===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/Attic/apropos_db.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -c -r1.2 -r1.3
*** src/usr.bin/mandoc/Attic/apropos_db.c	2011/11/13 10:40:52	1.2
--- src/usr.bin/mandoc/Attic/apropos_db.c	2011/11/13 11:07:10	1.3
***************
*** 1,6 ****
! /*	$Id: apropos_db.c,v 1.2 2011/11/13 10:40:52 schwarze Exp $ */
  /*
   * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   *
   * Permission to use, copy, modify, and distribute this software for any
   * purpose with or without fee is hereby granted, provided that the above
--- 1,7 ----
! /*	$Id: apropos_db.c,v 1.3 2011/11/13 11:07:10 schwarze Exp $ */
  /*
   * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
+  * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
   *
   * Permission to use, copy, modify, and distribute this software for any
   * purpose with or without fee is hereby granted, provided that the above
***************
*** 31,45 ****
  #include "apropos_db.h"
  #include "mandoc.h"
  
- enum	match {
- 	MATCH_REGEX,
- 	MATCH_REGEXCASE,
- 	MATCH_STR,
- 	MATCH_STRCASE
- };
- 
  struct	expr {
! 	enum match	 match;
  	int	 	 mask;
  	char		*v;
  	regex_t	 	 re;
--- 32,39 ----
  #include "apropos_db.h"
  #include "mandoc.h"
  
  struct	expr {
! 	int		 regex;
  	int	 	 mask;
  	char		*v;
  	regex_t	 	 re;
***************
*** 71,77 ****
  
  static	DB	*btree_open(void);
  static	int	 btree_read(const DBT *, const struct mchars *, char **);
! static	int	 exprexec(const struct expr *, char *);
  static	DB	*index_open(void);
  static	int	 index_read(const DBT *, const DBT *, 
  			const struct mchars *, struct rec *);
--- 65,71 ----
  
  static	DB	*btree_open(void);
  static	int	 btree_read(const DBT *, const struct mchars *, char **);
! static	int	 exprexec(const struct expr *, char *, int);
  static	DB	*index_open(void);
  static	int	 index_read(const DBT *, const DBT *, 
  			const struct mchars *, struct rec *);
***************
*** 368,374 ****
  		if ( ! btree_read(&key, mc, &buf))
  			break;
  
! 		if ( ! exprexec(expr, buf))
  			continue;
  
  		memcpy(&rec, val.data + 4, sizeof(recno_t));
--- 362,368 ----
  		if ( ! btree_read(&key, mc, &buf))
  			break;
  
! 		if ( ! exprexec(expr, buf, *(int *)val.data))
  			continue;
  
  		memcpy(&rec, val.data + 4, sizeof(recno_t));
***************
*** 460,515 ****
  }
  
  struct expr *
! exprcomp(int cs, char *argv[], int argc)
  {
  	struct expr	*p;
  	struct expr	 e;
! 	int		 i, pos, ch;
  
! 	pos = 0;
! 
! 	if (pos > argc)
  		return(NULL);
  
! 	for (i = 0; 0 != types[i].mask; i++)
! 		if (0 == strcmp(types[i].name, argv[pos]))
! 			break;
  
! 	if (0 == (e.mask = types[i].mask))
! 		return(NULL);
  
! 	if (++pos > argc--)
! 		return(NULL);
  
! 	if ('-' != *argv[pos]) 
! 		e.match = cs ? MATCH_STRCASE : MATCH_STR;
! 	else if (0 == strcmp("-eq", argv[pos]))
! 		e.match = cs ? MATCH_STRCASE : MATCH_STR;
! 	else if (0 == strcmp("-ieq", argv[pos]))
! 		e.match = MATCH_STRCASE;
! 	else if (0 == strcmp("-re", argv[pos]))
! 		e.match = cs ? MATCH_REGEXCASE : MATCH_REGEX;
! 	else if (0 == strcmp("-ire", argv[pos]))
! 		e.match = MATCH_REGEXCASE;
! 	else
! 		return(NULL);
  
! 	if ('-' == *argv[pos])
! 		pos++;
! 
! 	if (pos > argc--)
  		return(NULL);
  
! 	e.v = mandoc_strdup(argv[pos]);
  
- 	if (MATCH_REGEX == e.match || MATCH_REGEXCASE == e.match) {
- 		ch = REG_EXTENDED | REG_NOSUB;
- 		if (MATCH_REGEXCASE == e.match)
- 			ch |= REG_ICASE;
- 		if (regcomp(&e.re, e.v, ch))
- 			return(NULL);
- 	}
- 
  	p = mandoc_calloc(1, sizeof(struct expr));
  	memcpy(p, &e, sizeof(struct expr));
  	return(p);
--- 454,509 ----
  }
  
  struct expr *
! exprcomp(int argc, char *argv[])
  {
  	struct expr	*p;
  	struct expr	 e;
! 	char		*key;
! 	int		 i, icase;
  
! 	if (0 >= argc)
  		return(NULL);
  
! 	/*
! 	 * Choose regex or substring match.
! 	 */
  
! 	if (NULL == (e.v = strpbrk(*argv, "=~"))) {
! 		e.regex = 0;
! 		e.v = *argv;
! 	} else {
! 		e.regex = '~' == *e.v;
! 		*e.v++ = '\0';
! 	}
  
! 	/*
! 	 * Determine the record types to search for.
! 	 */
  
! 	icase = 0;
! 	e.mask = 0;
! 	if (*argv < e.v) {
! 		while (NULL != (key = strsep(argv, ","))) {
! 			if ('i' == key[0] && '\0' == key[1]) {
! 				icase = REG_ICASE;
! 				continue;
! 			}
! 			i = 0;
! 			while (types[i].mask &&
! 			    strcmp(types[i].name, key))
! 				i++;
! 			e.mask |= types[i].mask;
! 		}
! 	}
! 	if (0 == e.mask)
! 		e.mask = TYPE_Nm | TYPE_Nd;
  
! 	if (e.regex &&
! 	    regcomp(&e.re, e.v, REG_EXTENDED | REG_NOSUB | icase))
  		return(NULL);
  
! 	e.v = mandoc_strdup(e.v);
  
  	p = mandoc_calloc(1, sizeof(struct expr));
  	memcpy(p, &e, sizeof(struct expr));
  	return(p);
***************
*** 522,528 ****
  	if (NULL == p)
  		return;
  
! 	if (MATCH_REGEX == p->match)
  		regfree(&p->re);
  
  	free(p->v);
--- 516,522 ----
  	if (NULL == p)
  		return;
  
! 	if (p->regex)
  		regfree(&p->re);
  
  	free(p->v);
***************
*** 530,543 ****
  }
  
  static int
! exprexec(const struct expr *p, char *cp)
  {
  
! 	if (MATCH_STR == p->match)
! 		return(0 == strcmp(p->v, cp));
! 	else if (MATCH_STRCASE == p->match)
! 		return(0 == strcasecmp(p->v, cp));
  
! 	assert(MATCH_REGEX == p->match);
! 	return(0 == regexec(&p->re, cp, 0, NULL, 0));
  }
--- 524,537 ----
  }
  
  static int
! exprexec(const struct expr *p, char *cp, int mask)
  {
  
! 	if ( ! (mask & p->mask))
! 		return(0);
  
! 	if (p->regex)
! 		return(0 == regexec(&p->re, cp, 0, NULL, 0));
! 	else
! 		return(NULL != strcasestr(cp, p->v));
  }