PERFORCE change 52433 for review

[Peter Wemm]

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

Change 52433 by peter at peter_daintree on 2004/05/07 08:57:26

	IFC @52426

Affected files ...

.. //depot/projects/hammer/sbin/route/route.c#7 integrate
.. //depot/projects/hammer/sys/kern/tty_compat.c#4 integrate
.. //depot/projects/hammer/sys/sys/user.h#10 integrate

Differences ...

==== //depot/projects/hammer/sbin/route/route.c#7 (text+ko) ====

@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)route.c	8.6 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD: src/sbin/route/route.c,v 1.74 2004/05/03 16:30:32 andre Exp $";
+  "$FreeBSD: src/sbin/route/route.c,v 1.75 2004/05/07 15:33:17 csjp Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -273,6 +273,8 @@
 		rtm->rtm_type = RTM_DELETE;
 		rtm->rtm_seq = seqno;
 		rlen = write(s, next, rtm->rtm_msglen);
+		if (rlen < 0 && errno == EPERM)
+			err(1, "write to routing socket");
 		if (rlen < (int)rtm->rtm_msglen) {
 			warn("write to routing socket");
 			(void) printf("got only %d for rlen\n", rlen);
@@ -1223,6 +1225,8 @@
 	if (debugonly)
 		return (0);
 	if ((rlen = write(s, (char *)&m_rtmsg, l)) < 0) {
+		if (errno == EPERM)
+			err(1, "writing to routing socket");
 		warn("writing to routing socket");
 		return (-1);
 	}

==== //depot/projects/hammer/sys/kern/tty_compat.c#4 (text+ko) ====

@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/tty_compat.c,v 1.33 2004/04/05 21:03:36 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/tty_compat.c,v 1.34 2004/05/07 15:35:38 cognet Exp $");
 
 #include "opt_compat.h"
 
@@ -137,7 +137,7 @@
 		cc[VSTOP] = tc->t_stopc;
 		cc[VEOF] = tc->t_eofc;
 		cc[VEOL] = tc->t_brkc;
-		if (tc->t_brkc == -1)
+		if (tc->t_brkc == (char)_POSIX_VDISABLE)
 			cc[VEOL2] = _POSIX_VDISABLE;
 		*com = TIOCSETA;
 		break;

==== //depot/projects/hammer/sys/sys/user.h#10 (text+ko) ====

@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)user.h	8.2 (Berkeley) 9/23/93
- * $FreeBSD: src/sys/sys/user.h,v 1.55 2004/04/07 04:19:50 imp Exp $
+ * $FreeBSD: src/sys/sys/user.h,v 1.56 2004/05/07 15:37:56 cognet Exp $
  */
 
 #ifndef _SYS_USER_H_
@@ -74,7 +74,7 @@
     defined(__amd64__)
 #define	KINFO_PROC_SIZE	912		/* the correct size for kinfo_proc */
 #endif
-#ifdef	__i386__
+#if	__i386__ || defined __arm__
 #define	KINFO_PROC_SIZE	648		/* the correct size for kinfo_proc */
 #endif
 #ifdef  __powerpc__