]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
build-sys: fix the script used for generating load_fragment_gperf_nulstr (#6646)
authorEvgeny Vereshchagin <evvers@ya.ru>
Sat, 26 Aug 2017 14:21:23 +0000 (17:21 +0300)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Sat, 26 Aug 2017 14:21:23 +0000 (23:21 +0900)
This prevents `systemd --dump-configuration-items` from crashing.
Closes #6596.

src/core/load-fragment-gperf-nulstr.awk
src/test/test-unit-file.c

index b52438abe30893c3d9bdbfef041025f674e8277d..44bc1fb69823bfb75b4dc61b29c8ac7c3675eaf7 100644 (file)
@@ -4,7 +4,7 @@ BEGIN{
         print "const char load_fragment_gperf_nulstr[] ="
 }
 keyword==1 {
-        print "\"" $$1 "\\0\""
+        print "\"" $1 "\\0\""
 }
 /%%/ {
         keyword=1
index aa457279863f2e3f64d20a2c19cd41db57822927..cb9a37d9a6fea77edbae38742f0891475b0a0267 100644 (file)
@@ -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;
 }