diff options
| author | Guy Harris <guy@alum.mit.edu> | 2002-06-07 07:27:35 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2002-06-07 07:27:35 +0000 |
| commit | 2aad75bb826b45ee1a78be2bbe2687e488748f8b (patch) | |
| tree | fc165ec22e943d3b15a10b6c8c84359286432e05 /wiretap/file.c | |
| parent | c15486768a2d90fcf97ca8ea628f3d174ad11a5b (diff) | |
Graeme Hewson noted that zlib has a bug wherein "gzseek()" doesn't set
the internal z_err value for the stream if an "fseek()" call it makes
fails, so that if "gzerror()" is subsequently called, it returns Z_OK
rather than an error.
To work around this, we pass "file_seek()" an "int *err", and have the
with-zlib version of "file_seek()" check, if "gzseek()" fails, whether
the return value of "file_error()" is 0 and, if so, have it return
"errno" instead.
svn path=/trunk/; revision=5642
Diffstat (limited to 'wiretap/file.c')
| -rw-r--r-- | wiretap/file.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/wiretap/file.c b/wiretap/file.c index 178a109237..973cc94821 100644 --- a/wiretap/file.c +++ b/wiretap/file.c @@ -1,6 +1,6 @@ /* file.c * - * $Id: file.c,v 1.90 2002/05/29 02:19:49 guy Exp $ + * $Id: file.c,v 1.91 2002/06/07 07:27:34 guy Exp $ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> @@ -129,10 +129,8 @@ gboolean wtap_def_seek_read(wtap *wth, long seek_off, { int bytes_read; - if (file_seek(wth->random_fh, seek_off, SEEK_SET) == -1) { - *err = file_error(wth->random_fh); + if (file_seek(wth->random_fh, seek_off, SEEK_SET, err) == -1) return FALSE; - } bytes_read = file_read(pd, sizeof(guint8), len, wth->random_fh); if (bytes_read != len) { @@ -240,9 +238,8 @@ wtap* wtap_open_offline(const char *filename, int *err, gboolean do_random) to start reading at the beginning. Initialize the data offset while we're at it. */ - if (file_seek(wth->fh, 0, SEEK_SET) == -1) { + if (file_seek(wth->fh, 0, SEEK_SET, err) == -1) { /* I/O error - give up */ - *err = file_error(wth->fh); if (wth->random_fh != NULL) file_close(wth->random_fh); file_close(wth->fh); |