Fossil SCM
another attempt ۠
Commit
4358a237783f9729909477a5ca3a21775e079703
Parent
fa8e0fed9c4b2cc…
1 file changed
+4
-4
+4
-4
| --- src/checkin.c | ||
| +++ src/checkin.c | ||
| @@ -1162,11 +1162,11 @@ | ||
| 1162 | 1162 | static const unsigned short ubom = 0xfeff; |
| 1163 | 1163 | static const unsigned short urbom = 0xfffe; |
| 1164 | 1164 | if( blob_size(&comment)>2 && memcmp(blob_buffer(&comment), bom, 3)==0 ) { |
| 1165 | 1165 | struct Blob temp; |
| 1166 | 1166 | char *zUtf8 = blob_str(&comment) + 3; |
| 1167 | - blob_set(&temp, zUtf8); | |
| 1167 | + blob_append(&temp, zUtf8, -1); | |
| 1168 | 1168 | fossil_mbcs_free(zUtf8); |
| 1169 | 1169 | blob_swap(&temp, &comment); |
| 1170 | 1170 | blob_reset(&temp); |
| 1171 | 1171 | }else if( blob_size(&comment)>1 && (blob_size(&comment)&1)==0 |
| 1172 | 1172 | && memcmp(blob_buffer(&comment), &ubom, 2)==0 ) { |
| @@ -1174,19 +1174,19 @@ | ||
| 1174 | 1174 | /* Make sure the blob contains two terminating 0-bytes */ |
| 1175 | 1175 | blob_append(&comment, "", 1); |
| 1176 | 1176 | zUtf8 = blob_str(&comment) + 2; |
| 1177 | 1177 | zUtf8 = fossil_unicode_to_utf8(zUtf8); |
| 1178 | 1178 | blob_zero(&comment); |
| 1179 | - blob_set(&comment, zUtf8); | |
| 1179 | + blob_append(&comment, zUtf8, -1); | |
| 1180 | 1180 | fossil_mbcs_free(zUtf8); |
| 1181 | 1181 | }else if( blob_size(&comment)>1 |
| 1182 | - && memcmp(blob_buffer(&comment), &urbom, 2)==0 ){ | |
| 1182 | + && memcmp(blob_buffer(&comment), &urbom, 2)==0 ){ | |
| 1183 | 1183 | fossil_fatal("unicode bom (be) not (yet) implemented"); |
| 1184 | 1184 | }else{ |
| 1185 | 1185 | char *zUtf8 = fossil_mbcs_to_utf8(blob_str(&comment)); |
| 1186 | 1186 | blob_zero(&comment); |
| 1187 | - blob_set(&comment, zUtf8); | |
| 1187 | + blob_append(&comment, zUtf8, -1); | |
| 1188 | 1188 | fossil_mbcs_free(zUtf8); |
| 1189 | 1189 | } |
| 1190 | 1190 | } |
| 1191 | 1191 | #endif /* _WIN32 */ |
| 1192 | 1192 | db_multi_exec("REPLACE INTO vvar VALUES('ci-comment',%B)", &comment); |
| 1193 | 1193 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -1162,11 +1162,11 @@ | |
| 1162 | static const unsigned short ubom = 0xfeff; |
| 1163 | static const unsigned short urbom = 0xfffe; |
| 1164 | if( blob_size(&comment)>2 && memcmp(blob_buffer(&comment), bom, 3)==0 ) { |
| 1165 | struct Blob temp; |
| 1166 | char *zUtf8 = blob_str(&comment) + 3; |
| 1167 | blob_set(&temp, zUtf8); |
| 1168 | fossil_mbcs_free(zUtf8); |
| 1169 | blob_swap(&temp, &comment); |
| 1170 | blob_reset(&temp); |
| 1171 | }else if( blob_size(&comment)>1 && (blob_size(&comment)&1)==0 |
| 1172 | && memcmp(blob_buffer(&comment), &ubom, 2)==0 ) { |
| @@ -1174,19 +1174,19 @@ | |
| 1174 | /* Make sure the blob contains two terminating 0-bytes */ |
| 1175 | blob_append(&comment, "", 1); |
| 1176 | zUtf8 = blob_str(&comment) + 2; |
| 1177 | zUtf8 = fossil_unicode_to_utf8(zUtf8); |
| 1178 | blob_zero(&comment); |
| 1179 | blob_set(&comment, zUtf8); |
| 1180 | fossil_mbcs_free(zUtf8); |
| 1181 | }else if( blob_size(&comment)>1 |
| 1182 | && memcmp(blob_buffer(&comment), &urbom, 2)==0 ){ |
| 1183 | fossil_fatal("unicode bom (be) not (yet) implemented"); |
| 1184 | }else{ |
| 1185 | char *zUtf8 = fossil_mbcs_to_utf8(blob_str(&comment)); |
| 1186 | blob_zero(&comment); |
| 1187 | blob_set(&comment, zUtf8); |
| 1188 | fossil_mbcs_free(zUtf8); |
| 1189 | } |
| 1190 | } |
| 1191 | #endif /* _WIN32 */ |
| 1192 | db_multi_exec("REPLACE INTO vvar VALUES('ci-comment',%B)", &comment); |
| 1193 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -1162,11 +1162,11 @@ | |
| 1162 | static const unsigned short ubom = 0xfeff; |
| 1163 | static const unsigned short urbom = 0xfffe; |
| 1164 | if( blob_size(&comment)>2 && memcmp(blob_buffer(&comment), bom, 3)==0 ) { |
| 1165 | struct Blob temp; |
| 1166 | char *zUtf8 = blob_str(&comment) + 3; |
| 1167 | blob_append(&temp, zUtf8, -1); |
| 1168 | fossil_mbcs_free(zUtf8); |
| 1169 | blob_swap(&temp, &comment); |
| 1170 | blob_reset(&temp); |
| 1171 | }else if( blob_size(&comment)>1 && (blob_size(&comment)&1)==0 |
| 1172 | && memcmp(blob_buffer(&comment), &ubom, 2)==0 ) { |
| @@ -1174,19 +1174,19 @@ | |
| 1174 | /* Make sure the blob contains two terminating 0-bytes */ |
| 1175 | blob_append(&comment, "", 1); |
| 1176 | zUtf8 = blob_str(&comment) + 2; |
| 1177 | zUtf8 = fossil_unicode_to_utf8(zUtf8); |
| 1178 | blob_zero(&comment); |
| 1179 | blob_append(&comment, zUtf8, -1); |
| 1180 | fossil_mbcs_free(zUtf8); |
| 1181 | }else if( blob_size(&comment)>1 |
| 1182 | && memcmp(blob_buffer(&comment), &urbom, 2)==0 ){ |
| 1183 | fossil_fatal("unicode bom (be) not (yet) implemented"); |
| 1184 | }else{ |
| 1185 | char *zUtf8 = fossil_mbcs_to_utf8(blob_str(&comment)); |
| 1186 | blob_zero(&comment); |
| 1187 | blob_append(&comment, zUtf8, -1); |
| 1188 | fossil_mbcs_free(zUtf8); |
| 1189 | } |
| 1190 | } |
| 1191 | #endif /* _WIN32 */ |
| 1192 | db_multi_exec("REPLACE INTO vvar VALUES('ci-comment',%B)", &comment); |
| 1193 |