diff options
| author | Thomas Adam <thomas@xteddy.org> | 2015-11-25 16:37:30 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2015-11-25 16:37:30 +0000 |
| commit | 890d8da2e3588d416ef178e2e74ed3df226a6040 (patch) | |
| tree | 3d024b90830e8afe48f75f0cb741965a5bb76015 /cmd-set-environment.c | |
| parent | 0a2ef2b932f37d54157d82e526a8097caf9143ba (diff) | |
| parent | ac8678aefe157d7e40c5bcedd12333eaedf0df92 (diff) | |
| download | rtmux-890d8da2e3588d416ef178e2e74ed3df226a6040.tar.gz rtmux-890d8da2e3588d416ef178e2e74ed3df226a6040.tar.bz2 rtmux-890d8da2e3588d416ef178e2e74ed3df226a6040.zip | |
Merge branch 'obsd-master'
Conflicts:
log.c
proc.c
tmux.c
Diffstat (limited to 'cmd-set-environment.c')
| -rw-r--r-- | cmd-set-environment.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd-set-environment.c b/cmd-set-environment.c index 864e1d9b..2c0010af 100644 --- a/cmd-set-environment.c +++ b/cmd-set-environment.c @@ -79,13 +79,13 @@ cmd_set_environment_exec(struct cmd *self, struct cmd_q *cmdq) cmdq_error(cmdq, "can't specify a value with -r"); return (CMD_RETURN_ERROR); } - environ_set(env, name, NULL); + environ_clear(env, name); } else { if (value == NULL) { cmdq_error(cmdq, "no value specified"); return (CMD_RETURN_ERROR); } - environ_set(env, name, value); + environ_set(env, name, "%s", value); } return (CMD_RETURN_NORMAL); |