cli: refactor multilist property handling of "match.interface-names"

We had %VALUE_STRSPLIT_MODE_MULTILIST_WITH_ESCAPE, which was used
by "match.interface-names". This uses nm_utils_strsplit_set_full()
with %NM_UTILS_STRSPLIT_SET_FLAGS_ALLOW_ESCAPING and
_nm_utils_unescape_plain().

We want eventually to use nm_utils_escaped_tokens_split() everywhere.

We already have %VALUE_STRSPLIT_MODE_ESCAPED_TOKENS, which splits the
list at ',' (and strips whitespaces at the around the delimiter). That
differs from what %VALUE_STRSPLIT_MODE_MULTILIST_WITH_ESCAPE did, which
also considered whitespace a delimiter.

So, we need a new mode %VALUE_STRSPLIT_MODE_ESCAPED_TOKENS_WITH_SPACES
which replaces the previous mode.

Note that the previous implementation did almost the same thing. In
fact, I cannot imagine examples where they behaved differently, but
my feeling is that there might be some edge cases where this changes
behavior.

(cherry picked from commit 6093f49304a2d6bc45d4a8f7a1cac774f1c24203)

2 files changed, 14 insertions, 23 deletions

diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c
index 65737d8032..5a1352ccce 100644
--- a/clients/common/nm-meta-setting-desc.c
+++ b/clients/common/nm-meta-setting-desc.c
@@ -165,7 +165,8 @@ _value_str_as_index_list (const char *value, gsize *out_len)
 	return g_steal_pointer (&arr);
 }
 
-#define MULTILIST_WITH_ESCAPE_CHARS     NM_ASCII_SPACES","
+#define ESCAPED_TOKENS_WITH_SPACES_DELIMTER  ' '
+#define ESCAPED_TOKENS_WITH_SPACES_DELIMTERS NM_ASCII_SPACES","
 
 #define ESCAPED_TOKENS_DELIMITER        ','
 #define ESCAPED_TOKENS_DELIMITERS       ","
@@ -174,16 +175,10 @@ typedef enum {
 	VALUE_STRSPLIT_MODE_STRIPPED,
 	VALUE_STRSPLIT_MODE_OBJLIST,
 	VALUE_STRSPLIT_MODE_MULTILIST,
-	VALUE_STRSPLIT_MODE_MULTILIST_WITH_ESCAPE,
 	VALUE_STRSPLIT_MODE_ESCAPED_TOKENS,
+	VALUE_STRSPLIT_MODE_ESCAPED_TOKENS_WITH_SPACES,
 } ValueStrsplitMode;
 
