Fossil SCM
Actually get the "file:" transport working this time.
Commit
a742cfa29254d810f9119a065e391d4b74fb1b93
Parent
ece2c766a26a708…
1 file changed
+3
-3
+3
-3
| --- src/http_transport.c | ||
| +++ src/http_transport.c | ||
| @@ -104,12 +104,12 @@ | ||
| 104 | 104 | if( transport.pFile ){ |
| 105 | 105 | fclose(transport.pFile); |
| 106 | 106 | transport.pFile = 0; |
| 107 | 107 | } |
| 108 | 108 | unlink(transport.zInFile); |
| 109 | - free(transport.zInFile); | |
| 110 | 109 | unlink(transport.zOutFile); |
| 110 | + free(transport.zInFile); | |
| 111 | 111 | free(transport.zOutFile); |
| 112 | 112 | }else{ |
| 113 | 113 | socket_close(); |
| 114 | 114 | } |
| 115 | 115 | transport.isOpen = 0; |
| @@ -143,11 +143,11 @@ | ||
| 143 | 143 | void transport_flip(void){ |
| 144 | 144 | if( g.urlIsFile ){ |
| 145 | 145 | char *zCmd; |
| 146 | 146 | fclose(transport.pFile); |
| 147 | 147 | zCmd = mprintf("\"%s\" http \"%s\" \"%s\" \"%s\" 127.0.0.1", |
| 148 | - g.argv[0], g.zRepositoryName, transport.zOutFile, transport.zInFile | |
| 148 | + g.argv[0], g.urlName, transport.zOutFile, transport.zInFile | |
| 149 | 149 | ); |
| 150 | 150 | system(zCmd); |
| 151 | 151 | free(zCmd); |
| 152 | 152 | transport.pFile = fopen(transport.zInFile, "rb"); |
| 153 | 153 | } |
| @@ -189,11 +189,11 @@ | ||
| 189 | 189 | int got; |
| 190 | 190 | if( g.urlIsHttps ){ |
| 191 | 191 | /* TBD */ |
| 192 | 192 | got = 0; |
| 193 | 193 | }else if( g.urlIsFile ){ |
| 194 | - got = fread(zBuf, 0, N, transport.pFile); | |
| 194 | + got = fread(zBuf, 1, N, transport.pFile); | |
| 195 | 195 | }else{ |
| 196 | 196 | got = socket_receive(0, zBuf, N); |
| 197 | 197 | } |
| 198 | 198 | if( got>0 ){ |
| 199 | 199 | nByte += got; |
| 200 | 200 |
| --- src/http_transport.c | |
| +++ src/http_transport.c | |
| @@ -104,12 +104,12 @@ | |
| 104 | if( transport.pFile ){ |
| 105 | fclose(transport.pFile); |
| 106 | transport.pFile = 0; |
| 107 | } |
| 108 | unlink(transport.zInFile); |
| 109 | free(transport.zInFile); |
| 110 | unlink(transport.zOutFile); |
| 111 | free(transport.zOutFile); |
| 112 | }else{ |
| 113 | socket_close(); |
| 114 | } |
| 115 | transport.isOpen = 0; |
| @@ -143,11 +143,11 @@ | |
| 143 | void transport_flip(void){ |
| 144 | if( g.urlIsFile ){ |
| 145 | char *zCmd; |
| 146 | fclose(transport.pFile); |
| 147 | zCmd = mprintf("\"%s\" http \"%s\" \"%s\" \"%s\" 127.0.0.1", |
| 148 | g.argv[0], g.zRepositoryName, transport.zOutFile, transport.zInFile |
| 149 | ); |
| 150 | system(zCmd); |
| 151 | free(zCmd); |
| 152 | transport.pFile = fopen(transport.zInFile, "rb"); |
| 153 | } |
| @@ -189,11 +189,11 @@ | |
| 189 | int got; |
| 190 | if( g.urlIsHttps ){ |
| 191 | /* TBD */ |
| 192 | got = 0; |
| 193 | }else if( g.urlIsFile ){ |
| 194 | got = fread(zBuf, 0, N, transport.pFile); |
| 195 | }else{ |
| 196 | got = socket_receive(0, zBuf, N); |
| 197 | } |
| 198 | if( got>0 ){ |
| 199 | nByte += got; |
| 200 |
| --- src/http_transport.c | |
| +++ src/http_transport.c | |
| @@ -104,12 +104,12 @@ | |
| 104 | if( transport.pFile ){ |
| 105 | fclose(transport.pFile); |
| 106 | transport.pFile = 0; |
| 107 | } |
| 108 | unlink(transport.zInFile); |
| 109 | unlink(transport.zOutFile); |
| 110 | free(transport.zInFile); |
| 111 | free(transport.zOutFile); |
| 112 | }else{ |
| 113 | socket_close(); |
| 114 | } |
| 115 | transport.isOpen = 0; |
| @@ -143,11 +143,11 @@ | |
| 143 | void transport_flip(void){ |
| 144 | if( g.urlIsFile ){ |
| 145 | char *zCmd; |
| 146 | fclose(transport.pFile); |
| 147 | zCmd = mprintf("\"%s\" http \"%s\" \"%s\" \"%s\" 127.0.0.1", |
| 148 | g.argv[0], g.urlName, transport.zOutFile, transport.zInFile |
| 149 | ); |
| 150 | system(zCmd); |
| 151 | free(zCmd); |
| 152 | transport.pFile = fopen(transport.zInFile, "rb"); |
| 153 | } |
| @@ -189,11 +189,11 @@ | |
| 189 | int got; |
| 190 | if( g.urlIsHttps ){ |
| 191 | /* TBD */ |
| 192 | got = 0; |
| 193 | }else if( g.urlIsFile ){ |
| 194 | got = fread(zBuf, 1, N, transport.pFile); |
| 195 | }else{ |
| 196 | got = socket_receive(0, zBuf, N); |
| 197 | } |
| 198 | if( got>0 ){ |
| 199 | nByte += got; |
| 200 |