Remove the ENDBODY_NOSPACE flag, simplifying the code.

[mandoc.git] / catman.c

diff --git a/catman.c b/catman.c
index 6c9276d4aea2fdaaa2d4cbdc36a714003bcf132a..a17657fbedb58cc715f86f68e86b59c1f69d479d 100644 (file)
--- a/catman.c
+++ b/catman.c
@@ -1,4 +1,4 @@
-/*     $Id: catman.c,v 1.15 2017/02/08 14:50:53 schwarze Exp $ */
+/*     $Id: catman.c,v 1.18 2017/02/09 20:53:33 schwarze Exp $ */
 /*
  * Copyright (c) 2017 Michael Stapelberg <stapelberg@debian.org>
  * Copyright (c) 2017 Ingo Schwarze <schwarze@openbsd.org>
@@ -17,6 +17,10 @@
  */
 #include "config.h"
 
+#if HAVE_CMSG_XPG42
+#define _XPG4_2
+#endif
+
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
@@ -37,6 +41,10 @@
 #include <time.h>
 #include <unistd.h>
 
+#ifndef O_DIRECTORY
+#define O_DIRECTORY 0
+#endif
+
 int     process_manpage(int, int, const char *);
 int     process_tree(int, int);
 void    run_mandocd(int, const char *, const char *)
@@ -53,10 +61,11 @@ run_mandocd(int sockfd, const char *outtype, const char* defos)
        if (snprintf(sockfdstr, sizeof(sockfdstr), "%d", sockfd) == -1)
                err(1, "snprintf");
        if (defos == NULL)
-               execlp("mandocd", "mandocd", "-T", outtype, sockfdstr, NULL);
+               execlp("mandocd", "mandocd", "-T", outtype,
+                   sockfdstr, (char *)NULL);
        else
                execlp("mandocd", "mandocd", "-T", outtype,
-                   "-I", defos, sockfdstr, NULL);
+                   "-I", defos, sockfdstr, (char *)NULL);
        err(1, "exec");
 }