Merge branch 'obsd-master'

1 files changed, 46 insertions, 91 deletions

diff --git a/cmd.c b/cmd.c
index 6aaddcf0..39834c5a 100644
--- a/cmd.c
+++ b/cmd.c
@@ -206,9 +206,8 @@ const struct cmd_entry *cmd_table[] = {
 	NULL
 };
 
-static void		 cmd_clear_state(struct cmd_state *);
-static struct client	*cmd_get_state_client(struct cmd_q *, int);
-static int		 cmd_set_state_flag(struct cmd *, struct cmd_q *, char);
+static void	cmd_clear_state(struct cmd_state *);
+static int	cmd_set_state_flag(struct cmd *, struct cmd_q *, char);
 
 int
 cmd_pack_argv(int argc, char **argv, char *buf, size_t len)
@@ -407,29 +406,11 @@ cmd_clear_state(struct cmd_state *state)
 	state->sflag.idx = -1;
 }
 
-static struct client *
-cmd_get_state_client(struct cmd_q *cmdq, int quiet)
-{
-	struct cmd	*cmd = cmdq->cmd;
-	struct args	*args = cmd->args;
-
-	switch (cmd->entry->flags & (CMD_CLIENT_C|CMD_CLIENT_T)) {
-	case 0:
-		return (cmd_find_client(cmdq, NULL, 1));
-	case CMD_CLIENT_C:
-		return (cmd_find_client(cmdq, args_get(args, 'c'), quiet));
-	case CMD_CLIENT_T:
-		return (cmd_find_client(cmdq, args_get(args, 't'), quiet));
-	default:
-		fatalx("both -t and -c for %s", cmd->entry->name);
-	}
-}
-
 static int
 cmd_set_state_flag(struct cmd *cmd, struct cmd_q *cmdq, char c)
 {
 	struct cmd_state	*state = &cmdq->state;
-	struct cmd_state_flag	*statef = NULL;
+	struct cmd_find_state	*fsf = NULL;
 	const char		*flag;
 	int			 flags = cmd->entry->flags, everything = 0;
 	int			 allflags = 0, targetflags, error;
@@ -437,14 +418,13 @@ cmd_set_state_flag(struct cmd *cmd, struct cmd_q *cmdq, char c)
 	struct window		*w;
 	struct winlink		*wl;
 	struct window_pane	*wp;
-	struct cmd_find_state	 fs;
 
 	/* Set up state for either -t or -s. */
 	if (c == 't') {
-		statef = &cmdq->state.tflag;
+		fsf = &cmdq->state.tflag;
 		allflags = CMD_ALL_T;
 	} else if (c == 's') {
-		statef = &cmdq->state.sflag;
+		fsf = &cmdq->state.sflag;
 		allflags = CMD_ALL_S;
 	}
 
@@ -479,25 +459,21 @@ cmd_set_state_flag(struct cmd *cmd, struct cmd_q *cmdq, char c)
 	case CMD_SESSION_T|CMD_PANE_T:
 	case CMD_SESSION_S|CMD_PANE_S:
 		if (flag != NULL && flag[strcspn(flag, ":.")] != '\0') {
-			error = cmd_find_target(&fs, cmdq, flag, CMD_FIND_PANE,
+			error = cmd_find_target(fsf, cmdq, flag, CMD_FIND_PANE,
 			    targetflags);
 			if (error != 0)
 				return (-1);
-			statef->s = fs.s;
-			statef->wl = fs.wl;
-			statef->wp = fs.wp;
 		} else {
-			error = cmd_find_target(&fs, cmdq, flag,
+			error = cmd_find_target(fsf, cmdq, flag,
 			    CMD_FIND_SESSION, targetflags);
 			if (error != 0)
 				return (-1);
-			statef->s = fs.s;
 
 			if (flag == NULL) {
-				statef->wl = statef->s->curw;
-				statef->wp = statef->s->curw->window->active;
+				fsf->wl = fsf->s->curw;
+				fsf->wp = fsf->s->curw->window->active;
 			} else {
-				s = statef->s;
+				s = fsf->s;
 				if ((w = window_find_by_id_str(flag)) != NULL)
 					wp = w->active;
 				else {
@@ -507,34 +483,29 @@ cmd_set_state_flag(struct cmd *cmd, struct cmd_q *cmdq, char c)
 				}
 				wl = winlink_find_by_window(&s->windows, w);
 				if (wl != NULL) {
-					statef->wl = wl;
-					statef->wp = wp;
+					fsf->wl = wl;
+					fsf->wp = wp;
 				}
 			}
 		}
 		break;
 	case CMD_MOVEW_R|CMD_INDEX_T:
 	case CMD_MOVEW_R|CMD_INDEX_S:
-		error = cmd_find_target(&fs, cmdq, flag, CMD_FIND_SESSION,
-		    targetflags);
-		if (error == 0)
-			statef->s = fs.s;
-		else {
-			error = cmd_find_target(&fs, cmdq, flag,
+		error = cmd_find_target(fsf, cmdq, flag, CMD_FIND_SESSION,
+		    targetflags|CMD_FIND_QUIET);
+		if (error != 0) {
+			error = cmd_find_target(fsf, cmdq, flag,
 			    CMD_FIND_WINDOW, CMD_FIND_WINDOW_INDEX);
 			if (error != 0)
 				return (-1);
-			statef->s = fs.s;
-			statef->idx = fs.idx;
 		}
 		break;
 	case CMD_SESSION_T:
 	case CMD_SESSION_S:
-		error = cmd_find_target(&fs, cmdq, flag, CMD_FIND_SESSION,
+		error = cmd_find_target(fsf, cmdq, flag, CMD_FIND_SESSION,
 		    targetflags);
 		if (error != 0)
 			return (-1);
-		statef->s = fs.s;
 		break;
 	case CMD_WINDOW_MARKED_T:
 	case CMD_WINDOW_MARKED_S:
@@ -542,12 +513,10 @@ cmd_set_state_flag(struct cmd *cmd, struct cmd_q *cmdq, char c)
 		/* FALLTHROUGH */
 	case CMD_WINDOW_T:
 	case CMD_WINDOW_S:
-		error = cmd_find_target(&fs, cmdq, flag, CMD_FIND_WINDOW,
+		error = cmd_find_target(fsf, cmdq, flag, CMD_FIND_WINDOW,
 		    targetflags);
 		if (error != 0)
 			return (-1);
-		statef->s = fs.s;
-		statef->wl = fs.wl;
 		break;
 	case CMD_PANE_MARKED_T:
 	case CMD_PANE_MARKED_S:
@@ -555,22 +524,17 @@ cmd_set_state_flag(struct cmd *cmd, struct cmd_q *cmdq, char c)
 		/* FALLTHROUGH */
 	case CMD_PANE_T:
 	case CMD_PANE_S:
-		error = cmd_find_target(&fs, cmdq, flag, CMD_FIND_PANE,
+		error = cmd_find_target(fsf, cmdq, flag, CMD_FIND_PANE,
 		    targetflags);
 		if (error != 0)
 			return (-1);
-		statef->s = fs.s;
-		statef->wl = fs.wl;
-		statef->wp = fs.wp;
 		break;
 	case CMD_INDEX_T:
 	case CMD_INDEX_S:
-		error = cmd_find_target(&fs, cmdq, flag, CMD_FIND_WINDOW,
+		error = cmd_find_target(fsf, cmdq, flag, CMD_FIND_WINDOW,
 		    CMD_FIND_WINDOW_INDEX);
 		if (error != 0)
 			return (-1);
-		statef->s = fs.s;
-		statef->idx = fs.idx;
 		break;
 	default:
 		fatalx("too many -%c for %s", c, cmd->entry->name);
@@ -585,36 +549,31 @@ cmd_set_state_flag(struct cmd *cmd, struct cmd_q *cmdq, char c)
 		return (0);
 
 complete_everything:
-	if (statef->s == NULL) {
+	if (fsf->s == NULL) {
 		if (state->c != NULL)
-			statef->s = state->c->session;
-		if (statef->s == NULL) {
-			error = cmd_find_target(&fs, cmdq, NULL,
+			fsf->s = state->c->session;
+		if (fsf->s == NULL) {
+			error = cmd_find_target(fsf, cmdq, NULL,
 			    CMD_FIND_SESSION, CMD_FIND_QUIET);
-			if (error == 0)
-				statef->s = fs.s;
+			if (error != 0)
+				fsf->s = NULL;
 		}
-		if (statef->s == NULL) {
+		if (fsf->s == NULL) {
 			if (flags & CMD_CANFAIL)
 				return (0);
 			cmdq_error(cmdq, "no current session");
 			return (-1);
 		}
 	}
-	if (statef->wl == NULL) {
-		error = cmd_find_target(&fs, cmdq, flag, CMD_FIND_WINDOW, 0);
-		if (error != 0) {
-			statef->s = fs.s;
-			statef->wl = fs.wl;
-		}
+	if (fsf->wl == NULL) {
+		error = cmd_find_target(fsf, cmdq, flag, CMD_FIND_WINDOW, 0);
+		if (error != 0)
+			return (-1);
 	}
-	if (statef->wp == NULL) {
-		error = cmd_find_target(&fs, cmdq, flag, CMD_FIND_PANE, 0);
-		if (error != 0) {
-			statef->s = fs.s;
-			statef->wl = fs.wl;
-			statef->wp = fs.wp;
-		}
+	if (fsf->wp == NULL) {
+		error = cmd_find_target(fsf, cmdq, flag, CMD_FIND_PANE, 0);
+		if (error != 0)
+			return (-1);
 	}
 	return (0);
 }
@@ -624,9 +583,8 @@ cmd_prepare_state(struct cmd *cmd, struct cmd_q *cmdq)
 {
 	struct cmd_state	*state = &cmdq->state;
 	struct args		*args = cmd->args;
-	const char		*cflag, *tflag;
 	char			*tmp;
-	int			 error;
+	int			 error, quiet;
 
 	tmp = cmd_print(cmd);
 	log_debug("preparing state for: %s (client %p)", tmp, cmdq->client);
@@ -635,6 +593,11 @@ cmd_prepare_state(struct cmd *cmd, struct cmd_q *cmdq)
 	/* Start with an empty state. */
 	cmd_clear_state(state);
 
+	/* No error messages if can fail. */
+	quiet = 0;
+	if (cmd->entry->flags & CMD_CLIENT_CANFAIL)
+		quiet = 1;
+
 	/*
 	 * If the command wants a client and provides -c or -t, use it. If not,
 	 * try the base command instead via cmd_get_state_client. No client is
@@ -642,24 +605,16 @@ cmd_prepare_state(struct cmd *cmd, struct cmd_q *cmdq)
 	 */
 	switch (cmd->entry->flags & (CMD_CLIENT_C|CMD_CLIENT_T)) {
 	case 0:
-		state->c = cmd_get_state_client(cmdq, 1);
+		state->c = cmd_find_client(cmdq, NULL, 1);
 		break;
 	case CMD_CLIENT_C:
-		cflag = args_get(args, 'c');
-		if (cflag == NULL)
-			state->c = cmd_get_state_client(cmdq, 0);
-		else
-			state->c = cmd_find_client(cmdq, cflag, 0);
-		if (state->c == NULL)
+		state->c = cmd_find_client(cmdq, args_get(args, 'c'), quiet);
+		if (!quiet && state->c == NULL)
 			return (-1);
 		break;
 	case CMD_CLIENT_T:
-		tflag = args_get(args, 't');
-		if (tflag == NULL)
-			state->c = cmd_get_state_client(cmdq, 0);
-		else
-			state->c = cmd_find_client(cmdq, tflag, 0);
-		if (state->c == NULL)
+		state->c = cmd_find_client(cmdq, args_get(args, 't'), quiet);
+		if (!quiet && state->c == NULL)
 			return (-1);
 		break;
 	default: