aboutsummaryrefslogtreecommitdiff
path: root/server.c
diff options
context:
space:
mode:
authorTiago Cunha <tcunha@gmx.com>2009-11-14 17:48:39 +0000
committerTiago Cunha <tcunha@gmx.com>2009-11-14 17:48:39 +0000
commit72bc03ac4c0fa3757d16363ab9cacb0a152275f9 (patch)
tree59c1d12870a47c1e295a9258ca44208594cfffb4 /server.c
parent56447d73c1348c708f36a624416c008e6b262293 (diff)
downloadrtmux-72bc03ac4c0fa3757d16363ab9cacb0a152275f9.tar.gz
rtmux-72bc03ac4c0fa3757d16363ab9cacb0a152275f9.tar.bz2
rtmux-72bc03ac4c0fa3757d16363ab9cacb0a152275f9.zip
Sync OpenBSD patchset 535:
Destroy panes immediately rather than checking them all every loop.
Diffstat (limited to 'server.c')
-rw-r--r--server.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/server.c b/server.c
index 6f272b24..79526d8a 100644
--- a/server.c
+++ b/server.c
@@ -1,4 +1,4 @@
-/* $Id: server.c,v 1.228 2009-11-13 16:52:46 tcunha Exp $ */
+/* $Id: server.c,v 1.229 2009-11-14 17:48:39 tcunha Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -353,7 +353,6 @@ server_accept_callback(int fd, short events, unused void *data)
return;
}
server_client_create(newfd);
-
}
/* Set up server signal handling. */
@@ -467,9 +466,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;
}
}
}