diff options
author | charnier <charnier@FreeBSD.org> | 2000-05-28 15:02:26 +0000 |
---|---|---|
committer | charnier <charnier@FreeBSD.org> | 2000-05-28 15:02:26 +0000 |
commit | 2d96b5343da8c5ac2038a5585a32aca35f8618b1 (patch) | |
tree | 0ad3f048420ed6781e3a9f36648db20b23fc9333 | |
parent | 0d13eca3cca9ca49dfb6be6a39ad1c6a57a687af (diff) | |
download | FreeBSD-src-2d96b5343da8c5ac2038a5585a32aca35f8618b1.zip FreeBSD-src-2d96b5343da8c5ac2038a5585a32aca35f8618b1.tar.gz |
Do not add progname in err() strings, it will be printed twice
-rw-r--r-- | usr.sbin/mailwrapper/mailwrapper.8 | 2 | ||||
-rw-r--r-- | usr.sbin/mailwrapper/mailwrapper.c | 17 |
2 files changed, 9 insertions, 10 deletions
diff --git a/usr.sbin/mailwrapper/mailwrapper.8 b/usr.sbin/mailwrapper/mailwrapper.8 index f0402a1..3f0c5dd 100644 --- a/usr.sbin/mailwrapper/mailwrapper.8 +++ b/usr.sbin/mailwrapper/mailwrapper.8 @@ -118,7 +118,7 @@ Configuration for is kept in .Pa /etc/mail/mailer.conf . .Pa /usr/sbin/sendmail -is typically set up as a symlink to +is typically set up as a symbolic link to .Nm which is not usually invoked on its own. .Sh DIAGNOSTICS diff --git a/usr.sbin/mailwrapper/mailwrapper.c b/usr.sbin/mailwrapper/mailwrapper.c index 0fc1d24..509496b 100644 --- a/usr.sbin/mailwrapper/mailwrapper.c +++ b/usr.sbin/mailwrapper/mailwrapper.c @@ -64,7 +64,7 @@ initarg(al) al->argc = 0; al->maxc = 10; if ((al->argv = malloc(al->maxc * sizeof(char *))) == NULL) - err(1, "mailwrapper"); + err(1, NULL); } static void @@ -83,14 +83,14 @@ addarg(al, arg, copy) if (al->argv) free(al->argv); al->argv = NULL; - err(1, "mailwrapper"); + err(1, NULL); } else { al->argv = argv2; } } if (copy) { if ((al->argv[al->argc++] = strdup(arg)) == NULL) - err(1, "mailwrapper"); + err(1, NULL); } else al->argv[al->argc++] = (char *)arg; } @@ -131,16 +131,15 @@ main(argc, argv, envp) execve(_PATH_DEFAULTMTA, al.argv, envp); freearg(&al, 0); free(line); - err(1, "mailwrapper: execing %s", _PATH_DEFAULTMTA); + err(1, "execing %s", _PATH_DEFAULTMTA); /*NOTREACHED*/ } for (;;) { if ((line = fparseln(config, &len, &lineno, NULL, 0)) == NULL) { if (feof(config)) - errx(1, "mailwrapper: no mapping in %s", - _PATH_MAILERCONF); - err(1, "mailwrapper"); + errx(1, "no mapping in %s", _PATH_MAILERCONF); + err(1, "can't parse line %lu", (u_long)lineno); } #define WS " \t\n" @@ -178,12 +177,12 @@ main(argc, argv, envp) execve(to, al.argv, envp); freearg(&al, 0); free(line); - err(1, "mailwrapper: execing %s", to); + err(1, "execing %s", to); /*NOTREACHED*/ parse_error: freearg(&al, 0); free(line); - errx(1, "mailwrapper: parse error in %s at line %lu", + errx(1, "parse error in %s at line %lu", _PATH_MAILERCONF, (u_long)lineno); /*NOTREACHED*/ } |