summaryrefslogtreecommitdiffstats
path: root/main.c
diff options
context:
space:
mode:
authorNicolas Williams <nico@cryptonector.com>2015-06-19 17:10:45 -0500
committerNicolas Williams <nico@cryptonector.com>2015-06-19 18:54:44 -0500
commit7811ef1e1746f0963deb960af2c9623fb53c24a5 (patch)
tree1f8d7c7e70ed278e18e801a65f84261b3b811191 /main.c
parentb04cd6aadaa8b8327654969392a5d094f3995f6d (diff)
Fix #811: use CommandLineToArgvW() and _wfopen()
Diffstat (limited to 'main.c')
-rw-r--r--main.c23
1 files changed, 23 insertions, 0 deletions
diff --git a/main.c b/main.c
index ceb2360a..a888c306 100644
--- a/main.c
+++ b/main.c
@@ -6,6 +6,15 @@
#include <stdio.h>
#include <string.h>
#include <unistd.h>
+
+#ifdef WIN32
+#include <windows.h>
+#include <processenv.h>
+#include <shellapi.h>
+#include <wchar.h>
+#include <wtypes.h>
+#endif
+
#include "compile.h"
#include "jv.h"
#include "jq.h"
@@ -165,6 +174,20 @@ int main(int argc, char* argv[]) {
int badwrite;
jv program_arguments = jv_array();
+#ifdef WIN32
+ int wargc;
+ wchar_t **wargv = CommandLineToArgvW(GetCommandLineW(), &wargc);
+ assert(wargc == argc);
+ size_t arg_sz;
+ for (int i = 0; i < argc; i++) {
+ argv[i] = alloca((arg_sz = WideCharToMultiByte(CP_UTF8,
+ 0,
+ wargv[i],
+ -1, 0, 0, 0, 0)));
+ WideCharToMultiByte(CP_UTF8, 0, wargv[i], -1, argv[i], arg_sz, 0, 0);
+ }
+#endif
+
if (argc) progname = argv[0];
jq = jq_init();