===================================================================
RCS file: /cvs/mandoc/main.c,v
retrieving revision 1.221
retrieving revision 1.224
diff -u -p -r1.221 -r1.224
--- mandoc/main.c	2015/02/16 16:23:54	1.221
+++ mandoc/main.c	2015/03/10 03:02:28	1.224
@@ -1,4 +1,4 @@
-/*	$Id: main.c,v 1.221 2015/02/16 16:23:54 schwarze Exp $ */
+/*	$Id: main.c,v 1.224 2015/03/10 03:02:28 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2012, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -20,11 +20,13 @@
 
 #include <sys/types.h>
 #include <sys/param.h>	/* MACHINE */
+#include <sys/wait.h>
 
 #include <assert.h>
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <glob.h>
 #include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
@@ -302,18 +304,20 @@ main(int argc, char *argv[])
 				argc = 1;
 			}
 		} else if (argc > 1 &&
-		    ((uc = argv[0]) != NULL) &&
+		    ((uc = (unsigned char *)argv[0]) != NULL) &&
 		    ((isdigit(uc[0]) && (uc[1] == '\0' ||
 		      (isalpha(uc[1]) && uc[2] == '\0'))) ||
 		     (uc[0] == 'n' && uc[1] == '\0'))) {
-			search.sec = uc;
+			search.sec = (char *)uc;
 			argv++;
 			argc--;
 		}
 		if (search.arch == NULL)
 			search.arch = getenv("MACHINE");
+#ifdef MACHINE
 		if (search.arch == NULL)
 			search.arch = MACHINE;
+#endif
 	}
 
 	rc = MANDOCLEVEL_OK;
@@ -478,6 +482,21 @@ 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.
+	 */
+
+	fclose(stdout);
+
+	/*
+	 * 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);
 }
 
@@ -517,16 +536,16 @@ fs_lookup(const struct manpaths *paths, size_t ipath,
 	const char *sec, const char *arch, const char *name,
 	struct manpage **res, size_t *ressz)
 {
+	glob_t		 globinfo;
 	struct manpage	*page;
 	char		*file;
-	int		 form;
+	int		 form, globres;
 
+	form = FORM_SRC;
 	mandoc_asprintf(&file, "%s/man%s/%s.%s",
 	    paths->paths[ipath], sec, name, sec);
-	if (access(file, R_OK) != -1) {
-		form = FORM_SRC;
+	if (access(file, R_OK) != -1)
 		goto found;
-	}
 	free(file);
 
 	mandoc_asprintf(&file, "%s/cat%s/%s.0",
@@ -540,14 +559,24 @@ fs_lookup(const struct manpaths *paths, size_t ipath,
 	if (arch != NULL) {
 		mandoc_asprintf(&file, "%s/man%s/%s/%s.%s",
 		    paths->paths[ipath], sec, arch, name, sec);
-		if (access(file, R_OK) != -1) {
-			form = FORM_SRC;
+		if (access(file, R_OK) != -1)
 			goto found;
-		}
 		free(file);
 	}
-	return(0);
 
+	mandoc_asprintf(&file, "%s/man%s/%s.*",
+	    paths->paths[ipath], sec, name);
+	globres = glob(file, 0, NULL, &globinfo);
+	if (globres != 0 && globres != GLOB_NOMATCH)
+		fprintf(stderr, "%s: %s: glob: %s\n",
+		    progname, file, strerror(errno));
+	free(file);
+	if (globres == 0)
+		file = mandoc_strdup(*globinfo.gl_pathv);
+	globfree(&globinfo);
+	if (globres != 0)
+		return(0);
+
 found:
 #if HAVE_SQLITE3
 	fprintf(stderr, "%s: outdated mandoc.db lacks %s(%s) entry,\n"
@@ -938,18 +967,19 @@ spawn_pager(void)
 		    progname, strerror(errno));
 		exit((int)MANDOCLEVEL_SYSERR);
 	case 0:
+		break;
+	default:
 		close(fildes[0]);
 		if (dup2(fildes[1], STDOUT_FILENO) == -1) {
 			fprintf(stderr, "%s: dup output: %s\n",
 			    progname, strerror(errno));
 			exit((int)MANDOCLEVEL_SYSERR);
 		}
+		close(fildes[1]);
 		return;
-	default:
-		break;
 	}
 
-	/* The original process becomes the pager. */
+	/* The child process becomes the pager. */
 
 	close(fildes[1]);
 	if (dup2(fildes[0], STDIN_FILENO) == -1) {
@@ -957,6 +987,7 @@ spawn_pager(void)
 		    progname, strerror(errno));
 		exit((int)MANDOCLEVEL_SYSERR);
 	}
+	close(fildes[0]);
 
 	pager = getenv("MANPAGER");
 	if (pager == NULL || *pager == '\0')