From owner-freebsd-bugs@FreeBSD.ORG Fri Sep 30 00:40:19 2005 Return-Path: X-Original-To: freebsd-bugs@hub.freebsd.org Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D467516A420 for ; Fri, 30 Sep 2005 00:40:19 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 62D2843D48 for ; Fri, 30 Sep 2005 00:40:19 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j8U0eJkf033307 for ; Fri, 30 Sep 2005 00:40:19 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j8U0eIhx033306; Fri, 30 Sep 2005 00:40:18 GMT (envelope-from gnats) Resent-Date: Fri, 30 Sep 2005 00:40:18 GMT Resent-Message-Id: <200509300040.j8U0eIhx033306@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Andrew Turner Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0453716A41F; Fri, 30 Sep 2005 00:38:00 +0000 (GMT) (envelope-from andrew@fubar.geek.nz) Received: from mta206-rme.xtra.co.nz (mta206-rme.xtra.co.nz [210.86.15.58]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5A0E643D48; Fri, 30 Sep 2005 00:37:58 +0000 (GMT) (envelope-from andrew@fubar.geek.nz) Received: from mta4-rme.xtra.co.nz ([210.86.15.192]) by mta206-rme.xtra.co.nz with ESMTP id <20050930003757.VEUW28153.mta206-rme.xtra.co.nz@mta4-rme.xtra.co.nz>; Fri, 30 Sep 2005 12:37:57 +1200 Received: from serv.int.fubar.geek.nz ([222.152.222.171]) by mta4-rme.xtra.co.nz with ESMTP id <20050930003756.HPJF5449.mta4-rme.xtra.co.nz@serv.int.fubar.geek.nz>; Fri, 30 Sep 2005 12:37:56 +1200 Received: by serv.int.fubar.geek.nz (Postfix, from userid 1001) id 80FDC6128; Fri, 30 Sep 2005 12:37:55 +1200 (NZST) Message-Id: <20050930003755.80FDC6128@serv.int.fubar.geek.nz> Date: Fri, 30 Sep 2005 12:37:55 +1200 (NZST) From: Andrew Turner To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: kientzle@FreeBSD.org Subject: bin/86742: Add archive_open_ to read from a FILE stream X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Andrew Turner List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Sep 2005 00:40:20 -0000 >Number: 86742 >Category: bin >Synopsis: Add archive_open_ to read from a FILE stream >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Sep 30 00:40:18 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Andrew Turner >Release: FreeBSD 5.4-STABLE i386 >Organization: >Environment: System: FreeBSD serv.int.fubar.geek.nz 5.4-STABLE FreeBSD 5.4-STABLE #7: Wed May 11 23:57:29 NZST 2005 root@serv.int.fubar.geek.nz:/usr/obj/srctrees/RELENG_5/sys/GENERIC i386 >Description: Libarchive dosn't have a read_open function to read data from a file stream. archive_open_fd can be used in some cases with fileno. However when the stream dosn't have a file descriptor associated with it it will fail eg. fetchGetURL from libfetch has an invalid file descriptor. The code is based off archive_read_open_fd rev. 1.4 >How-To-Repeat: >Fix: --- archive_read_open_stream.c begins here --- /*- * Copyright (c) 2003-2004 Tim Kientzle * Copyright (c) 2005 Andrew Turner * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer * in this position and unchanged. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT, * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "archive_platform.h" __FBSDID("$FreeBSD$"); #include #include #include #include "archive.h" struct read_stream_data { FILE *fd; size_t block_size; void *buffer; }; int archive_read_open_stream(struct archive *, FILE *, size_t); static int stream_close(struct archive *, void *); static int stream_open(struct archive *, void *); static ssize_t stream_read(struct archive *, void *, const void **buff); int archive_read_open_stream(struct archive *a, FILE *fd, size_t block_size) { struct read_stream_data *mine; mine = malloc(sizeof(*mine)); if (mine == NULL) { archive_set_error(a, ENOMEM, "No memory"); return (ARCHIVE_FATAL); } mine->block_size = block_size; mine->buffer = malloc(mine->block_size); if (mine->buffer == NULL) { archive_set_error(a, ENOMEM, "No memory"); free(mine); return (ARCHIVE_FATAL); } mine->fd = fd; return (archive_read_open(a, mine, stream_open, stream_read, stream_close)); } static int stream_open(struct archive *a, void *client_data) { struct read_stream_data *mine = client_data; (void)a; /* UNUSED */ if (mine->fd == NULL) { archive_set_error(a, EINVAL, "Bad FILE pointer"); free(mine->buffer); free(mine); return (ARCHIVE_FATAL); } return (ARCHIVE_OK); } static ssize_t stream_read(struct archive *a, void *client_data, const void **buff) { struct read_stream_data *mine = client_data; (void)a; /* UNUSED */ *buff = mine->buffer; return fread(mine->buffer, 1, mine->block_size, mine->fd); } static int stream_close(struct archive *a, void *client_data) { struct read_stream_data *mine = client_data; (void)a; /* UNUSED */ free(mine->buffer); free(mine); return (ARCHIVE_OK); } --- archive_read_open_stream.c ends here --- >Release-Note: >Audit-Trail: >Unformatted: