Changeset 14337

Timestamp:

Sep 21, 2014, 6:06:28 PM (8 years ago)

Author:

jordan

Message:

(trunk) #4160: mike.dld patch: 4160-08-args.patch

Location:

trunk

Files:

• cli/cli.c (modified) (1 diff)
• daemon/daemon.c (modified) (1 diff)
• daemon/remote.c (modified) (1 diff)
• libtransmission/utils.c (modified) (2 diffs)
• libtransmission/utils.h (modified) (1 diff)
• qt/app.cc (modified) (1 diff)
• utils/create.c (modified) (1 diff)
• utils/edit.c (modified) (1 diff)
• utils/show.c (modified) (1 diff)

trunk/cli/cli.c

@@ -234 +234 @@
   const char  * str;
 
+#ifdef _WIN32
+  tr_win32_make_args_utf8 (&argc, &argv);
+#endif
+
   tr_formatter_mem_init (MEM_K, MEM_K_STR, MEM_M_STR, MEM_G_STR, MEM_T_STR);
   tr_formatter_size_init (DISK_K,DISK_K_STR, DISK_M_STR, DISK_G_STR, DISK_T_STR);

trunk/daemon/daemon.c

@@ -426 +426 @@
     struct event *status_ev;
 
+#ifdef _WIN32
+    tr_win32_make_args_utf8 (&argc, &argv);
+#endif
+
     key_pidfile = tr_quark_new ("pidfile",  7);
 

trunk/daemon/remote.c

@@ -2407 +2407 @@
     int exit_status = EXIT_SUCCESS;
 
+#ifdef _WIN32
+    tr_win32_make_args_utf8 (&argc, &argv);
+#endif
+
     if (argc < 2) {
         showUsage ();

trunk/libtransmission/utils.c

@@ -42 +42 @@
  #define WINVER WindowsXP /* freeaddrinfo (), getaddrinfo (), getnameinfo () */
  #include <windows.h> /* Sleep (), GetSystemTimeAsFileTime (), GetEnvironmentVariable () */
+ #include <shellapi.h> /* CommandLineToArgv () */
 #endif
 
@@ -1216 +1217 @@
 
   return text;
+}
+
+void
+tr_win32_make_args_utf8 (int    * argc,
+                         char *** argv)
+{
+  int my_argc, i;
+  char ** my_argv;
+  wchar_t ** my_wide_argv;
+
+  my_wide_argv = CommandLineToArgvW (GetCommandLineW (), &my_argc);
+  if (my_wide_argv == NULL)
+    return;
+
+  assert (*argc == my_argc);
+
+  my_argv = tr_new (char *, my_argc + 1);
+
+  for (i = 0; i < my_argc; ++i)
+    {
+      my_argv[i] = tr_win32_native_to_utf8 (my_wide_argv[i], -1);
+      if (my_argv[i] == NULL)
+        break;
+    }
+
+  if (i < my_argc)
+    {
+      int j;
+
+      for (j = 0; j < i; ++j)
+        {
+          tr_free (my_argv[j]);
+        }
+
+      tr_free (my_argv);
+    }
+  else
+    {
+      my_argv[my_argc] = NULL;
+
+      *argc = my_argc;
+      *argv = my_argv;
+
+      /* TODO: Add atexit handler to cleanup? */
+    }
+
+  LocalFree (my_wide_argv);
 }
 

trunk/libtransmission/utils.h

@@ -191 +191 @@
 char    * tr_win32_format_message    (uint32_t        code);
 
+void      tr_win32_make_args_utf8    (int    * argc,
+                                      char *** argv);
+
 #endif
 

trunk/qt/app.cc

@@ -494 +494 @@
   QStringList addme;
   const char * optarg;
-  char ** argvv = argv;
+  char ** argvv;
+
+#ifdef _WIN32
+  tr_win32_make_args_utf8 (&argc, &argv);
+#endif
+
+  argvv = argv;
   while ( (c = tr_getopt (getUsage (), argc, (const char **)argvv, opts, &optarg)))
     if (c == TR_OPT_UNK)

trunk/utils/create.c

@@ -132 +132 @@
   tr_metainfo_builder * b = NULL;
 
+#ifdef _WIN32
+  tr_win32_make_args_utf8 (&argc, &argv);
+#endif
+
   tr_logSetLevel (TR_LOG_ERROR);
   tr_formatter_mem_init (MEM_K, MEM_K_STR, MEM_M_STR, MEM_G_STR, MEM_T_STR);

trunk/utils/edit.c

@@ -291 +291 @@
   int changedCount = 0;
 
+#ifdef _WIN32
+  tr_win32_make_args_utf8 (&argc, &argv);
+#endif
+
   files = tr_new0 (const char*, argc);
 

trunk/utils/show.c

@@ -290 +290 @@
   tr_ctor * ctor;
 
+#ifdef _WIN32
+  tr_win32_make_args_utf8 (&argc, &argv);
+#endif
+
   tr_logSetLevel (TR_LOG_ERROR);
   tr_formatter_mem_init (MEM_K, MEM_K_STR, MEM_M_STR, MEM_G_STR, MEM_T_STR);