From 5889d4b435d8a0063cd272c08f417ce9c6fa1a75 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Thu, 3 Jul 2014 00:28:24 -0700 Subject: More getopt_long(), for --help and --version. Change-Id: Ia02d7b1fbeaa8e581e85ad8b87afabd576515434 Reviewed-on: https://code.wireshark.org/review/2792 Reviewed-by: Guy Harris --- tfshark.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'tfshark.c') diff --git a/tfshark.c b/tfshark.c index e4e42da312..791e55ca12 100644 --- a/tfshark.c +++ b/tfshark.c @@ -752,6 +752,11 @@ main(int argc, char *argv[]) GString *runtime_info_str; char *init_progfile_dir_error; int opt; + static const struct option long_options[] = { + {(char *)"help", no_argument, NULL, 'h'}, + {(char *)"version", no_argument, NULL, 'v'}, + {0, 0, 0, 0 } + }; gboolean arg_error = FALSE; char *gpf_path, *pf_path; @@ -1060,7 +1065,7 @@ main(int argc, char *argv[]) output_fields = output_fields_new(); /* Now get our args */ - while ((opt = getopt(argc, argv, optstring)) != -1) { + while ((opt = getopt_long(argc, argv, optstring, long_options, NULL)) != -1) { switch (opt) { case '2': /* Perform two pass analysis */ perform_two_pass_analysis = TRUE; -- cgit v1.2.3