Fossil SCM
Another unversioned file sync fix.
Commit
a6b66652d1ce91ce4dcf8d60467a1ee5e3584016
Parent
5d913409b70a013…
1 file changed
+2
-2
+2
-2
| --- src/xfer.c | ||
| +++ src/xfer.c | ||
| @@ -320,11 +320,11 @@ | ||
| 320 | 320 | |
| 321 | 321 | pHash = &pXfer->aToken[3]; |
| 322 | 322 | if( pXfer->nToken==5 |
| 323 | 323 | || !blob_is_filename(&pXfer->aToken[1]) |
| 324 | 324 | || !blob_is_int64(&pXfer->aToken[2], &mtime) |
| 325 | - || (blob_eq(pHash,"-")!=0 && !blob_is_uuid(pHash)) | |
| 325 | + || (!blob_eq(pHash,"-") && !blob_is_uuid(pHash)) | |
| 326 | 326 | || !blob_is_int(&pXfer->aToken[4], &sz) |
| 327 | 327 | || !blob_is_int(&pXfer->aToken[5], &flags) |
| 328 | 328 | ){ |
| 329 | 329 | blob_appendf(&pXfer->err, "malformed uvfile line"); |
| 330 | 330 | return; |
| @@ -2026,11 +2026,11 @@ | ||
| 2026 | 2026 | if( xfer.nToken==5 |
| 2027 | 2027 | && blob_eq(&xfer.aToken[0], "uvigot") |
| 2028 | 2028 | && blob_is_filename(&xfer.aToken[1]) |
| 2029 | 2029 | && blob_is_int64(&xfer.aToken[2], &mtime) |
| 2030 | 2030 | && blob_is_int(&xfer.aToken[4], &size) |
| 2031 | - && (blob_eq(&xfer.aToken[3],"-")==0 || blob_is_uuid(&xfer.aToken[3])) | |
| 2031 | + && (blob_eq(&xfer.aToken[3],"-") || blob_is_uuid(&xfer.aToken[3])) | |
| 2032 | 2032 | ){ |
| 2033 | 2033 | const char *zName = blob_str(&xfer.aToken[1]); |
| 2034 | 2034 | const char *zHash = blob_str(&xfer.aToken[3]); |
| 2035 | 2035 | int iStatus; |
| 2036 | 2036 | if( uvStatus==0 ) uvStatus = 2; |
| 2037 | 2037 |
| --- src/xfer.c | |
| +++ src/xfer.c | |
| @@ -320,11 +320,11 @@ | |
| 320 | |
| 321 | pHash = &pXfer->aToken[3]; |
| 322 | if( pXfer->nToken==5 |
| 323 | || !blob_is_filename(&pXfer->aToken[1]) |
| 324 | || !blob_is_int64(&pXfer->aToken[2], &mtime) |
| 325 | || (blob_eq(pHash,"-")!=0 && !blob_is_uuid(pHash)) |
| 326 | || !blob_is_int(&pXfer->aToken[4], &sz) |
| 327 | || !blob_is_int(&pXfer->aToken[5], &flags) |
| 328 | ){ |
| 329 | blob_appendf(&pXfer->err, "malformed uvfile line"); |
| 330 | return; |
| @@ -2026,11 +2026,11 @@ | |
| 2026 | if( xfer.nToken==5 |
| 2027 | && blob_eq(&xfer.aToken[0], "uvigot") |
| 2028 | && blob_is_filename(&xfer.aToken[1]) |
| 2029 | && blob_is_int64(&xfer.aToken[2], &mtime) |
| 2030 | && blob_is_int(&xfer.aToken[4], &size) |
| 2031 | && (blob_eq(&xfer.aToken[3],"-")==0 || blob_is_uuid(&xfer.aToken[3])) |
| 2032 | ){ |
| 2033 | const char *zName = blob_str(&xfer.aToken[1]); |
| 2034 | const char *zHash = blob_str(&xfer.aToken[3]); |
| 2035 | int iStatus; |
| 2036 | if( uvStatus==0 ) uvStatus = 2; |
| 2037 |
| --- src/xfer.c | |
| +++ src/xfer.c | |
| @@ -320,11 +320,11 @@ | |
| 320 | |
| 321 | pHash = &pXfer->aToken[3]; |
| 322 | if( pXfer->nToken==5 |
| 323 | || !blob_is_filename(&pXfer->aToken[1]) |
| 324 | || !blob_is_int64(&pXfer->aToken[2], &mtime) |
| 325 | || (!blob_eq(pHash,"-") && !blob_is_uuid(pHash)) |
| 326 | || !blob_is_int(&pXfer->aToken[4], &sz) |
| 327 | || !blob_is_int(&pXfer->aToken[5], &flags) |
| 328 | ){ |
| 329 | blob_appendf(&pXfer->err, "malformed uvfile line"); |
| 330 | return; |
| @@ -2026,11 +2026,11 @@ | |
| 2026 | if( xfer.nToken==5 |
| 2027 | && blob_eq(&xfer.aToken[0], "uvigot") |
| 2028 | && blob_is_filename(&xfer.aToken[1]) |
| 2029 | && blob_is_int64(&xfer.aToken[2], &mtime) |
| 2030 | && blob_is_int(&xfer.aToken[4], &size) |
| 2031 | && (blob_eq(&xfer.aToken[3],"-") || blob_is_uuid(&xfer.aToken[3])) |
| 2032 | ){ |
| 2033 | const char *zName = blob_str(&xfer.aToken[1]); |
| 2034 | const char *zHash = blob_str(&xfer.aToken[3]); |
| 2035 | int iStatus; |
| 2036 | if( uvStatus==0 ) uvStatus = 2; |
| 2037 |