Make already audited tools argv-centric instead of argc-centric
This has already been suggested by Evan Gates <evan.gates@gmail.com> and he's totally right about it. So, what's the problem? I wrote a testing program asshole.c with int main(void) { execl("/path/to/sbase/echo", "echo", "test"); return 0; } and checked the results with glibc and musl. Note that the sentinel NULL is missing from the end of the argument list. glibc calculates an argc of 5, musl 4 (instead of 2) and thus mess up things anyway. The powerful arg.h also focuses on argv instead of argc as well, but ignoring argc completely is also the wrong way to go. Instead, a more idiomatic approach is to check *argv only and decrement argc on the go. While at it, I rewrote yes(1) in an argv-centric way as well. All audited tools have been "fixed" and each following audited tool will receive the same treatment.
This commit is contained in:
parent
5d6e609455
commit
286df29e7d
2
cat.c
2
cat.c
|
@ -28,7 +28,7 @@ main(int argc, char *argv[])
|
||||||
if (argc == 0) {
|
if (argc == 0) {
|
||||||
concat(stdin, "<stdin>", stdout, "<stdout>");
|
concat(stdin, "<stdin>", stdout, "<stdout>");
|
||||||
} else {
|
} else {
|
||||||
for (; argc > 0; argc--, argv++) {
|
for (; *argv; argc--, argv++) {
|
||||||
if ((*argv)[0] == '-' && !(*argv)[1]) {
|
if ((*argv)[0] == '-' && !(*argv)[1]) {
|
||||||
concat(stdin, "<stdin>", stdout, "<stdout>");
|
concat(stdin, "<stdin>", stdout, "<stdout>");
|
||||||
} else if (!(fp = fopen(*argv, "r"))) {
|
} else if (!(fp = fopen(*argv, "r"))) {
|
||||||
|
|
2
echo.c
2
echo.c
|
@ -22,7 +22,7 @@ main(int argc, char *argv[])
|
||||||
usage();
|
usage();
|
||||||
} ARGEND;
|
} ARGEND;
|
||||||
|
|
||||||
for (; argc > 0; argc--, argv++)
|
for (; *argv; argc--, argv++)
|
||||||
putword(*argv);
|
putword(*argv);
|
||||||
if (!nflag)
|
if (!nflag)
|
||||||
putchar('\n');
|
putchar('\n');
|
||||||
|
|
|
@ -87,7 +87,7 @@ cryptcheck(int argc, char *argv[], struct crypt_ops *ops, uint8_t *md, size_t sz
|
||||||
if (argc == 0) {
|
if (argc == 0) {
|
||||||
mdchecklist(stdin, ops, md, sz, &formatsucks, &noread, &nonmatch);
|
mdchecklist(stdin, ops, md, sz, &formatsucks, &noread, &nonmatch);
|
||||||
} else {
|
} else {
|
||||||
for (; argc > 0; argc--, argv++) {
|
for (; *argv; argc--, argv++) {
|
||||||
if (!(fp = fopen(*argv, "r"))) {
|
if (!(fp = fopen(*argv, "r"))) {
|
||||||
weprintf("fopen %s:", *argv);
|
weprintf("fopen %s:", *argv);
|
||||||
ret = 1;
|
ret = 1;
|
||||||
|
@ -124,7 +124,7 @@ cryptmain(int argc, char *argv[], struct crypt_ops *ops, uint8_t *md, size_t sz)
|
||||||
cryptsum(ops, stdin, "<stdin>", md);
|
cryptsum(ops, stdin, "<stdin>", md);
|
||||||
mdprint(md, "<stdin>", sz);
|
mdprint(md, "<stdin>", sz);
|
||||||
} else {
|
} else {
|
||||||
for (; argc > 0; argc--, argv++) {
|
for (; *argv; argc--, argv++) {
|
||||||
if (!(fp = fopen(*argv, "r"))) {
|
if (!(fp = fopen(*argv, "r"))) {
|
||||||
weprintf("fopen %s:", *argv);
|
weprintf("fopen %s:", *argv);
|
||||||
ret = 1;
|
ret = 1;
|
||||||
|
|
|
@ -24,12 +24,12 @@ main(int argc, char *argv[])
|
||||||
} ARGEND;
|
} ARGEND;
|
||||||
|
|
||||||
if (!argc) {
|
if (!argc) {
|
||||||
while (*environ)
|
for (; *environ; environ++)
|
||||||
printf("%s\n", *environ++);
|
puts(*environ);
|
||||||
} else {
|
} else {
|
||||||
for (; argc > 0; argc--, argv++) {
|
for (; *argv; argc--, argv++) {
|
||||||
if ((var = getenv(*argv)))
|
if ((var = getenv(*argv)))
|
||||||
printf("%s\n", var);
|
puts(var);
|
||||||
else
|
else
|
||||||
ret = 1;
|
ret = 1;
|
||||||
}
|
}
|
||||||
|
|
4
rm.c
4
rm.c
|
@ -30,8 +30,8 @@ main(int argc, char *argv[])
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
for (; argc > 0; argc--, argv++)
|
for (; *argv; argc--, argv++)
|
||||||
rm(argv[0], 0);
|
rm(*argv, 0);
|
||||||
|
|
||||||
return rm_status;
|
return rm_status;
|
||||||
}
|
}
|
||||||
|
|
8
yes.c
8
yes.c
|
@ -12,16 +12,16 @@ usage(void)
|
||||||
int
|
int
|
||||||
main(int argc, char *argv[])
|
main(int argc, char *argv[])
|
||||||
{
|
{
|
||||||
size_t i;
|
char **p;
|
||||||
|
|
||||||
ARGBEGIN {
|
ARGBEGIN {
|
||||||
default:
|
default:
|
||||||
usage();
|
usage();
|
||||||
} ARGEND;
|
} ARGEND;
|
||||||
|
|
||||||
for (i = 0; ; i++, i %= argc ? argc : 1) {
|
for (p = argv; ; p = (*p && *(p + 1)) ? p + 1 : argv) {
|
||||||
fputs(argc ? argv[i] : "y", stdout);
|
fputs(*p ? *p : "y", stdout);
|
||||||
putchar((!argc || i == argc - 1) ? '\n' : ' ');
|
putchar((!*p || !*(p + 1)) ? '\n' : ' ');
|
||||||
}
|
}
|
||||||
|
|
||||||
return 1; /* not reached */
|
return 1; /* not reached */
|
||||||
|
|
Loading…
Reference in New Issue
Block a user