-static const char *
-_value_strescape (const char *str, char **out_to_free)
-{
-	return _nm_utils_escape_plain (str, MULTILIST_WITH_ESCAPE_CHARS, out_to_free);
-}
-
 static const char **
 _value_strsplit (const char *value,
                  ValueStrsplitMode split_mode,
@@ -209,13 +204,14 @@ _value_strsplit (const char *value,
 	case VALUE_STRSPLIT_MODE_MULTILIST:
 		strv = nm_utils_strsplit_set (value, " \t,");
 		break;
-	case VALUE_STRSPLIT_MODE_MULTILIST_WITH_ESCAPE:
-		strv = nm_utils_strsplit_set_full (value, MULTILIST_WITH_ESCAPE_CHARS, NM_UTILS_STRSPLIT_SET_FLAGS_ALLOW_ESCAPING);
-		break;
 	case VALUE_STRSPLIT_MODE_ESCAPED_TOKENS:
 		strv = nm_utils_escaped_tokens_split (value, ESCAPED_TOKENS_DELIMITERS);
 		NM_SET_OUT (out_len, NM_PTRARRAY_LEN (strv));
 		return g_steal_pointer (&strv);
+	case VALUE_STRSPLIT_MODE_ESCAPED_TOKENS_WITH_SPACES:
+		strv = nm_utils_escaped_tokens_split (value, ESCAPED_TOKENS_WITH_SPACES_DELIMTERS);
+		NM_SET_OUT (out_len, NM_PTRARRAY_LEN (strv));
+		return g_steal_pointer (&strv);
 	default:
 		nm_assert_not_reached ();
 		break;
@@ -234,11 +230,7 @@ _value_strsplit (const char *value,
 		if (s[0] == '\0')
 			continue;
 
-		if (split_mode == VALUE_STRSPLIT_MODE_MULTILIST_WITH_ESCAPE)
-			_nm_utils_unescape_plain ((char *) s, MULTILIST_WITH_ESCAPE_CHARS, TRUE);
-		else
-			g_strchomp ((char *) s);
-
+		g_strchomp ((char *) s);
 		strv[len++] = s;
 	}
 	strv[len] = NULL;
@@ -1919,8 +1911,8 @@ _set_fcn_multilist (ARGS_SET_FCN)
 	strv = _value_strsplit (value,
 	                          property_info->property_typ_data->subtype.multilist.strsplit_plain
 	                        ? VALUE_STRSPLIT_MODE_MULTILIST
-	                        : (  property_info->property_typ_data->subtype.multilist.strsplit_with_escape
-	                           ? VALUE_STRSPLIT_MODE_MULTILIST_WITH_ESCAPE
+	                        : (  property_info->property_typ_data->subtype.multilist.strsplit_with_spaces
+	                           ? VALUE_STRSPLIT_MODE_ESCAPED_TOKENS_WITH_SPACES
 	                           : VALUE_STRSPLIT_MODE_ESCAPED_TOKENS),
 	                        &nstrv);
 
@@ -3468,7 +3460,6 @@ _get_fcn_match_interface_name (ARGS_GET_FCN)
 
 	num = nm_setting_match_get_num_interface_names (s_match);
 	for (i = 0; i < num; i++) {
-		gs_free char *to_free = NULL;
 		const char *name;
 
 		name = nm_setting_match_get_interface_name (s_match, i);
@@ -3477,8 +3468,8 @@ _get_fcn_match_interface_name (ARGS_GET_FCN)
 		if (!str)
 			str = g_string_new ("");
 		else
-			g_string_append_c (str, ' ');
-		g_string_append (str, _value_strescape (name, &to_free));
+			g_string_append_c (str, ESCAPED_TOKENS_WITH_SPACES_DELIMTER);
+		nm_utils_escaped_tokens_escape_gstr (name, ESCAPED_TOKENS_WITH_SPACES_DELIMTERS, str);
 	}
 
 	NM_SET_OUT (out_is_default, num == 0);
@@ -6161,7 +6152,7 @@ static const NMMetaPropertyInfo *const property_infos_MATCH[] = {
 				.add2_fcn =             MULTILIST_ADD2_FCN            (NMSettingMatch, nm_setting_match_add_interface_name),
 				.remove_by_idx_fcn_s =  MULTILIST_REMOVE_BY_IDX_FCN_S (NMSettingMatch, nm_setting_match_remove_interface_name),
 				.remove_by_value_fcn =  MULTILIST_REMOVE_BY_VALUE_FCN (NMSettingMatch, nm_setting_match_remove_interface_name_by_value),
-				.strsplit_with_escape = TRUE,
+				.strsplit_with_spaces = TRUE,
 			),
 		),
 	),
diff --git a/clients/common/nm-meta-setting-desc.h b/clients/common/nm-meta-setting-desc.h
index c250700abd..a5083ba603 100644
--- a/clients/common/nm-meta-setting-desc.h
+++ b/clients/common/nm-meta-setting-desc.h
@@ -281,7 +281,7 @@ struct _NMMetaPropertyTypData {
 			void (*remove_by_idx_fcn_s) (NMSetting *setting, int idx);
 			gboolean (*remove_by_value_fcn) (NMSetting *setting, const char *item);
 			bool strsplit_plain:1;
-			bool strsplit_with_escape:1;
+			bool strsplit_with_spaces:1;
 		} multilist;
 		struct {
 			guint (*get_num_fcn) (NMSetting *setting);