diff options
Diffstat (limited to 'mergecap.c')
| -rw-r--r-- | mergecap.c | 27 |
1 files changed, 22 insertions, 5 deletions
diff --git a/mergecap.c b/mergecap.c index bc55d63bc9..516ab714da 100644 --- a/mergecap.c +++ b/mergecap.c @@ -225,9 +225,8 @@ merge_callback(merge_event event, int num, return FALSE; } - -int -main(int argc, char *argv[]) +static int +real_main(int argc, char *argv[]) { GString *comp_info_str; GString *runtime_info_str; @@ -259,7 +258,6 @@ main(int argc, char *argv[]) cmdarg_err_init(mergecap_cmdarg_err, mergecap_cmdarg_err_cont); #ifdef _WIN32 - arg_list_utf_16to8(argc, argv); create_app_running_mutex(); #endif /* _WIN32 */ @@ -473,6 +471,26 @@ clean_exit: return (status == MERGE_OK) ? 0 : 2; } +#ifdef _WIN32 +int +wmain(int argc, wchar_t *argv[]) +{ + char **argv_utf8; + + /* Convert our arg list from UTF-16LE to UTF-8. */ + argv_utf8 = g_malloc(argc * sizeof *argv_utf8); + for (int i = 0; i < argc; i++) + argv_utf8[i] = g_utf16_to_utf8(argv[i], -1, NULL, NULL, NULL); + return real_main(argc, argv_utf8); +} +#else +int +main(int argc, char *argv[]) +{ + return real_main(argc, argv); +} +#endif + /* * Editor modelines - http://www.wireshark.org/tools/modelines.html * @@ -485,4 +503,3 @@ clean_exit: * vi: set shiftwidth=2 tabstop=8 expandtab: * :indentSize=2:tabSize=8:noTabs=true: */ - |