diff options
| author |   Ingo Schwarze <schwarze@openbsd.org> | 2015-03-21 17:19:36 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@openbsd.org> | 2015-03-21 17:19:36 +0000 |
| commit | 2dd6335f7e38c6febe4d28c1b9d484009f454ef7 (patch) | |
| tree | 4d70787ec7e4dc9877d0f98f80d852e0902bce2b | |
| parent | 565cc8df95b2d9171dda472ca59175de1c8ba317 (diff) | |
| download | mandoc-2dd6335f7e38c6febe4d28c1b9d484009f454ef7.tar.gz mandoc-2dd6335f7e38c6febe4d28c1b9d484009f454ef7.tar.zst mandoc-2dd6335f7e38c6febe4d28c1b9d484009f454ef7.zip | |
when there is no -m, no -M, no MANPATH and no /etc/man.conf,
fall back to /usr/share/man:/usr/X11R6/man:/usr/local/man
| -rw-r--r-- | manpath.c | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -1,6 +1,6 @@ -/* $Id: manpath.c,v 1.19 2014/11/27 00:30:40 schwarze Exp $ */ +/* $Id: manpath.c,v 1.20 2015/03/21 17:19:36 schwarze Exp $ */ /* - * Copyright (c) 2011, 2014 Ingo Schwarze <schwarze@openbsd.org> + * Copyright (c) 2011, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org> * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv> * * Permission to use, copy, modify, and distribute this software for any @@ -32,6 +32,7 @@ #define MAN_CONF_FILE "/etc/man.conf" #define MAN_CONF_KEY "_whatdb" +#define MANPATH_DEFAULT "/usr/share/man:/usr/X11R6/man:/usr/local/man" static void manpath_add(struct manpaths *, const char *, int); static void manpath_parseline(struct manpaths *, char *, int); @@ -86,6 +87,7 @@ manpath_parse(struct manpaths *dirs, const char *file, free(buf); pclose(stream); #else + char manpath_default[] = MANPATH_DEFAULT; char *insert; /* Always prepend -m. */ @@ -105,6 +107,8 @@ manpath_parse(struct manpaths *dirs, const char *file, /* No MANPATH; use man.conf(5) only. */ if (NULL == defp || '\0' == defp[0]) { manpath_manconf(dirs, file); + if (dirs->sz == 0) + manpath_parseline(dirs, manpath_default, 0); return; } |