[systemd-commits] 2 commits - src/systemctl

[Lennart Poettering]

 src/systemctl/systemctl.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5a8e9427a6db2af25c1ae628ad6caea0c64a11ec
Author: Lennart Poettering <lennart at poettering.net>
Date:   Fri Apr 5 20:19:54 2013 +0200

    systemctl: tweak drop-in display
    
    So far we didn't place spaces between the box drawing chars and the
    values next to them. Let's be consistent here.
    
    (Or to turn this around: if we really want to place a space there we
    probably should do that in all our tree outputs, not just here...)

diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 6a4c968..e445b50 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -2349,7 +2349,7 @@ static void print_status_info(UnitStatusInfo *i) {
                                         return;
                                 }
 
-                                printf("%s\n %*s  %s ", dir, maxlen, "",
+                                printf("%s\n %*s  %s", dir, maxlen, "",
                                        draw_special_char(DRAW_TREE_RIGHT));
                         }
 

commit 45a4f72337f3fe26e0a07301238ccbe8eec8893c
Author: Lennart Poettering <lennart at poettering.net>
Date:   Fri Apr 5 20:12:39 2013 +0200

    systemctl: tweak output of Listen: fields a bit
    
    It's probably a good idea to minimize the number of field names to show
    in the "systemctl status" output, in order to make them useful as a
    guide for the reader how things are "grouped". This patch moves
    information about the used socket technology to the end of the output
    lines in brackets, rather than into the field names. This turns the used
    socket technology into what it is -- peripheral meta information --
    instead of something that was at the core.
    
    New output:
    
    systemd-journald.socket - Journal Socket
             Loaded: loaded (/usr/lib/systemd/system/systemd-journald.socket; static)
             Active: active (running) since Fr 2013-03-29 02:16:30 CET; 1 weeks 0 days ago
               Docs: man:systemd-journald.service(8)
                     man:journald.conf(5)
                     man:systemd-journald.service(8)
                     man:journald.conf(5)
             Listen: /run/systemd/journal/stdout (Stream)
                     /run/systemd/journal/socket (Datagram)
                     /dev/log (Datagram)

diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index a7b541d..6a4c968 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -2420,7 +2420,7 @@ static void print_status_info(UnitStatusInfo *i) {
                 printf(" %*s %s\n", maxlen+1, t == i->documentation ? "Docs:" : "", *t);
 
         STRV_FOREACH_PAIR(t, t2, i->listen)
-                printf(" %*s%s: %s\n", maxlen - (int)strlen(*t), "Listen", *t, *t2);
+                printf(" %*s %s (%s)\n", maxlen+1, t == i->listen ? "Listen:" : "", *t2, *t);
 
         if (i->accept)
                 printf(" %*s: %u; Connected: %u\n", maxlen, "Accepted", i->n_accepted, i->n_connections);