(patch) correct error messages in mailwrapper(8)

[Andrey Matveev <andrushock_(_at_)_korovino_(_dot_)_net>]

err(3)/errx(3) functions display program name, so no need to include
progname in error message by hands to prevent output, for example, like this: 
mailwrapper: mailwrapper: no mapping in /etc/mailer.conf

Index: usr.sbin/mailwrapper/mailwrapper.c
===================================================================
RCS file: /cvs/src/usr.sbin/mailwrapper/mailwrapper.c,v
retrieving revision 1.12
diff -u -r1.12 mailwrapper.c
--- usr.sbin/mailwrapper/mailwrapper.c	2002/12/20 15:29:54	1.12
+++ usr.sbin/mailwrapper/mailwrapper.c	2003/03/08 20:55:16
@@ -61,7 +61,7 @@
 	al->argc = 0;
 	al->maxc = 10;
 	if ((al->argv = malloc(al->maxc * sizeof(char *))) == NULL)
-		err(1, "mailwrapper");
+		err(1, "malloc");
 }
 
 static void
@@ -77,14 +77,14 @@
 			if (al->argv)
 				free(al->argv);
 			al->argv = NULL;
-			err(1, "mailwrapper");
+			err(1, "realloc");
 		} else {
 			al->argv = argv2;
 		}
 	}
 	if (copy) {
 		if ((al->argv[al->argc++] = strdup(arg)) == NULL)
-			err(1, "mailwrapper");
+			err(1, "strdup");
 	} else
 		al->argv[al->argc++] = (char *)arg;
 }
@@ -104,20 +104,19 @@
 	if ((config = fopen(_PATH_MAILERCONF, "r")) == NULL) {
 		addarg(&al, NULL, 0);
 		openlog("mailwrapper", LOG_PID, LOG_MAIL);
-		syslog(LOG_INFO, "can't open %s, using %s as default MTA",
+		syslog(LOG_INFO, "cannot open %s, using %s as default MTA",
 		    _PATH_MAILERCONF, _PATH_DEFAULTMTA);
 		closelog();
 		execve(_PATH_DEFAULTMTA, al.argv, envp);
-		err(1, "mailwrapper: execing %s", _PATH_DEFAULTMTA);
+		err(1, "executing %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, "fparseln");
 		}
 
 #define	WS	" \t\n"
@@ -154,10 +153,10 @@
 	addarg(&al, NULL, 0);
 
 	execve(to, al.argv, envp);
-	err(1, "mailwrapper: execing %s", to);
+	err(1, "executing %s", to);
 	/*NOTREACHED*/
 parse_error:
-	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*/
 }