SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

env-util: use strextend()

Browse Source
This commit is contained in:
Yu Watanabe
2021-05-20 18:18:56 +09:00
parent 4304f68d15
commit 2b070200f1
1 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/basic/env-util.c
+3 -12
View File
@@ -572,12 +572,9 @@ char *replace_env_n(const char *format, size_t n, char **env, unsigned flags) {
t = strv_env_get_n(env, word+2, e-word-2, flags);
k = strjoin(r, t);
if (!k)
if (!strextend(&r, t))
return NULL;
free_and_replace(r, k);
word = e+1;
state = WORD;
} else if (*e == ':') {
@@ -627,12 +624,9 @@ char *replace_env_n(const char *format, size_t n, char **env, unsigned flags) {
else if (!t && state == DEFAULT_VALUE)
t = v = replace_env_n(test_value, e-test_value, env, flags);
k = strjoin(r, t);
if (!k)
if (!strextend(&r, t))
return NULL;
free_and_replace(r, k);
word = e+1;
state = WORD;
}
@@ -646,12 +640,9 @@ char *replace_env_n(const char *format, size_t n, char **env, unsigned flags) {
t = strv_env_get_n(env, word+1, e-word-1, flags);
k = strjoin(r, t);
if (!k)
if (!strextend(&r, t))
return NULL;
free_and_replace(r, k);
word = e--;
i--;
state = WORD;