summaryrefslogtreecommitdiffstats
path: root/usr.bin/tmux/server.c
diff options
context:
space:
mode:
authornicm <nicm@openbsd.org>2009-11-13 17:33:07 +0000
committernicm <nicm@openbsd.org>2009-11-13 17:33:07 +0000
commit7c6e570cf8298e9efb3fb279a3d1fd51567131f1 (patch)
tree4467c083da44341dd0f9cf4a3ac8596daf3c4ebf /usr.bin/tmux/server.c
parentstop the options string leak if it is not attached into the options (diff)
downloadwireguard-openbsd-7c6e570cf8298e9efb3fb279a3d1fd51567131f1.tar.xz
wireguard-openbsd-7c6e570cf8298e9efb3fb279a3d1fd51567131f1.zip
Destroy panes immediately rather than checking them all every loop.
Diffstat (limited to 'usr.bin/tmux/server.c')
-rw-r--r--usr.bin/tmux/server.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/usr.bin/tmux/server.c b/usr.bin/tmux/server.c
index e4b336b109f..c01d54603d0 100644
--- a/usr.bin/tmux/server.c
+++ b/usr.bin/tmux/server.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: server.c,v 1.76 2009/11/11 13:24:42 nicm Exp $ */
+/* $OpenBSD: server.c,v 1.77 2009/11/13 17:33:07 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -335,7 +335,6 @@ server_accept_callback(int fd, short events, unused void *data)
return;
}
server_client_create(newfd);
-
}
/* Set up server signal handling. */
@@ -449,9 +448,8 @@ server_child_exited(pid_t pid, int status)
continue;
TAILQ_FOREACH(wp, &w->panes, entry) {
if (wp->pid == pid) {
- close(wp->fd);
- bufferevent_free(wp->event);
- wp->fd = -1;
+ server_destroy_pane(wp);
+ break;
}
}
}