aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoberto E. Vargas Caballero <k0ga@shike2.com>2015-11-21 18:21:03 +0100
committerRoberto E. Vargas Caballero <k0ga@shike2.com>2015-11-21 18:21:03 +0100
commit375b28720f7c78e6fac1c274f9dee7c40a78aacb (patch)
treedf9bdab5affc8bb59a3276b3f0e31809f7344a37
parentd836561b96097b04760104e7e0f8d014f5889a18 (diff)
downloadst-patched-375b28720f7c78e6fac1c274f9dee7c40a78aacb.tar.bz2
st-patched-375b28720f7c78e6fac1c274f9dee7c40a78aacb.tar.xz
st-patched-375b28720f7c78e6fac1c274f9dee7c40a78aacb.zip
Avoid recursive call to ttywrite from ttyread
Ttyread() calls to ttywrite, so if we check for reading before that for writing in ttywrite we can get a circular call sequence.
-rw-r--r--st.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/st.c b/st.c
index a47f094..c5d62c1 100644
--- a/st.c
+++ b/st.c
@@ -1518,8 +1518,6 @@ ttywrite(const char *s, size_t n)
1518 continue; 1518 continue;
1519 die("select failed: %s\n", strerror(errno)); 1519 die("select failed: %s\n", strerror(errno));
1520 } 1520 }
1521 if (FD_ISSET(cmdfd, &rfd))
1522 lim = ttyread();
1523 if (FD_ISSET(cmdfd, &wfd)) { 1521 if (FD_ISSET(cmdfd, &wfd)) {
1524 /* 1522 /*
1525 * Only write the bytes written by ttywrite() or the 1523 * Only write the bytes written by ttywrite() or the
@@ -1543,6 +1541,8 @@ ttywrite(const char *s, size_t n)
1543 break; 1541 break;
1544 } 1542 }
1545 } 1543 }
1544 if (FD_ISSET(cmdfd, &rfd))
1545 lim = ttyread();
1546 } 1546 }
1547 return; 1547 return;
1548 1548