Commit f73141d7 authored by Lennart Poettering's avatar Lennart Poettering

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.
parent 7f602784
......@@ -95,6 +95,7 @@
/test-efivars
/test-engine
/test-env-replace
/test-fileio
/test-hostname
/test-id128
/test-inhibit
......
......@@ -1087,7 +1087,8 @@ noinst_tests += \
test-calendarspec \
test-strip-tab-ansi \
test-cgroup-util \
test-prioq
test-prioq \
test-fileio
EXTRA_DIST += \
test/sched_idle_bad.service \
......@@ -1187,6 +1188,15 @@ test_prioq_CFLAGS = \
test_prioq_LDADD = \
libsystemd-core.la
test_fileio_SOURCES = \
src/test/test-fileio.c
test_fileio_CFLAGS = \
$(AM_CFLAGS)
test_fileio_LDADD = \
libsystemd-core.la
test_log_SOURCES = \
src/test/test-log.c
......
......@@ -1741,7 +1741,7 @@ int exec_context_load_environment(const ExecContext *c, char ***l) {
return -EINVAL;
}
for (n = 0; n < count; n++) {
k = load_env_file(pglob.gl_pathv[n], &p);
k = load_env_file(pglob.gl_pathv[n], NULL, &p);
if (k < 0) {
if (ignore)
continue;
......
......@@ -303,7 +303,7 @@ static int write_data_other(void) {
char **l = NULL;
int r, p;
r = load_env_file("/etc/machine-info", &l);
r = load_env_file("/etc/machine-info", NULL, &l);
if (r < 0 && r != -ENOENT)
return r;
......
......@@ -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;
......
This diff is collapsed.
......@@ -29,5 +29,5 @@ int read_one_line_file(const char *fn, char **line);
int read_full_file(const char *fn, char **contents, size_t *size);
int parse_env_file(const char *fname, const char *separator, ...) _sentinel_;
int load_env_file(const char *fname, char ***l);
int load_env_file(const char *fname, const char *separator, char ***l);
int write_env_file(const char *fname, char **l);
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
/***
This file is part of systemd.
Copyright 2013 Lennart Poettering
systemd is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
systemd is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
#include <stdio.h>
#include <fcntl.h>
#include <unistd.h>
#include "util.h"
#include "fileio.h"
#include "strv.h"
static void test_parse_env_file(void) {
char t[] = "/tmp/test-parse-env-file-XXXXXX";
int fd, r;
FILE *f;
_cleanup_free_ char *one = NULL, *two = NULL, *three = NULL, *four = NULL, *five = NULL, *six = NULL, *seven = NULL;
_cleanup_strv_free_ char **a = NULL;
char **i;
fd = mkostemp(t, O_CLOEXEC);
assert_se(fd >= 0);
f = fdopen(fd, "w");
assert_se(f);
fputs("one=BAR \n"
"# comment\n"
" # comment \n"
" two = bar \n"
"invalid line\n"
"three = \"333\n"
"xxxx\"\n"
"four = \'44\\\"44\'\n"
"five = \'55\\\'55\' \"FIVE\" cinco \n"
"six = seis sechs\\\n"
" sis\n"
"seven=", f);
fflush(f);
fclose(f);
r = parse_env_file(
t, NULL,
"one", &one,
"two", &two,
"three", &three,
"four", &four,
"five", &five,
"six", &six,
"seven", &seven,
NULL);
assert_se(r >= 0);
log_info("one=[%s]", strna(one));
log_info("two=[%s]", strna(two));
log_info("three=[%s]", strna(three));
log_info("four=[%s]", strna(four));
log_info("five=[%s]", strna(five));
log_info("six=[%s]", strna(six));
log_info("seven=[%s]", strna(seven));
assert_se(streq(one, "BAR"));
assert_se(streq(two, "bar"));
assert_se(streq(three, "333\nxxxx"));
assert_se(streq(four, "44\"44"));
assert_se(streq(five, "55\'55FIVEcinco"));
assert_se(streq(six, "seis sechs sis"));
assert_se(seven == NULL);
r = load_env_file(t, NULL, &a);
assert_se(r >= 0);
STRV_FOREACH(i, a)
log_info("Got: %s", *i);
unlink(t);
}
int main(int argc, char *argv[]) {
test_parse_env_file();
return 0;
}
......@@ -180,19 +180,19 @@ static void test_config_parse_exec(void) {
exec_command_free_list(c);
}
#define env_file_1 \
"a\n" \
"b\\\n" \
"c\n" \
"d\\\n" \
"e\\\n" \
"f\n" \
"g\\ \n" \
"h\n" \
"i\\"
#define env_file_2 \
"a\\\n"
#define env_file_1 \
"a=a\n" \
"b=b\\\n" \
"c\n" \
"d=d\\\n" \
"e\\\n" \
"f\n" \
"g=g\\ \n" \
"h=h\n" \
"i=i\\"
#define env_file_2 \
"a=a\\\n"
#define env_file_3 \
"#SPAMD_ARGS=\"-d --socketpath=/var/lib/bulwark/spamd \\\n" \
......@@ -208,14 +208,14 @@ static void test_load_env_file_1(void) {
assert(fd >= 0);
assert_se(write(fd, env_file_1, sizeof(env_file_1)) == sizeof(env_file_1));
r = load_env_file(name, &data);
r = load_env_file(name, NULL, &data);
assert(r == 0);
assert(streq(data[0], "a"));
assert(streq(data[1], "bc"));
assert(streq(data[2], "def"));
assert(streq(data[3], "g\\"));
assert(streq(data[4], "h"));
assert(streq(data[5], "i\\"));
assert(streq(data[0], "a=a"));
assert(streq(data[1], "b=bc"));
assert(streq(data[2], "d=def"));
assert(streq(data[3], "g=g "));
assert(streq(data[4], "h=h"));
assert(streq(data[5], "i=i"));
assert(data[6] == NULL);
unlink(name);
}
......@@ -229,9 +229,9 @@ static void test_load_env_file_2(void) {
assert(fd >= 0);
assert_se(write(fd, env_file_2, sizeof(env_file_2)) == sizeof(env_file_2));
r = load_env_file(name, &data);
r = load_env_file(name, NULL, &data);
assert(r == 0);
assert(streq(data[0], "a"));
assert(streq(data[0], "a=a"));
assert(data[1] == NULL);
unlink(name);
}
......@@ -245,7 +245,7 @@ static void test_load_env_file_3(void) {
assert(fd >= 0);
assert_se(write(fd, env_file_3, sizeof(env_file_3)) == sizeof(env_file_3));
r = load_env_file(name, &data);
r = load_env_file(name, NULL, &data);
assert(r == 0);
assert(data == NULL);
unlink(name);
......@@ -272,7 +272,7 @@ static void test_install_printf(void) {
assert_se((host = gethostname_malloc()));
#define expect(src, pattern, result) \
{ \
do { \
char _cleanup_free_ *t = install_full_printf(&src, pattern); \
char _cleanup_free_ \
*d1 = strdup(i.name), \
......@@ -289,7 +289,7 @@ static void test_install_printf(void) {
strcpy(i.name, d1); \
strcpy(i.path, d2); \
strcpy(i.user, d3); \
}
} while(false)
assert_se(setenv("USER", "root", 1) == 0);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment