===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/manpath.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -c -r1.1 -r1.2
*** src/usr.bin/mandoc/manpath.c	2011/11/26 16:41:35	1.1
--- src/usr.bin/mandoc/manpath.c	2011/12/12 01:59:13	1.2
***************
*** 1,4 ****
! /*	$Id: manpath.c,v 1.1 2011/11/26 16:41:35 schwarze Exp $ */
  /*
   * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
   * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
--- 1,4 ----
! /*	$Id: manpath.c,v 1.2 2011/12/12 01:59:13 schwarze Exp $ */
  /*
   * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
   * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
***************
*** 33,39 ****
  static	void	 manpath_add(struct manpaths *, const char *);
  
  void
! manpath_parse(struct manpaths *dirs, char *defp, char *auxp)
  {
  
  	manpath_parseline(dirs, auxp);
--- 33,40 ----
  static	void	 manpath_add(struct manpaths *, const char *);
  
  void
! manpath_parse(struct manpaths *dirs, const char *file,
! 		char *defp, char *auxp)
  {
  
  	manpath_parseline(dirs, auxp);
***************
*** 42,48 ****
  		defp = getenv("MANPATH");
  
  	if (NULL == defp)
! 		manpath_parseconf(dirs);
  	else
  		manpath_parseline(dirs, defp);
  }
--- 43,49 ----
  		defp = getenv("MANPATH");
  
  	if (NULL == defp)
! 		manpath_parseconf(dirs, file);
  	else
  		manpath_parseline(dirs, defp);
  }
***************
*** 88,97 ****
  }
  
  void
! manpath_parseconf(struct manpaths *dirs)
  {
  
! 	manpath_manconf(MAN_CONF_FILE, dirs);
  }
  
  void
--- 89,98 ----
  }
  
  void
! manpath_parseconf(struct manpaths *dirs, const char *file)
  {
  
! 	manpath_manconf(dirs, file ? file : MAN_CONF_FILE);
  }
  
  void
***************
*** 106,112 ****
  }
  
  void
! manpath_manconf(const char *file, struct manpaths *dirs)
  {
  	FILE		*stream;
  	char		*p, *q;
--- 107,113 ----
  }
  
  void
! manpath_manconf(struct manpaths *dirs, const char *file)
  {
  	FILE		*stream;
  	char		*p, *q;