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>

1 files changed, 2 insertions, 22 deletions

diff --git a/text2pcap.c b/text2pcap.c
index 0eaf1588f1..5ac0e9c7a3 100644
--- a/text2pcap.c
+++ b/text2pcap.c
@@ -101,6 +101,7 @@
 #include <string.h>
 #include <wsutil/file_util.h>
 #include <wsutil/crash_info.h>
+#include <cli_main.h>
 #include <version_info.h>
 #include <wsutil/inet_addr.h>
 
@@ -132,10 +133,6 @@
 
 #include "wiretap/wtap.h"
 
-#ifdef _WIN32
-#include <wsutil/unicode-utils.h>
-#endif /* _WIN32 */
-
 /*--- Options --------------------------------------------------------------------*/
 
 /* File format */
@@ -1874,7 +1871,7 @@ parse_options (int argc, char *argv[])
     return EXIT_SUCCESS;
 }
 
-static int
+int
 real_main(int argc, char *argv[])
 {
     int ret = EXIT_SUCCESS;
@@ -1946,23 +1943,6 @@ clean_exit:
     return ret;
 }
 
-#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
  *