aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/mansearch.c
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@openbsd.org>2016-01-08 15:02:54 +0000
committerIngo Schwarze <schwarze@openbsd.org>2016-01-08 15:02:54 +0000
commitc2d0e548871bfed103ed040312a4333026ee10f1 (patch)
treeafd19ae4a243cb508bc5759dcba75798e61657b5 /mansearch.c
parent88bc2f3d403685eb613237b364c82c0042b74ee5 (diff)
downloadmandoc-c2d0e548871bfed103ed040312a4333026ee10f1.tar.gz
mandoc-c2d0e548871bfed103ed040312a4333026ee10f1.tar.zst
mandoc-c2d0e548871bfed103ed040312a4333026ee10f1.zip
Prefer warn(3) over perror(3) at the few places where it was used.
It is useful to see the program name, and we have err.h compat in place anyway. Suggested by Christos Zoulas (NetBSD).
Diffstat (limited to 'mansearch.c')
-rw-r--r--mansearch.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/mansearch.c b/mansearch.c
index e6e5d997..843326ba 100644
--- a/mansearch.c
+++ b/mansearch.c
@@ -1,4 +1,4 @@
-/* $Id: mansearch.c,v 1.63 2015/11/26 07:42:11 schwarze Exp $ */
+/* $Id: mansearch.c,v 1.64 2016/01/08 15:02:54 schwarze Exp $ */
/*
* Copyright (c) 2012 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -125,7 +125,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 +144,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 +226,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 +364,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;