TShark doesn't need wtap_fdreopen(), as it doesn't do saves and thus

doesn't do safe saves, so wtap_fdreopen() always needs to reopen the
random file descriptor.

At the point where a safe save is done, the sequential read is done, so
the sequential stream is closed; there's no need to reopen it.

(The former fourth argument to wtap_fdreopen() wasn't an indication of
whether the file was compressed, it was an indicationof whether the
random stream should be reopened.)

svn path=/trunk/; revision=42977

1 files changed, 3 insertions, 2 deletions

diff --git a/file.c b/file.c
index 854d52ec69..5248ba3fda 100644
--- a/file.c
+++ b/file.c
@@ -3983,8 +3983,9 @@ cf_save_packets(capture_file *cf, const char *fname, guint save_format,
       simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
                     file_rename_error_message(errno), fname);
 #ifdef _WIN32
-      /* Attempt to reopen the file descriptors using fname. */
-      if (!wtap_fdreopen(cf->wth, fname, &err, compressed)) {
+      /* Attempt to reopen the random file descriptor using fname.
+         (At this point, the sequential file descriptor is closed.) */
+      if (!wtap_fdreopen(cf->wth, fname, &err)) {
         /* Oh, well, we're screwed. */
         simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
                       file_open_error_message(err, FALSE), fname);