===================================================================
RCS file: /cvs/mandoc/main.c,v
retrieving revision 1.203
retrieving revision 1.206
diff -u -p -r1.203 -r1.206
--- mandoc/main.c	2014/12/09 07:29:42	1.203
+++ mandoc/main.c	2014/12/15 18:05:57	1.206
@@ -1,4 +1,4 @@
-/*	$Id: main.c,v 1.203 2014/12/09 07:29:42 schwarze Exp $ */
+/*	$Id: main.c,v 1.206 2014/12/15 18:05:57 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2011, 2012, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -91,7 +91,9 @@ static	void		  mmsg(enum mandocerr, enum mandoclevel,
 				const char *, int, int, const char *);
 static	void		  parse(struct curparse *, int,
 				const char *, enum mandoclevel *);
+#if HAVE_SQLITE3
 static	enum mandoclevel  passthrough(const char *, int, int);
+#endif
 static	void		  spawn_pager(void);
 static	int		  toptions(struct curparse *, char *);
 static	void		  usage(enum argmode) __attribute__((noreturn));
@@ -110,12 +112,13 @@ main(int argc, char *argv[])
 	struct curparse	 curp;
 	struct mansearch search;
 	struct manpaths	 paths;
-	char		*conf_file, *defpaths, *auxpaths;
+	char		*auxpaths;
 	char		*defos;
 #if HAVE_SQLITE3
 	struct manpage	*res, *resp;
+	char		*conf_file, *defpaths;
 	size_t		 isec, i, sz;
-	int		 prio, best_prio;
+	int		 prio, best_prio, synopsis_only;
 	char		 sec;
 #endif
 	enum mandoclevel rc;
@@ -123,7 +126,6 @@ main(int argc, char *argv[])
 	int		 fd;
 	int		 show_usage;
 	int		 use_pager;
-	int		 synopsis_only;
 	int		 options;
 	int		 c;
 
@@ -134,24 +136,26 @@ main(int argc, char *argv[])
 		++progname;
 
 #if HAVE_SQLITE3
-	if (0 == strncmp(progname, "mandocdb", 8) ||
-	    0 == strncmp(progname, "makewhatis", 10))
+	if (strcmp(progname, BINM_MAKEWHATIS) == 0)
 		return(mandocdb(argc, argv));
 #endif
 
 	/* Search options. */
 
 	memset(&paths, 0, sizeof(struct manpaths));
-	conf_file = defpaths = auxpaths = NULL;
+#if HAVE_SQLITE3
+	conf_file = defpaths = NULL;
+#endif
+	auxpaths = NULL;
 
 	memset(&search, 0, sizeof(struct mansearch));
 	search.outkey = "Nd";
 
-	if (strcmp(progname, "man") == 0)
+	if (strcmp(progname, BINM_MAN) == 0)
 		search.argmode = ARG_NAME;
-	else if (strncmp(progname, "apropos", 7) == 0)
+	else if (strcmp(progname, BINM_APROPOS) == 0)
 		search.argmode = ARG_EXPR;
-	else if (strncmp(progname, "whatis", 6) == 0)
+	else if (strcmp(progname, BINM_WHATIS) == 0)
 		search.argmode = ARG_WORD;
 	else if (strncmp(progname, "help", 4) == 0)
 		search.argmode = ARG_NAME;
@@ -168,7 +172,9 @@ main(int argc, char *argv[])
 
 	use_pager = 1;
 	show_usage = 0;
+#if HAVE_SQLITE3
 	synopsis_only = 0;
+#endif
 	outmode = OUTMODE_DEF;
 
 	while (-1 != (c = getopt(argc, argv,
@@ -178,7 +184,9 @@ main(int argc, char *argv[])
 			outmode = OUTMODE_ALL;
 			break;
 		case 'C':
+#if HAVE_SQLITE3
 			conf_file = optarg;
+#endif
 			break;
 		case 'c':
 			use_pager = 0;
@@ -188,7 +196,9 @@ main(int argc, char *argv[])
 			break;
 		case 'h':
 			(void)strlcat(curp.outopts, "synopsis,", BUFSIZ);
+#if HAVE_SQLITE3
 			synopsis_only = 1;
+#endif
 			use_pager = 0;
 			outmode = OUTMODE_ALL;
 			break;
@@ -222,7 +232,9 @@ main(int argc, char *argv[])
 			outmode = OUTMODE_ALL;
 			break;
 		case 'M':
+#if HAVE_SQLITE3
 			defpaths = optarg;
+#endif
 			break;
 		case 'm':
 			auxpaths = optarg;
@@ -297,9 +309,10 @@ main(int argc, char *argv[])
 				argv = help_argv;
 				argc = 1;
 			}
-		} else if (argv[0] != NULL &&
-		    isdigit((unsigned char)argv[0][0]) &&
-		    (argv[0][1] == '\0' || !strcmp(argv[0], "3p"))) {
+		} else if (argv[0] != NULL && (
+		    (isdigit((unsigned char)argv[0][0]) &&
+		     (argv[0][1] == '\0' || !strcmp(argv[0], "3p"))) ||
+		    (argv[0][0] == 'n' && argv[0][1] == '\0'))) {
 			search.sec = argv[0];
 			argv++;
 			argc--;
@@ -605,6 +618,7 @@ parse(struct curparse *curp, int fd, const char *file,
 		*level = rc;
 }
 
+#if HAVE_SQLITE3
 static enum mandoclevel
 passthrough(const char *file, int fd, int synopsis_only)
 {
@@ -668,6 +682,7 @@ fail:
 	    progname, file, syscall, strerror(errno));
 	return(MANDOCLEVEL_SYSERR);
 }
+#endif
 
 static int
 koptions(int *options, char *arg)