PERFORCE change 148098 for review

[Ed Schouten]

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

Change 148098 by ed at 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;
 			}