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

cryptsetup: port to strprepend()

Browse Source
This commit is contained in:
Mike Yuan
2025-02-10 19:39:21 +01:00
parent b40694f5fc
commit ce0a510667
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/cryptsetup/cryptsetup.c
+6 -5
View File
@@ -600,14 +600,15 @@ static int parse_one_option(const char *option) {
* - text descriptions prefixed with "%:" or "%keyring:".
* - text description with no prefix.
* - numeric keyring id (ignored in current patch set). */
if (IN_SET(*val, '@', '%'))
keyring = strndup(val, sep - val);
else
/* add type prefix if missing (crypt_set_keyring_to_link() expects it) */
keyring = strnappend("%:", val, sep - val);
keyring = strndup(val, sep - val);
if (!keyring)
return log_oom();
/* add type prefix if missing (crypt_set_keyring_to_link() expects it) */
if (!IN_SET(*keyring, '@', '%'))
if (!strprepend(&keyring, "%:"))
return log_oom();
sep += 2;
/* %<key_type> is optional (and defaults to 'user') */