diff options
| author | Simon J. Gerraty <sjg@FreeBSD.org> | 2014-08-19 06:50:54 +0000 |
|---|---|---|
| committer | Simon J. Gerraty <sjg@FreeBSD.org> | 2014-08-19 06:50:54 +0000 |
| commit | ee7b0571c2c18bdec848ed2044223cc88db29bd8 (patch) | |
| tree | b04f4bd7cd887f50e7d98af35f46b9834ff86c80 /usr.bin/gzip | |
| parent | ffda191e301f128a62c152fde92b692548367fca (diff) | |
| parent | 15fc2873832ea5b9b639e701bbbf2e73af8b6a88 (diff) | |
| download | src-test-ee7b0571c2c18bdec848ed2044223cc88db29bd8.tar.gz src-test-ee7b0571c2c18bdec848ed2044223cc88db29bd8.zip | |
Merge head from 7/28
Notes
Notes:
svn path=/projects/bmake/; revision=270164
Diffstat (limited to 'usr.bin/gzip')
| -rw-r--r-- | usr.bin/gzip/gzip.1 | 4 | ||||
| -rw-r--r-- | usr.bin/gzip/zuncompress.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/gzip/gzip.1 b/usr.bin/gzip/gzip.1 index ca1ca157ebb71..ba78bd060b30d 100644 --- a/usr.bin/gzip/gzip.1 +++ b/usr.bin/gzip/gzip.1 @@ -214,9 +214,9 @@ and first appeared in This implementation of .Nm was written by -.An Matthew R. Green Aq mrg@eterna.com.au +.An Matthew R. Green Aq Mt mrg@eterna.com.au with unpack support written by -.An Xin LI Aq delphij@FreeBSD.org . +.An Xin LI Aq Mt delphij@FreeBSD.org . .Sh BUGS According to RFC 1952, the recorded file size is stored in a 32-bit integer, therefore, it can not represent files larger than 4GB. diff --git a/usr.bin/gzip/zuncompress.c b/usr.bin/gzip/zuncompress.c index f1b05fd235723..6069cae2d41d3 100644 --- a/usr.bin/gzip/zuncompress.c +++ b/usr.bin/gzip/zuncompress.c @@ -145,7 +145,7 @@ zuncompress(FILE *in, FILE *out, char *pre, size_t prelen, else compressed_pre = NULL; - while ((bin = fread(buf, 1, sizeof(buf), in)) != 0) { + while ((bin = fread(buf, 1, BUFSIZE, in)) != 0) { if (tflag == 0 && (off_t)fwrite(buf, 1, bin, out) != bin) { free(buf); return -1; |