From dfa5fc70dbb385b497ec595331a54ec893f198c2 Mon Sep 17 00:00:00 2001
From: fjoe <fjoe@FreeBSD.org>
Date: Thu, 15 Dec 2011 06:25:19 +0000
Subject: Revert r228521: sometimes job output is lost (see
 tools/regression/usr.bin/make/execution/joberr test).

openpty(fd + 0, fd + 1,...) version does not have this problem but
it sometimes enters an infinite sleep in "ttywait" state in tty_drain()
when make(1) closes slave pty.
---
 usr.bin/make/Makefile |  2 --
 usr.bin/make/job.c    | 10 ++--------
 2 files changed, 2 insertions(+), 10 deletions(-)

(limited to 'usr.bin')

diff --git a/usr.bin/make/Makefile b/usr.bin/make/Makefile
index 773f5e3..2dc7e583 100644
--- a/usr.bin/make/Makefile
+++ b/usr.bin/make/Makefile
@@ -7,8 +7,6 @@ CFLAGS+=-I${.CURDIR}
 SRCS=	arch.c buf.c cond.c dir.c for.c hash.c hash_tables.c job.c	\
 	lst.c main.c make.c parse.c proc.c shell.c str.c suff.c targ.c	\
 	util.c var.c
-DPADD=	${LIBUTIL}
-LDADD=	-lutil
 
 NO_SHARED?=	YES
 
diff --git a/usr.bin/make/job.c b/usr.bin/make/job.c
index 179306f..75f7949 100644
--- a/usr.bin/make/job.c
+++ b/usr.bin/make/job.c
@@ -115,7 +115,6 @@ __FBSDID("$FreeBSD$");
 #include <fcntl.h>
 #include <inttypes.h>
 #include <limits.h>
-#include <libutil.h>
 #include <paths.h>
 #include <string.h>
 #include <signal.h>
@@ -1799,13 +1798,8 @@ JobStart(GNode *gn, int flags, Job *previous)
 		if (usePipes) {
 			int fd[2];
 
-			if (isatty(1)) {
-				if (openpty(fd + 1, fd + 0, NULL, NULL, NULL) == -1)
-					Punt("Cannot open pty: %s", strerror(errno));
-			} else {
-				if (pipe(fd) == -1)
-					Punt("Cannot create pipe: %s", strerror(errno));
-			}
+			if (pipe(fd) == -1)
+				Punt("Cannot create pipe: %s", strerror(errno));
 			job->inPipe = fd[0];
 			job->outPipe = fd[1];
 			fcntl(job->inPipe, F_SETFD, 1);
-- 
cgit v1.1