[systemd-commits] man/busctl.xml shell-completion/bash src/libsystemd

[Thomas H.P. Andersen]

 man/busctl.xml                 |   10 ++++++++++
 shell-completion/bash/busctl   |    4 ++--
 src/libsystemd/sd-bus/busctl.c |   22 ++++++++++++++++------
 3 files changed, 28 insertions(+), 8 deletions(-)

New commits:
commit 17d47d8d2dee22ee4f0a7319b9603d3e33a0b28a
Author: Thomas Hindoe Paaboel Andersen <phomes at gmail.com>
Date:   Wed Feb 19 17:35:35 2014 +0100

    busctl: add --no-legend and use in bash completion

diff --git a/man/busctl.xml b/man/busctl.xml
index 33420a9..f352da1 100644
--- a/man/busctl.xml
+++ b/man/busctl.xml
@@ -94,6 +94,16 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
       </varlistentry>
 
       <varlistentry>
+        <term><option>--no-legend</option></term>
+
+        <listitem>
+          <para>Do not print the legend,
+          i.e. the column headers and the
+          footer.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
         <term><option>--system</option></term>
 
         <listitem>
diff --git a/shell-completion/bash/busctl b/shell-completion/bash/busctl
index 0727241..06d5d93 100644
--- a/shell-completion/bash/busctl
+++ b/shell-completion/bash/busctl
@@ -32,14 +32,14 @@ __get_machines() {
 
 __get_endpoints() {
         local a b
-        busctl list --no-pager | { while read a b; do echo " $a"; done; };
+        busctl list --no-legend --no-pager | { while read a b; do echo " $a"; done; };
 }
 
 _busctl() {
         local i verb comps
         local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
         local -A OPTS=(
-               [STANDALONE]='-h --help --version --no-pager --system --user
+               [STANDALONE]='-h --help --version --no-pager --no-legend --system --user
                              --show-machine --unique --acquired --activatable'
                       [ARG]='-H --host -M --machine --address --match'
         )
diff --git a/src/libsystemd/sd-bus/busctl.c b/src/libsystemd/sd-bus/busctl.c
index 1d7f575..a59b8ea 100644
--- a/src/libsystemd/sd-bus/busctl.c
+++ b/src/libsystemd/sd-bus/busctl.c
@@ -34,6 +34,7 @@
 #include "bus-dump.h"
 
 static bool arg_no_pager = false;
+static bool arg_legend = true;
 static char *arg_address = NULL;
 static bool arg_unique = false;
 static bool arg_acquired = false;
@@ -106,13 +107,15 @@ static int list_bus_names(sd_bus *bus, char **argv) {
         merged[n] = NULL;
         strv_sort(merged);
 
-        printf("%-*s %*s %-*s %-*s %-*s %-*s %-*s %-*s",
-               (int) max_i, "NAME", 10, "PID", 15, "PROCESS", 16, "USER", 13, "CONNECTION", 25, "UNIT", 10, "SESSION", 19, "CONNECTION-NAME");
+        if (arg_legend) {
+                printf("%-*s %*s %-*s %-*s %-*s %-*s %-*s %-*s",
+                       (int) max_i, "NAME", 10, "PID", 15, "PROCESS", 16, "USER", 13, "CONNECTION", 25, "UNIT", 10, "SESSION", 19, "CONNECTION-NAME");
 
-        if (arg_show_machine)
-                puts(" MACHINE");
-        else
-                putchar('\n');
+                if (arg_show_machine)
+                        puts(" MACHINE");
+                else
+                        putchar('\n');
+        }
 
         STRV_FOREACH(i, merged) {
                 _cleanup_bus_creds_unref_ sd_bus_creds *creds = NULL;
@@ -323,6 +326,7 @@ static int help(void) {
                "  -h --help               Show this help\n"
                "     --version            Show package version\n"
                "     --no-pager           Do not pipe output into a pager\n"
+               "     --no-legend          Do not show the headers and footers\n"
                "     --system             Connect to system bus\n"
                "     --user               Connect to user bus\n"
                "  -H --host=[USER@]HOST   Operate on remote host\n"
@@ -348,6 +352,7 @@ static int parse_argv(int argc, char *argv[]) {
         enum {
                 ARG_VERSION = 0x100,
                 ARG_NO_PAGER,
+                ARG_NO_LEGEND,
                 ARG_SYSTEM,
                 ARG_USER,
                 ARG_ADDRESS,
@@ -362,6 +367,7 @@ static int parse_argv(int argc, char *argv[]) {
                 { "help",         no_argument,       NULL, 'h'              },
                 { "version",      no_argument,       NULL, ARG_VERSION      },
                 { "no-pager",     no_argument,       NULL, ARG_NO_PAGER     },
+                { "no-legend",    no_argument,       NULL, ARG_NO_LEGEND    },
                 { "system",       no_argument,       NULL, ARG_SYSTEM       },
                 { "user",         no_argument,       NULL, ARG_USER         },
                 { "address",      required_argument, NULL, ARG_ADDRESS      },
@@ -396,6 +402,10 @@ static int parse_argv(int argc, char *argv[]) {
                         arg_no_pager = true;
                         break;
 
+                case ARG_NO_LEGEND:
+                        arg_legend = false;
+                        break;
+
                 case ARG_USER:
                         arg_user = true;
                         break;