diff options
| author | delphij <delphij@FreeBSD.org> | 2011-05-23 09:02:44 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2011-05-23 09:02:44 +0000 |
| commit | f71ef98f21035641932d7e1aa2311e27af0fd5eb (patch) | |
| tree | 99b89e7c9d903b18cc4e2aae4682da6a191027c7 /usr.bin/gzip/gzip.c | |
| parent | 383b306f0a67acf8f459ff44a54abfdc085a7b0e (diff) | |
| download | FreeBSD-src-f71ef98f21035641932d7e1aa2311e27af0fd5eb.zip FreeBSD-src-f71ef98f21035641932d7e1aa2311e27af0fd5eb.tar.gz | |
Diff reduction against NetBSD. The most notable change is to zdiff(1) to
handle more file formats including bzip2 and xz.
MFC after: 2 weeks
Diffstat (limited to 'usr.bin/gzip/gzip.c')
| -rw-r--r-- | usr.bin/gzip/gzip.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/usr.bin/gzip/gzip.c b/usr.bin/gzip/gzip.c index d86e84b..474575c 100644 --- a/usr.bin/gzip/gzip.c +++ b/usr.bin/gzip/gzip.c @@ -1,4 +1,4 @@ -/* $NetBSD: gzip.c,v 1.97 2009/10/11 09:17:21 mrg Exp $ */ +/* $NetBSD: gzip.c,v 1.99 2011/03/23 12:59:44 tsutsui Exp $ */ /*- * Copyright (c) 1997, 1998, 2003, 2004, 2006 Matthew R. Green @@ -31,7 +31,7 @@ #ifndef lint __COPYRIGHT("@(#) Copyright (c) 1997, 1998, 2003, 2004, 2006\ Matthew R. Green. All rights reserved."); -__RCSID("$FreeBSD$"); +__FBSDID("$FreeBSD$"); #endif /* not lint */ /* @@ -146,7 +146,7 @@ static suffixes_t suffixes[] = { #define NUM_SUFFIXES (sizeof suffixes / sizeof suffixes[0]) #define SUFFIX_MAXLEN 30 -static const char gzip_version[] = "FreeBSD gzip 20100407"; +static const char gzip_version[] = "FreeBSD gzip 20110523"; #ifndef SMALL static const char gzip_copyright[] = \ @@ -314,7 +314,7 @@ main(int argc, char **argv) dflag = cflag = 1; #ifdef SMALL -#define OPT_LIST "123456789cdhltV" +#define OPT_LIST "123456789cdhlV" #else #define OPT_LIST "123456789acdfhklLNnqrS:tVv" #endif @@ -918,6 +918,7 @@ gz_uncompress(int in, int out, char *pre, size_t prelen, off_t *gsizep, case Z_BUF_ERROR: if (z.avail_out > 0 && !done_reading) continue; + case Z_STREAM_END: case Z_OK: break; |
