From 0c700d392d8c8829d230b9f5f12b8f509601a955 Mon Sep 17 00:00:00 2001 From: Evgeny Vereshchagin Date: Sat, 26 Aug 2017 17:21:23 +0300 Subject: [PATCH] build-sys: fix the script used for generating load_fragment_gperf_nulstr (#6646) This prevents `systemd --dump-configuration-items` from crashing. Closes #6596. --- src/core/load-fragment-gperf-nulstr.awk | 2 +- src/test/test-unit-file.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/core/load-fragment-gperf-nulstr.awk b/src/core/load-fragment-gperf-nulstr.awk index b52438abe3..44bc1fb698 100644 --- a/src/core/load-fragment-gperf-nulstr.awk +++ b/src/core/load-fragment-gperf-nulstr.awk @@ -4,7 +4,7 @@ BEGIN{ print "const char load_fragment_gperf_nulstr[] =" } keyword==1 { - print "\"" $$1 "\\0\"" + print "\"" $1 "\\0\"" } /%%/ { keyword=1 diff --git a/src/test/test-unit-file.c b/src/test/test-unit-file.c index aa45727986..cb9a37d9a6 100644 --- a/src/test/test-unit-file.c +++ b/src/test/test-unit-file.c @@ -841,6 +841,10 @@ static void test_config_parse_pass_environ(void) { } +static void test_unit_dump_config_items(void) { + unit_dump_config_items(stdout); +} + int main(int argc, char *argv[]) { _cleanup_(rm_rf_physical_and_freep) char *runtime_dir = NULL; int r; @@ -863,6 +867,7 @@ int main(int argc, char *argv[]) { test_load_env_file_4(); test_load_env_file_5(); TEST_REQ_RUNNING_SYSTEMD(test_install_printf()); + test_unit_dump_config_items(); return r; }