diff options
| -rw-r--r-- | cmd-break-pane.c | 2 | ||||
| -rw-r--r-- | cmd-command-prompt.c | 2 | ||||
| -rw-r--r-- | cmd-confirm-before.c | 2 | ||||
| -rw-r--r-- | cmd-detach-client.c | 2 | ||||
| -rw-r--r-- | cmd-display-message.c | 4 | ||||
| -rw-r--r-- | cmd-display-panes.c | 2 | ||||
| -rw-r--r-- | cmd-lock-server.c | 2 | ||||
| -rw-r--r-- | cmd-new-window.c | 2 | ||||
| -rw-r--r-- | cmd-pipe-pane.c | 2 | ||||
| -rw-r--r-- | cmd-refresh-client.c | 2 | ||||
| -rw-r--r-- | cmd-show-messages.c | 2 | ||||
| -rw-r--r-- | cmd-split-window.c | 2 | ||||
| -rw-r--r-- | cmd-suspend-client.c | 2 | ||||
| -rw-r--r-- | cmd-switch-client.c | 2 | ||||
| -rw-r--r-- | cmd.c | 12 | ||||
| -rw-r--r-- | tmux.h | 2 |
16 files changed, 23 insertions, 21 deletions
diff --git a/cmd-break-pane.c b/cmd-break-pane.c index a4350fe6..c270ca07 100644 --- a/cmd-break-pane.c +++ b/cmd-break-pane.c @@ -97,7 +97,7 @@ cmd_break_pane_exec(struct cmd *self, struct cmd_ctx *ctx) template = BREAK_PANE_TEMPLATE; ft = format_create(); - if ((c = cmd_find_client(ctx, NULL)) != NULL) + if ((c = cmd_find_client(ctx, NULL, 1)) != NULL) format_client(ft, c); format_session(ft, s); format_winlink(ft, s, wl); diff --git a/cmd-command-prompt.c b/cmd-command-prompt.c index e1db3dd4..97284898 100644 --- a/cmd-command-prompt.c +++ b/cmd-command-prompt.c @@ -94,7 +94,7 @@ cmd_command_prompt_exec(struct cmd *self, struct cmd_ctx *ctx) char *prompt, *ptr, *input = NULL; size_t n; - if ((c = cmd_find_client(ctx, args_get(args, 't'))) == NULL) + if ((c = cmd_find_client(ctx, args_get(args, 't'), 0)) == NULL) return (CMD_RETURN_ERROR); if (c->prompt_string != NULL) diff --git a/cmd-confirm-before.c b/cmd-confirm-before.c index 0b41592b..30db5bd2 100644 --- a/cmd-confirm-before.c +++ b/cmd-confirm-before.c @@ -79,7 +79,7 @@ cmd_confirm_before_exec(struct cmd *self, struct cmd_ctx *ctx) return (CMD_RETURN_ERROR); } - if ((c = cmd_find_client(ctx, args_get(args, 't'))) == NULL) + if ((c = cmd_find_client(ctx, args_get(args, 't'), 0)) == NULL) return (CMD_RETURN_ERROR); if ((prompt = args_get(args, 'p')) != NULL) diff --git a/cmd-detach-client.c b/cmd-detach-client.c index f75b37a3..4b447e1a 100644 --- a/cmd-detach-client.c +++ b/cmd-detach-client.c @@ -61,7 +61,7 @@ cmd_detach_client_exec(struct cmd *self, struct cmd_ctx *ctx) server_write_client(c, msgtype, NULL, 0); } } else { - c = cmd_find_client(ctx, args_get(args, 't')); + c = cmd_find_client(ctx, args_get(args, 't'), 0); if (c == NULL) return (CMD_RETURN_ERROR); diff --git a/cmd-display-message.c b/cmd-display-message.c index 8bcd43f9..f0cd66c0 100644 --- a/cmd-display-message.c +++ b/cmd-display-message.c @@ -55,8 +55,6 @@ cmd_display_message_exec(struct cmd *self, struct cmd_ctx *ctx) time_t t; size_t len; - c = cmd_find_client(ctx, args_get(args, 'c')); - if (args_has(args, 't')) { wl = cmd_find_pane(ctx, args_get(args, 't'), &s, &wp); if (wl == NULL) @@ -79,7 +77,7 @@ cmd_display_message_exec(struct cmd *self, struct cmd_ctx *ctx) template = DISPLAY_MESSAGE_TEMPLATE; ft = format_create(); - if (c != NULL) + if ((c = cmd_find_client(ctx, args_get(args, 'c'), 1)) != NULL) format_client(ft, c); format_session(ft, s); format_winlink(ft, s, wl); diff --git a/cmd-display-panes.c b/cmd-display-panes.c index 2745ac59..dd4a333e 100644 --- a/cmd-display-panes.c +++ b/cmd-display-panes.c @@ -42,7 +42,7 @@ cmd_display_panes_exec(struct cmd *self, struct cmd_ctx *ctx) struct args *args = self->args; struct client *c; - if ((c = cmd_find_client(ctx, args_get(args, 't'))) == NULL) + if ((c = cmd_find_client(ctx, args_get(args, 't'), 0)) == NULL) return (CMD_RETURN_ERROR); server_set_identify(c); diff --git a/cmd-lock-server.c b/cmd-lock-server.c index db0b7dc4..4eb0b700 100644 --- a/cmd-lock-server.c +++ b/cmd-lock-server.c @@ -74,7 +74,7 @@ cmd_lock_server_exec(struct cmd *self, unused struct cmd_ctx *ctx) return (CMD_RETURN_ERROR); server_lock_session(s); } else { - if ((c = cmd_find_client(ctx, args_get(args, 't'))) == NULL) + if ((c = cmd_find_client(ctx, args_get(args, 't'), 0)) == NULL) return (CMD_RETURN_ERROR); server_lock_client(c); } diff --git a/cmd-new-window.c b/cmd-new-window.c index d8c576af..e50b234a 100644 --- a/cmd-new-window.c +++ b/cmd-new-window.c @@ -126,7 +126,7 @@ cmd_new_window_exec(struct cmd *self, struct cmd_ctx *ctx) template = NEW_WINDOW_TEMPLATE; ft = format_create(); - if ((c = cmd_find_client(ctx, NULL)) != NULL) + if ((c = cmd_find_client(ctx, NULL, 1)) != NULL) format_client(ft, c); format_session(ft, s); format_winlink(ft, s, wl); diff --git a/cmd-pipe-pane.c b/cmd-pipe-pane.c index 8f53b6ee..3c6211d9 100644 --- a/cmd-pipe-pane.c +++ b/cmd-pipe-pane.c @@ -56,7 +56,7 @@ cmd_pipe_pane_exec(struct cmd *self, struct cmd_ctx *ctx) if (cmd_find_pane(ctx, args_get(args, 't'), NULL, &wp) == NULL) return (CMD_RETURN_ERROR); - c = cmd_find_client(ctx, NULL); + c = cmd_find_client(ctx, NULL, 1); /* Destroy the old pipe. */ old_fd = wp->pipe_fd; diff --git a/cmd-refresh-client.c b/cmd-refresh-client.c index 849154d9..7bec5205 100644 --- a/cmd-refresh-client.c +++ b/cmd-refresh-client.c @@ -44,7 +44,7 @@ cmd_refresh_client_exec(struct cmd *self, struct cmd_ctx *ctx) const char *size; u_int w, h; - if ((c = cmd_find_client(ctx, args_get(args, 't'))) == NULL) + if ((c = cmd_find_client(ctx, args_get(args, 't'), 0)) == NULL) return (CMD_RETURN_ERROR); if (args_has(args, 'C')) { diff --git a/cmd-show-messages.c b/cmd-show-messages.c index d8c18519..728e170d 100644 --- a/cmd-show-messages.c +++ b/cmd-show-messages.c @@ -48,7 +48,7 @@ cmd_show_messages_exec(struct cmd *self, struct cmd_ctx *ctx) char *tim; u_int i; - if ((c = cmd_find_client(ctx, args_get(args, 't'))) == NULL) + if ((c = cmd_find_client(ctx, args_get(args, 't'), 0)) == NULL) return (CMD_RETURN_ERROR); for (i = 0; i < ARRAY_LENGTH(&c->message_log); i++) { diff --git a/cmd-split-window.c b/cmd-split-window.c index 859d5fd1..54d5bcde 100644 --- a/cmd-split-window.c +++ b/cmd-split-window.c @@ -151,7 +151,7 @@ cmd_split_window_exec(struct cmd *self, struct cmd_ctx *ctx) template = SPLIT_WINDOW_TEMPLATE; ft = format_create(); - if ((c = cmd_find_client(ctx, NULL)) != NULL) + if ((c = cmd_find_client(ctx, NULL, 1)) != NULL) format_client(ft, c); format_session(ft, s); format_winlink(ft, s, wl); diff --git a/cmd-suspend-client.c b/cmd-suspend-client.c index 95278f98..68affac4 100644 --- a/cmd-suspend-client.c +++ b/cmd-suspend-client.c @@ -45,7 +45,7 @@ cmd_suspend_client_exec(struct cmd *self, struct cmd_ctx *ctx) struct args *args = self->args; struct client *c; - if ((c = cmd_find_client(ctx, args_get(args, 't'))) == NULL) + if ((c = cmd_find_client(ctx, args_get(args, 't'), 0)) == NULL) return (CMD_RETURN_ERROR); tty_stop_tty(&c->tty); diff --git a/cmd-switch-client.c b/cmd-switch-client.c index 1ca0c41d..29a3d788 100644 --- a/cmd-switch-client.c +++ b/cmd-switch-client.c @@ -64,7 +64,7 @@ cmd_switch_client_exec(struct cmd *self, struct cmd_ctx *ctx) struct client *c; struct session *s; - if ((c = cmd_find_client(ctx, args_get(args, 'c'))) == NULL) + if ((c = cmd_find_client(ctx, args_get(args, 'c'), 0)) == NULL) return (CMD_RETURN_ERROR); if (args_has(args, 'r')) { @@ -516,15 +516,19 @@ cmd_choose_client(struct clients *cc) /* Find the target client or report an error and return NULL. */ struct client * -cmd_find_client(struct cmd_ctx *ctx, const char *arg) +cmd_find_client(struct cmd_ctx *ctx, const char *arg, int quiet) { struct client *c; char *tmparg; size_t arglen; /* A NULL argument means the current client. */ - if (arg == NULL) - return (cmd_current_client(ctx)); + if (arg == NULL) { + c = cmd_current_client(ctx); + if (c == NULL && !quiet) + ctx->error(ctx, "no clients"); + return (c); + } tmparg = xstrdup(arg); /* Trim a single trailing colon if any. */ @@ -536,7 +540,7 @@ cmd_find_client(struct cmd_ctx *ctx, const char *arg) c = cmd_lookup_client(tmparg); /* If no client found, report an error. */ - if (c == NULL) + if (c == NULL && !quiet) ctx->error(ctx, "client not found: %s", tmparg); free(tmparg); @@ -1728,7 +1728,7 @@ struct cmd *cmd_parse(int, char **, char **); size_t cmd_print(struct cmd *, char *, size_t); struct session *cmd_current_session(struct cmd_ctx *, int); struct client *cmd_current_client(struct cmd_ctx *); -struct client *cmd_find_client(struct cmd_ctx *, const char *); +struct client *cmd_find_client(struct cmd_ctx *, const char *, int); struct session *cmd_find_session(struct cmd_ctx *, const char *, int); struct winlink *cmd_find_window( struct cmd_ctx *, const char *, struct session **); |