[dovecot-cvs] dovecot/src/lib-storage mail-search.c,1.19,1.19.2.1

[tss-movial at dovecot.org]

Update of /var/lib/cvs/dovecot/src/lib-storage
In directory talvi:/tmp/cvs-serv30627/lib-storage

Modified Files:
      Tag: branch_1_0
	mail-search.c 
Log Message:
NOT condition wasn't handled correctly in SEARCH.



Index: mail-search.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/mail-search.c,v
retrieving revision 1.19
retrieving revision 1.19.2.1
diff -u -d -r1.19 -r1.19.2.1
--- mail-search.c	13 Jan 2006 20:26:24 -0000	1.19
+++ mail-search.c	20 Jun 2006 15:16:33 -0000	1.19.2.1
@@ -46,7 +46,7 @@
 
 			if (subarg->result == -1)
 				arg->result = -1;
-			else if (subarg->result == arg->not) {
+			else if (subarg->result == 0) {
 				/* didn't match */
 				arg->result = 0;
 				break;
@@ -54,6 +54,8 @@
 
 			subarg = subarg->next;
 		}
+		if (arg->not && arg->result != -1)
+			arg->result = !arg->result;
 	} else if (arg->type == SEARCH_OR) {
 		/* OR-list of conditions */
 		i_assert(arg->value.subargs != NULL);
@@ -64,18 +66,18 @@
 			if (subarg->result == -1)
 				search_arg_foreach(subarg, callback, context);
 
-			if (subarg->result != -1) {
-				if (subarg->result == !arg->not) {
-					/* matched */
-					arg->result = 1;
-					break;
-				}
-			} else {
+			if (subarg->result == -1)
 				arg->result = -1;
+			else if (subarg->result > 0) {
+				/* matched */
+				arg->result = 1;
+				break;
 			}
 
 			subarg = subarg->next;
 		}
+		if (arg->not && arg->result != -1)
+			arg->result = !arg->result;
 	} else {
 		/* just a single condition */
 		callback(arg, context);