diff options
| author | delphij <delphij@FreeBSD.org> | 2009-06-24 21:51:02 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2009-06-24 21:51:02 +0000 |
| commit | a2b16a14dfcf8adf5a116d8f4860420d042e48bb (patch) | |
| tree | 1d00d604065a6b0aaa95f5c4bc5d5d3fd2d8fac6 /usr.bin/gzip/gzip.c | |
| parent | e53e57277b75107b8ed5c3e296e30d1da52c1269 (diff) | |
| download | FreeBSD-src-a2b16a14dfcf8adf5a116d8f4860420d042e48bb.zip FreeBSD-src-a2b16a14dfcf8adf5a116d8f4860420d042e48bb.tar.gz | |
Sync with NetBSD:
- gzip -n does not store timestamp; [1]
- Reduce diff against NetBSD by moving some casts in our local
versions.
PR: bin/134955
Obtained from: NetBSD
MFC after: 1 month
Diffstat (limited to 'usr.bin/gzip/gzip.c')
| -rw-r--r-- | usr.bin/gzip/gzip.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/gzip/gzip.c b/usr.bin/gzip/gzip.c index bdff534..9d4548e 100644 --- a/usr.bin/gzip/gzip.c +++ b/usr.bin/gzip/gzip.c @@ -1,4 +1,4 @@ -/* $NetBSD: gzip.c,v 1.92 2008/07/21 14:19:22 lukem Exp $ */ +/* $NetBSD: gzip.c,v 1.94 2009/04/12 10:31:14 lukem Exp $ */ /*- * Copyright (c) 1997, 1998, 2003, 2004, 2006 Matthew R. Green @@ -1360,10 +1360,10 @@ file_uncompress(char *file, char *outfile, size_t outsize) #ifndef SMALL if (method == FT_GZIP && Nflag) { unsigned char ts[4]; /* timestamp */ - int rv; + ssize_t rv; rv = pread(fd, ts, sizeof ts, GZIP_TIMESTAMP); - if (rv >= 0 && (size_t)rv < sizeof ts) + if (rv >= 0 && rv < (ssize_t)(sizeof ts)) goto unexpected_EOF; if (rv == -1) { if (!fflag) |
