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.
This commit is contained in:
Roberto E. Vargas Caballero 2015-11-21 18:21:03 +01:00
parent d836561b96
commit 375b28720f

4
st.c
View file

@ -1518,8 +1518,6 @@ ttywrite(const char *s, size_t n)
continue; continue;
die("select failed: %s\n", strerror(errno)); die("select failed: %s\n", strerror(errno));
} }
if (FD_ISSET(cmdfd, &rfd))
lim = ttyread();
if (FD_ISSET(cmdfd, &wfd)) { if (FD_ISSET(cmdfd, &wfd)) {
/* /*
* Only write the bytes written by ttywrite() or the * Only write the bytes written by ttywrite() or the
@ -1543,6 +1541,8 @@ ttywrite(const char *s, size_t n)
break; break;
} }
} }
if (FD_ISSET(cmdfd, &rfd))
lim = ttyread();
} }
return; return;