Date: Sun, 12 Apr 2009 04:45:40 +0000 (UTC) From: Tim Kientzle <kientzle@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r190955 - head/lib/libarchive Message-ID: <200904120445.n3C4jevv010898@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kientzle Date: Sun Apr 12 04:45:40 2009 New Revision: 190955 URL: http://svn.freebsd.org/changeset/base/190955 Log: Merge r881 from libarchive.googlecode.com: The "empty" format should not be recognized if there is a read error. Modified: head/lib/libarchive/archive_read_support_format_empty.c Modified: head/lib/libarchive/archive_read_support_format_empty.c ============================================================================== --- head/lib/libarchive/archive_read_support_format_empty.c Sun Apr 12 03:45:03 2009 (r190954) +++ head/lib/libarchive/archive_read_support_format_empty.c Sun Apr 12 04:45:40 2009 (r190955) @@ -60,9 +60,10 @@ static int archive_read_format_empty_bid(struct archive_read *a) { const void *h; + ssize_t avail; - h = __archive_read_ahead(a, 1, NULL); - if (h != NULL) + h = __archive_read_ahead(a, 1, &avail); + if (avail != 0) return (-1); return (1); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200904120445.n3C4jevv010898>