From owner-svn-src-head@FreeBSD.ORG Fri Apr 17 01:07:37 2009 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9471B1065749; Fri, 17 Apr 2009 01:07:37 +0000 (UTC) (envelope-from kientzle@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 820168FC20; Fri, 17 Apr 2009 01:07:37 +0000 (UTC) (envelope-from kientzle@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n3H17bPM000230; Fri, 17 Apr 2009 01:07:37 GMT (envelope-from kientzle@svn.freebsd.org) Received: (from kientzle@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3H17bwq000229; Fri, 17 Apr 2009 01:07:37 GMT (envelope-from kientzle@svn.freebsd.org) Message-Id: <200904170107.n3H17bwq000229@svn.freebsd.org> From: Tim Kientzle Date: Fri, 17 Apr 2009 01:07:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r191184 - head/lib/libarchive X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Apr 2009 01:07:38 -0000 Author: kientzle Date: Fri Apr 17 01:07:37 2009 New Revision: 191184 URL: http://svn.freebsd.org/changeset/base/191184 Log: Publicize a handful of new functions and bump the version number to indicate that this is synchronized with the recent libarchive 2.7.0 release. Modified: head/lib/libarchive/archive.h Modified: head/lib/libarchive/archive.h ============================================================================== --- head/lib/libarchive/archive.h Fri Apr 17 01:06:31 2009 (r191183) +++ head/lib/libarchive/archive.h Fri Apr 17 01:07:37 2009 (r191184) @@ -118,13 +118,13 @@ extern "C" { * (ARCHIVE_API_VERSION * 1000000 + ARCHIVE_API_FEATURE * 1000) * #endif */ -#define ARCHIVE_VERSION_NUMBER 2006901 +#define ARCHIVE_VERSION_NUMBER 2007000 __LA_DECL int archive_version_number(void); /* * Textual name/version of the library, useful for version displays. */ -#define ARCHIVE_VERSION_STRING "libarchive 2.6.901a" +#define ARCHIVE_VERSION_STRING "libarchive 2.7.0" __LA_DECL const char * archive_version_string(void); #if ARCHIVE_VERSION_NUMBER < 3000000 @@ -298,6 +298,7 @@ __LA_DECL int archive_read_support_com __LA_DECL int archive_read_support_compression_bzip2(struct archive *); __LA_DECL int archive_read_support_compression_compress(struct archive *); __LA_DECL int archive_read_support_compression_gzip(struct archive *); +__LA_DECL int archive_read_support_compression_lzma(struct archive *); __LA_DECL int archive_read_support_compression_none(struct archive *); __LA_DECL int archive_read_support_compression_program(struct archive *, const char *command); @@ -305,6 +306,8 @@ __LA_DECL int archive_read_support_com (struct archive *, const char *, const void * /* match */, size_t); +__LA_DECL int archive_read_support_compression_xz(struct archive *); + __LA_DECL int archive_read_support_format_all(struct archive *); __LA_DECL int archive_read_support_format_ar(struct archive *); __LA_DECL int archive_read_support_format_cpio(struct archive *); @@ -352,6 +355,10 @@ __LA_DECL int archive_read_open_FILE(s __LA_DECL int archive_read_next_header(struct archive *, struct archive_entry **); +/* Parses and returns next entry header using the archive_entry passed in */ +__LA_DECL int archive_read_next_header2(struct archive *, + struct archive_entry *); + /* * Retrieve the byte offset in UNCOMPRESSED data where last-read * header started. @@ -499,9 +506,11 @@ __LA_DECL int archive_write_set_skip_f __LA_DECL int archive_write_set_compression_bzip2(struct archive *); __LA_DECL int archive_write_set_compression_compress(struct archive *); __LA_DECL int archive_write_set_compression_gzip(struct archive *); +__LA_DECL int archive_write_set_compression_lzma(struct archive *); __LA_DECL int archive_write_set_compression_none(struct archive *); __LA_DECL int archive_write_set_compression_program(struct archive *, const char *cmd); +__LA_DECL int archive_write_set_compression_xz(struct archive *); /* A convenience function to set the format based on the code or name. */ __LA_DECL int archive_write_set_format(struct archive *, int format_code); __LA_DECL int archive_write_set_format_by_name(struct archive *, @@ -584,10 +593,12 @@ __LA_DECL int archive_write_set_options /*- + * ARCHIVE_WRITE_DISK API + * * To create objects on disk: * 1) Ask archive_write_disk_new for a new archive_write_disk object. - * 2) Set any global properties. In particular, you should set - * the compression and format to use. + * 2) Set any global properties. In particular, you probably + * want to set the options. * 3) For each entry: * - construct an appropriate struct archive_entry structure * - archive_write_header to create the file/dir/etc on disk @@ -601,7 +612,8 @@ __LA_DECL struct archive *archive_write_ /* This file will not be overwritten. */ __LA_DECL int archive_write_disk_set_skip_file(struct archive *, dev_t, ino_t); -/* Set flags to control how the next item gets created. */ +/* Set flags to control how the next item gets created. + * This accepts a bitmask of ARCHIVE_EXTRACT_XXX flags defined above. */ __LA_DECL int archive_write_disk_set_options(struct archive *, int flags); /*