dropbear: svr-chansession.c comparison

Improve behaviour when flushing out after a process has exited.

comparison

equal deleted inserted replaced

-:8b9aba1d5fa4
+:a01c0c8e543a
 #endif
 		} else {
 			/* we use this to determine how pid exited */
 			exit->exitsignal = -1;
 		}
-	}
+		/* Make sure that the main select() loop wakes up */
+		while (1) {
+			/* EAGAIN means the pipe's full, so don't need to write anything */
+			/* isserver is just a random byte to write */
+			if (write(ses.signal_pipe[1], &ses.isserver, 1) == 1 || errno == EAGAIN) {
+				break;
+			}
+			if (errno == EINTR) {
+				continue;
+			}
+			dropbear_exit("error writing signal pipe");
+		}
+	}
 	sa_chld.sa_handler = sesssigchild_handler;
 	sa_chld.sa_flags = SA_NOCLDSTOP;
 	sigaction(SIGCHLD, &sa_chld, NULL);
 	TRACE(("leave sigchld handler"))
 }
 	struct ChanSess *chansess;
 	unsigned int i;
 	struct logininfo *li;
+	TRACE(("enter closechansess"))
 	chansess = (struct ChanSess*)channel->typedata;
-	send_exitsignalstatus(channel);
-	TRACE(("enter closechansess"))
 	if (chansess == NULL) {
 		TRACE(("leave closechansess: chansess == NULL"))
 		return;
 	}
+	send_exitsignalstatus(channel);
 	m_free(chansess->cmd);
 	m_free(chansess->term);
 	if (chansess->tty) {

Mercurial > dropbear