shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-24 02:03:54 +03:00
Code

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

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

(cherry picked from commit f735076c548abe9878e98c2da044458dd0e684f3)
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2023-03-28 11:55:21 +02:00 committed by Luca Boccassi
parent 00977a8e74
commit ff7040b193
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/busctl/busctl.c
View File

@ -38,7 +38,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;
@ -203,7 +203,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);
@ -1108,7 +1108,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);
@ -2538,6 +2538,9 @@ static int parse_argv(int argc, char *argv[]) {
assert_not_reached();
}
if (arg_full < 0)
arg_full = terminal_is_dumb();
return 1;
}