[src/trunk]: src/usr.bin/man Teach man -p to respect the MANPATH environment ...

[abhinav <abhinav%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/14af9fceb869
branches:  trunk
changeset: 823680:14af9fceb869
user:      abhinav <abhinav%NetBSD.org@localhost>
date:      Tue May 02 14:19:23 2017 +0000

description:
Teach man -p to respect the MANPATH environment variable and the -M option.

Currently, `man -p` generates its output based on the value of the _default tag
in man.conf. However, man(1) modifies its search path based on the value of the
MANPATH variable and the list of directories specified via the -M option. In such
a case, `man -p` does not represent the correct search path. This commit intends
to fix this.

This change has the side effect that now the output of `man -p` will also include
the machine class specific subdirectories (such as man8/x86), while previously it
did not. The output would include subdirectories only for those machine classes
which are specified in the man.conf file.

Also, with this change, it is possible to run makemandb(8), by setting MANPATH
environment variable (e.g. env MANPATH=/usr/share/man makemandb).

Patch reviewed by wiz@

diffstat:

 usr.bin/man/man.c |  43 ++++++++++++++++---------------------------
 1 files changed, 16 insertions(+), 27 deletions(-)

diffs (77 lines):

diff -r 6fb2594a91e3 -r 14af9fceb869 usr.bin/man/man.c
--- a/usr.bin/man/man.c Tue May 02 13:54:08 2017 +0000
+++ b/usr.bin/man/man.c Tue May 02 14:19:23 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: man.c,v 1.65 2017/04/27 09:31:50 abhinav Exp $ */
+/*     $NetBSD: man.c,v 1.66 2017/05/02 14:19:23 abhinav Exp $ */
 
 /*
  * Copyright (c) 1987, 1993, 1994, 1995
@@ -40,7 +40,7 @@
 #if 0
 static char sccsid[] = "@(#)man.c      8.17 (Berkeley) 1/31/95";
 #else
-__RCSID("$NetBSD: man.c,v 1.65 2017/04/27 09:31:50 abhinav Exp $");
+__RCSID("$NetBSD: man.c,v 1.66 2017/05/02 14:19:23 abhinav Exp $");
 #endif
 #endif /* not lint */
 
@@ -1046,44 +1046,33 @@
 static void
 printmanpath(struct manstate *m)
 {
-       ENTRY *esubd;
-       char *defaultpath = NULL; /* _default tag value from man.conf. */
-       char *buf; /* for storing temporary values */
+       ENTRY *epath;
        char **ap;
        glob_t pg;
        struct stat sb;
-       TAG *path = m->defaultpath;
-       TAG *subdirs = m->subdirs;
+       TAG *path = m->mymanpath;
        
        /* the tail queue is empty if no _default tag is defined in * man.conf */
        if (TAILQ_EMPTY(&path->entrylist))
                errx(EXIT_FAILURE, "Empty manpath");
                
-       defaultpath = TAILQ_LAST(&path->entrylist, tqh)->s;
-       
-       if (glob(defaultpath, GLOB_BRACE | GLOB_NOSORT, NULL, &pg) != 0)
-               err(EXIT_FAILURE, "glob failed");
+       TAILQ_FOREACH(epath, &path->entrylist, q) {
+               if (glob(epath->s, GLOB_BRACE | GLOB_NOSORT, NULL, &pg) != 0)
+                       err(EXIT_FAILURE, "glob failed");
 
-       if (pg.gl_matchc == 0) {
-               warnx("Default path in %s doesn't exist", _PATH_MANCONF);
-               globfree(&pg);
-               return;
-       }
-
-       TAILQ_FOREACH(esubd, &subdirs->entrylist, q) {
-               /* Drop cat page directory, only sources are relevant. */
-               if (strncmp(esubd->s, "man", 3))
+               if (pg.gl_matchc == 0) {
+                       globfree(&pg);
                        continue;
+               }
 
                for (ap = pg.gl_pathv; *ap != NULL; ++ap) {
-                       if (asprintf(&buf, "%s%s", *ap, esubd->s) == -1) 
-                               err(EXIT_FAILURE, "memory allocation error");
+                       /* Skip cat page directories */
+                       if (strstr(*ap, "/cat") != NULL)
+                               continue;
                        /* Skip non-directories. */
-                       if (stat(buf, &sb) == 0 && S_ISDIR(sb.st_mode))
-                               printf("%s\n", buf);
-
-                       free(buf);
+                       if (stat(*ap, &sb) == 0 && S_ISDIR(sb.st_mode))
+                               printf("%s\n", *ap);
                }
+               globfree(&pg);
        }
-       globfree(&pg);
 }