Author: kientzle
Date: Fri Apr 17 01:00:11 2009
New Revision: 191177
URL: http://svn.freebsd.org/changeset/base/191177
Log:
Don't match an empty file on 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 Fri Apr 17
00:59:34 2009 (r191176)
+++ head/lib/libarchive/archive_read_support_format_empty.c Fri Apr 17
01:00:11 2009 (r191177)
@@ -59,14 +59,13 @@ archive_read_support_format_empty(struct
static int
archive_read_format_empty_bid(struct archive_read *a)
{
+ const void *h;
ssize_t avail;
- (void)__archive_read_ahead(a, 1, &avail);
- /* Bid 1 if we successfully read exactly zero bytes. */
- if (avail == 0)
- return (1);
- /* Otherwise, we don't bid on this. */
- return (-1);
+ h = __archive_read_ahead(a, 1, &avail);
+ if (avail != 0)
+ return (-1);
+ return (1);
}
static int
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
