mirror of
https://github.com/tmux/tmux.git
synced 2024-11-18 18:38:54 +00:00
Merge branch 'obsd-master' into master
This commit is contained in:
commit
31a6e5eff4
@ -153,6 +153,10 @@ args_parse(const struct args_parse *parse, struct args_value *values,
|
|||||||
flag = *string++;
|
flag = *string++;
|
||||||
if (flag == '\0')
|
if (flag == '\0')
|
||||||
break;
|
break;
|
||||||
|
if (flag == '?') {
|
||||||
|
args_free(args);
|
||||||
|
return (NULL);
|
||||||
|
}
|
||||||
if (!isalnum(flag)) {
|
if (!isalnum(flag)) {
|
||||||
xasprintf(cause, "invalid flag -%c", flag);
|
xasprintf(cause, "invalid flag -%c", flag);
|
||||||
args_free(args);
|
args_free(args);
|
||||||
|
2
cmd.c
2
cmd.c
@ -501,7 +501,7 @@ cmd_parse(struct args_value *values, u_int count, const char *file, u_int line,
|
|||||||
const struct cmd_entry *entry;
|
const struct cmd_entry *entry;
|
||||||
struct cmd *cmd;
|
struct cmd *cmd;
|
||||||
struct args *args;
|
struct args *args;
|
||||||
char *error;
|
char *error = NULL;
|
||||||
|
|
||||||
if (count == 0 || values[0].type != ARGS_STRING) {
|
if (count == 0 || values[0].type != ARGS_STRING) {
|
||||||
xasprintf(cause, "no command");
|
xasprintf(cause, "no command");
|
||||||
|
Loading…
Reference in New Issue
Block a user