From owner-p4-projects@FreeBSD.ORG  Fri Aug 22 10:49:41 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 12EAD1065677; Fri, 22 Aug 2008 10:49:41 +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 CB5171065672
	for <perforce@FreeBSD.org>; Fri, 22 Aug 2008 10:49:40 +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 BB9DA8FC0C
	for <perforce@FreeBSD.org>; Fri, 22 Aug 2008 10:49:40 +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 m7MAneYi034115
	for <perforce@FreeBSD.org>; Fri, 22 Aug 2008 10:49:40 GMT
	(envelope-from ed@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7MAnes3034113
	for perforce@freebsd.org; Fri, 22 Aug 2008 10:49:40 GMT
	(envelope-from ed@FreeBSD.org)
Date: Fri, 22 Aug 2008 10:49:40 GMT
Message-Id: <200808221049.m7MAnes3034113@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 148098 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: Fri, 22 Aug 2008 10:49:41 -0000

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

Change 148098 by ed@ed_dull on 2008/08/22 10:48:54

	IFC my pts(4) fix.

Affected files ...

.. //depot/projects/mpsafetty/lib/csu/amd64/Makefile#2 integrate
.. //depot/projects/mpsafetty/sys/kern/tty_pts.c#13 edit

Differences ...

==== //depot/projects/mpsafetty/lib/csu/amd64/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/csu/amd64/Makefile,v 1.18 2003/06/30 12:53:39 ru Exp $
+# $FreeBSD: src/lib/csu/amd64/Makefile,v 1.19 2008/08/22 09:23:39 kib Exp $
 
 .PATH: ${.CURDIR}/../common
 
@@ -7,6 +7,7 @@
 OBJS+=		gcrt1.o
 CFLAGS+=	-I${.CURDIR}/../common \
 		-I${.CURDIR}/../../libc/include
+CFLAGS+=	-fno-omit-frame-pointer
 
 all: ${OBJS}
 

==== //depot/projects/mpsafetty/sys/kern/tty_pts.c#13 (text+ko) ====

@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/tty_pts.c,v 1.19 2008/08/20 08:31:58 ed Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/tty_pts.c,v 1.20 2008/08/22 10:40:21 ed Exp $");
 
 #include "opt_tty.h"
 
@@ -135,10 +135,8 @@
 			break;
 
 		/* Maybe the device isn't used anyway. */
-		if (tty_opened(tp) == 0) {
-			error = ENXIO;
+		if (tty_opened(tp) == 0)
 			break;
-		}
 
 		/* Wait for more data. */
 		if (fp->f_flag & O_NONBLOCK) {
@@ -204,7 +202,7 @@
 
 			/* Maybe the device isn't used anyway. */
 			if (tty_opened(tp) == 0) {
-				error = ENXIO;
+				error = EIO;
 				goto done;
 			}