Make environ_set va_args and use it to tidy up some calls. Also add a

missing word in manpage (from jmc).

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);