basic/random-util: add new header for getrandom()

[elogind.git] / src / basic / fileio.c

diff --git a/src/basic/fileio.c b/src/basic/fileio.c
index 03238151c64694ea3222292ce2acbfae3f2d2c7f..13f61077167e691dab32e0c7af76f3038c9db0d5 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,
-                                     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;
 
@@ -803,7 +805,7 @@ int merge_env_file(
                 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);
@@ -1437,7 +1439,6 @@ int link_tmpfile(int fd, const char *path, const char *target) {
 
         return 0;
 }
-#endif // 0
 
 int read_nul_string(FILE *f, char **ret) {
         _cleanup_free_ char *x = NULL;
@@ -1498,3 +1499,4 @@ int mkdtemp_malloc(const char *template, char **ret) {
         *ret = p;
         return 0;
 }
+#endif // 0