]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
networkctl-cat: insert a newline between different config files
authorMike Yuan <me@yhndnzj.com>
Sat, 16 Dec 2023 11:57:02 +0000 (19:57 +0800)
committerMike Yuan <me@yhndnzj.com>
Wed, 20 Dec 2023 04:46:45 +0000 (12:46 +0800)
src/network/networkctl-config-file.c

index e2a2596f6061e8b3998f825467a73007cd298524..408cfbfffb7ddd7b5f61d885fe16dcadb7bfb923 100644 (file)
@@ -459,6 +459,7 @@ int verb_cat(int argc, char *argv[], void *userdata) {
 
         pager_open(arg_pager_flags);
 
+        bool first = true;
         STRV_FOREACH(name, strv_skip(argv, 1)) {
                 _cleanup_strv_free_ char **dropins = NULL;
                 _cleanup_free_ char *path = NULL;
@@ -481,9 +482,14 @@ int verb_cat(int argc, char *argv[], void *userdata) {
                         }
                 }
 
+                if (!first)
+                        putchar('\n');
+
                 r = cat_files(path, dropins, /* flags = */ CAT_FORMAT_HAS_SECTIONS);
                 if (r < 0)
                         return RET_GATHER(ret, r);
+
+                first = false;
         }
 
         return ret;