1 --- mutt-1.5.17/imap/util.c.orig 2007-04-12 22:44:40.000000000 +0200
2 +++ mutt-1.5.17/imap/util.c 2007-11-13 15:57:52.000000000 +0100
7 -/* silly helper for mailbox name string comparisons, because of INBOX */
8 +/* Silly helper for mailbox name string comparisons, because of INBOX
9 + * and different folder delimiters. Warning: unlike strcmp this funtion
10 + * won't tell which mailbox is 'greater'. */
11 int imap_mxcmp (const char* mx1, const char* mx2)
17 if (!ascii_strcasecmp (mx1, "INBOX") && !ascii_strcasecmp (mx2, "INBOX"))
20 - return mutt_strcmp (mx1, mx2);
22 + result = mutt_strcmp (mx1, mx2);
24 + if (result == 0 || !ImapDelimChars || !ImapDelimChars[0]) {
25 + /* exactly equal or no ImapDelimChars -- we are done */
29 + if (!mx1 || !mx2) return 1;
31 + /* compare with normalized delimiters
32 + * (so "INBOX.something" equals "INBOX./something") */
33 + for(i=0,j=0; mx1[i] && mx2[j]; i++, j++) {
36 + if (strchr(ImapDelimChars, c1)) {
37 + c1 = ImapDelimChars[0];
38 + while(mx1[i+1] && strchr(ImapDelimChars, mx1[i+1])) i+=1;
40 + if (strchr(ImapDelimChars, c2)) {
41 + c2 = ImapDelimChars[0];
42 + while(mx2[j+1] && strchr(ImapDelimChars, mx2[j+1])) j+=1;
44 + if (c1 != c2) return 1;
46 + if (mx1[i] || mx2[j]) return 1;
50 /* imap_pretty_mailbox: called by mutt_pretty_mailbox to make IMAP paths