fbt/sbase
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Audit env(1)

Browse Source 
1) Shorten synopsis and reflect this in the manual
2) Use argv0 in usage()
3) Decrement argc in argv-loop for consistency
4) Make it clearer which error-code results from which errno in enprintf
5) Use idiomatic for-loop also for environ. Don't increment these pointers
   in the loop itself!
This commit is contained in:
FRIGN
2015-03-02 14:50:43 +01:00
parent 933ed8c00b
commit 27656a0cbc
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
env.c
View File

@@ -12,7 +12,7 @@ extern char **environ;
static void
usage(void)
{
eprintf("usage: env [-i] [-u variable] ... [variable=value] ... [cmd [arg ...]]\n");
eprintf("usage: %s [-i] [-u var] ... [var=value] ... [cmd [arg ...]]\n", argv0);
}
int
@@ -30,16 +30,16 @@ main(int argc, char *argv[])
usage();
} ARGEND;
for (; *argv && strchr(*argv, '='); argv++)
for (; *argv && strchr(*argv, '='); argc--, argv++)
putenv(*argv);
if (*argv) {
execvp(*argv, argv);
enprintf(127 - (errno != EEXIST), "env: '%s':", *argv);
enprintf(126 + (errno == EEXIST), "execvp: %s:", *argv);
}
while (environ && *environ)
printf("%s\n", *environ++);
for (; environ && *environ; environ++)
puts(*environ);
return 0;
}