===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/mandocdb.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -c -r1.24 -r1.25
*** src/usr.bin/mandoc/mandocdb.c	2011/12/10 22:01:03	1.24
--- src/usr.bin/mandoc/mandocdb.c	2011/12/12 01:59:13	1.25
***************
*** 1,4 ****
! /*	$Id: mandocdb.c,v 1.24 2011/12/10 22:01:03 schwarze Exp $ */
  /*
   * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$Id: mandocdb.c,v 1.25 2011/12/12 01:59:13 schwarze Exp $ */
  /*
   * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 260,265 ****
--- 260,266 ----
  	struct manpaths	 dirs;
  	enum op		 op; /* current operation */
  	const char	*dir;
+ 	char		*conf_file;
  	char		*cp;
  	char		 pbuf[PATH_MAX],
  			 ibuf[MAXPATHLEN], /* index fname */
***************
*** 299,310 ****
  	maxrec = 0;
  	op = OP_NEW;
  	dir = NULL;
  
! 	while (-1 != (ch = getopt(argc, argv, "ad:u:v")))
  		switch (ch) {
  		case ('a'):
  			use_all = 1;
  			break;
  		case ('d'):
  			dir = optarg;
  			op = OP_UPDATE;
--- 300,315 ----
  	maxrec = 0;
  	op = OP_NEW;
  	dir = NULL;
+ 	conf_file = NULL;
  
! 	while (-1 != (ch = getopt(argc, argv, "aC:d:u:v")))
  		switch (ch) {
  		case ('a'):
  			use_all = 1;
  			break;
+ 		case ('C'):
+ 			conf_file = optarg;
+ 			break;
  		case ('d'):
  			dir = optarg;
  			op = OP_UPDATE;
***************
*** 414,420 ****
  			dirs.paths[i] = mandoc_strdup(cp);
  		}
  	} else
! 		manpath_parse(&dirs, NULL, NULL);
  
  	for (i = 0; i < dirs.sz; i++) {
  		ibuf[0] = fbuf[0] = '\0';
--- 419,425 ----
  			dirs.paths[i] = mandoc_strdup(cp);
  		}
  	} else
! 		manpath_parse(&dirs, conf_file, NULL, NULL);
  
  	for (i = 0; i < dirs.sz; i++) {
  		ibuf[0] = fbuf[0] = '\0';
***************
*** 1648,1654 ****
  {
  
  	fprintf(stderr, "usage: %s [-v] "
! 			"[-d dir [files...] |"
! 			" -u dir [files...] |"
! 			" dir...]\n", progname);
  }
--- 1653,1660 ----
  {
  
  	fprintf(stderr, "usage: %s [-v] "
! 			"[-C file] |"
! 			" dir ... |"
! 			" -d dir [file ...] |"
! 			" -u dir [file ...]\n", progname);
  }