shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-22 13:33:56 +03:00
Code

machinectl: allow --max-addresses=0

Browse Source 
Sometimes the addresses are not important, so allow skipping them in output.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2022-10-20 09:38:59 +02:00
parent 6762c907c4
commit 99b8149ae1
2 changed files with 20 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
man/machinectl.xml
View File

@ -800,11 +800,10 @@
<varlistentry>
<term><option>--max-addresses=</option></term>
<listitem><para>When used with the <option>list-machines</option> command, limits the number of ip
addresses output for every machine. Defaults to 1. All addresses can be requested with
<literal>all</literal> as argument to <option>--max-addresses=</option>. If the argument to
<option>--max-addresses=</option> is less than the actual number of addresses,
<literal>…</literal>follows the last address.</para></listitem>
<listitem><para>When used with the <option>list-machines</option> command, limits the number of IP
addresses shown for every machine. Defaults to 1. All addresses can be requested with
<literal>all</literal>. If the limit is 0, the address column is not shown. Otherwise, if the machine
has more addresses than shown, <literal>…</literal> follows the last address.</para></listitem>
</varlistentry>
<varlistentry>

37
src/machine/machinectl.c
View File

@ -60,8 +60,6 @@
#include "verbs.h"
#include "web-util.h"
#define ALL_ADDRESSES -1
static char **arg_property = NULL;
static bool arg_all = false;
static BusPrintPropertyFlags arg_print_flags = 0;
@ -83,7 +81,7 @@ static ImportVerify arg_verify = IMPORT_VERIFY_SIGNATURE;
static const char* arg_format = NULL;
static const char *arg_uid = NULL;
static char **arg_setenv = NULL;
static int arg_max_addresses = 1;
static unsigned arg_max_addresses = 1;
STATIC_DESTRUCTOR_REGISTER(arg_property, strv_freep);
STATIC_DESTRUCTOR_REGISTER(arg_setenv, strv_freep);
@ -260,7 +258,6 @@ static int show_table(Table *table, const char *word) {
}
static int list_machines(int argc, char *argv[], void *userdata) {
_cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
_cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL;
_cleanup_(table_unrefp) Table *table = NULL;
@ -273,12 +270,13 @@ static int list_machines(int argc, char *argv[], void *userdata) {
if (r < 0)
return log_error_errno(r, "Could not get machines: %s", bus_error_message(&error, r));
table = table_new("machine", "class", "service", "os", "version", "addresses");
table = table_new("machine", "class", "service", "os", "version",
arg_max_addresses > 0 ? "addresses" : NULL);
if (!table)
return log_oom();
table_set_ersatz_string(table, TABLE_ERSATZ_DASH);
if (!arg_full && arg_max_addresses != ALL_ADDRESSES)
if (!arg_full && arg_max_addresses > 0 && arg_max_addresses < UINT_MAX)
table_set_cell_height_max(table, arg_max_addresses);
if (arg_full)
@ -310,23 +308,23 @@ static int list_machines(int argc, char *argv[], void *userdata) {
&os,
&version_id);
(void) call_get_addresses(
bus,
name,
0,
"",
"\n",
&addresses);
r = table_add_many(table,
TABLE_STRING, empty_to_null(name),
TABLE_STRING, empty_to_null(class),
TABLE_STRING, empty_to_null(service),
TABLE_STRING, empty_to_null(os),
TABLE_STRING, empty_to_null(version_id),
TABLE_STRING, empty_to_null(addresses));
TABLE_STRING, empty_to_null(version_id));
if (r < 0)
return table_log_add_error(r);
if (arg_max_addresses > 0) {
(void) call_get_addresses(bus, name, 0, "", "\n", &addresses);
r = table_add_many(table,
TABLE_STRING, empty_to_null(addresses));
if (r < 0)
return table_log_add_error(r);
}
}
r = sd_bus_message_exit_container(reply);
@ -2717,13 +2715,10 @@ static int parse_argv(int argc, char *argv[]) {
case ARG_MAX_ADDRESSES:
if (streq(optarg, "all"))
arg_max_addresses = ALL_ADDRESSES;
else if (safe_atoi(optarg, &arg_max_addresses) < 0)
arg_max_addresses = UINT_MAX;
else if (safe_atou(optarg, &arg_max_addresses) < 0)
return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
"Invalid number of addresses: %s", optarg);
else if (arg_max_addresses <= 0)
return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
"Number of IPs cannot be negative or zero: %s", optarg);
break;
case '?':