dovecot-2.1: lib-storage: And another fix to previous maildir_na...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.1/rev/db8c1dde0b41
changeset: 14046:db8c1dde0b41
user:      Timo Sirainen <tss at iki.fi>
date:      Wed Feb 01 22:18:33 2012 +0200
description:
lib-storage: And another fix to previous maildir_name/mailbox_dir_name changes.

diffstat:

 src/lib-storage/index/dbox-common/dbox-storage.c |  4 ++--
 src/lib-storage/index/maildir/maildir-storage.c  |  2 +-
 src/lib-storage/mailbox-list.c                   |  2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diffs (39 lines):

diff -r 0308a33d9f99 -r db8c1dde0b41 src/lib-storage/index/dbox-common/dbox-storage.c
--- 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;
 }
 
diff -r 0308a33d9f99 -r db8c1dde0b41 src/lib-storage/index/maildir/maildir-storage.c
--- 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) {
diff -r 0308a33d9f99 -r db8c1dde0b41 src/lib-storage/mailbox-list.c
--- 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;
 	}