 @@ -1,14 +1,14 @@
-/*	$NetBSD: man.c,v 1.48 2013/07/18 15:39:08 christos Exp $	*/
+/*	$NetBSD: man.c,v 1.49 2013/07/18 16:01:25 christos Exp $	*/
 /*
  * Copyright (c) 1987, 1993, 1994, 1995
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -30,27 +30,27 @@
  */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1987, 1993, 1994, 1995\
  The Regents of the University of California.  All rights reserved.");
 #endif /* not lint */
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)man.c	8.17 (Berkeley) 1/31/95";
 #else
-__RCSID("$NetBSD: man.c,v 1.48 2013/07/18 15:39:08 christos Exp $");
+__RCSID("$NetBSD: man.c,v 1.49 2013/07/18 16:01:25 christos Exp $");
 #endif
 #endif /* not lint */
 #include <sys/param.h>
 #include <sys/queue.h>
 #include <sys/stat.h>
 #include <sys/utsname.h>
 #include <ctype.h>
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <fnmatch.h>
 @@ -112,28 +112,26 @@ struct manstate {
 static void	 build_page(char *, char **, struct manstate *);
 static void	 cat(char *);
 static const char	*check_pager(const char *);
 static int	 cleanup(void);
 static void	 how(char *);
 static void	 jump(char **, const char *, const char *);
 static int	 manual(char *, struct manstate *, glob_t *);
 static void	 onsig(int);
 static void	 usage(void) __attribute__((__noreturn__));
 static void	 addpath(struct manstate *, const char *, size_t, const char *);
 static const char *getclass(const char *);
 static void printmanpath(struct manstate *);
 static char EMPTY[1];
 /*
  * main function
  */
 int
 main(int argc, char **argv)
+{
 	static struct manstate m;
 	int ch, abs_section, found;
 	ENTRY *esubd, *epath;
 	char *p, **ap, *cmd;
 	size_t len;
 	glob_t pg;
 @@ -577,34 +575,34 @@ manual(char *page, struct manstate *mp,
 			p[0] = '\0';
 		found = 0;
 		for (cnt = pg->gl_pathc - pg->gl_matchc;
 		    cnt < pg->gl_pathc; ++cnt)
+		{
 			found = manual_find_buildkeyword(escpage, "%s%s",
 				mp, pg, cnt);
 			if (found) {
 				anyfound = 1;
 				if (!mp->all) {
 					/* Delete any other matches. */
 					while (++cnt< pg->gl_pathc)
-						pg->gl_pathv[cnt] = EMPTY;
+						*pg->gl_pathv[cnt] = '\0';
 					break;
+				}
 				continue;
+			}
 			/* It's not a man page, forget about it. */
-			pg->gl_pathv[cnt] = EMPTY;
+			*pg->gl_pathv[cnt] = '\0';
+		}
   notfound:
 		if (!anyfound) {
 			if (addentry(mp->missinglist, page, 0) < 0) {
 				warn("malloc");
 				(void)cleanup();
 				exit(EXIT_FAILURE);
+			}
+		}
 		free(escpage);
 		return anyfound;
+	}
 @@ -633,27 +631,27 @@ manual(char *page, struct manstate *mp,
 		/*
 		 * start going through the matches glob(3) just found and
 		 * use m.pathsearch (if present) to filter out pages we
 		 * don't want.  then verify the suffix is valid, and build
 		 * the page if we have a _build suffix.
 		 */
 		for (cnt = pg->gl_pathc - pg->gl_matchc;
 		    cnt < pg->gl_pathc; ++cnt) {
 			/* filter on directory path name */
 			if (mp->pathsearch) {
 				p = strstr(pg->gl_pathv[cnt], mp->pathsearch);
 				if (!p || strchr(p, '/') == NULL) {
-					pg->gl_pathv[cnt] = EMPTY; /* zap! */
+					*pg->gl_pathv[cnt] = '\0'; /* zap! */
 					continue;
+				}
+			}
 			/*
 			 * Try the _suffix key words first.
+			 *
 			 * XXX
 			 * Older versions of man.conf didn't have the suffix
 			 * key words, it was assumed that everything was a .0.
 			 * We just test for .0 first, it's fast and probably
 			 * going to hit.
 			 */
 @@ -672,34 +670,34 @@ manual(char *page, struct manstate *mp,
+				}
+			}
 			if (found)
 				goto next;
 			/* Try the _build key words next. */
 			found = manual_find_buildkeyword(escpage, "*/%s%s",
 				mp, pg, cnt);
 			if (found) {
 next:				anyfound = 1;
 				if (!mp->all) {
 					/* Delete any other matches. */
 					while (++cnt< pg->gl_pathc)
-						pg->gl_pathv[cnt] = EMPTY;
+						*pg->gl_pathv[cnt] = '\0';
 					break;
+				}
 				continue;
+			}
 			/* It's not a man page, forget about it. */
-			pg->gl_pathv[cnt] = EMPTY;
+			*pg->gl_pathv[cnt] = '\0';
+		}
 		if (anyfound && !mp->all)
 			break;
+	}
 	/* If not found, enter onto the missing list. */
 	if (!anyfound) {
 		if (addentry(mp->missinglist, page, 0) < 0) {
 			warn("malloc");
 			(void)cleanup();
 			exit(EXIT_FAILURE);
+		}