diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2021-02-09 16:07:19 +0100 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2021-02-10 14:47:00 +0100 |
| commit | c706a52ac5f6b6e3d20d0a9e965b557dddbe0401 (patch) | |
| tree | f030f1166629a8363c359d97c961f6e954f81ffc /src/machine | |
| parent | 7211c853c26554ad1f58c2cfa1d5a0bfc059bf15 (diff) | |
| download | systemd-c706a52ac5f6b6e3d20d0a9e965b557dddbe0401.tar.gz | |
machinectl: write arg_* only after verifying the value
Diffstat (limited to 'src/machine')
| -rw-r--r-- | src/machine/machinectl.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c index 1771abc077..3d6048eaff 100644 --- a/src/machine/machinectl.c +++ b/src/machine/machinectl.c @@ -2693,10 +2693,10 @@ static int parse_argv(int argc, char *argv[]) { return 0; } - arg_output = output_mode_from_string(optarg); - if (arg_output < 0) - return log_error_errno(SYNTHETIC_ERRNO(EINVAL), - "Unknown output '%s'.", optarg); + r = output_mode_from_string(optarg); + if (r < 0) + return log_error_errno(r, "Unknown output '%s'.", optarg); + arg_output = r; if (OUTPUT_MODE_IS_JSON(arg_output)) arg_legend = false; @@ -2720,10 +2720,10 @@ static int parse_argv(int argc, char *argv[]) { return 0; } - arg_signal = signal_from_string(optarg); - if (arg_signal < 0) - return log_error_errno(SYNTHETIC_ERRNO(EINVAL), - "Failed to parse signal string %s.", optarg); + r = signal_from_string(optarg); + if (r < 0) + return log_error_errno(r, "Failed to parse signal string %s.", optarg); + arg_signal = r; break; case ARG_NO_ASK_PASSWORD: @@ -2758,10 +2758,10 @@ static int parse_argv(int argc, char *argv[]) { return 0; } - arg_verify = import_verify_from_string(optarg); - if (arg_verify < 0) - return log_error_errno(SYNTHETIC_ERRNO(EINVAL), - "Failed to parse --verify= setting: %s", optarg); + r = import_verify_from_string(optarg); + if (r < 0) + return log_error_errno(r, "Failed to parse --verify= setting: %s", optarg); + arg_verify = r; break; case ARG_FORCE: |