do not crash when a manpath directory contains a symbolic link

[mandoc.git] / compat_err.c

diff --git a/compat_err.c b/compat_err.c
index fd6e11f45e37dc8591cf892e92d2fae0f08f7b15..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.3 2015/11/07 14:22:29 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,6 +27,7 @@ int dummy;
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
+#include "config.h"
 
 #include <errno.h>
 #include <stdarg.h>
@@ -76,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, ...)
 {
@@ -96,5 +101,3 @@ warnx(const char *fmt, ...)
        va_end(ap);
        fputc('\n', stderr);
 }
-
-#endif