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 /cli_main.h | |
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 'cli_main.h')
-rw-r--r-- | cli_main.h | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/cli_main.h b/cli_main.h new file mode 100644 index 0000000000..fc947b4ce3 --- /dev/null +++ b/cli_main.h @@ -0,0 +1,19 @@ +/* + * Declaration of the real main routine, for all CLI programs where the + * main routine should get UTF-8 arguments on Windows. In those programs, + * in the file that defines the main routine, include this header and define + * the main routine as real_main() rather than main(), and build those + * programs with cli_main.c and link with the object file. + * + * This is used in software licensed under the GPLv2, and its license MUST + * be compatible with that license. + * + * This is used in software licensed under the Apache 2.0 license, and its + * license MUST be compatible with that license. + * + * For that purpose, we use the MIT (X11) license. + * + * SPDX-License-Identifier: MIT + */ + +extern int real_main(int argc, char *argv[]); |