===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/bc/bc.y,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- src/usr.bin/bc/bc.y	2011/07/08 23:29:46	1.38
+++ src/usr.bin/bc/bc.y	2011/08/03 08:48:19	1.39
@@ -1,5 +1,5 @@
 %{
-/*	$OpenBSD: bc.y,v 1.38 2011/07/08 23:29:46 tedu Exp $	*/
+/*	$OpenBSD: bc.y,v 1.39 2011/08/03 08:48:19 otto Exp $	*/
 
 /*
  * Copyright (c) 2003, Otto Moerbeek <otto@drijf.net>
@@ -43,6 +43,7 @@
 #include <stdarg.h>
 #include <stdbool.h>
 #include <string.h>
+#include <termios.h>
 #include <unistd.h>
 
 #include "extern.h"
@@ -1061,12 +1062,13 @@
 	int status, save_errno = errno;
 
 	for (;;) {
-		pid = waitpid(dc, &status, WCONTINUED);
+		pid = waitpid(dc, &status, WCONTINUED | WNOHANG);
 		if (pid == -1) {
 			if (errno == EINTR)
 				continue;
 			_exit(0);
-		}
+		} else if (pid == 0)
+			break;
 		if (WIFEXITED(status) || WIFSIGNALED(status))
 			_exit(0);
 		else
@@ -1139,6 +1141,7 @@
 			close(p[0]);
 			close(p[1]);
 			if (interactive) {
+				gettty(&ttysaved);
 				el = el_init("bc", stdin, stderr, stderr);
 				hist = history_init();
 				history(hist, &he, H_SETSIZE, 100);