chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prep v233: Add missing updates from upstream in src/basic
[elogind.git]
/
src
/
basic
/
fileio.c
diff --git
a/src/basic/fileio.c
b/src/basic/fileio.c
index 03238151c64694ea3222292ce2acbfae3f2d2c7f..822855c9d939e5dd92101bf1941536e6cbf57dc5 100644
(file)
--- a/
src/basic/fileio.c
+++ b/
src/basic/fileio.c
@@
-788,7
+788,9
@@
static int merge_env_file_push(
}
expanded_value = replace_env(value, *env,
}
expanded_value = replace_env(value, *env,
- REPLACE_ENV_USE_ENVIRONMENT|REPLACE_ENV_ALLOW_BRACELESS);
+ REPLACE_ENV_USE_ENVIRONMENT|
+ REPLACE_ENV_ALLOW_BRACELESS|
+ REPLACE_ENV_ALLOW_EXTENDED);
if (!expanded_value)
return -ENOMEM;
if (!expanded_value)
return -ENOMEM;
@@
-803,7
+805,7
@@
int merge_env_file(
const char *fname) {
/* NOTE: this function supports braceful and braceless variable expansions,
const char *fname) {
/* NOTE: this function supports braceful and braceless variable expansions,
- * unlike other exported parsing functions.
+ *
plus "extended" substitutions,
unlike other exported parsing functions.
*/
return parse_env_file_internal(f, fname, NEWLINE, merge_env_file_push, env, NULL);
*/
return parse_env_file_internal(f, fname, NEWLINE, merge_env_file_push, env, NULL);