Fossil SCM
Fix the "ui"/"server" command for win32 so that it works even if run from cygwin in a directory that contains a space in its name.
Commit
7343126617842a3b677085b2de78901978147460
Parent
bbd758ecc30352d…
1 file changed
+3
-3
+3
-3
| --- src/winhttp.c | ||
| +++ src/winhttp.c | ||
| @@ -109,15 +109,15 @@ | ||
| 109 | 109 | } |
| 110 | 110 | wanted -= got; |
| 111 | 111 | } |
| 112 | 112 | fclose(out); |
| 113 | 113 | out = 0; |
| 114 | - sprintf(zCmd, "%s http \"%s\" %s %s %s", | |
| 114 | + sprintf(zCmd, "\"%s\" http \"%s\" %s %s %s", | |
| 115 | 115 | g.argv[0], g.zRepositoryName, zRequestFName, zReplyFName, |
| 116 | 116 | inet_ntoa(p->addr.sin_addr) |
| 117 | 117 | ); |
| 118 | - system(zCmd); | |
| 118 | + portable_system(zCmd); | |
| 119 | 119 | in = fopen(zReplyFName, "rb"); |
| 120 | 120 | if( in ){ |
| 121 | 121 | while( (got = fread(zHdr, 1, sizeof(zHdr), in))>0 ){ |
| 122 | 122 | send(p->s, zHdr, got, 0); |
| 123 | 123 | } |
| @@ -177,11 +177,11 @@ | ||
| 177 | 177 | zTempPrefix = mprintf("fossil_server_P%d_", iPort); |
| 178 | 178 | printf("Listening for HTTP requests on TCP port %d\n", iPort); |
| 179 | 179 | if( zBrowser ){ |
| 180 | 180 | zBrowser = mprintf(zBrowser, iPort); |
| 181 | 181 | printf("Launch webbrowser: %s\n", zBrowser); |
| 182 | - system(zBrowser); | |
| 182 | + portable_system(zBrowser); | |
| 183 | 183 | } |
| 184 | 184 | printf("Type Ctrl-C to stop the HTTP server\n"); |
| 185 | 185 | for(;;){ |
| 186 | 186 | SOCKET client; |
| 187 | 187 | SOCKADDR_IN client_addr; |
| 188 | 188 |
| --- src/winhttp.c | |
| +++ src/winhttp.c | |
| @@ -109,15 +109,15 @@ | |
| 109 | } |
| 110 | wanted -= got; |
| 111 | } |
| 112 | fclose(out); |
| 113 | out = 0; |
| 114 | sprintf(zCmd, "%s http \"%s\" %s %s %s", |
| 115 | g.argv[0], g.zRepositoryName, zRequestFName, zReplyFName, |
| 116 | inet_ntoa(p->addr.sin_addr) |
| 117 | ); |
| 118 | system(zCmd); |
| 119 | in = fopen(zReplyFName, "rb"); |
| 120 | if( in ){ |
| 121 | while( (got = fread(zHdr, 1, sizeof(zHdr), in))>0 ){ |
| 122 | send(p->s, zHdr, got, 0); |
| 123 | } |
| @@ -177,11 +177,11 @@ | |
| 177 | zTempPrefix = mprintf("fossil_server_P%d_", iPort); |
| 178 | printf("Listening for HTTP requests on TCP port %d\n", iPort); |
| 179 | if( zBrowser ){ |
| 180 | zBrowser = mprintf(zBrowser, iPort); |
| 181 | printf("Launch webbrowser: %s\n", zBrowser); |
| 182 | system(zBrowser); |
| 183 | } |
| 184 | printf("Type Ctrl-C to stop the HTTP server\n"); |
| 185 | for(;;){ |
| 186 | SOCKET client; |
| 187 | SOCKADDR_IN client_addr; |
| 188 |
| --- src/winhttp.c | |
| +++ src/winhttp.c | |
| @@ -109,15 +109,15 @@ | |
| 109 | } |
| 110 | wanted -= got; |
| 111 | } |
| 112 | fclose(out); |
| 113 | out = 0; |
| 114 | sprintf(zCmd, "\"%s\" http \"%s\" %s %s %s", |
| 115 | g.argv[0], g.zRepositoryName, zRequestFName, zReplyFName, |
| 116 | inet_ntoa(p->addr.sin_addr) |
| 117 | ); |
| 118 | portable_system(zCmd); |
| 119 | in = fopen(zReplyFName, "rb"); |
| 120 | if( in ){ |
| 121 | while( (got = fread(zHdr, 1, sizeof(zHdr), in))>0 ){ |
| 122 | send(p->s, zHdr, got, 0); |
| 123 | } |
| @@ -177,11 +177,11 @@ | |
| 177 | zTempPrefix = mprintf("fossil_server_P%d_", iPort); |
| 178 | printf("Listening for HTTP requests on TCP port %d\n", iPort); |
| 179 | if( zBrowser ){ |
| 180 | zBrowser = mprintf(zBrowser, iPort); |
| 181 | printf("Launch webbrowser: %s\n", zBrowser); |
| 182 | portable_system(zBrowser); |
| 183 | } |
| 184 | printf("Type Ctrl-C to stop the HTTP server\n"); |
| 185 | for(;;){ |
| 186 | SOCKET client; |
| 187 | SOCKADDR_IN client_addr; |
| 188 |