From 4a4daf13031673870341c68b990e20c314140118 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Sun, 13 Dec 2015 14:32:38 +0000
Subject: Instead of every command resolving the target (-t or -s) itself,
 prepare the state (client, session, winlink, pane) for it it before entering
 the command. Each command provides some flags that tell the prepare step what
 it is expecting.

This is a requirement for having hooks on commands (for example, if you
hook "select-window -t1:2", the hook command should to operate on window
1:2 not whatever it thinks is the current window), and should allow some
other target improvements.

The old cmd_find_* functions remain for the moment but that layer will
be dropped later.

Joint work with Thomas Adam.
---
 cmd-set-environment.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'cmd-set-environment.c')

diff --git a/cmd-set-environment.c b/cmd-set-environment.c
index 2c0010af..4be967b7 100644
--- a/cmd-set-environment.c
+++ b/cmd-set-environment.c
@@ -33,7 +33,7 @@ const struct cmd_entry cmd_set_environment_entry = {
 	"set-environment", "setenv",
 	"grt:u", 1, 2,
 	"[-gru] " CMD_TARGET_SESSION_USAGE " name [value]",
-	0,
+	CMD_SESSION_T,
 	cmd_set_environment_exec
 };
 
@@ -41,7 +41,6 @@ enum cmd_retval
 cmd_set_environment_exec(struct cmd *self, struct cmd_q *cmdq)
 {
 	struct args	*args = self->args;
-	struct session	*s;
 	struct environ	*env;
 	const char	*name, *value;
 
@@ -62,11 +61,8 @@ cmd_set_environment_exec(struct cmd *self, struct cmd_q *cmdq)
 
 	if (args_has(self->args, 'g'))
 		env = global_environ;
-	else {
-		if ((s = cmd_find_session(cmdq, args_get(args, 't'), 0)) == NULL)
-			return (CMD_RETURN_ERROR);
-		env = s->environ;
-	}
+	else
+		env = cmdq->state.tflag.s->environ;
 
 	if (args_has(self->args, 'u')) {
 		if (value != NULL) {
-- 
cgit