===================================================================
RCS file: /cvs/mandoc/main.c,v
retrieving revision 1.224
retrieving revision 1.226
diff -u -p -r1.224 -r1.226
--- mandoc/main.c	2015/03/10 03:02:28	1.224
+++ mandoc/main.c	2015/03/17 07:33:07	1.226
@@ -1,4 +1,4 @@
-/*	$Id: main.c,v 1.224 2015/03/10 03:02:28 schwarze Exp $ */
+/*	$Id: main.c,v 1.226 2015/03/17 07:33:07 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2012, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -27,6 +27,7 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <glob.h>
+#include <signal.h>
 #include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
@@ -92,6 +93,7 @@ static	int		  fs_lookup(const struct manpaths *,
 static	void		  fs_search(const struct mansearch *,
 				const struct manpaths *, int, char**,
 				struct manpage **, size_t *);
+static	void		  handle_sigpipe(int);
 static	int		  koptions(int *, char *);
 #if HAVE_SQLITE3
 int			  mandocdb(int, char**);
@@ -102,7 +104,7 @@ static	void		  mmsg(enum mandocerr, enum mandoclevel,
 static	void		  parse(struct curparse *, int,
 				const char *, enum mandoclevel *);
 static	enum mandoclevel  passthrough(const char *, int, int);
-static	void		  spawn_pager(void);
+static	pid_t		  spawn_pager(void);
 static	int		  toptions(struct curparse *, char *);
 static	void		  usage(enum argmode) __attribute__((noreturn));
 static	int		  woptions(struct curparse *, char *);
@@ -111,6 +113,7 @@ static	const int sec_prios[] = {1, 4, 5, 8, 6, 3, 7, 2
 static	char		  help_arg[] = "help";
 static	char		 *help_argv[] = {help_arg, NULL};
 static	const char	 *progname;
+static	enum mandoclevel  rc;
 
 
 int
@@ -127,13 +130,13 @@ main(int argc, char *argv[])
 	size_t		 isec, i, sz;
 	int		 prio, best_prio, synopsis_only;
 	char		 sec;
-	enum mandoclevel rc, rctmp;
+	enum mandoclevel rctmp;
 	enum outmode	 outmode;
 	int		 fd;
 	int		 show_usage;
-	int		 use_pager;
 	int		 options;
 	int		 c;
+	pid_t		 pager_pid;  /* 0: don't use; 1: not yet spawned. */
 
 	if (argc < 1)
 		progname = "mandoc";
@@ -175,7 +178,7 @@ main(int argc, char *argv[])
 	options = MPARSE_SO | MPARSE_UTF8 | MPARSE_LATIN1;
 	defos = NULL;
 
-	use_pager = 1;
+	pager_pid = 1;
 	show_usage = 0;
 	synopsis_only = 0;
 	outmode = OUTMODE_DEF;
@@ -190,7 +193,7 @@ main(int argc, char *argv[])
 			conf_file = optarg;
 			break;
 		case 'c':
-			use_pager = 0;
+			pager_pid = 0;
 			break;
 		case 'f':
 			search.argmode = ARG_WORD;
@@ -198,7 +201,7 @@ main(int argc, char *argv[])
 		case 'h':
 			(void)strlcat(curp.outopts, "synopsis,", BUFSIZ);
 			synopsis_only = 1;
-			use_pager = 0;
+			pager_pid = 0;
 			outmode = OUTMODE_ALL;
 			break;
 		case 'I':
@@ -273,7 +276,7 @@ main(int argc, char *argv[])
 		switch (search.argmode) {
 		case ARG_FILE:
 			outmode = OUTMODE_ALL;
-			use_pager = 0;
+			pager_pid = 0;
 			break;
 		case ARG_NAME:
 			outmode = OUTMODE_ONE;
@@ -418,8 +421,8 @@ main(int argc, char *argv[])
 		mparse_keep(curp.mp);
 
 	if (argc < 1) {
-		if (use_pager && isatty(STDOUT_FILENO))
-			spawn_pager();
+		if (pager_pid == 1 && isatty(STDOUT_FILENO))
+			pager_pid = spawn_pager();
 		parse(&curp, STDIN_FILENO, "<stdin>", &rc);
 	}
 
@@ -430,9 +433,8 @@ main(int argc, char *argv[])
 			rc = rctmp;
 
 		if (fd != -1) {
-			if (use_pager && isatty(STDOUT_FILENO))
-				spawn_pager();
-			use_pager = 0;
+			if (pager_pid == 1 && isatty(STDOUT_FILENO))
+				pager_pid = spawn_pager();
 
 			if (resp == NULL)
 				parse(&curp, fd, *argv, &rc);
@@ -483,20 +485,16 @@ out:
 	free(defos);
 
 	/*
-	 * Flush the output and signal end of file.
-	 * If a pager is attached, it allows browsing to the end.
-	 * Otherwise, it does no harm, we are about to exit anyway.
+	 * If a pager is attached, flush the pipe leading to it
+	 * and signal end of file such that the user can browse
+	 * to the end.  Then wait for the user to close the pager.
 	 */
 
-	fclose(stdout);
+	if (pager_pid != 0 && pager_pid != 1) {
+		fclose(stdout);
+		waitpid(pager_pid, NULL, 0);
+	}
 
-	/*
-	 * If we spawned a pager, wait for the user to close it.
-	 * Otherwise, this call fails with no adverse effect.
-	 */
-
-	wait(NULL);
-
 	return((int)rc);
 }
 
@@ -946,6 +944,13 @@ mmsg(enum mandocerr t, enum mandoclevel lvl,
 }
 
 static void
+handle_sigpipe(int signum)
+{
+
+	exit(rc);
+}
+
+static pid_t
 spawn_pager(void)
 {
 #define MAX_PAGER_ARGS 16
@@ -954,14 +959,15 @@ spawn_pager(void)
 	char		*cp;
 	int		 fildes[2];
 	int		 argc;
+	pid_t		 pager_pid;
 
 	if (pipe(fildes) == -1) {
 		fprintf(stderr, "%s: pipe: %s\n",
 		    progname, strerror(errno));
-		return;
+		return(0);
 	}
 
-	switch (fork()) {
+	switch (pager_pid = fork()) {
 	case -1:
 		fprintf(stderr, "%s: fork: %s\n",
 		    progname, strerror(errno));
@@ -976,7 +982,8 @@ spawn_pager(void)
 			exit((int)MANDOCLEVEL_SYSERR);
 		}
 		close(fildes[1]);
-		return;
+		signal(SIGPIPE, handle_sigpipe);
+		return(pager_pid);
 	}
 
 	/* The child process becomes the pager. */