diff options
| author | Harald Hoyer <harald@redhat.com> | 2013-04-17 15:25:02 +0200 |
|---|---|---|
| committer | Harald Hoyer <harald@redhat.com> | 2013-04-17 15:31:45 +0200 |
| commit | ebc05a09ad6d1672cf4f426ee4252cf495daa139 (patch) | |
| tree | 1373481138158eddd498d4c536dd8baed35aa821 /src/shared/fileio.c | |
| parent | d2a514b8388e77e3ef228070422b7b73af2b4f10 (diff) | |
core/execute: report invalid environment variables from files
Because "export key=val" is not supported by systemd, an error is logged
where the invalid assignment is coming from.
Introduce strv_env_clean_log() to log invalid environment assignments,
where logging is possible and allowed.
parse_env_file_internal() is modified to allow WHITESPACE in keys, to
report the issues later on.
Diffstat (limited to 'src/shared/fileio.c')
| -rw-r--r-- | src/shared/fileio.c | 34 |
1 files changed, 14 insertions, 20 deletions
diff --git a/src/shared/fileio.c b/src/shared/fileio.c index 3f242edc6..4390726a9 100644 --- a/src/shared/fileio.c +++ b/src/shared/fileio.c @@ -184,7 +184,6 @@ static int parse_env_file_internal( enum { PRE_KEY, KEY, - PRE_EQUAL, PRE_VALUE, VALUE, VALUE_ESCAPE, @@ -209,9 +208,7 @@ static int parse_env_file_internal( switch (state) { case PRE_KEY: - if (startswith(p, "export ")) - p+=6; - else if (strchr(COMMENTS, c)) + if (strchr(COMMENTS, c)) state = COMMENT; else if (!strchr(WHITESPACE, c)) { state = KEY; @@ -228,9 +225,7 @@ static int parse_env_file_internal( if (strchr(newline, c)) { state = PRE_KEY; n_key = 0; - } else if (strchr(WHITESPACE, c)) - state = PRE_EQUAL; - else if (c == '=') + } else if (c == '=') state = PRE_VALUE; else { if (!greedy_realloc((void**) &key, &key_alloc, n_key+2)) { @@ -243,19 +238,6 @@ static int parse_env_file_internal( break; - case PRE_EQUAL: - if (strchr(newline, c)) { - state = PRE_KEY; - n_key = 0; - } else if (c == '=') - state = PRE_VALUE; - else if (!strchr(WHITESPACE, c)) { - n_key = 0; - state = COMMENT; - } - - break; - case PRE_VALUE: if (strchr(newline, c) || strchr(COMMENTS, c)) { state = PRE_KEY; @@ -264,6 +246,10 @@ static int parse_env_file_internal( if (value) value[n_value] = 0; + /* strip trailing whitespace from key */ + while(strchr(WHITESPACE, key[--n_key])) + key[n_key]=0; + r = push(key, value, userdata); if (r < 0) goto fail; @@ -302,6 +288,10 @@ static int parse_env_file_internal( if (last_whitespace != (size_t) -1) value[last_whitespace] = 0; + /* strip trailing whitespace from key */ + while(strchr(WHITESPACE, key[--n_key])) + key[n_key]=0; + r = push(key, value, userdata); if (r < 0) goto fail; @@ -426,6 +416,10 @@ static int parse_env_file_internal( if (value) value[n_value] = 0; + /* strip trailing whitespace from key */ + while(strchr(WHITESPACE, key[--n_key])) + key[n_key]=0; + r = push(key, value, userdata); if (r < 0) goto fail; |