diff options
author | Nicholas Marriott <nicm@openbsd.org> | 2009-07-13 17:47:46 +0000 |
---|---|---|
committer | Nicholas Marriott <nicm@openbsd.org> | 2009-07-13 17:47:46 +0000 |
commit | 023d8d38ec7d59bbf635253f10e82e0b62ba59ca (patch) | |
tree | f2ca407f1d6e72543177cfa7b65fa45fd2e5737c /cmd-new-window.c | |
parent | 359285928b63605a130990699c33c8af42be9fd2 (diff) | |
download | rtmux-023d8d38ec7d59bbf635253f10e82e0b62ba59ca.tar.gz rtmux-023d8d38ec7d59bbf635253f10e82e0b62ba59ca.tar.bz2 rtmux-023d8d38ec7d59bbf635253f10e82e0b62ba59ca.zip |
Tidy up and improve target (-t) argument parsing:
- move the code back into cmd.c and merge with the existing functions where
possible;
- accept "-tttyp0" as well as "-t/dev/ttyp0" for clients;
- when looking up session names, try an exact match first, and if that fails
look for it as an fnmatch pattern and then as the start of a name - if more
that one session matches an error is given; so if there is one session called
"mysession", -tmysession, -tmysess, -tmysess* are equivalent but if there
is also "mysession2", the last two are errors;
- similarly for windows, if the argument is not a valid index or exact window
name match, try it against the window names as an fnmatch pattern and a
prefix.
Diffstat (limited to 'cmd-new-window.c')
-rw-r--r-- | cmd-new-window.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/cmd-new-window.c b/cmd-new-window.c index 30b84ac3..ee8cd8b7 100644 --- a/cmd-new-window.c +++ b/cmd-new-window.c @@ -126,18 +126,8 @@ cmd_new_window_exec(struct cmd *self, struct cmd_ctx *ctx) if (data == NULL) return (0); - if (arg_parse_window(data->target, &s, &idx) != 0) { - ctx->error(ctx, "bad window: %s", data->target); + if ((idx = cmd_find_index(ctx, data->target, &s)) == -2) return (-1); - } - if (s == NULL) - s = ctx->cursession; - if (s == NULL) - s = cmd_current_session(ctx); - if (s == NULL) { - ctx->error(ctx, "session not found: %s", data->target); - return (-1); - } wl = NULL; if (idx != -1) |