From df0983af39922f2ee747a244c1c718ba7ca28910 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Thu, 3 Mar 2016 14:15:22 +0000
Subject: show-* and set-* need to handle a missing target.

---
 cmd-show-environment.c | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

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

diff --git a/cmd-show-environment.c b/cmd-show-environment.c
index 83661c44..29e89274 100644
--- a/cmd-show-environment.c
+++ b/cmd-show-environment.c
@@ -93,11 +93,28 @@ cmd_show_environment_exec(struct cmd *self, struct cmd_q *cmdq)
 	struct args		*args = self->args;
 	struct environ		*env;
 	struct environ_entry	*envent;
+	const char		*target;
 
-	if (args_has(self->args, 'g') || cmdq->state.tflag.s == NULL)
+	if ((target = args_get(args, 't')) != NULL) {
+		if (cmdq->state.tflag.s == NULL) {
+			cmdq_error(cmdq, "no such session: %s", target);
+			return (CMD_RETURN_ERROR);
+		}
+	}
+
+	if (args_has(self->args, 'g'))
 		env = global_environ;
-	else
+	else {
+		if (cmdq->state.tflag.s == NULL) {
+			target = args_get(args, 't');
+			if (target != NULL)
+				cmdq_error(cmdq, "no such session: %s", target);
+			else
+				cmdq_error(cmdq, "no current session");
+			return (CMD_RETURN_ERROR);
+		}
 		env = cmdq->state.tflag.s->environ;
+	}
 
 	if (args->argc != 0) {
 		envent = environ_find(env, args->argv[0]);
-- 
cgit