summaryrefslogtreecommitdiff
path: root/usr.bin/tmux/server.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@cvs.openbsd.org>2010-10-18 20:00:04 +0000
committerNicholas Marriott <nicm@cvs.openbsd.org>2010-10-18 20:00:04 +0000
commit132a2d9d9490f08b58a816107c4570beeddd377c (patch)
tree135c9bcea4db136be6bc732d0620c572535a05d6 /usr.bin/tmux/server.c
parenteb857f9590522520858804dfc0145d44b74df10b (diff)
Merge the before and after attach client code into one in client.c
(instead of two in tmux.c and client.c).
Diffstat (limited to 'usr.bin/tmux/server.c')
-rw-r--r--usr.bin/tmux/server.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/usr.bin/tmux/server.c b/usr.bin/tmux/server.c
index 3b337648a6d..2006c5f3730 100644
--- a/usr.bin/tmux/server.c
+++ b/usr.bin/tmux/server.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: server.c,v 1.95 2010/10/16 08:31:55 nicm Exp $ */
+/* $OpenBSD: server.c,v 1.96 2010/10/18 20:00:02 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -106,11 +106,11 @@ server_create_socket(void)
/* Fork new server. */
int
-server_start(char *path)
+server_start(void)
{
struct window_pane *wp;
int pair[2];
- char rpathbuf[MAXPATHLEN], *cause;
+ char *cause;
struct timeval tv;
u_int i;
@@ -155,12 +155,8 @@ server_start(char *path)
utf8_build();
start_time = time(NULL);
- socket_path = path;
-
- if (realpath(socket_path, rpathbuf) == NULL)
- strlcpy(rpathbuf, socket_path, sizeof rpathbuf);
log_debug("socket path %s", socket_path);
- setproctitle("server (%s)", rpathbuf);
+ setproctitle("server (%s)", socket_path);
server_fd = server_create_socket();
server_client_create(pair[1]);