Fossil SCM
Fix fossil git export to safely quote filenames that have been deleted (D lines) with special characters in them such as newline. D lines already do this.
Commit
78e6add989c7d798f1a12d635a8880430010fa87d369617406bcda8b2988c082
Parent
c088cf957fffc55…
1 file changed
+4
-1
+4
-1
| --- src/export.c | ||
| +++ src/export.c | ||
| @@ -1235,11 +1235,14 @@ | ||
| 1235 | 1235 | "SELECT filename FROM files_of_checkin(%Q)" |
| 1236 | 1236 | " EXCEPT SELECT filename FROM files_of_checkin(%Q)", |
| 1237 | 1237 | pMan->azParent[iParent], zUuid |
| 1238 | 1238 | ); |
| 1239 | 1239 | while( db_step(&q)==SQLITE_ROW ){ |
| 1240 | - fprintf(xCmd, "D %s\n", db_column_text(&q,0)); | |
| 1240 | + const char *zFilename = db_column_text(&q,0); | |
| 1241 | + char *zFNQuoted = gitmirror_quote_filename_if_needed(zFilename); | |
| 1242 | + fprintf(xCmd, "D %s\n", zFNQuoted); | |
| 1243 | + fossil_free(zFNQuoted); | |
| 1241 | 1244 | } |
| 1242 | 1245 | db_finalize(&q); |
| 1243 | 1246 | } |
| 1244 | 1247 | blob_init(&sql, 0, 0); |
| 1245 | 1248 | blob_append_sql(&sql, |
| 1246 | 1249 |
| --- src/export.c | |
| +++ src/export.c | |
| @@ -1235,11 +1235,14 @@ | |
| 1235 | "SELECT filename FROM files_of_checkin(%Q)" |
| 1236 | " EXCEPT SELECT filename FROM files_of_checkin(%Q)", |
| 1237 | pMan->azParent[iParent], zUuid |
| 1238 | ); |
| 1239 | while( db_step(&q)==SQLITE_ROW ){ |
| 1240 | fprintf(xCmd, "D %s\n", db_column_text(&q,0)); |
| 1241 | } |
| 1242 | db_finalize(&q); |
| 1243 | } |
| 1244 | blob_init(&sql, 0, 0); |
| 1245 | blob_append_sql(&sql, |
| 1246 |
| --- src/export.c | |
| +++ src/export.c | |
| @@ -1235,11 +1235,14 @@ | |
| 1235 | "SELECT filename FROM files_of_checkin(%Q)" |
| 1236 | " EXCEPT SELECT filename FROM files_of_checkin(%Q)", |
| 1237 | pMan->azParent[iParent], zUuid |
| 1238 | ); |
| 1239 | while( db_step(&q)==SQLITE_ROW ){ |
| 1240 | const char *zFilename = db_column_text(&q,0); |
| 1241 | char *zFNQuoted = gitmirror_quote_filename_if_needed(zFilename); |
| 1242 | fprintf(xCmd, "D %s\n", zFNQuoted); |
| 1243 | fossil_free(zFNQuoted); |
| 1244 | } |
| 1245 | db_finalize(&q); |
| 1246 | } |
| 1247 | blob_init(&sql, 0, 0); |
| 1248 | blob_append_sql(&sql, |
| 1249 |