From owner-svn-src-all@FreeBSD.ORG Tue Mar 3 17:07:28 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2685F10657AE; Tue, 3 Mar 2009 17:07:28 +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 EF4B58FC1F; Tue, 3 Mar 2009 17:07:27 +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 n23H7Rfj016398; Tue, 3 Mar 2009 17:07:27 GMT (envelope-from kientzle@svn.freebsd.org) Received: (from kientzle@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n23H7RmL016396; Tue, 3 Mar 2009 17:07:27 GMT (envelope-from kientzle@svn.freebsd.org) Message-Id: <200903031707.n23H7RmL016396@svn.freebsd.org> From: Tim Kientzle Date: Tue, 3 Mar 2009 17:07:27 +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: r189309 - head/lib/libarchive X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Mar 2009 17:07:29 -0000 Author: kientzle Date: Tue Mar 3 17:07:27 2009 New Revision: 189309 URL: http://svn.freebsd.org/changeset/base/189309 Log: Merge r340 from libarchive.googlecode.com: If zlib/bzlib aren't available, we can still detect gzip/bzip2 compressed streams, we just can't decompress them. Modified: head/lib/libarchive/archive_write_set_compression_bzip2.c head/lib/libarchive/archive_write_set_compression_gzip.c Modified: head/lib/libarchive/archive_write_set_compression_bzip2.c ============================================================================== --- head/lib/libarchive/archive_write_set_compression_bzip2.c Tue Mar 3 17:02:51 2009 (r189308) +++ head/lib/libarchive/archive_write_set_compression_bzip2.c Tue Mar 3 17:07:27 2009 (r189309) @@ -25,9 +25,6 @@ #include "archive_platform.h" -/* Don't compile this if we don't have bzlib. */ -#if HAVE_BZLIB_H - __FBSDID("$FreeBSD$"); #ifdef HAVE_ERRNO_H @@ -48,6 +45,16 @@ __FBSDID("$FreeBSD$"); #include "archive_private.h" #include "archive_write_private.h" +#ifndef HAVE_BZLIB_H +int +archive_write_set_compression_bzip2(struct archive *_a) +{ + /* Unsupported bzip2 compression, we don't have bzlib */ + return (ARCHIVE_FATAL); +} +#else +/* Don't compile this if we don't have bzlib. */ + struct private_data { bz_stream stream; int64_t total_in; Modified: head/lib/libarchive/archive_write_set_compression_gzip.c ============================================================================== --- head/lib/libarchive/archive_write_set_compression_gzip.c Tue Mar 3 17:02:51 2009 (r189308) +++ head/lib/libarchive/archive_write_set_compression_gzip.c Tue Mar 3 17:07:27 2009 (r189309) @@ -25,9 +25,6 @@ #include "archive_platform.h" -/* Don't compile this if we don't have zlib. */ -#if HAVE_ZLIB_H - __FBSDID("$FreeBSD$"); #ifdef HAVE_ERRNO_H @@ -48,6 +45,16 @@ __FBSDID("$FreeBSD$"); #include "archive_private.h" #include "archive_write_private.h" +#ifndef HAVE_ZLIB_H +int +archive_write_set_compression_gzip(struct archive *_a) +{ + /* Unsupported gzip compression, we don't have zlib */ + return (ARCHIVE_FATAL); +} +#else +/* Don't compile this if we don't have zlib. */ + struct private_data { z_stream stream; int64_t total_in;