diff options
author | João Valverde <j@v6e.pt> | 2021-07-26 17:22:36 +0100 |
---|---|---|
committer | João Valverde <j@v6e.pt> | 2021-09-17 00:43:54 +0100 |
commit | 8df2a73594fbcc812f4ea22a72ab7a79bfb63dc3 (patch) | |
tree | 7d30bc5be8e85c52c0dd295cb15cd717d5770dcb /reordercap.c | |
parent | 7462e76884942258bae110ead925f25ffa54e2a8 (diff) |
Use the musl in-tree getopt_long() everywhere
Besides the obvious limitation of being unavailable on Windows,
the standard is vague about getopt() and getopt_long() has many
non-portable pitfalls and buggy implementations, that increase
the maintainance cost a lot. Also the GNU libc code currently
in the tree is not suited for embedding and is unmaintainable.
Own maintainership for getopt_long() and use the musl implementation
everywhere. This way we don't need to worry if optreset is available,
or if the $OPERATING_SYSTEM version behaves in subtly different ways.
The API is under the Wireshark namespace to avoid conflicts with
system headers.
Side-note, the Mingw-w64 9.0 getopt_long() implementation is buggy
with opterr and known to crash. In my experience it's a headache to
use the embedded getopt implementation if the system provides one.
Diffstat (limited to 'reordercap.c')
-rw-r--r-- | reordercap.c | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/reordercap.c b/reordercap.c index c8aa70297b..d52f49daff 100644 --- a/reordercap.c +++ b/reordercap.c @@ -15,18 +15,7 @@ #include <string.h> #include <glib.h> -/* - * If we have getopt_long() in the system library, include <getopt.h>. - * Otherwise, we're using our own getopt_long() (either because the - * system has getopt() but not getopt_long(), as with some UN*Xes, - * or because it doesn't even have getopt(), as with Windows), so - * include our getopt_long()'s header. - */ -#ifdef HAVE_GETOPT_LONG -#include <getopt.h> -#else -#include <wsutil/wsgetopt.h> -#endif +#include <wsutil/ws_getopt.h> #include <wiretap/wtap.h> @@ -242,7 +231,7 @@ main(int argc, char *argv[]) wtap_init(TRUE); /* Process the options first */ - while ((opt = getopt_long(argc, argv, "hnv", long_options, NULL)) != -1) { + while ((opt = ws_getopt_long(argc, argv, "hnv", long_options, NULL)) != -1) { switch (opt) { case 'n': write_output_regardless = FALSE; @@ -262,10 +251,10 @@ main(int argc, char *argv[]) } /* Remaining args are file names */ - file_count = argc - optind; + file_count = argc - ws_optind; if (file_count == 2) { - infile = argv[optind]; - outfile = argv[optind+1]; + infile = argv[ws_optind]; + outfile = argv[ws_optind+1]; } else { print_usage(stderr); |