diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-07-02 21:50:54 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-07-03 04:51:20 +0000 |
| commit | 8afe3313697e4e5adcb5eebc9bd31b375dee92b0 (patch) | |
| tree | 70aecda9538784b2d86399b459d48c359376ff0d /mergecap.c | |
| parent | a4304de1ccb3646dec74ed3a380485e80006b877 (diff) | |
| download | wireshark-8afe3313697e4e5adcb5eebc9bd31b375dee92b0.tar.gz wireshark-8afe3313697e4e5adcb5eebc9bd31b375dee92b0.tar.bz2 wireshark-8afe3313697e4e5adcb5eebc9bd31b375dee92b0.zip | |
More getopt_long, to add --help and --version support.
Change-Id: I946067b972a70154f02ab561bc0fd029a7a5abc4
Reviewed-on: https://code.wireshark.org/review/2791
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'mergecap.c')
| -rw-r--r-- | mergecap.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/mergecap.c b/mergecap.c index 85654adfbc..44c8c71b43 100644 --- a/mergecap.c +++ b/mergecap.c @@ -34,6 +34,10 @@ #include <unistd.h> #endif +#ifdef HAVE_GETOPT_H +#include <getopt.h> +#endif + #ifdef HAVE_SYS_TIME_H #include <sys/time.h> #endif @@ -217,6 +221,11 @@ int main(int argc, char *argv[]) { 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 do_append = FALSE; gboolean verbose = FALSE; int in_file_count = 0; @@ -245,7 +254,7 @@ main(int argc, char *argv[]) #endif /* _WIN32 */ /* Process the options first */ - while ((opt = getopt(argc, argv, "aF:hs:T:vVw:")) != -1) { + while ((opt = getopt_long(argc, argv, "aF:hs:T:vVw:", long_options, NULL)) != -1) { switch (opt) { case 'a': |