[BACK]Return to manpath.c CVS log [TXT][DIR] Up to [cvsweb.bsd.lv] / mandoc

Diff for /mandoc/manpath.c between version 1.19 and 1.20

version 1.19, 2014/11/27 00:30:40 version 1.20, 2015/03/21 17:19:36
Line 1 
Line 1 
 /*      $Id$ */  /*      $Id$ */
 /*  /*
  * 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>   * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *   *
  * Permission to use, copy, modify, and distribute this software for any   * Permission to use, copy, modify, and distribute this software for any
Line 32 
Line 32 
   
 #define MAN_CONF_FILE   "/etc/man.conf"  #define MAN_CONF_FILE   "/etc/man.conf"
 #define MAN_CONF_KEY    "_whatdb"  #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_add(struct manpaths *, const char *, int);
 static  void     manpath_parseline(struct manpaths *, char *, int);  static  void     manpath_parseline(struct manpaths *, char *, int);
Line 86  manpath_parse(struct manpaths *dirs, const char *file,
Line 87  manpath_parse(struct manpaths *dirs, const char *file,
         free(buf);          free(buf);
         pclose(stream);          pclose(stream);
 #else  #else
           char             manpath_default[] = MANPATH_DEFAULT;
         char            *insert;          char            *insert;
   
         /* Always prepend -m. */          /* Always prepend -m. */
Line 105  manpath_parse(struct manpaths *dirs, const char *file,
Line 107  manpath_parse(struct manpaths *dirs, const char *file,
         /* No MANPATH; use man.conf(5) only. */          /* No MANPATH; use man.conf(5) only. */
         if (NULL == defp || '\0' == defp[0]) {          if (NULL == defp || '\0' == defp[0]) {
                 manpath_manconf(dirs, file);                  manpath_manconf(dirs, file);
                   if (dirs->sz == 0)
                           manpath_parseline(dirs, manpath_default, 0);
                 return;                  return;
         }          }
   
Legend:
Removed from v.1.19  
changed lines
  Added in v.1.20
CVSweb