Fossil SCM
Simplify manifest generation logic in zip page
Commit
b9de60427ad932108a159edc04a3b3f1ebce26bf75ec8ca218a82e2bc73bac6c
Parent
95edba6534dafc1…
1 file changed
+8
-14
+8
-14
| --- src/zip.c | ||
| +++ src/zip.c | ||
| @@ -372,22 +372,17 @@ | ||
| 372 | 372 | && !glob_match(pExclude, "manifest.tags") |
| 373 | 373 | && (flg & MFESTFLG_TAGS) ){ |
| 374 | 374 | eflg |= MFESTFLG_TAGS; |
| 375 | 375 | } |
| 376 | 376 | |
| 377 | - if( eflg & (MFESTFLG_RAW|MFESTFLG_UUID) ){ | |
| 378 | - if( eflg & MFESTFLG_RAW ){ | |
| 379 | - blob_append(&filename, "manifest", -1); | |
| 380 | - zName = blob_str(&filename); | |
| 381 | - zip_add_folders(zName); | |
| 382 | - } | |
| 383 | - if( eflg & MFESTFLG_RAW ){ | |
| 384 | - sterilize_manifest(&mfile); | |
| 385 | - zip_add_file(zName, &mfile, 0); | |
| 386 | - } | |
| 387 | - } | |
| 388 | - blob_reset(&mfile); | |
| 377 | + if( eflg & MFESTFLG_RAW ){ | |
| 378 | + blob_append(&filename, "manifest", -1); | |
| 379 | + zName = blob_str(&filename); | |
| 380 | + zip_add_folders(zName); | |
| 381 | + sterilize_manifest(&mfile); | |
| 382 | + zip_add_file(zName, &mfile, 0); | |
| 383 | + } | |
| 389 | 384 | if( eflg & MFESTFLG_UUID ){ |
| 390 | 385 | blob_append(&hash, "\n", 1); |
| 391 | 386 | blob_resize(&filename, nPrefix); |
| 392 | 387 | blob_append(&filename, "manifest.uuid", -1); |
| 393 | 388 | zName = blob_str(&filename); |
| @@ -420,13 +415,12 @@ | ||
| 420 | 415 | zip_add_folders(zName); |
| 421 | 416 | zip_add_file(zName, &file, manifest_file_mperm(pFile)); |
| 422 | 417 | blob_reset(&file); |
| 423 | 418 | } |
| 424 | 419 | } |
| 425 | - }else{ | |
| 426 | - blob_reset(&mfile); | |
| 427 | 420 | } |
| 421 | + blob_reset(&mfile); | |
| 428 | 422 | manifest_destroy(pManifest); |
| 429 | 423 | blob_reset(&filename); |
| 430 | 424 | blob_reset(&hash); |
| 431 | 425 | zip_close(pZip); |
| 432 | 426 | } |
| 433 | 427 |
| --- src/zip.c | |
| +++ src/zip.c | |
| @@ -372,22 +372,17 @@ | |
| 372 | && !glob_match(pExclude, "manifest.tags") |
| 373 | && (flg & MFESTFLG_TAGS) ){ |
| 374 | eflg |= MFESTFLG_TAGS; |
| 375 | } |
| 376 | |
| 377 | if( eflg & (MFESTFLG_RAW|MFESTFLG_UUID) ){ |
| 378 | if( eflg & MFESTFLG_RAW ){ |
| 379 | blob_append(&filename, "manifest", -1); |
| 380 | zName = blob_str(&filename); |
| 381 | zip_add_folders(zName); |
| 382 | } |
| 383 | if( eflg & MFESTFLG_RAW ){ |
| 384 | sterilize_manifest(&mfile); |
| 385 | zip_add_file(zName, &mfile, 0); |
| 386 | } |
| 387 | } |
| 388 | blob_reset(&mfile); |
| 389 | if( eflg & MFESTFLG_UUID ){ |
| 390 | blob_append(&hash, "\n", 1); |
| 391 | blob_resize(&filename, nPrefix); |
| 392 | blob_append(&filename, "manifest.uuid", -1); |
| 393 | zName = blob_str(&filename); |
| @@ -420,13 +415,12 @@ | |
| 420 | zip_add_folders(zName); |
| 421 | zip_add_file(zName, &file, manifest_file_mperm(pFile)); |
| 422 | blob_reset(&file); |
| 423 | } |
| 424 | } |
| 425 | }else{ |
| 426 | blob_reset(&mfile); |
| 427 | } |
| 428 | manifest_destroy(pManifest); |
| 429 | blob_reset(&filename); |
| 430 | blob_reset(&hash); |
| 431 | zip_close(pZip); |
| 432 | } |
| 433 |
| --- src/zip.c | |
| +++ src/zip.c | |
| @@ -372,22 +372,17 @@ | |
| 372 | && !glob_match(pExclude, "manifest.tags") |
| 373 | && (flg & MFESTFLG_TAGS) ){ |
| 374 | eflg |= MFESTFLG_TAGS; |
| 375 | } |
| 376 | |
| 377 | if( eflg & MFESTFLG_RAW ){ |
| 378 | blob_append(&filename, "manifest", -1); |
| 379 | zName = blob_str(&filename); |
| 380 | zip_add_folders(zName); |
| 381 | sterilize_manifest(&mfile); |
| 382 | zip_add_file(zName, &mfile, 0); |
| 383 | } |
| 384 | if( eflg & MFESTFLG_UUID ){ |
| 385 | blob_append(&hash, "\n", 1); |
| 386 | blob_resize(&filename, nPrefix); |
| 387 | blob_append(&filename, "manifest.uuid", -1); |
| 388 | zName = blob_str(&filename); |
| @@ -420,13 +415,12 @@ | |
| 415 | zip_add_folders(zName); |
| 416 | zip_add_file(zName, &file, manifest_file_mperm(pFile)); |
| 417 | blob_reset(&file); |
| 418 | } |
| 419 | } |
| 420 | } |
| 421 | blob_reset(&mfile); |
| 422 | manifest_destroy(pManifest); |
| 423 | blob_reset(&filename); |
| 424 | blob_reset(&hash); |
| 425 | zip_close(pZip); |
| 426 | } |
| 427 |