Fossil SCM
Fix memory leak in prompt handling. Move clean-glob setting to ignore-glob, that makes "fossil extras" and "fossil clean" behave much more sensible.
Commit
a98c99571fa3f0e173970882182e09f31c073f39
Parent
466ccf96c6a528a…
3 files changed
-14
+17
+3
-3
D
.fossil-settings/clean-glob
-14
| --- a/.fossil-settings/clean-glob | ||
| +++ b/.fossil-settings/clean-glob | ||
| @@ -1,14 +0,0 @@ | ||
| 1 | -*.a | |
| 2 | -*.lib | |
| 3 | -*.manifest | |
| 4 | -*.o | |
| 5 | -bld/* | |
| 6 | -w.a | |
| 7 | -*.lib | |
| 8 | -*.manifest | |
| 9 | -*.o | |
| 10 | -*.obj | |
| 11 | -*.pdb | |
| 12 | -*.res | |
| 13 | -Makefile | |
| 14 | -aut |
| --- a/.fossil-settings/clean-glob | |
| +++ b/.fossil-settings/clean-glob | |
| @@ -1,14 +0,0 @@ | |
| 1 | *.a |
| 2 | *.lib |
| 3 | *.manifest |
| 4 | *.o |
| 5 | bld/* |
| 6 | w.a |
| 7 | *.lib |
| 8 | *.manifest |
| 9 | *.o |
| 10 | *.obj |
| 11 | *.pdb |
| 12 | *.res |
| 13 | Makefile |
| 14 | aut |
| --- a/.fossil-settings/clean-glob | |
| +++ b/.fossil-settings/clean-glob | |
| @@ -1,14 +0,0 @@ | |
| --- .fossil-settings/ignore-glob | ||
| +++ .fossil-settings/ignore-glob | ||
| @@ -1,5 +1,22 @@ | ||
| 1 | 1 | compat/openssl* |
| 2 | 2 | compat/tcl* |
| 3 | 3 | fossil |
| 4 | 4 | fossil.exe |
| 5 | 5 | win/fossil.exe |
| 6 | +*.a | |
| 7 | +*.lib | |
| 8 | +*.manifest | |
| 9 | +*.o | |
| 10 | +*.obj | |
| 11 | +*.pdb | |
| 12 | +*.res | |
| 13 | +Makefile | |
| 14 | +bld/* | |
| 15 | +wbld/* | |
| 16 | +win/*.c | |
| 17 | +win/*.h | |
| 18 | +win/*.exe | |
| 19 | +win/headers | |
| 20 | +win/linkopts | |
| 21 | +autoconfig.h | |
| 22 | +config.log | |
| 6 | 23 |
| --- .fossil-settings/ignore-glob | |
| +++ .fossil-settings/ignore-glob | |
| @@ -1,5 +1,22 @@ | |
| 1 | compat/openssl* |
| 2 | compat/tcl* |
| 3 | fossil |
| 4 | fossil.exe |
| 5 | win/fossil.exe |
| 6 |
| --- .fossil-settings/ignore-glob | |
| +++ .fossil-settings/ignore-glob | |
| @@ -1,5 +1,22 @@ | |
| 1 | compat/openssl* |
| 2 | compat/tcl* |
| 3 | fossil |
| 4 | fossil.exe |
| 5 | win/fossil.exe |
| 6 | *.a |
| 7 | *.lib |
| 8 | *.manifest |
| 9 | *.o |
| 10 | *.obj |
| 11 | *.pdb |
| 12 | *.res |
| 13 | Makefile |
| 14 | bld/* |
| 15 | wbld/* |
| 16 | win/*.c |
| 17 | win/*.h |
| 18 | win/*.exe |
| 19 | win/headers |
| 20 | win/linkopts |
| 21 | autoconfig.h |
| 22 | config.log |
| 23 |
+3
-3
| --- src/checkin.c | ||
| +++ src/checkin.c | ||
| @@ -672,12 +672,12 @@ | ||
| 672 | 672 | ** that were removed will be removed as well. |
| 673 | 673 | ** -f|--force Remove directories without prompting. |
| 674 | 674 | ** -x|--verily Remove everything that is not a managed file or |
| 675 | 675 | ** the repository itself. Implies -f --emptydirs |
| 676 | 676 | ** --dotfiles. Disregard keep-glob and ignore-glob, |
| 677 | -** except that files matching ignore-glob are not | |
| 678 | -** never undo-able. | |
| 677 | +** except that files matching ignore-glob are never | |
| 678 | +** undo-able. | |
| 679 | 679 | ** --clean <CSG> Never prompt for files matching this |
| 680 | 680 | ** comma separated list of glob patterns. |
| 681 | 681 | ** --ignore <CSG> Ignore files matching patterns from the |
| 682 | 682 | ** comma separated list of glob patterns. |
| 683 | 683 | ** --keep <CSG> Keep files matching this comma separated |
| @@ -772,16 +772,16 @@ | ||
| 772 | 772 | if( !dryRunFlag && !glob_match(pClean, zName+nRoot) |
| 773 | 773 | && !(verilyFlag && glob_match(pIgnore, zName+nRoot)) |
| 774 | 774 | && undo_save(zName+nRoot, 10*1024*1024) ){ |
| 775 | 775 | prompt = mprintf("file \"%s\" too big. Deletion will not be " |
| 776 | 776 | "undo-able. Continue (y/N)? ", zName+nRoot); |
| 777 | - blob_zero(&ans); | |
| 778 | 777 | prompt_user(prompt, &ans); |
| 779 | 778 | cReply = blob_str(&ans)[0]; |
| 780 | 779 | if( cReply!='y' && cReply!='Y' ){ |
| 781 | 780 | fossil_fatal("Clean aborted"); |
| 782 | 781 | } |
| 782 | + blob_reset(&ans); | |
| 783 | 783 | } |
| 784 | 784 | if( dryRunFlag || file_delete(zName)==0 ){ |
| 785 | 785 | if( verboseFlag || dryRunFlag ){ |
| 786 | 786 | fossil_print("Removed unmanaged file: %s\n", zName+nRoot); |
| 787 | 787 | } |
| 788 | 788 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -672,12 +672,12 @@ | |
| 672 | ** that were removed will be removed as well. |
| 673 | ** -f|--force Remove directories without prompting. |
| 674 | ** -x|--verily Remove everything that is not a managed file or |
| 675 | ** the repository itself. Implies -f --emptydirs |
| 676 | ** --dotfiles. Disregard keep-glob and ignore-glob, |
| 677 | ** except that files matching ignore-glob are not |
| 678 | ** never undo-able. |
| 679 | ** --clean <CSG> Never prompt for files matching this |
| 680 | ** comma separated list of glob patterns. |
| 681 | ** --ignore <CSG> Ignore files matching patterns from the |
| 682 | ** comma separated list of glob patterns. |
| 683 | ** --keep <CSG> Keep files matching this comma separated |
| @@ -772,16 +772,16 @@ | |
| 772 | if( !dryRunFlag && !glob_match(pClean, zName+nRoot) |
| 773 | && !(verilyFlag && glob_match(pIgnore, zName+nRoot)) |
| 774 | && undo_save(zName+nRoot, 10*1024*1024) ){ |
| 775 | prompt = mprintf("file \"%s\" too big. Deletion will not be " |
| 776 | "undo-able. Continue (y/N)? ", zName+nRoot); |
| 777 | blob_zero(&ans); |
| 778 | prompt_user(prompt, &ans); |
| 779 | cReply = blob_str(&ans)[0]; |
| 780 | if( cReply!='y' && cReply!='Y' ){ |
| 781 | fossil_fatal("Clean aborted"); |
| 782 | } |
| 783 | } |
| 784 | if( dryRunFlag || file_delete(zName)==0 ){ |
| 785 | if( verboseFlag || dryRunFlag ){ |
| 786 | fossil_print("Removed unmanaged file: %s\n", zName+nRoot); |
| 787 | } |
| 788 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -672,12 +672,12 @@ | |
| 672 | ** that were removed will be removed as well. |
| 673 | ** -f|--force Remove directories without prompting. |
| 674 | ** -x|--verily Remove everything that is not a managed file or |
| 675 | ** the repository itself. Implies -f --emptydirs |
| 676 | ** --dotfiles. Disregard keep-glob and ignore-glob, |
| 677 | ** except that files matching ignore-glob are never |
| 678 | ** undo-able. |
| 679 | ** --clean <CSG> Never prompt for files matching this |
| 680 | ** comma separated list of glob patterns. |
| 681 | ** --ignore <CSG> Ignore files matching patterns from the |
| 682 | ** comma separated list of glob patterns. |
| 683 | ** --keep <CSG> Keep files matching this comma separated |
| @@ -772,16 +772,16 @@ | |
| 772 | if( !dryRunFlag && !glob_match(pClean, zName+nRoot) |
| 773 | && !(verilyFlag && glob_match(pIgnore, zName+nRoot)) |
| 774 | && undo_save(zName+nRoot, 10*1024*1024) ){ |
| 775 | prompt = mprintf("file \"%s\" too big. Deletion will not be " |
| 776 | "undo-able. Continue (y/N)? ", zName+nRoot); |
| 777 | prompt_user(prompt, &ans); |
| 778 | cReply = blob_str(&ans)[0]; |
| 779 | if( cReply!='y' && cReply!='Y' ){ |
| 780 | fossil_fatal("Clean aborted"); |
| 781 | } |
| 782 | blob_reset(&ans); |
| 783 | } |
| 784 | if( dryRunFlag || file_delete(zName)==0 ){ |
| 785 | if( verboseFlag || dryRunFlag ){ |
| 786 | fossil_print("Removed unmanaged file: %s\n", zName+nRoot); |
| 787 | } |
| 788 |