Fossil SCM
merge trunk g.nameOfExe should have filename_to_utf translation as well on UNIX/OSX
Commit
bac4b248f50b31389302f409787c16b3116e26c5
Parent
b1036fe5bfafbac…
3 files changed
+1
-1
+1
-1
+1
-1
+1
-1
| --- src/main.c | ||
| +++ src/main.c | ||
| @@ -372,17 +372,17 @@ | ||
| 372 | 372 | WCHAR buf[MAX_PATH]; |
| 373 | 373 | #endif |
| 374 | 374 | |
| 375 | 375 | g.argc = argc; |
| 376 | 376 | g.argv = argv; |
| 377 | + for(i=0; i<g.argc; i++) g.argv[i] = fossil_filename_to_utf8(g.argv[i]); | |
| 377 | 378 | #if defined(_WIN32) |
| 378 | 379 | GetModuleFileNameW(NULL, buf, MAX_PATH); |
| 379 | 380 | g.nameOfExe = fossil_filename_to_utf8(buf); |
| 380 | 381 | #else |
| 381 | 382 | g.nameOfExe = g.argv[0]; |
| 382 | 383 | #endif |
| 383 | - for(i=0; i<g.argc; i++) g.argv[i] = fossil_filename_to_utf8(g.argv[i]); | |
| 384 | 384 | for(i=1; i<g.argc-1; i++){ |
| 385 | 385 | z = g.argv[i]; |
| 386 | 386 | if( z[0]!='-' ) continue; |
| 387 | 387 | z++; |
| 388 | 388 | if( z[0]=='-' ) z++; |
| 389 | 389 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -372,17 +372,17 @@ | |
| 372 | WCHAR buf[MAX_PATH]; |
| 373 | #endif |
| 374 | |
| 375 | g.argc = argc; |
| 376 | g.argv = argv; |
| 377 | #if defined(_WIN32) |
| 378 | GetModuleFileNameW(NULL, buf, MAX_PATH); |
| 379 | g.nameOfExe = fossil_filename_to_utf8(buf); |
| 380 | #else |
| 381 | g.nameOfExe = g.argv[0]; |
| 382 | #endif |
| 383 | for(i=0; i<g.argc; i++) g.argv[i] = fossil_filename_to_utf8(g.argv[i]); |
| 384 | for(i=1; i<g.argc-1; i++){ |
| 385 | z = g.argv[i]; |
| 386 | if( z[0]!='-' ) continue; |
| 387 | z++; |
| 388 | if( z[0]=='-' ) z++; |
| 389 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -372,17 +372,17 @@ | |
| 372 | WCHAR buf[MAX_PATH]; |
| 373 | #endif |
| 374 | |
| 375 | g.argc = argc; |
| 376 | g.argv = argv; |
| 377 | for(i=0; i<g.argc; i++) g.argv[i] = fossil_filename_to_utf8(g.argv[i]); |
| 378 | #if defined(_WIN32) |
| 379 | GetModuleFileNameW(NULL, buf, MAX_PATH); |
| 380 | g.nameOfExe = fossil_filename_to_utf8(buf); |
| 381 | #else |
| 382 | g.nameOfExe = g.argv[0]; |
| 383 | #endif |
| 384 | for(i=1; i<g.argc-1; i++){ |
| 385 | z = g.argv[i]; |
| 386 | if( z[0]!='-' ) continue; |
| 387 | z++; |
| 388 | if( z[0]=='-' ) z++; |
| 389 |
+1
-1
| --- src/main.c | ||
| +++ src/main.c | ||
| @@ -372,17 +372,17 @@ | ||
| 372 | 372 | WCHAR buf[MAX_PATH]; |
| 373 | 373 | #endif |
| 374 | 374 | |
| 375 | 375 | g.argc = argc; |
| 376 | 376 | g.argv = argv; |
| 377 | + for(i=0; i<g.argc; i++) g.argv[i] = fossil_filename_to_utf8(g.argv[i]); | |
| 377 | 378 | #if defined(_WIN32) |
| 378 | 379 | GetModuleFileNameW(NULL, buf, MAX_PATH); |
| 379 | 380 | g.nameOfExe = fossil_filename_to_utf8(buf); |
| 380 | 381 | #else |
| 381 | 382 | g.nameOfExe = g.argv[0]; |
| 382 | 383 | #endif |
| 383 | - for(i=0; i<g.argc; i++) g.argv[i] = fossil_filename_to_utf8(g.argv[i]); | |
| 384 | 384 | for(i=1; i<g.argc-1; i++){ |
| 385 | 385 | z = g.argv[i]; |
| 386 | 386 | if( z[0]!='-' ) continue; |
| 387 | 387 | z++; |
| 388 | 388 | if( z[0]=='-' ) z++; |
| 389 | 389 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -372,17 +372,17 @@ | |
| 372 | WCHAR buf[MAX_PATH]; |
| 373 | #endif |
| 374 | |
| 375 | g.argc = argc; |
| 376 | g.argv = argv; |
| 377 | #if defined(_WIN32) |
| 378 | GetModuleFileNameW(NULL, buf, MAX_PATH); |
| 379 | g.nameOfExe = fossil_filename_to_utf8(buf); |
| 380 | #else |
| 381 | g.nameOfExe = g.argv[0]; |
| 382 | #endif |
| 383 | for(i=0; i<g.argc; i++) g.argv[i] = fossil_filename_to_utf8(g.argv[i]); |
| 384 | for(i=1; i<g.argc-1; i++){ |
| 385 | z = g.argv[i]; |
| 386 | if( z[0]!='-' ) continue; |
| 387 | z++; |
| 388 | if( z[0]=='-' ) z++; |
| 389 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -372,17 +372,17 @@ | |
| 372 | WCHAR buf[MAX_PATH]; |
| 373 | #endif |
| 374 | |
| 375 | g.argc = argc; |
| 376 | g.argv = argv; |
| 377 | for(i=0; i<g.argc; i++) g.argv[i] = fossil_filename_to_utf8(g.argv[i]); |
| 378 | #if defined(_WIN32) |
| 379 | GetModuleFileNameW(NULL, buf, MAX_PATH); |
| 380 | g.nameOfExe = fossil_filename_to_utf8(buf); |
| 381 | #else |
| 382 | g.nameOfExe = g.argv[0]; |
| 383 | #endif |
| 384 | for(i=1; i<g.argc-1; i++){ |
| 385 | z = g.argv[i]; |
| 386 | if( z[0]!='-' ) continue; |
| 387 | z++; |
| 388 | if( z[0]=='-' ) z++; |
| 389 |
+1
-1
| --- test/cmdline.test | ||
| +++ test/cmdline.test | ||
| @@ -20,11 +20,11 @@ | ||
| 20 | 20 | |
| 21 | 21 | proc cmd-line {testname args} { |
| 22 | 22 | set i 1 |
| 23 | 23 | foreach {cmdline result} $args { |
| 24 | 24 | fossil test-echo $cmdline |
| 25 | - test cmd-line-$testname.$i {[lrange [split $::RESULT \n] 2 end]=="\{argv\[2\] = \[$result\]\}"} | |
| 25 | + test cmd-line-$testname.$i {[lrange [split $::RESULT \n] 3 end]=="\{argv\[2\] = \[$result\]\}"} | |
| 26 | 26 | incr i |
| 27 | 27 | } |
| 28 | 28 | } |
| 29 | 29 | cmd-line 100 abc abc a\"bc a\"bc \"abc\" \"abc\" |
| 30 | 30 | cmd-line 101 * * *.* *.* |
| 31 | 31 |
| --- test/cmdline.test | |
| +++ test/cmdline.test | |
| @@ -20,11 +20,11 @@ | |
| 20 | |
| 21 | proc cmd-line {testname args} { |
| 22 | set i 1 |
| 23 | foreach {cmdline result} $args { |
| 24 | fossil test-echo $cmdline |
| 25 | test cmd-line-$testname.$i {[lrange [split $::RESULT \n] 2 end]=="\{argv\[2\] = \[$result\]\}"} |
| 26 | incr i |
| 27 | } |
| 28 | } |
| 29 | cmd-line 100 abc abc a\"bc a\"bc \"abc\" \"abc\" |
| 30 | cmd-line 101 * * *.* *.* |
| 31 |
| --- test/cmdline.test | |
| +++ test/cmdline.test | |
| @@ -20,11 +20,11 @@ | |
| 20 | |
| 21 | proc cmd-line {testname args} { |
| 22 | set i 1 |
| 23 | foreach {cmdline result} $args { |
| 24 | fossil test-echo $cmdline |
| 25 | test cmd-line-$testname.$i {[lrange [split $::RESULT \n] 3 end]=="\{argv\[2\] = \[$result\]\}"} |
| 26 | incr i |
| 27 | } |
| 28 | } |
| 29 | cmd-line 100 abc abc a\"bc a\"bc \"abc\" \"abc\" |
| 30 | cmd-line 101 * * *.* *.* |
| 31 |