From owner-p4-projects@FreeBSD.ORG  Thu Aug  7 18:14:05 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6C9621065671; Thu,  7 Aug 2008 18:14:05 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 31BB9106566C
	for <perforce@FreeBSD.org>; Thu,  7 Aug 2008 18:14:05 +0000 (UTC)
	(envelope-from ed@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 1FC678FC0A
	for <perforce@FreeBSD.org>; Thu,  7 Aug 2008 18:14:05 +0000 (UTC)
	(envelope-from ed@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m77IE5Lw088081
	for <perforce@FreeBSD.org>; Thu, 7 Aug 2008 18:14:05 GMT
	(envelope-from ed@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m77IE4Hv088079
	for perforce@freebsd.org; Thu, 7 Aug 2008 18:14:04 GMT
	(envelope-from ed@FreeBSD.org)
Date: Thu, 7 Aug 2008 18:14:04 GMT
Message-Id: <200808071814.m77IE4Hv088079@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	ed@FreeBSD.org using -f
From: Ed Schouten <ed@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 146846 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 07 Aug 2008 18:14:06 -0000

http://perforce.freebsd.org/chv.cgi?CH=146846

Change 146846 by ed@ed_dull on 2008/08/07 18:13:58

	Revert changes to openpty(). There is no real need to trim away
	the function calls. This still makes libutil work when used with
	an older kernel + C library from pre-mpsafetty.

Affected files ...

.. //depot/projects/mpsafetty/lib/libutil/pty.c#2 integrate

Differences ...

==== //depot/projects/mpsafetty/lib/libutil/pty.c#2 (text+ko) ====

@@ -60,9 +60,31 @@
 	if (master == -1)
 		return (-1);
 
-	if ((slavename = ptsname(master)) == NULL ||
-	    (slave = open(slavename, O_RDWR)) == -1) {
+	if (grantpt(master) == -1) {
+		close(master);
+		return (-1);
+	}
+
+	slavename = ptsname(master);
+	if (slavename == NULL) {
+		close(master);
+		return (-1);
+	}
+
+	if (revoke(slavename) == -1) {
+		close(master);
+		return (-1);
+	}
+
+	slave = open(slavename, O_RDWR);
+	if (slave == -1) {
+		close(master);
+		return (-1);
+	}
+
+	if (unlockpt(master) == -1) {
 		close(master);
+		close(slave);
 		return (-1);
 	}