diff options
author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2023-04-12 22:38:01 +0900 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2023-04-13 11:17:28 +0200 |
commit | 06e78680e3c36589b785f90ecda64d124905a3f7 (patch) | |
tree | 4e30e25ea6b5d15e3156ec783cfef15744df9b27 /src/coredump | |
parent | 771805eb44ec42228d9d85f4d35962ff8459bb77 (diff) | |
download | systemd-06e78680e3c36589b785f90ecda64d124905a3f7.tar.gz |
image-policy: introduce parse_image_policy_argument() helper
Addresses
https://github.com/systemd/systemd/pull/25608/commits/84be0c710d9d562f6d2cf986cc2a8ff4c98a138b#r1060130312,
https://github.com/systemd/systemd/pull/25608/commits/84be0c710d9d562f6d2cf986cc2a8ff4c98a138b#r1067927293, and
https://github.com/systemd/systemd/pull/25608/commits/84be0c710d9d562f6d2cf986cc2a8ff4c98a138b#r1067926416.
Follow-up for 84be0c710d9d562f6d2cf986cc2a8ff4c98a138b.
Diffstat (limited to 'src/coredump')
-rw-r--r-- | src/coredump/coredumpctl.c | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/src/coredump/coredumpctl.c b/src/coredump/coredumpctl.c index 076b35f098..bc52cc0b06 100644 --- a/src/coredump/coredumpctl.c +++ b/src/coredump/coredumpctl.c @@ -222,8 +222,8 @@ static int parse_argv(int argc, char *argv[]) { ARG_FILE, ARG_ROOT, ARG_IMAGE, - ARG_ALL, ARG_IMAGE_POLICY, + ARG_ALL, }; int c, r; @@ -246,8 +246,8 @@ static int parse_argv(int argc, char *argv[]) { { "json", required_argument, NULL, ARG_JSON }, { "root", required_argument, NULL, ARG_ROOT }, { "image", required_argument, NULL, ARG_IMAGE }, - { "all", no_argument, NULL, ARG_ALL }, { "image-policy", required_argument, NULL, ARG_IMAGE_POLICY }, + { "all", no_argument, NULL, ARG_ALL }, {} }; @@ -349,6 +349,12 @@ static int parse_argv(int argc, char *argv[]) { return r; break; + case ARG_IMAGE_POLICY: + r = parse_image_policy_argument(optarg, &arg_image_policy); + if (r < 0) + return r; + break; + case 'r': arg_reverse = true; break; @@ -368,18 +374,6 @@ static int parse_argv(int argc, char *argv[]) { arg_all = true; break; - case ARG_IMAGE_POLICY: { - _cleanup_(image_policy_freep) ImagePolicy *p = NULL; - - r = image_policy_from_string(optarg, &p); - if (r < 0) - return log_error_errno(r, "Failed to parse image policy: %s", optarg); - - image_policy_free(arg_image_policy); - arg_image_policy = TAKE_PTR(p); - break; - } - case '?': return -EINVAL; |