Make "-q" suppress packet printing when you're reading a capture file

and not writing to another capture file, for use with "-z" options.

Note that "-z proto" *doesn't* print statistics at the end - it modifies
the packet summary output.

Note that on at least some BSDs the "status" character is set to "off"
by default, so you have to set it explicitly in order to be able to ^T
an application such as Tethereal.

svn path=/trunk/; revision=11038

1 files changed, 11 insertions, 4 deletions

diff --git a/tethereal.c b/tethereal.c
index 12e3369ff5..c672e981a0 100644
--- a/tethereal.c
+++ b/tethereal.c
@@ -1,6 +1,6 @@
 /* tethereal.c
  *
- * $Id: tethereal.c,v 1.240 2004/05/31 07:52:27 guy Exp $
+ * $Id: tethereal.c,v 1.241 2004/05/31 08:41:32 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -1312,11 +1312,16 @@ main(int argc, char *argv[])
   ld.output_to_pipe = FALSE;
 #endif
   if (cfile.save_file != NULL) {
+    /* We're writing to a capture file. */
     if (strcmp(cfile.save_file, "-") == 0) {
-      /* stdout */
+      /* Write to the standard output. */
       g_free(cfile.save_file);
       cfile.save_file = g_strdup("");
 #ifdef HAVE_LIBPCAP
+      /* XXX - should we check whether it's a pipe?  It's arguably
+         silly to do "-w - >output_file" rather than "-w output_file",
+         but by not checking we might be violating the Principle Of
+         Least Astonishment. */
       ld.output_to_pipe = TRUE;
 #endif
     }
@@ -1343,8 +1348,10 @@ main(int argc, char *argv[])
     }
 #endif
   } else {
-    /* We're not writing to a file, so we should print packet information. */
-    print_packet_info = TRUE;
+    /* We're not writing to a file, so we should print packet information
+       unless "-q" was specified. */
+    if (!quiet)
+      print_packet_info = TRUE;
   }
 
 #ifndef HAVE_LIBPCAP