Move suspend-client code into detach-client.

3 files changed, 19 insertions, 57 deletions

diff --git a/usr.bin/tmux/Makefile b/usr.bin/tmux/Makefile
index bf860e1d9fa..f7ce3b383b4 100644
--- a/usr.bin/tmux/Makefile
+++ b/usr.bin/tmux/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.73 2014/10/20 22:57:46 nicm Exp $
+# $OpenBSD: Makefile,v 1.74 2014/10/20 23:01:51 nicm Exp $
 
 PROG=	tmux
 SRCS=	arguments.c \
@@ -65,7 +65,6 @@ SRCS=	arguments.c \
 	cmd-source-file.c \
 	cmd-split-window.c \
 	cmd-string.c \
-	cmd-suspend-client.c \
 	cmd-swap-pane.c \
 	cmd-swap-window.c \
 	cmd-switch-client.c \
diff --git a/usr.bin/tmux/cmd-detach-client.c b/usr.bin/tmux/cmd-detach-client.c
index 1009bd03860..0b5d7be0b7d 100644
--- a/usr.bin/tmux/cmd-detach-client.c
+++ b/usr.bin/tmux/cmd-detach-client.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-detach-client.c,v 1.17 2014/10/20 22:29:25 nicm Exp $ */
+/* $OpenBSD: cmd-detach-client.c,v 1.18 2014/10/20 23:01:51 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -36,6 +36,14 @@ const struct cmd_entry cmd_detach_client_entry = {
 	cmd_detach_client_exec
 };
 
+const struct cmd_entry cmd_suspend_client_entry = {
+	"suspend-client", "suspendc",
+	"t:", 0, 0,
+	CMD_TARGET_CLIENT_USAGE,
+	0,
+	cmd_detach_client_exec
+};
+
 enum cmd_retval
 cmd_detach_client_exec(struct cmd *self, struct cmd_q *cmdq)
 {
@@ -45,6 +53,15 @@ cmd_detach_client_exec(struct cmd *self, struct cmd_q *cmdq)
 	enum msgtype	 msgtype;
 	u_int 		 i;
 
+	if (self->entry == &cmd_suspend_client_entry) {
+		if ((c = cmd_find_client(cmdq, args_get(args, 't'), 0)) == NULL)
+			return (CMD_RETURN_ERROR);
+		tty_stop_tty(&c->tty);
+		c->flags |= CLIENT_SUSPENDED;
+		server_write_client(c, MSG_SUSPEND, NULL, 0);
+		return (CMD_RETURN_NORMAL);
+	}
+
 	if (args_has(args, 'P'))
 		msgtype = MSG_DETACHKILL;
 	else
diff --git a/usr.bin/tmux/cmd-suspend-client.c b/usr.bin/tmux/cmd-suspend-client.c
deleted file mode 100644
index c9d76434e79..00000000000
--- a/usr.bin/tmux/cmd-suspend-client.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/* $OpenBSD: cmd-suspend-client.c,v 1.11 2014/10/20 22:29:25 nicm Exp $ */
-
-/*
- * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER
- * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <sys/types.h>
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "tmux.h"
-
-/*
- * Suspend client with SIGTSTP.
- */
-
-enum cmd_retval	 cmd_suspend_client_exec(struct cmd *, struct cmd_q *);
-
-const struct cmd_entry cmd_suspend_client_entry = {
-	"suspend-client", "suspendc",
-	"t:", 0, 0,
-	CMD_TARGET_CLIENT_USAGE,
-	0,
-	cmd_suspend_client_exec
-};
-
-enum cmd_retval
-cmd_suspend_client_exec(struct cmd *self, struct cmd_q *cmdq)
-{
-	struct args	*args = self->args;
-	struct client	*c;
-
-	if ((c = cmd_find_client(cmdq, args_get(args, 't'), 0)) == NULL)
-		return (CMD_RETURN_ERROR);
-
-	tty_stop_tty(&c->tty);
-	c->flags |= CLIENT_SUSPENDED;
-	server_write_client(c, MSG_SUSPEND, NULL, 0);
-
-	return (CMD_RETURN_NORMAL);
-}