From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from krisdoz.my.domain (kristaps@localhost [127.0.0.1])
	by krisdoz.my.domain (8.14.3/8.14.3) with ESMTP id pA9NVb0n005140
	for <source@mdocml.bsd.lv>; Wed, 9 Nov 2011 18:31:37 -0500 (EST)
Received: (from kristaps@localhost)
	by krisdoz.my.domain (8.14.3/8.14.3/Submit) id pA9NVbmf001758;
	Wed, 9 Nov 2011 18:31:37 -0500 (EST)
Date: Wed, 9 Nov 2011 18:31:37 -0500 (EST)
Message-Id: <201111092331.pA9NVbmf001758@krisdoz.my.domain>
X-Mailinglist: mdocml-source
Reply-To: source@mdocml.bsd.lv
MIME-Version: 1.0
From: kristaps@mdocml.bsd.lv
To: source@mdocml.bsd.lv
Subject: mdocml: Use proper infix expressions and provide a default.
X-Mailer: activitymail 1.26, http://search.cpan.org/dist/activitymail/
Content-Type: text/plain; charset=utf-8

Log Message:
-----------
Use proper infix expressions and provide a default.  (Exact match.)

Modified Files:
--------------
    mdocml:
        db.c

Revision Data
-------------
Index: db.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/db.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -Ldb.c -Ldb.c -u -p -r1.2 -r1.3
--- db.c
+++ db.c
@@ -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 (0 == strcmp("-eq", argv[0]))
+	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[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;
--
 To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv