Mercurial > dovecot > core-2.2

changeset 14046:db8c1dde0b41

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
lib-storage: And another fix to previous maildir_name/mailbox_dir_name changes.
author Timo Sirainen <tss@iki.fi>
date Wed, 01 Feb 2012 22:18:33 +0200
parents 0308a33d9f99
children b82a3149f45e
files src/lib-storage/index/dbox-common/dbox-storage.c src/lib-storage/index/maildir/maildir-storage.c src/lib-storage/mailbox-list.c
diffstat 3 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/lib-storage/index/dbox-common/dbox-storage.c	Wed Feb 01 22:04:26 2012 +0200
+++ b/src/lib-storage/index/dbox-common/dbox-storage.c	Wed Feb 01 22:18:33 2012 +0200
@@ -21,9 +21,9 @@
 		set->layout = MAILBOX_LIST_NAME_FS;
 	if (set->subscription_fname == NULL)
 		set->subscription_fname = DBOX_SUBSCRIPTION_FILE_NAME;
-	if (set->maildir_name == NULL)
+	if (*set->maildir_name == '\0')
 		set->maildir_name = DBOX_MAILDIR_NAME;
-	if (set->mailbox_dir_name == NULL)
+	if (*set->mailbox_dir_name == '\0')
 		set->mailbox_dir_name = DBOX_MAILBOX_DIR_NAME;
 }
 
--- a/src/lib-storage/index/maildir/maildir-storage.c	Wed Feb 01 22:04:26 2012 +0200
+++ b/src/lib-storage/index/maildir/maildir-storage.c	Wed Feb 01 22:18:33 2012 +0200
@@ -80,7 +80,7 @@
 	if (set->subscription_fname == NULL)
 		set->subscription_fname = MAILDIR_SUBSCRIPTION_FILE_NAME;
 
-	if (set->inbox_path == NULL && set->maildir_name == NULL &&
+	if (set->inbox_path == NULL && *set->maildir_name == '\0' &&
 	    (strcmp(set->layout, MAILBOX_LIST_NAME_MAILDIRPLUSPLUS) == 0 ||
 	     strcmp(set->layout, MAILBOX_LIST_NAME_FS) == 0) &&
 	    (ns->flags & NAMESPACE_FLAG_INBOX_ANY) != 0) {
--- a/src/lib-storage/mailbox-list.c	Wed Feb 01 22:04:26 2012 +0200
+++ b/src/lib-storage/mailbox-list.c	Wed Feb 01 22:18:33 2012 +0200
@@ -119,7 +119,7 @@
 
 	class_p = array_idx(&mailbox_list_drivers, idx);
 	if (((*class_p)->props & MAILBOX_LIST_PROP_NO_MAILDIR_NAME) != 0 &&
-	    set->maildir_name != NULL && *set->maildir_name != '\0') {
+	    *set->maildir_name != '\0') {
 		*error_r = "maildir_name not supported by this driver";
 		return -1;
 	}