d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not add progname in err() strings, it will be printed twice

Browse Source
This commit is contained in:
Philippe Charnier 2000-05-28 15:02:26 +00:00
parent db66828c4b
commit 39e80db3db
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=61023
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
usr.sbin/mailwrapper/mailwrapper.8
View File

@ -118,7 +118,7 @@ Configuration for
is kept in is kept in
.Pa /etc/mail/mailer.conf . .Pa /etc/mail/mailer.conf .
.Pa /usr/sbin/sendmail .Pa /usr/sbin/sendmail
is typically set up as a symlink to is typically set up as a symbolic link to
.Nm .Nm
which is not usually invoked on its own. which is not usually invoked on its own.
.Sh DIAGNOSTICS .Sh DIAGNOSTICS

17
usr.sbin/mailwrapper/mailwrapper.c
View File

@ -64,7 +64,7 @@ initarg(al)
al->argc = 0; al->argc = 0;
al->maxc = 10; al->maxc = 10;
if ((al->argv = malloc(al->maxc * sizeof(char *))) == NULL) if ((al->argv = malloc(al->maxc * sizeof(char *))) == NULL)
err(1, "mailwrapper"); err(1, NULL);
} }
static void static void
@ -83,14 +83,14 @@ addarg(al, arg, copy)
if (al->argv) if (al->argv)
free(al->argv); free(al->argv);
al->argv = NULL; al->argv = NULL;
err(1, "mailwrapper"); err(1, NULL);
} else { } else {
al->argv = argv2; al->argv = argv2;
} }
} }
if (copy) { if (copy) {
if ((al->argv[al->argc++] = strdup(arg)) == NULL) if ((al->argv[al->argc++] = strdup(arg)) == NULL)
err(1, "mailwrapper"); err(1, NULL);
} else } else
al->argv[al->argc++] = (char *)arg; al->argv[al->argc++] = (char *)arg;
} }
@ -131,16 +131,15 @@ main(argc, argv, envp)
execve(_PATH_DEFAULTMTA, al.argv, envp); execve(_PATH_DEFAULTMTA, al.argv, envp);
freearg(&al, 0); freearg(&al, 0);
free(line); free(line);
err(1, "mailwrapper: execing %s", _PATH_DEFAULTMTA); err(1, "execing %s", _PATH_DEFAULTMTA);
/*NOTREACHED*/ /*NOTREACHED*/
} }
for (;;) { for (;;) {
if ((line = fparseln(config, &len, &lineno, NULL, 0)) == NULL) { if ((line = fparseln(config, &len, &lineno, NULL, 0)) == NULL) {
if (feof(config)) if (feof(config))
errx(1, "mailwrapper: no mapping in %s", errx(1, "no mapping in %s", _PATH_MAILERCONF);
_PATH_MAILERCONF); err(1, "can't parse line %lu", (u_long)lineno);
err(1, "mailwrapper");
} }
#define WS " \t\n" #define WS " \t\n"
@ -178,12 +177,12 @@ main(argc, argv, envp)
execve(to, al.argv, envp); execve(to, al.argv, envp);
freearg(&al, 0); freearg(&al, 0);
free(line); free(line);
err(1, "mailwrapper: execing %s", to); err(1, "execing %s", to);
/*NOTREACHED*/ /*NOTREACHED*/
parse_error: parse_error:
freearg(&al, 0); freearg(&al, 0);
free(line); 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); _PATH_MAILERCONF, (u_long)lineno);
/*NOTREACHED*/ /*NOTREACHED*/
} }