diff options
Diffstat (limited to 'server-client.c')
-rw-r--r-- | server-client.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/server-client.c b/server-client.c index e0b0c668..6b3ba8ca 100644 --- a/server-client.c +++ b/server-client.c @@ -1,4 +1,4 @@ -/* $OpenBSD$ */ +/* $Id$ */ /* * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net> @@ -22,7 +22,6 @@ #include <errno.h> #include <event.h> #include <fcntl.h> -#include <paths.h> #include <stdlib.h> #include <string.h> #include <time.h> @@ -543,8 +542,18 @@ server_client_check_resize(struct window_pane *wp) ws.ws_col = wp->sx; ws.ws_row = wp->sy; - if (ioctl(wp->fd, TIOCSWINSZ, &ws) == -1) + if (ioctl(wp->fd, TIOCSWINSZ, &ws) == -1) { +#ifdef __sun + /* + * Some versions of Solaris apparently can return an error when + * resizing; don't know why this happens, can't reproduce on + * other platforms and ignoring it doesn't seem to cause any + * issues. + */ + if (errno != EINVAL && errno != ENXIO) +#endif fatal("ioctl failed"); + } wp->flags &= ~PANE_RESIZE; } |