colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ifcfg-rh: use macro _char_in_strset() for svEscape()

Browse Source
This commit is contained in:
Thomas Haller
2016-11-07 18:42:29 +01:00
parent c55b7e866e
commit 337fc582b2
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/settings/plugins/ifcfg-rh/shvar.c
View File

@@ -172,6 +172,8 @@ _escape_ansic (const char *source)
/*****************************************************************************/ /*****************************************************************************/
#define _char_in_strset(ch, str) (!!strchr (""str"", (ch)))
#define ESC_ESCAPEES "\"'\\$~`" /* must be escaped */ #define ESC_ESCAPEES "\"'\\$~`" /* must be escaped */
#define ESC_SPACES " \t|&;()<>" /* only require "" */ #define ESC_SPACES " \t|&;()<>" /* only require "" */
@@ -187,11 +189,11 @@ svEscape (const char *s, char **to_free)
slen = strlen (s); slen = strlen (s);
for (i = 0; i < slen; i++) { for (i = 0; i < slen; i++) {
if (strchr (ESC_ESCAPEES, s[i])) if (_char_in_strset (s[i], ESC_ESCAPEES))
mangle++; mangle++;
if (strchr (ESC_SPACES, s[i])) else if (_char_in_strset (s[i], ESC_SPACES))
has_space = TRUE; has_space = TRUE;
if (s[i] < ' ') { else if (s[i] < ' ') {
/* if the string contains newline we can only express it using ANSI C quotation /* if the string contains newline we can only express it using ANSI C quotation
* (as we don't support line continuation). * (as we don't support line continuation).
* Additionally, ANSI control characters look odd with regular quotation, so handle * Additionally, ANSI control characters look odd with regular quotation, so handle
@@ -210,7 +212,7 @@ svEscape (const char *s, char **to_free)
j = 0; j = 0;
new[j++] = '"'; new[j++] = '"';
for (i = 0; i < slen; i++) { for (i = 0; i < slen; i++) {
if (strchr (ESC_ESCAPEES, s[i])) { if (_char_in_strset (s[i], ESC_ESCAPEES)) {
new[j++] = '\\'; new[j++] = '\\';
} }
new[j++] = s[i]; new[j++] = s[i];