[dovecot-cvs] dovecot/src/lib-storage/index/maildir maildir-list.c, 1.43, 1.44

[cras at dovecot.org]

Update of /var/lib/cvs/dovecot/src/lib-storage/index/maildir
In directory talvi:/tmp/cvs-serv9468/maildir

Modified Files:
	maildir-list.c 
Log Message:
Handle reference parameter more like UW-IMAP: If it doesn't begin with
separator, just use it as a prefix to mask. I'm not sure where I got the
earlier rules..



Index: maildir-list.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/maildir/maildir-list.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- maildir-list.c	27 Jun 2006 21:13:45 -0000	1.43
+++ maildir-list.c	6 Aug 2006 21:00:42 -0000	1.44
@@ -282,17 +282,7 @@
 
 	if (*ref != '\0') {
 		/* join reference + mask */
-		if (*mask == MAILDIR_FS_SEP &&
-		    ref[strlen(ref)-1] == MAILDIR_FS_SEP) {
-			/* A. .B -> A.B */
-			mask++;
-		} else if (*mask != MAILDIR_FS_SEP &&
-			   ref[strlen(ref)-1] != MAILDIR_FS_SEP) {
-			/* A B -> A.B */
-			mask = t_strconcat(ref, MAILDIR_FS_SEP_S, mask, NULL);
-		} else {
-			mask = t_strconcat(ref, mask, NULL);
-		}
+		mask = t_strconcat(ref, mask, NULL);
 	}
 
 	glob = imap_match_init(pool, mask, TRUE, MAILDIR_FS_SEP);