Changeset 14337
- Timestamp:
- Sep 21, 2014, 6:06:28 PM (8 years ago)
- Location:
- trunk
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/cli/cli.c
r14331 r14337 234 234 const char * str; 235 235 236 #ifdef _WIN32 237 tr_win32_make_args_utf8 (&argc, &argv); 238 #endif 239 236 240 tr_formatter_mem_init (MEM_K, MEM_K_STR, MEM_M_STR, MEM_G_STR, MEM_T_STR); 237 241 tr_formatter_size_init (DISK_K,DISK_K_STR, DISK_M_STR, DISK_G_STR, DISK_T_STR); -
trunk/daemon/daemon.c
r14335 r14337 426 426 struct event *status_ev; 427 427 428 #ifdef _WIN32 429 tr_win32_make_args_utf8 (&argc, &argv); 430 #endif 431 428 432 key_pidfile = tr_quark_new ("pidfile", 7); 429 433 -
trunk/daemon/remote.c
r14336 r14337 2407 2407 int exit_status = EXIT_SUCCESS; 2408 2408 2409 #ifdef _WIN32 2410 tr_win32_make_args_utf8 (&argc, &argv); 2411 #endif 2412 2409 2413 if (argc < 2) { 2410 2414 showUsage (); -
trunk/libtransmission/utils.c
r14336 r14337 42 42 #define WINVER WindowsXP /* freeaddrinfo (), getaddrinfo (), getnameinfo () */ 43 43 #include <windows.h> /* Sleep (), GetSystemTimeAsFileTime (), GetEnvironmentVariable () */ 44 #include <shellapi.h> /* CommandLineToArgv () */ 44 45 #endif 45 46 … … 1216 1217 1217 1218 return text; 1219 } 1220 1221 void 1222 tr_win32_make_args_utf8 (int * argc, 1223 char *** argv) 1224 { 1225 int my_argc, i; 1226 char ** my_argv; 1227 wchar_t ** my_wide_argv; 1228 1229 my_wide_argv = CommandLineToArgvW (GetCommandLineW (), &my_argc); 1230 if (my_wide_argv == NULL) 1231 return; 1232 1233 assert (*argc == my_argc); 1234 1235 my_argv = tr_new (char *, my_argc + 1); 1236 1237 for (i = 0; i < my_argc; ++i) 1238 { 1239 my_argv[i] = tr_win32_native_to_utf8 (my_wide_argv[i], -1); 1240 if (my_argv[i] == NULL) 1241 break; 1242 } 1243 1244 if (i < my_argc) 1245 { 1246 int j; 1247 1248 for (j = 0; j < i; ++j) 1249 { 1250 tr_free (my_argv[j]); 1251 } 1252 1253 tr_free (my_argv); 1254 } 1255 else 1256 { 1257 my_argv[my_argc] = NULL; 1258 1259 *argc = my_argc; 1260 *argv = my_argv; 1261 1262 /* TODO: Add atexit handler to cleanup? */ 1263 } 1264 1265 LocalFree (my_wide_argv); 1218 1266 } 1219 1267 -
trunk/libtransmission/utils.h
r14336 r14337 191 191 char * tr_win32_format_message (uint32_t code); 192 192 193 void tr_win32_make_args_utf8 (int * argc, 194 char *** argv); 195 193 196 #endif 194 197 -
trunk/qt/app.cc
r14272 r14337 494 494 QStringList addme; 495 495 const char * optarg; 496 char ** argvv = argv; 496 char ** argvv; 497 498 #ifdef _WIN32 499 tr_win32_make_args_utf8 (&argc, &argv); 500 #endif 501 502 argvv = argv; 497 503 while ( (c = tr_getopt (getUsage (), argc, (const char **)argvv, opts, &optarg))) 498 504 if (c == TR_OPT_UNK) -
trunk/utils/create.c
r14331 r14337 132 132 tr_metainfo_builder * b = NULL; 133 133 134 #ifdef _WIN32 135 tr_win32_make_args_utf8 (&argc, &argv); 136 #endif 137 134 138 tr_logSetLevel (TR_LOG_ERROR); 135 139 tr_formatter_mem_init (MEM_K, MEM_K_STR, MEM_M_STR, MEM_G_STR, MEM_T_STR); -
trunk/utils/edit.c
r14241 r14337 291 291 int changedCount = 0; 292 292 293 #ifdef _WIN32 294 tr_win32_make_args_utf8 (&argc, &argv); 295 #endif 296 293 297 files = tr_new0 (const char*, argc); 294 298 -
trunk/utils/show.c
r14336 r14337 290 290 tr_ctor * ctor; 291 291 292 #ifdef _WIN32 293 tr_win32_make_args_utf8 (&argc, &argv); 294 #endif 295 292 296 tr_logSetLevel (TR_LOG_ERROR); 293 297 tr_formatter_mem_init (MEM_K, MEM_K_STR, MEM_M_STR, MEM_G_STR, MEM_T_STR);
Note: See TracChangeset
for help on using the changeset viewer.