From dda70d4ef1ce155906c123c6880352c4979e4b57 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Mon, 27 Jan 2014 23:57:35 +0000
Subject: Merge start-server into kill-server.

---
 cmd-kill-server.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'cmd-kill-server.c')

diff --git a/cmd-kill-server.c b/cmd-kill-server.c
index ef4a3946..6f0b7494 100644
--- a/cmd-kill-server.c
+++ b/cmd-kill-server.c
@@ -38,10 +38,20 @@ const struct cmd_entry cmd_kill_server_entry = {
 	cmd_kill_server_exec
 };
 
+const struct cmd_entry cmd_start_server_entry = {
+	"start-server", "start",
+	"", 0, 0,
+	"",
+	CMD_STARTSERVER,
+	NULL,
+	cmd_kill_server_exec
+};
+
 enum cmd_retval
-cmd_kill_server_exec(unused struct cmd *self, unused struct cmd_q *cmdq)
+cmd_kill_server_exec(struct cmd *self, unused struct cmd_q *cmdq)
 {
-	kill(getpid(), SIGTERM);
+	if (self->entry == &cmd_kill_server_entry)
+		kill(getpid(), SIGTERM);
 
 	return (CMD_RETURN_NORMAL);
 }
-- 
cgit