summaryrefslogtreecommitdiff
path: root/src/basic/env-util.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-10-07 15:54:04 +0300
committerLennart Poettering <lennart@poettering.net>2015-10-07 15:54:04 +0300
commit5530caa20b9688bad0bceedb4d9df5df8ad96299 (patch)
treeeb2c38ca6d95ba1c0e87d2f6088c8c737b42c796 /src/basic/env-util.c
parent7c85ab42dda080cfed2386880b9c07ac03fa9d56 (diff)
parent3faf145d32549735c6090a6a39e3a80e68e35c5d (diff)
Merge pull request #1487 from michich/fix-env-expansion
Fix env expansion
Diffstat (limited to 'src/basic/env-util.c')
-rw-r--r--src/basic/env-util.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/basic/env-util.c b/src/basic/env-util.c
index 4804a67f91..ecb2192c4d 100644
--- a/src/basic/env-util.c
+++ b/src/basic/env-util.c
@@ -541,7 +541,7 @@ char **replace_env_argv(char **argv, char **env) {
STRV_FOREACH(i, argv) {
/* If $FOO appears as single word, replace it by the split up variable */
- if ((*i)[0] == '$' && (*i)[1] != '{') {
+ if ((*i)[0] == '$' && (*i)[1] != '{' && (*i)[1] != '$') {
char *e;
char **w, **m = NULL;
unsigned q;