From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Mon, 7 Oct 2024 11:51:55 +0000 (+0300)
Subject: lib-settings, config: Add and use SETTINGS_FILTER_ARRAY_SEPARATORS
X-Git-Tag: 2.4.1~268
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7dde5a25a406c1546c8b01d3bedc30479253d345;p=thirdparty%2Fdovecot%2Fcore.git

lib-settings, config: Add and use SETTINGS_FILTER_ARRAY_SEPARATORS
---

diff --git a/src/config/config-parser.c b/src/config/config-parser.c
index d72f6da0cf..5d928b295a 100644
--- a/src/config/config-parser.c
+++ b/src/config/config-parser.c
@@ -660,7 +660,8 @@ static int config_apply_filter_array(struct config_parser_context *ctx,
 				     const char *value,
 				     ARRAY_TYPE(const_string) **namesp)
 {
-	const char *const *list = t_strsplit(value, ",\t ");
+	const char *const *list =
+		t_strsplit(value, SETTINGS_FILTER_ARRAY_SEPARATORS);
 	unsigned int i, count = str_array_length(list);
 
 	if (line != NULL && line->type != CONFIG_LINE_TYPE_SECTION_BEGIN) {
diff --git a/src/lib-settings/settings-parser.c b/src/lib-settings/settings-parser.c
index b52d699fdd..c02a44649b 100644
--- a/src/lib-settings/settings-parser.c
+++ b/src/lib-settings/settings-parser.c
@@ -735,7 +735,8 @@ settings_parse(struct setting_parser_context *ctx,
 		   by giving e.g. "namespace+=newname" without it removing the
 		   existing ones. */
 		ARRAY_TYPE(const_string) *arr = ptr;
-		const char *const *list = t_strsplit(value, ",\t ");
+		const char *const *list =
+			t_strsplit(value, SETTINGS_FILTER_ARRAY_SEPARATORS);
 		unsigned int i, count = str_array_length(list);
 		if (!array_is_created(arr))
 			p_array_init(arr, ctx->set_pool, count);
diff --git a/src/lib-settings/settings-parser.h b/src/lib-settings/settings-parser.h
index a84394b961..1c23ee1edf 100644
--- a/src/lib-settings/settings-parser.h
+++ b/src/lib-settings/settings-parser.h
@@ -9,6 +9,8 @@ struct var_expand_provider;
 #define SETTINGS_SEPARATOR '/'
 #define SETTINGS_SEPARATOR_S "/"
 
+#define SETTINGS_FILTER_ARRAY_SEPARATORS ",\t "
+
 /* These values are shown as "unlimited" */
 #define SET_VALUE_UNLIMITED "unlimited"
 #define SET_UINT_UNLIMITED UINT_MAX
diff --git a/src/lib-settings/settings.c b/src/lib-settings/settings.c
index 681823b5a2..f90b9f4e21 100644
--- a/src/lib-settings/settings.c
+++ b/src/lib-settings/settings.c
@@ -1693,7 +1693,8 @@ settings_instance_override_add_default(struct settings_apply_ctx *ctx,
 	     next settings_get_filter() could be trying to look up this filter
 	     and it won't know enough to build the event filter.
 	*/
-	const char *const *items = t_strsplit(array_set->value, ",\t ");
+	const char *const *items =
+		t_strsplit(array_set->value, SETTINGS_FILTER_ARRAY_SEPARATORS);
 	for (unsigned int i = 0; items[i] != NULL; i++) {
 		struct settings_override *set =
 			array_append_space(array_set->overrides_array);