Make it more explicit that the statement "-O tag does not work with less(1)"

[mandoc.git] / compat_err.c

diff --git a/compat_err.c b/compat_err.c
index 5107c4607f0c647f3955494eabc1e8f3c55a85dd..31994cbfaee7ebe893659fa8fec3f09d7390b159 100644 (file)
--- a/compat_err.c
+++ b/compat_err.c
@@ -1,12 +1,4 @@
-#include "config.h"
-
-#if HAVE_ERR
-
-int dummy;
-
-#else
-
-/* $Id: compat_err.c,v 1.1 2015/10/11 21:12:54 schwarze Exp $ */
+/* $Id: compat_err.c,v 1.5 2020/06/15 01:37:14 schwarze Exp $ */
 /*
  * Copyright (c) 1993
  *      The Regents of the University of California.  All rights reserved.
@@ -35,23 +27,21 @@ int dummy;
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
+#include "config.h"
 
-#include <err.h>
 #include <errno.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-extern char *__progname;
-
 static void vwarni(const char *, va_list);
 static void vwarnxi(const char *, va_list);
 
 static void
 vwarnxi(const char *fmt, va_list ap)
 {
-       fprintf(stderr, "%s: ", __progname);
+       fprintf(stderr, "%s: ", getprogname());
        if (fmt != NULL)
                vfprintf(stderr, fmt, ap);
 }
@@ -79,6 +69,18 @@ err(int eval, const char *fmt, ...)
        exit(eval);
 }
 
+void
+errx(int eval, const char *fmt, ...)
+{
+       va_list ap;
+
+       va_start(ap, fmt);
+       vwarnxi(fmt, ap);
+       va_end(ap);
+       fputc('\n', stderr);
+       exit(eval);
+}
+
 void
 warn(const char *fmt, ...)
 {
@@ -99,5 +101,3 @@ warnx(const char *fmt, ...)
        va_end(ap);
        fputc('\n', stderr);
 }
-
-#endif