Mercurial > dovecot > core-2.2
changeset 4321:928f9082a322 HEAD
Create destination INBOX always uppercased.
| author | Timo Sirainen <tss@iki.fi> |
|---|---|
| date | Thu, 08 Jun 2006 20:07:25 +0300 |
| parents | 5d2849b6cb90 |
| children | f693898fee3b |
| files | src/plugins/convert/convert-storage.c |
| diffstat | 1 files changed, 10 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/src/plugins/convert/convert-storage.c Thu Jun 08 20:03:27 2006 +0300 +++ b/src/plugins/convert/convert-storage.c Thu Jun 08 20:07:25 2006 +0300 @@ -103,43 +103,43 @@ struct mailbox_list *list, struct dotlock *dotlock) { + const char *name; struct mailbox *srcbox, *destbox; int ret = 0; if ((list->flags & (MAILBOX_NONEXISTENT|MAILBOX_PLACEHOLDER)) != 0) return 0; + name = strcasecmp(list->name, "INBOX") == 0 ? "INBOX" : list->name; if ((list->flags & MAILBOX_NOSELECT) != 0) { - if (mail_storage_mailbox_create(dest_storage, - list->name, TRUE) < 0) { + if (mail_storage_mailbox_create(dest_storage, name, TRUE) < 0) { i_error("Mailbox conversion: Couldn't create mailbox " - "directory %s", list->name); + "directory %s", name); return -1; } return 0; } /* It's a real mailbox. First create the destination mailbox. */ - if (mail_storage_mailbox_create(dest_storage, list->name, FALSE) < 0) { - i_error("Mailbox conversion: Couldn't create mailbox %s", - list->name); + if (mail_storage_mailbox_create(dest_storage, name, FALSE) < 0) { + i_error("Mailbox conversion: Couldn't create mailbox %s", name); return -1; } /* Open both the mailboxes.. */ - srcbox = mailbox_open(source_storage, list->name, NULL, + srcbox = mailbox_open(source_storage, name, NULL, MAILBOX_OPEN_READONLY | MAILBOX_OPEN_KEEP_RECENT); if (srcbox == NULL) { i_error("Mailbox conversion: Couldn't open source mailbox %s", - list->name); + name); return -1; } - destbox = mailbox_open(dest_storage, list->name, NULL, + destbox = mailbox_open(dest_storage, name, NULL, MAILBOX_OPEN_KEEP_RECENT); if (destbox == NULL) { i_error("Mailbox conversion: Couldn't open dest mailbox %s", - list->name); + name); mailbox_close(&srcbox); return -1; }