fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-08 20:00:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

shared: refactor allowed-escaped handling in nm_utils_strsplit_set_full()

Browse source 
Drop the next_char() and is_delimiter() macros. They are difficult to
understand, because they both have a state-variable (escaped).
Instead, the state of whether we handle an escape or not, shall only
depend on the current line of code.
This commit is contained in:
Thomas Haller 2019-04-03 16:41:21 +02:00
parent e2217a26e7
commit 453b3ea362
1 changed files with 21 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
shared/nm-utils/nm-shared-utils.c
View file

@ -1017,36 +1017,22 @@ nm_utils_strsplit_set_full (const char *str,
char *s0;
char *s;
guint8 ch_lookup[256];
gboolean escaped = FALSE;
const gboolean f_allow_escaping = NM_FLAGS_HAS (flags, NM_UTILS_STRSPLIT_SET_FLAGS_ALLOW_ESCAPING);
if (!str)
return NULL;
/* initialize lookup table for delimiter */
if (!delimiters) {
nm_assert_not_reached ();
delimiters = " \t\n";
}
_char_lookup_table_init (ch_lookup, delimiters);
#define _is_delimiter(ch_lookup, ch, allow_esc, esc) \
(_char_lookup_has ((ch_lookup), (ch)) && (!allow_esc || !esc))
nm_assert ( !f_allow_escaping
|| !_char_lookup_has (ch_lookup, '\\'));
#define next_char(p, esc) \
G_STMT_START { \
if (esc) \
esc = FALSE; \
else \
esc = p[0] == '\\'; \
p++; \
} G_STMT_END
/* skip initial delimiters, and return of the remaining string is
* empty. */
while (_is_delimiter (ch_lookup, str[0], f_allow_escaping, escaped))
next_char (str, escaped);
while (_char_lookup_has (ch_lookup, str[0]))
str++;
if (!str[0])
return NULL;
@ -1079,23 +1065,30 @@ nm_utils_strsplit_set_full (const char *str,
ptr[plen++] = s;
nm_assert (s[0] && !_is_delimiter (ch_lookup, s[0], f_allow_escaping, escaped));
nm_assert (s[0] && !_char_lookup_has (ch_lookup, s[0]));
while (TRUE) {
next_char (s, escaped);
if (_is_delimiter (ch_lookup, s[0], f_allow_escaping, escaped))
break;
if (s[0] == '\0')
while (!_char_lookup_has (ch_lookup, s[0])) {
if (G_UNLIKELY ( s[0] == '\\'
&& f_allow_escaping)) {
s++;
if (s[0] == '\0')
goto done;
s++;
} else if (s[0] == '\0')
goto done;
else
s++;
}
nm_assert (_char_lookup_has (ch_lookup, s[0]));
s[0] = '\0';
next_char (s, escaped);
while (_is_delimiter (ch_lookup, s[0], f_allow_escaping, escaped))
next_char (s, escaped);
s++;
while (_char_lookup_has (ch_lookup, s[0]))
s++;
if (s[0] == '\0')
break;
goto done;
}
done:
ptr[plen] = NULL;