From andrew@fubar.geek.nz  Fri Sep 30 00:38:00 2005
Return-Path: <andrew@fubar.geek.nz>
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 <andrew@fubar.geek.nz>
Reply-To: Andrew Turner <andrew@fubar.geek.nz>
To: FreeBSD-gnats-submit@freebsd.org
Cc: kientzle@FreeBSD.org
Subject: Add archive_open_ to read from a FILE stream
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         86742
>Category:       bin
>Synopsis:       [libarchive] [patch] Add archive_open_ to read from a FILE stream
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    kientzle
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Sep 30 00:40:18 GMT 2005
>Closed-Date:    Wed Feb 14 08:19:28 GMT 2007
>Last-Modified:  Wed Feb 14 08:19:28 GMT 2007
>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:
Responsible-Changed-From-To: freebsd-bugs->kientzle 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Fri Sep 30 00:45:03 GMT 2005 
Responsible-Changed-Why:  
Over to maintainer. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=86742 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/86742: commit references a PR
Date: Fri, 24 Nov 2006 02:01:24 +0000 (UTC)

 kientzle    2006-11-24 02:00:49 UTC
 
   FreeBSD src repository
 
   Modified files:
     lib/libarchive       archive.h.in archive_read_open_file.c 
                          archive_write_open_file.c 
   Added files:
     lib/libarchive       archive_read_open_memory.c 
                          archive_write_open_memory.c 
   Log:
   New hooks for reading/writing archives to/from a FILE * or
   an in-memory buffer.
   
   PR: bin/86742
   
   Revision  Changes    Path
   1.33      +16 -0     src/lib/libarchive/archive.h.in
   1.17      +47 -130   src/lib/libarchive/archive_read_open_file.c
   1.1       +147 -0    src/lib/libarchive/archive_read_open_memory.c (new)
   1.17      +17 -81    src/lib/libarchive/archive_write_open_file.c
   1.1       +127 -0    src/lib/libarchive/archive_write_open_memory.c (new)
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/86742: commit references a PR
Date: Fri, 24 Nov 2006 05:34:29 +0000 (UTC)

 kientzle    2006-11-24 05:34:23 UTC
 
   FreeBSD src repository
 
   Modified files:
     lib/libarchive       archive_read.3 archive_write.3 
                          libarchive.3 
   Log:
   Document the new _open_FILE() and _open_memory() interfaces.
   
   PR: bin/86742
   
   Revision  Changes    Path
   1.26      +23 -2     src/lib/libarchive/archive_read.3
   1.16      +39 -7     src/lib/libarchive/archive_write.3
   1.8       +13 -2     src/lib/libarchive/libarchive.3
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/86742: commit references a PR
Date: Fri, 24 Nov 2006 16:36:05 +0000 (UTC)

 kientzle    2006-11-24 16:35:54 UTC
 
   FreeBSD src repository
 
   Modified files:
     lib/libarchive       Makefile 
   Log:
   Connect four new files to the build.
   PR: bin/86742
   
   Revision  Changes    Path
   1.54      +9 -1      src/lib/libarchive/Makefile
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->closed 
State-Changed-By: kientzle 
State-Changed-When: Wed Feb 14 08:18:32 UTC 2007 
State-Changed-Why:  
Fixed in -CURRENT and 6-STABLE since a little while ago. 


http://www.freebsd.org/cgi/query-pr.cgi?pr=86742 
>Unformatted:
