aboutsummaryrefslogtreecommitdiffstats
path: root/tshark.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2010-07-01 00:12:16 +0000
committerGuy Harris <guy@alum.mit.edu>2010-07-01 00:12:16 +0000
commitb0b7697dea7da93a261d6eeb8bf7562a4884bc5a (patch)
tree49de4177e15fd73502e2d2b372524999676dddb3 /tshark.c
parent6aaa5874c610def77b749831f785be309acaf853 (diff)
From Petr Lautrbach: when capturing, return the exit status of dumpcap,
so we give a non-zero exit status for invalid interfaces or capture filters. From me: don't exit immediately if dumpcap failed, print out information from taps and the like. svn path=/trunk/; revision=33393
Diffstat (limited to 'tshark.c')
-rw-r--r--tshark.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/tshark.c b/tshark.c
index a0c8f4f71e..b5105a44bb 100644
--- a/tshark.c
+++ b/tshark.c
@@ -1748,8 +1748,10 @@ main(int argc, char *argv[])
*
* The capture code is a bit twisty, so it doesn't appear to
* be an easy fix. We just ignore the return value for now.
+ * Instead, pass on the exit status from the capture child.
*/
capture();
+ exit_status = global_capture_opts.fork_child_status;
if (print_packet_info) {
if (!write_finale()) {