From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Tue, 28 Mar 2023 09:55:21 +0000 (+0200)
Subject: busctl: also assume --full if not writing to terminal
X-Git-Tag: v254-rc1~890^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f735076c548abe9878e98c2da044458dd0e684f3;p=thirdparty%2Fsystemd.git

busctl: also assume --full if not writing to terminal

If people grep the output, it probably shouldn't be ellipsized.
---

diff --git a/src/busctl/busctl.c b/src/busctl/busctl.c
index 0adceb6d1b8..37ba05680f5 100644
--- a/src/busctl/busctl.c
+++ b/src/busctl/busctl.c
@@ -39,7 +39,7 @@
 static JsonFormatFlags arg_json_format_flags = JSON_FORMAT_OFF;
 static PagerFlags arg_pager_flags = 0;
 static bool arg_legend = true;
-static bool arg_full = false;
+static int arg_full = -1;
 static const char *arg_address = NULL;
 static bool arg_unique = false;
 static bool arg_acquired = false;
@@ -215,7 +215,7 @@ static int list_bus_names(int argc, char **argv, void *userdata) {
         if (!table)
                 return log_oom();
 
-        if (arg_full)
+        if (arg_full > 0)
                 table_set_width(table, 0);
 
         r = table_set_align_percent(table, table_get_cell(table, 0, COLUMN_PID), 100);
@@ -1120,7 +1120,7 @@ static int introspect(int argc, char **argv, void *userdata) {
                 sorted[k++] = m;
         }
 
-        if (result_width > 40 && !arg_full)
+        if (result_width > 40 && arg_full <= 0)
                 result_width = 40;
 
         typesafe_qsort(sorted, k, member_compare_funcp);
@@ -2550,6 +2550,9 @@ static int parse_argv(int argc, char *argv[]) {
                         assert_not_reached();
                 }
 
+        if (arg_full < 0)
+                arg_full = terminal_is_dumb();
+
         return 1;
 }