components/tmux/patches/winsz.patch
author pnyc <petr.nyc@oracle.com>
Fri, 15 Jan 2016 12:42:53 -0800
branchs11u3-sru4-backport
changeset 5285 9d9554b832a4
parent 3954 7e6addf418e2
permissions -rw-r--r--
Close s11u3-sru4-backport branch
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3391
e5c18bd08e0d 19412065 tmux dies when creating panes
Peter Schow <peter.schow@oracle.com>
parents:
diff changeset
     1
ioctl(TIOCSWINSZ) will sporadically fail with an ENXIO.  Ignoring this
e5c18bd08e0d 19412065 tmux dies when creating panes
Peter Schow <peter.schow@oracle.com>
parents:
diff changeset
     2
harmless condition doesn't affect tmux behavior.
e5c18bd08e0d 19412065 tmux dies when creating panes
Peter Schow <peter.schow@oracle.com>
parents:
diff changeset
     3
In-house patch.  Has been filed upstream as ticket #158
e5c18bd08e0d 19412065 tmux dies when creating panes
Peter Schow <peter.schow@oracle.com>
parents:
diff changeset
     4
    https://sourceforge.net/p/tmux/tickets/158/
3954
7e6addf418e2 19622198 Update tmux to 1.9
Peter Schow <peter.schow@oracle.com>
parents: 3391
diff changeset
     5
Patch was accepted by maintainer, will be included in the next stable version.
7e6addf418e2 19622198 Update tmux to 1.9
Peter Schow <peter.schow@oracle.com>
parents: 3391
diff changeset
     6
--- ORIGINAL/server-client.c	2014-02-19 13:44:07.000000000 -0800
7e6addf418e2 19622198 Update tmux to 1.9
Peter Schow <peter.schow@oracle.com>
parents: 3391
diff changeset
     7
+++ tmux-1.9/server-client.c	2014-11-20 11:17:33.896630008 -0800
7e6addf418e2 19622198 Update tmux to 1.9
Peter Schow <peter.schow@oracle.com>
parents: 3391
diff changeset
     8
@@ -541,7 +541,8 @@
7e6addf418e2 19622198 Update tmux to 1.9
Peter Schow <peter.schow@oracle.com>
parents: 3391
diff changeset
     9
 	ws.ws_row = wp->sy;
7e6addf418e2 19622198 Update tmux to 1.9
Peter Schow <peter.schow@oracle.com>
parents: 3391
diff changeset
    10
 
7e6addf418e2 19622198 Update tmux to 1.9
Peter Schow <peter.schow@oracle.com>
parents: 3391
diff changeset
    11
 	if (ioctl(wp->fd, TIOCSWINSZ, &ws) == -1)
7e6addf418e2 19622198 Update tmux to 1.9
Peter Schow <peter.schow@oracle.com>
parents: 3391
diff changeset
    12
-		fatal("ioctl failed");
3391
e5c18bd08e0d 19412065 tmux dies when creating panes
Peter Schow <peter.schow@oracle.com>
parents:
diff changeset
    13
+		if (errno != EINVAL && errno != ENXIO)
3954
7e6addf418e2 19622198 Update tmux to 1.9
Peter Schow <peter.schow@oracle.com>
parents: 3391
diff changeset
    14
+			fatal("ioctl failed");
7e6addf418e2 19622198 Update tmux to 1.9
Peter Schow <peter.schow@oracle.com>
parents: 3391
diff changeset
    15
 
7e6addf418e2 19622198 Update tmux to 1.9
Peter Schow <peter.schow@oracle.com>
parents: 3391
diff changeset
    16
 	wp->flags &= ~PANE_RESIZE;
7e6addf418e2 19622198 Update tmux to 1.9
Peter Schow <peter.schow@oracle.com>
parents: 3391
diff changeset
    17
 }