diff options
| author | Tiago Cunha <tcunha@gmx.com> | 2009-11-14 17:56:39 +0000 |
|---|---|---|
| committer | Tiago Cunha <tcunha@gmx.com> | 2009-11-14 17:56:39 +0000 |
| commit | e35f5b35bd9a6a85eb314bfb642998267b2d475d (patch) | |
| tree | be325ba507d553b2dbe6d0c8e17441041009071c /cmd-set-environment.c | |
| parent | fc6a835be86461c11fcadfc873cf00853b5a92b8 (diff) | |
| download | rtmux-e35f5b35bd9a6a85eb314bfb642998267b2d475d.tar.gz rtmux-e35f5b35bd9a6a85eb314bfb642998267b2d475d.tar.bz2 rtmux-e35f5b35bd9a6a85eb314bfb642998267b2d475d.zip | |
Sync OpenBSD patchset 539:
Get rid of the ugly CMD_CHFLAG macro and use a const string (eg "dDU") in the
command entry structs and a couple of functions to check/set the flags.
Diffstat (limited to 'cmd-set-environment.c')
| -rw-r--r-- | cmd-set-environment.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cmd-set-environment.c b/cmd-set-environment.c index a93e097d..89079778 100644 --- a/cmd-set-environment.c +++ b/cmd-set-environment.c @@ -1,4 +1,4 @@ -/* $Id: cmd-set-environment.c,v 1.2 2009-08-11 14:42:59 nicm Exp $ */ +/* $Id: cmd-set-environment.c,v 1.3 2009-11-14 17:56:39 tcunha Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net> @@ -32,7 +32,7 @@ int cmd_set_environment_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_set_environment_entry = { "set-environment", "setenv", "[-gru] " CMD_TARGET_SESSION_USAGE " name [value]", - CMD_ARG12, CMD_CHFLAG('g')|CMD_CHFLAG('r')|CMD_CHFLAG('u'), + CMD_ARG12, "gru", NULL, cmd_target_parse, cmd_set_environment_exec, @@ -56,7 +56,7 @@ cmd_set_environment_exec(struct cmd *self, struct cmd_ctx *ctx) return (-1); } - if (data->chflags & CMD_CHFLAG('g')) + if (cmd_check_flag(data->chflags, 'g')) env = &global_environ; else { if ((s = cmd_find_session(ctx, data->target)) == NULL) @@ -64,13 +64,13 @@ cmd_set_environment_exec(struct cmd *self, struct cmd_ctx *ctx) env = &s->environ; } - if (data->chflags & CMD_CHFLAG('u')) { + if (cmd_check_flag(data->chflags, 'u')) { if (data->arg2 != NULL) { ctx->error(ctx, "can't specify a value with -u"); return (-1); } environ_unset(env, data->arg); - } else if (data->chflags & CMD_CHFLAG('r')) { + } else if (cmd_check_flag(data->chflags, 'r')) { if (data->arg2 != NULL) { ctx->error(ctx, "can't specify a value with -r"); return (-1); |