use libc err(); ahd@kew.com

diff --git a/bin/rmail/rmail.c b/bin/rmail/rmail.c
index 1b8d4e4..1881934 100644 (file)
--- a/bin/rmail/rmail.c
+++ b/bin/rmail/rmail.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: rmail.c,v 1.5 1997/01/15 23:40:26 millert Exp $       */
+/*     $OpenBSD: rmail.c,v 1.6 1997/04/07 10:12:07 deraadt Exp $       */
 /*     $NetBSD: rmail.c,v 1.8 1995/09/07 06:51:50 jtc Exp $    */
 
 /*
@@ -44,7 +44,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.5 1997/01/15 23:40:26 millert Exp $";
+static char rcsid[] = "$OpenBSD: rmail.c,v 1.6 1997/04/07 10:12:07 deraadt Exp $";
 #endif
 #endif /* not lint */
 
@@ -68,9 +68,6 @@ static char rcsid[] = "$OpenBSD: rmail.c,v 1.5 1997/01/15 23:40:26 millert Exp $
  *
  * The output of rmail(8) compresses the <forward> lines into a single
  * from path.
- *
- * The err(3) routine is included here deliberately to make this code
- * a bit more portable.
  */
 #include <sys/param.h>
 #include <sys/stat.h>
@@ -353,32 +350,3 @@ usage()
        (void)fprintf(stderr, "usage: rmail [-T] [-D domain] user ...\n");
        exit(EX_USAGE);
 }
-
-#ifdef __STDC__
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
-
-void
-#ifdef __STDC__
-err(int eval, const char *fmt, ...)
-#else
-err(eval, fmt, va_alist)
-       int eval;
-       const char *fmt;
-       va_dcl
-#endif
-{
-       va_list ap;
-#if __STDC__
-       va_start(ap, fmt);
-#else
-       va_start(ap);
-#endif
-       (void)fprintf(stderr, "rmail: ");
-       (void)vfprintf(stderr, fmt, ap);
-       va_end(ap);
-       (void)fprintf(stderr, "\n");
-       exit(eval);
-}