X-Git-Url: https://git.cameronkatri.com/mandoc.git/blobdiff_plain/05ede23b72a253dad7a9e6f68dc14d4f2a1ea3c2..e1a01aa9b20122cb40cafd18bb9e1047e1617e61:/catman.c

diff --git a/catman.c b/catman.c
index 6c9276d4..e46613eb 100644
--- 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.23 2021/10/15 15:04:02 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 NEED_XPG4_2
+#define _XPG4_2
+#endif
+
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
@@ -40,9 +44,9 @@
 int	 process_manpage(int, int, const char *);
 int	 process_tree(int, int);
 void	 run_mandocd(int, const char *, const char *)
-		__attribute__((noreturn));
+		__attribute__((__noreturn__));
 ssize_t	 sock_fd_write(int, int, int, int);
-void	 usage(void) __attribute__((noreturn));
+void	 usage(void) __attribute__((__noreturn__));
 
 
 void
@@ -53,11 +57,12 @@ 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);
-	err(1, "exec");
+		    "-I", defos, sockfdstr, (char *)NULL);
+	err(1, "exec(mandocd)");
 }
 
 ssize_t
@@ -249,7 +254,7 @@ main(int argc, char **argv)
 void
 usage(void)
 {
-	fprintf(stderr, "usage: catman [-I os=name] [-T output] "
-	    "srcdir dstdir\n");
+	fprintf(stderr, "usage: %s [-I os=name] [-T output] "
+	    "srcdir dstdir\n", BINM_CATMAN);
 	exit(1);
 }