dovecot-1.0: If source mailbox name contain destination storage'...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-1.0/rev/7f620247ac5a
changeset: 5379:7f620247ac5a
user:      Timo Sirainen <tss at iki.fi>
date:      Thu Aug 09 21:02:51 2007 +0300
description:
If source mailbox name contain destination storage's separator, replace it
with '_'.

diffstat:

1 file changed, 6 insertions(+), 1 deletion(-)
src/plugins/convert/convert-storage.c |    7 ++++++-

diffs (19 lines):

diff -r bc683833b319 -r 7f620247ac5a src/plugins/convert/convert-storage.c
--- a/src/plugins/convert/convert-storage.c	Thu Aug 09 20:47:12 2007 +0300
+++ b/src/plugins/convert/convert-storage.c	Thu Aug 09 21:02:51 2007 +0300
@@ -114,9 +114,14 @@ mailbox_name_convert(struct mail_storage
 	src_sep = mail_storage_get_hierarchy_sep(source_storage);
 	dest_sep = mail_storage_get_hierarchy_sep(dest_storage);
 
+	if (src_sep == dest_sep)
+		return name;
+
 	dest_name = t_strdup_noconst(name);
 	for (p = dest_name; *p != '\0'; p++) {
-		if (*p == src_sep)
+		if (*p == dest_sep)
+			*p = '_';
+		else if (*p == src_sep)
 			*p = dest_sep;
 	}
 	return dest_name;