Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2015-12-13 23:46:58 +00:00
63 changed files with 716 additions and 449 deletions

6
cmd.c
View File

@ -352,12 +352,12 @@ cmd_parse(int argc, char **argv, const char *file, u_int line, char **cause)
return (NULL);
}
args = args_parse(entry->args_template, argc, argv);
args = args_parse(entry->args.template, argc, argv);
if (args == NULL)
goto usage;
if (entry->args_lower != -1 && args->argc < entry->args_lower)
if (entry->args.lower != -1 && args->argc < entry->args.lower)
goto usage;
if (entry->args_upper != -1 && args->argc > entry->args_upper)
if (entry->args.upper != -1 && args->argc > entry->args.upper)
goto usage;
cmd = xcalloc(1, sizeof *cmd);