If we get an error reading the capture file, don't give up - run the

taps, etc., so we at least print the statistics for the packets we
*could* read.

Also, if we're printing packet data, and the standard output and
standard error are going to the same place, before printing the error
message for that error, flush the standard output and print a newline to
the standard error, so the error appears after all the packet data, and
has a newline separating it from the packet data.

This fixes bug 4845.

svn path=/trunk/; revision=33124

diff --git a/tshark.c b/tshark.c
index 161369c1a122549c0d6407299b3155ceede06c44..89c0ad35fcb38ed29465dc23032ef8c18ae13b6c 100644 (file)
--- a/tshark.c
+++ b/tshark.c
@@ -753,6 +753,7 @@ main(int argc, char *argv[])
   int                  gdp_open_errno, gdp_read_errno;
   int                  dp_open_errno, dp_read_errno;
   int                  err;
+  int                  exit_status = 0;
 #ifdef HAVE_LIBPCAP
   gboolean             list_link_layer_types = FALSE;
   gboolean             start_capture = FALSE;
@@ -1632,8 +1633,9 @@ main(int argc, char *argv[])
     err = load_cap_file(&cfile, NULL, out_file_type, 0, 0);
 #endif
     if (err != 0) {
-      epan_cleanup();
-      return 2;
+      /* We still dump out the results of taps, etc., as we might have
+         read some packets; however, we exit with an error status. */
+      exit_status = 2;
     }
   } else {
     /* No capture file specified, so we're supposed to do a live capture
@@ -1742,7 +1744,7 @@ main(int argc, char *argv[])
   output_fields_free(output_fields);
   output_fields = NULL;
 
-  return 0;
+  return exit_status;
 }
 
 /*#define USE_BROKEN_G_MAIN_LOOP*/
@@ -2641,7 +2643,26 @@ load_cap_file(capture_file *cf, char *save_file, int out_file_type,
   }
 
   if (err != 0) {
-    /* Print a message noting that the read failed somewhere along the line. */
+    /*
+     * Print a message noting that the read failed somewhere along the line.
+     *
+     * If we're printing packet data, and the standard output and error are
+     * going to the same place, flush the standard output, so everything
+     * buffered up is written, and then print a newline to the standard error
+     * before printing the error message, to separate it from the packet
+     * data.
+     */
+    if (print_packet_info) {
+      struct stat stat_stdout, stat_stderr;
+
+      if (fstat(1, &stat_stdout) == 0 && fstat(2, &stat_stderr) == 0) {
+        if (stat_stdout.st_dev == stat_stderr.st_dev &&
+            stat_stdout.st_ino == stat_stderr.st_ino) {
+          fflush(stdout);
+          fprintf(stderr, "\n");
+        }
+      }
+    }
     switch (err) {
 
     case WTAP_ERR_UNSUPPORTED_ENCAP: