diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1998-05-07 19:12:21 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1998-05-07 19:12:21 +0000 |
| commit | 860bdcaf761bcf8225b4dec33bfd17ad1d20c9b3 (patch) | |
| tree | e3e26584121e11991769f9123247bce7d765ebda /usr.bin/which | |
| parent | ff633278b017921bc019f19a8262d60d9147a522 (diff) | |
fix err() use
Diffstat (limited to 'usr.bin/which')
| -rw-r--r-- | usr.bin/which/which.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/usr.bin/which/which.c b/usr.bin/which/which.c index 592bd67de50..08fcf576efc 100644 --- a/usr.bin/which/which.c +++ b/usr.bin/which/which.c @@ -1,4 +1,4 @@ -/* $OpenBSD: which.c,v 1.3 1998/01/28 17:18:53 millert Exp $ */ +/* $OpenBSD: which.c,v 1.4 1998/05/07 19:12:20 deraadt Exp $ */ /* * Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com> @@ -31,7 +31,7 @@ */ #ifndef lint -static char rcsid[] = "$OpenBSD: which.c,v 1.3 1998/01/28 17:18:53 millert Exp $"; +static char rcsid[] = "$OpenBSD: which.c,v 1.4 1998/05/07 19:12:20 deraadt Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -100,23 +100,23 @@ main(argc, argv) mib[0] = CTL_USER; mib[1] = USER_CS_PATH; if (sysctl(mib, 2, NULL, &n, NULL, 0) == -1) - err(-1, "unable to get length of user.cs_path"); + err(1, "unable to get length of user.cs_path"); if (n == 0) - errx(-1, "user.cs_path was zero length!"); + errx(1, "user.cs_path was zero length!"); if ((path = (char *)malloc(n)) == NULL) - errx(-1, "can't allocate memory."); + errx(1, "can't allocate memory."); if (sysctl(mib, 2, path, &n, NULL, 0) == -1) - err(-1, "unable to get user.cs_path"); + err(1, "unable to get user.cs_path"); } else { if ((path = getenv("PATH")) == NULL) - err(-1, "can't get $PATH from environment"); + err(1, "can't get $PATH from environment"); } /* To make access(2) do what we want */ if (setgid(getegid())) - err(-1, "Can't set gid to %u", getegid()); + err(1, "Can't set gid to %u", getegid()); if (setuid(geteuid())) - err(-1, "Can't set uid to %u", geteuid()); + err(1, "Can't set uid to %u", geteuid()); for (n = optind; n < argc; n++) if (findprog(argv[n], path, progmode, allmatches) == 0) @@ -149,7 +149,7 @@ findprog(prog, path, progmode, allmatches) } if ((path = strdup(path)) == NULL) - errx(-1, "Can't allocate memory."); + errx(1, "Can't allocate memory."); proglen = strlen(prog); while ((p = strsep(&path, ":")) != NULL) { |