aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStig Bjørlykke <stig@bjorlykke.org>2019-01-31 12:38:16 +0100
committerPeter Wu <peter@lekensteyn.nl>2019-01-31 13:16:54 +0000
commit6aad32583dcf9a159b68007546d699fb391c7f18 (patch)
tree6d5d329c8bf99970d3bcdc5b627aeb3b2de1e2d6
parent3bbf2c5e64b4e7018667ff96008ad57ea5481b60 (diff)
tshark: Improve options help texts
Align the usage help text for '-' as filename for stdin and stdout with the text used for wireshark. Change-Id: I67011b8234616940b7878fd5768c9e2a9e79f9f0 Reviewed-on: https://code.wireshark.org/review/31838 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-rw-r--r--docbook/wsug_src/tshark-h.txt4
-rw-r--r--tshark.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/docbook/wsug_src/tshark-h.txt b/docbook/wsug_src/tshark-h.txt
index d5ee7d2231..9258772a46 100644
--- a/docbook/wsug_src/tshark-h.txt
+++ b/docbook/wsug_src/tshark-h.txt
@@ -28,7 +28,7 @@ Capture output:
filesize:NUM - switch to next file after NUM KB
files:NUM - ringbuffer: replace after NUM files
Input file:
- -r <infile> set the filename to read from (- to read from stdin)
+ -r <infile|-> set the filename to read from (or '-' for stdin)
Processing:
-2 perform a two-pass analysis
@@ -54,7 +54,7 @@ Processing:
disable dissection of heuristic protocol
Output:
-w <outfile|-> write packets to a pcapng-format file named "outfile"
- (or to the standard output for "-")
+ (or '-' for stdout)
-C <config profile> start with specified configuration profile
-F <output file type> set the output file type, default is pcapng
an empty "-F" option will list the file types
diff --git a/tshark.c b/tshark.c
index b3d86f49a2..c1fbd13eb5 100644
--- a/tshark.c
+++ b/tshark.c
@@ -360,7 +360,7 @@ print_usage(FILE *output)
#endif
/*fprintf(output, "\n");*/
fprintf(output, "Input file:\n");
- fprintf(output, " -r <infile> set the filename to read from (- to read from stdin)\n");
+ fprintf(output, " -r <infile|-> set the filename to read from (or '-' for stdin)\n");
fprintf(output, "\n");
fprintf(output, "Processing:\n");
@@ -393,7 +393,7 @@ print_usage(FILE *output)
#else
fprintf(output, " -w <outfile|-> write packets to a pcap-format file named \"outfile\"\n");
#endif
- fprintf(output, " (or to the standard output for \"-\")\n");
+ fprintf(output, " (or '-' for stdout)\n");
fprintf(output, " -C <config profile> start with specified configuration profile\n");
#ifdef PCAP_NG_DEFAULT
fprintf(output, " -F <output file type> set the output file type, default is pcapng\n");