diff options
| author | delphij <delphij@FreeBSD.org> | 2010-04-16 20:04:45 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2010-04-16 20:04:45 +0000 |
| commit | 60d1ae7ed970f76115097c85c1a42c45b8ac3698 (patch) | |
| tree | d4aeb3437b6fd68a21673e92ad09d1c1bc3ba595 /lib/libz/gzlib.c | |
| parent | ce27b0428a5cc7c02cf71493bc42f41946660a0f (diff) | |
| download | FreeBSD-src-60d1ae7ed970f76115097c85c1a42c45b8ac3698.zip FreeBSD-src-60d1ae7ed970f76115097c85c1a42c45b8ac3698.tar.gz | |
MFV: libz 1.2.4.3.
Diffstat (limited to 'lib/libz/gzlib.c')
| -rw-r--r-- | lib/libz/gzlib.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/libz/gzlib.c b/lib/libz/gzlib.c index 88f27a8..f49fa8e 100644 --- a/lib/libz/gzlib.c +++ b/lib/libz/gzlib.c @@ -8,7 +8,7 @@ #include "gzguts.h" #include "zutil.h" -#if _LARGEFILE64_SOURCE == 1 && _LFS64_LARGEFILE == 1 +#if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0 # define LSEEK lseek64 #else # define LSEEK lseek @@ -175,6 +175,7 @@ local gzFile gz_open(path, fd, mode) O_APPEND))), 0666); if (state->fd == -1) { + free(state->path); free(state); return NULL; } @@ -435,7 +436,8 @@ int ZEXPORT gzeof(file) return 0; /* return end-of-file state */ - return state->mode == GZ_READ ? (state->eof && state->have == 0) : 0; + return state->mode == GZ_READ ? + (state->eof && state->strm.avail_in == 0 && state->have == 0) : 0; } /* -- see zlib.h -- */ |
