Merge branch 'obsd-master'

pull/3431/head
Thomas Adam 2023-01-09 02:01:10 +00:00
commit c1a30ed995
1 changed files with 2 additions and 4 deletions

View File

@ -150,8 +150,6 @@ args_parse_flag_argument(struct args_value *values, u_int count, char **cause,
xasprintf(cause, "-%c argument must be a string", flag);
return (-1);
}
if (argument->string[0] == '-')
argument = NULL;
}
if (argument == NULL) {
if (optional_argument) {
@ -210,12 +208,12 @@ args_parse_flags(const struct args_parse *parse, struct args_value *values,
xasprintf(cause, "unknown flag -%c", flag);
return (-1);
}
if (*++found != ':') {
if (found[1] != ':') {
log_debug("%s: -%c", __func__, flag);
args_set(args, flag, NULL, 0);
continue;
}
optional_argument = (*found == ':');
optional_argument = (found[2] == ':');
return (args_parse_flag_argument(values, count, cause, args, i,
string, flag, optional_argument));
}