changeset 1649:27f68eecfb35 HEAD

Fixes for inbox case-insensitity matching
author Timo Sirainen <tss@iki.fi>
date Sun, 27 Jul 2003 02:28:05 +0300
parents f9f7f69f345e
children bc76e08a9c9d
files src/lib-imap/imap-match.c
diffstat 1 files changed, 3 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/lib-imap/imap-match.c	Sun Jul 27 01:42:44 2003 +0300
+++ b/src/lib-imap/imap-match.c	Sun Jul 27 02:28:05 2003 +0300
@@ -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;