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

[Xin LI]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Hi, Pan,

On 05/25/11 10:03, Pan Tsu wrote:
>>   Match symbolic link handling behavior with GNU gzip, bzip2 and xz:
> 
> After this change zcat(1) behaves unlike GNU zcat, bzcat and xzcat.
> 
>   $ zcat TIFFfree.3tiff.gz
>   zcat: TIFFfree.3tiff.gz is not a regular file
>   Exit 1

Will the attached patch help?

[...]
> At least our man(1) relies on foocat, e.g.
[...]
> and uses `-f' flag only when compression is not known/not compressed

I think this is a gzip(1) bug and thus it's not man(1) to be fixed.

However, that might indicate a different bug (thankfully it revealed the
gzip(1) one) in the TIFF port :)

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.17 (FreeBSD)

iQEcBAEBCAAGBQJN3T6NAAoJEATO+BI/yjfB/4YIALvCH1J1GvbHFXn8aN4msBnY
28RnaioHsOpABVwJJ4H6HR6hh3XEC/rU6LeQaCocZ3K+THkKc4+OvvLJwi/QEiLz
0i4zW/K0ZM3BrwjmCuoTHSNPCTkAAcEPiGQt2XjvgPRzAXOeQSI16ABbl98i6OeK
nT2ntP9izC4A0VR+YBPBYAjCi7u1Yers46fhjTEDi0ISpuKiONPeU32ZyIttee/U
j0uRc4PBxAsrGZTkhMn2qB3pVRIfQje+eUxB/yHQs3JwW9CIZ/VWprIlfn1S5Gr+
JPsNeBGRYWTUS2MJyn9uEmiMZvOzGO0rzATKgzyoP6yBrUCmSQhAO6DpkMTibj8=
=kLw1
-----END PGP SIGNATURE-----
-------------- next part --------------
Index: usr.bin/gzip/gzip.c
===================================================================
--- usr.bin/gzip/gzip.c	(revision 222265)
+++ usr.bin/gzip/gzip.c	(working copy)
@@ -1782,7 +1782,8 @@
 	}
 
 retry:
-	if (stat(path, &sb) != 0 || (fflag == 0 && lstat(path, &sb) != 0)) {
+	if (stat(path, &sb) != 0 || (fflag == 0 && cflag == 0 &&
+	    lstat(path, &sb) != 0)) {
 		/* lets try <path>.gz if we're decompressing */
 		if (dflag && s == NULL && errno == ENOENT) {
 			len = strlen(path);