From 8f033b9ec35601ec57fb7ccde390d68c8a51165a Mon Sep 17 00:00:00 2001 From: Kristaps Dzonsons Date: Wed, 9 Nov 2011 23:31:36 +0000 Subject: Use proper infix expressions and provide a default. (Exact match.) --- db.c | 37 +++++++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/db.c b/db.c index 512c48aa..d7d08247 100644 --- a/db.c +++ b/db.c @@ -1,4 +1,4 @@ -/* $Id: db.c,v 1.2 2011/11/09 22:05:56 kristaps Exp $ */ +/* $Id: db.c,v 1.3 2011/11/09 23:31:36 kristaps Exp $ */ /* * Copyright (c) 2011 Kristaps Dzonsons * @@ -462,30 +462,43 @@ exprcomp(int cs, char *argv[], int argc) { struct expr *p; struct expr e; - int i, ch; + int i, pos, ch; - if (3 != argc) + 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 (0 == strcmp("-eq", argv[0])) + 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[0])) + else if (0 == strcmp("-ieq", argv[pos])) e.match = MATCH_STRCASE; - else if (0 == strcmp("-re", argv[0])) + else if (0 == strcmp("-re", argv[pos])) e.match = cs ? MATCH_REGEXCASE : MATCH_REGEX; - else if (0 == strcmp("-ire", argv[0])) + else if (0 == strcmp("-ire", argv[pos])) e.match = MATCH_REGEXCASE; else return(NULL); - for (i = 0; 0 != types[i].mask; i++) - if (0 == strcmp(types[i].name, argv[1])) - break; + if ('-' == *argv[pos]) + pos++; - if (0 == (e.mask = types[i].mask)) + if (pos > argc--) return(NULL); - e.v = mandoc_strdup(argv[2]); + e.v = mandoc_strdup(argv[pos]); if (MATCH_REGEX == e.match || MATCH_REGEXCASE == e.match) { ch = REG_EXTENDED | REG_NOSUB; -- cgit v1.2.3-56-ge451