diff options
| author | Thomas Adam <thomas@xteddy.org> | 2020-09-01 12:01:20 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2020-09-01 12:01:20 +0100 |
| commit | a0fee328bf7d2cefe047f3911e7e29955f14a75a (patch) | |
| tree | fe18cdabbcd74bffaeadbc46dbf00e390659161b /cmd-set-environment.c | |
| parent | b895ffbf37ef79c9fd8a3330dd60852626d4dd6b (diff) | |
| parent | 60860aced8d424ef6c1d527b63842a0ea0f452ad (diff) | |
| download | rtmux-a0fee328bf7d2cefe047f3911e7e29955f14a75a.tar.gz rtmux-a0fee328bf7d2cefe047f3911e7e29955f14a75a.tar.bz2 rtmux-a0fee328bf7d2cefe047f3911e7e29955f14a75a.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-set-environment.c')
| -rw-r--r-- | cmd-set-environment.c | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/cmd-set-environment.c b/cmd-set-environment.c index 3c43b635..f142df53 100644 --- a/cmd-set-environment.c +++ b/cmd-set-environment.c @@ -34,8 +34,8 @@ const struct cmd_entry cmd_set_environment_entry = { .name = "set-environment", .alias = "setenv", - .args = { "hgrt:u", 1, 2 }, - .usage = "[-hgru] " CMD_TARGET_SESSION_USAGE " name [value]", + .args = { "Fhgrt:u", 1, 2 }, + .usage = "[-Fhgru] " CMD_TARGET_SESSION_USAGE " name [value]", .target = { 't', CMD_FIND_SESSION, CMD_FIND_CANFAIL }, @@ -50,6 +50,8 @@ cmd_set_environment_exec(struct cmd *self, struct cmdq_item *item) struct cmd_find_state *target = cmdq_get_target(item); struct environ *env; const char *name, *value, *tflag; + char *expand = NULL; + enum cmd_retval retval = CMD_RETURN_NORMAL; name = args->argv[0]; if (*name == '\0') { @@ -63,6 +65,8 @@ cmd_set_environment_exec(struct cmd *self, struct cmdq_item *item) if (args->argc < 2) value = NULL; + else if (args_has(args, 'F')) + value = expand = format_single_from_target(item, args->argv[1]); else value = args->argv[1]; @@ -75,7 +79,8 @@ cmd_set_environment_exec(struct cmd *self, struct cmdq_item *item) cmdq_error(item, "no such session: %s", tflag); else cmdq_error(item, "no current session"); - return (CMD_RETURN_ERROR); + retval = CMD_RETURN_ERROR; + goto out; } env = target->s->environ; } @@ -83,25 +88,31 @@ cmd_set_environment_exec(struct cmd *self, struct cmdq_item *item) if (args_has(args, 'u')) { if (value != NULL) { cmdq_error(item, "can't specify a value with -u"); - return (CMD_RETURN_ERROR); + retval = CMD_RETURN_ERROR; + goto out; } environ_unset(env, name); } else if (args_has(args, 'r')) { if (value != NULL) { cmdq_error(item, "can't specify a value with -r"); - return (CMD_RETURN_ERROR); + retval = CMD_RETURN_ERROR; + goto out; } environ_clear(env, name); } else { if (value == NULL) { cmdq_error(item, "no value specified"); - return (CMD_RETURN_ERROR); + retval = CMD_RETURN_ERROR; + goto out; } + if (args_has(args, 'h')) environ_set(env, name, ENVIRON_HIDDEN, "%s", value); else environ_set(env, name, 0, "%s", value); } - return (CMD_RETURN_NORMAL); +out: + free(expand); + return (retval); } |