From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Mon, 18 Jan 2021 21:30:28 +0000 (+0200)
Subject: imapc: Add IMAPC_LIST_FS_NAME_ESCAPE_CHAR
X-Git-Tag: 2.3.14.rc1~30
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1535a2ddbb95e489633e6c08a1d87a50ef65203f;p=thirdparty%2Fdovecot%2Fcore.git

imapc: Add IMAPC_LIST_FS_NAME_ESCAPE_CHAR

This clarifies how the escape characters are used.
---

diff --git a/src/lib-storage/index/imapc/imapc-list.c b/src/lib-storage/index/imapc/imapc-list.c
index 8859e6fb6e..f244d68ba3 100644
--- a/src/lib-storage/index/imapc/imapc-list.c
+++ b/src/lib-storage/index/imapc/imapc-list.c
@@ -402,8 +402,10 @@ static struct mailbox_list *imapc_list_get_fs(struct imapc_mailbox_list *list)
 		mailbox_list_settings_init_defaults(&list_set);
 		list_set.layout = MAILBOX_LIST_NAME_MAILDIRPLUSPLUS;
 		list_set.root_dir = dir;
+		/* Filesystem needs to be able to store any kind of a mailbox
+		   name. */
 		list_set.storage_name_escape_char =
-			IMAPC_LIST_STORAGE_NAME_ESCAPE_CHAR;
+			IMAPC_LIST_FS_NAME_ESCAPE_CHAR;
 		list_set.vname_escape_char = IMAPC_LIST_VNAME_ESCAPE_CHAR;
 
 		if (mailbox_list_create(list_set.layout, list->list.ns,
diff --git a/src/lib-storage/index/imapc/imapc-storage.h b/src/lib-storage/index/imapc/imapc-storage.h
index 91f4c4b2b8..0f4a12b430 100644
--- a/src/lib-storage/index/imapc/imapc-storage.h
+++ b/src/lib-storage/index/imapc/imapc-storage.h
@@ -6,7 +6,11 @@
 #include "imapc-client.h"
 
 #define IMAPC_STORAGE_NAME "imapc"
+/* storage_name separator */
 #define IMAPC_LIST_STORAGE_NAME_ESCAPE_CHAR '%'
+/* fs_name separator */
+#define IMAPC_LIST_FS_NAME_ESCAPE_CHAR '%'
+/* vname separator */
 #define IMAPC_LIST_VNAME_ESCAPE_CHAR '~'
 
 struct imap_arg;