Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

simplify error message handling by using err() function.

This commit is contained in:
jtc 1993-11-10 20:06:00 +00:00
parent 81fd674b7b
commit 3ee54fb39e
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
usr.bin/env/env.c vendored
View File

@ -39,7 +39,7 @@ char copyright[] =
#ifndef lint #ifndef lint
/*static char sccsid[] = "from: @(#)env.c 5.3 (Berkeley) 6/1/90";*/ /*static char sccsid[] = "from: @(#)env.c 5.3 (Berkeley) 6/1/90";*/
static char rcsid[] = "$Id: env.c,v 1.4 1993/08/27 22:30:23 jtc Exp $"; static char rcsid[] = "$Id: env.c,v 1.5 1993/11/10 20:06:00 jtc Exp $";
#endif /* not lint */ #endif /* not lint */
#include <stdio.h> #include <stdio.h>
@ -47,6 +47,7 @@ static char rcsid[] = "$Id: env.c,v 1.4 1993/08/27 22:30:23 jtc Exp $";
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#include <unistd.h> #include <unistd.h>
#include <err.h>
static void usage(); static void usage();
@ -61,7 +62,7 @@ main(argc, argv)
char *cleanenv[1]; char *cleanenv[1];
int ch; int ch;
while ((ch = getopt(argc, argv, "-i")) != EOF) while ((ch = getopt(argc, argv, "-i")) != -1)
switch((char)ch) { switch((char)ch) {
case '-': /* obsolete */ case '-': /* obsolete */
case 'i': case 'i':
@ -79,12 +80,10 @@ main(argc, argv)
if (*argv) { if (*argv) {
/* return 127 if the command to be run could not be found; 126 /* return 127 if the command to be run could not be found; 126
if the command was was found but could not be invoked */ if the command was was found but could not be invoked */
int status;
execvp(*argv, argv); execvp(*argv, argv);
status = (errno == ENOENT) ? 127 : 126; err((errno == ENOENT) ? 127 : 126, "%s", *argv);
(void)fprintf(stderr, "env: %s: %s\n", *argv, strerror(errno)); /* NOTREACHED */
exit(status);
} }
for (ep = environ; *ep; ep++) for (ep = environ; *ep; ep++)