[src/netbsd-2-0]: src/usr.bin/gzip Pull up revision 1.30 (requested by tron i...

[grant <grant%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/5042574fa876
branches:  netbsd-2-0
changeset: 560172:5042574fa876
user:      grant <grant%NetBSD.org@localhost>
date:      Wed Mar 31 09:04:26 2004 +0000

description:
Pull up revision 1.30 (requested by tron in ticket #21):

patch from tron@ to convert to using public bz interfaces.  simonb says
no reason not to and this fixes PR#24964.

diffstat:

 usr.bin/gzip/gzip.c |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (50 lines):

diff -r 793081fb1e5d -r 5042574fa876 usr.bin/gzip/gzip.c
--- a/usr.bin/gzip/gzip.c       Wed Mar 31 08:11:35 2004 +0000
+++ b/usr.bin/gzip/gzip.c       Wed Mar 31 09:04:26 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: gzip.c,v 1.29 2004/03/28 13:54:44 mrg Exp $    */
+/*     $NetBSD: gzip.c,v 1.29.2.1 2004/03/31 09:04:26 grant Exp $      */
 
 /*
  * Copyright (c) 1997, 1998, 2003 Matthew R. Green
@@ -32,7 +32,7 @@
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1997, 1998, 2003 Matthew R. Green\n\
      All rights reserved.\n");
-__RCSID("$NetBSD: gzip.c,v 1.29 2004/03/28 13:54:44 mrg Exp $");
+__RCSID("$NetBSD: gzip.c,v 1.29.2.1 2004/03/31 09:04:26 grant Exp $");
 #endif /* not lint */
 
 /*
@@ -78,7 +78,6 @@
 };
 
 #ifndef NO_BZIP2_SUPPORT
-#define BZ_NO_STDIO
 #include <bzlib.h>
 
 #define BZ2_SUFFIX     ".bz2"
@@ -746,6 +745,7 @@
                        maybe_warnx("%s already exists -- skipping", outfile);
                        goto lose;
                }
+               /* XXX wanna do this for -l in -DSMALL */
                if (stat(file, &isb) == 0) {
                        if (isb.st_nlink > 1 && lflag == 0) {
                                maybe_warnx("%s has %d other links -- skipping",
@@ -761,6 +761,7 @@
        if (method == FT_BZIP2) {
                int in, out;
 
+               /* XXX */
                if (lflag)
                        maybe_errx(1, "no -l with bzip2 files");
 
@@ -785,6 +786,7 @@
                FILE *in, *out;
                int fd;
 
+               /* XXX */
                if (lflag)
                        maybe_errx(1, "no -l with Lempel-Ziv files");