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-attach-session.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-attach-session.c')
| -rw-r--r-- | cmd-attach-session.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cmd-attach-session.c b/cmd-attach-session.c index dc5f6abf..13d0ff54 100644 --- a/cmd-attach-session.c +++ b/cmd-attach-session.c @@ -1,4 +1,4 @@ -/* $Id: cmd-attach-session.c,v 1.33 2009-11-13 16:51:49 tcunha Exp $ */ +/* $Id: cmd-attach-session.c,v 1.34 2009-11-14 17:56:39 tcunha Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -29,7 +29,7 @@ int cmd_attach_session_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_attach_session_entry = { "attach-session", "attach", "[-d] " CMD_TARGET_SESSION_USAGE, - CMD_CANTNEST|CMD_STARTSERVER|CMD_SENDENVIRON, CMD_CHFLAG('d'), + CMD_CANTNEST|CMD_STARTSERVER|CMD_SENDENVIRON, "d", cmd_target_init, cmd_target_parse, cmd_attach_session_exec, @@ -58,7 +58,7 @@ cmd_attach_session_exec(struct cmd *self, struct cmd_ctx *ctx) return (0); if (ctx->cmdclient == NULL) { - if (data->chflags & CMD_CHFLAG('d')) { + if (cmd_check_flag(data->chflags, 'd')) { /* * Can't use server_write_session in case attaching to * the same session as currently attached to. @@ -89,7 +89,7 @@ cmd_attach_session_exec(struct cmd *self, struct cmd_ctx *ctx) return (-1); } - if (data->chflags & CMD_CHFLAG('d')) + if (cmd_check_flag(data->chflags, 'd')) server_write_session(s, MSG_DETACH, NULL, 0); ctx->cmdclient->session = s; |