aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/manpath.c
diff options
context:
space:
mode:
authorKristaps Dzonsons <kristaps@bsd.lv>2011-12-24 22:37:16 +0000
committerKristaps Dzonsons <kristaps@bsd.lv>2011-12-24 22:37:16 +0000
commit586d9c5122c9adb8da1eac27d93045e4851ccf60 (patch)
tree471e094e47e0d4a881a9cdb2e5655182eb7edfdf /manpath.c
parent028a2f531d2c69747d239102a16dc0a9044afea1 (diff)
downloadmandoc-586d9c5122c9adb8da1eac27d93045e4851ccf60.tar.gz
mandoc-586d9c5122c9adb8da1eac27d93045e4851ccf60.tar.zst
mandoc-586d9c5122c9adb8da1eac27d93045e4851ccf60.zip
Support leading, trailing and double colons in MANPATH to prepend,
append or insert the man.conf(5) default path; compatible with GNU manpath(1), implementation by kristaps@, heavily tweaked by schwarze@. Updates to MANPATH documentation applied to whatis.1, apropos.1, and catman.8 also.
Diffstat (limited to 'manpath.c')
-rw-r--r--manpath.c53
1 files changed, 46 insertions, 7 deletions
diff --git a/manpath.c b/manpath.c
index 3a12496d..b6d9574e 100644
--- a/manpath.c
+++ b/manpath.c
@@ -1,4 +1,4 @@
-/* $Id: manpath.c,v 1.7 2011/12/13 21:09:01 kristaps Exp $ */
+/* $Id: manpath.c,v 1.8 2011/12/24 22:37:16 kristaps Exp $ */
/*
* Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
* Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
@@ -87,15 +87,54 @@ manpath_parse(struct manpaths *dirs, const char *file,
free(buf);
pclose(stream);
#else
- manpath_parseline(dirs, auxp);
+ char *insert;
- if (NULL == defp)
- defp = getenv("MANPATH");
+ /* Always prepend -m. */
+ manpath_parseline(dirs, auxp);
+
+ /* If -M is given, it overrides everything else. */
+ if (NULL != defp) {
+ manpath_parseline(dirs, defp);
+ return;
+ }
+
+ /* MANPATH and man.conf(5) cooperate. */
+ defp = getenv("MANPATH");
+ if (NULL == file)
+ file = MAN_CONF_FILE;
+
+ /* No MANPATH; use man.conf(5) only. */
+ if (NULL == defp || '\0' == defp[0]) {
+ manpath_manconf(dirs, file);
+ return;
+ }
+
+ /* Prepend man.conf(5) to MANPATH. */
+ if (':' == defp[0]) {
+ manpath_manconf(dirs, file);
+ manpath_parseline(dirs, defp);
+ return;
+ }
- if (NULL == defp)
- manpath_manconf(dirs, file ? file : MAN_CONF_FILE);
- else
+ /* Append man.conf(5) to MANPATH. */
+ if (':' == defp[(int)strlen(defp) - 1]) {
manpath_parseline(dirs, defp);
+ manpath_manconf(dirs, file);
+ return;
+ }
+
+ /* Insert man.conf(5) into MANPATH. */
+ insert = strstr(defp, "::");
+ if (NULL != insert) {
+ *insert++ = '\0';
+ manpath_parseline(dirs, defp);
+ manpath_manconf(dirs, file);
+ manpath_parseline(dirs, insert + 1);
+ return;
+ }
+
+ /* MANPATH overrides man.conf(5) completely. */
+ manpath_parseline(dirs, defp);
#endif
}