===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tail/misc.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- src/usr.bin/tail/misc.c	1997/01/12 23:43:05	1.3
+++ src/usr.bin/tail/misc.c	1999/02/03 02:09:30	1.4
@@ -1,4 +1,4 @@
-/*	$OpenBSD: misc.c,v 1.3 1997/01/12 23:43:05 millert dead $	*/
+/*	$OpenBSD: misc.c,v 1.4 1999/02/03 02:09:30 millert Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993
@@ -39,12 +39,14 @@
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)misc.c	8.1 (Berkeley) 6/6/93";
+#else
+static char rcsid[] = "$OpenBSD: misc.c,v 1.4 1999/02/03 02:09:30 millert Exp $";
 #endif
-static char rcsid[] = "$OpenBSD: misc.c,v 1.3 1997/01/12 23:43:05 millert dead $";
 #endif /* not lint */
 
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <err.h>
 #include <errno.h>
 #include <unistd.h>
 #include <stdio.h>
@@ -55,42 +57,14 @@
 void
 ierr()
 {
-	err(0, "%s: %s", fname, strerror(errno));
+
+	warn("%s", fname);
+	rval = 1;
 }
 
 void
 oerr()
 {
-	err(1, "stdout: %s", strerror(errno));
-}
 
-#if __STDC__
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
-
-void
-#if __STDC__
-err(int fatal, const char *fmt, ...)
-#else
-err(fatal, fmt, va_alist)
-	int fatal;
-	char *fmt;
-	va_dcl
-#endif
-{
-	va_list ap;
-#if __STDC__
-	va_start(ap, fmt);
-#else
-	va_start(ap);
-#endif
-	(void)fprintf(stderr, "tail: ");
-	(void)vfprintf(stderr, fmt, ap);
-	va_end(ap);
-	(void)fprintf(stderr, "\n");
-	if (fatal)
-		exit(1);
-	rval = 1;
+	err(1, "stdout");
 }