diff options
| -rw-r--r-- | TODO | 2 | ||||
| -rw-r--r-- | src/shared/fileio.c | 46 |
2 files changed, 30 insertions, 18 deletions
@@ -29,8 +29,6 @@ Features: * see if we can fix https://bugs.freedesktop.org/show_bug.cgi?id=63672 without dropping the location cache entirely. -* truncate whitespace of var names the same way as values in parse_env_file_internal() - * dbus: when a unit failed to load (i.e. is in UNIT_ERROR state), we should be able to safely try another attempt when the bus call LoadUnit() is invoked. diff --git a/src/shared/fileio.c b/src/shared/fileio.c index 337b9e4147..48dd44239f 100644 --- a/src/shared/fileio.c +++ b/src/shared/fileio.c @@ -177,7 +177,7 @@ static int parse_env_file_internal( void *userdata) { _cleanup_free_ char *contents = NULL, *key = NULL; - size_t key_alloc = 0, n_key = 0, value_alloc = 0, n_value = 0, last_whitespace = (size_t) -1; + size_t key_alloc = 0, n_key = 0, value_alloc = 0, n_value = 0, last_value_whitespace = (size_t) -1, last_key_whitespace = (size_t) -1; char *p, *value = NULL; int r; @@ -212,6 +212,8 @@ static int parse_env_file_internal( state = COMMENT; else if (!strchr(WHITESPACE, c)) { state = KEY; + last_key_whitespace = (size_t) -1; + if (!greedy_realloc((void**) &key, &key_alloc, n_key+2)) { r = -ENOMEM; goto fail; @@ -225,9 +227,15 @@ static int parse_env_file_internal( if (strchr(newline, c)) { state = PRE_KEY; n_key = 0; - } else if (c == '=') + } else if (c == '=') { state = PRE_VALUE; - else { + last_value_whitespace = (size_t) -1; + } else { + if (!strchr(WHITESPACE, c)) + last_key_whitespace = (size_t) -1; + else if (last_key_whitespace == (size_t) -1) + last_key_whitespace = n_key; + if (!greedy_realloc((void**) &key, &key_alloc, n_key+2)) { r = -ENOMEM; goto fail; @@ -247,8 +255,8 @@ static int parse_env_file_internal( value[n_value] = 0; /* strip trailing whitespace from key */ - while(n_key && strchr(WHITESPACE, key[--n_key])) - key[n_key]=0; + if (last_key_whitespace != (size_t) -1) + key[last_key_whitespace] = 0; r = push(key, value, userdata); if (r < 0) @@ -257,6 +265,7 @@ static int parse_env_file_internal( n_key = 0; value = NULL; value_alloc = n_value = 0; + } else if (c == '\'') state = SINGLE_QUOTE_VALUE; else if (c == '\"') @@ -285,13 +294,13 @@ static int parse_env_file_internal( if (value) value[n_value] = 0; - /* Chomp off trailing whitespace */ - if (last_whitespace != (size_t) -1) - value[last_whitespace] = 0; + /* Chomp off trailing whitespace from value */ + if (last_value_whitespace != (size_t) -1) + value[last_value_whitespace] = 0; /* strip trailing whitespace from key */ - while(n_key && strchr(WHITESPACE, key[--n_key])) - key[n_key]=0; + if (last_key_whitespace != (size_t) -1) + key[last_key_whitespace] = 0; r = push(key, value, userdata); if (r < 0) @@ -300,14 +309,15 @@ static int parse_env_file_internal( n_key = 0; value = NULL; value_alloc = n_value = 0; + } else if (c == '\\') { state = VALUE_ESCAPE; - last_whitespace = (size_t) -1; + last_value_whitespace = (size_t) -1; } else { if (!strchr(WHITESPACE, c)) - last_whitespace = (size_t) -1; - else if (last_whitespace == (size_t) -1) - last_whitespace = n_value; + last_value_whitespace = (size_t) -1; + else if (last_value_whitespace == (size_t) -1) + last_value_whitespace = n_value; if (!greedy_realloc((void**) &value, &value_alloc, n_value+2)) { r = -ENOMEM; @@ -417,9 +427,13 @@ static int parse_env_file_internal( if (value) value[n_value] = 0; + if (state == VALUE) + if (last_value_whitespace != (size_t) -1) + value[last_value_whitespace] = 0; + /* strip trailing whitespace from key */ - while(n_key && strchr(WHITESPACE, key[--n_key])) - key[n_key]=0; + if (last_key_whitespace != (size_t) -1) + key[last_key_whitespace] = 0; r = push(key, value, userdata); if (r < 0) |