Attachment #1098 for bug #52




	int len;

	if (c->rfd != -1 &&
	    (c->detach_close || FD_ISSET(c->rfd, readset))) {
		len = read(c->rfd, buf, sizeof(buf));
		if (len < 0 && errno == EINTR)
			return 1;
		if (len <= 0) {
			debug2("channel %d: read<=0 rfd %d len %d",

				c->local_consumed += len;
			}
		} else if (c->extended_usage == CHAN_EXTENDED_READ &&
		    (c->detach_close || FD_ISSET(c->efd, readset))) {
			len = read(c->efd, buf, sizeof(buf));
			debug2("channel %d: read %d from efd %d",
			    c->self, len, c->efd);
			if (len < 0 && errno == EINTR)
				return 1;
			if (len <= 0) {
				debug2("channel %d: closing read-efd %d",




	struct timeval tv, *tvp;
	int ret;
	int client_alive_scheduled = 0;
	int program_alive_scheduled = 0;

	/*
	 * if using client_alive, set the max timeout accordingly,

		 * the client, try to get some more data from the program.
		 */
		if (packet_not_very_much_data_to_write()) {
			program_alive_scheduled = child_terminated;
			if (!fdout_eof)
				FD_SET(fdout, *readsetp);
			if (!fderr_eof)

		memset(*writesetp, 0, *nallocp);
		if (errno != EINTR)
			error("select: %.100s", strerror(errno));
	} else {
		if (ret == 0 && client_alive_scheduled)
			client_alive_check();
		if (program_alive_scheduled && fdin_is_tty) {
			if (!fdout_eof)
				FD_SET(fdout, *readsetp);
			if (!fderr_eof)
				FD_SET(fderr, *readsetp);
		}
	}

	notify_done(*readsetp);
}

	/* Read and buffer any available stdout data from the program. */
	if (!fdout_eof && FD_ISSET(fdout, readset)) {
		len = read(fdout, buf, sizeof(buf));
		if (len < 0 && errno == EINTR) {
			/* do nothing */
		} else if (len <= 0) {
			fdout_eof = 1;

	/* Read and buffer any available stderr data from the program. */
	if (!fderr_eof && FD_ISSET(fderr, readset)) {
		len = read(fderr, buf, sizeof(buf));
		if (len < 0 && errno == EINTR) {
			/* do nothing */
		} else if (len <= 0) {
			fderr_eof = 1;

Return to bug 52

Lines 1418-1426 channel_handle_rfd(Channel c, fd_set Link Here

(-)openssh-4.3p2/channels.c (-4 / +4 lines)
1418	int len;	1418	int len;
1419		1419
1420	if (c->rfd != -1 &&	1420	if (c->rfd != -1 &&
1421	FD_ISSET(c->rfd, readset)) {	1421	(c->detach_close \|\| FD_ISSET(c->rfd, readset))) {
1422	len = read(c->rfd, buf, sizeof(buf));	1422	len = read(c->rfd, buf, sizeof(buf));
1423	if (len < 0 && (errno == EINTR \|\| errno == EAGAIN))	1423	if (len < 0 && errno == EINTR)
1424	return 1;	1424	return 1;
1425	if (len <= 0) {	1425	if (len <= 0) {
1426	debug2("channel %d: read<=0 rfd %d len %d",	1426	debug2("channel %d: read<=0 rfd %d len %d",
Lines 1564-1574 channel_handle_efd(Channel c, fd_set Link Here
1564	c->local_consumed += len;	1564	c->local_consumed += len;
1565	}	1565	}
1566	} else if (c->extended_usage == CHAN_EXTENDED_READ &&	1566	} else if (c->extended_usage == CHAN_EXTENDED_READ &&
1567	FD_ISSET(c->efd, readset)) {	1567	(c->detach_close \|\| FD_ISSET(c->efd, readset))) {
1568	len = read(c->efd, buf, sizeof(buf));	1568	len = read(c->efd, buf, sizeof(buf));
1569	debug2("channel %d: read %d from efd %d",	1569	debug2("channel %d: read %d from efd %d",
1570	c->self, len, c->efd);	1570	c->self, len, c->efd);
1571	if (len < 0 && (errno == EINTR \|\| errno == EAGAIN))	1571	if (len < 0 && errno == EINTR)
1572	return 1;	1572	return 1;
1573	if (len <= 0) {	1573	if (len <= 0) {
1574	debug2("channel %d: closing read-efd %d",	1574	debug2("channel %d: closing read-efd %d",

Lines 255-260 wait_until_can_do_something(fd_set **rea Link Here

(-)openssh-4.3p2/serverloop.c (-4 / +14 lines)
255	struct timeval tv, *tvp;	255	struct timeval tv, *tvp;
256	int ret;	256	int ret;
257	int client_alive_scheduled = 0;	257	int client_alive_scheduled = 0;
		258	int program_alive_scheduled = 0;
258		259
259	/*	260	/*
260	* if using client_alive, set the max timeout accordingly,	261	* if using client_alive, set the max timeout accordingly,
Lines 292-297 wait_until_can_do_something(fd_set **rea Link Here
292	* the client, try to get some more data from the program.	293	* the client, try to get some more data from the program.
293	*/	294	*/
294	if (packet_not_very_much_data_to_write()) {	295	if (packet_not_very_much_data_to_write()) {
		296	program_alive_scheduled = child_terminated;
295	if (!fdout_eof)	297	if (!fdout_eof)
296	FD_SET(fdout, *readsetp);	298	FD_SET(fdout, *readsetp);
297	if (!fderr_eof)	299	if (!fderr_eof)
Lines 337-344 wait_until_can_do_something(fd_set **rea Link Here
337	memset(writesetp, 0, nallocp);	339	memset(writesetp, 0, nallocp);
338	if (errno != EINTR)	340	if (errno != EINTR)
339	error("select: %.100s", strerror(errno));	341	error("select: %.100s", strerror(errno));
340	} else if (ret == 0 && client_alive_scheduled)	342	} else {
341	client_alive_check();	343	if (ret == 0 && client_alive_scheduled)
		344	client_alive_check();
		345	if (program_alive_scheduled && fdin_is_tty) {
		346	if (!fdout_eof)
		347	FD_SET(fdout, *readsetp);
		348	if (!fderr_eof)
		349	FD_SET(fderr, *readsetp);
		350	}
		351	}
342		352
343	notify_done(*readsetp);	353	notify_done(*readsetp);
344	}	354	}
Lines 381-387 process_input(fd_set * readset) Link Here
381	/* Read and buffer any available stdout data from the program. */	391	/* Read and buffer any available stdout data from the program. */
382	if (!fdout_eof && FD_ISSET(fdout, readset)) {	392	if (!fdout_eof && FD_ISSET(fdout, readset)) {
383	len = read(fdout, buf, sizeof(buf));	393	len = read(fdout, buf, sizeof(buf));
384	if (len < 0 && (errno == EINTR \|\| errno == EAGAIN)) {	394	if (len < 0 && errno == EINTR) {
385	/* do nothing */	395	/* do nothing */
386	} else if (len <= 0) {	396	} else if (len <= 0) {
387	fdout_eof = 1;	397	fdout_eof = 1;
Lines 393-399 process_input(fd_set * readset) Link Here
393	/* Read and buffer any available stderr data from the program. */	403	/* Read and buffer any available stderr data from the program. */
394	if (!fderr_eof && FD_ISSET(fderr, readset)) {	404	if (!fderr_eof && FD_ISSET(fderr, readset)) {
395	len = read(fderr, buf, sizeof(buf));	405	len = read(fderr, buf, sizeof(buf));
396	if (len < 0 && (errno == EINTR \|\| errno == EAGAIN)) {	406	if (len < 0 && errno == EINTR) {
397	/* do nothing */	407	/* do nothing */
398	} else if (len <= 0) {	408	} else if (len <= 0) {
399	fderr_eof = 1;	409	fderr_eof = 1;