Fossil SCM
merge trunk <p>Fix continuation-byte check for UTF-8 chars > 2 bytes.
Commit
3920fa67bdae08fe6873ef84aac04128881968b1
Parent
4d6ae5c0072ea8a…
3 files changed
+10
+1
-1
+1
-1
+10
| --- src/add.c | ||
| +++ src/add.c | ||
| @@ -500,10 +500,20 @@ | ||
| 500 | 500 | ** Rename a single file. |
| 501 | 501 | ** |
| 502 | 502 | ** The original name of the file is zOrig. The new filename is zNew. |
| 503 | 503 | */ |
| 504 | 504 | static void mv_one_file(int vid, const char *zOrig, const char *zNew){ |
| 505 | + int x = db_int(-1, "SELECT deleted FROM vfile WHERE pathname=%Q", zNew); | |
| 506 | + if( x>=0 ){ | |
| 507 | + if( x==0 ){ | |
| 508 | + fossil_fatal("cannot rename '%s' to '%s' since another file named '%s'" | |
| 509 | + " is currently under management", zOrig, zNew, zNew); | |
| 510 | + }else{ | |
| 511 | + fossil_fatal("cannot rename '%s' to '%s' since the delete of '%s' has " | |
| 512 | + "not yet been committed", zOrig, zNew, zNew); | |
| 513 | + } | |
| 514 | + } | |
| 505 | 515 | fossil_print("RENAME %s %s\n", zOrig, zNew); |
| 506 | 516 | db_multi_exec( |
| 507 | 517 | "UPDATE vfile SET pathname='%q' WHERE pathname='%q' AND vid=%d", |
| 508 | 518 | zNew, zOrig, vid |
| 509 | 519 | ); |
| 510 | 520 |
| --- src/add.c | |
| +++ src/add.c | |
| @@ -500,10 +500,20 @@ | |
| 500 | ** Rename a single file. |
| 501 | ** |
| 502 | ** The original name of the file is zOrig. The new filename is zNew. |
| 503 | */ |
| 504 | static void mv_one_file(int vid, const char *zOrig, const char *zNew){ |
| 505 | fossil_print("RENAME %s %s\n", zOrig, zNew); |
| 506 | db_multi_exec( |
| 507 | "UPDATE vfile SET pathname='%q' WHERE pathname='%q' AND vid=%d", |
| 508 | zNew, zOrig, vid |
| 509 | ); |
| 510 |
| --- src/add.c | |
| +++ src/add.c | |
| @@ -500,10 +500,20 @@ | |
| 500 | ** Rename a single file. |
| 501 | ** |
| 502 | ** The original name of the file is zOrig. The new filename is zNew. |
| 503 | */ |
| 504 | static void mv_one_file(int vid, const char *zOrig, const char *zNew){ |
| 505 | int x = db_int(-1, "SELECT deleted FROM vfile WHERE pathname=%Q", zNew); |
| 506 | if( x>=0 ){ |
| 507 | if( x==0 ){ |
| 508 | fossil_fatal("cannot rename '%s' to '%s' since another file named '%s'" |
| 509 | " is currently under management", zOrig, zNew, zNew); |
| 510 | }else{ |
| 511 | fossil_fatal("cannot rename '%s' to '%s' since the delete of '%s' has " |
| 512 | "not yet been committed", zOrig, zNew, zNew); |
| 513 | } |
| 514 | } |
| 515 | fossil_print("RENAME %s %s\n", zOrig, zNew); |
| 516 | db_multi_exec( |
| 517 | "UPDATE vfile SET pathname='%q' WHERE pathname='%q' AND vid=%d", |
| 518 | zNew, zOrig, vid |
| 519 | ); |
| 520 |
+1
-1
| --- src/diff.c | ||
| +++ src/diff.c | ||
| @@ -190,11 +190,11 @@ | ||
| 190 | 190 | if( n<2 || ((z[1]&0xC0)!=0x80) ){ \ |
| 191 | 191 | result |= 4; /* Invalid continuation byte, continue */ \ |
| 192 | 192 | break; \ |
| 193 | 193 | }else{ \ |
| 194 | 194 | /* prepare for checking remaining continuation bytes */ \ |
| 195 | - c<<=2; --n; ++j; ++z; \ | |
| 195 | + c<<=1; --n; ++j; ++z; \ | |
| 196 | 196 | } \ |
| 197 | 197 | }while( c>=0xC0 ); |
| 198 | 198 | |
| 199 | 199 | /* |
| 200 | 200 | ** This function attempts to scan each logical line within the blob to |
| 201 | 201 |
| --- src/diff.c | |
| +++ src/diff.c | |
| @@ -190,11 +190,11 @@ | |
| 190 | if( n<2 || ((z[1]&0xC0)!=0x80) ){ \ |
| 191 | result |= 4; /* Invalid continuation byte, continue */ \ |
| 192 | break; \ |
| 193 | }else{ \ |
| 194 | /* prepare for checking remaining continuation bytes */ \ |
| 195 | c<<=2; --n; ++j; ++z; \ |
| 196 | } \ |
| 197 | }while( c>=0xC0 ); |
| 198 | |
| 199 | /* |
| 200 | ** This function attempts to scan each logical line within the blob to |
| 201 |
| --- src/diff.c | |
| +++ src/diff.c | |
| @@ -190,11 +190,11 @@ | |
| 190 | if( n<2 || ((z[1]&0xC0)!=0x80) ){ \ |
| 191 | result |= 4; /* Invalid continuation byte, continue */ \ |
| 192 | break; \ |
| 193 | }else{ \ |
| 194 | /* prepare for checking remaining continuation bytes */ \ |
| 195 | c<<=1; --n; ++j; ++z; \ |
| 196 | } \ |
| 197 | }while( c>=0xC0 ); |
| 198 | |
| 199 | /* |
| 200 | ** This function attempts to scan each logical line within the blob to |
| 201 |
+1
-1
| --- src/diff.c | ||
| +++ src/diff.c | ||
| @@ -190,11 +190,11 @@ | ||
| 190 | 190 | if( n<2 || ((z[1]&0xC0)!=0x80) ){ \ |
| 191 | 191 | result |= 4; /* Invalid continuation byte, continue */ \ |
| 192 | 192 | break; \ |
| 193 | 193 | }else{ \ |
| 194 | 194 | /* prepare for checking remaining continuation bytes */ \ |
| 195 | - c<<=2; --n; ++j; ++z; \ | |
| 195 | + c<<=1; --n; ++j; ++z; \ | |
| 196 | 196 | } \ |
| 197 | 197 | }while( c>=0xC0 ); |
| 198 | 198 | |
| 199 | 199 | /* |
| 200 | 200 | ** This function attempts to scan each logical line within the blob to |
| 201 | 201 |
| --- src/diff.c | |
| +++ src/diff.c | |
| @@ -190,11 +190,11 @@ | |
| 190 | if( n<2 || ((z[1]&0xC0)!=0x80) ){ \ |
| 191 | result |= 4; /* Invalid continuation byte, continue */ \ |
| 192 | break; \ |
| 193 | }else{ \ |
| 194 | /* prepare for checking remaining continuation bytes */ \ |
| 195 | c<<=2; --n; ++j; ++z; \ |
| 196 | } \ |
| 197 | }while( c>=0xC0 ); |
| 198 | |
| 199 | /* |
| 200 | ** This function attempts to scan each logical line within the blob to |
| 201 |
| --- src/diff.c | |
| +++ src/diff.c | |
| @@ -190,11 +190,11 @@ | |
| 190 | if( n<2 || ((z[1]&0xC0)!=0x80) ){ \ |
| 191 | result |= 4; /* Invalid continuation byte, continue */ \ |
| 192 | break; \ |
| 193 | }else{ \ |
| 194 | /* prepare for checking remaining continuation bytes */ \ |
| 195 | c<<=1; --n; ++j; ++z; \ |
| 196 | } \ |
| 197 | }while( c>=0xC0 ); |
| 198 | |
| 199 | /* |
| 200 | ** This function attempts to scan each logical line within the blob to |
| 201 |