diff options
| author | Lennart Poettering <lennart@poettering.net> | 2022-03-31 10:48:37 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2022-03-31 11:24:01 +0200 |
| commit | 2fabbad8983bf012e73479b73ecd390794080c3d (patch) | |
| tree | 54f286cfcfe577ee236820986b457be8b8b79a8b /src/cryptsetup/cryptsetup.c | |
| parent | dcbc38c916ebc6f024870c888536e55fc38b353c (diff) | |
| download | systemd-2fabbad8983bf012e73479b73ecd390794080c3d.tar.gz | |
cryptsetup: add helper for mangling "none" option strings
let's unify some code here, and let's do so in cryptsetup-util.h so that
we can later reuse this in integritysetup/veritysetup
Diffstat (limited to 'src/cryptsetup/cryptsetup.c')
| -rw-r--r-- | src/cryptsetup/cryptsetup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c index 9db3f6f098..137e7ee95d 100644 --- a/src/cryptsetup/cryptsetup.c +++ b/src/cryptsetup/cryptsetup.c @@ -1750,8 +1750,8 @@ static int run(int argc, char *argv[]) { volume = argv[2]; source = argv[3]; - key_file = argc >= 5 && !STR_IN_SET(argv[4], "", "-", "none") ? argv[4] : NULL; - options = argc >= 6 && !STR_IN_SET(argv[5], "", "-", "none") ? argv[5] : NULL; + key_file = mangle_none(argc >= 5 ? argv[4] : NULL); + options = mangle_none(argc >= 6 ? argv[5] : NULL); if (!filename_is_valid(volume)) return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Volume name '%s' is not valid.", volume); |