nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-03-22 06:38:37 -05:00
Code Issues Projects Releases Wiki Activity

cgtest: default to deleting temporary key files.

Browse Source 
This stops cgtest from leaving detritus all over my git checkout.
There's a --keep option to revert to the previous behaviour, just in
case I actually want the detritus on some occasion - although in that
situation I might also need to arrange that the various intermediate
files all go by different names, because otherwise there's a good
chance that the one I cared about would already have been overwritten.
This commit is contained in:
Simon Tatham 2020-01-14 19:53:06 +00:00
parent 12aa06ccc9
commit 02d0990bd5
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cmdgen.c
View File

@ -1345,6 +1345,7 @@ int main(int argc, char **argv)
{ {
int i; int i;
int active[lenof(cgtest_keytypes)], active_value; int active[lenof(cgtest_keytypes)], active_value;
bool remove_files = true;
active_value = 0; active_value = 0;
for (i = 0; i < lenof(cgtest_keytypes); i++) for (i = 0; i < lenof(cgtest_keytypes); i++)
@ -1355,10 +1356,14 @@ int main(int argc, char **argv)
if (ptrlen_eq_string(arg, "-v") || if (ptrlen_eq_string(arg, "-v") ||
ptrlen_eq_string(arg, "--verbose")) { ptrlen_eq_string(arg, "--verbose")) {
cgtest_verbose = true; cgtest_verbose = true;
} else if (ptrlen_eq_string(arg, "--keep")) {
remove_files = false;
} else if (ptrlen_eq_string(arg, "--help")) { } else if (ptrlen_eq_string(arg, "--help")) {
printf("usage: cgtest [options] [key types]\n"); printf("usage: cgtest [options] [key types]\n");
printf("options: -v, --verbose " printf("options: -v, --verbose "
"print more output during tests\n"); "print more output during tests\n");
printf(" --keep "
"do not delete the temporary output files\n");
printf(" --help " printf(" --help "
"display this help text\n"); "display this help text\n");
printf("key types: "); printf("key types: ");
@ -1788,6 +1793,15 @@ int main(int argc, char **argv)
test(1, "puttygen", "-C", "spurious-new-comment", pubfilename, NULL); test(1, "puttygen", "-C", "spurious-new-comment", pubfilename, NULL);
sfree(fp); sfree(fp);
if (remove_files) {
remove(filename);
remove(pubfilename);
remove(osfilename);
remove(scfilename);
remove(tmpfilename1);
remove(tmpfilename2);
}
} }
printf("%d passes, %d fails\n", passes, fails); printf("%d passes, %d fails\n", passes, fails);
return fails == 0 ? 0 : 1; return fails == 0 ? 0 : 1;