aboutsummaryrefslogtreecommitdiff
path: root/cmd-set-environment.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2015-10-28 12:01:11 +0000
committerThomas Adam <thomas@xteddy.org>2015-10-28 12:01:11 +0000
commita5e4d3a2d8c2fb288488ee5922a561a4a9e6803a (patch)
treeebfcd8a38514651c4657dac40601a5aafa360b89 /cmd-set-environment.c
parentda1f6fc2c8477c99e986061bcdd7c3e854a60076 (diff)
parentbf9c933caed5c74be3c9c4da02d7c57a9dcf091d (diff)
downloadrtmux-a5e4d3a2d8c2fb288488ee5922a561a4a9e6803a.tar.gz
rtmux-a5e4d3a2d8c2fb288488ee5922a561a4a9e6803a.tar.bz2
rtmux-a5e4d3a2d8c2fb288488ee5922a561a4a9e6803a.zip
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-set-environment.c')
-rw-r--r--cmd-set-environment.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd-set-environment.c b/cmd-set-environment.c
index 83e63b48..864e1d9b 100644
--- a/cmd-set-environment.c
+++ b/cmd-set-environment.c
@@ -61,11 +61,11 @@ cmd_set_environment_exec(struct cmd *self, struct cmd_q *cmdq)
value = args->argv[1];
if (args_has(self->args, 'g'))
- env = &global_environ;
+ env = global_environ;
else {
if ((s = cmd_find_session(cmdq, args_get(args, 't'), 0)) == NULL)
return (CMD_RETURN_ERROR);
- env = &s->environ;
+ env = s->environ;
}
if (args_has(self->args, 'u')) {