svn commit: r199066 - head/usr.bin/gzip

[Xin LI]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Xin LI wrote:
> Anonymous wrote:
>> Xin LI <delphij at FreeBSD.org> writes:
> 
>>> Author: delphij
>>> Date: Mon Nov  9 02:37:02 2009
>>> New Revision: 199066
>>> URL: http://svn.freebsd.org/changeset/base/199066
>>>
>>> Log:
>>>   Apply a NetBSD fix (revision 1.12) to handle multi-session bzip2 files
>>>   as created by pbzip2.
>>>   
>>>   Submitted by:	mrg (NetBSD.org)
>>>   MFC after:	1 week
>>>
>>> Modified:
>>>   head/usr.bin/gzip/unbzip2.c
>>>
>>     $ touch blah
>>     $ bzip2 blah
>>     $ gzip -d blah.bz2
>>     gzip: read: No such file or directory
>>     Exit 2
> 
>> Regression? Can you reproduce?
> 
> Yes, this is a regression (confirmed that this behavior is different
> from bzip2 and a regression from 199065).  Thanks for your report and
> I'll investigate what's happening.

I think the attached patch should fixed this issue.  Could you please test?

Cheers,
- --
Xin LI <delphij at delphij.net>	http://www.delphij.net/
FreeBSD - The Power to Serve!	       Live free or die
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.13 (FreeBSD)

iEYEARECAAYFAkr94n8ACgkQi+vbBBjt66D4VQCfekBnaZdllB2EPffhlpfW0S7v
q5sAoJWPfTXhILLajqX80NbDHXRj0iNy
=NaaM
-----END PGP SIGNATURE-----
-------------- next part --------------
Index: usr.bin/gzip/unbzip2.c
===================================================================
--- usr.bin/gzip/unbzip2.c	(revision 199258)
+++ usr.bin/gzip/unbzip2.c	(working copy)
@@ -71,7 +71,7 @@
 	                n = read(in, inbuf, BUFLEN);
 	                if (n < 0)
 	                        maybe_err("read");
-	                if (n == 0)
+	                if (n < BUFLEN)
 	                        end_of_file = 1;
 	                bzs.next_in = inbuf;
 	                bzs.avail_in = n;