A child process for a "-S" or "-F" capture should *always* exit when the

capture is done; make it do so, and don't bother passing it a "-Q" flag
to tell it to do so.

"capture()" is called in two places; in one place, it's in a child
process, and it shouldn't read in the capture file.  Move the reading of
the capture file out of "capture()" itself to the place where we
*should* read in the capture file after it returns.  Also, have it
return an indication of whether it succeeded or failed, so we know
whether we should read in the capture file.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@747 f5534014-38df-0310-8fa8-9805f1628bb7

1 files changed, 2 insertions, 2 deletions

diff --git a/capture.h b/capture.h
index ff9e59519d..e03efc1966 100644
--- a/capture.h
+++ b/capture.h
@@ -1,7 +1,7 @@
 /* capture.h
  * Definitions for packet capture windows
  *
- * $Id: capture.h,v 1.17 1999/09/30 06:49:54 guy Exp $
+ * $Id: capture.h,v 1.18 1999/10/02 06:00:07 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -60,7 +60,7 @@ void   do_capture(void);
 void   run_capture(void);
 
 /* Do the low-level work of a capture. */
-void   capture(void);
+int    capture(void);
 
 #endif /* HAVE_LIBPCAP */
 #endif /* capture.h */