===================================================================
RCS file: /cvs/mandoc/mansearch.c,v
retrieving revision 1.63
retrieving revision 1.65
diff -u -p -r1.63 -r1.65
--- mandoc/mansearch.c	2015/11/26 07:42:11	1.63
+++ mandoc/mansearch.c	2016/07/09 15:24:19	1.65
@@ -1,4 +1,4 @@
-/*	$Id: mansearch.c,v 1.63 2015/11/26 07:42:11 schwarze Exp $ */
+/*	$Id: mansearch.c,v 1.65 2016/07/09 15:24:19 schwarze Exp $ */
 /*
  * Copyright (c) 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -26,7 +26,6 @@
 #endif
 #include <errno.h>
 #include <fcntl.h>
-#include <getopt.h>
 #include <glob.h>
 #include <limits.h>
 #include <regex.h>
@@ -125,7 +124,7 @@ mansearch_setup(int start)
 		    MAP_SHARED | MAP_ANON, -1, 0);
 
 		if (MAP_FAILED == pagecache) {
-			perror("mmap");
+			warn("mmap");
 			pagecache = NULL;
 			return (int)MANDOCLEVEL_SYSERR;
 		}
@@ -144,7 +143,7 @@ mansearch_setup(int start)
 	}
 
 	if (-1 == munmap(pagecache, PC_PAGESIZE * PC_NUMPAGES)) {
-		perror("munmap");
+		warn("munmap");
 		pagecache = NULL;
 		return (int)MANDOCLEVEL_SYSERR;
 	}
@@ -226,12 +225,12 @@ mansearch(const struct mansearch *search,
 				warnx("%s: getcwd: %s", paths->paths[i], buf);
 				continue;
 			} else if (chdir(buf) == -1) {
-				perror(buf);
+				warn("%s", buf);
 				continue;
 			}
 		}
 		if (chdir(paths->paths[i]) == -1) {
-			perror(paths->paths[i]);
+			warn("%s", paths->paths[i]);
 			continue;
 		}
 		chdir_status = 1;
@@ -364,7 +363,7 @@ mansearch(const struct mansearch *search,
 	}
 	qsort(*res, cur, sizeof(struct manpage), manpage_compare);
 	if (chdir_status && getcwd_status && chdir(buf) == -1)
-		perror(buf);
+		warn("%s", buf);
 	exprfree(e);
 	free(sql);
 	*sz = cur;