From owner-p4-projects@FreeBSD.ORG Fri May 7 08:58:07 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1DAEC16A4D0; Fri, 7 May 2004 08:58:07 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E65EE16A4CE for ; Fri, 7 May 2004 08:58:06 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8011F43D2D for ; Fri, 7 May 2004 08:58:06 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i47Fw6Ge070390 for ; Fri, 7 May 2004 08:58:06 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i47Fw6BQ070387 for perforce@freebsd.org; Fri, 7 May 2004 08:58:06 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Fri, 7 May 2004 08:58:06 -0700 (PDT) Message-Id: <200405071558.i47Fw6BQ070387@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 52433 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 May 2004 15:58:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=52433 Change 52433 by peter@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 @@ -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 -__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__