diff options
| author | Guy Harris <guy@alum.mit.edu> | 2018-12-12 02:53:08 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2018-12-13 00:52:11 +0000 |
| commit | a34cc98b2ac5a0ad011a1c3a40ce5e59230a9498 (patch) | |
| tree | 6cff6069cc4b3925fa4af82ce968959444dadd75 /mergecap.c | |
| parent | 17b721e45180a9decebb70dab77f41d96d5f7a03 (diff) | |
Put the main() and wmain() routines for CLI programs into a separate file.
That means that code is only in one place, rather than having copies of
it in each of those programs.
CLI programs that, on Windows, should get UTF-8 arguments rather than
arguments in the local code page should:
include the top-level cli_main.h header;
define the main function as real_main();
be built with the top-level cli_main.c file.
On UN*X, cli_main.c has a main() program, and just passes the arguments
on to real_main().
On Windows, cli_main.c has a wmain() function that converts the UTF-16
arguments it's handed to UTF-8 arguments, using WideCharToMultiByte() so
that it doesn't use any functions other than those provided by the
system, and then calls real_main() with the argument count and UTF-8
arguments.
Change-Id: I8b11f01dbc5c63fce599d1bef9ad96cd92c3c01e
Reviewed-on: https://code.wireshark.org/review/31017
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'mergecap.c')
| -rw-r--r-- | mergecap.c | 25 |
1 files changed, 3 insertions, 22 deletions
diff --git a/mergecap.c b/mergecap.c index 0425efc2f3..21798ad974 100644 --- a/mergecap.c +++ b/mergecap.c @@ -37,6 +37,8 @@ #include <wsutil/file_util.h> #include <wsutil/privileges.h> #include <wsutil/strnatcmp.h> + +#include <cli_main.h> #include <version_info.h> #ifdef HAVE_PLUGINS @@ -47,10 +49,6 @@ #include <wiretap/merge.h> -#ifdef _WIN32 -#include <wsutil/unicode-utils.h> -#endif /* _WIN32 */ - #include "ui/failure_message.h" /* @@ -229,7 +227,7 @@ merge_callback(merge_event event, int num, return FALSE; } -static int +int real_main(int argc, char *argv[]) { GString *comp_info_str; @@ -479,23 +477,6 @@ clean_exit: return (status == MERGE_OK) ? 0 : 2; } -#ifdef _WIN32 -int -wmain(int argc, wchar_t *wc_argv[]) -{ - char **argv; - - argv = arg_list_utf_16to8(argc, wc_argv); - return real_main(argc, argv); -} -#else -int -main(int argc, char *argv[]) -{ - return real_main(argc, argv); -} -#endif - /* * Editor modelines - http://www.wireshark.org/tools/modelines.html * |