diff options
| -rw-r--r-- | bin/rmail/rmail.c | 8 | ||||
| -rw-r--r-- | usr.bin/lndir/lndir.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/bin/rmail/rmail.c b/bin/rmail/rmail.c index 8ddd857e7c3..d381deebb55 100644 --- a/bin/rmail/rmail.c +++ b/bin/rmail/rmail.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rmail.c,v 1.20 2005/11/12 13:27:59 deraadt Exp $ */ +/* $OpenBSD: rmail.c,v 1.21 2006/11/15 22:23:09 miod Exp $ */ /* $NetBSD: rmail.c,v 1.8 1995/09/07 06:51:50 jtc Exp $ */ /* @@ -40,7 +40,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)rmail.c 8.3 (Berkeley) 5/15/95"; #else -static char rcsid[] = "$OpenBSD: rmail.c,v 1.20 2005/11/12 13:27:59 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: rmail.c,v 1.21 2006/11/15 22:23:09 miod Exp $"; #endif #endif /* not lint */ @@ -77,6 +77,7 @@ static char rcsid[] = "$OpenBSD: rmail.c,v 1.20 2005/11/12 13:27:59 deraadt Exp #include <string.h> #include <sysexits.h> #include <unistd.h> +#include <err.h> #include <errno.h> #ifndef MAX @@ -85,7 +86,6 @@ static char rcsid[] = "$OpenBSD: rmail.c,v 1.20 2005/11/12 13:27:59 deraadt Exp extern char *__progname; -void err(int, const char *, ...); void usage(void); #define TAYLOR_ENV /* use UU_MACHINE if present */ @@ -336,7 +336,7 @@ main(int argc, char *argv[]) } while (fgets(lbuf, sizeof(lbuf), stdin) != NULL); if (ferror(stdin)) - err(EX_TEMPFAIL, "stdin: %s", strerror(errno)); + err(EX_TEMPFAIL, "stdin"); if (fclose(fp)) err(EX_OSERR, NULL); diff --git a/usr.bin/lndir/lndir.c b/usr.bin/lndir/lndir.c index 7ba511a7f22..1a7c6563940 100644 --- a/usr.bin/lndir/lndir.c +++ b/usr.bin/lndir/lndir.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lndir.c,v 1.17 2005/10/04 19:30:00 jmc Exp $ */ +/* $OpenBSD: lndir.c,v 1.18 2006/11/15 22:23:11 miod Exp $ */ /* $XConsortium: lndir.c /main/15 1995/08/30 10:56:18 gildea $ */ /* @@ -126,7 +126,7 @@ main(int argc, char *argv[]) if (stat(fn, &fs) < 0) err(1, "%s", fn); if (!(S_ISDIR(fs.st_mode))) - err(2, "%s: %s", fn, strerror(ENOTDIR)); + errx(2, "%s: %s", fn, strerror(ENOTDIR)); exit(dodir(fn, &fs, &ts, 0)); } |