Date: Fri, 30 Sep 2005 12:37:55 +1200 (NZST) From: Andrew Turner <andrew@fubar.geek.nz> To: FreeBSD-gnats-submit@FreeBSD.org Cc: kientzle@FreeBSD.org Subject: bin/86742: Add archive_open_ to read from a FILE stream Message-ID: <20050930003755.80FDC6128@serv.int.fubar.geek.nz> Resent-Message-ID: <200509300040.j8U0eIhx033306@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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 <errno.h> #include <stdio.h> #include <stdlib.h> #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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050930003755.80FDC6128>