circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-01-12 03:08:46 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam 2017-01-18 10:01:12 +00:00
commit 6d37984f4f
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd-show-options.c
View File

@ -130,7 +130,8 @@ cmd_show_options_one(struct cmd *self, struct cmdq_item *item,
cmdq_error(item, "ambiguous option: %s", name); cmdq_error(item, "ambiguous option: %s", name);
return (CMD_RETURN_ERROR); return (CMD_RETURN_ERROR);
} }
if (options_match_get(oo, name, &idx, 0, &ambiguous) != NULL) if (*name != '@' &&
options_match_get(oo, name, &idx, 0, &ambiguous) != NULL)
return (CMD_RETURN_NORMAL); return (CMD_RETURN_NORMAL);
cmdq_error(item, "unknown option: %s", name); cmdq_error(item, "unknown option: %s", name);
return (CMD_RETURN_ERROR); return (CMD_RETURN_ERROR);

5
options.c
View File

@ -403,6 +403,11 @@ options_match(const char *s, int *idx, int* ambiguous)
name = options_parse(s, idx); name = options_parse(s, idx);
namelen = strlen(name); namelen = strlen(name);
if (*name == '@') {
*ambiguous = 0;
return (xstrdup(name));
}
found = NULL; found = NULL;
for (oe = options_table; oe->name != NULL; oe++) { for (oe = options_table; oe->name != NULL; oe++) {
if (strcmp(oe->name, name) == 0) { if (strcmp(oe->name, name) == 0) {