X-Git-Url: https://git.cameronkatri.com/mandoc.git/blobdiff_plain/b97d34324cdec9efa4093d1fd5113e1c806f2f8d..3dfee9ea37ce25813fe91a089b7bcdaec3426db5:/catman.c

diff --git a/catman.c b/catman.c
index 88a818ac..7d62c0e7 100644
--- a/catman.c
+++ b/catman.c
@@ -1,4 +1,4 @@
-/*	$Id: catman.c,v 1.17 2017/02/09 18:46:44 schwarze Exp $ */
+/*	$Id: catman.c,v 1.21 2017/02/18 12:24:24 schwarze Exp $ */
 /*
  * Copyright (c) 2017 Michael Stapelberg <stapelberg@debian.org>
  * Copyright (c) 2017 Ingo Schwarze <schwarze@openbsd.org>
@@ -41,16 +41,12 @@
 #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 *)
-		__attribute__((noreturn));
+		__attribute__((__noreturn__));
 ssize_t	 sock_fd_write(int, int, int, int);
-void	 usage(void) __attribute__((noreturn));
+void	 usage(void) __attribute__((__noreturn__));
 
 
 void
@@ -61,10 +57,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");
 }
 
@@ -257,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);
 }