summaryrefslogtreecommitdiff
path: root/src/locale/localed.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2013-04-03 19:04:03 +0200
committerLennart Poettering <lennart@poettering.net>2013-04-03 20:12:57 +0200
commitf73141d7657b3f60b8669bc8386413d8a8a372c6 (patch)
treea2fc0917431fa8498c1c0ac2ae9c7c8ac4f00163 /src/locale/localed.c
parent7f602784de4fd378120e8ebfe6d830862b9cae03 (diff)
shared: rework env file reader
Implement this with a proper state machine, so that newlines and escaped chars can appear in string assignments. This should bring the parser much closer to shell.
Diffstat (limited to 'src/locale/localed.c')
-rw-r--r--src/locale/localed.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/locale/localed.c b/src/locale/localed.c
index 60083b7681..df812ee651 100644
--- a/src/locale/localed.c
+++ b/src/locale/localed.c
@@ -355,7 +355,7 @@ static int write_data_locale(void) {
int r, p;
char **l = NULL;
- r = load_env_file("/etc/locale.conf", &l);
+ r = load_env_file("/etc/locale.conf", NULL, &l);
if (r < 0 && r != -ENOENT)
return r;
@@ -494,7 +494,7 @@ static int write_data_vconsole(void) {
int r;
char **l = NULL;
- r = load_env_file("/etc/vconsole.conf", &l);
+ r = load_env_file("/etc/vconsole.conf", NULL, &l);
if (r < 0 && r != -ENOENT)
return r;