Fossil SCM
Attempt to fix quoting issues with the browser launch command on windows.
Commit
c72c6df46527511b8d05542dc5f860db2b6419b7f93eb0bd13ab745ff857a8ba
Parent
afaffb66dff5565…
2 files changed
+1
-1
+3
+1
-1
| --- src/diffcmd.c | ||
| +++ src/diffcmd.c | ||
| @@ -322,11 +322,11 @@ | ||
| 322 | 322 | fossil_print("<script>\n%s</script>\n", zJs); |
| 323 | 323 | } |
| 324 | 324 | fossil_print("%s", zWebpageEnd); |
| 325 | 325 | } |
| 326 | 326 | if( (diffFlags & DIFF_BROWSER)!=0 && nErr==0 ){ |
| 327 | - char *zCmd = mprintf("%$ %$", fossil_web_browser(), tempDiffFilename); | |
| 327 | + char *zCmd = mprintf("%s %$", fossil_web_browser(), tempDiffFilename); | |
| 328 | 328 | fclose(diffOut); |
| 329 | 329 | diffOut = freopen(NULL_DEVICE, "wb", stdout); |
| 330 | 330 | fossil_system(zCmd); |
| 331 | 331 | fossil_free(zCmd); |
| 332 | 332 | diffOut = 0; |
| 333 | 333 |
| --- src/diffcmd.c | |
| +++ src/diffcmd.c | |
| @@ -322,11 +322,11 @@ | |
| 322 | fossil_print("<script>\n%s</script>\n", zJs); |
| 323 | } |
| 324 | fossil_print("%s", zWebpageEnd); |
| 325 | } |
| 326 | if( (diffFlags & DIFF_BROWSER)!=0 && nErr==0 ){ |
| 327 | char *zCmd = mprintf("%$ %$", fossil_web_browser(), tempDiffFilename); |
| 328 | fclose(diffOut); |
| 329 | diffOut = freopen(NULL_DEVICE, "wb", stdout); |
| 330 | fossil_system(zCmd); |
| 331 | fossil_free(zCmd); |
| 332 | diffOut = 0; |
| 333 |
| --- src/diffcmd.c | |
| +++ src/diffcmd.c | |
| @@ -322,11 +322,11 @@ | |
| 322 | fossil_print("<script>\n%s</script>\n", zJs); |
| 323 | } |
| 324 | fossil_print("%s", zWebpageEnd); |
| 325 | } |
| 326 | if( (diffFlags & DIFF_BROWSER)!=0 && nErr==0 ){ |
| 327 | char *zCmd = mprintf("%s %$", fossil_web_browser(), tempDiffFilename); |
| 328 | fclose(diffOut); |
| 329 | diffOut = freopen(NULL_DEVICE, "wb", stdout); |
| 330 | fossil_system(zCmd); |
| 331 | fossil_free(zCmd); |
| 332 | diffOut = 0; |
| 333 |
+3
| --- src/main.c | ||
| +++ src/main.c | ||
| @@ -3073,10 +3073,13 @@ | ||
| 3073 | 3073 | zBrowserArg = mprintf("http://[%s]:%%d/%s", zIpAddr, zInitPage); |
| 3074 | 3074 | }else{ |
| 3075 | 3075 | zBrowserArg = mprintf("http://%s:%%d/%s", zIpAddr, zInitPage); |
| 3076 | 3076 | } |
| 3077 | 3077 | #ifdef _WIN32 |
| 3078 | + /* The "start" command on windows does not allow a URL to be quoted. | |
| 3079 | + ** So we have to depend on the fact that the URL is contructed in such | |
| 3080 | + ** a way that no quoting is needed. */ | |
| 3078 | 3081 | zBrowserCmd = mprintf("%s %s &", zBrowser, zBrowserArg); |
| 3079 | 3082 | #else |
| 3080 | 3083 | zBrowserCmd = mprintf("%s %!$ &", zBrowser, zBrowserArg); |
| 3081 | 3084 | #endif |
| 3082 | 3085 | fossil_free(zBrowserArg); |
| 3083 | 3086 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -3073,10 +3073,13 @@ | |
| 3073 | zBrowserArg = mprintf("http://[%s]:%%d/%s", zIpAddr, zInitPage); |
| 3074 | }else{ |
| 3075 | zBrowserArg = mprintf("http://%s:%%d/%s", zIpAddr, zInitPage); |
| 3076 | } |
| 3077 | #ifdef _WIN32 |
| 3078 | zBrowserCmd = mprintf("%s %s &", zBrowser, zBrowserArg); |
| 3079 | #else |
| 3080 | zBrowserCmd = mprintf("%s %!$ &", zBrowser, zBrowserArg); |
| 3081 | #endif |
| 3082 | fossil_free(zBrowserArg); |
| 3083 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -3073,10 +3073,13 @@ | |
| 3073 | zBrowserArg = mprintf("http://[%s]:%%d/%s", zIpAddr, zInitPage); |
| 3074 | }else{ |
| 3075 | zBrowserArg = mprintf("http://%s:%%d/%s", zIpAddr, zInitPage); |
| 3076 | } |
| 3077 | #ifdef _WIN32 |
| 3078 | /* The "start" command on windows does not allow a URL to be quoted. |
| 3079 | ** So we have to depend on the fact that the URL is contructed in such |
| 3080 | ** a way that no quoting is needed. */ |
| 3081 | zBrowserCmd = mprintf("%s %s &", zBrowser, zBrowserArg); |
| 3082 | #else |
| 3083 | zBrowserCmd = mprintf("%s %!$ &", zBrowser, zBrowserArg); |
| 3084 | #endif |
| 3085 | fossil_free(zBrowserArg); |
| 3086 |