From c42286c1274b0fd02a1ba636106a2977a94b55ef Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Wed, 18 Mar 2009 17:26:40 -0400 Subject: [PATCH] MAILBOXDIR changes broke some setups. --HG-- branch : HEAD --- src/lib-storage/mailbox-list.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/lib-storage/mailbox-list.c b/src/lib-storage/mailbox-list.c index 5dfbf60ef5..f46b5ecb30 100644 --- a/src/lib-storage/mailbox-list.c +++ b/src/lib-storage/mailbox-list.c @@ -182,13 +182,6 @@ int mailbox_list_settings_parse(const char *data, if (set->index_dir != NULL && strcmp(set->index_dir, "MEMORY") == 0) set->index_dir = ""; - - if (set->mailbox_dir_name == NULL) - set->mailbox_dir_name = ""; - else if (set->mailbox_dir_name[strlen(set->mailbox_dir_name)-1] != '/') { - set->mailbox_dir_name = - t_strconcat(set->mailbox_dir_name, "/", NULL); - } return 0; } @@ -221,8 +214,16 @@ void mailbox_list_init(struct mailbox_list *list, struct mail_namespace *ns, list->set.maildir_name = (list->props & MAILBOX_LIST_PROP_NO_MAILDIR_NAME) != 0 ? "" : p_strdup(list->pool, set->maildir_name); - list->set.mailbox_dir_name = - p_strdup(list->pool, set->mailbox_dir_name); + + if (set->mailbox_dir_name == NULL) + list->set.mailbox_dir_name = ""; + else if (set->mailbox_dir_name[strlen(set->mailbox_dir_name)-1] == '/') { + list->set.mailbox_dir_name = + p_strdup(list->pool, set->mailbox_dir_name); + } else { + list->set.mailbox_dir_name = + p_strconcat(list->pool, set->mailbox_dir_name, "/", NULL); + } list->set.mail_storage_flags = set->mail_storage_flags; list->set.lock_method = set->lock_method; -- 2.47.3