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

nspawn: simplify parsing of --hostname/--machine

Browse Source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2026-02-11 12:50:51 +01:00
committed by Zbigniew Jędrzejewski-Szmek
parent c1fcc80421
commit 26de1563d0
1 changed files with 12 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/nspawn/nspawn.c
+12 -20
View File
@@ -942,31 +942,23 @@ static int parse_argv(int argc, char *argv[]) {
}
case 'M':
if (isempty(optarg))
arg_machine = mfree(arg_machine);
else {
if (!hostname_is_valid(optarg, 0))
return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
"Invalid machine name: %s", optarg);
if (!isempty(optarg) && !hostname_is_valid(optarg, /* flags= */ 0))
return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
"Invalid machine name: %s", optarg);
r = free_and_strdup(&arg_machine, optarg);
if (r < 0)
return log_oom();
}
r = free_and_strdup_warn(&arg_machine, optarg);
if (r < 0)
return r;
break;
case ARG_HOSTNAME:
if (isempty(optarg))
arg_hostname = mfree(arg_hostname);
else {
if (!hostname_is_valid(optarg, 0))
return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
"Invalid hostname: %s", optarg);
if (!isempty(optarg) && !hostname_is_valid(optarg, /* flags= */ 0))
return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
"Invalid hostname: %s", optarg);
r = free_and_strdup(&arg_hostname, optarg);
if (r < 0)
return log_oom();
}
r = free_and_strdup_warn(&arg_hostname, optarg);
if (r < 0)
return r;
arg_settings_mask |= SETTING_HOSTNAME;
break;