aboutsummaryrefslogtreecommitdiff
path: root/server-fn.c
diff options
context:
space:
mode:
Diffstat (limited to 'server-fn.c')
-rw-r--r--server-fn.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/server-fn.c b/server-fn.c
index a00cadbd..1ed3a01f 100644
--- a/server-fn.c
+++ b/server-fn.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -31,7 +31,7 @@ void server_callback_identify(int, short, void *);
void
server_fill_environ(struct session *s, struct environ *env)
{
- char var[MAXPATHLEN], *term;
+ char var[PATH_MAX], *term;
u_int idx;
long pid;
@@ -270,6 +270,7 @@ server_kill_window(struct window *w)
if (session_has(s, w) == NULL)
continue;
+ server_unzoom_window(w);
while ((wl = winlink_find_by_window(&s->windows, w)) != NULL) {
if (session_detach(s, wl)) {
server_destroy_session_group(s);
@@ -291,7 +292,8 @@ server_kill_window(struct window *w)
int
server_link_window(struct session *src, struct winlink *srcwl,
- struct session *dst, int dstidx, int killflag, int selectflag, char **cause)
+ struct session *dst, int dstidx, int killflag, int selectflag,
+ char **cause)
{
struct winlink *dstwl;
struct session_group *srcsg, *dstsg;
@@ -361,6 +363,9 @@ server_destroy_pane(struct window_pane *wp)
old_fd = wp->fd;
if (wp->fd != -1) {
+#ifdef HAVE_UTEMPTER
+ utempter_remove_record(wp->fd);
+#endif
bufferevent_free(wp->event);
close(wp->fd);
wp->fd = -1;