mischief/openbsd-src
1
0
Fork 0
mirror of https://github.com/openbsd/src.git synced 2025-01-10 06:47:55 -08:00
Code

Merge start-server into kill-server.

Browse Source
This commit is contained in:
nicm 2014-01-27 23:57:35 +00:00
parent 5f98b70b12
commit bd586b8f70
3 changed files with 14 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
usr.bin/tmux/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.67 2014/01/22 14:43:42 nicm Exp $
# $OpenBSD: Makefile,v 1.68 2014/01/27 23:57:35 nicm Exp $
PROG= tmux
SRCS= arguments.c \
@ -68,7 +68,6 @@ SRCS= arguments.c \
cmd-show-options.c \
cmd-source-file.c \
cmd-split-window.c \
cmd-start-server.c \
cmd-string.c \
cmd-suspend-client.c \
cmd-swap-pane.c \

16
usr.bin/tmux/cmd-kill-server.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: cmd-kill-server.c,v 1.11 2013/10/10 12:00:20 nicm Exp $ */
/* $OpenBSD: cmd-kill-server.c,v 1.12 2014/01/27 23:57:35 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -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);
}

42
usr.bin/tmux/cmd-start-server.c
View File

@ -1,42 +0,0 @@
/* $OpenBSD: cmd-start-server.c,v 1.10 2013/10/10 12:00:24 nicm Exp $ */
/*
* Copyright (c) 2007 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 "tmux.h"
/*
* Start the server and do nothing else.
*/
enum cmd_retval cmd_start_server_exec(struct cmd *, struct cmd_q *);
const struct cmd_entry cmd_start_server_entry = {
"start-server", "start",
"", 0, 0,
"",
CMD_STARTSERVER,
NULL,
cmd_start_server_exec
};
enum cmd_retval
cmd_start_server_exec(unused struct cmd *self, unused struct cmd_q *cmdq)
{
return (CMD_RETURN_NORMAL);
}