[BACK]Return to manpath.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / mandoc

Diff for /src/usr.bin/mandoc/manpath.c between version 1.11 and 1.12

version 1.11, 2014/11/18 19:40:38 version 1.12, 2015/03/21 17:18:17
Line 1 
Line 1 
 /*      $OpenBSD$ */  /*      $OpenBSD$ */
 /*  /*
  * 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 30 
Line 30 
   
 #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 38 
Line 39 
 manpath_parse(struct manpaths *dirs, const char *file,  manpath_parse(struct manpaths *dirs, const char *file,
                 char *defp, char *auxp)                  char *defp, char *auxp)
 {  {
           char             manpath_default[] = MANPATH_DEFAULT;
         char            *insert;          char            *insert;
   
         /* Always prepend -m. */          /* Always prepend -m. */
Line 57 
Line 59 
         /* 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.11  
changed lines
  Added in v.1.12