[dovecot-cvs] dovecot/src/lib-imap imap-match.c,1.6,1.7

[cras at procontrol.fi]

Update of /home/cvs/dovecot/src/lib-imap
In directory danu:/tmp/cvs-serv10109/lib-imap

Modified Files:
	imap-match.c 
Log Message:
Fixes for inbox case-insensitity matching



Index: imap-match.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-imap/imap-match.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- imap-match.c	20 Feb 2003 16:41:16 -0000	1.6
+++ imap-match.c	26 Jul 2003 23:28:05 -0000	1.7
@@ -61,7 +61,8 @@
 		/* check if we could be comparing INBOX. */
 		inboxp = inbox;
 		glob->inboxcase = TRUE;
-		for (p = glob->mask; *p != '\0' && *p != '*'; p++) {
+                p = glob->mask;
+		for (; *p != '\0' && *p != '*' && *p != separator; p++) {
 			if (*p != '%') {
 				inboxp = strchr(inboxp, i_toupper(*p));
 				if (inboxp == NULL) {
@@ -74,16 +75,12 @@
 					   any invalid chars */
 					if (*++p == '%') p++;
 					if (*p != '\0' && *p != '*' &&
-					    *p != glob->sep_char)
+					    *p != separator)
 						glob->inboxcase = FALSE;
 					break;
 				}
 			}
 		}
-
-		if (glob->inboxcase && inboxp != NULL && *inboxp != '\0' &&
-		    *p != '*' && (p != glob->mask && p[-1] != '%'))
-			glob->inboxcase = FALSE;
 	}
 
 	return glob;