SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Convert more programs to the new option and verb parsers (#41458)

Browse Source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2026-04-04 10:21:14 +02:00
committed by GitHub
parent 1741cc4e6b ff2fa93ac0
commit ca745e1914
51 changed files with 366 additions and 419 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meson.build
+9
View File
@@ -549,6 +549,15 @@ foreach attr : possible_c_attributes
conf.set10('HAVE_ATTRIBUTE_' + attr.to_upper(), have)
endforeach
# TODO: drop this manual check when meson learns about this attribute
possible_c_attributes += ['no_reorder']
have = cc.compiles(
'__attribute__((__no_reorder__)) int x;',
args : '-Werror=attributes',
name : '__attribute__((__no_reorder__))')
conf.set10('HAVE_ATTRIBUTE_NO_REORDER', have)
#####################################################################
# compilation result tests
src/ac-power/ac-power.c
+3 -1
View File
@@ -37,7 +37,9 @@ static int help(void) {
program_invocation_short_name,
ansi_highlight(),
ansi_normal());
table_print(options, stdout);
r = table_print_or_warn(options);
if (r < 0)
return r;
printf("\nSee the %s for details.\n", link);
return 0;
src/analyze/analyze-blame.c
+6 -20
View File
@@ -28,29 +28,21 @@ int verb_blame(int argc, char *argv[], uintptr_t _data, void *userdata) {
if (!table)
return log_oom();
table_set_header(table, false);
assert_se(cell = table_get_cell(table, 0, 0));
r = table_set_ellipsize_percent(table, cell, 100);
if (r < 0)
return r;
(void) table_set_ellipsize_percent(table, cell, 100);
r = table_set_align_percent(table, cell, 100);
if (r < 0)
return r;
(void) table_set_align_percent(table, cell, 100);
assert_se(cell = table_get_cell(table, 0, 1));
r = table_set_ellipsize_percent(table, cell, 100);
if (r < 0)
return r;
(void) table_set_ellipsize_percent(table, cell, 100);
r = table_set_sort(table, (size_t) 0);
if (r < 0)
return r;
return table_log_sort_error(r);
r = table_set_reverse(table, 0, true);
if (r < 0)
return r;
return table_log_sort_error(r);
for (UnitTimes *u = times; u->has_data; u++) {
if (u->time <= 0)
@@ -63,11 +55,5 @@ int verb_blame(int argc, char *argv[], uintptr_t _data, void *userdata) {
return table_log_add_error(r);
}
pager_open(arg_pager_flags);
r = table_print(table, NULL);
if (r < 0)
return r;
return 0;
return table_print_with_pager(table, arg_json_format_flags, arg_pager_flags, /* show_header= */ false);
}
src/analyze/analyze-calendar.c
+3 -7
View File
@@ -35,14 +35,10 @@ static int test_calendar_one(usec_t n, const char *p) {
return log_oom();
assert_se(cell = table_get_cell(table, 0, 0));
r = table_set_ellipsize_percent(table, cell, 100);
if (r < 0)
return r;
(void) table_set_ellipsize_percent(table, cell, 100);
assert_se(cell = table_get_cell(table, 0, 1));
r = table_set_ellipsize_percent(table, cell, 100);
if (r < 0)
return r;
(void) table_set_ellipsize_percent(table, cell, 100);
if (!streq(t, p)) {
r = table_add_many(table,
@@ -119,7 +115,7 @@ static int test_calendar_one(usec_t n, const char *p) {
n = next;
}
return table_print(table, NULL);
return table_print_or_warn(table);
}
int verb_calendar(int argc, char *argv[], uintptr_t _data, void *userdata) {
src/analyze/analyze-image-policy.c
+1 -1
View File
@@ -157,7 +157,7 @@ int verb_image_policy(int argc, char *argv[], uintptr_t _data, void *userdata) {
putc('\n', stdout);
r = table_print(table, NULL);
r = table_print_or_warn(table);
if (r < 0)
return r;
}
src/analyze/analyze-inspect-elf.c
+2 -2
View File
@@ -118,9 +118,9 @@ static int analyze_elf(char **filenames, sd_json_format_flags_t json_flags) {
if (sd_json_format_enabled(json_flags))
sd_json_variant_dump(package_metadata, json_flags, stdout, NULL);
else {
r = table_print(t, NULL);
r = table_print_or_warn(t);
if (r < 0)
return table_log_print_error(r);
return r;
}
}
src/analyze/analyze-plot.c
+1 -1
View File
@@ -429,7 +429,7 @@ static int show_table(Table *table, const char *word) {
if (sd_json_format_enabled(arg_json_format_flags))
r = table_print_json(table, NULL, arg_json_format_flags | SD_JSON_FORMAT_COLOR_AUTO);
else
r = table_print(table, NULL);
r = table_print(table);
if (r < 0)
return table_log_print_error(r);
}
src/analyze/analyze-timespan.c
+3 -7
View File
@@ -28,14 +28,10 @@ int verb_timespan(int argc, char *argv[], uintptr_t _data, void *userdata) {
return log_oom();
assert_se(cell = table_get_cell(table, 0, 0));
r = table_set_ellipsize_percent(table, cell, 100);
if (r < 0)
return r;
(void) table_set_ellipsize_percent(table, cell, 100);
assert_se(cell = table_get_cell(table, 0, 1));
r = table_set_ellipsize_percent(table, cell, 100);
if (r < 0)
return r;
(void) table_set_ellipsize_percent(table, cell, 100);
r = table_add_many(table,
TABLE_FIELD, "Original",
@@ -55,7 +51,7 @@ int verb_timespan(int argc, char *argv[], uintptr_t _data, void *userdata) {
if (r < 0)
return table_log_add_error(r);
r = table_print(table, NULL);
r = table_print_or_warn(table);
if (r < 0)
return r;
src/analyze/analyze-timestamp.c
+4 -8
View File
@@ -27,14 +27,10 @@ static int test_timestamp_one(const char *p) {
return log_oom();
assert_se(cell = table_get_cell(table, 0, 0));
r = table_set_ellipsize_percent(table, cell, 100);
if (r < 0)
return r;
(void) table_set_ellipsize_percent(table, cell, 100);
assert_se(cell = table_get_cell(table, 0, 1));
r = table_set_ellipsize_percent(table, cell, 100);
if (r < 0)
return r;
(void) table_set_ellipsize_percent(table, cell, 100);
r = table_add_many(table,
TABLE_FIELD, "Original form",
@@ -65,7 +61,7 @@ static int test_timestamp_one(const char *p) {
usec / USEC_PER_SEC,
usec % USEC_PER_SEC);
if (r < 0)
return r;
return table_log_add_error(r);
r = table_add_many(table,
TABLE_FIELD, "From now",
@@ -73,7 +69,7 @@ static int test_timestamp_one(const char *p) {
if (r < 0)
return table_log_add_error(r);
return table_print(table, NULL);
return table_print_or_warn(table);
}
int verb_timestamp(int argc, char *argv[], uintptr_t _data, void *userdata) {
src/ask-password/ask-password.c
+3 -1
View File
@@ -57,7 +57,9 @@ static int help(void) {
program_invocation_short_name,
ansi_highlight(),
ansi_normal());
table_print(options, stdout);
r = table_print_or_warn(options);
if (r < 0)
return r;
printf("\nSee the %s for details.\n", link);
return 0;
src/binfmt/binfmt.c
+3 -1
View File
@@ -126,7 +126,9 @@ static int help(void) {
program_invocation_short_name,
ansi_highlight(),
ansi_normal());
table_print(options, stdout);
r = table_print_or_warn(options);
if (r < 0)
return r;
printf("\nSee the %s for details.\n", link);
return 0;
src/bless-boot/bless-boot.c
+6 -2
View File
@@ -58,10 +58,14 @@ static int help(void) {
program_invocation_short_name,
ansi_highlight(),
ansi_normal());
table_print(verbs, stdout);
r = table_print_or_warn(verbs);
if (r < 0)
return r;
printf("\nOptions:\n");
table_print(options, stdout);
r = table_print_or_warn(options);
if (r < 0)
return r;
printf("\nSee the %s for details.\n", link);
return 0;
src/busctl/busctl.c
+1 -7
View File
@@ -1188,13 +1188,7 @@ static int verb_introspect(int argc, char *argv[], uintptr_t _data, void *userda
return table_log_add_error(r);
}
pager_open(arg_pager_flags);
r = table_print(table, NULL);
if (r < 0)
return table_log_print_error(r);
return 0;
return table_print_with_pager(table, arg_json_format_flags, arg_pager_flags, arg_legend);
}
static int message_dump(sd_bus_message *m, FILE *f) {
src/cryptenroll/cryptenroll-list.c
+1 -5
View File
@@ -125,9 +125,5 @@ int list_enrolled(struct crypt_device *cd) {
return 0;
}
r = table_print(t, stdout);
if (r < 0)
return log_error_errno(r, "Failed to show slot table: %m");
return 0;
return table_print_or_warn(t);
}
src/detect-virt/detect-virt.c
+3 -1
View File
@@ -41,7 +41,9 @@ static int help(void) {
program_invocation_short_name,
ansi_highlight(),
ansi_normal());
table_print(options, stdout);
r = table_print_or_warn(options);
if (r < 0)
return r;
printf("\nSee the %s for details.\n", link);
return 0;
src/dissect/dissect.c
+8 -4
View File
@@ -165,11 +165,15 @@ static int help(void) {
ansi_underline(),
ansi_normal());
table_print(options, stdout);
r = table_print_or_warn(options);
if (r < 0)
return r;
printf("\n%sCommands:%s\n", ansi_underline(), ansi_normal());
table_print(commands, stdout);
r = table_print_or_warn(commands);
if (r < 0)
return r;
printf("\nSee the %s for details.\n", link);
return 0;
@@ -1082,9 +1086,9 @@ static int action_dissect(
if (!sd_json_format_enabled(arg_json_format_flags)) {
table_set_header(t, arg_legend);
r = table_print(t, NULL);
r = table_print_or_warn(t);
if (r < 0)
return table_log_print_error(r);
return r;
} else {
_cleanup_(sd_json_variant_unrefp) sd_json_variant *jt = NULL;
src/factory-reset/factory-reset-tool.c
+6 -2
View File
@@ -51,10 +51,14 @@ static int help(void) {
program_invocation_short_name,
ansi_highlight(),
ansi_normal());
table_print(verbs, stdout);
r = table_print_or_warn(verbs);
if (r < 0)
return r;
printf("\nOptions:\n");
table_print(options, stdout);
r = table_print_or_warn(options);
if (r < 0)
return r;
printf("\nSee the %s for details.\n", link);
return 0;
src/fundamental/macro-fundamental.h
+6
View File
@@ -116,6 +116,12 @@
# define _retain_
#endif
#if HAVE_ATTRIBUTE_NO_REORDER
# define _no_reorder_ __attribute__((__no_reorder__))
#else
# define _no_reorder_
#endif
#if __GNUC__ >= 15
# define _nonnull_if_nonzero_(p, n) __attribute__((nonnull_if_nonzero(p, n)))
#else
src/hostname/hostnamectl.c
+7 -7
View File
@@ -375,11 +375,7 @@ static int print_status_info(StatusInfo *i) {
}
}
r = table_print(table, NULL);
if (r < 0)
return table_log_print_error(r);
return 0;
return table_print_or_warn(table);
}
static int get_one_name(sd_bus *bus, const char* attr, char **ret) {
@@ -748,10 +744,14 @@ static int help(void) {
program_invocation_short_name,
ansi_highlight(),
ansi_normal());
table_print(verbs, stdout);
r = table_print_or_warn(verbs);
if (r < 0)
return r;
printf("\nOptions:\n");
table_print(options, stdout);
r = table_print_or_warn(options);
if (r < 0)
return r;
printf("\nSee the %s for details.\n", link);
return 0;
src/id128/id128.c
+6 -2
View File
@@ -216,10 +216,14 @@ static int help(void) {
program_invocation_short_name,
ansi_highlight(),
ansi_normal());
table_print(verbs, stdout);
r = table_print_or_warn(verbs);
if (r < 0)
return r;
printf("\nOptions:\n");
table_print(options, stdout);
r = table_print_or_warn(options);
if (r < 0)
return r;
printf("\nSee the %s for details.\n", link);
return 0;
src/imds/imds-tool.c
+2 -6
View File
@@ -381,14 +381,10 @@ static int action_summary(sd_varlink *link) {
if (table_isempty(table))
return log_error_errno(SYNTHETIC_ERRNO(EOPNOTSUPP), "No well-known IMDS data available.");
r = table_print(table, NULL);
if (r < 0)
return table_log_print_error(r);
return 0;
return table_print_or_warn(table);
}
static const char *detect_json_object(const char *text) {
static const char* detect_json_object(const char *text) {
assert(text);
/* Checks if the provided text looks like a JSON object. It checks if the first non-whitespace
src/locale/localectl.c
+1 -5
View File
@@ -144,11 +144,7 @@ static int print_status_info(StatusInfo *i) {
return table_log_add_error(r);
}
r = table_print(table, NULL);
if (r < 0)
return table_log_print_error(r);
return 0;
return table_print_or_warn(table);
}
static int verb_show_status(int argc, char *argv[], uintptr_t _data, void *userdata) {
src/login/loginctl.c
+6 -6
View File
@@ -716,9 +716,9 @@ static int print_session_status_info(sd_bus *bus, const char *path) {
/* We don't use the table to show the header, in order to make the width of the column stable. */
printf("%s%s - %s (" UID_FMT ")%s\n", ansi_highlight(), i.id, i.name, i.uid, ansi_normal());
r = table_print(table, NULL);
r = table_print_or_warn(table);
if (r < 0)
return table_log_print_error(r);
return r;
if (i.scope) {
show_unit_cgroup(bus, i.scope, i.leader, /* prefix= */ strrepa(" ", STRLEN("Display: ")));
@@ -821,9 +821,9 @@ static int print_user_status_info(sd_bus *bus, const char *path) {
printf("%s%s (" UID_FMT ")%s\n", ansi_highlight(), i.name, i.uid, ansi_normal());
r = table_print(table, NULL);
r = table_print_or_warn(table);
if (r < 0)
return table_log_print_error(r);
return r;
if (i.slice) {
show_unit_cgroup(bus, i.slice, /* leader= */ 0, /* prefix= */ strrepa(" ", STRLEN("Sessions: ")));
@@ -896,9 +896,9 @@ static int print_seat_status_info(sd_bus *bus, const char *path) {
printf("%s%s%s\n", ansi_highlight(), i.id, ansi_normal());
r = table_print(table, NULL);
r = table_print_or_warn(table);
if (r < 0)
return table_log_print_error(r);
return r;
if (arg_transport == BUS_TRANSPORT_LOCAL) {
unsigned c = MAX(LESS_BY(columns(), 21U), 10U);
src/machine/machinectl.c
+1 -1
View File
@@ -262,7 +262,7 @@ static int show_table(Table *table, const char *word) {
if (OUTPUT_MODE_IS_JSON(arg_output))
r = table_print_json(table, NULL, output_mode_to_json_format_flags(arg_output) | SD_JSON_FORMAT_COLOR_AUTO);
else
r = table_print(table, NULL);
r = table_print(table);
if (r < 0)
return table_log_print_error(r);
}
src/network/networkctl-address-label.c
+1 -5
View File
@@ -82,11 +82,7 @@ static int dump_address_labels(sd_netlink *rtnl) {
return table_log_add_error(r);
}
r = table_print(table, NULL);
if (r < 0)
return table_log_print_error(r);
return 0;
return table_print_or_warn(table);
}
int verb_list_address_labels(int argc, char *argv[], uintptr_t _data, void *userdata) {
src/network/networkctl-list.c
+2 -2
View File
@@ -79,9 +79,9 @@ int verb_list_links(int argc, char *argv[], uintptr_t _data, void *userdata) {
return table_log_add_error(r);
}
r = table_print(table, NULL);
r = table_print_or_warn(table);
if (r < 0)
return table_log_print_error(r);
return r;
if (arg_legend)
printf("\n%i links listed.\n", c);
src/network/networkctl-lldp.c
+2 -2
View File
@@ -303,9 +303,9 @@ int verb_link_lldp_status(int argc, char *argv[], uintptr_t _data, void *userdat
}
}
r = table_print(table, NULL);
r = table_print_or_warn(table);
if (r < 0)
return table_log_print_error(r);
return r;
if (arg_legend) {
lldp_capabilities_legend(all);
src/network/networkctl-status-link.c
+2 -2
View File
@@ -900,9 +900,9 @@ static int link_status_one(
on_color_operational, glyph(GLYPH_BLACK_CIRCLE), off_color_operational,
info->ifindex, info->name);
r = table_print(table, NULL);
r = table_print_or_warn(table);
if (r < 0)
return table_log_print_error(r);
return r;
return show_logs(info->ifindex, info->name);
}
src/network/networkctl-status-system.c
+2 -2
View File
@@ -126,9 +126,9 @@ int system_status(sd_netlink *rtnl, sd_hwdb *hwdb) {
on_color_operational, glyph(GLYPH_BLACK_CIRCLE), off_color_operational,
strna(netifs_joined));
r = table_print(table, NULL);
r = table_print_or_warn(table);
if (r < 0)
return table_log_print_error(r);
return r;
return show_logs(0, NULL);
}
src/notify/notify.c
+3 -1
View File
@@ -77,7 +77,9 @@ static int help(void) {
ansi_highlight(),
ansi_normal());
table_print(options, stdout);
r = table_print_or_warn(options);
if (r < 0)
return r;
printf("\nSee the %s for details.\n", link);
return 0;
src/portable/portablectl.c
+2 -2
View File
@@ -1075,9 +1075,9 @@ static int verb_list_images(int argc, char *argv[], uintptr_t _data, void *userd
table_set_header(table, arg_legend);
r = table_print(table, NULL);
r = table_print_or_warn(table);
if (r < 0)
return table_log_print_error(r);
return r;
}
if (arg_legend) {
src/report/report-basic-server.c
+1 -2
View File
@@ -47,9 +47,8 @@ static int help(void) {
ansi_normal(),
ansi_underline(),
ansi_normal());
table_print(options, stdout);
return 0;
return table_print_or_warn(options);
}
static int parse_argv(int argc, char *argv[]) {
src/resolve/resolvectl.c
+4 -12
View File
@@ -1321,11 +1321,7 @@ static int verb_show_statistics(int argc, char *argv[], uintptr_t _data, void *u
if (r < 0)
return table_log_add_error(r);
r = table_print(table, NULL);
if (r < 0)
return table_log_print_error(r);
return 0;
return table_print_or_warn(table);
}
static int verb_reset_statistics(int argc, char *argv[], uintptr_t _data, void *userdata) {
@@ -1890,9 +1886,9 @@ static int print_configuration(DNSConfiguration *configuration, StatusMode mode,
return table_log_add_error(r);
}
r = table_print(table, NULL);
r = table_print_or_warn(table);
if (r < 0)
return table_log_print_error(r);
return r;
if (empty_line)
*empty_line = true;
@@ -3097,11 +3093,7 @@ static int dump_server_state(sd_json_variant *server) {
if (r < 0)
return table_log_add_error(r);
r = table_print(table, NULL);
if (r < 0)
return table_log_print_error(r);
return 0;
return table_print_or_warn(table);
}
static int verb_show_server_state(int argc, char *argv[], uintptr_t _data, void *userdata) {
src/run/run.c
+1 -1
View File
@@ -2437,7 +2437,7 @@ static int run_context_show_result(RunContext *c) {
return table_log_add_error(r);
}
r = table_print(t, stderr);
r = table_print_full(t, stderr, /* flush= */ true);
if (r < 0)
return table_log_print_error(r);
src/shared/format-table.c
+15 -3
View File
@@ -2221,7 +2221,7 @@ int _table_sync_column_widths(size_t column, Table *a, ...) {
return r;
}
int table_print(Table *t, FILE *f) {
int table_print_full(Table *t, FILE *f, bool flush) {
size_t n_rows, *minimum_width, *maximum_width, display_columns, *requested_width,
table_minimum_width, table_maximum_width, table_requested_width, table_effective_width,
*width = NULL;
@@ -2641,9 +2641,21 @@ int table_print(Table *t, FILE *f) {
} while (more_sublines);
}
if (!flush)
return 0;
return fflush_and_check(f);
}
int table_print_or_warn(Table *t) {
int r;
r = table_print(t);
if (r < 0)
return table_log_print_error(r);
return 0;
}
int table_format(Table *t, char **ret) {
_cleanup_(memstream_done) MemStream m = {};
FILE *f;
@@ -2656,7 +2668,7 @@ int table_format(Table *t, char **ret) {
if (!f)
return -ENOMEM;
r = table_print(t, f);
r = table_print_full(t, f, /* flush= */ true);
if (r < 0)
return r;
@@ -3145,7 +3157,7 @@ int table_print_json(Table *t, FILE *f, sd_json_format_flags_t flags) {
assert(t);
if (!sd_json_format_enabled(flags)) /* If JSON output is turned off, use regular output */
return table_print(t, f);
return table_print_full(t, f, /* flush= */ true);
if (!f)
f = stdout;
src/shared/format-table.h
+6 -1
View File
@@ -147,7 +147,12 @@ int table_set_column_width(Table *t, size_t column, size_t width);
int _table_sync_column_widths(size_t column, Table *a, ...);
#define table_sync_column_widths(column, a, ...) _table_sync_column_widths(column, a, __VA_ARGS__, NULL)
int table_print(Table *t, FILE *f);
int table_print_full(Table *t, FILE *f, bool flush);
static inline int table_print(Table *t) {
return table_print_full(t, /* f= */ NULL, /* flush= */ false);
}
int table_print_or_warn(Table *t);
int table_format(Table *t, char **ret);
static inline TableCell* TABLE_HEADER_CELL(size_t i) {
src/shared/libfido2-util.c
+2 -4
View File
@@ -1241,11 +1241,9 @@ int fido2_list_devices(void) {
}
}
r = table_print(t, stdout);
if (r < 0) {
log_error_errno(r, "Failed to show device table: %m");
r = table_print_or_warn(t);
if (r < 0)
goto finish;
}
if (!table_isempty(t))
printf("\n"
src/shared/options.c
+2 -1
View File
@@ -238,7 +238,8 @@ char** option_parser_get_args(const OptionParser *state) {
/* Returns positional args as a strv.
* If "--" was found, it has been moved before state->positional_offset.
* The array is only valid, i.e. clean without any options, after parsing
* has naturally finished. */
* has naturally finished. The array that is returned is a slice of the
* original argv array, so it must not be freed or modified. */
assert(state->optind > 0);
assert(state->optind == state->argc || state->parsing_stopped);
src/shared/options.h
+1
View File
@@ -25,6 +25,7 @@ typedef struct Option {
_alignptr_ \
_used_ \
_retain_ \
_no_reorder_ \
_variable_no_sanitize_address_ \
static const Option CONCATENATE(option, counter) = { \
.id = 0x100 + counter, \
src/shared/parse-argument.c
+1 -5
View File
@@ -130,11 +130,7 @@ int parse_signal_argument(const char *s, int *ret) {
return table_log_add_error(r);
}
r = table_print(table, NULL);
if (r < 0)
return table_log_print_error(r);
return 0;
return table_print_or_warn(table);
}
r = signal_from_string(s);
src/shared/pkcs11-util.c
+1 -5
View File
@@ -1821,11 +1821,7 @@ int pkcs11_list_tokens(void) {
return 0;
}
r = table_print(t, stdout);
if (r < 0)
return log_error_errno(r, "Failed to show device table: %m");
return 0;
return table_print_or_warn(t);
#else
return log_error_errno(SYNTHETIC_ERRNO(EOPNOTSUPP),
"PKCS#11 tokens not supported on this build.");
src/shared/tpm2-util.c
+1 -5
View File
@@ -6586,11 +6586,7 @@ int tpm2_list_devices(bool legend, bool quiet) {
return 0;
}
r = table_print(t, stdout);
if (r < 0)
return log_error_errno(r, "Failed to show device table: %m");
return 0;
return table_print_or_warn(t);
#else
return log_error_errno(SYNTHETIC_ERRNO(EOPNOTSUPP),
"TPM2 not supported on this build.");
src/shared/verbs.h
+3 -1
View File
@@ -26,6 +26,7 @@ typedef struct {
_alignptr_ \
_used_ \
_retain_ \
_no_reorder_ \
_variable_no_sanitize_address_ \
static const Verb CONCATENATE(verb_data_, __COUNTER__) = { \
.verb = v, \
@@ -52,7 +53,8 @@ typedef struct {
#define VERB_NOARG(d, v, h) \
VERB(d, v, /* a= */ NULL, /* amin= */ VERB_ANY, /* amax= */ 1, /* f= */ 0, h)
/* Magic entry in the table (which will not be returned) that designates the start of the group <gr>. */
/* Magic entry in the table (which will not be returned) that designates the start of the group <gr>.
* The macro works as a separator between groups and must be between other VERB* stanzas. */
#define VERB_GROUP(gr) \
_VERB_DATA(/* d= */ NULL, /* v= */ gr, /* a= */ NULL, /* amin= */ 0, /* amax= */ 0, \
/* f= */ VERB_GROUP_MARKER, /* dat= */ 0, /* h= */ NULL)
src/systemctl/systemctl-list-jobs.c
+2 -2
View File
@@ -115,9 +115,9 @@ static int output_jobs_list(sd_bus *bus, const struct job_info* jobs, unsigned n
output_waiting_jobs(bus, table, j->id, "GetJobBefore", "\twaiting for job");
}
r = table_print(table, NULL);
r = table_print_or_warn(table);
if (r < 0)
return log_error_errno(r, "Failed to print the table: %m");
return r;
if (arg_legend != 0) {
on = ansi_highlight();
src/systemctl/systemctl-util.c
+1 -1
View File
@@ -919,7 +919,7 @@ int output_table(Table *table) {
if (OUTPUT_MODE_IS_JSON(arg_output))
r = table_print_json(table, NULL, output_mode_to_json_format_flags(arg_output) | SD_JSON_FORMAT_COLOR_AUTO);
else
r = table_print(table, NULL);
r = table_print(table);
if (r < 0)
return table_log_print_error(r);
src/test/test-format-table.c
+1 -1
View File
@@ -890,7 +890,7 @@ TEST(table_ansi) {
"FOO BAR BAZ KKK\n"
"hallo knuerzredgreen noansi thisisgrey\n");
ASSERT_OK(table_print(table, /* f= */ NULL));
ASSERT_OK(table_print(table));
_cleanup_(sd_json_variant_unrefp) sd_json_variant *j = NULL, *jj = NULL;
src/timedate/timedatectl.c
+113 -157
View File
@@ -1,6 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <getopt.h>
#include <locale.h>
#include <math.h>
#include <stdlib.h>
@@ -20,6 +19,7 @@
#include "in-addr-util.h"
#include "log.h"
#include "main-func.h"
#include "options.h"
#include "pager.h"
#include "parse-argument.h"
#include "parse-util.h"
@@ -163,9 +163,9 @@ static int print_status_info(const StatusInfo *i) {
if (r < 0)
return table_log_add_error(r);
r = table_print(table, NULL);
r = table_print_or_warn(table);
if (r < 0)
return table_log_print_error(r);
return r;
if (i->rtc_local) {
fflush(stdout);
@@ -180,7 +180,8 @@ static int print_status_info(const StatusInfo *i) {
return 0;
}
static int verb_show_status(int argc, char *argv[], uintptr_t _data, void *userdata) {
VERB(verb_status, "status", NULL, VERB_ANY, 1, VERB_DEFAULT, "Show current time settings");
static int verb_status(int argc, char *argv[], uintptr_t _data, void *userdata) {
StatusInfo info = {};
static const struct bus_properties_map map[] = {
{ "Timezone", "s", NULL, offsetof(StatusInfo, timezone) },
@@ -212,7 +213,8 @@ static int verb_show_status(int argc, char *argv[], uintptr_t _data, void *userd
return print_status_info(&info);
}
static int verb_show_properties(int argc, char *argv[], uintptr_t _data, void *userdata) {
VERB_NOARG(verb_show, "show", "Show properties of systemd-timedated");
static int verb_show(int argc, char *argv[], uintptr_t _data, void *userdata) {
sd_bus *bus = ASSERT_PTR(userdata);
int r;
@@ -229,6 +231,7 @@ static int verb_show_properties(int argc, char *argv[], uintptr_t _data, void *u
return 0;
}
VERB(verb_set_time, "set-time", "TIME", 2, 2, 0, "Set system time");
static int verb_set_time(int argc, char *argv[], uintptr_t _data, void *userdata) {
_cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
sd_bus *bus = userdata;
@@ -254,6 +257,7 @@ static int verb_set_time(int argc, char *argv[], uintptr_t _data, void *userdata
return 0;
}
VERB(verb_set_timezone, "set-timezone", "ZONE", 2, 2, 0, "Set system time zone");
static int verb_set_timezone(int argc, char *argv[], uintptr_t _data, void *userdata) {
_cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
sd_bus *bus = userdata;
@@ -268,6 +272,30 @@ static int verb_set_timezone(int argc, char *argv[], uintptr_t _data, void *user
return 0;
}
VERB_NOARG(verb_list_timezones, "list-timezones", "Show known time zones");
static int verb_list_timezones(int argc, char *argv[], uintptr_t _data, void *userdata) {
_cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
sd_bus *bus = userdata;
_cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL;
int r;
_cleanup_strv_free_ char **zones = NULL;
r = bus_call_method(bus, bus_timedate, "ListTimezones", &error, &reply, NULL);
if (r < 0)
return log_error_errno(r, "Failed to request list of time zones: %s",
bus_error_message(&error, r));
r = sd_bus_message_read_strv(reply, &zones);
if (r < 0)
return bus_log_parse_error(r);
pager_open(arg_pager_flags);
strv_print(zones);
return 0;
}
VERB(verb_set_local_rtc, "set-local-rtc", "BOOL", 2, 2, 0, "Control whether RTC is in local time");
static int verb_set_local_rtc(int argc, char *argv[], uintptr_t _data, void *userdata) {
_cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
sd_bus *bus = userdata;
@@ -299,6 +327,7 @@ static int verb_set_local_rtc(int argc, char *argv[], uintptr_t _data, void *use
return 0;
}
VERB(verb_set_ntp, "set-ntp", "BOOL", 2, 2, 0, "Enable or disable network time synchronization");
static int verb_set_ntp(int argc, char *argv[], uintptr_t _data, void *userdata) {
_cleanup_(sd_bus_message_unrefp) sd_bus_message *m = NULL;
_cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
@@ -327,28 +356,6 @@ static int verb_set_ntp(int argc, char *argv[], uintptr_t _data, void *userdata)
return 0;
}
static int verb_list_timezones(int argc, char *argv[], uintptr_t _data, void *userdata) {
_cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
sd_bus *bus = userdata;
_cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL;
int r;
_cleanup_strv_free_ char **zones = NULL;
r = bus_call_method(bus, bus_timedate, "ListTimezones", &error, &reply, NULL);
if (r < 0)
return log_error_errno(r, "Failed to request list of time zones: %s",
bus_error_message(&error, r));
r = sd_bus_message_read_strv(reply, &zones);
if (r < 0)
return bus_log_parse_error(r);
pager_open(arg_pager_flags);
strv_print(zones);
return 0;
}
typedef struct NTPStatusInfo {
const char *server_name;
char *server_address;
@@ -443,20 +450,12 @@ static int print_ntp_status_info(NTPStatusInfo *i) {
if (r < 0)
return table_log_add_error(r);
r = table_print(table, NULL);
if (r < 0)
return table_log_print_error(r);
return 0;
return table_print_or_warn(table);
}
if (i->dest < i->origin || i->trans < i->recv || i->dest - i->origin < i->trans - i->recv) {
log_error("Invalid NTP response");
r = table_print(table, NULL);
if (r < 0)
return table_log_print_error(r);
return 0;
return table_print_or_warn(table);
}
delay = (i->dest - i->origin) - (i->trans - i->recv);
@@ -536,11 +535,7 @@ static int print_ntp_status_info(NTPStatusInfo *i) {
return table_log_add_error(r);
}
r = table_print(table, NULL);
if (r < 0)
return table_log_print_error(r);
return 0;
return table_print_or_warn(table);
}
static int map_server_address(sd_bus *bus, const char *member, sd_bus_message *m, sd_bus_error *error, void *userdata) {
@@ -688,7 +683,10 @@ static int on_properties_changed(sd_bus_message *m, void *userdata, sd_bus_error
return show_timesync_status_once(sd_bus_message_get_bus(m));
}
static int verb_show_timesync_status(int argc, char *argv[], uintptr_t _data, void *userdata) {
VERB_GROUP("systemd-timesyncd Commands");
VERB_NOARG(verb_timesync_status, "timesync-status", "Show status of systemd-timesyncd");
static int verb_timesync_status(int argc, char *argv[], uintptr_t _data, void *userdata) {
_cleanup_(sd_event_unrefp) sd_event *event = NULL;
sd_bus *bus = ASSERT_PTR(userdata);
int r;
@@ -792,6 +790,7 @@ static int print_timesync_property(const char *name, const char *expected_value,
return 0;
}
VERB_NOARG(verb_show_timesync, "show-timesync", "Show properties of systemd-timesyncd");
static int verb_show_timesync(int argc, char *argv[], uintptr_t _data, void *userdata) {
_cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
sd_bus *bus = ASSERT_PTR(userdata);
@@ -841,6 +840,8 @@ static int parse_ifindex_bus(sd_bus *bus, const char *str) {
return i;
}
VERB(verb_ntp_servers, "ntp-servers", "INTERFACE SERVER…", 3, VERB_ANY, 0,
"Set the interface specific NTP servers");
static int verb_ntp_servers(int argc, char *argv[], uintptr_t _data, void *userdata) {
_cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
_cleanup_(sd_bus_message_unrefp) sd_bus_message *req = NULL;
@@ -872,6 +873,7 @@ static int verb_ntp_servers(int argc, char *argv[], uintptr_t _data, void *userd
return 0;
}
VERB(verb_revert, "revert", "INTERFACE", 2, 2, 0, "Revert the interface specific NTP servers");
static int verb_revert(int argc, char *argv[], uintptr_t _data, void *userdata) {
_cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
sd_bus *bus = ASSERT_PTR(userdata);
@@ -892,179 +894,133 @@ static int verb_revert(int argc, char *argv[], uintptr_t _data, void *userdata)
static int help(void) {
_cleanup_free_ char *link = NULL;
_cleanup_(table_unrefp) Table *verbs = NULL, *verbs2 = NULL, *options = NULL;
int r;
r = terminal_urlify_man("timedatectl", "1", &link);
if (r < 0)
return log_oom();
r = verbs_get_help_table(&verbs);
if (r < 0)
return r;
r = verbs_get_help_table_group("systemd-timesyncd Commands", &verbs2);
if (r < 0)
return r;
r = option_parser_get_help_table(&options);
if (r < 0)
return r;
(void) table_sync_column_widths(0, verbs, verbs2, options);
printf("%s [OPTIONS...] COMMAND ...\n"
"\n%sQuery or change system time and date settings.%s\n"
"\nCommands:\n"
" status Show current time settings\n"
" show Show properties of systemd-timedated\n"
" set-time TIME Set system time\n"
" set-timezone ZONE Set system time zone\n"
" list-timezones Show known time zones\n"
" set-local-rtc BOOL Control whether RTC is in local time\n"
" set-ntp BOOL Enable or disable network time synchronization\n"
"\nsystemd-timesyncd Commands:\n"
" timesync-status Show status of systemd-timesyncd\n"
" show-timesync Show properties of systemd-timesyncd\n"
" ntp-servers INTERFACE SERVER…\n"
" Set the interface specific NTP servers\n"
" revert INTERFACE Revert the interface specific NTP servers\n"
"\nOptions:\n"
" -h --help Show this help message\n"
" --version Show package version\n"
" --no-pager Do not pipe output into a pager\n"
" --no-ask-password Do not prompt for password\n"
" -H --host=[USER@]HOST Operate on remote host\n"
" -M --machine=CONTAINER Operate on local container\n"
" --adjust-system-clock Adjust system clock when changing local RTC mode\n"
" --monitor Monitor status of systemd-timesyncd\n"
" -p --property=NAME Show only properties by this name\n"
" -a --all Show all properties, including empty ones\n"
" --value When showing properties, only print the value\n"
" -P NAME Equivalent to --value --property=NAME\n"
"\nSee the %s for details.\n",
"\nCommands:\n",
program_invocation_short_name,
ansi_highlight(),
ansi_normal(),
link);
ansi_normal());
r = table_print_or_warn(verbs);
if (r < 0)
return r;
printf("\nsystemd-timesyncd Commands:\n");
r = table_print_or_warn(verbs2);
if (r < 0)
return r;
printf("\nOptions:\n");
r = table_print_or_warn(options);
if (r < 0)
return r;
printf("\nSee the %s for details.\n", link);
return 0;
}
static int verb_help(int argc, char *argv[], uintptr_t _data, void *userdata) {
return help();
}
VERB_COMMON_HELP_HIDDEN(help);
static int parse_argv(int argc, char *argv[]) {
enum {
ARG_VERSION = 0x100,
ARG_NO_PAGER,
ARG_ADJUST_SYSTEM_CLOCK,
ARG_NO_ASK_PASSWORD,
ARG_MONITOR,
ARG_VALUE,
};
static const struct option options[] = {
{ "help", no_argument, NULL, 'h' },
{ "version", no_argument, NULL, ARG_VERSION },
{ "no-pager", no_argument, NULL, ARG_NO_PAGER },
{ "host", required_argument, NULL, 'H' },
{ "machine", required_argument, NULL, 'M' },
{ "no-ask-password", no_argument, NULL, ARG_NO_ASK_PASSWORD },
{ "adjust-system-clock", no_argument, NULL, ARG_ADJUST_SYSTEM_CLOCK },
{ "monitor", no_argument, NULL, ARG_MONITOR },
{ "property", required_argument, NULL, 'p' },
{ "value", no_argument, NULL, ARG_VALUE },
{ "all", no_argument, NULL, 'a' },
{}
};
int c, r;
static int parse_argv(int argc, char *argv[], char ***ret_args) {
int r;
assert(argc >= 0);
assert(argv);
while ((c = getopt_long(argc, argv, "hH:M:p:P:a", options, NULL)) >= 0)
switch (c) {
OptionParser state = { argc, argv };
const Option *current;
const char *arg;
case 'h':
FOREACH_OPTION_FULL(&state, c, &current, &arg, /* on_error= */ return c)
switch (c) {
OPTION_COMMON_HELP:
return help();
case ARG_VERSION:
OPTION_COMMON_VERSION:
return version();
case 'H':
arg_transport = BUS_TRANSPORT_REMOTE;
arg_host = optarg;
OPTION_COMMON_NO_PAGER:
arg_pager_flags |= PAGER_DISABLE;
break;
case 'M':
r = parse_machine_argument(optarg, &arg_host, &arg_transport);
OPTION_COMMON_NO_ASK_PASSWORD:
arg_ask_password = false;
break;
OPTION_COMMON_HOST:
arg_transport = BUS_TRANSPORT_REMOTE;
arg_host = arg;
break;
OPTION_COMMON_MACHINE:
r = parse_machine_argument(arg, &arg_host, &arg_transport);
if (r < 0)
return r;
break;
case ARG_NO_ASK_PASSWORD:
arg_ask_password = false;
break;
case ARG_ADJUST_SYSTEM_CLOCK:
OPTION_LONG("adjust-system-clock", NULL, "Adjust system clock when changing local RTC mode"):
arg_adjust_system_clock = true;
break;
case ARG_NO_PAGER:
arg_pager_flags |= PAGER_DISABLE;
break;
case ARG_MONITOR:
OPTION_LONG("monitor", NULL, "Monitor status of systemd-timesyncd"):
arg_monitor = true;
break;
case 'p':
case 'P':
r = strv_extend(&arg_property, optarg);
OPTION('p', "property", "NAME", "Show only properties by this name"): {}
OPTION_SHORT('P', "NAME", "Equivalent to --value --property=NAME"):
r = strv_extend(&arg_property, arg);
if (r < 0)
return log_oom();
/* If the user asked for a particular property, show it to them, even if empty. */
SET_FLAG(arg_print_flags, BUS_PRINT_PROPERTY_SHOW_EMPTY, true);
if (c == 'p')
break;
_fallthrough_;
if (current->short_code == 'P')
SET_FLAG(arg_print_flags, BUS_PRINT_PROPERTY_ONLY_VALUE, true);
break;
case ARG_VALUE:
OPTION_LONG("value", NULL, "When showing properties, only print the value"):
SET_FLAG(arg_print_flags, BUS_PRINT_PROPERTY_ONLY_VALUE, true);
break;
case 'a':
OPTION('a', "all", NULL, "Show all properties, including empty ones"):
SET_FLAG(arg_print_flags, BUS_PRINT_PROPERTY_SHOW_EMPTY, true);
break;
case '?':
return -EINVAL;
default:
assert_not_reached();
}
*ret_args = option_parser_get_args(&state);
return 1;
}
static int timedatectl_main(sd_bus *bus, int argc, char *argv[]) {
static const Verb verbs[] = {
{ "status", VERB_ANY, 1, VERB_DEFAULT, verb_show_status },
{ "show", VERB_ANY, 1, 0, verb_show_properties },
{ "set-time", 2, 2, 0, verb_set_time },
{ "set-timezone", 2, 2, 0, verb_set_timezone },
{ "list-timezones", VERB_ANY, 1, 0, verb_list_timezones },
{ "set-local-rtc", 2, 2, 0, verb_set_local_rtc },
{ "set-ntp", 2, 2, 0, verb_set_ntp },
{ "timesync-status", VERB_ANY, 1, 0, verb_show_timesync_status },
{ "show-timesync", VERB_ANY, 1, 0, verb_show_timesync },
{ "ntp-servers", 3, VERB_ANY, 0, verb_ntp_servers },
{ "revert", 2, 2, 0, verb_revert },
{ "help", VERB_ANY, VERB_ANY, 0, verb_help }, /* Not documented, but supported since it has been created. */
{}
};
return dispatch_verb(argc, argv, verbs, bus);
}
static int run(int argc, char *argv[]) {
_cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL;
char **args = NULL;
int r;
setlocale(LC_ALL, "");
log_setup();
r = parse_argv(argc, argv);
r = parse_argv(argc, argv, &args);
if (r <= 0)
return r;
@@ -1074,7 +1030,7 @@ static int run(int argc, char *argv[]) {
(void) sd_bus_set_allow_interactive_authorization(bus, arg_ask_password);
return timedatectl_main(bus, argc, argv);
return dispatch_verb_with_args(args, bus);
}
DEFINE_MAIN_FUNCTION(run);
src/update-done/update-done.c
+3 -1
View File
@@ -82,7 +82,9 @@ static int help(void) {
ansi_normal(),
ansi_underline(),
ansi_normal());
table_print(options, stdout);
r = table_print_or_warn(options);
if (r < 0)
return r;
printf("\nSee the %s for details.\n", link);
return 0;
src/validatefs/validatefs.c
+3 -1
View File
@@ -50,7 +50,9 @@ static int help(void) {
program_invocation_short_name,
ansi_highlight(),
ansi_normal());
table_print(options, stdout);
r = table_print_or_warn(options);
if (r < 0)
return r;
printf("\nSee the %s for details.\n", link);
return 0;
src/varlinkctl/varlinkctl.c
+5 -9
View File
@@ -416,6 +416,8 @@ static int verb_info(int argc, char *argv[], uintptr_t _data, void *userdata) {
if (streq_ptr(argv[0], "list-interfaces")) {
STRV_FOREACH(i, data.interfaces)
puts(*i);
return 0;
} else {
_cleanup_(table_unrefp) Table *t = NULL;
@@ -439,20 +441,14 @@ static int verb_info(int argc, char *argv[], uintptr_t _data, void *userdata) {
if (r < 0)
return table_log_add_error(r);
r = table_print(t, NULL);
if (r < 0)
return table_log_print_error(r);
return table_print_or_warn(t);
}
} else {
sd_json_variant *v;
v = streq_ptr(argv[0], "list-interfaces") ?
sd_json_variant *v = streq_ptr(argv[0], "list-interfaces") ?
sd_json_variant_by_key(reply, "interfaces") : reply;
sd_json_variant_dump(v, arg_json_format_flags, stdout, NULL);
return sd_json_variant_dump(v, arg_json_format_flags, stdout, NULL);
}
return 0;
}
static size_t break_columns(void) {
src/vpick/vpick-tool.c
+94 -94
View File
@@ -1,7 +1,6 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <dirent.h>
#include <getopt.h>
#include "alloc-util.h"
#include "architecture.h"
@@ -9,12 +8,14 @@
#include "format-table.h"
#include "log.h"
#include "main-func.h"
#include "options.h"
#include "parse-util.h"
#include "path-util.h"
#include "pretty-print.h"
#include "stat-util.h"
#include "string-table.h"
#include "string-util.h"
#include "strv.h"
#include "vpick.h"
typedef enum {
@@ -55,167 +56,165 @@ DEFINE_PRIVATE_STRING_TABLE_LOOKUP_FROM_STRING(print, Print);
static int help(void) {
_cleanup_free_ char *link = NULL;
_cleanup_(table_unrefp) Table *lookup_keys = NULL, *output = NULL;
int r;
r = terminal_urlify_man("systemd-vpick", "1", &link);
if (r < 0)
return log_oom();
printf("%1$s [OPTIONS...] PATH...\n"
"\n%5$sPick entry from versioned directory.%6$s\n\n"
" -h --help Show this help\n"
" --version Show package version\n"
"\n%3$sLookup Keys:%4$s\n"
" -B --basename=BASENAME\n"
" Look for specified basename\n"
" -V VERSION Look for specified version\n"
" -A ARCH Look for specified architecture\n"
" -S --suffix=SUFFIX Look for specified suffix\n"
" -t --type=TYPE Look for specified inode type\n"
"\n%3$sOutput:%4$s\n"
" -p --print=filename Print selected filename rather than path\n"
" -p --print=version Print selected version rather than path\n"
" -p --print=type Print selected inode type rather than path\n"
" -p --print=arch Print selected architecture rather than path\n"
" -p --print=tries Print selected tries left/tries done rather than path\n"
" -p --print=all Print all of the above\n"
" --resolve=yes Canonicalize the result path\n"
"\nSee the %2$s for details.\n",
program_invocation_short_name,
link,
ansi_underline(), ansi_normal(),
ansi_highlight(), ansi_normal());
r = option_parser_get_help_table(&lookup_keys);
if (r < 0)
return r;
r = option_parser_get_help_table_group("Output", &output);
if (r < 0)
return r;
(void) table_sync_column_widths(0, lookup_keys, output);
printf("%s [OPTIONS...] PATH...\n"
"\n%sPick entry from versioned directory.%s\n",
program_invocation_short_name,
ansi_highlight(),
ansi_normal());
printf("\n%sLookup Keys:%s\n", ansi_underline(), ansi_normal());
r = table_print_or_warn(lookup_keys);
if (r < 0)
return r;
printf("\n%sOutput:%s\n", ansi_underline(), ansi_normal());
r = table_print_or_warn(output);
if (r < 0)
return r;
printf("\nSee the %s for details.\n", link);
return 0;
}
static int parse_argv(int argc, char *argv[]) {
enum {
ARG_VERSION = 0x100,
ARG_RESOLVE,
};
static const struct option options[] = {
{ "help", no_argument, NULL, 'h' },
{ "version", no_argument, NULL, ARG_VERSION },
{ "basename", required_argument, NULL, 'B' },
{ "suffix", required_argument, NULL, 'S' },
{ "type", required_argument, NULL, 't' },
{ "print", required_argument, NULL, 'p' },
{ "resolve", required_argument, NULL, ARG_RESOLVE },
{}
};
int c, r;
static int parse_argv(int argc, char *argv[], char ***ret_args) {
int r;
assert(argc >= 0);
assert(argv);
while ((c = getopt_long(argc, argv, "hB:V:A:S:t:p:", options, NULL)) >= 0) {
OptionParser state = { argc, argv };
const char *arg;
FOREACH_OPTION(&state, c, &arg, /* on_error= */ return c)
switch (c) {
case 'h':
return help();
OPTION('B', "basename", "BASENAME", "Look for specified basename"):
if (!filename_part_is_valid(arg))
return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Invalid basename string: %s", arg);
case ARG_VERSION:
return version();
case 'B':
if (!filename_part_is_valid(optarg))
return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Invalid basename string: %s", optarg);
r = free_and_strdup_warn(&arg_filter_basename, optarg);
r = free_and_strdup_warn(&arg_filter_basename, arg);
if (r < 0)
return r;
break;
case 'V':
if (!version_is_valid(optarg))
return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Invalid version string: %s", optarg);
OPTION_SHORT('V', "VERSION", "Look for specified version"):
if (!version_is_valid(arg))
return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Invalid version string: %s", arg);
r = free_and_strdup_warn(&arg_filter_version, optarg);
r = free_and_strdup_warn(&arg_filter_version, arg);
if (r < 0)
return r;
break;
case 'A':
if (streq(optarg, "native"))
OPTION_SHORT('A', "ARCH", "Look for specified architecture"):
if (streq(arg, "native"))
arg_filter_architecture = native_architecture();
else if (streq(optarg, "secondary")) {
else if (streq(arg, "secondary")) {
#ifdef ARCHITECTURE_SECONDARY
arg_filter_architecture = ARCHITECTURE_SECONDARY;
#else
return log_error_errno(SYNTHETIC_ERRNO(EOPNOTSUPP), "Local architecture has no secondary architecture.");
#endif
} else if (streq(optarg, "uname"))
} else if (streq(arg, "uname"))
arg_filter_architecture = uname_architecture();
else if (streq(optarg, "auto"))
else if (streq(arg, "auto"))
arg_filter_architecture = _ARCHITECTURE_INVALID;
else {
arg_filter_architecture = architecture_from_string(optarg);
arg_filter_architecture = architecture_from_string(arg);
if (arg_filter_architecture < 0)
return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Unknown architecture: %s", optarg);
return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Unknown architecture: %s", arg);
}
break;
case 'S':
if (!filename_part_is_valid(optarg))
return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Invalid suffix string: %s", optarg);
OPTION('S', "suffix", "SUFFIX", "Look for specified suffix"):
if (!filename_part_is_valid(arg))
return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Invalid suffix string: %s", arg);
r = free_and_strdup_warn(&arg_filter_suffix, optarg);
r = free_and_strdup_warn(&arg_filter_suffix, arg);
if (r < 0)
return r;
break;
case 't':
if (isempty(optarg))
OPTION('t', "type", "TYPE", "Look for specified inode type"):
if (isempty(arg))
arg_filter_type_mask = 0;
else {
mode_t m;
m = inode_type_from_string(optarg);
m = inode_type_from_string(arg);
if (m == MODE_INVALID)
return log_error_errno(m, "Unknown inode type: %s", optarg);
return log_error_errno(m, "Unknown inode type: %s", arg);
arg_filter_type_mask |= UINT32_C(1) << IFTODT(m);
}
break;
case 'p':
if (streq(optarg, "arch")) /* accept abbreviation too */
OPTION_GROUP("Output"): {}
OPTION_COMMON_HELP:
return help();
OPTION_COMMON_VERSION:
return version();
OPTION('p', "print", "WHAT",
"Print selected WHAT rather than path"): {}
OPTION_LONG_FLAGS(OPTION_HELP_ENTRY, "print", "filename",
"... print selected filename"): {}
OPTION_LONG_FLAGS(OPTION_HELP_ENTRY, "print", "version",
"... print selected version"): {}
OPTION_LONG_FLAGS(OPTION_HELP_ENTRY, "print", "type",
"... print selected inode type"): {}
OPTION_LONG_FLAGS(OPTION_HELP_ENTRY, "print", "arch",
"... print selected architecture"): {}
OPTION_LONG_FLAGS(OPTION_HELP_ENTRY, "print", "tries",
"... print selected tries left/tries done"): {}
OPTION_LONG_FLAGS(OPTION_HELP_ENTRY, "print", "all",
"... print all of the above"):
if (streq(arg, "arch")) /* accept abbreviation too */
arg_print = PRINT_ARCHITECTURE;
else
arg_print = print_from_string(optarg);
arg_print = print_from_string(arg);
if (arg_print < 0)
return log_error_errno(arg_print, "Unknown --print= argument: %s", optarg);
return log_error_errno(arg_print, "Unknown --print= argument: %s", arg);
break;
case ARG_RESOLVE:
r = parse_boolean(optarg);
OPTION_LONG("resolve", "BOOL", "Canonicalize the result path"):
r = parse_boolean(arg);
if (r < 0)
return log_error_errno(r, "Failed to parse --resolve= value: %m");
SET_FLAG(arg_flags, PICK_RESOLVE, r);
break;
case '?':
return -EINVAL;
default:
assert_not_reached();
}
}
if (arg_print < 0)
arg_print = PRINT_PATH;
*ret_args = option_parser_get_args(&state);
return 1;
}
@@ -224,18 +223,19 @@ static int run(int argc, char *argv[]) {
log_setup();
r = parse_argv(argc, argv);
char **args = NULL;
r = parse_argv(argc, argv, &args);
if (r <= 0)
return r;
if (optind >= argc)
if (strv_isempty(args))
return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Path to resolve must be specified.");
for (int i = optind; i < argc; i++) {
STRV_FOREACH(i, args) {
_cleanup_free_ char *p = NULL;
r = path_make_absolute_cwd(argv[i], &p);
r = path_make_absolute_cwd(*i, &p);
if (r < 0)
return log_error_errno(r, "Failed to make path '%s' absolute: %m", argv[i]);
return log_error_errno(r, "Failed to make path '%s' absolute: %m", *i);
_cleanup_(pick_result_done) PickResult result = PICK_RESULT_NULL;
r = path_pick(/* toplevel_path= */ NULL,
@@ -337,9 +337,9 @@ static int run(int argc, char *argv[]) {
return table_log_add_error(r);
}
r = table_print(t, stdout);
r = table_print_or_warn(t);
if (r < 0)
return table_log_print_error(r);
return r;
break;
}