Move the Windows argument list conversion code to a common routine.

svn path=/trunk/; revision=37372

1 files changed, 16 insertions, 0 deletions

diff --git a/wsutil/unicode-utils.c b/wsutil/unicode-utils.c
index 80541a5784..567ef180ca 100644
--- a/wsutil/unicode-utils.c
+++ b/wsutil/unicode-utils.c
@@ -28,6 +28,8 @@
 
 #include "unicode-utils.h"
 
+#include <shellapi.h>
+
 /** @file
  * Unicode utilities (internal interface)
  *
@@ -141,3 +143,17 @@ utf_16to8(const wchar_t *utf16str)
   return utf8buf[idx];
 }
 
+/* Convert our argument list from UTF-16 to UTF-8. */
+void
+arg_list_utf_16to8(int argc, char *argv[]) {
+  LPWSTR              *wc_argv;
+  int                  wc_argc, i;
+
+  /* Convert our arg list to UTF-8. */
+  wc_argv = CommandLineToArgvW(GetCommandLineW(), &wc_argc);
+  if (wc_argv && wc_argc == argc) {
+    for (i = 0; i < argc; i++) {
+      argv[i] = g_utf16_to_utf8(wc_argv[i], -1, NULL, NULL, NULL);
+    }
+  } /* XXX else bail because something is horribly, horribly wrong? */
+}