diff options
| author | Thomas Adam <thomas@xteddy.org> | 2014-01-31 21:39:56 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2014-01-31 21:39:56 +0000 |
| commit | d50e47fc4ab5cbbdbe6bbebdc2c36ce3aae6e987 (patch) | |
| tree | 397f4999444c2eef367f884b815bec2a14697c3c /cmd-kill-server.c | |
| parent | cbf9224c5f7bcf07352f6ea128c90c12cb0af22e (diff) | |
| parent | 9f02feb9d089b1a4639afb52ab0e8212eeb55a7c (diff) | |
| download | rtmux-d50e47fc4ab5cbbdbe6bbebdc2c36ce3aae6e987.tar.gz rtmux-d50e47fc4ab5cbbdbe6bbebdc2c36ce3aae6e987.tar.bz2 rtmux-d50e47fc4ab5cbbdbe6bbebdc2c36ce3aae6e987.zip | |
Merge branch 'obsd-master'
Conflicts:
Makefile
cmd-server-info.c
cmd-start-server.c
Diffstat (limited to 'cmd-kill-server.c')
| -rw-r--r-- | cmd-kill-server.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/cmd-kill-server.c b/cmd-kill-server.c index ba63faa3..03016869 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); } |