# HG changeset patch
# User Matt Johnston <matt@ucc.asn.au>
# Date 1149957580 0
# Node ID 5488db2e9e4ea2fbd4ac3ab9eb5917b2ee20380d
# Parent  8ed0dce45126af2e840358782561020325d3ecb6# Parent  168272e481a8468d7fc29e0ee4c1dc58b67fad1f
merge of 332f709a4cb39cde4cedab7c3be89e05f3023067
     and ca4ca78b82c5d430c69ce01bf794e8886ce81431

diff -r 168272e481a8 -r 5488db2e9e4e common-channel.c
--- a/common-channel.c	Sat Jun 10 15:59:38 2006 +0000
+++ b/common-channel.c	Sat Jun 10 16:39:40 2006 +0000
@@ -202,6 +202,24 @@
 				send_msg_channel_data(channel, 1, SSH_EXTENDED_DATA_STDERR);
 		}
 
+		/* if we can read from the writefd, it might be closed, so we try to
+		 * see if it has errors */
+		if (channel->writefd >= 0 && channel->writefd != channel->readfd
+				&& FD_ISSET(channel->writefd, readfds)) {
+			if (channel->initconn) {
+				/* Handling for "in progress" connection - this is needed
+				 * to avoid spinning 100% CPU when we connect to a server
+				 * which doesn't send anything (tcpfwding) */
+				checkinitdone(channel);
+				continue; /* Important not to use the channel after 
+							 checkinitdone(), as it may be NULL */
+			}
+			ret = write(channel->writefd, NULL, 0); /* Fake write */
+			if (ret < 0 && errno != EINTR && errno != EAGAIN) {
+				closewritefd(channel);
+			}
+		}
+
 		/* write to program/pipe stdin */
 		if (channel->writefd >= 0 && FD_ISSET(channel->writefd, writefds)) {
 			if (channel->initconn) {
@@ -426,7 +444,17 @@
 			}
 		}
 
-		/* Stuff from the wire */
+		/* For checking FD status (ie closure etc) - we don't actually
+		 * read data from writefd */
+		TRACE(("writefd = %d, readfd %d, errfd %d, bufused %d", 
+					channel->writefd, channel->readfd,
+					channel->errfd,
+					cbuf_getused(channel->writebuf) ))
+		if (channel->writefd >= 0 && channel->writefd != channel->readfd) {
+			FD_SET(channel->writefd, readfds);
+		}
+
+		/* Stuff from the wire, to local program/shell/user etc */
 		if ((channel->writefd >= 0 && cbuf_getused(channel->writebuf) > 0 )
 				|| channel->initconn) {