0682bc43f5
Sinceee69e7884e(gc: use temporary file for editing crontab, 2022-08-28), we now insist that "argc == 3" (and otherwise return an error). Coverity notes that this causes some dead code: if (argc == 3) fclose(from); else fclose(to); as we will never trigger the else. This also causes a memory leak, since we'll never close "to". Now that all paths require 2 arguments, we can just reorganize the function to check argc up front, and tweak the cleanup to do the right thing for all cases. While we're here, we can also notice some minor problems: - we return a negative int via error() from what is essentially a main() function; we should return a positive non-zero value for error. Or better yet, we can just use usage(), which gives a better message. - while writing the usage message, we can note the one in the comment was made out of date byee69e7884e. But it also had a typo already, calling the subcommand "cron" and not "crontab" - we didn't check for an error from fopen(), meaning we would segfault if the to-be-read file was missing. We can use xfopen() to catch this. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
37 lines
652 B
C
37 lines
652 B
C
#include "test-tool.h"
|
|
#include "cache.h"
|
|
|
|
/*
|
|
* Usage: test-tool crontab <file> -l|<input>
|
|
*
|
|
* If -l is specified, then write the contents of <file> to stdout.
|
|
* Otherwise, copy the contents of <input> into <file>.
|
|
*/
|
|
int cmd__crontab(int argc, const char **argv)
|
|
{
|
|
int a;
|
|
FILE *from, *to;
|
|
|
|
if (argc != 3)
|
|
usage("test-tool crontab <file> -l|<input>");
|
|
|
|
if (!strcmp(argv[2], "-l")) {
|
|
from = fopen(argv[1], "r");
|
|
if (!from)
|
|
return 0;
|
|
to = stdout;
|
|
} else {
|
|
from = xfopen(argv[2], "r");
|
|
to = xfopen(argv[1], "w");
|
|
}
|
|
|
|
while ((a = fgetc(from)) != EOF)
|
|
fputc(a, to);
|
|
|
|
fclose(from);
|
|
if (to != stdout)
|
|
fclose(to);
|
|
|
|
return 0;
|
|
}
|