Fossil SCM
Correct last merge: mbcs->utf-8 conversion is done later
Commit
b9640f05a249e594229f72e0833dca24c8696971
Parent
71ef64bb7529858…
1 file changed
+2
-5
+2
-5
| --- src/checkin.c | ||
| +++ src/checkin.c | ||
| @@ -515,17 +515,14 @@ | ||
| 515 | 515 | blob_read_from_file(&text, zFile); |
| 516 | 516 | }else{ |
| 517 | 517 | char zIn[300]; |
| 518 | 518 | blob_reset(&text); |
| 519 | 519 | while( fgets(zIn, sizeof(zIn), stdin)!=0 ){ |
| 520 | - char *zUtf8 = fossil_mbcs_to_utf8(zIn); | |
| 521 | - if( zUtf8[0]=='.' && (zUtf8[1]==0 || zUtf8[1]=='\r' || zUtf8[1]=='\n') ){ | |
| 522 | - fossil_mbcs_free(zUtf8); | |
| 520 | + if( zIn[0]=='.' && (zIn[1]==0 || zIn[1]=='\r' || zIn[1]=='\n') ){ | |
| 523 | 521 | break; |
| 524 | 522 | } |
| 525 | - blob_append(&text, zUtf8, -1); | |
| 526 | - fossil_mbcs_free(zUtf8); | |
| 523 | + blob_append(&text, zIn, -1); | |
| 527 | 524 | } |
| 528 | 525 | } |
| 529 | 526 | blob_remove_cr(&text); |
| 530 | 527 | if( zEditor ) { |
| 531 | 528 | file_delete(zFile); |
| 532 | 529 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -515,17 +515,14 @@ | |
| 515 | blob_read_from_file(&text, zFile); |
| 516 | }else{ |
| 517 | char zIn[300]; |
| 518 | blob_reset(&text); |
| 519 | while( fgets(zIn, sizeof(zIn), stdin)!=0 ){ |
| 520 | char *zUtf8 = fossil_mbcs_to_utf8(zIn); |
| 521 | if( zUtf8[0]=='.' && (zUtf8[1]==0 || zUtf8[1]=='\r' || zUtf8[1]=='\n') ){ |
| 522 | fossil_mbcs_free(zUtf8); |
| 523 | break; |
| 524 | } |
| 525 | blob_append(&text, zUtf8, -1); |
| 526 | fossil_mbcs_free(zUtf8); |
| 527 | } |
| 528 | } |
| 529 | blob_remove_cr(&text); |
| 530 | if( zEditor ) { |
| 531 | file_delete(zFile); |
| 532 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -515,17 +515,14 @@ | |
| 515 | blob_read_from_file(&text, zFile); |
| 516 | }else{ |
| 517 | char zIn[300]; |
| 518 | blob_reset(&text); |
| 519 | while( fgets(zIn, sizeof(zIn), stdin)!=0 ){ |
| 520 | if( zIn[0]=='.' && (zIn[1]==0 || zIn[1]=='\r' || zIn[1]=='\n') ){ |
| 521 | break; |
| 522 | } |
| 523 | blob_append(&text, zIn, -1); |
| 524 | } |
| 525 | } |
| 526 | blob_remove_cr(&text); |
| 527 | if( zEditor ) { |
| 528 | file_delete(zFile); |
| 529 |