===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/Attic/apropos.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -c -r1.11 -r1.12
*** src/usr.bin/mandoc/Attic/apropos.c	2011/12/09 00:44:15	1.11
--- src/usr.bin/mandoc/Attic/apropos.c	2011/12/12 01:59:13	1.12
***************
*** 1,4 ****
! /*	$Id: apropos.c,v 1.11 2011/12/09 00:44:15 schwarze Exp $ */
  /*
   * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$Id: apropos.c,v 1.12 2011/12/12 01:59:13 schwarze Exp $ */
  /*
   * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 40,45 ****
--- 40,46 ----
  	struct opts	 opts;
  	struct expr	*e;
  	char		*defpaths, *auxpaths;
+ 	char		*conf_file;
  	extern int	 optind;
  	extern char	*optarg;
  
***************
*** 55,64 ****
  	memset(&opts, 0, sizeof(struct opts));
  
  	auxpaths = defpaths = NULL;
  	e = NULL;
  
! 	while (-1 != (ch = getopt(argc, argv, "M:m:S:s:")))
  		switch (ch) {
  		case ('M'):
  			defpaths = optarg;
  			break;
--- 56,69 ----
  	memset(&opts, 0, sizeof(struct opts));
  
  	auxpaths = defpaths = NULL;
+ 	conf_file = NULL;
  	e = NULL;
  
! 	while (-1 != (ch = getopt(argc, argv, "C:M:m:S:s:")))
  		switch (ch) {
+ 		case ('C'):
+ 			conf_file = optarg;
+ 			break;
  		case ('M'):
  			defpaths = optarg;
  			break;
***************
*** 84,90 ****
  
  	rc = 0;
  
! 	manpath_parse(&paths, defpaths, auxpaths);
  
  	e = whatis ? termcomp(argc, argv, &terms) :
  		     exprcomp(argc, argv, &terms);
--- 89,95 ----
  
  	rc = 0;
  
! 	manpath_parse(&paths, conf_file, defpaths, auxpaths);
  
  	e = whatis ? termcomp(argc, argv, &terms) :
  		     exprcomp(argc, argv, &terms);
***************
*** 138,147 ****
  {
  
  	fprintf(stderr, "usage: %s "
  			"[-M manpath] "
  			"[-m manpath] "
  			"[-S arch] "
  			"[-s section] "
! 			"expression...\n",
  			progname);
  }
--- 143,153 ----
  {
  
  	fprintf(stderr, "usage: %s "
+ 			"[-C file] "
  			"[-M manpath] "
  			"[-m manpath] "
  			"[-S arch] "
  			"[-s section] "
! 			"expression ...\n",
  			progname);
  }