From 8eb1a7d5dc8d66ca7d17c72e4d8d0e58d6fd2824 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Wed, 16 Dec 2015 21:47:00 +0000
Subject: showenv and setenv need to be CANFAIL.

---
 cmd-show-environment.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/cmd-show-environment.c b/cmd-show-environment.c
index ad9e9e37..54baafe4 100644
--- a/cmd-show-environment.c
+++ b/cmd-show-environment.c
@@ -94,7 +94,7 @@ cmd_show_environment_exec(struct cmd *self, struct cmd_q *cmdq)
 	struct environ		*env;
 	struct environ_entry	*envent;
 
-	if (args_has(self->args, 'g'))
+	if (args_has(self->args, 'g') || cmdq->state.tflag.s == NULL)
 		env = global_environ;
 	else
 		env = cmdq->state.tflag.s->environ;
-- 
cgit