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

udevadm: several cleanups for command line option parsers (#36241)

Browse Source
This commit is contained in:
Yu Watanabe
2025-02-06 09:39:03 +09:00
committed by GitHub
parent 2b6890d92f 295741c0d1
commit 570cd55783
13 changed files with 62 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsystemd/sd-device/device-private.c
-4
View File
@@ -961,7 +961,3 @@ static const char* const device_action_table[_SD_DEVICE_ACTION_MAX] = {
};
DEFINE_STRING_TABLE_LOOKUP(device_action, sd_device_action_t);
void dump_device_action_table(void) {
DUMP_STRING_TABLE(device_action, sd_device_action_t, _SD_DEVICE_ACTION_MAX);
}
src/libsystemd/sd-device/device-private.h
-1
View File
@@ -77,4 +77,3 @@ int device_read_uevent_file(sd_device *device);
int device_set_action(sd_device *device, sd_device_action_t a);
sd_device_action_t device_action_from_string(const char *s) _pure_;
const char* device_action_to_string(sd_device_action_t a) _const_;
void dump_device_action_table(void);
src/udev/udevadm-test-builtin.c
+2 -4
View File
@@ -45,10 +45,8 @@ static int parse_argv(int argc, char *argv[]) {
switch (c) {
case 'a':
r = parse_device_action(optarg, &arg_action);
if (r < 0)
return log_error_errno(r, "Invalid action '%s'", optarg);
if (r == 0)
return 0;
if (r <= 0)
return r;
break;
case 'V':
return print_version();
src/udev/udevadm-test.c
+5 -8
View File
@@ -60,16 +60,13 @@ static int parse_argv(int argc, char *argv[]) {
switch (c) {
case 'a':
r = parse_device_action(optarg, &arg_action);
if (r < 0)
return log_error_errno(r, "Invalid action '%s'", optarg);
if (r == 0)
return 0;
if (r <= 0)
return r;
break;
case 'N':
arg_resolve_name_timing = resolve_name_timing_from_string(optarg);
if (arg_resolve_name_timing < 0)
return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
"--resolve-names= must be early, late or never");
r = parse_resolve_name_timing(optarg, &arg_resolve_name_timing);
if (r <= 0)
return r;
break;
case 'D': {
_cleanup_free_ char *p = NULL;
src/udev/udevadm-trigger.c
+2 -4
View File
@@ -369,10 +369,8 @@ int trigger_main(int argc, char *argv[], void *userdata) {
break;
case 'c':
r = parse_device_action(optarg, &action);
if (r < 0)
return log_error_errno(r, "Unknown action '%s'", optarg);
if (r == 0)
return 0;
if (r <= 0)
return r;
break;
case 's':
r = sd_device_enumerator_add_match_subsystem(e, optarg, true);
src/udev/udevadm-util.c
+24 -10
View File
@@ -10,7 +10,9 @@
#include "constants.h"
#include "device-private.h"
#include "path-util.h"
#include "string-table.h"
#include "udev-ctrl.h"
#include "udev-rules.h"
#include "udev-varlink.h"
#include "udevadm-util.h"
#include "unit-name.h"
@@ -110,22 +112,34 @@ int find_device_with_action(const char *id, sd_device_action_t action, sd_device
return 0;
}
int parse_device_action(const char *str, sd_device_action_t *action) {
sd_device_action_t a;
int parse_device_action(const char *str, sd_device_action_t *ret) {
assert(str);
assert(action);
if (streq(str, "help")) {
dump_device_action_table();
return 0;
}
if (streq(str, "help"))
return DUMP_STRING_TABLE(device_action, sd_device_action_t, _SD_DEVICE_ACTION_MAX);
a = device_action_from_string(str);
sd_device_action_t a = device_action_from_string(str);
if (a < 0)
return a;
return log_error_errno(a, "Invalid action '%s'.", str);
*action = a;
if (ret)
*ret = a;
return 1;
}
int parse_resolve_name_timing(const char *str, ResolveNameTiming *ret) {
assert(str);
if (streq(str, "help"))
return DUMP_STRING_TABLE(resolve_name_timing, ResolveNameTiming, _RESOLVE_NAME_TIMING_MAX);
ResolveNameTiming v = resolve_name_timing_from_string(optarg);
if (v < 0)
return log_error_errno(v, "--resolve-names= must be 'early', 'late', or 'never'.");
if (ret)
*ret = v;
return 1;
}
src/udev/udevadm-util.h
+4 -1
View File
@@ -3,8 +3,11 @@
#include "sd-device.h"
#include "udev-def.h"
int find_device(const char *id, const char *prefix, sd_device **ret);
int find_device_with_action(const char *id, sd_device_action_t action, sd_device **ret);
int parse_device_action(const char *str, sd_device_action_t *action);
int parse_device_action(const char *str, sd_device_action_t *ret);
int parse_resolve_name_timing(const char *str, ResolveNameTiming *ret);
int udev_ping(usec_t timeout, bool ignore_connection_failure);
int search_rules_files(char * const *a, const char *root, char ***ret);
src/udev/udevadm-verify.c
+4 -12
View File
@@ -36,7 +36,7 @@ static int help(void) {
"\n%sVerify udev rules files.%s\n\n"
" -h --help Show this help\n"
" -V --version Show package version\n"
" -N --resolve-names=early|never When to resolve names\n"
" -N --resolve-names=early|late|never When to resolve names\n"
" --root=PATH Operate on an alternate filesystem root\n"
" --no-summary Do not show summary\n"
" --no-style Ignore style issues\n"
@@ -77,17 +77,9 @@ static int parse_argv(int argc, char *argv[]) {
case 'V':
return print_version();
case 'N':
arg_resolve_name_timing = resolve_name_timing_from_string(optarg);
if (arg_resolve_name_timing < 0)
return log_error_errno(arg_resolve_name_timing,
"--resolve-names= takes \"early\" or \"never\"");
/*
* In the verifier "late" has the effect of "never",
* and "never" would generate irrelevant diagnostics,
* so map "never" to "late".
*/
if (arg_resolve_name_timing == RESOLVE_NAME_NEVER)
arg_resolve_name_timing = RESOLVE_NAME_LATE;
r = parse_resolve_name_timing(optarg, &arg_resolve_name_timing);
if (r <= 0)
return r;
break;
case ARG_ROOT:
r = parse_path_argument(optarg, /* suppress_root= */ true, &arg_root);