dovecot-1.0: Use MAILDIR_FS_SEP directly instead of hierarchy_se...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-1.0/rev/5c798e920045
changeset: 5414:5c798e920045
user:      Timo Sirainen <tss at iki.fi>
date:      Sat Sep 22 18:07:20 2007 +0300
description:
Use MAILDIR_FS_SEP directly instead of hierarchy_sep. It's done this way in
mail-storage.c as well, and this breaks listescape plugin.

diffstat:

1 file changed, 6 insertions(+), 10 deletions(-)
src/lib-storage/index/maildir/maildir-list.c |   16 ++++++----------

diffs (49 lines):

diff -r 4c807839ac0c -r 5c798e920045 src/lib-storage/index/maildir/maildir-list.c
--- a/src/lib-storage/index/maildir/maildir-list.c	Sat Sep 22 18:01:36 2007 +0300
+++ b/src/lib-storage/index/maildir/maildir-list.c	Sat Sep 22 18:07:20 2007 +0300
@@ -331,7 +331,7 @@ int maildir_mailbox_list_deinit(struct m
 }
 
 static struct mailbox_node *find_next(struct mailbox_node **node,
-				      string_t *path, char hierarchy_sep)
+				      string_t *path)
 {
 	struct mailbox_node *child;
 	size_t len;
@@ -343,11 +343,10 @@ static struct mailbox_node *find_next(st
 		if ((*node)->children != NULL) {
 			len = str_len(path);
 			if (len != 0)
-				str_append_c(path, hierarchy_sep);
+				str_append_c(path, MAILDIR_FS_SEP);
 			str_append(path, (*node)->name);
 
-			child = find_next(&(*node)->children, path,
-					  hierarchy_sep);
+			child = find_next(&(*node)->children, path);
 			if (child != NULL)
 				return child;
 
@@ -376,8 +375,7 @@ maildir_mailbox_list_next(struct mailbox
 			return NULL;
 
 		str_truncate(ctx->node_path, 0);
-		node = find_next(&ctx->root, ctx->node_path,
-				 ctx->mailbox_ctx.storage->hierarchy_sep);
+		node = find_next(&ctx->root, ctx->node_path);
                 ctx->parent_pos = str_len(ctx->node_path);
 
 		if (node == NULL)
@@ -389,10 +387,8 @@ maildir_mailbox_list_next(struct mailbox
 	node->flags &= ~MAILBOX_FLAG_MATCHED;
 
 	str_truncate(ctx->node_path, ctx->parent_pos);
-	if (ctx->parent_pos != 0) {
-		str_append_c(ctx->node_path,
-			     ctx->mailbox_ctx.storage->hierarchy_sep);
-	}
+	if (ctx->parent_pos != 0)
+		str_append_c(ctx->node_path, MAILDIR_FS_SEP);
 	str_append(ctx->node_path, node->name);
 
 	ctx->list.name = str_c(ctx->node_path);