From f054a7fc36341cca5e32b2731a0a13a04b8d5012 Mon Sep 17 00:00:00 2001 From: Brendan Cully Date: Sun, 28 Jun 2009 20:21:04 -0700 Subject: [PATCH] Allow ImapDelimChars to be unset --- ChangeLog | 7 ++++++- imap/util.c | 9 +++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index eb59cdbee..9812d3029 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,9 @@ -2009-06-28 16:00 -0700 Brendan Cully (de948f407a1b) +2009-06-28 19:21 -0700 Brendan Cully (ef6523d11f24) + + * mutt.h: Rename struct thread to struct mutt_thread. Closes #3279. + + * imap/command.c: Not being able to start an IMAP command + is a fatal error. Closes #3155. * imap/auth_login.c: IMAP LOGIN does not support separate user and login accounts. Use the user account for both. Closes #3240. diff --git a/imap/util.c b/imap/util.c index 2e1dfc328..48ba630b0 100644 --- a/imap/util.c +++ b/imap/util.c @@ -316,7 +316,7 @@ void imap_pretty_mailbox (char* path) { if (! hlen) home_match = 1; - else + else if (ImapDelimChars) for (delim = ImapDelimChars; *delim != '\0'; delim++) if (target.mbox[hlen] == *delim) home_match = 1; @@ -421,14 +421,15 @@ char *imap_fix_path (IMAP_DATA *idata, const char *mailbox, char *path, while (mailbox && *mailbox && i < plen - 1) { if ((ImapDelimChars && strchr(ImapDelimChars, *mailbox)) - || *mailbox == delim) + || (delim && *mailbox == delim)) { /* use connection delimiter if known. Otherwise use user delimiter */ if (!idata) delim = *mailbox; - while (*mailbox && - (strchr(ImapDelimChars, *mailbox) || *mailbox == delim)) + while (*mailbox + && ((ImapDelimChars && strchr(ImapDelimChars, *mailbox)) + || (delim && *mailbox == delim))) mailbox++; path[i] = delim; } -- 2.40.0