From: Mike Yuan <me@yhndnzj.com>
Date: Sat, 16 Dec 2023 11:57:02 +0000 (+0800)
Subject: networkctl-cat: insert a newline between different config files
X-Git-Tag: v256-rc1~1449^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c5f51d5f3f77eb5e0f7a0433faa409352ad30acc;p=thirdparty%2Fsystemd.git

networkctl-cat: insert a newline between different config files
---

diff --git a/src/network/networkctl-config-file.c b/src/network/networkctl-config-file.c
index e2a2596f606..408cfbfffb7 100644
--- a/src/network/networkctl-config-file.c
+++ b/src/network/networkctl-config-file.c
@@ -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;