From owner-p4-projects@FreeBSD.ORG Sun Apr 18 19:15:38 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6A2E916A4D0; Sun, 18 Apr 2004 19:15:38 -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 2012216A4CE for ; Sun, 18 Apr 2004 19:15:38 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1496143D48 for ; Sun, 18 Apr 2004 19:15:38 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i3J2FbGe047906 for ; Sun, 18 Apr 2004 19:15:37 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i3J2Fb9r047903 for perforce@freebsd.org; Sun, 18 Apr 2004 19:15:37 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 18 Apr 2004 19:15:37 -0700 (PDT) Message-Id: <200404190215.i3J2Fb9r047903@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 51320 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: Mon, 19 Apr 2004 02:15:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=51320 Change 51320 by rwatson@rwatson_paprika on 2004/04/18 19:14:37 Integrate netperf_socket: sf_buf API simplification. further arl statistics and card support. ciss bugfixes. bde vs puc head to head. luigi cleans up, staticizes, and constifies more in the network stack. duplication of arpcom fields, et al, reduced. Loop back of if_ppp softc list locking. 0/NULL cleanups. Affected files ... .. //depot/projects/netperf_socket/sys/alpha/alpha/vm_machdep.c#5 integrate .. //depot/projects/netperf_socket/sys/alpha/include/sf_buf.h#2 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/vm_machdep.c#8 integrate .. //depot/projects/netperf_socket/sys/amd64/include/sf_buf.h#2 integrate .. //depot/projects/netperf_socket/sys/compat/ndis/subr_ntoskrnl.c#11 integrate .. //depot/projects/netperf_socket/sys/dev/arl/if_arl.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/arl/if_arlreg.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/awi/awi.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ciss/ciss.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/puc/puc_pccard.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/puc/pucdata.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/puc/pucvar.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/random/nehemiah.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/random/randomdev.c#6 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/vm_machdep.c#5 integrate .. //depot/projects/netperf_socket/sys/ia64/include/sf_buf.h#2 integrate .. //depot/projects/netperf_socket/sys/isa/psm.c#5 integrate .. //depot/projects/netperf_socket/sys/kern/kern_intr.c#5 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_mbuf.c#4 integrate .. //depot/projects/netperf_socket/sys/modules/netgraph/Makefile#4 integrate .. //depot/projects/netperf_socket/sys/modules/netgraph/hub/Makefile#1 branch .. //depot/projects/netperf_socket/sys/net/if.c#6 integrate .. //depot/projects/netperf_socket/sys/net/if_arp.h#3 integrate .. //depot/projects/netperf_socket/sys/net/if_ethersubr.c#11 integrate .. //depot/projects/netperf_socket/sys/net/if_fddisubr.c#5 integrate .. //depot/projects/netperf_socket/sys/net/if_iso88025subr.c#5 integrate .. //depot/projects/netperf_socket/sys/net/if_ppp.c#4 integrate .. //depot/projects/netperf_socket/sys/net/if_var.h#9 integrate .. //depot/projects/netperf_socket/sys/net/radix.c#3 integrate .. //depot/projects/netperf_socket/sys/net/radix.h#3 integrate .. //depot/projects/netperf_socket/sys/net/route.c#7 integrate .. //depot/projects/netperf_socket/sys/net/route.h#7 integrate .. //depot/projects/netperf_socket/sys/net/rtsock.c#5 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_eiface.c#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_ether.c#3 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_hub.c#1 branch .. //depot/projects/netperf_socket/sys/netgraph/ng_hub.h#1 branch .. //depot/projects/netperf_socket/sys/netinet/if_ether.c#7 integrate .. //depot/projects/netperf_socket/sys/netinet6/nd6.c#3 integrate .. //depot/projects/netperf_socket/sys/netinet6/nd6_rtr.c#2 integrate .. //depot/projects/netperf_socket/sys/netipsec/xform_ipip.c#3 integrate .. //depot/projects/netperf_socket/sys/powerpc/include/sf_buf.h#2 integrate .. //depot/projects/netperf_socket/sys/powerpc/powerpc/vm_machdep.c#7 integrate .. //depot/projects/netperf_socket/sys/sys/mbuf.h#6 integrate Differences ... ==== //depot/projects/netperf_socket/sys/alpha/alpha/vm_machdep.c#5 (text+ko) ==== @@ -67,7 +67,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.102 2004/04/03 09:16:24 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.103 2004/04/18 06:24:51 alc Exp $"); #include #include @@ -101,21 +101,7 @@ #include -static void sf_buf_init(void *arg); -SYSINIT(sock_sf, SI_SUB_MBUF, SI_ORDER_ANY, sf_buf_init, NULL) - /* - * Expanded sf_freelist head. Really an SLIST_HEAD() in disguise, with the - * sf_freelist head with the sf_lock mutex. - */ -static struct { - SLIST_HEAD(, sf_buf) sf_head; - struct mtx sf_lock; -} sf_freelist; - -static u_int sf_buf_alloc_want; - -/* * Finish a fork operation, with process p2 nearly set up. * Copy and update the pcb, set up the stack so that the child * ready to run and return to user mode. @@ -384,69 +370,24 @@ } /* - * Allocate a pool of sf_bufs (sendfile(2) or "super-fast" if you prefer. :-)) + * Allocate an sf_buf for the given vm_page. On this machine, however, there + * is no sf_buf object. Instead, an opaque pointer to the given vm_page is + * returned. */ -static void -sf_buf_init(void *arg) -{ - struct sf_buf *sf_bufs; - int i; - - mtx_init(&sf_freelist.sf_lock, "sf_bufs list lock", NULL, MTX_DEF); - SLIST_INIT(&sf_freelist.sf_head); - sf_bufs = malloc(nsfbufs * sizeof(struct sf_buf), M_TEMP, - M_NOWAIT | M_ZERO); - for (i = 0; i < nsfbufs; i++) - SLIST_INSERT_HEAD(&sf_freelist.sf_head, &sf_bufs[i], free_list); - sf_buf_alloc_want = 0; -} - -/* - * Get an sf_buf from the freelist. Will block if none are available. - */ struct sf_buf * sf_buf_alloc(struct vm_page *m, int pri) { - struct sf_buf *sf; - int error; - mtx_lock(&sf_freelist.sf_lock); - while ((sf = SLIST_FIRST(&sf_freelist.sf_head)) == NULL) { - sf_buf_alloc_want++; - mbstat.sf_allocwait++; - error = msleep(&sf_freelist, &sf_freelist.sf_lock, PVM | pri, - "sfbufa", 0); - sf_buf_alloc_want--; - - /* - * If we got a signal, don't risk going back to sleep. - */ - if (error) - break; - } - if (sf != NULL) { - SLIST_REMOVE_HEAD(&sf_freelist.sf_head, free_list); - sf->m = m; - nsfbufsused++; - nsfbufspeak = imax(nsfbufspeak, nsfbufsused); - } - mtx_unlock(&sf_freelist.sf_lock); - return (sf); + return ((struct sf_buf *)m); } /* - * Release resources back to the system. + * Free the sf_buf. In fact, do nothing because there are no resources + * associated with the sf_buf. */ void sf_buf_free(struct sf_buf *sf) { - - mtx_lock(&sf_freelist.sf_lock); - SLIST_INSERT_HEAD(&sf_freelist.sf_head, sf, free_list); - nsfbufsused--; - if (sf_buf_alloc_want > 0) - wakeup_one(&sf_freelist); - mtx_unlock(&sf_freelist.sf_lock); } /* ==== //depot/projects/netperf_socket/sys/alpha/include/sf_buf.h#2 (text+ko) ==== @@ -23,35 +23,36 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/include/sf_buf.h,v 1.1 2003/11/16 06:11:24 alc Exp $ + * $FreeBSD: src/sys/alpha/include/sf_buf.h,v 1.2 2004/04/18 06:24:51 alc Exp $ */ #ifndef _MACHINE_SF_BUF_H_ #define _MACHINE_SF_BUF_H_ -#include - #include #include #include -struct sf_buf { - SLIST_ENTRY(sf_buf) free_list; /* list of free buffer slots */ - vm_page_t m; /* currently mapped page */ -}; +/* + * On this machine, the only purpose for which sf_buf is used is to implement + * an opaque pointer required by the machine-independent parts of the kernel. + * That pointer references the vm_page that is "mapped" by the sf_buf. The + * actual mapping is provided by the direct virtual-to-physical mapping. + */ +struct sf_buf; static __inline vm_offset_t sf_buf_kva(struct sf_buf *sf) { - return (ALPHA_PHYS_TO_K0SEG(sf->m->phys_addr)); + return (ALPHA_PHYS_TO_K0SEG(VM_PAGE_TO_PHYS((vm_page_t)sf))); } static __inline vm_page_t sf_buf_page(struct sf_buf *sf) { - return (sf->m); + return ((vm_page_t)sf); } #endif /* !_MACHINE_SF_BUF_H_ */ ==== //depot/projects/netperf_socket/sys/amd64/amd64/vm_machdep.c#8 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.233 2004/04/11 04:26:58 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.234 2004/04/18 05:36:37 alc Exp $"); #include "opt_isa.h" #include "opt_cpu.h" @@ -85,20 +85,7 @@ static u_int cpu_reset_proxyid; static volatile u_int cpu_reset_proxy_active; #endif -static void sf_buf_init(void *arg); -SYSINIT(sock_sf, SI_SUB_MBUF, SI_ORDER_ANY, sf_buf_init, NULL) - -/* - * Expanded sf_freelist head. Really an SLIST_HEAD() in disguise, with the - * sf_freelist head with the sf_lock mutex. - */ -static struct { - SLIST_HEAD(, sf_buf) sf_head; - struct mtx sf_lock; -} sf_freelist; -static u_int sf_buf_alloc_want; - /* * Finish a fork operation, with process p2 nearly set up. * Copy and update the pcb, set up the stack so that the child @@ -439,69 +426,24 @@ } /* - * Allocate a pool of sf_bufs (sendfile(2) or "super-fast" if you prefer. :-)) - */ -static void -sf_buf_init(void *arg) -{ - struct sf_buf *sf_bufs; - int i; - - mtx_init(&sf_freelist.sf_lock, "sf_bufs list lock", NULL, MTX_DEF); - SLIST_INIT(&sf_freelist.sf_head); - sf_bufs = malloc(nsfbufs * sizeof(struct sf_buf), M_TEMP, - M_NOWAIT | M_ZERO); - for (i = 0; i < nsfbufs; i++) - SLIST_INSERT_HEAD(&sf_freelist.sf_head, &sf_bufs[i], free_list); - sf_buf_alloc_want = 0; -} - -/* - * Get an sf_buf from the freelist. Will block if none are available. + * Allocate an sf_buf for the given vm_page. On this machine, however, there + * is no sf_buf object. Instead, an opaque pointer to the given vm_page is + * returned. */ struct sf_buf * sf_buf_alloc(struct vm_page *m, int pri) { - struct sf_buf *sf; - int error; - mtx_lock(&sf_freelist.sf_lock); - while ((sf = SLIST_FIRST(&sf_freelist.sf_head)) == NULL) { - sf_buf_alloc_want++; - mbstat.sf_allocwait++; - error = msleep(&sf_freelist, &sf_freelist.sf_lock, PVM | pri, - "sfbufa", 0); - sf_buf_alloc_want--; - - /* - * If we got a signal, don't risk going back to sleep. - */ - if (error) - break; - } - if (sf != NULL) { - SLIST_REMOVE_HEAD(&sf_freelist.sf_head, free_list); - sf->m = m; - nsfbufsused++; - nsfbufspeak = imax(nsfbufspeak, nsfbufsused); - } - mtx_unlock(&sf_freelist.sf_lock); - return (sf); + return ((struct sf_buf *)m); } /* - * Release resources back to the system. + * Free the sf_buf. In fact, do nothing because there are no resources + * associated with the sf_buf. */ void sf_buf_free(struct sf_buf *sf) { - - mtx_lock(&sf_freelist.sf_lock); - SLIST_INSERT_HEAD(&sf_freelist.sf_head, sf, free_list); - nsfbufsused--; - if (sf_buf_alloc_want > 0) - wakeup_one(&sf_freelist); - mtx_unlock(&sf_freelist.sf_lock); } /* ==== //depot/projects/netperf_socket/sys/amd64/include/sf_buf.h#2 (text+ko) ==== @@ -23,35 +23,36 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/sf_buf.h,v 1.1 2003/11/16 06:11:25 alc Exp $ + * $FreeBSD: src/sys/amd64/include/sf_buf.h,v 1.2 2004/04/18 05:36:37 alc Exp $ */ #ifndef _MACHINE_SF_BUF_H_ #define _MACHINE_SF_BUF_H_ -#include - #include #include #include -struct sf_buf { - SLIST_ENTRY(sf_buf) free_list; /* list of free buffer slots */ - vm_page_t m; /* currently mapped page */ -}; +/* + * On this machine, the only purpose for which sf_buf is used is to implement + * an opaque pointer required by the machine-independent parts of the kernel. + * That pointer references the vm_page that is "mapped" by the sf_buf. The + * actual mapping is provided by the direct virtual-to-physical mapping. + */ +struct sf_buf; static __inline vm_offset_t sf_buf_kva(struct sf_buf *sf) { - return (PHYS_TO_DMAP(sf->m->phys_addr)); + return (PHYS_TO_DMAP(VM_PAGE_TO_PHYS((vm_page_t)sf))); } static __inline vm_page_t sf_buf_page(struct sf_buf *sf) { - return (sf->m); + return ((vm_page_t)sf); } #endif /* !_MACHINE_SF_BUF_H_ */ ==== //depot/projects/netperf_socket/sys/compat/ndis/subr_ntoskrnl.c#11 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.35 2004/04/16 00:04:28 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.36 2004/04/18 18:38:59 wpaul Exp $"); #include #include @@ -1029,7 +1029,7 @@ __asm__ __volatile__ ("" : "=c" (lock)); while (atomic_cmpset_acq_int((volatile u_int *)lock, 0, 1) == 0) - /* do nothing */; + /* sit and spin */; return; } @@ -1041,7 +1041,7 @@ __asm__ __volatile__ ("" : "=c" (lock)); - atomic_cmpset_rel_int((volatile u_int *)lock, 1, 0); + atomic_store_rel_int((volatile u_int *)lock, 0); return; } ==== //depot/projects/netperf_socket/sys/dev/arl/if_arl.c#3 (text+ko) ==== @@ -3,7 +3,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/arl/if_arl.c,v 1.4 2004/04/15 20:31:07 luigi Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/arl/if_arl.c,v 1.5 2004/04/17 20:30:05 fjoe Exp $"); #include "opt_inet.h" @@ -69,6 +69,9 @@ */ #define ARL_CHECKREG(sc) (ar->registrationMode && ar->registrationStatus == 0) +#define GET_ARL_PARAM(name) (arcfg.name = ar->name) +#define SET_ARL_PARAM(name) (ar->name = arcfg.name) + #ifndef BPF_MTAP #define BPF_MTAP(_ifp,_m) \ do { \ @@ -114,6 +117,13 @@ devclass_t arl_devclass; +u_int8_t rate2media[4] = { + IFM_IEEE80211_DS354k, + IFM_IEEE80211_DS512k, + IFM_IEEE80211_DS1, + IFM_IEEE80211_DS2 +}; + /* * Copy config values to local cache */ @@ -194,13 +204,16 @@ ifmedia_init(&sc->arl_ifmedia, 0, arl_media_change, arl_media_status); #define ADD(s, o) ifmedia_add(&sc->arl_ifmedia, \ IFM_MAKEWORD(IFM_IEEE80211, (s), (o), 0), 0, NULL) + ADD(IFM_IEEE80211_DS354k, 0); + ADD(IFM_IEEE80211_DS354k, IFM_IEEE80211_ADHOC); + ADD(IFM_IEEE80211_DS512k, 0); + ADD(IFM_IEEE80211_DS512k, IFM_IEEE80211_ADHOC); ADD(IFM_IEEE80211_DS1, 0); ADD(IFM_IEEE80211_DS1, IFM_IEEE80211_ADHOC); ADD(IFM_IEEE80211_DS2, 0); ADD(IFM_IEEE80211_DS2, IFM_IEEE80211_ADHOC); ifmedia_set(&sc->arl_ifmedia, IFM_MAKEWORD(IFM_IEEE80211, - arcfg.spreadingCode == 4 ? IFM_IEEE80211_DS2 : IFM_IEEE80211_DS1 - , 0, 0)); + rate2media[arcfg.spreadingCode - 1], 0, 0)); #undef ADD /* @@ -1152,16 +1165,19 @@ int i; static int cache_slot = 0; static int wrapindex = 0; + u_int8_t zero[6] = {0, 0, 0, 0, 0, 0}; + u_char *mac; if ((ntohs(eh->ether_type) != ETHERTYPE_IP)) { return; } + mac = (dir == ARLCACHE_RX ? eh->ether_shost : eh->ether_dhost); + for (i = 0; i < MAXARLCACHE; i++) { - if (!bcmp(dir == ARLCACHE_RX ? eh->ether_shost : eh->ether_dhost, - sc->arl_sigcache[i].macsrc, 6)) { + if (!bcmp(zero, sc->arl_sigcache[i].macsrc, 6) || + !bcmp(mac, sc->arl_sigcache[i].macsrc, 6)) break; - } } if (i < MAXARLCACHE) @@ -1187,12 +1203,19 @@ struct arl_softc *sc = ifp->if_softc; int otype = arcfg.registrationMode; int orate = arcfg.spreadingCode; + int nrate, i; + + nrate = IFM_SUBTYPE(sc->arl_ifmedia.ifm_cur->ifm_media); + + for(i = 1; i <= 4; i++) { + if (rate2media[i - 1] == nrate) + break; + } - arcfg.spreadingCode = ieee80211_media2rate( - IFM_SUBTYPE(sc->arl_ifmedia.ifm_cur->ifm_media)); + if (i == 5) + return (EINVAL); - if (arcfg.spreadingCode == 2) - arcfg.spreadingCode = 3; + arcfg.spreadingCode = i; /* XXX Need fix for PSP mode */ if ((sc->arl_ifmedia.ifm_cur->ifm_media & IFM_IEEE80211_ADHOC) != 0) @@ -1213,14 +1236,14 @@ struct ifmediareq *imr; { struct arl_softc *sc = ifp->if_softc; - int rate = (arcfg.spreadingCode == 4 ? 4 : 2); imr->ifm_active = IFM_IEEE80211; if (arcfg.registrationMode == 0) imr->ifm_active |= IFM_IEEE80211_ADHOC; - imr->ifm_active |= ieee80211_rate2media(NULL, rate, IEEE80211_T_DS); + imr->ifm_active |= IFM_MAKEWORD(IFM_IEEE80211, + rate2media[arcfg.spreadingCode - 1], 0, 0); imr->ifm_status = IFM_AVALID; if (!ARL_CHECKREG(sc)) imr->ifm_status |= IFM_ACTIVE; ==== //depot/projects/netperf_socket/sys/dev/arl/if_arlreg.h#3 (text+ko) ==== @@ -1,6 +1,6 @@ /* * $RISS: if_arl/dev/arl/if_arlreg.h,v 1.4 2004/03/16 04:43:27 count Exp $ - * $FreeBSD: src/sys/dev/arl/if_arlreg.h,v 1.3 2004/04/13 19:25:23 fjoe Exp $ + * $FreeBSD: src/sys/dev/arl/if_arlreg.h,v 1.4 2004/04/17 20:30:05 fjoe Exp $ */ #ifndef _IF_ARLREG_H @@ -299,9 +299,6 @@ } \ } while (0); -#define GET_ARL_PARAM(name) (arcfg.name = ar->name) -#define SET_ARL_PARAM(name) (ar->name = arcfg.name) - #ifdef _KERNEL void arl_release_resources (device_t); int arl_alloc_memory (device_t, int, int); ==== //depot/projects/netperf_socket/sys/dev/awi/awi.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $NetBSD: awi.c,v 1.61 2004/01/15 13:29:05 onoe Exp $ */ +/* $NetBSD: awi.c,v 1.62 2004/01/16 14:13:15 onoe Exp $ */ /*- * Copyright (c) 1999,2000,2001 The NetBSD Foundation, Inc. @@ -86,10 +86,10 @@ #include #ifdef __NetBSD__ -__KERNEL_RCSID(0, "$NetBSD: awi.c,v 1.61 2004/01/15 13:29:05 onoe Exp $"); +__KERNEL_RCSID(0, "$NetBSD: awi.c,v 1.62 2004/01/16 14:13:15 onoe Exp $"); #endif #ifdef __FreeBSD__ -__FBSDID("$FreeBSD: src/sys/dev/awi/awi.c,v 1.31 2004/03/20 19:57:46 mdodd Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/awi/awi.c,v 1.32 2004/04/18 01:05:02 onoe Exp $"); #endif #include "opt_inet.h" @@ -1112,7 +1112,7 @@ } sc->sc_mib_mac.aPromiscuous_Enable = 0; #ifdef __FreeBSD__ - if (ifp->if_amcount != 0) + if (ifp->if_flags & IFF_ALLMULTI) goto set_mib; TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) { if (ifma->ifma_addr->sa_family != AF_LINK) @@ -1141,10 +1141,12 @@ sc->sc_mib_local.Accept_All_Multicast_Dis = 1; set_mib: +#ifndef __FreeBSD__ if (sc->sc_mib_local.Accept_All_Multicast_Dis) ifp->if_flags &= ~IFF_ALLMULTI; else ifp->if_flags |= IFF_ALLMULTI; +#endif sc->sc_mib_mgt.Wep_Required = (sc->sc_ic.ic_flags & IEEE80211_F_WEPON) ? AWI_WEP_ON : AWI_WEP_OFF; @@ -1926,7 +1928,7 @@ case IEEE80211_S_ASSOC: case IEEE80211_S_INIT: ieee80211_begin_scan(ifp); - /* FALLTHRU */ + break; case IEEE80211_S_SCAN: /* scan next */ break; @@ -2084,8 +2086,11 @@ return (*sc->sc_newstate)(ic, nstate, arg); out: - if (error != 0) + if (error != 0) { + if (error == EINPROGRESS) + error = 0; return error; + } return (*sc->sc_newstate)(ic, nstate, arg); } ==== //depot/projects/netperf_socket/sys/dev/ciss/ciss.c#5 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ciss/ciss.c,v 1.41 2004/04/16 23:00:01 ps Exp $ + * $FreeBSD: src/sys/dev/ciss/ciss.c,v 1.43 2004/04/19 00:57:29 ps Exp $ */ /* @@ -458,8 +458,6 @@ /* flush adapter cache */ ciss_flush_adapter(sc); - destroy_dev(sc->ciss_dev_t); - /* release all resources */ ciss_free(sc); @@ -1503,6 +1501,10 @@ ciss_kill_notify_thread(sc); + /* remove the control device */ + if (sc->ciss_dev_t != NULL) + destroy_dev(sc->ciss_dev_t); + /* free the controller data */ if (sc->ciss_id != NULL) free(sc->ciss_id, CISS_MALLOC_CLASS); @@ -2906,7 +2908,10 @@ cnc->synchronous = 0; cnc->ordered = 0; cnc->seek_to_oldest = 0; - cnc->new_only = 0; + if ((sc->ciss_flags & CISS_FLAG_RUNNING) == 0) + cnc->new_only = 1; + else + cnc->new_only = 0; cnc->length = htonl(CISS_NOTIFY_DATA_SIZE); /* submit the request */ @@ -3412,9 +3417,15 @@ ciss_spawn_notify_thread(struct ciss_softc *sc) { +#if __FreeBSD_version > 500005 if (kthread_create((void(*)(void *))ciss_notify_thread, sc, &sc->ciss_notify_thread, 0, 0, "ciss_notify%d", device_get_unit(sc->ciss_dev))) +#else + if (kthread_create((void(*)(void *))ciss_notify_thread, sc, + &sc->ciss_notify_thread, "ciss_notify%d", + device_get_unit(sc->ciss_dev))) +#endif panic("Could not create notify thread\n"); } ==== //depot/projects/netperf_socket/sys/dev/puc/puc_pccard.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/puc/puc_pccard.c,v 1.7 2003/10/27 06:41:40 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/puc/puc_pccard.c,v 1.8 2004/04/18 14:37:27 bde Exp $"); #include "opt_puc.h" @@ -50,7 +50,6 @@ "ARGOSY SP320 Dual port serial PCMCIA", /* http://www.argosy.com.tw/product/sp320.htm */ - NULL, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { ==== //depot/projects/netperf_socket/sys/dev/puc/pucdata.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/puc/pucdata.c,v 1.30 2004/02/04 18:01:02 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/puc/pucdata.c,v 1.43 2004/04/18 14:37:27 bde Exp $"); /* * PCI "universal" communications card driver configuration data (used to @@ -51,19 +51,26 @@ const struct puc_device_description puc_devices[] = { + { "Sunix SUN1889", + { 0x0009, 0x7168, 0, 0 }, + { 0xffff, 0xffff, 0, 0 }, + { + { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 8 }, + { PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ * 8 }, + }, + }, + { "Diva Serial [GSP] Multiport UART", - NULL, - { 0x103c, 0x1048, 0x103c, 0x1282 }, - { 0xffff, 0xffff, 0xffff, 0xffff }, + { 0x103c, 0x1048, 0x103c, 0x1282 }, + { 0xffff, 0xffff, 0xffff, 0xffff }, { - { PUC_PORT_TYPE_UART, 0x10, 0x00, 0, PUC_FLAGS_MEMORY }, - { PUC_PORT_TYPE_UART, 0x10, 0x10, 0, PUC_FLAGS_MEMORY }, - { PUC_PORT_TYPE_UART, 0x10, 0x38, 0, PUC_FLAGS_MEMORY }, + { PUC_PORT_TYPE_UART, 0x10, 0x00, 0, PUC_FLAGS_MEMORY }, + { PUC_PORT_TYPE_UART, 0x10, 0x10, 0, PUC_FLAGS_MEMORY }, + { PUC_PORT_TYPE_UART, 0x10, 0x38, 0, PUC_FLAGS_MEMORY }, }, }, { "Comtrol RocketPort 550/4 RJ45", - NULL, { 0x11fe, 0x8014, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, { @@ -75,7 +82,6 @@ }, { "Comtrol RocketPort 550/Quad", - NULL, { 0x11fe, 0x8015, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, { @@ -87,7 +93,6 @@ }, { "Comtrol RocketPort 550/8 RJ11 part A", - NULL, { 0x11fe, 0x8010, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, { @@ -98,7 +103,6 @@ }, }, { "Comtrol RocketPort 550/8 RJ11 part B", - NULL, { 0x11fe, 0x8011, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, { @@ -110,7 +114,6 @@ }, { "Comtrol RocketPort 550/8 Octa part A", - NULL, { 0x11fe, 0x8012, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, { @@ -121,7 +124,6 @@ }, }, { "Comtrol RocketPort 550/8 Octa part B", - NULL, { 0x11fe, 0x8013, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, { @@ -133,7 +135,6 @@ }, { "Comtrol RocketPort 550/8 part A", - NULL, { 0x11fe, 0x8018, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, { @@ -144,7 +145,6 @@ }, }, { "Comtrol RocketPort 550/8 part B", - NULL, { 0x11fe, 0x8019, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, { @@ -156,7 +156,6 @@ }, { "Comtrol RocketPort 550/16 part A", - NULL, { 0x11fe, 0x8016, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, { @@ -167,7 +166,6 @@ }, }, { "Comtrol RocketPort 550/16 part B", - NULL, { 0x11fe, 0x8017, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, { @@ -198,7 +196,6 @@ * network/misc (0x02/0x80) device. */ { "Dolphin Peripherals 4014", - NULL, { 0x10b5, 0x9050, 0xd84d, 0x6810 }, { 0xffff, 0xffff, 0xffff, 0xffff }, { @@ -219,7 +216,6 @@ * network/misc (0x02/0x80) device. */ { "Dolphin Peripherals 4035", - NULL, { 0x10b5, 0x9050, 0xd84d, 0x6808 }, { 0xffff, 0xffff, 0xffff, 0xffff }, { @@ -233,12 +229,11 @@ * (Dolpin 4025 has the same ID but only one port) */ { "Dolphin Peripherals 4036", - NULL, - { 0x1409, 0x7168, 0x0, 0x0 }, - { 0xffff, 0xffff, 0x0, 0x0 }, + { 0x1409, 0x7168, 0, 0 }, + { 0xffff, 0xffff, 0, 0 }, { - { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 8}, - { PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ * 8}, + { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 8 }, + { PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ * 8 }, }, }, @@ -264,7 +259,6 @@ /* SIIG Cyber Serial PCI 16C550 (10x family): 1S */ { "SIIG Cyber Serial PCI 16C550 (10x family)", - NULL, { 0x131f, 0x1000, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, { @@ -274,7 +268,6 @@ /* SIIG Cyber Serial PCI 16C650 (10x family): 1S */ { "SIIG Cyber Serial PCI 16C650 (10x family)", - NULL, { 0x131f, 0x1001, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, { @@ -284,7 +277,6 @@ /* SIIG Cyber Serial PCI 16C850 (10x family): 1S */ { "SIIG Cyber Serial PCI 16C850 (10x family)", - NULL, { 0x131f, 0x1002, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, { @@ -294,7 +286,6 @@ /* SIIG Cyber I/O PCI 16C550 (10x family): 1S, 1P */ { "SIIG Cyber I/O PCI 16C550 (10x family)", - NULL, { 0x131f, 0x1010, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, { @@ -305,7 +296,6 @@ /* SIIG Cyber I/O PCI 16C650 (10x family): 1S, 1P */ { "SIIG Cyber I/O PCI 16C650 (10x family)", - NULL, { 0x131f, 0x1011, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, { @@ -316,7 +306,6 @@ /* SIIG Cyber I/O PCI 16C850 (10x family): 1S, 1P */ { "SIIG Cyber I/O PCI 16C850 (10x family)", - NULL, { 0x131f, 0x1012, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, { @@ -327,7 +316,6 @@ /* SIIG Cyber Parallel PCI (10x family): 1P */ { "SIIG Cyber Parallel PCI (10x family)", - NULL, { 0x131f, 0x1020, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, { @@ -337,7 +325,6 @@ /* SIIG Cyber Parallel Dual PCI (10x family): 2P */ { "SIIG Cyber Parallel Dual PCI (10x family)", - NULL, { 0x131f, 0x1021, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, { @@ -348,7 +335,6 @@ /* SIIG Cyber Serial Dual PCI 16C550 (10x family): 2S */ { "SIIG Cyber Serial Dual PCI 16C550 (10x family)", - NULL, { 0x131f, 0x1030, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, { @@ -359,7 +345,6 @@ /* SIIG Cyber Serial Dual PCI 16C650 (10x family): 2S */ { "SIIG Cyber Serial Dual PCI 16C650 (10x family)", - NULL, { 0x131f, 0x1031, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, { @@ -370,7 +355,6 @@ /* SIIG Cyber Serial Dual PCI 16C850 (10x family): 2S */ { "SIIG Cyber Serial Dual PCI 16C850 (10x family)", - NULL, { 0x131f, 0x1032, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, { @@ -381,7 +365,6 @@ /* SIIG Cyber 2S1P PCI 16C550 (10x family): 2S, 1P */ { "SIIG Cyber 2S1P PCI 16C550 (10x family)", - NULL, { 0x131f, 0x1034, 0, 0 }, /* XXX really? */ { 0xffff, 0xffff, 0, 0 }, { @@ -393,7 +376,6 @@ /* SIIG Cyber 2S1P PCI 16C650 (10x family): 2S, 1P */ { "SIIG Cyber 2S1P PCI 16C650 (10x family)", - NULL, { 0x131f, 0x1035, 0, 0 }, /* XXX really? */ { 0xffff, 0xffff, 0, 0 }, { @@ -405,7 +387,6 @@ /* SIIG Cyber 2S1P PCI 16C850 (10x family): 2S, 1P */ { "SIIG Cyber 2S1P PCI 16C850 (10x family)", - NULL, { 0x131f, 0x1036, 0, 0 }, /* XXX really? */ { 0xffff, 0xffff, 0, 0 }, { @@ -417,7 +398,6 @@ /* SIIG Cyber 4S PCI 16C550 (10x family): 4S */ { "SIIG Cyber 4S PCI 16C550 (10x family)", - NULL, { 0x131f, 0x1050, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, { @@ -430,7 +410,6 @@ /* SIIG Cyber 4S PCI 16C650 (10x family): 4S */ { "SIIG Cyber 4S PCI 16C650 (10x family)", - NULL, { 0x131f, 0x1051, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, { @@ -443,7 +422,6 @@ /* SIIG Cyber 4S PCI 16C850 (10x family): 4S */ { "SIIG Cyber 4S PCI 16C850 (10x family)", - NULL, { 0x131f, 0x1052, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, { @@ -460,7 +438,6 @@ /* SIIG Cyber Parallel PCI (20x family): 1P */ { "SIIG Cyber Parallel PCI (20x family)", - NULL, { 0x131f, 0x2020, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, { @@ -470,7 +447,6 @@ /* SIIG Cyber Parallel Dual PCI (20x family): 2P */ { "SIIG Cyber Parallel Dual PCI (20x family)", - NULL, { 0x131f, 0x2021, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, { @@ -481,7 +457,6 @@ /* SIIG Cyber 2P1S PCI 16C550 (20x family): 1S, 2P */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Apr 18 22:30:38 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 05CD416A4D1; Sun, 18 Apr 2004 22:30:38 -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 C8DF816A4CE for ; Sun, 18 Apr 2004 22:30:37 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A4E0943D55 for ; Sun, 18 Apr 2004 22:30:37 -0700 (PDT) (envelope-from marcel@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 i3J5UbGe095904 for ; Sun, 18 Apr 2004 22:30:37 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i3J5Ubwe095901 for perforce@freebsd.org; Sun, 18 Apr 2004 22:30:37 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Sun, 18 Apr 2004 22:30:37 -0700 (PDT) Message-Id: <200404190530.i3J5Ubwe095901@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 51327 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: Mon, 19 Apr 2004 05:30:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=51327 Change 51327 by marcel@marcel_nfs on 2004/04/18 22:30:06 Argument regnum is not used in gdb_cpu_regsz(). Add __unused. Affected files ... .. //depot/projects/gdb/sys/i386/include/gdb_machdep.h#6 edit Differences ... ==== //depot/projects/gdb/sys/i386/include/gdb_machdep.h#6 (text+ko) ==== @@ -34,7 +34,7 @@ #define GDB_REG_PC 8 static __inline size_t -gdb_cpu_regsz(int regnum) +gdb_cpu_regsz(int regnum __unused) { return (sizeof(int)); } From owner-p4-projects@FreeBSD.ORG Sun Apr 18 23:00:24 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0EF7316A57F; Sun, 18 Apr 2004 23:00:24 -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 D689216A579 for ; Sun, 18 Apr 2004 23:00:23 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CA08F43D55 for ; Sun, 18 Apr 2004 23:00:23 -0700 (PDT) (envelope-from imp@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 i3J60NGe002122 for ; Sun, 18 Apr 2004 23:00:23 -0700 (PDT) (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i3J60MYL002118 for perforce@freebsd.org; Sun, 18 Apr 2004 23:00:22 -0700 (PDT) (envelope-from imp@freebsd.org) Date: Sun, 18 Apr 2004 23:00:22 -0700 (PDT) Message-Id: <200404190600.i3J60MYL002118@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Subject: PERFORCE change 51330 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: Mon, 19 Apr 2004 06:00:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=51330 Change 51330 by imp@imp_pacopaco on 2004/04/18 23:00:18 IFC @51327 Affected files ... .. //depot/projects/power/sys/alpha/alpha/interrupt.c#4 integrate .. //depot/projects/power/sys/alpha/alpha/vm_machdep.c#6 integrate .. //depot/projects/power/sys/alpha/include/sf_buf.h#2 integrate .. //depot/projects/power/sys/amd64/amd64/vm_machdep.c#9 integrate .. //depot/projects/power/sys/amd64/include/sf_buf.h#2 integrate .. //depot/projects/power/sys/cam/scsi/scsi_da.c#5 integrate .. //depot/projects/power/sys/compat/ndis/subr_ntoskrnl.c#6 integrate .. //depot/projects/power/sys/conf/NOTES#12 integrate .. //depot/projects/power/sys/conf/options#12 integrate .. //depot/projects/power/sys/dev/acpica/acpi.c#19 integrate .. //depot/projects/power/sys/dev/arl/if_arl.c#3 integrate .. //depot/projects/power/sys/dev/arl/if_arlreg.h#3 integrate .. //depot/projects/power/sys/dev/awi/awi.c#3 integrate .. //depot/projects/power/sys/dev/ciss/ciss.c#7 integrate .. //depot/projects/power/sys/dev/ciss/cissreg.h#3 integrate .. //depot/projects/power/sys/dev/ciss/cissvar.h#2 integrate .. //depot/projects/power/sys/dev/puc/puc_pccard.c#3 integrate .. //depot/projects/power/sys/dev/puc/pucdata.c#6 integrate .. //depot/projects/power/sys/dev/puc/pucvar.h#3 integrate .. //depot/projects/power/sys/dev/random/harvest.c#5 integrate .. //depot/projects/power/sys/dev/random/nehemiah.c#2 integrate .. //depot/projects/power/sys/dev/random/randomdev.c#6 integrate .. //depot/projects/power/sys/dev/random/randomdev.h#4 integrate .. //depot/projects/power/sys/dev/random/randomdev_soft.c#2 integrate .. //depot/projects/power/sys/i386/acpica/madt.c#4 integrate .. //depot/projects/power/sys/i386/i386/apic_vector.s#5 integrate .. //depot/projects/power/sys/i386/i386/exception.s#4 integrate .. //depot/projects/power/sys/i386/i386/support.s#5 integrate .. //depot/projects/power/sys/i386/isa/atpic_vector.s#4 integrate .. //depot/projects/power/sys/i386/pci/pci_pir.c#2 integrate .. //depot/projects/power/sys/ia64/ia64/vm_machdep.c#8 integrate .. //depot/projects/power/sys/ia64/include/sf_buf.h#2 integrate .. //depot/projects/power/sys/isa/psm.c#6 integrate .. //depot/projects/power/sys/kern/kern_intr.c#5 integrate .. //depot/projects/power/sys/kern/uipc_mbuf.c#5 integrate .. //depot/projects/power/sys/modules/netgraph/Makefile#3 integrate .. //depot/projects/power/sys/modules/netgraph/hub/Makefile#1 branch .. //depot/projects/power/sys/net/if.c#9 integrate .. //depot/projects/power/sys/net/if_arp.h#3 integrate .. //depot/projects/power/sys/net/if_ethersubr.c#8 integrate .. //depot/projects/power/sys/net/if_fddisubr.c#6 integrate .. //depot/projects/power/sys/net/if_iso88025subr.c#6 integrate .. //depot/projects/power/sys/net/if_ppp.c#5 integrate .. //depot/projects/power/sys/net/if_stf.c#7 integrate .. //depot/projects/power/sys/net/if_var.h#10 integrate .. //depot/projects/power/sys/net/radix.c#4 integrate .. //depot/projects/power/sys/net/radix.h#3 integrate .. //depot/projects/power/sys/net/route.c#9 integrate .. //depot/projects/power/sys/net/route.h#7 integrate .. //depot/projects/power/sys/net/rtsock.c#6 integrate .. //depot/projects/power/sys/netgraph/ng_eiface.c#4 integrate .. //depot/projects/power/sys/netgraph/ng_ether.c#6 integrate .. //depot/projects/power/sys/netgraph/ng_hub.c#1 branch .. //depot/projects/power/sys/netgraph/ng_hub.h#1 branch .. //depot/projects/power/sys/netinet/if_ether.c#8 integrate .. //depot/projects/power/sys/netinet6/nd6.c#7 integrate .. //depot/projects/power/sys/netinet6/nd6_rtr.c#5 integrate .. //depot/projects/power/sys/netipsec/xform_ipip.c#4 integrate .. //depot/projects/power/sys/powerpc/include/sf_buf.h#2 integrate .. //depot/projects/power/sys/powerpc/powerpc/vm_machdep.c#8 integrate .. //depot/projects/power/sys/sys/mbuf.h#10 integrate Differences ... ==== //depot/projects/power/sys/alpha/alpha/interrupt.c#4 (text+ko) ==== @@ -35,7 +35,7 @@ #include /* RCS ID & Copyright macro defns */ /* __KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.23 1998/02/24 07:38:01 thorpej Exp $");*/ -__FBSDID("$FreeBSD: src/sys/alpha/alpha/interrupt.c,v 1.77 2004/03/23 22:28:16 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/interrupt.c,v 1.78 2004/04/16 20:09:53 jhb Exp $"); #include #include @@ -134,7 +134,7 @@ alpha_clock_interrupt(framep); break; - case ALPHA_INTR_ERROR: /* Machine Check or Correctable Error */ + case ALPHA_INTR_ERROR: /* Machine Check or Correctable Error */ a0 = alpha_pal_rdmces(); if (platform.mcheck_handler) (*platform.mcheck_handler)(a0, framep, a1, a2); ==== //depot/projects/power/sys/alpha/alpha/vm_machdep.c#6 (text+ko) ==== @@ -67,7 +67,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.102 2004/04/03 09:16:24 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.103 2004/04/18 06:24:51 alc Exp $"); #include #include @@ -101,21 +101,7 @@ #include -static void sf_buf_init(void *arg); -SYSINIT(sock_sf, SI_SUB_MBUF, SI_ORDER_ANY, sf_buf_init, NULL) - /* - * Expanded sf_freelist head. Really an SLIST_HEAD() in disguise, with the - * sf_freelist head with the sf_lock mutex. - */ -static struct { - SLIST_HEAD(, sf_buf) sf_head; - struct mtx sf_lock; -} sf_freelist; - -static u_int sf_buf_alloc_want; - -/* * Finish a fork operation, with process p2 nearly set up. * Copy and update the pcb, set up the stack so that the child * ready to run and return to user mode. @@ -384,69 +370,24 @@ } /* - * Allocate a pool of sf_bufs (sendfile(2) or "super-fast" if you prefer. :-)) + * Allocate an sf_buf for the given vm_page. On this machine, however, there + * is no sf_buf object. Instead, an opaque pointer to the given vm_page is + * returned. */ -static void -sf_buf_init(void *arg) -{ - struct sf_buf *sf_bufs; - int i; - - mtx_init(&sf_freelist.sf_lock, "sf_bufs list lock", NULL, MTX_DEF); - SLIST_INIT(&sf_freelist.sf_head); - sf_bufs = malloc(nsfbufs * sizeof(struct sf_buf), M_TEMP, - M_NOWAIT | M_ZERO); - for (i = 0; i < nsfbufs; i++) - SLIST_INSERT_HEAD(&sf_freelist.sf_head, &sf_bufs[i], free_list); - sf_buf_alloc_want = 0; -} - -/* - * Get an sf_buf from the freelist. Will block if none are available. - */ struct sf_buf * sf_buf_alloc(struct vm_page *m, int pri) { - struct sf_buf *sf; - int error; - mtx_lock(&sf_freelist.sf_lock); - while ((sf = SLIST_FIRST(&sf_freelist.sf_head)) == NULL) { - sf_buf_alloc_want++; - mbstat.sf_allocwait++; - error = msleep(&sf_freelist, &sf_freelist.sf_lock, PVM | pri, - "sfbufa", 0); - sf_buf_alloc_want--; - - /* - * If we got a signal, don't risk going back to sleep. - */ - if (error) - break; - } - if (sf != NULL) { - SLIST_REMOVE_HEAD(&sf_freelist.sf_head, free_list); - sf->m = m; - nsfbufsused++; - nsfbufspeak = imax(nsfbufspeak, nsfbufsused); - } - mtx_unlock(&sf_freelist.sf_lock); - return (sf); + return ((struct sf_buf *)m); } /* - * Release resources back to the system. + * Free the sf_buf. In fact, do nothing because there are no resources + * associated with the sf_buf. */ void sf_buf_free(struct sf_buf *sf) { - - mtx_lock(&sf_freelist.sf_lock); - SLIST_INSERT_HEAD(&sf_freelist.sf_head, sf, free_list); - nsfbufsused--; - if (sf_buf_alloc_want > 0) - wakeup_one(&sf_freelist); - mtx_unlock(&sf_freelist.sf_lock); } /* ==== //depot/projects/power/sys/alpha/include/sf_buf.h#2 (text+ko) ==== @@ -23,35 +23,36 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/include/sf_buf.h,v 1.1 2003/11/16 06:11:24 alc Exp $ + * $FreeBSD: src/sys/alpha/include/sf_buf.h,v 1.2 2004/04/18 06:24:51 alc Exp $ */ #ifndef _MACHINE_SF_BUF_H_ #define _MACHINE_SF_BUF_H_ -#include - #include #include #include -struct sf_buf { - SLIST_ENTRY(sf_buf) free_list; /* list of free buffer slots */ - vm_page_t m; /* currently mapped page */ -}; +/* + * On this machine, the only purpose for which sf_buf is used is to implement + * an opaque pointer required by the machine-independent parts of the kernel. + * That pointer references the vm_page that is "mapped" by the sf_buf. The + * actual mapping is provided by the direct virtual-to-physical mapping. + */ +struct sf_buf; static __inline vm_offset_t sf_buf_kva(struct sf_buf *sf) { - return (ALPHA_PHYS_TO_K0SEG(sf->m->phys_addr)); + return (ALPHA_PHYS_TO_K0SEG(VM_PAGE_TO_PHYS((vm_page_t)sf))); } static __inline vm_page_t sf_buf_page(struct sf_buf *sf) { - return (sf->m); + return ((vm_page_t)sf); } #endif /* !_MACHINE_SF_BUF_H_ */ ==== //depot/projects/power/sys/amd64/amd64/vm_machdep.c#9 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.233 2004/04/11 04:26:58 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.234 2004/04/18 05:36:37 alc Exp $"); #include "opt_isa.h" #include "opt_cpu.h" @@ -85,20 +85,7 @@ static u_int cpu_reset_proxyid; static volatile u_int cpu_reset_proxy_active; #endif -static void sf_buf_init(void *arg); -SYSINIT(sock_sf, SI_SUB_MBUF, SI_ORDER_ANY, sf_buf_init, NULL) - -/* - * Expanded sf_freelist head. Really an SLIST_HEAD() in disguise, with the - * sf_freelist head with the sf_lock mutex. - */ -static struct { - SLIST_HEAD(, sf_buf) sf_head; - struct mtx sf_lock; -} sf_freelist; -static u_int sf_buf_alloc_want; - /* * Finish a fork operation, with process p2 nearly set up. * Copy and update the pcb, set up the stack so that the child @@ -439,69 +426,24 @@ } /* - * Allocate a pool of sf_bufs (sendfile(2) or "super-fast" if you prefer. :-)) - */ -static void -sf_buf_init(void *arg) -{ - struct sf_buf *sf_bufs; - int i; - - mtx_init(&sf_freelist.sf_lock, "sf_bufs list lock", NULL, MTX_DEF); - SLIST_INIT(&sf_freelist.sf_head); - sf_bufs = malloc(nsfbufs * sizeof(struct sf_buf), M_TEMP, - M_NOWAIT | M_ZERO); - for (i = 0; i < nsfbufs; i++) - SLIST_INSERT_HEAD(&sf_freelist.sf_head, &sf_bufs[i], free_list); - sf_buf_alloc_want = 0; -} - -/* - * Get an sf_buf from the freelist. Will block if none are available. + * Allocate an sf_buf for the given vm_page. On this machine, however, there + * is no sf_buf object. Instead, an opaque pointer to the given vm_page is + * returned. */ struct sf_buf * sf_buf_alloc(struct vm_page *m, int pri) { - struct sf_buf *sf; - int error; - mtx_lock(&sf_freelist.sf_lock); - while ((sf = SLIST_FIRST(&sf_freelist.sf_head)) == NULL) { - sf_buf_alloc_want++; - mbstat.sf_allocwait++; - error = msleep(&sf_freelist, &sf_freelist.sf_lock, PVM | pri, - "sfbufa", 0); - sf_buf_alloc_want--; - - /* - * If we got a signal, don't risk going back to sleep. - */ - if (error) - break; - } - if (sf != NULL) { - SLIST_REMOVE_HEAD(&sf_freelist.sf_head, free_list); - sf->m = m; - nsfbufsused++; - nsfbufspeak = imax(nsfbufspeak, nsfbufsused); - } - mtx_unlock(&sf_freelist.sf_lock); - return (sf); + return ((struct sf_buf *)m); } /* - * Release resources back to the system. + * Free the sf_buf. In fact, do nothing because there are no resources + * associated with the sf_buf. */ void sf_buf_free(struct sf_buf *sf) { - - mtx_lock(&sf_freelist.sf_lock); - SLIST_INSERT_HEAD(&sf_freelist.sf_head, sf, free_list); - nsfbufsused--; - if (sf_buf_alloc_want > 0) - wakeup_one(&sf_freelist); - mtx_unlock(&sf_freelist.sf_lock); } /* ==== //depot/projects/power/sys/amd64/include/sf_buf.h#2 (text+ko) ==== @@ -23,35 +23,36 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/sf_buf.h,v 1.1 2003/11/16 06:11:25 alc Exp $ + * $FreeBSD: src/sys/amd64/include/sf_buf.h,v 1.2 2004/04/18 05:36:37 alc Exp $ */ #ifndef _MACHINE_SF_BUF_H_ #define _MACHINE_SF_BUF_H_ -#include - #include #include #include -struct sf_buf { - SLIST_ENTRY(sf_buf) free_list; /* list of free buffer slots */ - vm_page_t m; /* currently mapped page */ -}; +/* + * On this machine, the only purpose for which sf_buf is used is to implement + * an opaque pointer required by the machine-independent parts of the kernel. + * That pointer references the vm_page that is "mapped" by the sf_buf. The + * actual mapping is provided by the direct virtual-to-physical mapping. + */ +struct sf_buf; static __inline vm_offset_t sf_buf_kva(struct sf_buf *sf) { - return (PHYS_TO_DMAP(sf->m->phys_addr)); + return (PHYS_TO_DMAP(VM_PAGE_TO_PHYS((vm_page_t)sf))); } static __inline vm_page_t sf_buf_page(struct sf_buf *sf) { - return (sf->m); + return ((vm_page_t)sf); } #endif /* !_MACHINE_SF_BUF_H_ */ ==== //depot/projects/power/sys/cam/scsi/scsi_da.c#5 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.164 2004/02/22 01:14:54 cperciva Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.166 2004/04/19 04:14:09 njl Exp $"); #ifdef _KERNEL #include "opt_da.h" @@ -238,151 +238,55 @@ {T_DIRECT, SIP_MEDIA_FIXED, "COMPAQ", "RAID*", "*"}, /*quirks*/ DA_Q_NO_SYNC_CACHE }, -#ifdef DA_OLD_QUIRKS - /* USB floppy devices supported by umass(4) */ - { - /* - * This USB floppy drive uses the UFI command set. This - * command set is a derivative of the ATAPI command set and - * does not support READ_6 commands only READ_10. It also does - * not support sync cache (0x35). - */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "Y-E DATA", "USB-FDU", "*"}, - /*quirks*/ DA_Q_NO_SYNC_CACHE - }, - { - /* Another USB floppy */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "MATSHITA", "FDD CF-VFDU*","*"}, - /*quirks*/ DA_Q_NO_SYNC_CACHE - }, - { - /* - * The vendor, product and version strings coming from the - * controller are null terminated instead of being padded with - * spaces. The trailing wildcard character '*' is required. - */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "SMSC*", "USB FDC*","*"}, - /*quirks*/ DA_Q_NO_SYNC_CACHE - }, - { - /* - * SmartDisk (Mitsumi) USB floppy drive - * PR: kern/50226 - */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "MITSUMI", "USB FDD", "*"}, - /*quirks*/ DA_Q_NO_SYNC_CACHE - }, /* USB mass storage devices supported by umass(4) */ { /* - * Sony Memory Stick adapter MSAC-US1 and - * Sony PCG-C1VJ Internal Memory Stick Slot (MSC-U01). - * Make all sony MS* products use this quirk. + * EXATELECOM (Sigmatel) i-Bead 100/105 USB Flash MP3 Player + * PR: kern/51675 */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "Sony", "MS*", "*"}, + {T_DIRECT, SIP_MEDIA_REMOVABLE, "EXATEL", "i-BEAD10*", "*"}, /*quirks*/ DA_Q_NO_SYNC_CACHE }, { /* - * Sony Memory Stick adapter for the CLIE series - * of PalmOS PDA's + * Power Quotient Int. (PQI) USB flash key + * PR: kern/53067 */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "Sony", "CLIE*", "*"}, - /*quirks*/ DA_Q_NO_SYNC_CACHE - }, - { - /* - * Intelligent Stick USB disk-on-key - * PR: kern/53005 - */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "USB Card", - "IntelligentStick*", "*"}, - /*quirks*/ DA_Q_NO_SYNC_CACHE - }, - { - /* - * Sony DSC cameras (DSC-S30, DSC-S50, DSC-S70) - */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "Sony", "Sony DSC", "*"}, - /*quirks*/ DA_Q_NO_SYNC_CACHE - }, - { - /* - * Microtech USB CameraMate - */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "eUSB Compact*", - "Compact Flash*", "*"}, - /*quirks*/ DA_Q_NO_SYNC_CACHE - }, - { - /* - * Olympus digital cameras (C-3040ZOOM, C-2040ZOOM, C-1) - */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "OLYMPUS", "C-*", "*"}, - /*quirks*/ DA_Q_NO_SYNC_CACHE - }, - { - /* - * Olympus digital cameras (E-100RS, E-10). - */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "OLYMPUS", "E-*", "*"}, - /*quirks*/ DA_Q_NO_SYNC_CACHE - }, - { - /* - * KingByte Pen Drives - */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "NO BRAND", "PEN DRIVE", "*"}, - /*quirks*/ DA_Q_NO_SYNC_CACHE + {T_DIRECT, SIP_MEDIA_REMOVABLE, "Generic*", "USB Flash Disk*", + "*"}, /*quirks*/ DA_Q_NO_SYNC_CACHE + }, + { + /* + * Creative Nomad MUVO mp3 player (USB) + * PR: kern/53094 + */ + {T_DIRECT, SIP_MEDIA_REMOVABLE, "CREATIVE", "NOMAD_MUVO", "*"}, + /*quirks*/ DA_Q_NO_SYNC_CACHE|DA_Q_NO_PREVENT }, { /* - * Minolta Dimage E203 + * Jungsoft NEXDISK USB flash key + * PR: kern/54737 */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "MINOLTA", "DiMAGE E203", "*"}, + {T_DIRECT, SIP_MEDIA_REMOVABLE, "JUNGSOFT", "NEXDISK*", "*"}, /*quirks*/ DA_Q_NO_SYNC_CACHE }, { /* - * Daisy Technology PhotoClip on Zoran chip - * PR: kern/43580 + * FreeDik USB Mini Data Drive + * PR: kern/54786 */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "ZORAN", "COACH", "*"}, - /*quirks*/ DA_Q_NO_SYNC_CACHE + {T_DIRECT, SIP_MEDIA_REMOVABLE, "FreeDik*", "Mini Data Drive", + "*"}, /*quirks*/ DA_Q_NO_SYNC_CACHE }, { /* - * Sony USB Key-Storage - * PR: kern/46386 + * Sigmatel USB Flash MP3 Player + * PR: kern/57046 */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "Sony", "Storage Media", "*"}, - /*quirks*/ DA_Q_NO_SYNC_CACHE + {T_DIRECT, SIP_MEDIA_REMOVABLE, "SigmaTel", "MSCN", "*"}, + /*quirks*/ DA_Q_NO_SYNC_CACHE|DA_Q_NO_PREVENT }, -#endif /* DA_OLD_QUIRKS */ - { - /* - * EXATELECOM (Sigmatel) i-Bead 100/105 USB Flash MP3 Player - * PR: kern/51675 - */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "EXATEL", "i-BEAD10*", "*"}, - /*quirks*/ DA_Q_NO_SYNC_CACHE - }, - { - /* - * Jungsoft NEXDISK USB flash key - * PR: kern/54737 - */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "JUNGSOFT", "NEXDISK*", "*"}, - /*quirks*/ DA_Q_NO_SYNC_CACHE - }, - { - /* - * Creative Nomad MUVO mp3 player (USB) - * PR: kern/53094 - */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "CREATIVE", "NOMAD_MUVO", "*"}, - /*quirks*/ DA_Q_NO_SYNC_CACHE|DA_Q_NO_PREVENT - }, }; static disk_strategy_t dastrategy; ==== //depot/projects/power/sys/compat/ndis/subr_ntoskrnl.c#6 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.35 2004/04/16 00:04:28 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.36 2004/04/18 18:38:59 wpaul Exp $"); #include #include @@ -1029,7 +1029,7 @@ __asm__ __volatile__ ("" : "=c" (lock)); while (atomic_cmpset_acq_int((volatile u_int *)lock, 0, 1) == 0) - /* do nothing */; + /* sit and spin */; return; } @@ -1041,7 +1041,7 @@ __asm__ __volatile__ ("" : "=c" (lock)); - atomic_cmpset_rel_int((volatile u_int *)lock, 1, 0); + atomic_store_rel_int((volatile u_int *)lock, 0); return; } ==== //depot/projects/power/sys/conf/NOTES#12 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1214 2004/04/12 02:36:51 imp Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1215 2004/04/19 03:33:54 njl Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -968,12 +968,6 @@ options SCSI_NO_OP_STRINGS options SCSI_DELAY=8000 # Be pessimistic about Joe SCSI device -# Options for the CAM SCSI disk driver: -# DA_OLD_QUIRKS: Restore old USB and firewire quirks that have been -# deprecated. Please also email scsi@freebsd.org if you -# have a device that needs this option. -options DA_OLD_QUIRKS - # Options for the CAM CDROM driver: # CHANGER_MIN_BUSY_SECONDS: Guaranteed minimum time quantum for a changer LUN # CHANGER_MAX_BUSY_SECONDS: Maximum time quantum per changer LUN, only ==== //depot/projects/power/sys/conf/options#12 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.440 2004/04/11 20:01:18 imp Exp $ +# $FreeBSD: src/sys/conf/options,v 1.441 2004/04/19 03:33:55 njl Exp $ # # On the handling of kernel options # @@ -241,8 +241,6 @@ CHANGER_MIN_BUSY_SECONDS opt_cd.h CHANGER_MAX_BUSY_SECONDS opt_cd.h -DA_OLD_QUIRKS opt_da.h - # Options used only in cam/scsi/scsi_sa.c. SA_IO_TIMEOUT opt_sa.h SA_SPACE_TIMEOUT opt_sa.h ==== //depot/projects/power/sys/dev/acpica/acpi.c#19 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.138 2004/04/14 17:48:33 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.139 2004/04/16 16:27:37 njl Exp $ */ #include "opt_acpi.h" @@ -265,6 +265,7 @@ */ AcpiGbl_AllMethodsSerialized = acpi_serialize_methods; AcpiGbl_CreateOsiMethod = acpi_osi_method; + AcpiGbl_LeaveWakeGpesDisabled = FALSE; /* Start up the ACPI CA subsystem. */ #ifdef ACPI_DEBUGGER ==== //depot/projects/power/sys/dev/arl/if_arl.c#3 (text+ko) ==== @@ -3,7 +3,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/arl/if_arl.c,v 1.4 2004/04/15 20:31:07 luigi Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/arl/if_arl.c,v 1.5 2004/04/17 20:30:05 fjoe Exp $"); #include "opt_inet.h" @@ -69,6 +69,9 @@ */ #define ARL_CHECKREG(sc) (ar->registrationMode && ar->registrationStatus == 0) +#define GET_ARL_PARAM(name) (arcfg.name = ar->name) +#define SET_ARL_PARAM(name) (ar->name = arcfg.name) + #ifndef BPF_MTAP #define BPF_MTAP(_ifp,_m) \ do { \ @@ -114,6 +117,13 @@ devclass_t arl_devclass; +u_int8_t rate2media[4] = { + IFM_IEEE80211_DS354k, + IFM_IEEE80211_DS512k, + IFM_IEEE80211_DS1, + IFM_IEEE80211_DS2 +}; + /* * Copy config values to local cache */ @@ -194,13 +204,16 @@ ifmedia_init(&sc->arl_ifmedia, 0, arl_media_change, arl_media_status); #define ADD(s, o) ifmedia_add(&sc->arl_ifmedia, \ IFM_MAKEWORD(IFM_IEEE80211, (s), (o), 0), 0, NULL) + ADD(IFM_IEEE80211_DS354k, 0); + ADD(IFM_IEEE80211_DS354k, IFM_IEEE80211_ADHOC); + ADD(IFM_IEEE80211_DS512k, 0); + ADD(IFM_IEEE80211_DS512k, IFM_IEEE80211_ADHOC); ADD(IFM_IEEE80211_DS1, 0); ADD(IFM_IEEE80211_DS1, IFM_IEEE80211_ADHOC); ADD(IFM_IEEE80211_DS2, 0); ADD(IFM_IEEE80211_DS2, IFM_IEEE80211_ADHOC); ifmedia_set(&sc->arl_ifmedia, IFM_MAKEWORD(IFM_IEEE80211, - arcfg.spreadingCode == 4 ? IFM_IEEE80211_DS2 : IFM_IEEE80211_DS1 - , 0, 0)); + rate2media[arcfg.spreadingCode - 1], 0, 0)); #undef ADD /* @@ -1152,16 +1165,19 @@ int i; static int cache_slot = 0; static int wrapindex = 0; + u_int8_t zero[6] = {0, 0, 0, 0, 0, 0}; + u_char *mac; if ((ntohs(eh->ether_type) != ETHERTYPE_IP)) { return; } + mac = (dir == ARLCACHE_RX ? eh->ether_shost : eh->ether_dhost); + for (i = 0; i < MAXARLCACHE; i++) { - if (!bcmp(dir == ARLCACHE_RX ? eh->ether_shost : eh->ether_dhost, - sc->arl_sigcache[i].macsrc, 6)) { + if (!bcmp(zero, sc->arl_sigcache[i].macsrc, 6) || + !bcmp(mac, sc->arl_sigcache[i].macsrc, 6)) break; - } } if (i < MAXARLCACHE) @@ -1187,12 +1203,19 @@ struct arl_softc *sc = ifp->if_softc; int otype = arcfg.registrationMode; int orate = arcfg.spreadingCode; + int nrate, i; + + nrate = IFM_SUBTYPE(sc->arl_ifmedia.ifm_cur->ifm_media); + + for(i = 1; i <= 4; i++) { + if (rate2media[i - 1] == nrate) + break; + } - arcfg.spreadingCode = ieee80211_media2rate( - IFM_SUBTYPE(sc->arl_ifmedia.ifm_cur->ifm_media)); + if (i == 5) + return (EINVAL); - if (arcfg.spreadingCode == 2) - arcfg.spreadingCode = 3; + arcfg.spreadingCode = i; /* XXX Need fix for PSP mode */ if ((sc->arl_ifmedia.ifm_cur->ifm_media & IFM_IEEE80211_ADHOC) != 0) @@ -1213,14 +1236,14 @@ struct ifmediareq *imr; { struct arl_softc *sc = ifp->if_softc; - int rate = (arcfg.spreadingCode == 4 ? 4 : 2); imr->ifm_active = IFM_IEEE80211; if (arcfg.registrationMode == 0) imr->ifm_active |= IFM_IEEE80211_ADHOC; - imr->ifm_active |= ieee80211_rate2media(NULL, rate, IEEE80211_T_DS); + imr->ifm_active |= IFM_MAKEWORD(IFM_IEEE80211, + rate2media[arcfg.spreadingCode - 1], 0, 0); imr->ifm_status = IFM_AVALID; if (!ARL_CHECKREG(sc)) imr->ifm_status |= IFM_ACTIVE; ==== //depot/projects/power/sys/dev/arl/if_arlreg.h#3 (text+ko) ==== @@ -1,6 +1,6 @@ /* * $RISS: if_arl/dev/arl/if_arlreg.h,v 1.4 2004/03/16 04:43:27 count Exp $ - * $FreeBSD: src/sys/dev/arl/if_arlreg.h,v 1.3 2004/04/13 19:25:23 fjoe Exp $ + * $FreeBSD: src/sys/dev/arl/if_arlreg.h,v 1.4 2004/04/17 20:30:05 fjoe Exp $ */ #ifndef _IF_ARLREG_H @@ -299,9 +299,6 @@ } \ } while (0); -#define GET_ARL_PARAM(name) (arcfg.name = ar->name) -#define SET_ARL_PARAM(name) (ar->name = arcfg.name) - #ifdef _KERNEL void arl_release_resources (device_t); int arl_alloc_memory (device_t, int, int); ==== //depot/projects/power/sys/dev/awi/awi.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $NetBSD: awi.c,v 1.61 2004/01/15 13:29:05 onoe Exp $ */ +/* $NetBSD: awi.c,v 1.62 2004/01/16 14:13:15 onoe Exp $ */ /*- * Copyright (c) 1999,2000,2001 The NetBSD Foundation, Inc. @@ -86,10 +86,10 @@ #include #ifdef __NetBSD__ -__KERNEL_RCSID(0, "$NetBSD: awi.c,v 1.61 2004/01/15 13:29:05 onoe Exp $"); +__KERNEL_RCSID(0, "$NetBSD: awi.c,v 1.62 2004/01/16 14:13:15 onoe Exp $"); #endif #ifdef __FreeBSD__ -__FBSDID("$FreeBSD: src/sys/dev/awi/awi.c,v 1.31 2004/03/20 19:57:46 mdodd Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/awi/awi.c,v 1.32 2004/04/18 01:05:02 onoe Exp $"); #endif #include "opt_inet.h" @@ -1112,7 +1112,7 @@ } sc->sc_mib_mac.aPromiscuous_Enable = 0; #ifdef __FreeBSD__ - if (ifp->if_amcount != 0) + if (ifp->if_flags & IFF_ALLMULTI) goto set_mib; TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) { if (ifma->ifma_addr->sa_family != AF_LINK) @@ -1141,10 +1141,12 @@ sc->sc_mib_local.Accept_All_Multicast_Dis = 1; set_mib: +#ifndef __FreeBSD__ if (sc->sc_mib_local.Accept_All_Multicast_Dis) ifp->if_flags &= ~IFF_ALLMULTI; else ifp->if_flags |= IFF_ALLMULTI; +#endif sc->sc_mib_mgt.Wep_Required = (sc->sc_ic.ic_flags & IEEE80211_F_WEPON) ? AWI_WEP_ON : AWI_WEP_OFF; @@ -1926,7 +1928,7 @@ case IEEE80211_S_ASSOC: case IEEE80211_S_INIT: ieee80211_begin_scan(ifp); - /* FALLTHRU */ + break; case IEEE80211_S_SCAN: /* scan next */ break; @@ -2084,8 +2086,11 @@ return (*sc->sc_newstate)(ic, nstate, arg); out: - if (error != 0) + if (error != 0) { + if (error == EINPROGRESS) + error = 0; return error; + } return (*sc->sc_newstate)(ic, nstate, arg); } ==== //depot/projects/power/sys/dev/ciss/ciss.c#7 (text+ko) ==== @@ -1,5 +1,6 @@ /*- * Copyright (c) 2001 Michael Smith + * Copyright (c) 2004 Paul Saab * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -23,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ciss/ciss.c,v 1.39 2004/04/14 19:45:07 ps Exp $ + * $FreeBSD: src/sys/dev/ciss/ciss.c,v 1.43 2004/04/19 00:57:29 ps Exp $ */ /* @@ -57,7 +58,7 @@ * are available, but we aren't supposed to know about them, and it is * dubious whether they would provide major performance improvements * except under extreme load. - * + * * Currently the only supported CISS adapters are the Compaq Smart * Array 5* series (5300, 5i, 532). Even with only three adapters, * Compaq still manage to have interface variations. @@ -66,6 +67,11 @@ * Thanks must go to Fred Harris and Darryl DeVinney at Compaq, as * well as Paul Saab at Yahoo! for their assistance in making this * driver happen. + * + * More thanks must go to John Cagle at HP for the countless hours + * spent making this driver "work" with the MSA* series storage + * enclosures. Without his help (and nagging), this driver could not + * be used with these enclosures. */ #include @@ -75,6 +81,8 @@ #include #include #include +#include +#include #include #include @@ -116,12 +124,16 @@ int nseg, int error); static int ciss_identify_adapter(struct ciss_softc *sc); static int ciss_init_logical(struct ciss_softc *sc); +static int ciss_init_physical(struct ciss_softc *sc); static int ciss_identify_logical(struct ciss_softc *sc, struct ciss_ldrive *ld); static int ciss_get_ldrive_status(struct ciss_softc *sc, struct ciss_ldrive *ld); static int ciss_update_config(struct ciss_softc *sc); -static int ciss_accept_media(struct ciss_softc *sc, int ldrive, int async); +static int ciss_accept_media(struct ciss_softc *sc, struct ciss_ldrive *ld, + int async); static void ciss_accept_media_complete(struct ciss_request *cr); static void ciss_free(struct ciss_softc *sc); +static void ciss_spawn_notify_thread(struct ciss_softc *sc); +static void ciss_kill_notify_thread(struct ciss_softc *sc); /* request submission/completion */ static int ciss_start(struct ciss_request *cr); @@ -155,7 +167,8 @@ /* CAM interface */ static int ciss_cam_init(struct ciss_softc *sc); -static void ciss_cam_rescan_target(struct ciss_softc *sc, int target); +static void ciss_cam_rescan_target(struct ciss_softc *sc, + int bus, int target); static void ciss_cam_rescan_all(struct ciss_softc *sc); static void ciss_cam_rescan_callback(struct cam_periph *periph, union ccb *ccb); static void ciss_cam_action(struct cam_sim *sim, union ccb *ccb); @@ -164,8 +177,9 @@ static void ciss_cam_poll(struct cam_sim *sim); static void ciss_cam_complete(struct ciss_request *cr); static void ciss_cam_complete_fixup(struct ciss_softc *sc, struct ccb_scsiio *csio); -static struct cam_periph *ciss_find_periph(struct ciss_softc *sc, int target); -static int ciss_name_device(struct ciss_softc *sc, int target); +static struct cam_periph *ciss_find_periph(struct ciss_softc *sc, + int bus, int target); +static int ciss_name_device(struct ciss_softc *sc, int bus, int target); /* periodic status monitoring */ static void ciss_periodic(void *arg); @@ -280,7 +294,7 @@ return(-10); } return(ENOENT); -} +} /************************************************************************ * Attach the driver to this adapter. @@ -350,7 +364,7 @@ error = ENXIO; goto out; } - + /* * Do PCI-specific init. */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Apr 18 23:18:47 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C68B716A4D0; Sun, 18 Apr 2004 23:18:46 -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 9A79A16A4CE for ; Sun, 18 Apr 2004 23:18:46 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9104B43D2D for ; Sun, 18 Apr 2004 23:18:46 -0700 (PDT) (envelope-from marcel@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 i3J6IkGe007051 for ; Sun, 18 Apr 2004 23:18:46 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i3J6Ik0G007048 for perforce@freebsd.org; Sun, 18 Apr 2004 23:18:46 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Sun, 18 Apr 2004 23:18:46 -0700 (PDT) Message-Id: <200404190618.i3J6Ik0G007048@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 51331 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: Mon, 19 Apr 2004 06:18:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=51331 Change 51331 by marcel@marcel_nfs on 2004/04/18 23:17:49 Bring in the packet code from the kernel. Duplicate for now. Still needed: o kvm_openfiles() -- which implies argument parsing o gdb_packet() -- to handle remote protocol packets. Affected files ... .. //depot/projects/gdb/usr.bin/kgdb/Makefile#4 edit .. //depot/projects/gdb/usr.bin/kgdb/kgdb.h#1 add .. //depot/projects/gdb/usr.bin/kgdb/main.c#5 edit .. //depot/projects/gdb/usr.bin/kgdb/md_i386.c#1 add .. //depot/projects/gdb/usr.bin/kgdb/packet.c#1 add Differences ... ==== //depot/projects/gdb/usr.bin/kgdb/Makefile#4 (text+ko) ==== @@ -1,10 +1,10 @@ # $FreeBSD$ PROG= kgdb -SRCS= main.c +SRCS= main.c md_${MACHINE_ARCH}.c packet.c -DPADD= ${LIBUTIL} -LDADD= -lutil +DPADD= ${LIBKVM} ${LIBUTIL} +LDADD= -lkvm -lutil WARNS?= 4 ==== //depot/projects/gdb/usr.bin/kgdb/main.c#5 (text+ko) ==== @@ -35,6 +35,9 @@ #include #include #include +#include +#include +#include #include #include #include @@ -43,15 +46,20 @@ #include -int gdb_in, gdb_out; +#include "kgdb.h" + +int gdb_stdin; +int gdb_stdout; +int gdb_rp_fd; +char *gdb_rp_dev; pid_t gdb_pid; +kvm_t *kvm; +struct kthr *curkthr; + char *cmdfile_name; int cmdfile_fd; -char *pty_dev; -int pty_master, pty_slave; - static const char cmd_set_prompt[] = "set prompt (kgdb) \n"; static void @@ -73,38 +81,21 @@ *wr = f[1]; } -static void -launch_gdb(void) +int +gdb_packet_recv(char *p, size_t sz) { - char *command; - int in, out; - int f, fmax; + return (read(gdb_rp_fd, p, sz)); +} - close(cmdfile_fd); +int +gdb_packet_send(const char *p, size_t sz) +{ + return (write(gdb_rp_fd, p, sz)); +} - mkpipe(&in, &gdb_in); - mkpipe(&gdb_out, &out); - - gdb_pid = fork(); - if (gdb_pid == -1) - err(1, "fork(2)"); - if (gdb_pid == 0) { - if (asprintf(&command, "--command=%s", cmdfile_name) < 0) - err(1, "asprintf(3)"); - /* Dup stderr last so that err(3) works as long as possible. */ - if (dup2(in, 0) == -1 || dup2(out, 1) == -1 || - dup2(out, 2) == -1) - err(1, "dup2(2)"); - fmax = getdtablesize(); - for (f = 3; f < fmax; f++) - close(f); - execlp("gdb", "gdb", command, NULL); - _exit(1); - } - - close(in); - close(out); - close(pty_slave); +void gdb_packet(void) +{ + printf("`%s'\n", gdb_rxp); } int @@ -113,7 +104,8 @@ char buf[256]; fd_set rfds, wfds, xfds; ssize_t sz; - int status; + int fdin, fdout; + int f, nfds, status; cmdfile_name = strdup("/tmp/kgdb.XXXXXXXX"); if (cmdfile_name == NULL) @@ -126,57 +118,79 @@ if (write(cmdfile_fd, cmd_set_prompt, sizeof(cmd_set_prompt) - 1) < 0) err(1, "write(2)"); - if (openpty(&pty_master, &pty_slave, buf, NULL, NULL) == -1) + if (openpty(&gdb_rp_fd, &f, buf, NULL, NULL) == -1) err(1, "openpty(3)"); - pty_dev = strdup(buf); + close(f); + gdb_rp_dev = strdup(buf); - sz = snprintf(buf, sizeof(buf), "target remote %s\n", pty_dev); + sz = snprintf(buf, sizeof(buf), "target remote %s\n", gdb_rp_dev); if (write(cmdfile_fd, buf, sz) < 0) err(1, "write(2)"); - launch_gdb(); + close(cmdfile_fd); + + mkpipe(&fdin, &gdb_stdin); + mkpipe(&gdb_stdout, &fdout); + + gdb_pid = fork(); + if (gdb_pid == -1) + err(1, "fork(2)"); + if (gdb_pid == 0) { + snprintf(buf, sizeof(buf), "--command=%s", cmdfile_name); + /* Dup stderr last so that err(3) works as long as possible. */ + if (dup2(fdin, 0) == -1 || dup2(fdout, 1) == -1 || + dup2(fdout, 2) == -1) + err(1, "dup2(2)"); + nfds = getdtablesize(); + for (f = 3; f < nfds; f++) + close(f); + execlp("gdb", "gdb", buf, NULL); + _exit(1); + } + + close(fdin); + close(fdout); + + nfds = (gdb_stdin > gdb_stdout) ? gdb_stdin : gdb_stdout; + nfds = (gdb_rp_fd > nfds) ? gdb_rp_fd : nfds; + nfds++; while (1) { FD_ZERO(&rfds); FD_ZERO(&wfds); FD_ZERO(&xfds); FD_SET(0, &rfds); - FD_SET(gdb_out, &rfds); - FD_SET(pty_master, &rfds); - FD_SET(gdb_in, &xfds); - FD_SET(gdb_out, &xfds); - FD_SET(pty_master, &xfds); - if (select(gdb_out + 1, &rfds, &wfds, &xfds, NULL) == -1) { + FD_SET(gdb_stdout, &rfds); + FD_SET(gdb_rp_fd, &rfds); + FD_SET(gdb_stdin, &xfds); + FD_SET(gdb_stdout, &xfds); + if (select(nfds, &rfds, &wfds, &xfds, NULL) == -1) { if (errno != EINTR) err(1, "select(2)"); continue; } - if (FD_ISSET(gdb_in, &xfds) || FD_ISSET(gdb_out, &xfds) || - FD_ISSET(pty_master, &xfds)) + if (FD_ISSET(gdb_stdin, &xfds) || FD_ISSET(gdb_stdout, &xfds)) break; if (FD_ISSET(0, &rfds)) { sz = read(0, buf, sizeof(buf)); if (sz > 0) - sz = write(gdb_in, buf, sz); + sz = write(gdb_stdin, buf, sz); } - if (FD_ISSET(gdb_out, &rfds)) { - sz = read(gdb_out, buf, sizeof(buf)); + if (FD_ISSET(gdb_stdout, &rfds)) { + sz = read(gdb_stdout, buf, sizeof(buf)); if (sz > 0) sz = write(1, buf, sz); } - if (FD_ISSET(pty_master, &rfds)) { - sz = read(pty_master, buf, sizeof(buf)); - if (sz > 0) { - buf[sz] = 0; - printf("``%s''\n", buf); - write(pty_master, "+", 1); - } + if (FD_ISSET(gdb_rp_fd, &rfds)) { + sz = read(gdb_rp_fd, buf, sizeof(buf)); + if (sz > 0) + gdb_packet_data(buf, sz); } } - close(gdb_in); - close(gdb_out); - close(pty_master); + close(gdb_rp_fd); + close(gdb_stdin); + close(gdb_stdout); wait4(gdb_pid, &status, 0, NULL); return (WEXITSTATUS(status)); From owner-p4-projects@FreeBSD.ORG Sun Apr 18 23:43:18 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 37C2716A4FB; Sun, 18 Apr 2004 23:43:17 -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 DF9FC16A4D3 for ; Sun, 18 Apr 2004 23:43:16 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D6B7F43D31 for ; Sun, 18 Apr 2004 23:43:16 -0700 (PDT) (envelope-from scottl@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 i3J6hGGe013361 for ; Sun, 18 Apr 2004 23:43:16 -0700 (PDT) (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i3J6hGMB013358 for perforce@freebsd.org; Sun, 18 Apr 2004 23:43:16 -0700 (PDT) (envelope-from scottl@freebsd.org) Date: Sun, 18 Apr 2004 23:43:16 -0700 (PDT) Message-Id: <200404190643.i3J6hGMB013358@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Subject: PERFORCE change 51332 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: Mon, 19 Apr 2004 06:43:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=51332 Change 51332 by scottl@scottl-junior-camlock on 2004/04/18 23:42:58 Add probescheduleprobe() to decouple the invocation of probeschedule(). Clean up a bunch of other little things that were bothing me. With the change, the probe driver is pretty much fully decoupled and ready for lockdown. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/cam_probe.c#7 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/cam_probe.c#7 (text+ko) ==== @@ -81,16 +81,18 @@ PERIPHDRIVER_DECLARE(probe, probe_driver); typedef enum { - WORK_EXECUTE_CCB = 0x1, - WORK_XPT_SCHED = 0x2, + WORK_EXECUTE_CCB, + WORK_XPT_SCHED, + WORK_PROBE_SCHED } cam_workflags; struct cam_workitem { TAILQ_ENTRY(cam_workitem) work_link; cam_workflags command; void *data1; - uintptr_t data2; + void *data2; void (*cbfcnp)(void *); + void *cbdata; }; typedef enum { @@ -135,14 +137,27 @@ } static void -probeschedule1(struct cam_periph *periph, uint32_t priority) +probereschedule(struct cam_periph *periph, uint32_t priority) { probe_softc *softc; softc = (probe_softc *)periph->softc; + softc->work->command = WORK_XPT_SCHED; softc->work->data1 = periph; - softc->work->data2 = (uintptr_t)priority; + softc->work->data2 = (void *)(uintptr_t)priority; + softc->work->cbfcnp = NULL; + probe_queue_work(softc->work); +} + +static void +probeschedprobe(struct cam_periph *periph) +{ + probe_softc *softc; + + softc = (probe_softc *)periph->softc; + softc->work->command = WORK_PROBE_SCHED; + softc->work->data1 = periph; softc->work->cbfcnp = NULL; probe_queue_work(softc->work); } @@ -171,7 +186,12 @@ case WORK_XPT_SCHED: mtx_lock(&Giant); xpt_schedule((struct cam_periph *)work->data1, - (uint32_t)(work->data2)); + (uint32_t)(uintptr_t)(work->data2)); + mtx_unlock(&Giant); + break; + case WORK_PROBE_SCHED: + mtx_lock(&Giant); + probeschedule((struct cam_periph *)work->data1); mtx_unlock(&Giant); break; default: @@ -179,7 +199,7 @@ } if (work->cbfcnp != NULL) - work->cbfcnp(work->data1); + work->cbfcnp(work->cbdata); mtx_lock(&probe_workmtx); } @@ -247,7 +267,7 @@ */ cam_periph_freeze_after_event(periph, &periph->path->bus->last_reset, scsi_delay); - probeschedule(periph); + probeschedprobe(periph); return(CAM_REQ_CMP); } @@ -494,7 +514,7 @@ } softc->action = PROBE_INQUIRY; xpt_release_ccb(done_ccb); - probeschedule1(periph, priority); + probereschedule(periph, priority); return; } case PROBE_INQUIRY: @@ -529,7 +549,7 @@ && alen > (SHORT_INQUIRY_LENGTH - 4)) { softc->action = PROBE_FULL_INQUIRY; xpt_release_ccb(done_ccb); - probeschedule1(periph, priority); + probereschedule(periph, priority); return; } @@ -546,7 +566,7 @@ path->device->flags &= ~CAM_DEV_UNCONFIGURED; xpt_release_ccb(done_ccb); - probeschedule1(periph, priority); + probereschedule(periph, priority); return; } default: @@ -607,7 +627,7 @@ xpt_release_ccb(done_ccb); free(mode_hdr, M_TEMP); softc->action = PROBE_SERIAL_NUM; - probeschedule1(periph, priority); + probereschedule(periph, priority); return; } case PROBE_SERIAL_NUM: @@ -713,7 +733,7 @@ * perform any necessary transfer negotiation. */ softc->action = PROBE_TUR_FOR_NEGOTIATION; - probeschedule1(periph, priority); + probereschedule(periph, priority); return; } xpt_release_ccb(done_ccb); @@ -746,7 +766,7 @@ cam_periph_invalidate(periph); cam_periph_release(periph); } else { - probeschedule(periph); + probeschedprobe(periph); } } From owner-p4-projects@FreeBSD.ORG Mon Apr 19 07:29:25 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4EC8316A4D1; Mon, 19 Apr 2004 07:29:25 -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 1EC2416A4CF for ; Mon, 19 Apr 2004 07:29:25 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1868C43D53 for ; Mon, 19 Apr 2004 07:29:25 -0700 (PDT) (envelope-from cvance@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i3JETOGe030180 for ; Mon, 19 Apr 2004 07:29:24 -0700 (PDT) (envelope-from cvance@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i3JETM5K030177 for perforce@freebsd.org; Mon, 19 Apr 2004 07:29:22 -0700 (PDT) (envelope-from cvance@nailabs.com) Date: Mon, 19 Apr 2004 07:29:22 -0700 (PDT) Message-Id: <200404191429.i3JETM5K030177@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cvance@nailabs.com using -f From: Chris Vance To: Perforce Change Reviews Subject: PERFORCE change 51347 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: Mon, 19 Apr 2004 14:29:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=51347 Change 51347 by cvance@cvance_g5 on 2004/04/19 07:28:56 Add write permission to bootx.bootinfo file This file is copied from bootinfo.hdr, which is read-only when checked out from perforce Affected files ... .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/Makefile.postamble#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/Makefile.postamble#4 (text+ko) ==== @@ -111,6 +111,7 @@ $(CP) $(SYMROOT)/bootx $(SYMROOT)/bootx.macho $(SYMROOT)/macho-to-xcoff $(SYMROOT)/bootx.macho $(SYMROOT)/bootx.xcoff $(CP) $(SRCROOT)/bootx.tproj/bootinfo.hdr $(SYMROOT)/bootx.bootinfo + chmod +w $(SYMROOT)/bootx.bootinfo $(CAT) $(SYMROOT)/bootx.xcoff >> $(SYMROOT)/bootx.bootinfo bootx_after_install: From owner-p4-projects@FreeBSD.ORG Mon Apr 19 12:38:52 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 760E716A4D1; Mon, 19 Apr 2004 12:38:52 -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 50AAC16A4CE for ; Mon, 19 Apr 2004 12:38:52 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4B3C343D39 for ; Mon, 19 Apr 2004 12:38:52 -0700 (PDT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i3JJcqGe004522 for ; Mon, 19 Apr 2004 12:38:52 -0700 (PDT) (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i3JJcp8Z004519 for perforce@freebsd.org; Mon, 19 Apr 2004 12:38:51 -0700 (PDT) (envelope-from areisse@nailabs.com) Date: Mon, 19 Apr 2004 12:38:51 -0700 (PDT) Message-Id: <200404191938.i3JJcp8Z004519@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Subject: PERFORCE change 51364 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: Mon, 19 Apr 2004 19:38:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=51364 Change 51364 by areisse@areisse_ibook on 2004/04/19 12:38:22 Don't store data to an uninitialized pointer Affected files ... .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/sl.subproj/main.c#6 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/sl.subproj/main.c#6 (text+ko) ==== @@ -612,7 +612,7 @@ args->exdata = NULL; args->exdatalen = 0; - char *prevname = "", *propname; + char *prevname = "", propname[128]; while (1) { if (1 != NextProp (gOptionsPH, prevname, propname)) break; @@ -1041,7 +1041,6 @@ strcpy(gExtensionsSpec + cnt, "System\\Library\\"); } - strcpy (gRootDir, gExtensionsSpec); SetProp(gChosenPH, "rootpath", gBootFile, strlen(gBootFile) + 1); gBootSourceNumber++; From owner-p4-projects@FreeBSD.ORG Mon Apr 19 13:14:59 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4999A16A4D0; Mon, 19 Apr 2004 13:14:59 -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 18CD216A4CE for ; Mon, 19 Apr 2004 13:14:59 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0CD7943D53 for ; Mon, 19 Apr 2004 13:14:59 -0700 (PDT) (envelope-from jhb@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 i3JKEwGe019933 for ; Mon, 19 Apr 2004 13:14:58 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i3JKEwvV019930 for perforce@freebsd.org; Mon, 19 Apr 2004 13:14:58 -0700 (PDT) (envelope-from jhb@freebsd.org) Date: Mon, 19 Apr 2004 13:14:58 -0700 (PDT) Message-Id: <200404192014.i3JKEwvV019930@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 51374 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: Mon, 19 Apr 2004 20:14:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=51374 Change 51374 by jhb@jhb_slimer on 2004/04/19 13:14:53 IFC @51372. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/vm_machdep.c#33 integrate .. //depot/projects/smpng/sys/alpha/include/sf_buf.h#2 integrate .. //depot/projects/smpng/sys/amd64/amd64/vm_machdep.c#17 integrate .. //depot/projects/smpng/sys/amd64/include/sf_buf.h#2 integrate .. //depot/projects/smpng/sys/boot/i386/boot0/boot0ext.s#2 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_da.c#50 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_ntoskrnl.c#13 integrate .. //depot/projects/smpng/sys/conf/NOTES#67 integrate .. //depot/projects/smpng/sys/conf/options#74 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pcib.c#21 integrate .. //depot/projects/smpng/sys/dev/arl/if_arl.c#4 integrate .. //depot/projects/smpng/sys/dev/arl/if_arlreg.h#4 integrate .. //depot/projects/smpng/sys/dev/ata/ata-lowlevel.c#13 integrate .. //depot/projects/smpng/sys/dev/awi/awi.c#18 integrate .. //depot/projects/smpng/sys/dev/ciss/ciss.c#31 integrate .. //depot/projects/smpng/sys/dev/ciss/cissreg.h#6 integrate .. //depot/projects/smpng/sys/dev/ciss/cissvar.h#7 integrate .. //depot/projects/smpng/sys/dev/puc/puc_pccard.c#5 integrate .. //depot/projects/smpng/sys/dev/puc/pucdata.c#24 integrate .. //depot/projects/smpng/sys/dev/puc/pucvar.h#11 integrate .. //depot/projects/smpng/sys/dev/random/nehemiah.c#2 integrate .. //depot/projects/smpng/sys/dev/random/randomdev.c#22 integrate .. //depot/projects/smpng/sys/i386/isa/atpic.c#6 integrate .. //depot/projects/smpng/sys/ia64/ia64/vm_machdep.c#40 integrate .. //depot/projects/smpng/sys/ia64/include/sf_buf.h#2 integrate .. //depot/projects/smpng/sys/isa/psm.c#24 integrate .. //depot/projects/smpng/sys/kern/kern_intr.c#45 integrate .. //depot/projects/smpng/sys/kern/kern_thr.c#14 integrate .. //depot/projects/smpng/sys/kern/uipc_mbuf.c#28 integrate .. //depot/projects/smpng/sys/modules/cam/Makefile#8 integrate .. //depot/projects/smpng/sys/modules/netgraph/Makefile#12 integrate .. //depot/projects/smpng/sys/modules/netgraph/hub/Makefile#1 branch .. //depot/projects/smpng/sys/net/if.c#47 integrate .. //depot/projects/smpng/sys/net/if_arp.h#5 integrate .. //depot/projects/smpng/sys/net/if_ethersubr.c#46 integrate .. //depot/projects/smpng/sys/net/if_fddisubr.c#19 integrate .. //depot/projects/smpng/sys/net/if_iso88025subr.c#17 integrate .. //depot/projects/smpng/sys/net/if_ppp.c#26 integrate .. //depot/projects/smpng/sys/net/if_stf.c#25 integrate .. //depot/projects/smpng/sys/net/if_var.h#24 integrate .. //depot/projects/smpng/sys/net/radix.c#10 integrate .. //depot/projects/smpng/sys/net/radix.h#7 integrate .. //depot/projects/smpng/sys/net/route.c#20 integrate .. //depot/projects/smpng/sys/net/route.h#17 integrate .. //depot/projects/smpng/sys/net/rtsock.c#32 integrate .. //depot/projects/smpng/sys/netgraph/ng_eiface.c#9 integrate .. //depot/projects/smpng/sys/netgraph/ng_ether.c#14 integrate .. //depot/projects/smpng/sys/netgraph/ng_hub.c#1 branch .. //depot/projects/smpng/sys/netgraph/ng_hub.h#1 branch .. //depot/projects/smpng/sys/netinet/if_ether.c#25 integrate .. //depot/projects/smpng/sys/netinet6/nd6.c#19 integrate .. //depot/projects/smpng/sys/netinet6/nd6_nbr.c#12 integrate .. //depot/projects/smpng/sys/netinet6/nd6_rtr.c#11 integrate .. //depot/projects/smpng/sys/netipsec/xform_ipip.c#7 integrate .. //depot/projects/smpng/sys/pci/if_sk.c#32 integrate .. //depot/projects/smpng/sys/powerpc/include/sf_buf.h#2 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/vm_machdep.c#35 integrate .. //depot/projects/smpng/sys/sys/mbuf.h#37 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/vm_machdep.c#33 (text+ko) ==== @@ -67,7 +67,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.102 2004/04/03 09:16:24 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.103 2004/04/18 06:24:51 alc Exp $"); #include #include @@ -101,21 +101,7 @@ #include -static void sf_buf_init(void *arg); -SYSINIT(sock_sf, SI_SUB_MBUF, SI_ORDER_ANY, sf_buf_init, NULL) - /* - * Expanded sf_freelist head. Really an SLIST_HEAD() in disguise, with the - * sf_freelist head with the sf_lock mutex. - */ -static struct { - SLIST_HEAD(, sf_buf) sf_head; - struct mtx sf_lock; -} sf_freelist; - -static u_int sf_buf_alloc_want; - -/* * Finish a fork operation, with process p2 nearly set up. * Copy and update the pcb, set up the stack so that the child * ready to run and return to user mode. @@ -384,69 +370,24 @@ } /* - * Allocate a pool of sf_bufs (sendfile(2) or "super-fast" if you prefer. :-)) + * Allocate an sf_buf for the given vm_page. On this machine, however, there + * is no sf_buf object. Instead, an opaque pointer to the given vm_page is + * returned. */ -static void -sf_buf_init(void *arg) -{ - struct sf_buf *sf_bufs; - int i; - - mtx_init(&sf_freelist.sf_lock, "sf_bufs list lock", NULL, MTX_DEF); - SLIST_INIT(&sf_freelist.sf_head); - sf_bufs = malloc(nsfbufs * sizeof(struct sf_buf), M_TEMP, - M_NOWAIT | M_ZERO); - for (i = 0; i < nsfbufs; i++) - SLIST_INSERT_HEAD(&sf_freelist.sf_head, &sf_bufs[i], free_list); - sf_buf_alloc_want = 0; -} - -/* - * Get an sf_buf from the freelist. Will block if none are available. - */ struct sf_buf * sf_buf_alloc(struct vm_page *m, int pri) { - struct sf_buf *sf; - int error; - mtx_lock(&sf_freelist.sf_lock); - while ((sf = SLIST_FIRST(&sf_freelist.sf_head)) == NULL) { - sf_buf_alloc_want++; - mbstat.sf_allocwait++; - error = msleep(&sf_freelist, &sf_freelist.sf_lock, PVM | pri, - "sfbufa", 0); - sf_buf_alloc_want--; - - /* - * If we got a signal, don't risk going back to sleep. - */ - if (error) - break; - } - if (sf != NULL) { - SLIST_REMOVE_HEAD(&sf_freelist.sf_head, free_list); - sf->m = m; - nsfbufsused++; - nsfbufspeak = imax(nsfbufspeak, nsfbufsused); - } - mtx_unlock(&sf_freelist.sf_lock); - return (sf); + return ((struct sf_buf *)m); } /* - * Release resources back to the system. + * Free the sf_buf. In fact, do nothing because there are no resources + * associated with the sf_buf. */ void sf_buf_free(struct sf_buf *sf) { - - mtx_lock(&sf_freelist.sf_lock); - SLIST_INSERT_HEAD(&sf_freelist.sf_head, sf, free_list); - nsfbufsused--; - if (sf_buf_alloc_want > 0) - wakeup_one(&sf_freelist); - mtx_unlock(&sf_freelist.sf_lock); } /* ==== //depot/projects/smpng/sys/alpha/include/sf_buf.h#2 (text+ko) ==== @@ -23,35 +23,36 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/include/sf_buf.h,v 1.1 2003/11/16 06:11:24 alc Exp $ + * $FreeBSD: src/sys/alpha/include/sf_buf.h,v 1.2 2004/04/18 06:24:51 alc Exp $ */ #ifndef _MACHINE_SF_BUF_H_ #define _MACHINE_SF_BUF_H_ -#include - #include #include #include -struct sf_buf { - SLIST_ENTRY(sf_buf) free_list; /* list of free buffer slots */ - vm_page_t m; /* currently mapped page */ -}; +/* + * On this machine, the only purpose for which sf_buf is used is to implement + * an opaque pointer required by the machine-independent parts of the kernel. + * That pointer references the vm_page that is "mapped" by the sf_buf. The + * actual mapping is provided by the direct virtual-to-physical mapping. + */ +struct sf_buf; static __inline vm_offset_t sf_buf_kva(struct sf_buf *sf) { - return (ALPHA_PHYS_TO_K0SEG(sf->m->phys_addr)); + return (ALPHA_PHYS_TO_K0SEG(VM_PAGE_TO_PHYS((vm_page_t)sf))); } static __inline vm_page_t sf_buf_page(struct sf_buf *sf) { - return (sf->m); + return ((vm_page_t)sf); } #endif /* !_MACHINE_SF_BUF_H_ */ ==== //depot/projects/smpng/sys/amd64/amd64/vm_machdep.c#17 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.233 2004/04/11 04:26:58 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.234 2004/04/18 05:36:37 alc Exp $"); #include "opt_isa.h" #include "opt_cpu.h" @@ -85,20 +85,7 @@ static u_int cpu_reset_proxyid; static volatile u_int cpu_reset_proxy_active; #endif -static void sf_buf_init(void *arg); -SYSINIT(sock_sf, SI_SUB_MBUF, SI_ORDER_ANY, sf_buf_init, NULL) - -/* - * Expanded sf_freelist head. Really an SLIST_HEAD() in disguise, with the - * sf_freelist head with the sf_lock mutex. - */ -static struct { - SLIST_HEAD(, sf_buf) sf_head; - struct mtx sf_lock; -} sf_freelist; -static u_int sf_buf_alloc_want; - /* * Finish a fork operation, with process p2 nearly set up. * Copy and update the pcb, set up the stack so that the child @@ -439,69 +426,24 @@ } /* - * Allocate a pool of sf_bufs (sendfile(2) or "super-fast" if you prefer. :-)) - */ -static void -sf_buf_init(void *arg) -{ - struct sf_buf *sf_bufs; - int i; - - mtx_init(&sf_freelist.sf_lock, "sf_bufs list lock", NULL, MTX_DEF); - SLIST_INIT(&sf_freelist.sf_head); - sf_bufs = malloc(nsfbufs * sizeof(struct sf_buf), M_TEMP, - M_NOWAIT | M_ZERO); - for (i = 0; i < nsfbufs; i++) - SLIST_INSERT_HEAD(&sf_freelist.sf_head, &sf_bufs[i], free_list); - sf_buf_alloc_want = 0; -} - -/* - * Get an sf_buf from the freelist. Will block if none are available. + * Allocate an sf_buf for the given vm_page. On this machine, however, there + * is no sf_buf object. Instead, an opaque pointer to the given vm_page is + * returned. */ struct sf_buf * sf_buf_alloc(struct vm_page *m, int pri) { - struct sf_buf *sf; - int error; - mtx_lock(&sf_freelist.sf_lock); - while ((sf = SLIST_FIRST(&sf_freelist.sf_head)) == NULL) { - sf_buf_alloc_want++; - mbstat.sf_allocwait++; - error = msleep(&sf_freelist, &sf_freelist.sf_lock, PVM | pri, - "sfbufa", 0); - sf_buf_alloc_want--; - - /* - * If we got a signal, don't risk going back to sleep. - */ - if (error) - break; - } - if (sf != NULL) { - SLIST_REMOVE_HEAD(&sf_freelist.sf_head, free_list); - sf->m = m; - nsfbufsused++; - nsfbufspeak = imax(nsfbufspeak, nsfbufsused); - } - mtx_unlock(&sf_freelist.sf_lock); - return (sf); + return ((struct sf_buf *)m); } /* - * Release resources back to the system. + * Free the sf_buf. In fact, do nothing because there are no resources + * associated with the sf_buf. */ void sf_buf_free(struct sf_buf *sf) { - - mtx_lock(&sf_freelist.sf_lock); - SLIST_INSERT_HEAD(&sf_freelist.sf_head, sf, free_list); - nsfbufsused--; - if (sf_buf_alloc_want > 0) - wakeup_one(&sf_freelist); - mtx_unlock(&sf_freelist.sf_lock); } /* ==== //depot/projects/smpng/sys/amd64/include/sf_buf.h#2 (text+ko) ==== @@ -23,35 +23,36 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/sf_buf.h,v 1.1 2003/11/16 06:11:25 alc Exp $ + * $FreeBSD: src/sys/amd64/include/sf_buf.h,v 1.2 2004/04/18 05:36:37 alc Exp $ */ #ifndef _MACHINE_SF_BUF_H_ #define _MACHINE_SF_BUF_H_ -#include - #include #include #include -struct sf_buf { - SLIST_ENTRY(sf_buf) free_list; /* list of free buffer slots */ - vm_page_t m; /* currently mapped page */ -}; +/* + * On this machine, the only purpose for which sf_buf is used is to implement + * an opaque pointer required by the machine-independent parts of the kernel. + * That pointer references the vm_page that is "mapped" by the sf_buf. The + * actual mapping is provided by the direct virtual-to-physical mapping. + */ +struct sf_buf; static __inline vm_offset_t sf_buf_kva(struct sf_buf *sf) { - return (PHYS_TO_DMAP(sf->m->phys_addr)); + return (PHYS_TO_DMAP(VM_PAGE_TO_PHYS((vm_page_t)sf))); } static __inline vm_page_t sf_buf_page(struct sf_buf *sf) { - return (sf->m); + return ((vm_page_t)sf); } #endif /* !_MACHINE_SF_BUF_H_ */ ==== //depot/projects/smpng/sys/boot/i386/boot0/boot0ext.s#2 (text+ko) ==== @@ -13,7 +13,7 @@ # purpose. # -# $FreeBSD: src/sys/boot/i386/boot0/boot0ext.s,v 1.1 2004/03/26 18:46:31 obrien Exp $ +# $FreeBSD: src/sys/boot/i386/boot0/boot0ext.s,v 1.2 2004/04/19 19:31:48 obrien Exp $ # A 1024-byte boot manager. @@ -34,6 +34,7 @@ .set KEY_ENTER,0x1c # Enter key scan code .set KEY_F1,0x3b # F1 key scan code + .set KEY_1,0x02 # #1 key scan code # # Flag bits @@ -45,7 +46,7 @@ # Addresses in the sector of embedded data values. # Accessed with negative offsets from the end of the relocated sectors (%bp). # - .set _PRT_END,(FAKE-(ORIGIN+SECTOR_SIZE)) + .set _PRT_END,(FAKE-(ORIGIN+SECTOR_SIZE*(NUM_SECTORS-1))) .set _NXTDRV,-(_PRT_END+0x48) # Next drive .set _OPT,-(_PRT_END+0x47) # Default option .set _SETDRV,-(_PRT_END+0x46) # Drive to force @@ -86,6 +87,16 @@ stosw # them incb -0xe(%di) # Sector number 1 # +# Check what flags were loaded with us; specifically, use a predefined Drive. +# If what the bios gives us is bad, use the '0' in the block instead, as well. +# + testb $FL_SETDRV,LOAD+flags-start # Set number drive? + jnz boot.1 # Yes + testb %dl,%dl # Drive number valid? + js boot.2 # Possibly (0x80 set) +boot.1: movb LOAD+setdrv-start,%dl # Drive number to use +boot.2: +# # Reload all of boot0 (including the extra sectors) into memory at the # relocation address. # @@ -100,19 +111,10 @@ # jmp main+ORIGIN-LOAD # To relocated code # -# Check what flags were loaded with us; specifically, use a predefined Drive. -# If what the bios gives us is bad, use the '0' in the block instead, as well. -# -main: testb $FL_SETDRV,_FLAGS(%bp) # Set number drive? - jnz main.1 # Yes - testb %dl,%dl # Drive number valid? - js main.2 # Possibly (0x80 set) -main.1: movb _SETDRV(%bp),%dl # Drive number to use -# # Whatever we decided to use, now store it into the fake # partition entry that lives in the data space above us. # -main.2: movb %dl,_FAKE(%bp) # Save drive number +main: movb %dl,_FAKE(%bp) # Save drive number callw putn # To new line pushw %dx # Save drive number # @@ -245,6 +247,9 @@ # subb $KEY_F1,%al # Less F1 scan code cmpb $0x4,%al # F1..F5? + jna main.12 # Yes + subb $(KEY_1 - KEY_F1),%al # Less #1 scan code + cmpb $0x4,%al # #1..#5? ja main.10 # No # # We have a selection. @@ -263,7 +268,7 @@ movw $fake,%si # Partition for write movb (%si),%dl # Drive number movw %si,%bx # Partition for read - cmpb $0x4,%al # F5 pressed? + cmpb $0x4,%al # F5/#5 pressed? pushf # Save je main.13 # Yes shlb $0x4,%al # Point to @@ -285,7 +290,7 @@ # If going to next drive, replace drive with selected one. # Remember to un-ascii it. Hey 0x80 is already set, cool! # - jne main.15 # If not F5 + jne main.15 # If not F5/#5 movb _NXTDRV(%bp),%dl # Next drive subb $'0',%dl # number # @@ -442,7 +447,7 @@ # # These values indicate bootable types we know the names of # -table1: .byte 0x1, 0x4, 0x6, 0x7, 0xb, 0xc, 0xe, 0x63, 0x83 +table1: .byte 0x1, 0x4, 0x6, 0x7, 0xb, 0xc, 0xe, 0x42, 0x63, 0x83 .byte 0x9f, 0xa5, 0xa6, 0xa9 table1_end: # @@ -453,10 +458,11 @@ .byte os_dos-. # DOS .byte os_dos-. # DOS .byte os_dos-. # DOS - .byte os_nt-. # NT or OS/2 + .byte os_nt-. # NT/XP or OS/2 + .byte os_windows-. # Windows 32-bit FAT + .byte os_windows-. # Windows 32-bit FAT ext int 13 .byte os_windows-. # Windows - .byte os_windows-. # Windows - .byte os_windows-. # Windows + .byte os_windows-. # Windows 2000 dyn ext .byte os_unix-. # UNIX .byte os_linux-. # Linux .byte os_bsdos-. # BSD/OS @@ -469,7 +475,7 @@ # os_misc: .ascii "Unknow"; .byte 'n'|0x80 os_dos: .ascii "DO"; .byte 'S'|0x80 -os_nt: .ascii "Windows N"; .byte 'T'|0x80 +os_nt: .ascii "Windows NT/X"; .byte 'P'|0x80 os_windows: .ascii "Window"; .byte 's'|0x80 os_unix: .ascii "UNI"; .byte 'X'|0x80 os_linux: .ascii "Linu"; .byte 'x'|0x80 ==== //depot/projects/smpng/sys/cam/scsi/scsi_da.c#50 (text+ko) ==== @@ -27,10 +27,9 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.164 2004/02/22 01:14:54 cperciva Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.167 2004/04/19 13:38:10 mux Exp $"); #ifdef _KERNEL -#include "opt_da.h" #include "opt_hw_wdog.h" #endif /* _KERNEL */ @@ -238,151 +237,55 @@ {T_DIRECT, SIP_MEDIA_FIXED, "COMPAQ", "RAID*", "*"}, /*quirks*/ DA_Q_NO_SYNC_CACHE }, -#ifdef DA_OLD_QUIRKS - /* USB floppy devices supported by umass(4) */ - { - /* - * This USB floppy drive uses the UFI command set. This - * command set is a derivative of the ATAPI command set and - * does not support READ_6 commands only READ_10. It also does - * not support sync cache (0x35). - */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "Y-E DATA", "USB-FDU", "*"}, - /*quirks*/ DA_Q_NO_SYNC_CACHE - }, - { - /* Another USB floppy */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "MATSHITA", "FDD CF-VFDU*","*"}, - /*quirks*/ DA_Q_NO_SYNC_CACHE - }, - { - /* - * The vendor, product and version strings coming from the - * controller are null terminated instead of being padded with - * spaces. The trailing wildcard character '*' is required. - */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "SMSC*", "USB FDC*","*"}, - /*quirks*/ DA_Q_NO_SYNC_CACHE - }, - { - /* - * SmartDisk (Mitsumi) USB floppy drive - * PR: kern/50226 - */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "MITSUMI", "USB FDD", "*"}, - /*quirks*/ DA_Q_NO_SYNC_CACHE - }, /* USB mass storage devices supported by umass(4) */ { /* - * Sony Memory Stick adapter MSAC-US1 and - * Sony PCG-C1VJ Internal Memory Stick Slot (MSC-U01). - * Make all sony MS* products use this quirk. + * EXATELECOM (Sigmatel) i-Bead 100/105 USB Flash MP3 Player + * PR: kern/51675 */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "Sony", "MS*", "*"}, + {T_DIRECT, SIP_MEDIA_REMOVABLE, "EXATEL", "i-BEAD10*", "*"}, /*quirks*/ DA_Q_NO_SYNC_CACHE }, { /* - * Sony Memory Stick adapter for the CLIE series - * of PalmOS PDA's + * Power Quotient Int. (PQI) USB flash key + * PR: kern/53067 */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "Sony", "CLIE*", "*"}, - /*quirks*/ DA_Q_NO_SYNC_CACHE - }, - { - /* - * Intelligent Stick USB disk-on-key - * PR: kern/53005 - */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "USB Card", - "IntelligentStick*", "*"}, - /*quirks*/ DA_Q_NO_SYNC_CACHE - }, - { - /* - * Sony DSC cameras (DSC-S30, DSC-S50, DSC-S70) - */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "Sony", "Sony DSC", "*"}, - /*quirks*/ DA_Q_NO_SYNC_CACHE - }, - { - /* - * Microtech USB CameraMate - */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "eUSB Compact*", - "Compact Flash*", "*"}, - /*quirks*/ DA_Q_NO_SYNC_CACHE - }, - { - /* - * Olympus digital cameras (C-3040ZOOM, C-2040ZOOM, C-1) - */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "OLYMPUS", "C-*", "*"}, - /*quirks*/ DA_Q_NO_SYNC_CACHE - }, - { - /* - * Olympus digital cameras (E-100RS, E-10). - */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "OLYMPUS", "E-*", "*"}, - /*quirks*/ DA_Q_NO_SYNC_CACHE - }, - { - /* - * KingByte Pen Drives - */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "NO BRAND", "PEN DRIVE", "*"}, - /*quirks*/ DA_Q_NO_SYNC_CACHE + {T_DIRECT, SIP_MEDIA_REMOVABLE, "Generic*", "USB Flash Disk*", + "*"}, /*quirks*/ DA_Q_NO_SYNC_CACHE + }, + { + /* + * Creative Nomad MUVO mp3 player (USB) + * PR: kern/53094 + */ + {T_DIRECT, SIP_MEDIA_REMOVABLE, "CREATIVE", "NOMAD_MUVO", "*"}, + /*quirks*/ DA_Q_NO_SYNC_CACHE|DA_Q_NO_PREVENT }, { /* - * Minolta Dimage E203 + * Jungsoft NEXDISK USB flash key + * PR: kern/54737 */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "MINOLTA", "DiMAGE E203", "*"}, + {T_DIRECT, SIP_MEDIA_REMOVABLE, "JUNGSOFT", "NEXDISK*", "*"}, /*quirks*/ DA_Q_NO_SYNC_CACHE }, { /* - * Daisy Technology PhotoClip on Zoran chip - * PR: kern/43580 + * FreeDik USB Mini Data Drive + * PR: kern/54786 */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "ZORAN", "COACH", "*"}, - /*quirks*/ DA_Q_NO_SYNC_CACHE + {T_DIRECT, SIP_MEDIA_REMOVABLE, "FreeDik*", "Mini Data Drive", + "*"}, /*quirks*/ DA_Q_NO_SYNC_CACHE }, { /* - * Sony USB Key-Storage - * PR: kern/46386 + * Sigmatel USB Flash MP3 Player + * PR: kern/57046 */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "Sony", "Storage Media", "*"}, - /*quirks*/ DA_Q_NO_SYNC_CACHE + {T_DIRECT, SIP_MEDIA_REMOVABLE, "SigmaTel", "MSCN", "*"}, + /*quirks*/ DA_Q_NO_SYNC_CACHE|DA_Q_NO_PREVENT }, -#endif /* DA_OLD_QUIRKS */ - { - /* - * EXATELECOM (Sigmatel) i-Bead 100/105 USB Flash MP3 Player - * PR: kern/51675 - */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "EXATEL", "i-BEAD10*", "*"}, - /*quirks*/ DA_Q_NO_SYNC_CACHE - }, - { - /* - * Jungsoft NEXDISK USB flash key - * PR: kern/54737 - */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "JUNGSOFT", "NEXDISK*", "*"}, - /*quirks*/ DA_Q_NO_SYNC_CACHE - }, - { - /* - * Creative Nomad MUVO mp3 player (USB) - * PR: kern/53094 - */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "CREATIVE", "NOMAD_MUVO", "*"}, - /*quirks*/ DA_Q_NO_SYNC_CACHE|DA_Q_NO_PREVENT - }, }; static disk_strategy_t dastrategy; ==== //depot/projects/smpng/sys/compat/ndis/subr_ntoskrnl.c#13 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.35 2004/04/16 00:04:28 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.36 2004/04/18 18:38:59 wpaul Exp $"); #include #include @@ -1029,7 +1029,7 @@ __asm__ __volatile__ ("" : "=c" (lock)); while (atomic_cmpset_acq_int((volatile u_int *)lock, 0, 1) == 0) - /* do nothing */; + /* sit and spin */; return; } @@ -1041,7 +1041,7 @@ __asm__ __volatile__ ("" : "=c" (lock)); - atomic_cmpset_rel_int((volatile u_int *)lock, 1, 0); + atomic_store_rel_int((volatile u_int *)lock, 0); return; } ==== //depot/projects/smpng/sys/conf/NOTES#67 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1214 2004/04/12 02:36:51 imp Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1215 2004/04/19 03:33:54 njl Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -968,12 +968,6 @@ options SCSI_NO_OP_STRINGS options SCSI_DELAY=8000 # Be pessimistic about Joe SCSI device -# Options for the CAM SCSI disk driver: -# DA_OLD_QUIRKS: Restore old USB and firewire quirks that have been -# deprecated. Please also email scsi@freebsd.org if you -# have a device that needs this option. -options DA_OLD_QUIRKS - # Options for the CAM CDROM driver: # CHANGER_MIN_BUSY_SECONDS: Guaranteed minimum time quantum for a changer LUN # CHANGER_MAX_BUSY_SECONDS: Maximum time quantum per changer LUN, only ==== //depot/projects/smpng/sys/conf/options#74 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.440 2004/04/11 20:01:18 imp Exp $ +# $FreeBSD: src/sys/conf/options,v 1.441 2004/04/19 03:33:55 njl Exp $ # # On the handling of kernel options # @@ -241,8 +241,6 @@ CHANGER_MIN_BUSY_SECONDS opt_cd.h CHANGER_MAX_BUSY_SECONDS opt_cd.h -DA_OLD_QUIRKS opt_da.h - # Options used only in cam/scsi/scsi_sa.c. SA_IO_TIMEOUT opt_sa.h SA_SPACE_TIMEOUT opt_sa.h ==== //depot/projects/smpng/sys/dev/acpica/acpi_pcib.c#21 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib.c,v 1.41 2004/03/22 20:39:20 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib.c,v 1.42 2004/04/19 17:52:20 njl Exp $"); #include "opt_acpi.h" #include @@ -369,6 +369,11 @@ AcpiFormatException(status)); goto out; } + /* XXX Figure out how this is happening when the append succeeds. */ + if (crsbuf.Pointer == NULL) { + device_printf(pcib, "_CRS buf NULL after append?\n"); + goto out; + } if (ACPI_FAILURE(status = AcpiSetCurrentResources(lnkdev, &crsbuf))) { device_printf(pcib, "_SRS failed for interrupt %d via %s - %s\n", Interrupts[0], acpi_name(lnkdev), ==== //depot/projects/smpng/sys/dev/arl/if_arl.c#4 (text+ko) ==== @@ -3,7 +3,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/arl/if_arl.c,v 1.4 2004/04/15 20:31:07 luigi Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/arl/if_arl.c,v 1.5 2004/04/17 20:30:05 fjoe Exp $"); #include "opt_inet.h" @@ -69,6 +69,9 @@ */ #define ARL_CHECKREG(sc) (ar->registrationMode && ar->registrationStatus == 0) +#define GET_ARL_PARAM(name) (arcfg.name = ar->name) +#define SET_ARL_PARAM(name) (ar->name = arcfg.name) + #ifndef BPF_MTAP #define BPF_MTAP(_ifp,_m) \ do { \ @@ -114,6 +117,13 @@ devclass_t arl_devclass; +u_int8_t rate2media[4] = { + IFM_IEEE80211_DS354k, + IFM_IEEE80211_DS512k, + IFM_IEEE80211_DS1, + IFM_IEEE80211_DS2 +}; + /* * Copy config values to local cache */ @@ -194,13 +204,16 @@ ifmedia_init(&sc->arl_ifmedia, 0, arl_media_change, arl_media_status); #define ADD(s, o) ifmedia_add(&sc->arl_ifmedia, \ IFM_MAKEWORD(IFM_IEEE80211, (s), (o), 0), 0, NULL) + ADD(IFM_IEEE80211_DS354k, 0); + ADD(IFM_IEEE80211_DS354k, IFM_IEEE80211_ADHOC); + ADD(IFM_IEEE80211_DS512k, 0); + ADD(IFM_IEEE80211_DS512k, IFM_IEEE80211_ADHOC); ADD(IFM_IEEE80211_DS1, 0); ADD(IFM_IEEE80211_DS1, IFM_IEEE80211_ADHOC); ADD(IFM_IEEE80211_DS2, 0); ADD(IFM_IEEE80211_DS2, IFM_IEEE80211_ADHOC); ifmedia_set(&sc->arl_ifmedia, IFM_MAKEWORD(IFM_IEEE80211, - arcfg.spreadingCode == 4 ? IFM_IEEE80211_DS2 : IFM_IEEE80211_DS1 - , 0, 0)); + rate2media[arcfg.spreadingCode - 1], 0, 0)); #undef ADD /* @@ -1152,16 +1165,19 @@ int i; static int cache_slot = 0; static int wrapindex = 0; + u_int8_t zero[6] = {0, 0, 0, 0, 0, 0}; + u_char *mac; if ((ntohs(eh->ether_type) != ETHERTYPE_IP)) { return; } + mac = (dir == ARLCACHE_RX ? eh->ether_shost : eh->ether_dhost); + for (i = 0; i < MAXARLCACHE; i++) { - if (!bcmp(dir == ARLCACHE_RX ? eh->ether_shost : eh->ether_dhost, - sc->arl_sigcache[i].macsrc, 6)) { + if (!bcmp(zero, sc->arl_sigcache[i].macsrc, 6) || + !bcmp(mac, sc->arl_sigcache[i].macsrc, 6)) break; - } } if (i < MAXARLCACHE) @@ -1187,12 +1203,19 @@ struct arl_softc *sc = ifp->if_softc; int otype = arcfg.registrationMode; int orate = arcfg.spreadingCode; + int nrate, i; + + nrate = IFM_SUBTYPE(sc->arl_ifmedia.ifm_cur->ifm_media); + + for(i = 1; i <= 4; i++) { + if (rate2media[i - 1] == nrate) + break; + } - arcfg.spreadingCode = ieee80211_media2rate( - IFM_SUBTYPE(sc->arl_ifmedia.ifm_cur->ifm_media)); + if (i == 5) + return (EINVAL); - if (arcfg.spreadingCode == 2) - arcfg.spreadingCode = 3; + arcfg.spreadingCode = i; /* XXX Need fix for PSP mode */ if ((sc->arl_ifmedia.ifm_cur->ifm_media & IFM_IEEE80211_ADHOC) != 0) @@ -1213,14 +1236,14 @@ struct ifmediareq *imr; { struct arl_softc *sc = ifp->if_softc; - int rate = (arcfg.spreadingCode == 4 ? 4 : 2); imr->ifm_active = IFM_IEEE80211; if (arcfg.registrationMode == 0) imr->ifm_active |= IFM_IEEE80211_ADHOC; - imr->ifm_active |= ieee80211_rate2media(NULL, rate, IEEE80211_T_DS); + imr->ifm_active |= IFM_MAKEWORD(IFM_IEEE80211, + rate2media[arcfg.spreadingCode - 1], 0, 0); imr->ifm_status = IFM_AVALID; if (!ARL_CHECKREG(sc)) imr->ifm_status |= IFM_ACTIVE; ==== //depot/projects/smpng/sys/dev/arl/if_arlreg.h#4 (text+ko) ==== @@ -1,6 +1,6 @@ /* * $RISS: if_arl/dev/arl/if_arlreg.h,v 1.4 2004/03/16 04:43:27 count Exp $ - * $FreeBSD: src/sys/dev/arl/if_arlreg.h,v 1.3 2004/04/13 19:25:23 fjoe Exp $ + * $FreeBSD: src/sys/dev/arl/if_arlreg.h,v 1.4 2004/04/17 20:30:05 fjoe Exp $ */ #ifndef _IF_ARLREG_H @@ -299,9 +299,6 @@ } \ } while (0); -#define GET_ARL_PARAM(name) (arcfg.name = ar->name) -#define SET_ARL_PARAM(name) (ar->name = arcfg.name) - #ifdef _KERNEL void arl_release_resources (device_t); int arl_alloc_memory (device_t, int, int); ==== //depot/projects/smpng/sys/dev/ata/ata-lowlevel.c#13 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-lowlevel.c,v 1.32 2004/04/13 09:44:20 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-lowlevel.c,v 1.33 2004/04/19 18:29:43 sos Exp $"); #include "opt_ata.h" #include @@ -563,16 +563,16 @@ } } + if (bootverbose) + ata_printf(ch, -1, "reset tp1 mask=%02x ostat0=%02x ostat1=%02x\n", + mask, ostat0, ostat1); + /* if nothing showed up there is no need to get any further */ /* SOS is that too strong?, we just might loose devices here XXX */ ch->devices = 0; if (!mask) return; - if (bootverbose) - ata_printf(ch, -1, "reset tp1 mask=%02x ostat0=%02x ostat1=%02x\n", - mask, ostat0, ostat1); - /* reset (both) devices on this channel */ ATA_IDX_OUTB(ch, ATA_DRIVE, ATA_D_IBM | ATA_MASTER); DELAY(10); ==== //depot/projects/smpng/sys/dev/awi/awi.c#18 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $NetBSD: awi.c,v 1.61 2004/01/15 13:29:05 onoe Exp $ */ +/* $NetBSD: awi.c,v 1.62 2004/01/16 14:13:15 onoe Exp $ */ /*- * Copyright (c) 1999,2000,2001 The NetBSD Foundation, Inc. @@ -86,10 +86,10 @@ #include #ifdef __NetBSD__ -__KERNEL_RCSID(0, "$NetBSD: awi.c,v 1.61 2004/01/15 13:29:05 onoe Exp $"); +__KERNEL_RCSID(0, "$NetBSD: awi.c,v 1.62 2004/01/16 14:13:15 onoe Exp $"); #endif #ifdef __FreeBSD__ -__FBSDID("$FreeBSD: src/sys/dev/awi/awi.c,v 1.31 2004/03/20 19:57:46 mdodd Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/awi/awi.c,v 1.32 2004/04/18 01:05:02 onoe Exp $"); #endif #include "opt_inet.h" @@ -1112,7 +1112,7 @@ } sc->sc_mib_mac.aPromiscuous_Enable = 0; #ifdef __FreeBSD__ - if (ifp->if_amcount != 0) + if (ifp->if_flags & IFF_ALLMULTI) goto set_mib; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Apr 19 17:18:21 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 888E716A4D1; Mon, 19 Apr 2004 17:18:21 -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 4D68B16A4CF for ; Mon, 19 Apr 2004 17:18:21 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3EF0143D4C for ; Mon, 19 Apr 2004 17:18:21 -0700 (PDT) (envelope-from cvance@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i3K0ILGe079496 for ; Mon, 19 Apr 2004 17:18:21 -0700 (PDT) (envelope-from cvance@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i3K0Hmtc079484 for perforce@freebsd.org; Mon, 19 Apr 2004 17:17:48 -0700 (PDT) (envelope-from cvance@nailabs.com) Date: Mon, 19 Apr 2004 17:17:48 -0700 (PDT) Message-Id: <200404200017.i3K0Hmtc079484@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cvance@nailabs.com using -f From: Chris Vance To: Perforce Change Reviews Subject: PERFORCE change 51389 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: Tue, 20 Apr 2004 00:18:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=51389 Change 51389 by cvance@cvance_sony on 2004/04/19 17:17:12 Sync SEBSD branch with the head of the MAC branch. Not sure if it builds yet, this is a checkpoint. See the commit message for change 49742 (rwatson) for full details on the integration. Affected files ... .. //depot/projects/trustedbsd/sebsd/MAINTAINERS#4 integrate .. //depot/projects/trustedbsd/sebsd/Makefile#8 integrate .. //depot/projects/trustedbsd/sebsd/Makefile.inc1#8 integrate .. //depot/projects/trustedbsd/sebsd/UPDATING#8 integrate .. //depot/projects/trustedbsd/sebsd/UPDATING.64BTT#1 branch .. //depot/projects/trustedbsd/sebsd/bin/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/bin/cat/cat.1#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/chflags/chflags.c#3 integrate .. //depot/projects/trustedbsd/sebsd/bin/csh/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/bin/date/date.c#5 integrate .. //depot/projects/trustedbsd/sebsd/bin/dd/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/bin/dd/args.c#4 integrate .. //depot/projects/trustedbsd/sebsd/bin/dd/dd.1#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/dd/dd.c#4 integrate .. //depot/projects/trustedbsd/sebsd/bin/dd/dd.h#4 integrate .. //depot/projects/trustedbsd/sebsd/bin/dd/gen.c#1 branch .. //depot/projects/trustedbsd/sebsd/bin/dd/ref.ascii#1 branch .. //depot/projects/trustedbsd/sebsd/bin/dd/ref.ebcdic#1 branch .. //depot/projects/trustedbsd/sebsd/bin/dd/ref.ibm#1 branch .. //depot/projects/trustedbsd/sebsd/bin/dd/ref.lcase#1 branch .. //depot/projects/trustedbsd/sebsd/bin/dd/ref.oldascii#1 branch .. //depot/projects/trustedbsd/sebsd/bin/dd/ref.oldebcdic#1 branch .. //depot/projects/trustedbsd/sebsd/bin/dd/ref.oldibm#1 branch .. //depot/projects/trustedbsd/sebsd/bin/dd/ref.pareven#1 branch .. //depot/projects/trustedbsd/sebsd/bin/dd/ref.parnone#1 branch .. //depot/projects/trustedbsd/sebsd/bin/dd/ref.parodd#1 branch .. //depot/projects/trustedbsd/sebsd/bin/dd/ref.parset#1 branch .. //depot/projects/trustedbsd/sebsd/bin/dd/ref.swab#1 branch .. //depot/projects/trustedbsd/sebsd/bin/dd/ref.ucase#1 branch .. //depot/projects/trustedbsd/sebsd/bin/df/df.c#6 integrate .. //depot/projects/trustedbsd/sebsd/bin/kill/kill.c#4 integrate .. //depot/projects/trustedbsd/sebsd/bin/ls/ls.1#6 integrate .. //depot/projects/trustedbsd/sebsd/bin/ls/ls.c#6 integrate .. //depot/projects/trustedbsd/sebsd/bin/ls/print.c#6 integrate .. //depot/projects/trustedbsd/sebsd/bin/mv/mv.c#4 integrate .. //depot/projects/trustedbsd/sebsd/bin/pax/cache.c#4 integrate .. //depot/projects/trustedbsd/sebsd/bin/pax/options.c#4 integrate .. //depot/projects/trustedbsd/sebsd/bin/ps/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/bin/ps/keyword.c#5 integrate .. //depot/projects/trustedbsd/sebsd/bin/ps/ps.1#5 integrate .. //depot/projects/trustedbsd/sebsd/bin/ps/ps.c#4 integrate .. //depot/projects/trustedbsd/sebsd/bin/rmail/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/bin/rmdir/rmdir.1#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/rmdir/rmdir.c#4 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/eval.c#5 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/input.c#4 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/jobs.c#4 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/parser.c#4 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/redir.c#4 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/redir.h#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/trap.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/scripts/amd.conf.5#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bc/FREEBSD-upgrade#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bc/bc/main.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bc/h/getopt.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bc/lib/getopt.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bc/lib/getopt1.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/binutils/include/getopt.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/binutils/libiberty/getopt.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/binutils/libiberty/getopt1.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/FREEBSD-Xlist#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/FREEBSD-upgrade#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/NEWS#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/README#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/TODO#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/VERSION#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/gensnmptree/gensnmptree.1#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/gensnmptree/gensnmptree.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/asn1.3#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/asn1.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/asn1.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/bsnmpagent.3#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/bsnmpclient.3#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/bsnmplib.3#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/snmp.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/snmp.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/snmpagent.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/snmpagent.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/snmpclient.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/snmpclient.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/snmppriv.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_ifmib.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_ifstack.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_interfaces.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_ip.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_ipaddr.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_nettomedia.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_rcvaddr.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_route.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_tcp.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_tree.def#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_udp.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/snmp_mibII.3#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/snmp_mibII.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/BEGEMOT-MIB.txt#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/BEGEMOT-SNMPD.txt#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/FOKUS-MIB.txt#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/action.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/bsnmpd.1#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/config.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/export.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/main.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/snmpd.config#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/snmpd.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/snmpd.sh#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/snmpmod.3#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/snmpmod.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/trans_lsock.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/trans_lsock.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/trans_udp.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/trans_udp.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/trap.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/tree.def#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/cpio/FREEBSD-upgrade#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/cpio/getopt.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/cpio/getopt.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/cpio/getopt1.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/cvs/src/modules.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/cvs/src/server.c#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/diff/FREEBSD-upgrade#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/diff/diff.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/diff/getopt.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/diff/getopt.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/diff/getopt1.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/FREEBSD-Xlist#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/FREEBSD-deletelist#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/freebsd-spec.h#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/getopt.c#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/getopt.h#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/gcc/getopt1.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gdtoa/gethex.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gdtoa/strtod.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gdtoa/xsum0.out#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gnu-sort/lib/getopt.c#3 delete .. //depot/projects/trustedbsd/sebsd/contrib/gnu-sort/lib/getopt.h#3 delete .. //depot/projects/trustedbsd/sebsd/contrib/gnu-sort/lib/getopt1.c#3 delete .. //depot/projects/trustedbsd/sebsd/contrib/gperf/FREEBSD-Xlist#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gperf/lib/getopt.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gperf/lib/getopt.c.patch#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gperf/lib/getopt.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gperf/lib/getopt.h.patch#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/gperf/lib/getopt1.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/groff/FREEBSD-Xlist#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/src/include/getopt.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/groff/src/libs/libgroff/getopt.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/groff/src/libs/libgroff/getopt1.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/isc-dhcp/FREEBSD-upgrade#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/isc-dhcp/client/dhclient.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/isc-dhcp/common/convert.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/isc-dhcp/common/errwarn.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/isc-dhcp/common/hash.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/isc-dhcp/common/inet_addr.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/isc-dhcp/includes/hash.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/isc-dhcp/includes/sysconf.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/libreadline/FREEBSD-upgrade#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/libreadline/bind.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/libreadline/complete.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/libreadline/display.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/libreadline/doc/readline.3#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/libreadline/mbutil.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/libreadline/readline.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/libreadline/readline.h#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/libreadline/rlconf.h#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/libreadline/shell.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/libreadline/terminal.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/libreadline/util.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/libreadline/vi_mode.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/one-true-awk/FIXES#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/one-true-awk/FREEBSD-upgrade#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/one-true-awk/b.c#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/one-true-awk/lex.c#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/one-true-awk/main.c#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/one-true-awk/run.c#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/openpam/CREDITS#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/openpam/HISTORY#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/openpam/Makefile.in#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/openpam/RELNOTES#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/openpam/configure#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/openpam/configure.in#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/openpam/doc/man/openpam.3#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/openpam/doc/man/openpam_borrow_cred.3#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/openpam/doc/man/openpam_free_data.3#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/openpam/doc/man/openpam_get_option.3#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/openpam/doc/man/openpam_log.3#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/openpam/doc/man/openpam_nullconv.3#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/openpam/doc/man/openpam_readline.3#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/openpam/doc/man/openpam_restore_cred.3#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/openpam/doc/man/openpam_set_option.3#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/openpam/doc/man/openpam_ttyconv.3#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/openpam/doc/man/pam.3#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/openpam/doc/man/pam_acct_mgmt.3#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/openpam/doc/man/pam_authenticate.3#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/openpam/doc/man/pam_chauthtok.3#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/openpam/doc/man/pam_close_session.3#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/openpam/doc/man/pam_conv.3#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/openpam/doc/man/pam_end.3#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/openpam/doc/man/pam_error.3#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/openpam/doc/man/pam_get_authtok.3#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/openpam/doc/man/pam_get_data.3#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/openpam/doc/man/pam_get_item.3#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/openpam/doc/man/pam_get_user.3#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/openpam/doc/man/pam_getenv.3#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/openpam/doc/man/pam_getenvlist.3#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/openpam/doc/man/pam_info.3#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/openpam/doc/man/pam_open_session.3#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/openpam/doc/man/pam_prompt.3#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/openpam/doc/man/pam_putenv.3#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/openpam/doc/man/pam_set_data.3#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/openpam/doc/man/pam_set_item.3#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/openpam/doc/man/pam_setcred.3#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/openpam/doc/man/pam_setenv.3#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/openpam/doc/man/pam_sm_authenticate.3#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/openpam/doc/man/pam_sm_chauthtok.3#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/openpam/doc/man/pam_sm_close_session.3#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/openpam/doc/man/pam_sm_open_session.3#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/openpam/doc/man/pam_sm_setcred.3#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/openpam/doc/man/pam_start.3#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/openpam/doc/man/pam_strerror.3#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/openpam/doc/man/pam_verror.3#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/openpam/doc/man/pam_vinfo.3#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/openpam/doc/man/pam_vprompt.3#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/openpam/include/security/openpam.h#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/openpam/include/security/openpam_version.h#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/openpam/include/security/pam_appl.h#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/openpam/lib/openpam_borrow_cred.c#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/openpam/lib/openpam_impl.h#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/openpam/lib/openpam_restore_cred.c#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/openpam/lib/pam_get_authtok.c#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/openpam/lib/pam_get_data.c#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/openpam/lib/pam_get_user.c#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/openpam/lib/pam_vprompt.c#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/openpam/ltmain.sh#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/openpam/stamp-h.in#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/pf/authpf/authpf.8#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/pf/authpf/authpf.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/pf/authpf/pathnames.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/pf/ftp-proxy/ftp-proxy.8#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/pf/ftp-proxy/ftp-proxy.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/pf/ftp-proxy/getline.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/pf/ftp-proxy/util.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/pf/ftp-proxy/util.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/pf/man/pf.4#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/pf/man/pf.conf.5#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/pf/man/pf.os.5#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/pf/man/pflog.4#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/pf/man/pfsync.4#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/pf/pfctl/parse.y#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/pf/pfctl/pf_print_state.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/pf/pfctl/pfctl.8#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/pf/pfctl/pfctl.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/pf/pfctl/pfctl.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/pf/pfctl/pfctl_altq.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/pf/pfctl/pfctl_osfp.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/pf/pfctl/pfctl_parser.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/pf/pfctl/pfctl_parser.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/pf/pfctl/pfctl_qstats.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/pf/pfctl/pfctl_radix.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/pf/pfctl/pfctl_table.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/pf/pflogd/pflogd.8#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/pf/pflogd/pflogd.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/pf/pflogd/pidfile.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/pf/pflogd/pidfile.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sendmail/FREEBSD-upgrade#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sendmail/PGPKEYS#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sendmail/RELEASE_NOTES#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sendmail/cf/README#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sendmail/cf/cf/submit.cf#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sendmail/cf/m4/cfhead.m4#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sendmail/cf/m4/proto.m4#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sendmail/cf/m4/version.m4#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sendmail/doc/op/op.me#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sendmail/include/libmilter/mfapi.h#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sendmail/include/libmilter/milter.h#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sendmail/include/sm/cdefs.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sendmail/include/sm/conf.h#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sendmail/libmilter/docs/smfi_addrcpt.html#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sendmail/libmilter/docs/smfi_delrcpt.html#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sendmail/libmilter/docs/smfi_setreply.html#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sendmail/libmilter/docs/xxfi_connect.html#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sendmail/libmilter/docs/xxfi_envrcpt.html#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sendmail/libmilter/engine.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sendmail/libmilter/libmilter.h#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sendmail/libmilter/listener.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sendmail/libmilter/main.c#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sendmail/libmilter/signal.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sendmail/libsm/assert.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sendmail/libsm/exc.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sendmail/libsm/ldap.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sendmail/libsm/local.h#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sendmail/smrsh/smrsh.8#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sendmail/smrsh/smrsh.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sendmail/src/README#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sendmail/src/alias.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sendmail/src/conf.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sendmail/src/daemon.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sendmail/src/deliver.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sendmail/src/headers.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sendmail/src/main.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sendmail/src/milter.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sendmail/src/mime.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sendmail/src/queue.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sendmail/src/readcf.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sendmail/src/recipient.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sendmail/src/sendmail.8#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sendmail/src/sendmail.h#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sendmail/src/srvrsmtp.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sendmail/src/tls.c#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sendmail/src/util.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sendmail/src/version.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/smbfs/lib/smb/nb_net.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/sort/Makefile#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sort/append.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sort/extern.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sort/fields.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sort/files.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sort/fsort.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sort/fsort.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sort/init.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sort/msort.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sort/pathnames.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sort/regress/Makefile#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sort/regress/stests#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sort/sort.1#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sort/sort.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sort/sort.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sort/tmp.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/tar/FREEBSD-Xlist#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/tar/lib/getopt.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/tar/lib/getopt.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/tar/lib/getopt1.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/texinfo/FREEBSD-Xlist#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/texinfo/lib/getopt.c#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/texinfo/lib/getopt.h#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/texinfo/lib/getopt1.c#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/traceroute/traceroute.c#2 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/CREDITS#3 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/ChangeLog#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/FREEBSD-Xlist#2 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/FREEBSD-upgrade#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/INSTALL#3 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/LICENCE#3 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/Makefile.in#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/OVERVIEW#2 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/README#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/README.dns#2 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/README.platform#1 branch .. //depot/projects/trustedbsd/sebsd/crypto/openssh/README.privsep#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/README.smartcard#3 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/RFC.nroff#2 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/TODO#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/WARNING.RNG#2 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/acconfig.h#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/acss.c#1 branch .. //depot/projects/trustedbsd/sebsd/crypto/openssh/acss.h#1 branch .. //depot/projects/trustedbsd/sebsd/crypto/openssh/auth-chall.c#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/auth-krb5.c#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/auth-pam.c#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/auth-pam.h#3 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/auth-passwd.c#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/auth-rh-rsa.c#3 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/auth-rhosts.c#3 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/auth-rsa.c#3 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/auth-shadow.c#1 branch .. //depot/projects/trustedbsd/sebsd/crypto/openssh/auth-sia.c#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/auth.c#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/auth.h#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/auth1.c#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/auth2-gss.c#2 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/auth2-hostbased.c#3 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/auth2-passwd.c#3 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/auth2-pubkey.c#3 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/auth2.c#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/authfd.c#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/authfd.h#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/authfile.c#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/bufaux.c#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/bufaux.h#3 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/buffer.c#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/canohost.c#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/channels.c#6 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/channels.h#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/cipher-3des1.c#2 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/cipher-acss.c#1 branch .. //depot/projects/trustedbsd/sebsd/crypto/openssh/cipher-aes.c#2 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/cipher-ctr.c#2 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/cipher.c#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/cipher.h#2 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/cleanup.c#1 branch .. //depot/projects/trustedbsd/sebsd/crypto/openssh/clientloop.c#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/clientloop.h#2 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/compat.c#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/compat.h#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/compress.c#2 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/config.guess#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/config.h#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/config.sub#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/configure.ac#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/defines.h#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/dh.c#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/dns.c#2 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/dns.h#2 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/entropy.c#3 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/fatal.c#2 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/fixprogs#2 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/groupaccess.c#3 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/gss-genr.c#2 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/gss-serv-krb5.c#2 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/gss-serv.c#2 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/hostfile.c#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/hostfile.h#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/includes.h#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/install-sh#2 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/kex.c#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/kexgexc.c#3 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/key.c#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/key.h#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/log.c#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/log.h#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/loginrec.c#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/mac.c#2 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/md5crypt.c#3 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/mdoc2man.awk#2 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/misc.c#6 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/mkinstalldirs#2 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/moduli#2 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/moduli.c#2 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/monitor.c#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/monitor.h#3 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/monitor_wrap.c#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/monitor_wrap.h#3 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/msg.c#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/msg.h#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/nchan.ms#2 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/nchan2.ms#2 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/Makefile.in#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/base64.c#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/basename.c#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/bsd-arc4random.c#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/bsd-cray.c#3 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/bsd-cray.h#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/bsd-getpeereid.c#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/bsd-misc.c#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/bsd-misc.h#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/bsd-openpty.c#1 branch .. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/daemon.c#3 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/dirname.c#3 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/fake-rfc2553.c#2 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/fake-rfc2553.h#2 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/getcwd.c#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/getgrouplist.c#3 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/getopt.c#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/getrrsetbyname.c#2 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/getrrsetbyname.h#2 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/glob.c#3 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/glob.h#3 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/inet_aton.c#3 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/inet_ntoa.c#3 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/inet_ntop.c#3 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/mktemp.c#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/openbsd-compat.h#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/port-aix.c#3 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/port-aix.h#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/readpassphrase.c#3 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/readpassphrase.h#2 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/realpath.c#3 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/rresvport.c#3 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/setenv.c#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/setproctitle.c#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/sigact.c#2 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/strlcat.c#3 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/strlcpy.c#3 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/strmode.c#3 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/strsep.c#3 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/strtoul.c#1 branch .. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/sys-queue.h#3 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/sys-tree.h#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/vis.c#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/vis.h#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/xcrypt.c#2 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/packet.c#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/pathnames.h#2 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/progressmeter.c#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/readconf.c#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/readconf.h#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/regress/Makefile#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/regress/README.regress#2 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/regress/agent-ptrace.sh#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/regress/banner.sh#1 branch .. //depot/projects/trustedbsd/sebsd/crypto/openssh/regress/sftp-badcmds.sh#2 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/regress/sftp-batch.sh#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/regress/sftp-cmds.sh#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/regress/ssh-com.sh#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/regress/test-exec.sh#3 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/rijndael.c#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/scard-opensc.c#3 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/scp.1#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/scp.c#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/servconf.c#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/servconf.h#3 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/serverloop.c#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/session.c#6 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/session.h#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/sftp-client.c#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/sftp-client.h#2 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/sftp-common.c#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/sftp-common.h#2 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/sftp-glob.c#2 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/sftp-glob.h#2 delete .. //depot/projects/trustedbsd/sebsd/crypto/openssh/sftp-int.c#5 delete .. //depot/projects/trustedbsd/sebsd/crypto/openssh/sftp-int.h#4 delete .. //depot/projects/trustedbsd/sebsd/crypto/openssh/sftp-server.8#3 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/sftp-server.c#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/sftp.1#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/sftp.c#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/ssh-add.1#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/ssh-add.c#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/ssh-agent.c#6 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/ssh-dss.c#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/ssh-gss.h#2 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/ssh-keygen.1#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/ssh-keygen.c#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/ssh-keyscan.c#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/ssh-keysign.c#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/ssh-rand-helper.8#2 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/ssh-rand-helper.c#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/ssh-rsa.c#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/ssh.1#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/ssh.c#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/ssh.h#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/ssh_config#6 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/ssh_config.5#6 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/ssh_prng_cmds.in#2 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/sshconnect.c#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/sshconnect2.c#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/sshd.8#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/sshd.c#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/sshd_config#7 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/sshd_config.5#7 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/sshpty.c#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/sshtty.c#3 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/sshtty.h#2 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/uidswap.c#3 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/uuencode.c#2 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/uuencode.h#2 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/version.h#6 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/CHANGES#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/Configure#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/FAQ#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/LICENSE#3 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/Makefile.org#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/Makefile.ssl#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/NEWS#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/README#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/apps/CA.pl#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/apps/Makefile.ssl#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/apps/apps.c#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/apps/apps.h#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/apps/asn1pars.c#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/apps/ca.c#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/apps/der_chop#3 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/apps/dgst.c#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/apps/enc.c#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/apps/engine.c#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/apps/ocsp.c#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/apps/openssl.cnf#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/apps/pkcs12.c#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/apps/pkcs7.c#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/apps/req.c#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/apps/rsautl.c#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/apps/s_socket.c#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/apps/s_time.c#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/apps/speed.c#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/apps/x509.c#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/certs/expired/vsign3.pem#1 branch .. //depot/projects/trustedbsd/sebsd/crypto/openssl/certs/vsign3.pem#2 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/config#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/Makefile.ssl#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/aes/Makefile.ssl#3 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/aes/aes_cbc.c#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/asn1/Makefile.ssl#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/asn1/a_gentm.c#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/asn1/a_mbstr.c#3 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/asn1/a_strex.c#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/asn1/a_time.c#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/asn1/a_utctm.c#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/asn1/asn1_lib.c#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/asn1/asn1_par.c#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/asn1/asn_moid.c#3 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/asn1/t_pkey.c#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/asn1/x_long.c#3 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/bf/Makefile.ssl#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/bio/Makefile.ssl#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/bio/b_dump.c#2 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/bio/b_print.c#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/bio/b_sock.c#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/bio/bio_cb.c#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/bio/bss_conn.c#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/bio/bss_file.c#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/bn/Makefile.ssl#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/bn/asm/bn-586.pl#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/bn/asm/x86_64-gcc.c#3 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/bn/bn_lcl.h#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/bn/bn_lib.c#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/bn/bn_print.c#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/buffer/Makefile.ssl#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/cast/Makefile.ssl#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/comp/Makefile.ssl#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/conf/Makefile.ssl#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/conf/conf_def.c#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/conf/conf_mod.c#3 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/cversion.c#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/des/Makefile.ssl#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/des/cfb_enc.c#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/des/ecb_enc.c#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/dh/Makefile.ssl#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/dsa/Makefile.ssl#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/dso/Makefile.ssl#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/dso/dso_lib.c#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/ec/Makefile.ssl#3 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/ec/ecp_smpl.c#3 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/engine/Makefile.ssl#3 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/engine/eng_ctrl.c#3 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/engine/eng_fat.c#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/engine/engine.h#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/engine/hw_cryptodev.c#3 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/err/Makefile.ssl#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/err/err.c#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/evp/Makefile.ssl#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/evp/bio_ok.c#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/evp/digest.c#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/evp/evp.h#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/evp/evp_enc.c#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/evp/evp_pbe.c#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/evp/evp_pkey.c#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/hmac/Makefile.ssl#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/idea/Makefile.ssl#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/krb5/Makefile.ssl#3 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/lhash/Makefile.ssl#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/md2/Makefile.ssl#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/md4/Makefile.ssl#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/md5/Makefile.ssl#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/mdc2/Makefile.ssl#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/mem.c#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/mem_dbg.c#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/objects/Makefile.ssl#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/objects/obj_dat.c#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/objects/obj_dat.pl#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/ocsp/Makefile.ssl#3 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/ocsp/ocsp_ext.c#3 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/ocsp/ocsp_lib.c#3 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/ocsp/ocsp_vfy.c#3 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/opensslconf.h#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/opensslv.h#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/pem/Makefile.ssl#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/pem/pem_lib.c#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/pem/pem_pkey.c#3 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/pkcs12/Makefile.ssl#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/pkcs7/Makefile.ssl#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/pkcs7/pk7_doit.c#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/rand/Makefile.ssl#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/rand/rand_egd.c#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/rand/rand_unix.c#3 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/rand/rand_win.c#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/rand/randfile.c#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/rc2/Makefile.ssl#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/rc4/Makefile.ssl#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/rc5/Makefile.ssl#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/ripemd/Makefile.ssl#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/rsa/Makefile.ssl#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/sha/Makefile.ssl#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/sha/asm/sha1-586.pl#2 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/stack/Makefile.ssl#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/threads/mttest.c#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/txt_db/Makefile.ssl#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/ui/Makefile.ssl#3 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/ui/ui_lib.c#3 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/x509/Makefile.ssl#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/x509/by_dir.c#2 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/x509/x509.h#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/x509/x509_txt.c#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/x509/x509_vfy.c#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/x509/x509_vfy.h#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/x509/x509type.c#3 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/x509v3/Makefile.ssl#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/x509v3/v3_alt.c#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/x509v3/v3_crld.c#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/x509v3/v3_info.c#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/crypto/x509v3/v3_purp.c#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/doc/apps/config.pod#2 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/doc/apps/openssl.pod#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/doc/apps/s_client.pod#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/doc/apps/s_time.pod#1 branch .. //depot/projects/trustedbsd/sebsd/crypto/openssl/doc/apps/smime.pod#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/doc/crypto/BIO_f_ssl.pod#2 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/doc/crypto/CONF_modules_free.pod#1 branch .. //depot/projects/trustedbsd/sebsd/crypto/openssl/doc/crypto/CONF_modules_load_file.pod#1 branch .. //depot/projects/trustedbsd/sebsd/crypto/openssl/doc/crypto/EVP_BytesToKey.pod#3 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/doc/crypto/EVP_DigestInit.pod#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/doc/crypto/OPENSSL_config.pod#1 branch .. //depot/projects/trustedbsd/sebsd/crypto/openssl/doc/crypto/OPENSSL_load_builtin_modules.pod#1 branch .. //depot/projects/trustedbsd/sebsd/crypto/openssl/doc/crypto/OpenSSL_add_all_algorithms.pod#2 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/doc/crypto/RSA_print.pod#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/doc/crypto/d2i_DSAPublicKey.pod#3 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/doc/crypto/d2i_RSAPublicKey.pod#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/doc/crypto/des.pod#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/doc/crypto/pem.pod#3 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/doc/crypto/ui.pod#3 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/doc/ssl/SSL_COMP_add_compression_method.pod#2 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/doc/ssleay.txt#2 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/openssl.spec#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/ssl/Makefile.ssl#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/ssl/kssl.c#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/ssl/s2_clnt.c#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/ssl/s2_enc.c#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/ssl/s2_lib.c#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/ssl/s2_pkt.c#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/ssl/s2_srvr.c#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/ssl/s3_clnt.c#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/ssl/s3_enc.c#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/ssl/s3_lib.c#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/ssl/s3_pkt.c#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/ssl/s3_srvr.c#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/ssl/ssl.h#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/ssl/ssl_asn1.c#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/ssl/ssl_cert.c#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/ssl/ssl_ciph.c#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/ssl/ssl_lib.c#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/ssl/ssl_sess.c#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/ssl/ssltest.c#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/test/Makefile.ssl#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/tools/Makefile.ssl#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/tools/c_rehash#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/util/extract-names.pl#4 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/util/mk1mf.pl#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/util/mkdef.pl#5 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssl/util/pl/OS2-EMX.pl#3 integrate .. //depot/projects/trustedbsd/sebsd/etc/Makefile#10 integrate .. //depot/projects/trustedbsd/sebsd/etc/defaults/devfs.rules#2 integrate .. //depot/projects/trustedbsd/sebsd/etc/defaults/rc.conf#7 integrate .. //depot/projects/trustedbsd/sebsd/etc/devd.conf#6 integrate .. //depot/projects/trustedbsd/sebsd/etc/etc.powerpc/ttys#1 branch .. //depot/projects/trustedbsd/sebsd/etc/ftpusers#4 integrate .. //depot/projects/trustedbsd/sebsd/etc/group#4 integrate .. //depot/projects/trustedbsd/sebsd/etc/inetd.conf#4 integrate .. //depot/projects/trustedbsd/sebsd/etc/isdn/Makefile#3 integrate .. //depot/projects/trustedbsd/sebsd/etc/mail/aliases#4 integrate .. //depot/projects/trustedbsd/sebsd/etc/master.passwd#4 integrate .. //depot/projects/trustedbsd/sebsd/etc/mtree/BSD.include.dist#9 integrate .. //depot/projects/trustedbsd/sebsd/etc/mtree/BSD.local.dist#7 integrate .. //depot/projects/trustedbsd/sebsd/etc/mtree/BSD.usr.dist#9 integrate .. //depot/projects/trustedbsd/sebsd/etc/mtree/BSD.var.dist#3 integrate .. //depot/projects/trustedbsd/sebsd/etc/namedb/named.root#2 integrate .. //depot/projects/trustedbsd/sebsd/etc/netstart#5 integrate .. //depot/projects/trustedbsd/sebsd/etc/pam.d/xdm#4 integrate .. //depot/projects/trustedbsd/sebsd/etc/pccard_ether#5 integrate .. //depot/projects/trustedbsd/sebsd/etc/periodic/daily/110.clean-tmps#2 integrate .. //depot/projects/trustedbsd/sebsd/etc/pf.conf#1 branch .. //depot/projects/trustedbsd/sebsd/etc/pf.os#1 branch .. //depot/projects/trustedbsd/sebsd/etc/protocols#2 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc#4 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/DAEMON#2 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/LOGIN#2 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/Makefile#7 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/NETWORKING#4 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/SERVERS#2 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/abi#4 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/accounting#2 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/addswap#2 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/adjkerntz#4 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/amd#2 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/apm#4 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/apmd#4 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/archdep#4 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/atm1#4 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/atm2#3 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/atm3#4 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/bgfsck#4 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/bootparams#2 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/ccd#2 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/cleanvar#4 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/cleartmp#3 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/cron#5 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/devd#4 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/devfs#5 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/dhclient#5 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/diskless#6 delete .. //depot/projects/trustedbsd/sebsd/etc/rc.d/dmesg#2 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/dumpon#2 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/fsck#2 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/gbde#3 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/gbde_swap#1 branch .. //depot/projects/trustedbsd/sebsd/etc/rc.d/hostname#3 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/ike#2 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/inetd#2 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/initdiskless#7 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/initrandom#2 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/ip6addrctl#2 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/ip6fw#4 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/ipfilter#6 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/ipfs#4 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/ipfw#4 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/ipmon#4 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/ipnat#6 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/ipsec#4 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/ipxrouted#2 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/isdnd#4 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/jail#6 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/kldxref#3 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/ldconfig#5 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/local#2 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/lomac#2 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/lpd#2 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/mixer#1 branch .. //depot/projects/trustedbsd/sebsd/etc/rc.d/motd#5 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/mountcritlocal#5 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/mountcritremote#4 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/mountd#2 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/moused#2 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/mroute6d#4 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/mrouted#4 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/named#4 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/netif#3 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/netoptions#3 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/network_ipv6#4 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/nfsclient#2 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/nfsd#4 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/nfslocking#4 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/nfsserver#2 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/ntpd#2 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/ntpdate#2 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/pccard#4 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/pcvt#2 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/pf#1 branch .. //depot/projects/trustedbsd/sebsd/etc/rc.d/power_profile#2 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/ppp-user#4 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/pppoed#2 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/pwcheck#2 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/quota#2 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/ramdisk#1 branch .. //depot/projects/trustedbsd/sebsd/etc/rc.d/random#4 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/rarpd#2 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/resolv#1 branch .. //depot/projects/trustedbsd/sebsd/etc/rc.d/root#3 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/route6d#4 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/routed#4 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/routing#4 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/rpcbind#2 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/rtadvd#4 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/rwho#2 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/savecore#2 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/securelevel#4 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/sendmail#2 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/serial#4 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/sppp#4 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/sshd#4 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/swap1#2 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/syscons#3 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/sysctl#4 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/syslogd#2 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/timed#2 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/tmp#1 branch .. //depot/projects/trustedbsd/sebsd/etc/rc.d/ttys#4 delete .. //depot/projects/trustedbsd/sebsd/etc/rc.d/usbd#2 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/var#1 branch .. //depot/projects/trustedbsd/sebsd/etc/rc.d/vinum#2 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/virecover#4 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/watchdogd#3 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/ypbind#4 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/yppasswdd#4 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/ypserv#4 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.subr#6 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.suspend#3 integrate .. //depot/projects/trustedbsd/sebsd/etc/remote#5 integrate .. //depot/projects/trustedbsd/sebsd/etc/sendmail/Makefile#6 integrate .. //depot/projects/trustedbsd/sebsd/games/factor/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/games/fortune/datfiles/fortunes#6 integrate .. //depot/projects/trustedbsd/sebsd/games/fortune/datfiles/fortunes2#8 integrate .. //depot/projects/trustedbsd/sebsd/games/fortune/datfiles/freebsd-tips#5 integrate .. //depot/projects/trustedbsd/sebsd/games/morse/morse.6#3 integrate .. //depot/projects/trustedbsd/sebsd/games/morse/morse.c#3 integrate .. //depot/projects/trustedbsd/sebsd/games/number/number.c#2 integrate .. //depot/projects/trustedbsd/sebsd/gnu/lib/csu/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/gnu/lib/libdialog/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/gnu/lib/libdialog/menubox.c#4 integrate .. //depot/projects/trustedbsd/sebsd/gnu/lib/libregex/AUTHORS#2 delete .. //depot/projects/trustedbsd/sebsd/gnu/lib/libregex/COPYING#2 delete .. //depot/projects/trustedbsd/sebsd/gnu/lib/libregex/ChangeLog#2 delete .. //depot/projects/trustedbsd/sebsd/gnu/lib/libregex/FREEBSD-upgrade#1 branch .. //depot/projects/trustedbsd/sebsd/gnu/lib/libregex/INSTALL#2 delete .. //depot/projects/trustedbsd/sebsd/gnu/lib/libregex/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/gnu/lib/libregex/Makefile.gnu#2 delete .. //depot/projects/trustedbsd/sebsd/gnu/lib/libregex/Makefile.in#2 delete .. //depot/projects/trustedbsd/sebsd/gnu/lib/libregex/NEWS#2 delete .. //depot/projects/trustedbsd/sebsd/gnu/lib/libregex/README#2 delete .. //depot/projects/trustedbsd/sebsd/gnu/lib/libregex/VERSION#2 delete .. //depot/projects/trustedbsd/sebsd/gnu/lib/libregex/config.status#2 delete .. //depot/projects/trustedbsd/sebsd/gnu/lib/libregex/configure#2 delete .. //depot/projects/trustedbsd/sebsd/gnu/lib/libregex/configure.in#2 delete .. //depot/projects/trustedbsd/sebsd/gnu/lib/libregex/gnuregex.h#1 branch .. //depot/projects/trustedbsd/sebsd/gnu/lib/libregex/posix/regex.h#1 branch .. //depot/projects/trustedbsd/sebsd/gnu/lib/libregex/regex.c#3 integrate .. //depot/projects/trustedbsd/sebsd/gnu/lib/libregex/regex.h#2 integrate .. //depot/projects/trustedbsd/sebsd/gnu/lib/libregex/test/ChangeLog#2 delete .. //depot/projects/trustedbsd/sebsd/gnu/lib/libregex/test/Makefile#2 delete .. //depot/projects/trustedbsd/sebsd/gnu/lib/libregex/test/Makefile.in#2 delete .. //depot/projects/trustedbsd/sebsd/gnu/lib/libregex/test/alloca.c#2 delete .. //depot/projects/trustedbsd/sebsd/gnu/lib/libregex/test/bsd-interf.c#2 delete .. //depot/projects/trustedbsd/sebsd/gnu/lib/libregex/test/debugmalloc.c#2 delete .. //depot/projects/trustedbsd/sebsd/gnu/lib/libregex/test/emacsmalloc.c#2 delete .. //depot/projects/trustedbsd/sebsd/gnu/lib/libregex/test/fileregex.c#2 delete .. //depot/projects/trustedbsd/sebsd/gnu/lib/libregex/test/g++malloc.c#2 delete .. //depot/projects/trustedbsd/sebsd/gnu/lib/libregex/test/getpagesize.h#2 delete .. //depot/projects/trustedbsd/sebsd/gnu/lib/libregex/test/iregex.c#2 delete .. //depot/projects/trustedbsd/sebsd/gnu/lib/libregex/test/main.c#2 delete .. //depot/projects/trustedbsd/sebsd/gnu/lib/libregex/test/malloc-test.c#2 delete .. //depot/projects/trustedbsd/sebsd/gnu/lib/libregex/test/other.c#2 delete .. //depot/projects/trustedbsd/sebsd/gnu/lib/libregex/test/printchar.c#2 delete .. //depot/projects/trustedbsd/sebsd/gnu/lib/libregex/test/psx-basic.c#2 delete .. //depot/projects/trustedbsd/sebsd/gnu/lib/libregex/test/psx-extend.c#2 delete .. //depot/projects/trustedbsd/sebsd/gnu/lib/libregex/test/psx-generic.c#2 delete .. //depot/projects/trustedbsd/sebsd/gnu/lib/libregex/test/psx-group.c#2 delete .. //depot/projects/trustedbsd/sebsd/gnu/lib/libregex/test/psx-interf.c#2 delete .. //depot/projects/trustedbsd/sebsd/gnu/lib/libregex/test/psx-interv.c#2 delete .. //depot/projects/trustedbsd/sebsd/gnu/lib/libregex/test/regexcpp.sed#2 delete .. //depot/projects/trustedbsd/sebsd/gnu/lib/libregex/test/syntax.skel#2 delete .. //depot/projects/trustedbsd/sebsd/gnu/lib/libregex/test/test.c#2 delete .. //depot/projects/trustedbsd/sebsd/gnu/lib/libregex/test/test.h#2 delete .. //depot/projects/trustedbsd/sebsd/gnu/lib/libregex/test/tregress.c#2 delete .. //depot/projects/trustedbsd/sebsd/gnu/lib/libregex/test/upcase.c#2 delete .. //depot/projects/trustedbsd/sebsd/gnu/lib/libregex/test/xmalloc.c#2 delete .. //depot/projects/trustedbsd/sebsd/gnu/lib/libstdc++/Makefile#5 integrate .. //depot/projects/trustedbsd/sebsd/gnu/usr.bin/bc/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/gnu/usr.bin/binutils/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/sebsd/gnu/usr.bin/binutils/Makefile.inc0#2 integrate .. //depot/projects/trustedbsd/sebsd/gnu/usr.bin/binutils/addr2line/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/gnu/usr.bin/binutils/as/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/sebsd/gnu/usr.bin/binutils/as/Makefile.inc0#4 integrate .. //depot/projects/trustedbsd/sebsd/gnu/usr.bin/binutils/as/ia64-freebsd/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/gnu/usr.bin/binutils/gasp/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/gnu/usr.bin/binutils/gdb/Makefile#5 integrate .. //depot/projects/trustedbsd/sebsd/gnu/usr.bin/binutils/gdb/fbsd-kgdb-alpha.h#2 integrate .. //depot/projects/trustedbsd/sebsd/gnu/usr.bin/binutils/gdb/fbsd-kgdb-amd64.h#1 branch .. //depot/projects/trustedbsd/sebsd/gnu/usr.bin/binutils/gdb/fbsd-kgdb-arm.h#2 integrate .. //depot/projects/trustedbsd/sebsd/gnu/usr.bin/binutils/gdb/fbsd-kgdb-i386.h#2 integrate .. //depot/projects/trustedbsd/sebsd/gnu/usr.bin/binutils/gdb/fbsd-kgdb-ia64.h#2 integrate .. //depot/projects/trustedbsd/sebsd/gnu/usr.bin/binutils/gdb/fbsd-kgdb-powerpc.h#2 integrate .. //depot/projects/trustedbsd/sebsd/gnu/usr.bin/binutils/gdb/fbsd-kgdb-sparc64.h#2 integrate .. //depot/projects/trustedbsd/sebsd/gnu/usr.bin/binutils/gdb/fbsd-kgdb-x86_64.h#2 delete .. //depot/projects/trustedbsd/sebsd/gnu/usr.bin/binutils/gdb/kvm-fbsd.c#4 integrate .. //depot/projects/trustedbsd/sebsd/gnu/usr.bin/binutils/ld/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/gnu/usr.bin/binutils/libbfd/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/gnu/usr.bin/binutils/libbfd/i386/bfd.h#2 integrate .. //depot/projects/trustedbsd/sebsd/gnu/usr.bin/binutils/libbfd/powerpc/bfd.h#2 integrate .. //depot/projects/trustedbsd/sebsd/gnu/usr.bin/binutils/libbinutils/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/gnu/usr.bin/binutils/libiberty/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/gnu/usr.bin/binutils/nm/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/gnu/usr.bin/binutils/objcopy/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/gnu/usr.bin/binutils/objdump/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/gnu/usr.bin/binutils/readelf/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/gnu/usr.bin/binutils/size/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/gnu/usr.bin/binutils/strings/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/gnu/usr.bin/binutils/strip/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/gnu/usr.bin/cc/c++/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/gnu/usr.bin/cc/c++filt/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/gnu/usr.bin/cc/cc/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/gnu/usr.bin/cc/cc1/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/gnu/usr.bin/cc/cc1obj/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/gnu/usr.bin/cc/cc1plus/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/gnu/usr.bin/cc/cc_int/Makefile#5 integrate .. //depot/projects/trustedbsd/sebsd/gnu/usr.bin/cc/cc_tools/Makefile#5 integrate .. //depot/projects/trustedbsd/sebsd/gnu/usr.bin/cc/cccp/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/gnu/usr.bin/cc/collect2/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/gnu/usr.bin/cc/cpp/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/gnu/usr.bin/cc/cpp0/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/gnu/usr.bin/cc/f771/Makefile#3 integrate .. //depot/projects/trustedbsd/sebsd/gnu/usr.bin/cc/tradcpp0/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/gnu/usr.bin/cpio/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/gnu/usr.bin/cvs/cvs/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/gnu/usr.bin/cvs/lib/Makefile#5 integrate .. //depot/projects/trustedbsd/sebsd/gnu/usr.bin/cvs/libdiff/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/gnu/usr.bin/dc/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/gnu/usr.bin/dialog/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/gnu/usr.bin/diff/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/gnu/usr.bin/diff/diff.1#2 integrate .. //depot/projects/trustedbsd/sebsd/gnu/usr.bin/diff3/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/gnu/usr.bin/gperf/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/gnu/usr.bin/grep/ChangeLog#2 integrate .. //depot/projects/trustedbsd/sebsd/gnu/usr.bin/grep/Makefile#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Apr 19 18:12:31 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4A2CD16A4D0; Mon, 19 Apr 2004 18:12:31 -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 1EE4916A4CE for ; Mon, 19 Apr 2004 18:12:31 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 12B7D43D5C for ; Mon, 19 Apr 2004 18:12:31 -0700 (PDT) (envelope-from marcel@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 i3K1CUGe092307 for ; Mon, 19 Apr 2004 18:12:30 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i3K1CSON092304 for perforce@freebsd.org; Mon, 19 Apr 2004 18:12:28 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Mon, 19 Apr 2004 18:12:28 -0700 (PDT) Message-Id: <200404200112.i3K1CSON092304@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 51391 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: Tue, 20 Apr 2004 01:12:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=51391 Change 51391 by marcel@marcel_nfs on 2004/04/19 18:12:11 IFC @51388 Affected files ... .. //depot/projects/gdb/MAINTAINERS#7 integrate .. //depot/projects/gdb/bin/df/Makefile#2 integrate .. //depot/projects/gdb/bin/df/df.1#3 integrate .. //depot/projects/gdb/bin/df/df.c#6 integrate .. //depot/projects/gdb/contrib/less/LICENSE#2 integrate .. //depot/projects/gdb/contrib/less/Makefile.aut#2 integrate .. //depot/projects/gdb/contrib/less/Makefile.dsg#2 integrate .. //depot/projects/gdb/contrib/less/Makefile.in#2 integrate .. //depot/projects/gdb/contrib/less/NEWS#2 integrate .. //depot/projects/gdb/contrib/less/README#2 integrate .. //depot/projects/gdb/contrib/less/acconfig.h#2 delete .. //depot/projects/gdb/contrib/less/brac.c#2 integrate .. //depot/projects/gdb/contrib/less/ch.c#2 integrate .. //depot/projects/gdb/contrib/less/charset.c#2 integrate .. //depot/projects/gdb/contrib/less/cmd.h#2 integrate .. //depot/projects/gdb/contrib/less/cmdbuf.c#2 integrate .. //depot/projects/gdb/contrib/less/command.c#2 integrate .. //depot/projects/gdb/contrib/less/configure#2 integrate .. //depot/projects/gdb/contrib/less/configure.ac#1 branch .. //depot/projects/gdb/contrib/less/configure.in#2 delete .. //depot/projects/gdb/contrib/less/decode.c#2 integrate .. //depot/projects/gdb/contrib/less/defines.ds#2 integrate .. //depot/projects/gdb/contrib/less/defines.h.in#2 integrate .. //depot/projects/gdb/contrib/less/defines.h.top#2 delete .. //depot/projects/gdb/contrib/less/defines.o2#2 integrate .. //depot/projects/gdb/contrib/less/defines.wn#2 integrate .. //depot/projects/gdb/contrib/less/edit.c#2 integrate .. //depot/projects/gdb/contrib/less/filename.c#2 integrate .. //depot/projects/gdb/contrib/less/forwback.c#2 integrate .. //depot/projects/gdb/contrib/less/funcs.h#2 integrate .. //depot/projects/gdb/contrib/less/help.c#2 integrate .. //depot/projects/gdb/contrib/less/ifile.c#2 integrate .. //depot/projects/gdb/contrib/less/input.c#2 integrate .. //depot/projects/gdb/contrib/less/jump.c#2 integrate .. //depot/projects/gdb/contrib/less/less.h#2 integrate .. //depot/projects/gdb/contrib/less/less.hlp#2 integrate .. //depot/projects/gdb/contrib/less/less.man#2 integrate .. //depot/projects/gdb/contrib/less/less.nro#2 integrate .. //depot/projects/gdb/contrib/less/lessecho.c#2 integrate .. //depot/projects/gdb/contrib/less/lesskey.c#2 integrate .. //depot/projects/gdb/contrib/less/lesskey.h#2 integrate .. //depot/projects/gdb/contrib/less/lesskey.man#2 integrate .. //depot/projects/gdb/contrib/less/lesskey.nro#2 integrate .. //depot/projects/gdb/contrib/less/lglob.h#2 integrate .. //depot/projects/gdb/contrib/less/line.c#2 integrate .. //depot/projects/gdb/contrib/less/linenum.c#2 integrate .. //depot/projects/gdb/contrib/less/lsystem.c#2 integrate .. //depot/projects/gdb/contrib/less/main.c#2 integrate .. //depot/projects/gdb/contrib/less/mark.c#2 integrate .. //depot/projects/gdb/contrib/less/mkhelp.c#2 integrate .. //depot/projects/gdb/contrib/less/optfunc.c#2 integrate .. //depot/projects/gdb/contrib/less/option.c#2 integrate .. //depot/projects/gdb/contrib/less/option.h#2 integrate .. //depot/projects/gdb/contrib/less/opttbl.c#2 integrate .. //depot/projects/gdb/contrib/less/os.c#2 integrate .. //depot/projects/gdb/contrib/less/output.c#2 integrate .. //depot/projects/gdb/contrib/less/pckeys.h#2 integrate .. //depot/projects/gdb/contrib/less/position.c#2 integrate .. //depot/projects/gdb/contrib/less/position.h#2 integrate .. //depot/projects/gdb/contrib/less/prompt.c#2 integrate .. //depot/projects/gdb/contrib/less/screen.c#2 integrate .. //depot/projects/gdb/contrib/less/scrsize.c#2 integrate .. //depot/projects/gdb/contrib/less/search.c#2 integrate .. //depot/projects/gdb/contrib/less/signal.c#2 integrate .. //depot/projects/gdb/contrib/less/tags.c#2 integrate .. //depot/projects/gdb/contrib/less/ttyin.c#2 integrate .. //depot/projects/gdb/contrib/less/version.c#2 integrate .. //depot/projects/gdb/contrib/pf/man/pf.4#2 integrate .. //depot/projects/gdb/contrib/pf/man/pflog.4#2 integrate .. //depot/projects/gdb/contrib/pf/man/pfsync.4#2 integrate .. //depot/projects/gdb/contrib/traceroute/traceroute.c#3 integrate .. //depot/projects/gdb/etc/rc.d/sendmail#4 integrate .. //depot/projects/gdb/gnu/usr.bin/binutils/libbfd/i386/bfd.h#4 integrate .. //depot/projects/gdb/lib/libarchive/archive_write_set_format_ustar.c#6 integrate .. //depot/projects/gdb/lib/libc/sys/mmap.2#2 integrate .. //depot/projects/gdb/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#2 integrate .. //depot/projects/gdb/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#11 integrate .. //depot/projects/gdb/release/doc/ja_JP.eucJP/hardware/ia64/proc-ia64.sgml#2 integrate .. //depot/projects/gdb/release/scripts/print-cdrom-packages.sh#4 integrate .. //depot/projects/gdb/secure/Makefile.inc#2 integrate .. //depot/projects/gdb/secure/lib/libcrypto/Makefile#4 integrate .. //depot/projects/gdb/secure/lib/libcrypto/Makefile.inc#4 integrate .. //depot/projects/gdb/share/man/man4/Makefile#8 integrate .. //depot/projects/gdb/share/man/man4/ng_bridge.4#2 integrate .. //depot/projects/gdb/share/man/man4/ng_hub.4#1 branch .. //depot/projects/gdb/share/man/man4/ng_one2many.4#3 integrate .. //depot/projects/gdb/sys/alpha/alpha/vm_machdep.c#5 integrate .. //depot/projects/gdb/sys/alpha/include/sf_buf.h#2 integrate .. //depot/projects/gdb/sys/amd64/amd64/vm_machdep.c#8 integrate .. //depot/projects/gdb/sys/amd64/include/sf_buf.h#2 integrate .. //depot/projects/gdb/sys/boot/i386/boot0/boot0ext.s#2 integrate .. //depot/projects/gdb/sys/cam/scsi/scsi_da.c#4 integrate .. //depot/projects/gdb/sys/compat/ndis/subr_hal.c#4 integrate .. //depot/projects/gdb/sys/compat/ndis/subr_ntoskrnl.c#11 integrate .. //depot/projects/gdb/sys/conf/NOTES#12 integrate .. //depot/projects/gdb/sys/conf/options#12 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_pcib.c#5 integrate .. //depot/projects/gdb/sys/dev/arl/if_arl.c#3 integrate .. //depot/projects/gdb/sys/dev/arl/if_arlreg.h#3 integrate .. //depot/projects/gdb/sys/dev/ata/ata-lowlevel.c#6 integrate .. //depot/projects/gdb/sys/dev/awi/awi.c#4 integrate .. //depot/projects/gdb/sys/dev/ciss/ciss.c#7 integrate .. //depot/projects/gdb/sys/dev/puc/puc_pccard.c#2 integrate .. //depot/projects/gdb/sys/dev/puc/pucdata.c#3 integrate .. //depot/projects/gdb/sys/dev/puc/pucvar.h#2 integrate .. //depot/projects/gdb/sys/dev/random/nehemiah.c#2 integrate .. //depot/projects/gdb/sys/dev/random/randomdev.c#7 integrate .. //depot/projects/gdb/sys/i386/isa/atpic.c#3 integrate .. //depot/projects/gdb/sys/ia64/ia64/vm_machdep.c#5 integrate .. //depot/projects/gdb/sys/ia64/include/sf_buf.h#2 integrate .. //depot/projects/gdb/sys/isa/psm.c#5 integrate .. //depot/projects/gdb/sys/kern/kern_thr.c#6 integrate .. //depot/projects/gdb/sys/kern/uipc_mbuf.c#4 integrate .. //depot/projects/gdb/sys/modules/cam/Makefile#2 integrate .. //depot/projects/gdb/sys/modules/netgraph/Makefile#4 integrate .. //depot/projects/gdb/sys/modules/netgraph/hub/Makefile#1 branch .. //depot/projects/gdb/sys/net/if.c#7 integrate .. //depot/projects/gdb/sys/net/if_arp.h#3 integrate .. //depot/projects/gdb/sys/net/if_ethersubr.c#8 integrate .. //depot/projects/gdb/sys/net/if_fddisubr.c#5 integrate .. //depot/projects/gdb/sys/net/if_iso88025subr.c#4 integrate .. //depot/projects/gdb/sys/net/if_ppp.c#4 integrate .. //depot/projects/gdb/sys/net/if_stf.c#5 integrate .. //depot/projects/gdb/sys/net/if_var.h#10 integrate .. //depot/projects/gdb/sys/net/radix.c#3 integrate .. //depot/projects/gdb/sys/net/radix.h#3 integrate .. //depot/projects/gdb/sys/net/route.c#6 integrate .. //depot/projects/gdb/sys/net/route.h#5 integrate .. //depot/projects/gdb/sys/net/rtsock.c#6 integrate .. //depot/projects/gdb/sys/netgraph/ng_eiface.c#2 integrate .. //depot/projects/gdb/sys/netgraph/ng_ether.c#3 integrate .. //depot/projects/gdb/sys/netgraph/ng_hub.c#1 branch .. //depot/projects/gdb/sys/netgraph/ng_hub.h#1 branch .. //depot/projects/gdb/sys/netinet/if_ether.c#6 integrate .. //depot/projects/gdb/sys/netinet6/nd6.c#3 integrate .. //depot/projects/gdb/sys/netinet6/nd6_nbr.c#3 integrate .. //depot/projects/gdb/sys/netinet6/nd6_rtr.c#2 integrate .. //depot/projects/gdb/sys/netipsec/xform_ipip.c#3 integrate .. //depot/projects/gdb/sys/pci/if_sk.c#5 integrate .. //depot/projects/gdb/sys/powerpc/include/sf_buf.h#2 integrate .. //depot/projects/gdb/sys/powerpc/powerpc/vm_machdep.c#6 integrate .. //depot/projects/gdb/sys/sys/mbuf.h#5 integrate .. //depot/projects/gdb/sys/sys/types.h#4 integrate .. //depot/projects/gdb/tools/tools/usb/print-usb-if-vids.sh#1 branch .. //depot/projects/gdb/usr.bin/calendar/calendars/calendar.freebsd#6 integrate .. //depot/projects/gdb/usr.bin/less/defines.h#2 integrate .. //depot/projects/gdb/usr.bin/talk/init_disp.c#2 integrate .. //depot/projects/gdb/usr.bin/talk/io.c#2 integrate .. //depot/projects/gdb/usr.bin/talk/talk.h#2 integrate .. //depot/projects/gdb/usr.bin/tar/Makefile#4 integrate .. //depot/projects/gdb/usr.sbin/acpi/acpidump/acpi.c#2 integrate .. //depot/projects/gdb/usr.sbin/sysinstall/dist.c#3 integrate Differences ... ==== //depot/projects/gdb/MAINTAINERS#7 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.86 2004/04/08 01:43:34 vkashyap Exp $ +$FreeBSD: src/MAINTAINERS,v 1.88 2004/04/19 17:47:45 tackerman Exp $ subsystem login notes ----------------------------- @@ -45,6 +45,7 @@ ch(4) ken Pre-commit review requested. isp(4) mjacob Pre-commit review requested. mpt(4) mjacob Pre-commit review requested. +em(4) tackerman Pre-commit review requested. tdfx(4) cokane Just keep me informed of changes, try not to break it. sendmail gshapiro Pre-commit review requested. etc/mail gshapiro Pre-commit review requested. @@ -73,7 +74,6 @@ libz peter Try not to break it. pppd/chat peter Try not to break it. groff ru Recommends pre-commit review. -natd(8) ru Recommends pre-commit review. share/mk ru Recommends pre-commit review. ipfw ipfw Pre-commit review preferred. send to ipfw@freebsd.org drm anholt Just keep me informed of changes, try not to break it. ==== //depot/projects/gdb/bin/df/Makefile#2 (text+ko) ==== @@ -1,8 +1,8 @@ # @(#)Makefile 8.3 (Berkeley) 5/8/95 -# $FreeBSD: src/bin/df/Makefile,v 1.16 2003/06/13 07:04:01 markm Exp $ +# $FreeBSD: src/bin/df/Makefile,v 1.17 2004/04/18 20:56:31 obrien Exp $ MOUNT= ${.CURDIR}/../../sbin/mount -.PATH: ${MOUNT} +.PATH: ${MOUNT} PROG= df SRCS= df.c vfslist.c ==== //depot/projects/gdb/bin/df/df.1#3 (text+ko) ==== @@ -26,7 +26,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)df.1 8.3 (Berkeley) 5/8/95 -.\" $FreeBSD: src/bin/df/df.1,v 1.31 2004/04/06 20:06:46 markm Exp $ +.\" $FreeBSD: src/bin/df/df.1,v 1.32 2004/04/18 20:56:31 obrien Exp $ .\" .Dd May 8, 1995 .Dt DF 1 @@ -40,7 +40,7 @@ .Fl b | h | H | k | .Fl m | P .Oc -.Op Fl ailn +.Op Fl aciln .Op Fl t Ar type .Op Ar file | filesystem ... .Sh DESCRIPTION @@ -69,6 +69,8 @@ this overrides the .Ev BLOCKSIZE specification from the environment. +.It Fl c +Display a grand total. .It Fl g Use 1073741824-byte (1-Gbyte) blocks rather than the default. Note that this overrides the ==== //depot/projects/gdb/bin/df/df.c#6 (text+ko) ==== @@ -44,7 +44,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.57 2004/04/06 20:06:46 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.58 2004/04/18 20:56:31 obrien Exp $"); #include #include @@ -121,6 +121,7 @@ static void prthuman(const struct statfs *, int64_t); static void prthumanval(double); static void prtstat(struct statfs *, struct maxwidths *); +static void addstat(struct statfs *, struct statfs *); static size_t regetmntinfo(struct statfs **, long, const char **); static unit_t unit_adjust(double *); static void update_maxwidths(struct maxwidths *, const struct statfs *); @@ -132,14 +133,14 @@ return (a > b ? a : b); } -static int aflag = 0, hflag, iflag, nflag; +static int aflag = 0, cflag, hflag, iflag, nflag; static struct ufs_args mdev; int main(int argc, char *argv[]) { struct stat stbuf; - struct statfs statfsbuf, *mntbuf; + struct statfs statfsbuf, totalbuf, *mntbuf; struct maxwidths maxwidths; const char *fstype; char *mntpath, *mntpt; @@ -149,12 +150,18 @@ fstype = "ufs"; + memset (&totalbuf, 0, sizeof (totalbuf)); + totalbuf.f_bsize = DEV_BSIZE; + strncpy (totalbuf.f_mntfromname, "total", MNAMELEN); vfslist = NULL; - while ((ch = getopt(argc, argv, "abgHhiklmnPt:")) != -1) + while ((ch = getopt(argc, argv, "abcgHhiklmnPt:")) != -1) switch (ch) { case 'a': aflag = 1; break; + case 'c': + cflag = 1; + break; case 'b': /* FALLTHROUGH */ case 'P': @@ -214,12 +221,18 @@ if (!*argv) { mntsize = regetmntinfo(&mntbuf, mntsize, vfslist); bzero(&maxwidths, sizeof(maxwidths)); + for (i = 0; i < mntsize; i++) { + if (cflag) + addstat(&totalbuf, &mntbuf[i]); + update_maxwidths(&maxwidths, &mntbuf[i]); + } + if (cflag) + update_maxwidths(&maxwidths, &totalbuf); for (i = 0; i < mntsize; i++) - update_maxwidths(&maxwidths, &mntbuf[i]); - for (i = 0; i < mntsize; i++) { if (aflag || (mntbuf[i].f_flags & MNT_IGNORE) == 0) prtstat(&mntbuf[i], &maxwidths); - } + if (cflag) + prtstat(&totalbuf, &maxwidths); exit(rv); } @@ -256,6 +269,8 @@ } else if (statfs(mntpt, &statfsbuf) == 0) { statfsbuf.f_mntonname[0] = '\0'; prtstat(&statfsbuf, &maxwidths); + if (cflag) + addstat(&totalbuf, &statfsbuf); } else { warn("%s", *argv); rv = 1; @@ -294,7 +309,11 @@ update_maxwidths(&maxwidths, &statfsbuf); } prtstat(&statfsbuf, &maxwidths); + if (cflag) + addstat(&totalbuf, &statfsbuf); } + if (cflag) + prtstat(&totalbuf, &maxwidths); return (rv); } @@ -383,11 +402,11 @@ unit = unit_adjust(&bytes); if (bytes == 0) - (void)printf(" 0B"); + (void)printf(" 0B"); else if (bytes > 10) - (void)printf(" %5.0f%c", bytes, "BKMGTPE"[unit]); + (void)printf(" % 6.0f%c", bytes, "BKMGTPE"[unit]); else - (void)printf(" %5.1f%c", bytes, "BKMGTPE"[unit]); + (void)printf(" % 6.1f%c", bytes, "BKMGTPE"[unit]); } /* @@ -409,6 +428,7 @@ static int headerlen, timesthrough = 0; static const char *header; int64_t used, availblks, inodes; + int total; if (++timesthrough == 1) { mwp->mntfrom = imax(mwp->mntfrom, (int)strlen("Filesystem")); @@ -450,15 +470,29 @@ } (void)printf(" %5.0f%%", availblks == 0 ? 100.0 : (double)used / (double)availblks * 100.0); + total = !*sfsp->f_mntonname && + strncmp(sfsp->f_mntfromname, "total", MNAMELEN) == 0; if (iflag) { inodes = sfsp->f_files; used = inodes - sfsp->f_ffree; (void)printf(" %*jd %*jd %4.0f%% ", mwp->iused, (intmax_t)used, mwp->ifree, (intmax_t)sfsp->f_ffree, inodes == 0 ? 100.0 : (double)used / (double)inodes * 100.0); - } else - (void)printf(" "); - (void)printf(" %s\n", sfsp->f_mntonname); + } else if (!total) + (void)printf(" %s", sfsp->f_mntonname); + (void)printf("\n"); +} + +void +addstat(struct statfs *totalfsp, struct statfs *statfsp) +{ + double bsize = statfsp->f_bsize / totalfsp->f_bsize; + + totalfsp->f_blocks += statfsp->f_blocks * bsize; + totalfsp->f_bfree += statfsp->f_bfree * bsize; + totalfsp->f_bavail += statfsp->f_bavail * bsize; + totalfsp->f_files += statfsp->f_files; + totalfsp->f_ffree += statfsp->f_ffree; } /* @@ -512,7 +546,7 @@ { (void)fprintf(stderr, - "usage: df [-b | -H | -h | -k | -m | -P] [-ailn] [-t type] [file | filesystem ...]\n"); + "usage: df [-b | -H | -h | -k | -m | -P] [-aciln] [-t type] [file | filesystem ...]\n"); exit(EX_USAGE); } ==== //depot/projects/gdb/contrib/less/LICENSE#2 (text+ko) ==== @@ -2,7 +2,7 @@ ------------ Less -Copyright (C) 1984-2000 Mark Nudelman +Copyright (C) 1984-2002 Mark Nudelman Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions ==== //depot/projects/gdb/contrib/less/Makefile.aut#2 (text+ko) ==== @@ -23,9 +23,9 @@ DISTFILES = \ ${SRC} regexp.c regexp.h \ COPYING INSTALL LICENSE Makefile.in Makefile.aut NEWS README \ - configure configure.in acconfig.h lesskey.c lessecho.c scrsize.c \ + configure configure.ac lesskey.c lessecho.c scrsize.c \ cmd.h funcs.h lglob.h less.h lesskey.h option.h pckeys.h position.h \ - install.sh defines.h.in defines.h.top mkinstalldirs \ + install.sh defines.h.in mkinstalldirs \ less.nro lesskey.nro less.man lesskey.man less.hlp \ mkfuncs.awk mkhelp.c \ ${DISTFILES_W} @@ -41,10 +41,8 @@ mkhelp: mkhelp.c ${CC} -o mkhelp mkhelp.c -${srcdir}/configure: ${srcdir}/configure.in \ - ${srcdir}/Makefile.in \ - ${srcdir}/defines.h.top \ - ${srcdir}/acconfig.h +${srcdir}/configure: ${srcdir}/configure.ac \ + ${srcdir}/Makefile.in cd ${srcdir}; autoheader; autoconf funcs.h: ${SRC:%=${srcdir}/%} ==== //depot/projects/gdb/contrib/less/Makefile.dsg#2 (text+ko) ==== @@ -6,6 +6,9 @@ VPATH = . CC = gcc +INSTALL = ginstall -c +INSTALL_PROGRAM = ginstall +INSTALL_DATA = ginstall -m 644 AWK = gawk CFLAGS = -O2 -g @@ -15,13 +18,20 @@ O=o LIBS = +prefix = /dev/env/DJDIR +exec_prefix = ${prefix} +bindir = ${exec_prefix}/bin +sysconfdir = ${prefix}/etc +mandir = ${prefix}/man +manext = 1 + #### End of system configuration section. #### # This rule allows us to supply the necessary -D options # in addition to whatever the user asks for. .c.o: - ${CC} -I. ${CFLAGS_COMPILE_ONLY} ${CPPFLAGS} ${CFLAGS} $< + ${CC} -I. ${CFLAGS_COMPILE_ONLY} -DBINDIR=\"${bindir}\" -DSYSDIR=\"${sysconfdir}\" ${CPPFLAGS} ${CFLAGS} $< OBJ = main.${O} screen.${O} brac.${O} ch.${O} charset.${O} cmdbuf.${O} \ command.${O} decode.${O} edit.${O} filename.${O} forwback.${O} \ @@ -44,7 +54,14 @@ defines.h: defines.ds command.com /c copy $< $@ -${OBJ}: less.h defines.h funcs.h +${OBJ}: ${srcdir}/less.h defines.h ${srcdir}/funcs.h + +install: all ${srcdir}/less.man ${srcdir}/lesskey.man + ${INSTALL_PROGRAM} less.exe ${bindir}/less.exe + ${INSTALL_PROGRAM} lesskey.exe ${bindir}/lesskey.exe + ${INSTALL_PROGRAM} lessecho.exe ${bindir}/lessecho.exe + ${INSTALL_DATA} ${srcdir}/less.man ${mandir}/man${manext}/less.${manext} + ${INSTALL_DATA} ${srcdir}/lesskey.man ${mandir}/man${manext}/lesskey.${manext} info: install-info: ==== //depot/projects/gdb/contrib/less/Makefile.in#2 (text+ko) ==== @@ -96,7 +96,7 @@ config.status: ${srcdir}/configure ./config.status --recheck -${srcdir}/configure: ${srcdir}/configure.in +${srcdir}/configure: ${srcdir}/configure.ac cd ${srcdir}; autoheader; autoconf clean: ==== //depot/projects/gdb/contrib/less/NEWS#2 (text+ko) ==== @@ -13,7 +13,38 @@ ====================================================================== - Major changes between "less" versions 358 and 371 + Major changes between "less" versions 378 and 381 + +* New -L option to disable LESSOPEN processing. + +* Further support for large (64 bit) file addressing. + Large file support is now set up by the configure script. + +* Use autoconf 2.54. + Replace configure.in, acconfig.h, defines.h.top with configure.ac. + +* Overstriking underscore with underscore is now bold or underlined + depending on context. + +* Use only 7 spaces for line numbers in -N mode, if possible. + +* Fix some bugs in handling overstriking in UTF-8 files. + +* Fix some nroff issues in the man page. + +====================================================================== + + Major changes between "less" versions 376 and 378 + +* Bug fixes: + Default buffer space is now 64K as documented. + Search highlighting works properly when used with -R. + Windows version works properly when input file contains carriage returns. + Clean up some compiler warnings. + +====================================================================== + + Major changes between "less" versions 358 and 376 * -x option can now specify multiple variable-width tab stops. @@ -41,7 +72,10 @@ * Default LESSCHARSET for MS-DOS versions is now "dos". -* Improved performance in reading very large files. +* Searching works better with ANSI (SGR) escape sequences. + ANSI color escape sequences are now supported in the MS-DOS (DJGPP) version. + +* Improved performance in reading very large pipes. * Eliminated some dependencies on file offets being 32 bits. @@ -51,6 +85,8 @@ * Improved horizontal shifting of text using -R option with ANSI color. +* Improved handling of filenames containing shell metacharacters. + * Some fixes for EBCDIC systems. * Some fixes for OS/2 systems. ==== //depot/projects/gdb/contrib/less/README#2 (text+ko) ==== @@ -1,7 +1,7 @@ - Less, version 371 + Less, version 381 - This is the distribution of less, version 371, released 26 Dec 2001. + This is the distribution of less, version 381, released 17 Jan 2003. This program is part of the GNU project (http://www.gnu.org). This program is free software. You may redistribute it and/or ==== //depot/projects/gdb/contrib/less/brac.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2000 Mark Nudelman + * Copyright (C) 1984-2002 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. ==== //depot/projects/gdb/contrib/less/ch.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2000 Mark Nudelman + * Copyright (C) 1984-2002 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. @@ -93,10 +93,10 @@ static struct filestate *thisfile; static int ch_ungotchar = -1; +static int maxbufs = -1; extern int autobuf; extern int sigs; -extern int cbufs; extern int secure; extern constant char helpdata[]; extern constant int size_helpdata; @@ -162,7 +162,7 @@ * 2. We haven't allocated the max buffers for this file yet. */ if ((autobuf && !(ch_flags & CH_CANSEEK)) || - (cbufs == -1 || ch_nbufs < cbufs)) + (maxbufs < 0 || ch_nbufs < maxbufs)) if (ch_addbuf()) /* * Allocation failed: turn off autobuf. @@ -561,32 +561,21 @@ } /* - * Allocate buffers. - * Caller wants us to have a total of at least want_nbufs buffers. + * Set max amount of buffer space. + * bufspace is in units of 1024 bytes. -1 mean no limit. */ - public int -ch_nbuf(want_nbufs) - int want_nbufs; + public void +ch_setbufspace(bufspace) + int bufspace; { - PARG parg; - - while (ch_nbufs < want_nbufs) + if (bufspace < 0) + maxbufs = -1; + else { - if (ch_addbuf()) - { - /* - * Cannot allocate enough buffers. - * If we don't have ANY, then quit. - * Otherwise, just report the error and return. - */ - parg.p_int = want_nbufs - ch_nbufs; - error("Cannot allocate %d buffers", &parg); - if (ch_nbufs == 0) - quit(QUIT_ERROR); - break; - } + maxbufs = ((bufspace * 1024) + LBUFSIZE-1) / LBUFSIZE; + if (maxbufs < 1) + maxbufs = 1; } - return (ch_nbufs); } /* ==== //depot/projects/gdb/contrib/less/charset.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2000 Mark Nudelman + * Copyright (C) 1984-2002 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. @@ -164,6 +164,7 @@ error("invalid charset name", NULL_PARG); quit(QUIT_ERROR); /*NOTREACHED*/ + return (0); } #if HAVE_LOCALE ==== //depot/projects/gdb/contrib/less/cmd.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2000 Mark Nudelman + * Copyright (C) 1984-2002 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. ==== //depot/projects/gdb/contrib/less/cmdbuf.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2000 Mark Nudelman + * Copyright (C) 1984-2002 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. @@ -64,25 +64,25 @@ */ struct mlist mlist_search = { &mlist_search, &mlist_search, &mlist_search, NULL }; -public void constant *ml_search = (void *) &mlist_search; +public void * constant ml_search = (void *) &mlist_search; struct mlist mlist_examine = { &mlist_examine, &mlist_examine, &mlist_examine, NULL }; -public void constant *ml_examine = (void *) &mlist_examine; +public void * constant ml_examine = (void *) &mlist_examine; #if SHELL_ESCAPE || PIPEC struct mlist mlist_shell = { &mlist_shell, &mlist_shell, &mlist_shell, NULL }; -public void constant *ml_shell = (void *) &mlist_shell; +public void * constant ml_shell = (void *) &mlist_shell; #endif #else /* CMD_HISTORY */ /* If CMD_HISTORY is off, these are just flags. */ -public void constant *ml_search = (void *)1; -public void constant *ml_examine = (void *)2; +public void * constant ml_search = (void *)1; +public void * constant ml_examine = (void *)2; #if SHELL_ESCAPE || PIPEC -public void constant *ml_shell = (void *)3; +public void * constant ml_shell = (void *)3; #endif #endif /* CMD_HISTORY */ @@ -730,7 +730,10 @@ char *word; #if SPACES_IN_FILENAMES char *p; - int quoted; + int delim_quoted = 0; + int meta_quoted = 0; + char *esc = get_meta_escape(); + int esclen = strlen(esc); #endif /* @@ -751,6 +754,7 @@ * We're already at the end of the word. */ ; +#if 0 } else { /* @@ -758,9 +762,10 @@ * Huh? There's no word here. */ return (NULL); +#endif } /* - * Search backwards for beginning of the word. + * Find the beginning of the word which the cursor is in. */ if (cp == cmdbuf) return (NULL); @@ -770,24 +775,34 @@ * without a corresponding close quote), we return everything * from the open quote, including spaces. */ - quoted = 0; + for (word = cmdbuf; word < cp; word++) + if (*word != ' ') + break; + if (word >= cp) + return (cp); for (p = cmdbuf; p < cp; p++) { - if (!quoted && *p == openquote) + if (meta_quoted) + { + meta_quoted = 0; + } else if (esclen > 0 && p + esclen < cp && + strncmp(p, esc, esclen) == 0) + { + meta_quoted = 1; + p += esclen - 1; + } else if (delim_quoted) { - quoted = 1; - word = p; - } else if (quoted && *p == closequote) + if (*p == closequote) + delim_quoted = 0; + } else /* (!delim_quoted) */ { - quoted = 0; + if (*p == openquote) + delim_quoted = 1; + else if (*p == ' ') + word = p+1; } } - if (quoted) - return (word); #endif - for (word = cp-1; word > cmdbuf; word--) - if (word[-1] == ' ') - break; return (word); } @@ -835,11 +850,20 @@ */ c = *cp; *cp = '\0'; -#if SPACES_IN_FILENAMES - if (*word == openquote) - word++; -#endif - tk_text = fcomplete(word); + if (*word != openquote) + { + tk_text = fcomplete(word); + } else + { + char *qword = shell_quote(word+1); + if (qword == NULL) + tk_text = fcomplete(word+1); + else + { + tk_text = fcomplete(qword); + free(qword); + } + } *cp = c; } @@ -1006,10 +1030,15 @@ /* * Return the number currently in the command buffer. */ - public int + public LINENUM cmd_int() { - return (atoi(cmdbuf)); + register char *p; + LINENUM n = 0; + + for (p = cmdbuf; *p != '\0'; p++) + n = (10 * n) + (*p - '0'); + return (n); } /* ==== //depot/projects/gdb/contrib/less/command.c#2 (text+ko) ==== @@ -1,6 +1,6 @@ -/* $FreeBSD: src/contrib/less/command.c,v 1.4 2002/01/07 20:37:09 ps Exp $ */ +/* $FreeBSD: src/contrib/less/command.c,v 1.5 2004/04/17 07:24:09 tjr Exp $ */ /* - * Copyright (C) 1984-2000 Mark Nudelman + * Copyright (C) 1984-2002 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. @@ -64,7 +64,7 @@ #endif static int mca; /* The multicharacter command (action) */ static int search_type; /* The previous type of search */ -static int number; /* The number typed by the user */ +static LINENUM number; /* The number typed by the user */ static char optchar; static int optflag; static int optgetname; @@ -189,7 +189,7 @@ { case A_F_SEARCH: case A_B_SEARCH: - multi_search(cbuf, number); + multi_search(cbuf, (int) number); break; case A_FIRSTCMD: /* @@ -209,18 +209,20 @@ optchar = '\0'; break; case A_F_BRACKET: - match_brac(cbuf[0], cbuf[1], 1, number); + match_brac(cbuf[0], cbuf[1], 1, (int) number); break; case A_B_BRACKET: - match_brac(cbuf[1], cbuf[0], 0, number); + match_brac(cbuf[1], cbuf[0], 0, (int) number); break; #if EXAMINE case A_EXAMINE: if (secure) break; edit_list(cbuf); +#if TAGS /* If tag structure is loaded then clean it up. */ cleantags(); +#endif break; #endif #if SHELL_ESCAPE @@ -363,7 +365,7 @@ * If so, display the complete name and stop * accepting chars until user hits RETURN. */ - struct option *o; + struct loption *o; char *oname; int lc; @@ -987,7 +989,7 @@ * Forward one window (and set the window size). */ if (number > 0) - swindow = number; + swindow = (int) number; /* FALLTHRU */ case A_F_SCREEN: /* @@ -998,7 +1000,7 @@ cmd_exec(); if (show_attn) set_attnpos(bottompos); - forward(number, 0, 1); + forward((int) number, 0, 1); break; case A_B_WINDOW: @@ -1006,7 +1008,7 @@ * Backward one window (and set the window size). */ if (number > 0) - swindow = number; + swindow = (int) number; /* FALLTHRU */ case A_B_SCREEN: /* @@ -1015,7 +1017,7 @@ if (number <= 0) number = get_swindow(); cmd_exec(); - backward(number, 0, 1); + backward((int) number, 0, 1); break; case A_F_LINE: @@ -1027,7 +1029,7 @@ cmd_exec(); if (show_attn == OPT_ONPLUS && number > 1) set_attnpos(bottompos); - forward(number, 0, 0); + forward((int) number, 0, 0); break; case A_B_LINE: @@ -1037,7 +1039,7 @@ if (number <= 0) number = 1; cmd_exec(); - backward(number, 0, 0); + backward((int) number, 0, 0); break; case A_FF_LINE: @@ -1049,7 +1051,7 @@ cmd_exec(); if (show_attn == OPT_ONPLUS && number > 1) set_attnpos(bottompos); - forward(number, 1, 0); + forward((int) number, 1, 0); break; case A_BF_LINE: @@ -1059,7 +1061,7 @@ if (number <= 0) number = 1; cmd_exec(); - backward(number, 1, 0); + backward((int) number, 1, 0); break; case A_FF_SCREEN: @@ -1071,7 +1073,7 @@ cmd_exec(); if (show_attn == OPT_ONPLUS) set_attnpos(bottompos); - forward(number, 1, 0); + forward((int) number, 1, 0); break; case A_F_FOREVER: @@ -1101,7 +1103,7 @@ * (default same as last 'd' or 'u' command). */ if (number > 0) - wscroll = number; + wscroll = (int) number; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Apr 20 06:19:26 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E575D16A4D0; Tue, 20 Apr 2004 06:19:25 -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 9851916A4CE for ; Tue, 20 Apr 2004 06:19:25 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8A2BA43D48 for ; Tue, 20 Apr 2004 06:19:25 -0700 (PDT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i3KDJPGe075467 for ; Tue, 20 Apr 2004 06:19:25 -0700 (PDT) (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i3KDJFrq075464 for perforce@freebsd.org; Tue, 20 Apr 2004 06:19:15 -0700 (PDT) (envelope-from areisse@nailabs.com) Date: Tue, 20 Apr 2004 06:19:15 -0700 (PDT) Message-Id: <200404201319.i3KDJFrq075464@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Subject: PERFORCE change 51422 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: Tue, 20 Apr 2004 13:19:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=51422 Change 51422 by areisse@areisse_ibook on 2004/04/20 06:18:28 bring adv_cmds-63 into sedarwin branch. Affected files ... .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/Makefile#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/Makefile.include#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/Makefile.preamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/PB.project#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/adv_cmds.rtf#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/cap_mkdb.tproj/Makefile#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/cap_mkdb.tproj/Makefile.postamble#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/cap_mkdb.tproj/Makefile.preamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/cap_mkdb.tproj/PB.project#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/cap_mkdb.tproj/cap_mkdb.1#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/cap_mkdb.tproj/cap_mkdb.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/colldef.tproj/Makefile#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/colldef.tproj/Makefile.postamble#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/colldef.tproj/Makefile.preamble#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/colldef.tproj/PB.project#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/colldef.tproj/colldef.1#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/colldef.tproj/common.h#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/colldef.tproj/fbsdcompat.h#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/colldef.tproj/locale/collate.h#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/colldef.tproj/parse.y#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/colldef.tproj/scan.l#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/finger.tproj/Makefile#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/finger.tproj/Makefile.postamble#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/finger.tproj/Makefile.preamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/finger.tproj/PB.project#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/finger.tproj/extern.h#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/finger.tproj/finger.1#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/finger.tproj/finger.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/finger.tproj/finger.h#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/finger.tproj/lprint.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/finger.tproj/net.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/finger.tproj/pathnames.h#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/finger.tproj/sprint.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/finger.tproj/util.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/fingerd.tproj/Makefile#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/fingerd.tproj/Makefile.postamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/fingerd.tproj/Makefile.preamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/fingerd.tproj/PB.project#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/fingerd.tproj/fingerd.8#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/fingerd.tproj/fingerd.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/fingerd.tproj/pathnames.h#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/gencat.tproj/Makefile#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/gencat.tproj/Makefile.postamble#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/gencat.tproj/Makefile.preamble#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/gencat.tproj/PB.project#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/gencat.tproj/fbsdcompat.h#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/gencat.tproj/gencat.1#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/gencat.tproj/gencat.c#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/gencat.tproj/gencat.h#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/gencat.tproj/genlib.c#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/gencat.tproj/nls/msgcat.h#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/last.tproj/Makefile#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/last.tproj/Makefile.postamble#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/last.tproj/Makefile.preamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/last.tproj/PB.project#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/last.tproj/last.1#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/last.tproj/last.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/lsvfs.tproj/Makefile#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/lsvfs.tproj/Makefile.postamble#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/lsvfs.tproj/PB.project#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/lsvfs.tproj/lsvfs.1#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/lsvfs.tproj/lsvfs.c#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/md.tproj/Makefile#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/md.tproj/Makefile.dist#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/md.tproj/Makefile.postamble#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/md.tproj/Makefile.preamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/md.tproj/PB.project#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/md.tproj/md.1#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/md.tproj/md.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/mklocale.tproj/Japanese#2 delete .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/mklocale.tproj/Makefile#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/mklocale.tproj/Makefile.postamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/mklocale.tproj/Makefile.preamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/mklocale.tproj/PB.project#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/mklocale.tproj/POSIX#2 delete .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/mklocale.tproj/extern.h#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/mklocale.tproj/fbsdcompat.h#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/mklocale.tproj/ldef.h#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/mklocale.tproj/lex.l#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/mklocale.tproj/mklocale.1#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/mklocale.tproj/share/Makefile#2 delete .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/mklocale.tproj/share/README.locale_name#2 delete .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/mklocale.tproj/share/bg_BG.CP1251.src#2 delete .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/mklocale.tproj/share/ja_JP.EUC.src#2 delete .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/mklocale.tproj/share/ja_JP.SJIS.src#2 delete .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/mklocale.tproj/share/ko_KR.EUC.src#2 delete .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/mklocale.tproj/share/la_LN.ISO8859-1.src#2 delete .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/mklocale.tproj/share/la_LN.ISO8859-15.src#2 delete .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/mklocale.tproj/share/la_LN.ISO8859-2.src#2 delete .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/mklocale.tproj/share/la_LN.ISO8859-4.src#2 delete .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/mklocale.tproj/share/la_LN.US-ASCII.src#2 delete .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/mklocale.tproj/share/ru_RU.CP866.src#2 delete .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/mklocale.tproj/share/ru_RU.ISO8859-5.src#2 delete .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/mklocale.tproj/share/ru_RU.KOI8-R.src#2 delete .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/mklocale.tproj/share/uk_UA.KOI8-U.src#2 delete .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/mklocale.tproj/share/zh_CN.EUC.src#2 delete .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/mklocale.tproj/share/zh_TW.Big5.src#2 delete .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/mklocale.tproj/yacc.y#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/ps.tproj/Makefile#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/ps.tproj/Makefile.postamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/ps.tproj/Makefile.preamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/ps.tproj/PB.project#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/ps.tproj/extern.h#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/ps.tproj/fmt.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/ps.tproj/h.template#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/ps.tproj/keyword.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/ps.tproj/m.template#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/ps.tproj/nlist.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/ps.tproj/print.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/ps.tproj/ps.1#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/ps.tproj/ps.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/ps.tproj/ps.h#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/ps.tproj/tasks.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/pstat.tproj/Makefile#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/pstat.tproj/Makefile.postamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/pstat.tproj/Makefile.preamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/pstat.tproj/PB.project#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/pstat.tproj/pstat.8#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/pstat.tproj/pstat.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/stty.tproj/Makefile#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/stty.tproj/Makefile.dist#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/stty.tproj/Makefile.postamble#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/stty.tproj/Makefile.preamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/stty.tproj/PB.project#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/stty.tproj/cchar.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/stty.tproj/extern.h#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/stty.tproj/gfmt.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/stty.tproj/key.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/stty.tproj/modes.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/stty.tproj/print.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/stty.tproj/stty.1#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/stty.tproj/stty.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/stty.tproj/stty.h#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/stty.tproj/util.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/tty.tproj/Makefile#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/tty.tproj/Makefile.postamble#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/tty.tproj/Makefile.preamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/tty.tproj/PB.project#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/tty.tproj/tty.1#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/tty.tproj/tty.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/Makefile#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/Makefile.bsd#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/Makefile.postamble#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/Makefile.preamble#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/PB.project#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/colldef/Makefile#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/colldef/README#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/colldef/bg_BG.CP1251.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/colldef/ca_ES.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/colldef/ca_ES.ISO8859-15.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/colldef/cs_CZ.ISO8859-2.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/colldef/de_DE.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/colldef/de_DE.ISO8859-15.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/colldef/el_GR.ISO8859-7.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/colldef/en_DK.example#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/colldef/es_ES.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/colldef/es_ES.ISO8859-15.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/colldef/et_EE.ISO8859-15.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/colldef/hi_IN.ISCII-DEV.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/colldef/is_IS.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/colldef/is_IS.ISO8859-15.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/colldef/la_LN.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/colldef/la_LN.ISO8859-15.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/colldef/la_LN.ISO8859-2.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/colldef/la_LN.ISO8859-4.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/colldef/la_LN.US-ASCII.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/colldef/lt_LT.ISO8859-13.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/colldef/lt_LT.ISO8859-4.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/colldef/map.CP1251#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/colldef/map.CP866#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/colldef/map.ISCII-DEV#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/colldef/map.ISO8859-1#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/colldef/map.ISO8859-13#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/colldef/map.ISO8859-15#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/colldef/map.ISO8859-2#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/colldef/map.ISO8859-4#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/colldef/map.ISO8859-5#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/colldef/map.ISO8859-7#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/colldef/map.KOI8-R#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/colldef/map.KOI8-U#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/colldef/pl_PL.ISO8859-2.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/colldef/ru_RU.CP866.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/colldef/ru_RU.ISO8859-5.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/colldef/ru_RU.KOI8-R.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/colldef/sr_YU.ISO8859-5.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/colldef/sv_SE.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/colldef/sv_SE.ISO8859-15.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/colldef/uk_UA.ISO8859-5.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/colldef/uk_UA.KOI8-U.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/dummy.c#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/mklocale/Makefile#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/mklocale/README.locale_name#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/mklocale/bg_BG.CP1251.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/mklocale/el_GR.ISO8859-7.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/mklocale/hi_IN.ISCII-DEV.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/mklocale/ja_JP.SJIS.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/mklocale/ja_JP.eucJP.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/mklocale/ko_KR.eucKR.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/mklocale/la_LN.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/mklocale/la_LN.ISO8859-15.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/mklocale/la_LN.ISO8859-2.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/mklocale/la_LN.ISO8859-4.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/mklocale/la_LN.US-ASCII.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/mklocale/lt_LT.ISO8859-13.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/mklocale/ru_RU.CP866.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/mklocale/ru_RU.ISO8859-5.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/mklocale/ru_RU.KOI8-R.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/mklocale/uk_UA.KOI8-U.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/mklocale/zh_CN.eucCN.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/mklocale/zh_TW.Big5.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/monetdef/Makefile#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/monetdef/af_ZA.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/monetdef/bg_BG.CP1251.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/monetdef/ca_ES.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/monetdef/cs_CZ.ISO8859-2.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/monetdef/da_DK.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/monetdef/de_AT.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/monetdef/de_CH.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/monetdef/de_DE.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/monetdef/el_GR.ISO8859-7.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/monetdef/en_AU.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/monetdef/en_CA.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/monetdef/en_GB.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/monetdef/en_NZ.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/monetdef/en_US.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/monetdef/es_ES.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/monetdef/et_EE.ISO8859-15.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/monetdef/fi_FI.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/monetdef/fr_BE.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/monetdef/fr_CA.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/monetdef/fr_FR.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/monetdef/hi_IN.ISCII-DEV.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/monetdef/hr_HR.ISO8859-2.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/monetdef/hu_HU.ISO8859-2.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/monetdef/is_IS.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/monetdef/it_IT.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/monetdef/ja_JP.eucJP.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/monetdef/ko_KR.eucKR.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/monetdef/lt_LT.ISO8859-13.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/monetdef/nl_BE.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/monetdef/nl_NL.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/monetdef/no_NO.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/monetdef/pl_PL.ISO8859-2.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/monetdef/pt_BR.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/monetdef/pt_PT.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/monetdef/ro_RO.ISO8859-2.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/monetdef/ru_RU.CP866.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/monetdef/ru_RU.ISO8859-5.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/monetdef/ru_RU.KOI8-R.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/monetdef/sk_SK.ISO8859-2.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/monetdef/sl_SI.ISO8859-2.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/monetdef/sr_YU.ISO8859-2.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/monetdef/sr_YU.ISO8859-5.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/monetdef/sv_SE.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/monetdef/tr_TR.ISO8859-9.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/monetdef/uk_UA.ISO8859-5.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/monetdef/uk_UA.KOI8-U.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/monetdef/zh_CN.eucCN.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/monetdef/zh_TW.Big5.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/msgdef/Makefile#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/msgdef/af_ZA.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/msgdef/bg_BG.CP1251.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/msgdef/ca_ES.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/msgdef/cs_CZ.ISO8859-2.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/msgdef/da_DK.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/msgdef/de_DE.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/msgdef/el_GR.ISO8859-7.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/msgdef/en_CA.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/msgdef/en_GB.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/msgdef/en_US.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/msgdef/es_ES.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/msgdef/et_EE.ISO8859-15.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/msgdef/fi_FI.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/msgdef/fr_BE.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/msgdef/fr_CH.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/msgdef/fr_FR.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/msgdef/hi_IN.ISCII-DEV.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/msgdef/hr_HR.ISO8859-2.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/msgdef/hu_HU.ISO8859-2.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/msgdef/is_IS.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/msgdef/it_IT.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/msgdef/ja_JP.SJIS.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/msgdef/ja_JP.eucJP.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/msgdef/ko_KR.eucKR.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/msgdef/lt_LT.ISO8859-13.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/msgdef/nl_NL.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/msgdef/no_NO.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/msgdef/pl_PL.ISO8859-2.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/msgdef/pt_PT.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/msgdef/ro_RO.ISO8859-2.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/msgdef/ru_RU.CP866.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/msgdef/ru_RU.ISO8859-5.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/msgdef/ru_RU.KOI8-R.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/msgdef/sl_SI.ISO8859-2.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/msgdef/sr_YU.ISO8859-2.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/msgdef/sr_YU.ISO8859-5.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/msgdef/sv_SE.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/msgdef/tr_TR.ISO8859-9.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/msgdef/uk_UA.ISO8859-5.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/msgdef/uk_UA.KOI8-U.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/msgdef/zh_CN.eucCN.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/msgdef/zh_TW.Big5.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/numericdef/Makefile#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/numericdef/af_ZA.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/numericdef/bg_BG.CP1251.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/numericdef/ca_ES.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/numericdef/cs_CZ.ISO8859-2.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/numericdef/da_DK.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/numericdef/de_DE.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/numericdef/el_GR.ISO8859-7.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/numericdef/en_US.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/numericdef/es_ES.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/numericdef/et_EE.ISO8859-15.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/numericdef/fi_FI.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/numericdef/fr_BE.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/numericdef/fr_FR.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/numericdef/hi_IN.ISCII-DEV.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/numericdef/hr_HR.ISO8859-2.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/numericdef/hu_HU.ISO8859-2.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/numericdef/is_IS.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/numericdef/it_IT.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/numericdef/ja_JP.eucJP.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/numericdef/ko_KR.eucKR.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/numericdef/lt_LT.ISO8859-13.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/numericdef/nl_NL.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/numericdef/no_NO.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/numericdef/pl_PL.ISO8859-2.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/numericdef/pt_BR.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/numericdef/pt_PT.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/numericdef/ro_RO.ISO8859-2.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/numericdef/ru_RU.CP866.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/numericdef/ru_RU.ISO8859-5.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/numericdef/ru_RU.KOI8-R.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/numericdef/sk_SK.ISO8859-2.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/numericdef/sl_SI.ISO8859-2.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/numericdef/sr_YU.ISO8859-2.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/numericdef/sr_YU.ISO8859-5.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/numericdef/sv_SE.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/numericdef/tr_TR.ISO8859-9.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/numericdef/uk_UA.ISO8859-5.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/numericdef/uk_UA.KOI8-U.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/numericdef/zh_CN.eucCN.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/numericdef/zh_TW.Big5.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/timedef/Makefile#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/timedef/bg_BG.CP1251.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/timedef/ca_ES.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/timedef/cs_CZ.ISO8859-2.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/timedef/da_DK.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/timedef/de_AT.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/timedef/de_DE.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/timedef/el_GR.ISO8859-7.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/timedef/en_GB.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/timedef/en_US.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/timedef/es_ES.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/timedef/et_EE.ISO8859-15.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/timedef/fi_FI.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/timedef/fr_FR.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/timedef/hi_IN.ISCII-DEV.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/timedef/hr_HR.ISO8859-2.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/timedef/hu_HU.ISO8859-2.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/timedef/is_IS.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/timedef/it_IT.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/timedef/ja_JP.SJIS.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/timedef/ja_JP.eucJP.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/timedef/ko_KR.eucKR.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/timedef/la_LN.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/timedef/lt_LT.ISO8859-13.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/timedef/lt_LT.ISO8859-4.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/timedef/nl_NL.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/timedef/no_NO.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/timedef/pl_PL.ISO8859-2.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/timedef/pt_BR.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/timedef/pt_PT.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/timedef/ro_RO.ISO8859-2.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/timedef/ru_RU.CP866.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/timedef/ru_RU.ISO8859-5.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/timedef/ru_RU.KOI8-R.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/timedef/sk_SK.ISO8859-2.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/timedef/sl_SI.ISO8859-2.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/timedef/sr_YU.ISO8859-2.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/timedef/sr_YU.ISO8859-5.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/timedef/sv_SE.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/timedef/tr_TR.ISO8859-9.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/timedef/uk_UA.ISO8859-5.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/timedef/uk_UA.KOI8-U.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/timedef/zh_CN.eucCN.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/timedef/zh_TW.Big5.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/utf8locale-1.5/COPYRIGHT.FREEBSD#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/utf8locale-1.5/COPYRIGHT.UNICODE#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/utf8locale-1.5/Makefile#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/utf8locale-1.5/colldef/Makefile#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/utf8locale-1.5/colldef/la_LN.UTF-8.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/utf8locale-1.5/mklocale/Makefile#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/utf8locale-1.5/mklocale/la_LN.UTF-8.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/utf8locale-1.5/monetdef/Makefile#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/utf8locale-1.5/monetdef/bg_BG.UTF-8.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/utf8locale-1.5/monetdef/cs_CZ.UTF-8.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/utf8locale-1.5/monetdef/en_AU.UTF-8.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/utf8locale-1.5/monetdef/en_GB.UTF-8.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/utf8locale-1.5/monetdef/pl_PL.UTF-8.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/utf8locale-1.5/monetdef/ru_RU.UTF-8.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/utf8locale-1.5/monetdef/sr_YU.UTF-8.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/utf8locale-1.5/monetdef/uk_UA.UTF-8.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/utf8locale-1.5/monetdef/zh_CN.UTF-8.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/utf8locale-1.5/msgdef/Makefile#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/utf8locale-1.5/msgdef/bg_BG.UTF-8.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/utf8locale-1.5/msgdef/el_GR.UTF-8.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/utf8locale-1.5/msgdef/ja_JP.UTF-8.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/utf8locale-1.5/msgdef/ru_RU.UTF-8.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/utf8locale-1.5/msgdef/sr_YU.UTF-8.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/utf8locale-1.5/msgdef/uk_UA.UTF-8.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/utf8locale-1.5/msgdef/zh_CN.UTF-8.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/utf8locale-1.5/msgdef/zh_TW.UTF-8.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/utf8locale-1.5/numericdef/Makefile#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/utf8locale-1.5/timedef/Makefile#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/utf8locale-1.5/timedef/bg_BG.UTF-8.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/utf8locale-1.5/timedef/ca_ES.UTF-8.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/utf8locale-1.5/timedef/cs_CZ.UTF-8.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/utf8locale-1.5/timedef/da_DK.UTF-8.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/utf8locale-1.5/timedef/de_AT.UTF-8.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/utf8locale-1.5/timedef/de_DE.UTF-8.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/utf8locale-1.5/timedef/el_GR.UTF-8.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/utf8locale-1.5/timedef/es_ES.UTF-8.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/utf8locale-1.5/timedef/et_EE.UTF-8.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/utf8locale-1.5/timedef/fi_FI.UTF-8.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/utf8locale-1.5/timedef/fr_FR.UTF-8.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/utf8locale-1.5/timedef/hr_HR.UTF-8.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/utf8locale-1.5/timedef/hu_HU.UTF-8.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/utf8locale-1.5/timedef/is_IS.UTF-8.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/utf8locale-1.5/timedef/ja_JP.UTF-8.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/utf8locale-1.5/timedef/ko_KR.UTF-8.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/utf8locale-1.5/timedef/lt_LT.UTF-8.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/utf8locale-1.5/timedef/no_NO.UTF-8.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/utf8locale-1.5/timedef/pl_PL.UTF-8.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/utf8locale-1.5/timedef/pt_BR.UTF-8.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/utf8locale-1.5/timedef/pt_PT.UTF-8.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/utf8locale-1.5/timedef/ro_RO.UTF-8.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/utf8locale-1.5/timedef/ru_RU.UTF-8.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/utf8locale-1.5/timedef/sk_SK.UTF-8.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/utf8locale-1.5/timedef/sl_SI.UTF-8.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/utf8locale-1.5/timedef/sr_YU.UTF-8.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/utf8locale-1.5/timedef/sv_SE.UTF-8.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/utf8locale-1.5/timedef/tr_TR.UTF-8.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/utf8locale-1.5/timedef/uk_UA.UTF-8.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/utf8locale-1.5/timedef/zh_CN.UTF-8.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/utf8locale-1.5/timedef/zh_TW.UTF-8.src#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/utf8locale-1.5/tools/genctypes.py#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/usr-share-locale.tproj/utf8locale-1.5/tools/genlocales.py#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/whois.tproj/Makefile#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/whois.tproj/Makefile.postamble#1 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/whois.tproj/Makefile.preamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/whois.tproj/PB.project#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/whois.tproj/whois.1#2 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/whois.tproj/whois.c#2 integrate Differences ... ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/Makefile#2 (text+ko) ==== @@ -13,9 +13,9 @@ PROJECT_TYPE = Aggregate LANGUAGE = English -TOOLS = cap_mkdb.tproj finger.tproj fingerd.tproj last.tproj md.tproj\ - mklocale.tproj pstat.tproj stty.tproj \ - tty.tproj whois.tproj ps.tproj +TOOLS = cap_mkdb.tproj colldef.tproj finger.tproj fingerd.tproj gencat.tproj \ + last.tproj lsvfs.tproj md.tproj mklocale.tproj pstat.tproj stty.tproj \ + tty.tproj whois.tproj ps.tproj usr-share-locale.tproj OTHERSRCS = Makefile.preamble Makefile Makefile.include adv_cmds.rtf @@ -28,7 +28,7 @@ PROF_LIBS = $(LIBS) -NEXTSTEP_PB_CFLAGS = -traditional-cpp -D__TEFLON__ +NEXTSTEP_PB_CFLAGS = -no-cpp-precomp -D__TEFLON__ NEXTSTEP_BUILD_OUTPUT_DIR = /tmp ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/Makefile.include#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/Makefile.preamble#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/PB.project#2 (text+ko) ==== @@ -11,9 +11,12 @@ PUBLIC_HEADERS = (); SUBPROJECTS = ( cap_mkdb.tproj, + colldef.tproj, finger.tproj, fingerd.tproj, + gencat.tproj, last.tproj, + lsvfs.tproj, md.tproj, mklocale.tproj, pstat.tproj, @@ -23,7 +26,8 @@ tty.tproj, tset.tproj, whois.tproj, - ps.tproj + ps.tproj, + usr-share-locale.tproj ); }; LANGUAGE = English; ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/adv_cmds.rtf#2 (text+ko) ==== @@ -19,6 +19,7 @@ \i0 error\ indent\ +gencat\ lorder\ make\ md\ ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/cap_mkdb.tproj/Makefile#2 (text+ko) ==== @@ -14,7 +14,7 @@ CFILES = cap_mkdb.c -OTHERSRCS = Makefile.preamble Makefile cap_mkdb.1 +OTHERSRCS = Makefile.preamble Makefile Makefile.postamble cap_mkdb.1 MAKEFILEDIR = $(MAKEFILEPATH)/pb_makefiles ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/cap_mkdb.tproj/Makefile.preamble#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/cap_mkdb.tproj/PB.project#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/cap_mkdb.tproj/cap_mkdb.1#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/cap_mkdb.tproj/cap_mkdb.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/finger.tproj/Makefile#2 (text+ko) ==== @@ -12,11 +12,11 @@ PROJECTVERSION = 2.8 PROJECT_TYPE = Tool -HFILES = extern.h finger.h +HFILES = extern.h finger.h pathnames.h CFILES = finger.c lprint.c net.c sprint.c util.c -OTHERSRCS = Makefile.preamble Makefile finger.1 +OTHERSRCS = Makefile.preamble Makefile Makefile.postamble finger.1 MAKEFILEDIR = $(MAKEFILEPATH)/pb_makefiles ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/finger.tproj/Makefile.preamble#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/finger.tproj/PB.project#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/finger.tproj/extern.h#2 (text+ko) ==== @@ -1,27 +1,60 @@ -/* - * Copyright (c) 1995 NeXT Computer, Inc. All Rights Reserved - * +/*- * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. * - * The NEXTSTEP Software License Agreement specifies the terms - * and conditions for redistribution. + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * 4. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. * * @(#)extern.h 8.2 (Berkeley) 4/28/95 + * $FreeBSD: src/usr.bin/finger/extern.h,v 1.8 2002/09/04 23:29:00 dwmalone Exp $ */ extern char tbuf[1024]; /* Temp buffer for anybody. */ extern int entries; /* Number of people. */ extern DB *db; /* Database. */ +extern int d_first; +extern sa_family_t family; +extern int gflag; +extern int lflag; +extern time_t now; +extern int oflag; +extern int pplan; /* don't show .plan/.project */ +extern int Tflag; -void enter_lastlog __P((PERSON *)); -PERSON *enter_person __P((struct passwd *)); -void enter_where __P((struct utmp *, PERSON *)); -PERSON *find_person __P((char *)); -void lflag_print __P((void)); -int match __P((struct passwd *, char *)); -void netfinger __P((char *)); -PERSON *palloc __P((void)); -char *prphone __P((char *)); -void sflag_print __P((void)); +void enter_lastlog(PERSON *); +PERSON *enter_person(struct passwd *); +void enter_where(struct utmp *, PERSON *); +PERSON *find_person(const char *); +int hide(struct passwd *); +void lflag_print(void); +int match(struct passwd *, const char *); +void netfinger(char *); +PERSON *palloc(void); +char *prphone(char *); +void sflag_print(void); +int show_text(const char *, const char *, const char *); ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/finger.tproj/finger.1#2 (text+ko) ==== @@ -30,51 +30,85 @@ .\" SUCH DAMAGE. .\" .\" @(#)finger.1 8.3 (Berkeley) 5/5/94 +.\" $FreeBSD: src/usr.bin/finger/finger.1,v 1.27 2002/12/24 13:41:47 ru Exp $ .\" -.Dd May 5, 1994 +.Dd July 22, 2002 .Dt FINGER 1 -.Os BSD 4 +.Os .Sh NAME .Nm finger .Nd user information lookup program .Sh SYNOPSIS -.Nm finger -.Op Fl lmsp -.Op Ar user ... -.Op Ar user@host ... +.Nm +.Op Fl 46glmpshoT +.Op Ar user ...\& +.Op Ar user@host ...\& .Sh DESCRIPTION The -.Nm finger -displays information about the system users. +.Nm +utility displays information about the system users. .Pp Options are: -.Bl -tag -width flag +.Bl -tag -width indent +.It Fl 4 +Forces +.Nm +to use IPv4 addresses only. +.It Fl 6 +Forces +.Nm +to use IPv6 addresses only. .It Fl s -.Nm Finger -displays the user's login name, real name, terminal name and write +Display the user's login name, real name, terminal name and write status (as a ``*'' before the terminal name if write permission is -denied), idle time, login time, office location and office phone -number. +denied), idle time, login time, and either office location and office +phone number, or the remote host. +If +.Fl o +is given, the office location and office phone number is printed +(the default). +If +.Fl h +is given, the remote host is printed instead. .Pp Idle time is in minutes if it is a single integer, hours and minutes if a ``:'' is present, or days if a ``d'' is present. -Login time is displayed as month, day, hours and minutes, unless -more than six months ago, in which case the year is displayed rather -than the hours and minutes. +If it is an +.Dq * , +the login time indicates the time of last login. +Login time is displayed as the day name if less than 6 days, else month, day; +hours and minutes, unless more than six months ago, in which case the year +is displayed rather than the hours and minutes. .Pp Unknown devices as well as nonexistent idle and login times are displayed as single asterisks. -.Pp +.It Fl h +When used in conjunction with the +.Fl s +option, the name of the remote host is displayed instead of the office +location and office phone. +.It Fl o +When used in conjunction with the +.Fl s +option, the office location and office phone information is displayed +instead of the name of the remote host. +.It Fl g +This option restricts the gecos output to only the users' real +name. It also has the side-effect of restricting the output +of the remote host when used in conjunction with the +.Fl h +option. .It Fl l -Produces a multi-line format displaying all of the information +Produce a multi-line format displaying all of the information described for the .Fl s option as well as the user's home directory, home phone number, login -shell, and the contents of the files -.Dq Pa .forward , -.Dq Pa .plan +shell, mail status, and the contents of the files +.Pa .forward , +.Pa .plan , +.Pa .project and -.Dq Pa .project +.Pa .pubkey from the user's home directory. .Pp If idle time is at least a minute and less than a day, it is @@ -85,6 +119,7 @@ Numbers specified as ten or seven digits are printed as the appropriate subset of that string. Numbers specified as five digits are printed as ``xN-NNNN''. +Numbers specified as four digits are printed as ``xNNNN''. .Pp If write permission is denied to the device, the phrase ``(messages off)'' is appended to the line containing the device name. @@ -93,17 +128,22 @@ option; if a user is logged on multiple times, terminal information is repeated once per login. .Pp +Mail status is shown as ``No Mail.'' if there is no mail at all, ``Mail +last read DDD MMM ## HH:MM YYYY (TZ)'' if the person has looked at their +mailbox since new mail arriving, or ``New mail received ...'', ``Unread +since ...'' if they have new mail. .It Fl p -Prevents +Prevent the .Fl l option of -.Nm finger +.Nm from displaying the contents of the -.Dq Pa .forward , -.Dq Pa .plan +.Pa .forward , +.Pa .plan , +.Pa .project and -.Dq Pa .project +.Pa .pubkey files. .It Fl m Prevent matching of @@ -115,12 +155,15 @@ .Fl m option is supplied. All name matching performed by -.Nm finger +.Nm is case insensitive. +.It Fl T +Disable the piggybacking of data on the initial connection request. +This option is needed to finger hosts with a broken TCP implementation. .El .Pp If no options are specified, -.Nm finger +.Nm defaults to the .Fl l style output if operands are provided, otherwise to the @@ -130,11 +173,12 @@ is not available for them. .Pp If no arguments are specified, -.Nm finger +.Nm will print an entry for each user currently logged into the system. .Pp -.Nm Finger -may be used to look up users on a remote machine. +The +.Nm +utility may be used to look up users on a remote machine. The format is to specify a .Ar user as @@ -150,8 +194,34 @@ The .Fl l option is the only option that may be passed to a remote machine. +.Pp +If the file +.Pa .nofinger +exists in the user's home directory, +.Nm +behaves as if the user in question does not exist. +.Pp +The optional +.Xr finger.conf 5 +configuration file can be used to specify aliases. +Since +.Nm +is invoked by +.Xr fingerd 8 , +aliases will work for both local and network queries. +.Sh ENVIRONMENT +The +.Nm +utility utilizes the following environment variable, if it exists: +.Bl -tag -width Fl +.It Ev FINGER +This variable may be set with favored options to +.Nm . +.El .Sh FILES .Bl -tag -width /var/log/lastlog -compact +.It Pa /etc/finger.conf +alias definition data base .It Pa /var/log/lastlog last login data base .El @@ -159,8 +229,21 @@ .Xr chpass 1 , .Xr w 1 , .Xr who 1 , +.Xr finger.conf 5 , +.Xr fingerd 8 +.Rs +.%A D. Zimmerman +.%T The Finger User Information Protocol +.%R RFC 1288 +.%D December, 1991 +.Re .Sh HISTORY The -.Nm finger +.Nm command appeared in .Bx 3.0 . +.Sh BUGS +The current FINGER protocol RFC requires that the client keep the connection +fully open until the server closes. This prevents the use of the optimal +three-packet T/TCP exchange. (Servers which depend on this requirement are +bogus but have nonetheless been observed in the Internet at large.) ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/finger.tproj/finger.c#2 (text+ko) ==== @@ -1,18 +1,63 @@ -/* - * Copyright (c) 1995 NeXT Computer, Inc. All Rights Reserved - * +/* * Copyright (c) 1989, 1993 * The Regents of the University of California. All rights reserved. * * This code is derived from software contributed to Berkeley by * Tony Nardo of the Johns Hopkins University/Applied Physics Lab. * - * The NEXTSTEP Software License Agreement specifies the terms - * and conditions for redistribution. + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * 4. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. * - * @(#)finger.c 8.5 (Berkeley) 5/4/95 + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +/* + * Luke Mewburn added the following on 940622: + * - mail status ("No Mail", "Mail read:...", or "New Mail ..., + * Unread since ...".) + * - 4 digit phone extensions (3210 is printed as x3210.) + * - host/office toggling in short format with -h & -o. + * - short day names (`Tue' printed instead of `Jun 21' if the + * login time is < 6 days. */ +#ifndef lint +static const char copyright[] = +"@(#) Copyright (c) 1989, 1993\n\ + The Regents of the University of California. All rights reserved.\n"; +#endif /* not lint */ + +#if 0 +#ifndef lint +static char sccsid[] = "@(#)finger.c 8.5 (Berkeley) 5/4/95"; +#endif +#endif + +#include + /* * Finger prints out information about users. It is not portable since * certain fields (e.g. the full user name, office, and phone numbers) are @@ -21,17 +66,16 @@ * * There are currently two output formats; the short format is one line * per user and displays login name, tty, login time, real name, idle time, - * and office location/phone number. The long format gives the same - * information (in a more legible format) as well as home directory, shell, - * mail info, and .plan/.project files. + * and either remote host information (default) or office location/phone + * number, depending on if -h or -o is used respectively. + * The long format gives the same information (in a more legible format) as + * well as home directory, shell, mail info, and .plan/.project files. */ -#include - +#include +#include #include #include -#include -#include #include #include #include @@ -39,26 +83,41 @@ #include #include #include +#include #include "finger.h" +#include "pathnames.h" >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Apr 20 07:06:25 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 998AD16A4D0; Tue, 20 Apr 2004 07:06:25 -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 67C6816A4CE for ; Tue, 20 Apr 2004 07:06:25 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 602E243D31 for ; Tue, 20 Apr 2004 07:06:25 -0700 (PDT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i3KE6PGe087312 for ; Tue, 20 Apr 2004 07:06:25 -0700 (PDT) (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i3KE6OKZ087309 for perforce@freebsd.org; Tue, 20 Apr 2004 07:06:24 -0700 (PDT) (envelope-from areisse@nailabs.com) Date: Tue, 20 Apr 2004 07:06:24 -0700 (PDT) Message-Id: <200404201406.i3KE6OKZ087309@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Subject: PERFORCE change 51426 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: Tue, 20 Apr 2004 14:06:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=51426 Change 51426 by areisse@areisse_ibook on 2004/04/20 07:05:38 branch libmac for sedarwin73 Affected files ... .. //depot/projects/trustedbsd/sedarwin73/libmac/Makefile#1 branch .. //depot/projects/trustedbsd/sedarwin73/libmac/mac.3#1 branch .. //depot/projects/trustedbsd/sedarwin73/libmac/mac.c#1 branch .. //depot/projects/trustedbsd/sedarwin73/libmac/mac.conf.5#1 branch .. //depot/projects/trustedbsd/sedarwin73/libmac/mac_constant.c#1 branch .. //depot/projects/trustedbsd/sedarwin73/libmac/mac_exec.c#1 branch .. //depot/projects/trustedbsd/sedarwin73/libmac/mac_free.3#1 branch .. //depot/projects/trustedbsd/sedarwin73/libmac/mac_get.3#1 branch .. //depot/projects/trustedbsd/sedarwin73/libmac/mac_get.c#1 branch .. //depot/projects/trustedbsd/sedarwin73/libmac/mac_is_present_np.3#1 branch .. //depot/projects/trustedbsd/sedarwin73/libmac/mac_prepare.3#1 branch .. //depot/projects/trustedbsd/sedarwin73/libmac/mac_set.3#1 branch .. //depot/projects/trustedbsd/sedarwin73/libmac/mac_set.c#1 branch .. //depot/projects/trustedbsd/sedarwin73/libmac/mac_text.3#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Tue Apr 20 07:21:29 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D086816A4D0; Tue, 20 Apr 2004 07:21:28 -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 A4EE216A4CE for ; Tue, 20 Apr 2004 07:21:28 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9981E43D2D for ; Tue, 20 Apr 2004 07:21:28 -0700 (PDT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i3KELSGe090598 for ; Tue, 20 Apr 2004 07:21:28 -0700 (PDT) (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i3KELRZh090585 for perforce@freebsd.org; Tue, 20 Apr 2004 07:21:27 -0700 (PDT) (envelope-from areisse@nailabs.com) Date: Tue, 20 Apr 2004 07:21:27 -0700 (PDT) Message-Id: <200404201421.i3KELRZh090585@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Subject: PERFORCE change 51435 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: Tue, 20 Apr 2004 14:21:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=51435 Change 51435 by areisse@areisse_ibook on 2004/04/20 07:21:22 merge sedarwin ps changes into version 63 Affected files ... .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/Makefile#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/Makefile.include#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/Makefile.preamble#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/PB.project#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/adv_cmds.rtf#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/cap_mkdb.tproj/Makefile#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/cap_mkdb.tproj/Makefile.preamble#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/cap_mkdb.tproj/PB.project#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/cap_mkdb.tproj/cap_mkdb.1#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/cap_mkdb.tproj/cap_mkdb.c#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/finger.tproj/Makefile#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/finger.tproj/Makefile.preamble#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/finger.tproj/PB.project#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/finger.tproj/extern.h#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/finger.tproj/finger.1#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/finger.tproj/finger.c#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/finger.tproj/finger.h#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/finger.tproj/lprint.c#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/finger.tproj/net.c#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/finger.tproj/sprint.c#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/finger.tproj/util.c#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/fingerd.tproj/Makefile#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/fingerd.tproj/Makefile.postamble#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/fingerd.tproj/Makefile.preamble#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/fingerd.tproj/PB.project#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/fingerd.tproj/fingerd.8#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/fingerd.tproj/fingerd.c#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/fingerd.tproj/pathnames.h#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/last.tproj/Makefile#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/last.tproj/Makefile.preamble#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/last.tproj/PB.project#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/last.tproj/last.1#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/last.tproj/last.c#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/md.tproj/Makefile#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/md.tproj/Makefile.dist#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/md.tproj/Makefile.preamble#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/md.tproj/PB.project#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/md.tproj/md.c#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/mklocale.tproj/Japanese#3 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/mklocale.tproj/Makefile#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/mklocale.tproj/Makefile.postamble#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/mklocale.tproj/Makefile.preamble#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/mklocale.tproj/PB.project#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/mklocale.tproj/POSIX#3 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/mklocale.tproj/ldef.h#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/mklocale.tproj/lex.l#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/mklocale.tproj/mklocale.1#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/mklocale.tproj/share/Makefile#3 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/mklocale.tproj/share/README.locale_name#3 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/mklocale.tproj/share/bg_BG.CP1251.src#3 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/mklocale.tproj/share/ja_JP.EUC.src#3 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/mklocale.tproj/share/ja_JP.SJIS.src#3 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/mklocale.tproj/share/ko_KR.EUC.src#3 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/mklocale.tproj/share/la_LN.ISO8859-1.src#3 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/mklocale.tproj/share/la_LN.ISO8859-15.src#3 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/mklocale.tproj/share/la_LN.ISO8859-2.src#3 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/mklocale.tproj/share/la_LN.ISO8859-4.src#3 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/mklocale.tproj/share/la_LN.US-ASCII.src#3 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/mklocale.tproj/share/ru_RU.CP866.src#3 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/mklocale.tproj/share/ru_RU.ISO8859-5.src#3 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/mklocale.tproj/share/ru_RU.KOI8-R.src#3 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/mklocale.tproj/share/uk_UA.KOI8-U.src#3 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/mklocale.tproj/share/zh_CN.EUC.src#3 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/mklocale.tproj/share/zh_TW.Big5.src#3 branch .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/mklocale.tproj/yacc.y#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/ps.tproj/Makefile#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/ps.tproj/Makefile.postamble#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/ps.tproj/Makefile.preamble#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/ps.tproj/PB.project#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/ps.tproj/extern.h#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/ps.tproj/fmt.c#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/ps.tproj/h.template#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/ps.tproj/keyword.c#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/ps.tproj/m.template#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/ps.tproj/nlist.c#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/ps.tproj/print.c#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/ps.tproj/ps.1#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/ps.tproj/ps.c#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/ps.tproj/ps.h#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/ps.tproj/tasks.c#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/pstat.tproj/Makefile#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/pstat.tproj/Makefile.postamble#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/pstat.tproj/Makefile.preamble#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/pstat.tproj/PB.project#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/pstat.tproj/pstat.8#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/pstat.tproj/pstat.c#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/stty.tproj/Makefile#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/stty.tproj/Makefile.dist#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/stty.tproj/Makefile.preamble#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/stty.tproj/PB.project#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/stty.tproj/cchar.c#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/stty.tproj/extern.h#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/stty.tproj/gfmt.c#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/stty.tproj/key.c#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/stty.tproj/modes.c#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/stty.tproj/print.c#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/stty.tproj/stty.1#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/stty.tproj/stty.c#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/stty.tproj/stty.h#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/stty.tproj/util.c#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/tty.tproj/Makefile#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/tty.tproj/Makefile.preamble#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/tty.tproj/PB.project#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/tty.tproj/tty.1#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/tty.tproj/tty.c#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/whois.tproj/Makefile#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/whois.tproj/Makefile.preamble#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/whois.tproj/PB.project#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/whois.tproj/whois.1#3 integrate .. //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/whois.tproj/whois.c#3 integrate Differences ... ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/Makefile#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/Makefile.include#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/Makefile.preamble#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/PB.project#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/adv_cmds.rtf#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/cap_mkdb.tproj/Makefile#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/cap_mkdb.tproj/Makefile.preamble#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/cap_mkdb.tproj/PB.project#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/cap_mkdb.tproj/cap_mkdb.1#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/cap_mkdb.tproj/cap_mkdb.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/finger.tproj/Makefile#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/finger.tproj/Makefile.preamble#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/finger.tproj/PB.project#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/finger.tproj/extern.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/finger.tproj/finger.1#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/finger.tproj/finger.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/finger.tproj/finger.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/finger.tproj/lprint.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/finger.tproj/net.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/finger.tproj/sprint.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/finger.tproj/util.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/fingerd.tproj/Makefile#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/fingerd.tproj/Makefile.postamble#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/fingerd.tproj/Makefile.preamble#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/fingerd.tproj/PB.project#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/fingerd.tproj/fingerd.8#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/fingerd.tproj/fingerd.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/fingerd.tproj/pathnames.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/last.tproj/Makefile#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/last.tproj/Makefile.preamble#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/last.tproj/PB.project#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/last.tproj/last.1#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/last.tproj/last.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/md.tproj/Makefile#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/md.tproj/Makefile.dist#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/md.tproj/Makefile.preamble#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/md.tproj/PB.project#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/md.tproj/md.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/mklocale.tproj/Makefile#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/mklocale.tproj/Makefile.postamble#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/mklocale.tproj/Makefile.preamble#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/mklocale.tproj/PB.project#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/mklocale.tproj/ldef.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/mklocale.tproj/lex.l#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/mklocale.tproj/mklocale.1#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/mklocale.tproj/yacc.y#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/ps.tproj/Makefile#3 (text+ko) ==== @@ -26,7 +26,7 @@ NEXTSTEP_INSTALLDIR = /bin WINDOWS_INSTALLDIR = /Library/Executables PDO_UNIX_INSTALLDIR = /bin -LIBS = +LIBS = ../../../libmac/libmac.a DEBUG_LIBS = $(LIBS) PROF_LIBS = $(LIBS) ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/ps.tproj/Makefile.postamble#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/ps.tproj/Makefile.preamble#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/ps.tproj/PB.project#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/ps.tproj/extern.h#3 (text+ko) ==== @@ -55,6 +55,8 @@ char *fmt_argv __P((char **, char *, int)); int getpcpu __P((KINFO *)); double getpmem __P((KINFO *)); +void label(KINFO *, VARENT *); +int s_label(KINFO *); void logname __P((KINFO *, VARENT *)); void longtname __P((KINFO *, VARENT *)); void lstarted __P((KINFO *, VARENT *)); ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/ps.tproj/fmt.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/ps.tproj/h.template#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/ps.tproj/keyword.c#3 (text+ko) ==== @@ -106,6 +106,8 @@ NULL, 0, pvar, NULL, 8, POFF(p_traceflag), INT, "x"}, {"ktracep", "KTRACEP", NULL, 0, pvar, NULL, 8, POFF(p_tracep), LONG, "lx"}, + {"label", "LABEL", NULL, LJUST|DSIZ, label, s_label, SHRT_MAX, 0, CHAR, + NULL}, {"lim", "LIM", NULL, 0, maxrss, NULL, 5}, {"login", "LOGIN", NULL, LJUST, logname, NULL, MAXLOGNAME-1}, {"logname", "", "login"}, ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/ps.tproj/m.template#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/ps.tproj/nlist.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/ps.tproj/print.c#3 (text+ko) ==== @@ -45,6 +45,7 @@ #include #include +#include #include #include #include @@ -1090,3 +1091,53 @@ else (void)printf("%*s", v->width, "-"); } + +void +label(KINFO *k, VARENT *ve) +{ + char *string; + VAR *v; + mac_t proclabel; + int error; + + v = ve->var; + string = NULL; + if (mac_prepare_process_label(&proclabel) == -1) { + perror("mac_prepare_process_label"); + goto out; + } + error = mac_get_pid(KI_PROC(k)->p_pid, proclabel); + if (error == 0) { + if (mac_to_text(proclabel, &string) == -1) + string = NULL; + } + mac_free(proclabel); + out: + if (string != NULL) { + (void)printf("%-*s", v->width, string); + free(string); + } else + (void)printf("%-*s", v->width, ""); + return; +} + +int +s_label(KINFO *k) +{ + char *string = NULL; + mac_t proclabel; + int error, size = 0; + + error = mac_prepare_process_label(&proclabel); + if (error != 0) { + perror("mac_prepare_process_label"); + return (0); + } + error = mac_get_pid(KI_PROC(k)->p_pid, proclabel); + if (error == 0 && mac_to_text(proclabel, &string) == 0) { + size = strlen(string); + free(string); + } + mac_free(proclabel); + return (size); +} ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/ps.tproj/ps.1#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/ps.tproj/ps.c#3 (text+ko) ==== @@ -108,6 +108,7 @@ char ufmt[] = "user pid %cpu %mem vsz rss tt state start time command"; char mfmt[] = "user pid tt %cpu state pri stime utime command"; char vfmt[] = "pid state time sl re pagein vsz rss lim tsiz %cpu %mem command"; +char Zfmt[] = "label"; int mflg = 0; /* if -M option to display all mach threads */ int print_thread_num=0; @@ -157,9 +158,9 @@ memf = _PATH_MEM; while ((ch = getopt(argc, argv, #if defined(LAZY_PS) - "aCcefghjLlM:mN:O:o:p:rSTt:U:uvW:wx")) != -1) + "aCcefghjLlM:mN:O:o:p:rSTt:U:uvW:wxZ")) != -1) #else - "aCceghjLlMmO:o:p:rSTt:U:uvwx")) != -1) + "aCceghjLlMmO:o:p:rSTt:U:uvwxZ")) != -1) #endif switch((char)ch) { case 'a': @@ -299,6 +300,10 @@ case 'x': xflg = 1; break; + case 'Z': + parsefmt(Zfmt); + Zfmt[0] = '\0'; + break; case '?': default: usage(); @@ -743,7 +748,7 @@ { (void)fprintf(stderr, "%s\n%s\n%s\n", - "usage: ps [-aChjlmMrSTuvwx] [-O|o fmt] [-p pid] [-t tty] [-U user]", + "usage: ps [-aChjlmMrSTuvwxZ] [-O|o fmt] [-p pid] [-t tty] [-U user]", " [-N system] [-W swap]", " ps [-L]"); exit(1); ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/ps.tproj/ps.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/ps.tproj/tasks.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/pstat.tproj/Makefile#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/pstat.tproj/Makefile.postamble#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/pstat.tproj/Makefile.preamble#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/pstat.tproj/PB.project#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/pstat.tproj/pstat.8#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/pstat.tproj/pstat.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/stty.tproj/Makefile#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/stty.tproj/Makefile.dist#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/stty.tproj/Makefile.preamble#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/stty.tproj/PB.project#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/stty.tproj/cchar.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/stty.tproj/extern.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/stty.tproj/gfmt.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/stty.tproj/key.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/stty.tproj/modes.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/stty.tproj/print.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/stty.tproj/stty.1#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/stty.tproj/stty.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/stty.tproj/stty.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/stty.tproj/util.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/tty.tproj/Makefile#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/tty.tproj/Makefile.preamble#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/tty.tproj/PB.project#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/tty.tproj/tty.1#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/tty.tproj/tty.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/whois.tproj/Makefile#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/whois.tproj/Makefile.preamble#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/whois.tproj/PB.project#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/whois.tproj/whois.1#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/other/adv_cmds/whois.tproj/whois.c#3 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Tue Apr 20 07:22:31 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7F65916A4D0; Tue, 20 Apr 2004 07:22:31 -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 4894716A4CE for ; Tue, 20 Apr 2004 07:22:31 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 27B2B43D58 for ; Tue, 20 Apr 2004 07:22:31 -0700 (PDT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i3KEMUGe091559 for ; Tue, 20 Apr 2004 07:22:30 -0700 (PDT) (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i3KEMU5X091549 for perforce@freebsd.org; Tue, 20 Apr 2004 07:22:30 -0700 (PDT) (envelope-from areisse@nailabs.com) Date: Tue, 20 Apr 2004 07:22:30 -0700 (PDT) Message-Id: <200404201422.i3KEMU5X091549@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Subject: PERFORCE change 51437 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: Tue, 20 Apr 2004 14:22:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=51437 Change 51437 by areisse@areisse_ibook on 2004/04/20 07:22:02 mig clients want a header file now Affected files ... .. //depot/projects/trustedbsd/sedarwin73/libmac/Makefile#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin73/libmac/Makefile#2 (text+ko) ==== @@ -6,7 +6,7 @@ VPATH = $(EXPORT_HDRS)/osfmk/mach /usr/include/mach %.c: %.defs - mig $(CFLAGS) -user $@ -header /dev/null -server /dev/null -sheader /dev/null $< + mig $(CFLAGS) -user $@ -header security.h -server /dev/null -sheader /dev/null $< libmac.a: $(OBJS) ar cr $@ $(OBJS) From owner-p4-projects@FreeBSD.ORG Tue Apr 20 07:23:33 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6F47116A4D0; Tue, 20 Apr 2004 07:23:33 -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 4B07A16A4CE for ; Tue, 20 Apr 2004 07:23:33 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2BFFF43D53 for ; Tue, 20 Apr 2004 07:23:33 -0700 (PDT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i3KENWGe091713 for ; Tue, 20 Apr 2004 07:23:32 -0700 (PDT) (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i3KENWWT091710 for perforce@freebsd.org; Tue, 20 Apr 2004 07:23:32 -0700 (PDT) (envelope-from areisse@nailabs.com) Date: Tue, 20 Apr 2004 07:23:32 -0700 (PDT) Message-Id: <200404201423.i3KENWWT091710@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Subject: PERFORCE change 51438 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: Tue, 20 Apr 2004 14:23:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=51438 Change 51438 by areisse@areisse_ibook on 2004/04/20 07:22:32 various little files Affected files ... .. //depot/projects/trustedbsd/sedarwin73/Makeconfig#1 add .. //depot/projects/trustedbsd/sedarwin73/etc/Makefile#1 branch .. //depot/projects/trustedbsd/sedarwin73/etc/mac.conf#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Tue Apr 20 07:33:48 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F176B16A4D0; Tue, 20 Apr 2004 07:33:47 -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 C765916A4CE for ; Tue, 20 Apr 2004 07:33:47 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BF6D843D41 for ; Tue, 20 Apr 2004 07:33:47 -0700 (PDT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i3KEXlGe093986 for ; Tue, 20 Apr 2004 07:33:47 -0700 (PDT) (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i3KEXlHT093983 for perforce@freebsd.org; Tue, 20 Apr 2004 07:33:47 -0700 (PDT) (envelope-from areisse@nailabs.com) Date: Tue, 20 Apr 2004 07:33:47 -0700 (PDT) Message-Id: <200404201433.i3KEXlHT093983@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Subject: PERFORCE change 51440 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: Tue, 20 Apr 2004 14:33:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=51440 Change 51440 by areisse@areisse_ibook on 2004/04/20 07:33:33 branch mac_cmds for sedarwin 73 Affected files ... .. //depot/projects/trustedbsd/sedarwin73/mac_cmds/Makefile#1 branch .. //depot/projects/trustedbsd/sedarwin73/mac_cmds/getfmac/Makefile#1 branch .. //depot/projects/trustedbsd/sedarwin73/mac_cmds/getfmac/getfmac#1 branch .. //depot/projects/trustedbsd/sedarwin73/mac_cmds/getfmac/getfmac.8#1 branch .. //depot/projects/trustedbsd/sedarwin73/mac_cmds/getfmac/getfmac.c#1 branch .. //depot/projects/trustedbsd/sedarwin73/mac_cmds/getpmac/Makefile#1 branch .. //depot/projects/trustedbsd/sedarwin73/mac_cmds/getpmac/getpmac#1 branch .. //depot/projects/trustedbsd/sedarwin73/mac_cmds/getpmac/getpmac.8#1 branch .. //depot/projects/trustedbsd/sedarwin73/mac_cmds/getpmac/getpmac.c#1 branch .. //depot/projects/trustedbsd/sedarwin73/mac_cmds/mexec/Makefile#1 branch .. //depot/projects/trustedbsd/sedarwin73/mac_cmds/mexec/mexec.c#1 branch .. //depot/projects/trustedbsd/sedarwin73/mac_cmds/setfsmac/Makefile#1 branch .. //depot/projects/trustedbsd/sedarwin73/mac_cmds/setfsmac/setfmac.8#1 branch .. //depot/projects/trustedbsd/sedarwin73/mac_cmds/setfsmac/setfsmac.8#1 branch .. //depot/projects/trustedbsd/sedarwin73/mac_cmds/setfsmac/setfsmac.c#1 branch .. //depot/projects/trustedbsd/sedarwin73/mac_cmds/setfsmac/sysqueue.h#1 branch .. //depot/projects/trustedbsd/sedarwin73/mac_cmds/setpmac/Makefile#1 branch .. //depot/projects/trustedbsd/sedarwin73/mac_cmds/setpmac/setpmac.8#1 branch .. //depot/projects/trustedbsd/sedarwin73/mac_cmds/setpmac/setpmac.c#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Tue Apr 20 08:52:35 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CF08216A4D0; Tue, 20 Apr 2004 08:52:34 -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 A2B1016A4CE for ; Tue, 20 Apr 2004 08:52:34 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 95A1943D53 for ; Tue, 20 Apr 2004 08:52:34 -0700 (PDT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i3KFqYGe017780 for ; Tue, 20 Apr 2004 08:52:34 -0700 (PDT) (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i3KFqVbG017741 for perforce@freebsd.org; Tue, 20 Apr 2004 08:52:31 -0700 (PDT) (envelope-from areisse@nailabs.com) Date: Tue, 20 Apr 2004 08:52:31 -0700 (PDT) Message-Id: <200404201552.i3KFqVbG017741@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Subject: PERFORCE change 51449 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: Tue, 20 Apr 2004 15:52:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=51449 Change 51449 by areisse@areisse_ibook on 2004/04/20 08:52:24 bring system_cmds 279.1 into sedarwin branch. Affected files ... .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/APPLE_LICENSE#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/Makefile#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/Makefile.preamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/PB.project#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/README.rtf#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/ac.tproj/Makefile#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/ac.tproj/Makefile.postamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/ac.tproj/Makefile.preamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/ac.tproj/PB.project#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/ac.tproj/ac.8#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/ac.tproj/ac.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/accton.tproj/Makefile#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/accton.tproj/Makefile.postamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/accton.tproj/Makefile.preamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/accton.tproj/PB.project#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/accton.tproj/accton.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/arch.tproj/Makefile#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/arch.tproj/Makefile.postamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/arch.tproj/PB.project#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/arch.tproj/arch.1#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/arch.tproj/arch.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/arch.tproj/machine.1#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/at.tproj/Makefile#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/at.tproj/Makefile.dist#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/at.tproj/Makefile.postamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/at.tproj/Makefile.preamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/at.tproj/PB.project#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/at.tproj/at.1#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/at.tproj/at.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/at.tproj/at.h#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/at.tproj/panic.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/at.tproj/panic.h#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/at.tproj/parsetime.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/at.tproj/parsetime.h#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/at.tproj/pathnames.h#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/at.tproj/perm.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/at.tproj/perm.h#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/at.tproj/privs.h#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/atrun.tproj/Makefile#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/atrun.tproj/Makefile.dist#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/atrun.tproj/Makefile.preamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/atrun.tproj/PB.project#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/atrun.tproj/atrun.8#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/atrun.tproj/atrun.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/atrun.tproj/atrun.h#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/chkpasswd.tproj/Makefile#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/chkpasswd.tproj/Makefile.postamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/chkpasswd.tproj/Makefile.preamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/chkpasswd.tproj/PB.project#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/chkpasswd.tproj/file_passwd.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/chkpasswd.tproj/netinfo_passwd.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/chkpasswd.tproj/nis_passwd.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/chkpasswd.tproj/passwd.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/chkpasswd.tproj/stringops.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/chkpasswd.tproj/stringops.h#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/chpass.tproj/Makefile#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/chpass.tproj/Makefile.dist#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/chpass.tproj/Makefile.postamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/chpass.tproj/Makefile.preamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/chpass.tproj/PB.project#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/chpass.tproj/chpass.1#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/chpass.tproj/chpass.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/chpass.tproj/chpass.h#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/chpass.tproj/edit.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/chpass.tproj/field.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/chpass.tproj/pathnames.h#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/chpass.tproj/pw_copy.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/chpass.tproj/pw_copy.h#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/chpass.tproj/table.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/chpass.tproj/util.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/dmesg.tproj/Makefile#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/dmesg.tproj/Makefile.dist#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/dmesg.tproj/Makefile.postamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/dmesg.tproj/Makefile.preamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/dmesg.tproj/PB.project#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/dmesg.tproj/dmesg.8#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/dmesg.tproj/dmesg.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/dp_notify_lib/Makefile#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/dp_notify_lib/Makefile.postamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/dp_notify_lib/Makefile.preamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/dp_notify_lib/PB.project#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/dp_notify_lib/backing_store_alerts.defs#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/dp_notify_lib/backing_store_triggers.defs#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/dp_notify_lib/h.template#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/dp_notify_lib/m.template#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/dynamic_pager.tproj/Makefile#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/dynamic_pager.tproj/Makefile.postamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/dynamic_pager.tproj/Makefile.preamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/dynamic_pager.tproj/PB.project#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/dynamic_pager.tproj/backing_store_alerts.defs#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/dynamic_pager.tproj/backing_store_triggers.defs#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/dynamic_pager.tproj/default_pager_alerts.defs#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/dynamic_pager.tproj/dynamic_pager.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/fs_usage.tproj/Makefile#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/fs_usage.tproj/Makefile.postamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/fs_usage.tproj/Makefile.preamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/fs_usage.tproj/PB.project#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/fs_usage.tproj/fs_usage.1#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/fs_usage.tproj/fs_usage.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/getty.tproj/Makefile#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/getty.tproj/Makefile.postamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/getty.tproj/Makefile.preamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/getty.tproj/PB.project#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/getty.tproj/extern.h#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/getty.tproj/getty.8#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/getty.tproj/gettytab.5#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/getty.tproj/gettytab.h#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/getty.tproj/init.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/getty.tproj/main.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/getty.tproj/pathnames.h#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/getty.tproj/subr.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/getty.tproj/ttys.5#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/halt.tproj/Makefile#2 delete .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/halt.tproj/Makefile.dist#2 delete .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/halt.tproj/Makefile.preamble#2 delete .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/halt.tproj/PB.project#2 delete .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/halt.tproj/halt.8#2 delete .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/halt.tproj/halt.c#2 delete .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/hostinfo.tproj/Makefile#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/hostinfo.tproj/Makefile.postamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/hostinfo.tproj/Makefile.preamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/hostinfo.tproj/PB.project#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/hostinfo.tproj/hostinfo.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/init.tproj/Makefile#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/init.tproj/Makefile.dist#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/init.tproj/Makefile.postamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/init.tproj/Makefile.preamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/init.tproj/NOTES#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/init.tproj/PB.project#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/init.tproj/init.8#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/init.tproj/init.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/init.tproj/pathnames.h#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/iostat.tproj/Makefile#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/iostat.tproj/Makefile.postamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/iostat.tproj/Makefile.preamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/iostat.tproj/PB.project#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/iostat.tproj/iostat.8#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/iostat.tproj/iostat.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/kdump.tproj/Makefile#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/kdump.tproj/Makefile.postamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/kdump.tproj/Makefile.preamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/kdump.tproj/PB.project#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/kdump.tproj/kdump.1#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/kdump.tproj/kdump.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/kdump.tproj/mkioctls#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/kdump.tproj/syscalls.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/kgmon.tproj/Makefile#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/kgmon.tproj/Makefile.postamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/kgmon.tproj/Makefile.preamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/kgmon.tproj/PB.project#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/kgmon.tproj/kgmon.8#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/kgmon.tproj/kgmon.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/ktrace.tproj/Makefile#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/ktrace.tproj/Makefile.postamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/ktrace.tproj/Makefile.preamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/ktrace.tproj/PB.project#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/ktrace.tproj/ktrace.1#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/ktrace.tproj/ktrace.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/ktrace.tproj/ktrace.h#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/ktrace.tproj/subr.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/latency.tproj/Makefile#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/latency.tproj/Makefile.postamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/latency.tproj/Makefile.preamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/latency.tproj/PB.project#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/latency.tproj/latency.1#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/latency.tproj/latency.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/login.tproj/Makefile#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/login.tproj/Makefile.postamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/login.tproj/Makefile.preamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/login.tproj/PB.project#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/login.tproj/klogin.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/login.tproj/login.1#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/login.tproj/login.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/login.tproj/pathnames.h#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/mach_init.tproj/Makefile#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/mach_init.tproj/Makefile.postamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/mach_init.tproj/Makefile.preamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/mach_init.tproj/PB.project#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/mach_init.tproj/bootstrap.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/mach_init.tproj/bootstrap.defs#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/mach_init.tproj/bootstrap_internal.h#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/mach_init.tproj/error_log.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/mach_init.tproj/error_log.h#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/mach_init.tproj/lists.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/mach_init.tproj/lists.h#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/mach_init.tproj/mach_init.8#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/mach_init.tproj/rpc_services.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/makekey.tproj/Makefile#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/makekey.tproj/Makefile.postamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/makekey.tproj/Makefile.preamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/makekey.tproj/PB.project#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/makekey.tproj/makekey.8#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/makekey.tproj/makekey.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/mkfile.tproj/Makefile#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/mkfile.tproj/Makefile.postamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/mkfile.tproj/Makefile.preamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/mkfile.tproj/PB.project#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/mkfile.tproj/mkfile.8#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/mkfile.tproj/mkfile.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/nologin.tproj/Makefile#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/nologin.tproj/Makefile.dist#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/nologin.tproj/Makefile.postamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/nologin.tproj/Makefile.preamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/nologin.tproj/PB.project#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/nologin.tproj/nologin.8#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/nologin.tproj/nologin.sh#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/nvram.tproj/Makefile#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/nvram.tproj/Makefile.postamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/nvram.tproj/Makefile.preamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/nvram.tproj/PB.project#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/nvram.tproj/nvram.8#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/nvram.tproj/nvram.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/nvram.tproj/nvram/Alchemy#2 delete .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/nvram.tproj/nvram/Gossamer#2 delete .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/nvram.tproj/nvram/Hooper#2 delete .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/nvram.tproj/nvram/Kanga#2 delete .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/nvram.tproj/nvram/Mainstreet#2 delete .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/nvram.tproj/nvram/PowerExpress#2 delete .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/nvram.tproj/nvram/PowerSurge#2 delete .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/nvram.tproj/nvram/Silk#2 delete .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/nvram.tproj/nvram/Wallstreet#2 delete .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/pagesize.tproj/Makefile#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/pagesize.tproj/Makefile.dist#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/pagesize.tproj/Makefile.postamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/pagesize.tproj/Makefile.preamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/pagesize.tproj/PB.project#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/pagesize.tproj/pagesize.1#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/pagesize.tproj/pagesize.sh#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/passwd.tproj/Makefile#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/passwd.tproj/Makefile.postamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/passwd.tproj/Makefile.preamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/passwd.tproj/PB.project#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/passwd.tproj/file_passwd.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/passwd.tproj/netinfo_passwd.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/passwd.tproj/nis_passwd.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/passwd.tproj/passwd.1#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/passwd.tproj/passwd.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/passwd.tproj/stringops.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/passwd.tproj/stringops.h#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/pwd_mkdb.tproj/Makefile#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/pwd_mkdb.tproj/Makefile.postamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/pwd_mkdb.tproj/Makefile.preamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/pwd_mkdb.tproj/PB.project#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/pwd_mkdb.tproj/pw_scan.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/pwd_mkdb.tproj/pw_scan.h#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/pwd_mkdb.tproj/pwd_mkdb.8#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/pwd_mkdb.tproj/pwd_mkdb.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/reboot.tproj/Makefile#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/reboot.tproj/Makefile.dist#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/reboot.tproj/Makefile.postamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/reboot.tproj/Makefile.preamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/reboot.tproj/PB.project#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/reboot.tproj/boot_hp300.8#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/reboot.tproj/boot_i386.8#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/reboot.tproj/boot_sparc.8#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/reboot.tproj/boot_tahoe.8#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/reboot.tproj/boot_vax.8#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/reboot.tproj/reboot.8#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/reboot.tproj/reboot.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/sc_usage.tproj/Makefile#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/sc_usage.tproj/Makefile.postamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/sc_usage.tproj/Makefile.preamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/sc_usage.tproj/PB.project#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/sc_usage.tproj/sc_usage.1#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/sc_usage.tproj/sc_usage.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/sc_usage.tproj/trace.codes#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/shutdown.tproj/Makefile#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/shutdown.tproj/Makefile.dist#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/shutdown.tproj/Makefile.postamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/shutdown.tproj/Makefile.preamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/shutdown.tproj/PB.project#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/shutdown.tproj/pathnames.h#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/shutdown.tproj/shutdown.8#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/shutdown.tproj/shutdown.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/sync.tproj/Makefile#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/sync.tproj/Makefile.dist#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/sync.tproj/Makefile.preamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/sync.tproj/PB.project#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/sync.tproj/sync.8#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/sync.tproj/sync.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/sysctl.tproj/Makefile#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/sysctl.tproj/Makefile.postamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/sysctl.tproj/Makefile.preamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/sysctl.tproj/PB.project#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/sysctl.tproj/sysctl.8#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/sysctl.tproj/sysctl.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/top.tproj/Makefile#2 delete .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/top.tproj/Makefile.postamble#2 delete .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/top.tproj/Makefile.preamble#2 delete .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/top.tproj/PB.project#2 delete .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/top.tproj/top.1#2 delete .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/top.tproj/top.c#2 delete .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/update.tproj/Makefile#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/update.tproj/Makefile.postamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/update.tproj/Makefile.preamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/update.tproj/PB.project#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/update.tproj/update.8#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/update.tproj/update.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/vipw.tproj/Makefile#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/vipw.tproj/Makefile.postamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/vipw.tproj/Makefile.preamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/vipw.tproj/PB.project#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/vipw.tproj/pw_util.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/vipw.tproj/pw_util.h#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/vipw.tproj/vipw.8#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/vipw.tproj/vipw.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/vm_stat.tproj/Makefile#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/vm_stat.tproj/Makefile.postamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/vm_stat.tproj/Makefile.preamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/vm_stat.tproj/PB.project#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/vm_stat.tproj/h.template#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/vm_stat.tproj/m.template#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/vm_stat.tproj/vm_stat.1#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/vm_stat.tproj/vm_stat.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zdump.tproj/Makefile#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zdump.tproj/Makefile.postamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zdump.tproj/Makefile.preamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zdump.tproj/PB.project#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zdump.tproj/zdump.8#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zdump.tproj/zdump.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Africa/Abidjan#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Africa/Accra#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Africa/Addis_Ababa#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Africa/Algiers#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Africa/Asmera#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Africa/Bamako#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Africa/Bangui#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Africa/Banjul#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Africa/Bissau#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Africa/Blantyre#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Africa/Brazzaville#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Africa/Bujumbura#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Africa/Cairo#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Africa/Casablanca#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Africa/Ceuta#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Africa/Conakry#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Africa/Dakar#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Africa/Dar_es_Salaam#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Africa/Djibouti#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Africa/Douala#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Africa/El_Aaiun#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Africa/Freetown#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Africa/Gaborone#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Africa/Harare#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Africa/Johannesburg#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Africa/Kampala#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Africa/Khartoum#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Africa/Kigali#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Africa/Kinshasa#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Africa/Lagos#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Africa/Libreville#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Africa/Lome#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Africa/Luanda#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Africa/Lubumbashi#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Africa/Lusaka#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Africa/Malabo#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Africa/Maputo#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Africa/Maseru#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Africa/Mbabane#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Africa/Mogadishu#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Africa/Monrovia#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Africa/Nairobi#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Africa/Ndjamena#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Africa/Niamey#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Africa/Nouakchott#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Africa/Ouagadougou#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Africa/Porto-Novo#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Africa/Sao_Tome#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Africa/Timbuktu#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Africa/Tripoli#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Africa/Tunis#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Africa/Windhoek#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Adak#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Anchorage#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Anguilla#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Antigua#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Aruba#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Asuncion#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Atka#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Barbados#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Belize#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Bogota#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Boise#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Buenos_Aires#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Caracas#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Catamarca#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Cayenne#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Cayman#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Chicago#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Cordoba#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Costa_Rica#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Cuiaba#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Curacao#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Dawson#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Dawson_Creek#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Denver#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Detroit#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Dominica#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Edmonton#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/El_Salvador#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Ensenada#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Fort_Wayne#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Fortaleza#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Glace_Bay#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Godthab#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Goose_Bay#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Grand_Turk#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Grenada#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Guadeloupe#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Guatemala#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Guayaquil#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Guyana#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Halifax#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Havana#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Indiana/Indianapolis#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Indiana/Knox#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Indiana/Marengo#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Indiana/Vevay#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Indianapolis#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Inuvik#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Iqaluit#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Jamaica#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Jujuy#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Juneau#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Knox_IN#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/La_Paz#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Lima#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Los_Angeles#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Louisville#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Maceio#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Managua#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Manaus#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Martinique#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Mazatlan#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Mendoza#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Menominee#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Mexico_City#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Miquelon#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Montevideo#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Montreal#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Montserrat#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Nassau#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/New_York#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Nipigon#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Nome#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Noronha#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Panama#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Pangnirtung#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Paramaribo#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Phoenix#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Port-au-Prince#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Port_of_Spain#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Porto_Acre#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Puerto_Rico#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Rainy_River#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Rankin_Inlet#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Regina#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Rosario#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Santiago#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Santo_Domingo#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Sao_Paulo#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Scoresbysund#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Shiprock#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/St_Johns#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/St_Kitts#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/St_Lucia#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/St_Thomas#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/St_Vincent#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Swift_Current#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Tegucigalpa#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Thule#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Thunder_Bay#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Tijuana#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Tortola#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Vancouver#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Virgin#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Whitehorse#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Winnipeg#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Yakutat#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/America/Yellowknife#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Antarctica/Casey#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Antarctica/Mawson#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Antarctica/McMurdo#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Antarctica/Palmer#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Antarctica/South_Pole#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Arctic/Longyearbyen#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Asia/Aden#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Asia/Alma-Ata#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Asia/Amman#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Asia/Anadyr#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Asia/Aqtau#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Asia/Aqtobe#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Asia/Ashkhabad#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Asia/Baghdad#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Asia/Bahrain#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Asia/Baku#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Asia/Bangkok#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Asia/Beirut#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Asia/Bishkek#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Asia/Brunei#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Asia/Calcutta#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Asia/Chungking#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Asia/Colombo#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Asia/Dacca#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Asia/Damascus#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Asia/Dubai#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Asia/Dushanbe#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Asia/Gaza#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Asia/Harbin#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Asia/Hong_Kong#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Asia/Irkutsk#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Asia/Ishigaki#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Asia/Istanbul#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Asia/Jakarta#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Asia/Jayapura#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Asia/Jerusalem#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Asia/Kabul#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Asia/Kamchatka#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Asia/Karachi#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Asia/Kashgar#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Asia/Katmandu#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Asia/Krasnoyarsk#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Asia/Kuala_Lumpur#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Asia/Kuching#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Asia/Kuwait#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Asia/Macao#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Asia/Magadan#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Asia/Manila#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Asia/Muscat#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Asia/Nicosia#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Asia/Novosibirsk#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Asia/Omsk#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Asia/Phnom_Penh#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Asia/Pyongyang#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Asia/Qatar#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Asia/Rangoon#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Asia/Riyadh#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Asia/Riyadh87#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Asia/Riyadh88#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Asia/Riyadh89#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Asia/Saigon#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Asia/Seoul#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Asia/Shanghai#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Asia/Singapore#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Asia/Taipei#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Asia/Tashkent#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Asia/Tbilisi#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Asia/Tehran#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Asia/Tel_Aviv#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Asia/Thimbu#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Asia/Tokyo#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Asia/Ujung_Pandang#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Asia/Ulan_Bator#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Asia/Urumqi#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Asia/Vientiane#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Asia/Vladivostok#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Asia/Yakutsk#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Asia/Yekaterinburg#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Asia/Yerevan#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Atlantic/Azores#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Atlantic/Bermuda#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Atlantic/Canary#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Atlantic/Cape_Verde#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Atlantic/Faeroe#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Atlantic/Jan_Mayen#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Atlantic/Madeira#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Atlantic/Reykjavik#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Atlantic/South_Georgia#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Atlantic/St_Helena#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Atlantic/Stanley#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Australia/ACT#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Australia/Adelaide#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Australia/Brisbane#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Australia/Broken_Hill#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Australia/Canberra#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Australia/Darwin#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Australia/Hobart#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Australia/LHI#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Australia/Lindeman#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Australia/Lord_Howe#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Australia/Melbourne#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Australia/NSW#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Australia/North#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Australia/Perth#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Australia/Queensland#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Australia/South#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Australia/Sydney#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Australia/Tasmania#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Australia/Victoria#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Australia/West#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Australia/Yancowinna#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Brazil/Acre#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Brazil/DeNoronha#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Brazil/East#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Brazil/West#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/CET#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/CST6CDT#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Canada/Atlantic#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Canada/Central#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Canada/East-Saskatchewan#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Canada/Eastern#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Canada/Mountain#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Canada/Newfoundland#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Canada/Pacific#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Canada/Saskatchewan#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Canada/Yukon#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Chile/Continental#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Chile/EasterIsland#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Cuba#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/EET#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/EST#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/EST5EDT#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Egypt#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Eire#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Etc/GMT#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Etc/GMT+0#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Etc/GMT+1#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Etc/GMT+10#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Etc/GMT+11#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Etc/GMT+12#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Etc/GMT+2#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Etc/GMT+3#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Etc/GMT+4#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Etc/GMT+5#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Etc/GMT+6#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Etc/GMT+7#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Etc/GMT+8#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Etc/GMT+9#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Etc/GMT-0#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Etc/GMT-1#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Etc/GMT-10#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Etc/GMT-11#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Etc/GMT-12#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Etc/GMT-13#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Etc/GMT-14#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Etc/GMT-2#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Etc/GMT-3#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Etc/GMT-4#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Etc/GMT-5#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Etc/GMT-6#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Etc/GMT-7#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Etc/GMT-8#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Etc/GMT-9#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Etc/GMT0#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Etc/Greenwich#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Etc/UCT#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Etc/UTC#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Etc/Universal#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Etc/Zulu#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Europe/Amsterdam#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Europe/Andorra#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Europe/Athens#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Europe/Belfast#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Europe/Belgrade#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Europe/Berlin#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Europe/Bratislava#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Europe/Brussels#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Europe/Bucharest#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Europe/Budapest#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Europe/Chisinau#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Europe/Copenhagen#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Europe/Dublin#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Europe/Gibraltar#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Europe/Helsinki#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Europe/Istanbul#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Europe/Kaliningrad#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Europe/Kiev#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Europe/Lisbon#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Europe/Ljubljana#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Europe/London#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Europe/Luxembourg#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Europe/Madrid#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Europe/Malta#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Europe/Minsk#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Europe/Monaco#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Europe/Moscow#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Europe/Oslo#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Europe/Paris#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Europe/Prague#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Europe/Riga#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Europe/Rome#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Europe/Samara#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Europe/San_Marino#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Europe/Sarajevo#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Europe/Simferopol#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Europe/Skopje#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Europe/Sofia#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Europe/Stockholm#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Europe/Tallinn#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Europe/Tirane#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Europe/Vaduz#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Europe/Vatican#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Europe/Vienna#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Europe/Vilnius#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Europe/Warsaw#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Europe/Zagreb#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Europe/Zurich#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Factory#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/GB#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/GMT#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/GMT+0#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/GMT-0#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/GMT0#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Greenwich#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/HST#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Hongkong#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Iceland#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Indian/Antananarivo#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Indian/Chagos#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Indian/Christmas#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Indian/Cocos#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Indian/Comoro#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Indian/Mahe#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Indian/Maldives#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Indian/Mauritius#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Indian/Mayotte#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Indian/Reunion#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Iran#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Israel#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Jamaica#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Japan#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Kwajalein#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Libya#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/MET#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/MST#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/MST7MDT#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Mexico/BajaNorte#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Mexico/BajaSur#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Mexico/General#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Mideast/Riyadh87#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Mideast/Riyadh88#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Mideast/Riyadh89#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/NZ#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/NZ-CHAT#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Navajo#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/PRC#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/PST8PDT#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Pacific/Apia#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Pacific/Auckland#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Pacific/Chatham#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Pacific/Easter#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Pacific/Efate#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Pacific/Enderbury#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Pacific/Fakaofo#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Pacific/Fiji#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Pacific/Funafuti#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Pacific/Galapagos#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Pacific/Gambier#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Pacific/Guadalcanal#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Pacific/Guam#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Pacific/Honolulu#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Pacific/Johnston#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Pacific/Kiritimati#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Pacific/Kosrae#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Pacific/Kwajalein#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Pacific/Majuro#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Pacific/Marquesas#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Pacific/Midway#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Pacific/Nauru#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Pacific/Niue#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Pacific/Norfolk#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Pacific/Noumea#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Pacific/Pago_Pago#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Pacific/Palau#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Pacific/Pitcairn#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Pacific/Ponape#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Pacific/Port_Moresby#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Pacific/Rarotonga#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Pacific/Saipan#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Pacific/Samoa#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Pacific/Tahiti#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Pacific/Tarawa#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Pacific/Tongatapu#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Pacific/Truk#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Pacific/Wake#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Pacific/Wallis#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Pacific/Yap#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Poland#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Portugal#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/ROC#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/ROK#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Singapore#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/SystemV/AST4#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/SystemV/AST4ADT#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/SystemV/CST6#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/SystemV/CST6CDT#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/SystemV/EST5#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/SystemV/EST5EDT#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/SystemV/HST10#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/SystemV/MST7#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/SystemV/MST7MDT#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/SystemV/PST8#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/SystemV/PST8PDT#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/SystemV/YST9#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/SystemV/YST9YDT#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Turkey#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/UCT#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/US/Alaska#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/US/Aleutian#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/US/Arizona#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/US/Central#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/US/East-Indiana#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/US/Eastern#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/US/Hawaii#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/US/Indiana-Starke#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/US/Michigan#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/US/Mountain#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/US/Pacific#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/US/Pacific-New#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/US/Samoa#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/UTC#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Universal#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/W-SU#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/WET#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/HACK/Zulu#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/Makefile#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/Makefile.postamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/Makefile.preamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/PB.project#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/datfiles/africa#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/datfiles/antarctica#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/datfiles/asia#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/datfiles/australasia#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/datfiles/backward#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/datfiles/etcetera#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/datfiles/europe#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/datfiles/factory#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/datfiles/leapseconds#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/datfiles/northamerica#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/datfiles/pacificnew#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/datfiles/solar87#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/datfiles/solar88#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/datfiles/solar89#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/datfiles/southamerica#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/datfiles/systemv#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/datfiles/yearistype.sh#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/ialloc.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/private.h#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/scheck.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/tzfile.h#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/zic.8#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zic.tproj/zic.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zprint.tproj/Makefile#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zprint.tproj/Makefile.postamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zprint.tproj/Makefile.preamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zprint.tproj/PB.project#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/zprint.tproj/zprint.c#2 integrate Differences ... ==== //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/APPLE_LICENSE#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/Makefile#2 (text+ko) ==== @@ -14,17 +14,17 @@ TOOLS = dynamic_pager.tproj ac.tproj accton.tproj arch.tproj at.tproj\ atrun.tproj chkpasswd.tproj chpass.tproj dmesg.tproj\ - getty.tproj halt.tproj hostinfo.tproj init.tproj iostat.tproj\ - kgmon.tproj ktrace.tproj login.tproj mach_init.tproj\ - makekey.tproj mkfile.tproj nvram.tproj passwd.tproj\ - pwd_mkdb.tproj reboot.tproj shutdown.tproj sync.tproj\ - sysctl.tproj update.tproj vipw.tproj zic.tproj zdump.tproj\ - vm_stat.tproj zprint.tproj top.tproj latency.tproj\ - sc_usage.tproj fs_usage.tproj kdump.tproj + getty.tproj hostinfo.tproj init.tproj iostat.tproj kgmon.tproj\ + ktrace.tproj login.tproj mach_init.tproj makekey.tproj\ + mkfile.tproj nvram.tproj passwd.tproj pwd_mkdb.tproj\ + reboot.tproj shutdown.tproj sync.tproj sysctl.tproj\ + update.tproj vipw.tproj zic.tproj zdump.tproj vm_stat.tproj\ + zprint.tproj latency.tproj sc_usage.tproj fs_usage.tproj\ + kdump.tproj sadc.tproj sar.tproj LIBRARIES = dp_notify_lib -LEGACIES = fastboot.tproj nologin.tproj pagesize.tproj +LEGACIES = nologin.tproj pagesize.tproj OTHERSRCS = Makefile.preamble Makefile README.rtf APPLE_LICENSE ==== //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/Makefile.preamble#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/PB.project#2 (text+ko) ==== @@ -23,9 +23,7 @@ "chkpasswd.tproj", "chpass.tproj", "dmesg.tproj", - "fastboot.tproj", "getty.tproj", - "halt.tproj", "hostinfo.tproj", "init.tproj", "iostat.tproj", @@ -50,11 +48,12 @@ "zdump.tproj", "vm_stat.tproj", "zprint.tproj", - "top.tproj", "latency.tproj", "sc_usage.tproj", "fs_usage.tproj", - "kdump.tproj" + "kdump.tproj", + "sadc.tproj", + "sar.tproj" ); }; LANGUAGE = English; ==== //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/README.rtf#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/ac.tproj/Makefile#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/ac.tproj/Makefile.postamble#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/ac.tproj/Makefile.preamble#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/ac.tproj/PB.project#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/ac.tproj/ac.8#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/ac.tproj/ac.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/accton.tproj/Makefile#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/accton.tproj/Makefile.postamble#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/accton.tproj/Makefile.preamble#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/accton.tproj/PB.project#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/accton.tproj/accton.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/arch.tproj/Makefile#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/arch.tproj/Makefile.postamble#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/arch.tproj/PB.project#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/arch.tproj/arch.1#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/arch.tproj/arch.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/arch.tproj/machine.1#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/at.tproj/Makefile#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/at.tproj/Makefile.dist#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/at.tproj/Makefile.postamble#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/at.tproj/Makefile.preamble#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/at.tproj/PB.project#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/system_cmds/at.tproj/at.1#2 (text+ko) ==== @@ -27,7 +27,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $Id: at.1,v 1.1.1.1 1999/05/02 04:21:18 wsanchez Exp $ +.\" $Id: at.1,v 1.3 2003/06/05 17:13:32 eseidel Exp $ .\" .Dd December 5, 1993 .Dt "AT" 1 @@ -55,6 +55,25 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Apr 20 09:26:18 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AF63C16A4D0; Tue, 20 Apr 2004 09:26:17 -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 665A716A4CE for ; Tue, 20 Apr 2004 09:26:17 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4DEE243D4C for ; Tue, 20 Apr 2004 09:26:17 -0700 (PDT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i3KGQHGe024997 for ; Tue, 20 Apr 2004 09:26:17 -0700 (PDT) (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i3KGQGJ8024994 for perforce@freebsd.org; Tue, 20 Apr 2004 09:26:16 -0700 (PDT) (envelope-from areisse@nailabs.com) Date: Tue, 20 Apr 2004 09:26:16 -0700 (PDT) Message-Id: <200404201626.i3KGQGJ8024994@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Subject: PERFORCE change 51451 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: Tue, 20 Apr 2004 16:26:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=51451 Change 51451 by areisse@areisse_ibook on 2004/04/20 09:25:30 bring bootstrap_cmds-44 into sedarwin for 7.3. Affected files ... .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/Makefile#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/Makefile.postamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/Makefile.preamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/PB.project#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/config.tproj/Makefile#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/config.tproj/Makefile.postamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/config.tproj/Makefile.preamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/config.tproj/PB.project#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/config.tproj/config.h#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/config.tproj/externs.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/config.tproj/lexer.l#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/config.tproj/main.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/config.tproj/mkglue.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/config.tproj/mkheaders.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/config.tproj/mkioconf.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/config.tproj/mkmakefile.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/config.tproj/mkswapconf.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/config.tproj/openp.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/config.tproj/parser.y#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/config.tproj/searchp.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/decomment.tproj/Makefile#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/decomment.tproj/Makefile.postamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/decomment.tproj/Makefile.preamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/decomment.tproj/PB.project#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/decomment.tproj/decomment.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/Makefile#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/Makefile.postamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/Makefile.preamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/PB.project#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/alloc.h#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/error.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/error.h#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/global.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/global.h#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/header.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/i386/mig_machine.h#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/lexxer.h#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/lexxer.l#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/mig.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/mig.sh#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/mig_machine.h#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/parser.y#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/ppc/mig_machine.h#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/routine.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/routine.h#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/server.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/statement.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/statement.h#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/strdefs.h#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/string.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/type.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/type.h#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/user.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/utils.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/utils.h#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/write.h#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/relpath.tproj/Makefile#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/relpath.tproj/Makefile.postamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/relpath.tproj/Makefile.preamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/relpath.tproj/PB.project#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/relpath.tproj/relpath.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/vers_string.1#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/vers_string.sh#2 integrate Differences ... ==== //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/Makefile#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/Makefile.postamble#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/Makefile.preamble#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/PB.project#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/config.tproj/Makefile#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/config.tproj/Makefile.postamble#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/config.tproj/Makefile.preamble#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/config.tproj/PB.project#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/config.tproj/config.h#2 (text+ko) ==== @@ -3,21 +3,22 @@ * * @APPLE_LICENSE_HEADER_START@ * - * "Portions Copyright (c) 1999 Apple Computer, Inc. All Rights - * Reserved. This file contains Original Code and/or Modifications of - * Original Code as defined in and that are subject to the Apple Public - * Source License Version 1.0 (the 'License'). You may not use this file - * except in compliance with the License. Please obtain a copy of the - * License at http://www.apple.com/publicsource and read it before using - * this file. + * Copyright (c) 1999-2003 Apple Computer, Inc. All Rights Reserved. + * + * This file contains Original Code and/or Modifications of Original Code + * as defined in and that are subject to the Apple Public Source License + * Version 2.0 (the 'License'). You may not use this file except in + * compliance with the License. Please obtain a copy of the License at + * http://www.opensource.apple.com/apsl/ and read it before using this + * file. * * The Original Code and all software distributed under the License are * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT. Please see the - * License for the specific language governing rights and limitations - * under the License." + * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. + * Please see the License for the specific language governing rights and + * limitations under the License. * * @APPLE_LICENSE_HEADER_END@ */ @@ -240,7 +241,8 @@ extern int seen_vme, seen_mbii; -struct device *connect(); +struct device *dconnect(); + extern struct device *dtab; dev_t nametodev(); char *devtoname(); ==== //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/config.tproj/externs.c#2 (text+ko) ==== @@ -3,21 +3,22 @@ * * @APPLE_LICENSE_HEADER_START@ * - * "Portions Copyright (c) 1999 Apple Computer, Inc. All Rights - * Reserved. This file contains Original Code and/or Modifications of - * Original Code as defined in and that are subject to the Apple Public - * Source License Version 1.0 (the 'License'). You may not use this file - * except in compliance with the License. Please obtain a copy of the - * License at http://www.apple.com/publicsource and read it before using - * this file. + * Copyright (c) 1999-2003 Apple Computer, Inc. All Rights Reserved. + * + * This file contains Original Code and/or Modifications of Original Code + * as defined in and that are subject to the Apple Public Source License + * Version 2.0 (the 'License'). You may not use this file except in + * compliance with the License. Please obtain a copy of the License at + * http://www.opensource.apple.com/apsl/ and read it before using this + * file. * * The Original Code and all software distributed under the License are * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT. Please see the - * License for the specific language governing rights and limitations - * under the License." + * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. + * Please see the License for the specific language governing rights and + * limitations under the License. * * @APPLE_LICENSE_HEADER_END@ */ ==== //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/config.tproj/lexer.l#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/config.tproj/main.c#2 (text+ko) ==== @@ -3,21 +3,22 @@ * * @APPLE_LICENSE_HEADER_START@ * - * "Portions Copyright (c) 1999 Apple Computer, Inc. All Rights - * Reserved. This file contains Original Code and/or Modifications of - * Original Code as defined in and that are subject to the Apple Public - * Source License Version 1.0 (the 'License'). You may not use this file - * except in compliance with the License. Please obtain a copy of the - * License at http://www.apple.com/publicsource and read it before using - * this file. + * Copyright (c) 1999-2003 Apple Computer, Inc. All Rights Reserved. + * + * This file contains Original Code and/or Modifications of Original Code + * as defined in and that are subject to the Apple Public Source License + * Version 2.0 (the 'License'). You may not use this file except in + * compliance with the License. Please obtain a copy of the License at + * http://www.opensource.apple.com/apsl/ and read it before using this + * file. * * The Original Code and all software distributed under the License are * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT. Please see the - * License for the specific language governing rights and limitations - * under the License." + * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. + * Please see the License for the specific language governing rights and + * limitations under the License. * * @APPLE_LICENSE_HEADER_END@ */ ==== //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/config.tproj/mkglue.c#2 (text+ko) ==== @@ -3,21 +3,22 @@ * * @APPLE_LICENSE_HEADER_START@ * - * "Portions Copyright (c) 1999 Apple Computer, Inc. All Rights - * Reserved. This file contains Original Code and/or Modifications of - * Original Code as defined in and that are subject to the Apple Public - * Source License Version 1.0 (the 'License'). You may not use this file - * except in compliance with the License. Please obtain a copy of the - * License at http://www.apple.com/publicsource and read it before using - * this file. + * Copyright (c) 1999-2003 Apple Computer, Inc. All Rights Reserved. + * + * This file contains Original Code and/or Modifications of Original Code + * as defined in and that are subject to the Apple Public Source License + * Version 2.0 (the 'License'). You may not use this file except in + * compliance with the License. Please obtain a copy of the License at + * http://www.opensource.apple.com/apsl/ and read it before using this + * file. * * The Original Code and all software distributed under the License are * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT. Please see the - * License for the specific language governing rights and limitations - * under the License." + * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. + * Please see the License for the specific language governing rights and + * limitations under the License. * * @APPLE_LICENSE_HEADER_END@ */ ==== //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/config.tproj/mkheaders.c#2 (text+ko) ==== @@ -3,21 +3,22 @@ * * @APPLE_LICENSE_HEADER_START@ * - * "Portions Copyright (c) 1999 Apple Computer, Inc. All Rights - * Reserved. This file contains Original Code and/or Modifications of - * Original Code as defined in and that are subject to the Apple Public - * Source License Version 1.0 (the 'License'). You may not use this file - * except in compliance with the License. Please obtain a copy of the - * License at http://www.apple.com/publicsource and read it before using - * this file. + * Copyright (c) 1999-2003 Apple Computer, Inc. All Rights Reserved. + * + * This file contains Original Code and/or Modifications of Original Code + * as defined in and that are subject to the Apple Public Source License + * Version 2.0 (the 'License'). You may not use this file except in + * compliance with the License. Please obtain a copy of the License at + * http://www.opensource.apple.com/apsl/ and read it before using this + * file. * * The Original Code and all software distributed under the License are * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT. Please see the - * License for the specific language governing rights and limitations - * under the License." + * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. + * Please see the License for the specific language governing rights and + * limitations under the License. * * @APPLE_LICENSE_HEADER_END@ */ ==== //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/config.tproj/mkioconf.c#2 (text+ko) ==== @@ -3,21 +3,22 @@ * * @APPLE_LICENSE_HEADER_START@ * - * "Portions Copyright (c) 1999 Apple Computer, Inc. All Rights - * Reserved. This file contains Original Code and/or Modifications of - * Original Code as defined in and that are subject to the Apple Public - * Source License Version 1.0 (the 'License'). You may not use this file - * except in compliance with the License. Please obtain a copy of the - * License at http://www.apple.com/publicsource and read it before using - * this file. + * Copyright (c) 1999-2003 Apple Computer, Inc. All Rights Reserved. + * + * This file contains Original Code and/or Modifications of Original Code + * as defined in and that are subject to the Apple Public Source License + * Version 2.0 (the 'License'). You may not use this file except in + * compliance with the License. Please obtain a copy of the License at + * http://www.opensource.apple.com/apsl/ and read it before using this + * file. * * The Original Code and all software distributed under the License are * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT. Please see the - * License for the specific language governing rights and limitations - * under the License." + * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. + * Please see the License for the specific language governing rights and + * limitations under the License. * * @APPLE_LICENSE_HEADER_END@ */ ==== //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/config.tproj/mkmakefile.c#2 (text+ko) ==== @@ -3,21 +3,22 @@ * * @APPLE_LICENSE_HEADER_START@ * - * "Portions Copyright (c) 1999 Apple Computer, Inc. All Rights - * Reserved. This file contains Original Code and/or Modifications of - * Original Code as defined in and that are subject to the Apple Public - * Source License Version 1.0 (the 'License'). You may not use this file - * except in compliance with the License. Please obtain a copy of the - * License at http://www.apple.com/publicsource and read it before using - * this file. + * Copyright (c) 1999-2003 Apple Computer, Inc. All Rights Reserved. + * + * This file contains Original Code and/or Modifications of Original Code + * as defined in and that are subject to the Apple Public Source License + * Version 2.0 (the 'License'). You may not use this file except in + * compliance with the License. Please obtain a copy of the License at + * http://www.opensource.apple.com/apsl/ and read it before using this + * file. * * The Original Code and all software distributed under the License are * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT. Please see the - * License for the specific language governing rights and limitations - * under the License." + * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. + * Please see the License for the specific language governing rights and + * limitations under the License. * * @APPLE_LICENSE_HEADER_END@ */ ==== //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/config.tproj/mkswapconf.c#2 (text+ko) ==== @@ -3,21 +3,22 @@ * * @APPLE_LICENSE_HEADER_START@ * - * "Portions Copyright (c) 1999 Apple Computer, Inc. All Rights - * Reserved. This file contains Original Code and/or Modifications of - * Original Code as defined in and that are subject to the Apple Public - * Source License Version 1.0 (the 'License'). You may not use this file - * except in compliance with the License. Please obtain a copy of the - * License at http://www.apple.com/publicsource and read it before using - * this file. + * Copyright (c) 1999-2003 Apple Computer, Inc. All Rights Reserved. + * + * This file contains Original Code and/or Modifications of Original Code + * as defined in and that are subject to the Apple Public Source License + * Version 2.0 (the 'License'). You may not use this file except in + * compliance with the License. Please obtain a copy of the License at + * http://www.opensource.apple.com/apsl/ and read it before using this + * file. * * The Original Code and all software distributed under the License are * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT. Please see the - * License for the specific language governing rights and limitations - * under the License." + * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. + * Please see the License for the specific language governing rights and + * limitations under the License. * * @APPLE_LICENSE_HEADER_END@ */ ==== //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/config.tproj/openp.c#2 (text+ko) ==== @@ -3,21 +3,22 @@ * * @APPLE_LICENSE_HEADER_START@ * - * "Portions Copyright (c) 1999 Apple Computer, Inc. All Rights - * Reserved. This file contains Original Code and/or Modifications of - * Original Code as defined in and that are subject to the Apple Public - * Source License Version 1.0 (the 'License'). You may not use this file - * except in compliance with the License. Please obtain a copy of the - * License at http://www.apple.com/publicsource and read it before using - * this file. + * Copyright (c) 1999-2003 Apple Computer, Inc. All Rights Reserved. + * + * This file contains Original Code and/or Modifications of Original Code + * as defined in and that are subject to the Apple Public Source License + * Version 2.0 (the 'License'). You may not use this file except in + * compliance with the License. Please obtain a copy of the License at + * http://www.opensource.apple.com/apsl/ and read it before using this + * file. * * The Original Code and all software distributed under the License are * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT. Please see the - * License for the specific language governing rights and limitations - * under the License." + * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. + * Please see the License for the specific language governing rights and + * limitations under the License. * * @APPLE_LICENSE_HEADER_END@ */ ==== //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/config.tproj/parser.y#2 (text+ko) ==== @@ -626,7 +626,7 @@ "%s must be connected to a nexus", cur.d_name); yyerror(errbuf); } - cur.d_conn = connect($2, $3); + cur.d_conn = dconnect($2, $3); if (machine == MACHINE_SQT) dev_param(&cur, "index", cur.d_unit); } | @@ -882,7 +882,7 @@ * returns 0 if no such device and prints an error message */ struct device * -connect(dev, num) +dconnect(dev, num) register char *dev; register int num; { @@ -962,7 +962,7 @@ if (dcp == TO_NEXUS || dcp == 0) dp->d_conn = dcp; else - dp->d_conn = connect(dcp->d_name, QUES); + dp->d_conn = dconnect(dcp->d_name, QUES); } return (dp); } ==== //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/config.tproj/searchp.c#2 (text+ko) ==== @@ -3,21 +3,22 @@ * * @APPLE_LICENSE_HEADER_START@ * - * "Portions Copyright (c) 1999 Apple Computer, Inc. All Rights - * Reserved. This file contains Original Code and/or Modifications of - * Original Code as defined in and that are subject to the Apple Public - * Source License Version 1.0 (the 'License'). You may not use this file - * except in compliance with the License. Please obtain a copy of the - * License at http://www.apple.com/publicsource and read it before using - * this file. + * Copyright (c) 1999-2003 Apple Computer, Inc. All Rights Reserved. + * + * This file contains Original Code and/or Modifications of Original Code + * as defined in and that are subject to the Apple Public Source License + * Version 2.0 (the 'License'). You may not use this file except in + * compliance with the License. Please obtain a copy of the License at + * http://www.opensource.apple.com/apsl/ and read it before using this + * file. * * The Original Code and all software distributed under the License are * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT. Please see the - * License for the specific language governing rights and limitations - * under the License." + * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. + * Please see the License for the specific language governing rights and + * limitations under the License. * * @APPLE_LICENSE_HEADER_END@ */ ==== //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/decomment.tproj/Makefile#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/decomment.tproj/Makefile.postamble#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/decomment.tproj/Makefile.preamble#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/decomment.tproj/PB.project#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/decomment.tproj/decomment.c#2 (text+ko) ==== @@ -3,21 +3,22 @@ * * @APPLE_LICENSE_HEADER_START@ * - * "Portions Copyright (c) 1999 Apple Computer, Inc. All Rights - * Reserved. This file contains Original Code and/or Modifications of - * Original Code as defined in and that are subject to the Apple Public - * Source License Version 1.0 (the 'License'). You may not use this file - * except in compliance with the License. Please obtain a copy of the - * License at http://www.apple.com/publicsource and read it before using - * this file. + * Copyright (c) 1999-2003 Apple Computer, Inc. All Rights Reserved. + * + * This file contains Original Code and/or Modifications of Original Code + * as defined in and that are subject to the Apple Public Source License + * Version 2.0 (the 'License'). You may not use this file except in + * compliance with the License. Please obtain a copy of the License at + * http://www.opensource.apple.com/apsl/ and read it before using this + * file. * * The Original Code and all software distributed under the License are * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT. Please see the - * License for the specific language governing rights and limitations - * under the License." + * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. + * Please see the License for the specific language governing rights and + * limitations under the License. * * @APPLE_LICENSE_HEADER_END@ */ ==== //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/Makefile#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/Makefile.postamble#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/Makefile.preamble#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/PB.project#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/alloc.h#2 (text+ko) ==== @@ -3,21 +3,22 @@ * * @APPLE_LICENSE_HEADER_START@ * - * "Portions Copyright (c) 1999 Apple Computer, Inc. All Rights - * Reserved. This file contains Original Code and/or Modifications of - * Original Code as defined in and that are subject to the Apple Public - * Source License Version 1.0 (the 'License'). You may not use this file - * except in compliance with the License. Please obtain a copy of the - * License at http://www.apple.com/publicsource and read it before using - * this file. + * Copyright (c) 1999-2003 Apple Computer, Inc. All Rights Reserved. + * + * This file contains Original Code and/or Modifications of Original Code + * as defined in and that are subject to the Apple Public Source License + * Version 2.0 (the 'License'). You may not use this file except in + * compliance with the License. Please obtain a copy of the License at + * http://www.opensource.apple.com/apsl/ and read it before using this + * file. * * The Original Code and all software distributed under the License are * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT. Please see the - * License for the specific language governing rights and limitations - * under the License." + * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. + * Please see the License for the specific language governing rights and + * limitations under the License. * * @APPLE_LICENSE_HEADER_END@ */ ==== //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/error.c#2 (text+ko) ==== @@ -3,21 +3,22 @@ * * @APPLE_LICENSE_HEADER_START@ * - * "Portions Copyright (c) 1999 Apple Computer, Inc. All Rights - * Reserved. This file contains Original Code and/or Modifications of - * Original Code as defined in and that are subject to the Apple Public - * Source License Version 1.0 (the 'License'). You may not use this file - * except in compliance with the License. Please obtain a copy of the - * License at http://www.apple.com/publicsource and read it before using - * this file. + * Copyright (c) 1999-2003 Apple Computer, Inc. All Rights Reserved. + * + * This file contains Original Code and/or Modifications of Original Code + * as defined in and that are subject to the Apple Public Source License + * Version 2.0 (the 'License'). You may not use this file except in + * compliance with the License. Please obtain a copy of the License at + * http://www.opensource.apple.com/apsl/ and read it before using this + * file. * * The Original Code and all software distributed under the License are * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT. Please see the - * License for the specific language governing rights and limitations - * under the License." + * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. + * Please see the License for the specific language governing rights and + * limitations under the License. * * @APPLE_LICENSE_HEADER_END@ */ ==== //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/error.h#2 (text+ko) ==== @@ -3,21 +3,22 @@ * * @APPLE_LICENSE_HEADER_START@ * - * "Portions Copyright (c) 1999 Apple Computer, Inc. All Rights - * Reserved. This file contains Original Code and/or Modifications of - * Original Code as defined in and that are subject to the Apple Public - * Source License Version 1.0 (the 'License'). You may not use this file - * except in compliance with the License. Please obtain a copy of the - * License at http://www.apple.com/publicsource and read it before using - * this file. + * Copyright (c) 1999-2003 Apple Computer, Inc. All Rights Reserved. + * + * This file contains Original Code and/or Modifications of Original Code + * as defined in and that are subject to the Apple Public Source License + * Version 2.0 (the 'License'). You may not use this file except in + * compliance with the License. Please obtain a copy of the License at + * http://www.opensource.apple.com/apsl/ and read it before using this + * file. * * The Original Code and all software distributed under the License are * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT. Please see the - * License for the specific language governing rights and limitations - * under the License." + * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. + * Please see the License for the specific language governing rights and + * limitations under the License. * * @APPLE_LICENSE_HEADER_END@ */ ==== //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/global.c#2 (text+ko) ==== @@ -3,21 +3,22 @@ * * @APPLE_LICENSE_HEADER_START@ * - * "Portions Copyright (c) 1999 Apple Computer, Inc. All Rights - * Reserved. This file contains Original Code and/or Modifications of - * Original Code as defined in and that are subject to the Apple Public - * Source License Version 1.0 (the 'License'). You may not use this file - * except in compliance with the License. Please obtain a copy of the - * License at http://www.apple.com/publicsource and read it before using - * this file. + * Copyright (c) 1999-2003 Apple Computer, Inc. All Rights Reserved. + * + * This file contains Original Code and/or Modifications of Original Code + * as defined in and that are subject to the Apple Public Source License + * Version 2.0 (the 'License'). You may not use this file except in + * compliance with the License. Please obtain a copy of the License at + * http://www.opensource.apple.com/apsl/ and read it before using this + * file. * * The Original Code and all software distributed under the License are * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT. Please see the - * License for the specific language governing rights and limitations - * under the License." + * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. + * Please see the License for the specific language governing rights and + * limitations under the License. * * @APPLE_LICENSE_HEADER_END@ */ ==== //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/global.h#2 (text+ko) ==== @@ -3,21 +3,22 @@ * * @APPLE_LICENSE_HEADER_START@ * - * "Portions Copyright (c) 1999 Apple Computer, Inc. All Rights - * Reserved. This file contains Original Code and/or Modifications of - * Original Code as defined in and that are subject to the Apple Public - * Source License Version 1.0 (the 'License'). You may not use this file - * except in compliance with the License. Please obtain a copy of the - * License at http://www.apple.com/publicsource and read it before using - * this file. + * Copyright (c) 1999-2003 Apple Computer, Inc. All Rights Reserved. + * + * This file contains Original Code and/or Modifications of Original Code + * as defined in and that are subject to the Apple Public Source License + * Version 2.0 (the 'License'). You may not use this file except in + * compliance with the License. Please obtain a copy of the License at + * http://www.opensource.apple.com/apsl/ and read it before using this + * file. * * The Original Code and all software distributed under the License are * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT. Please see the - * License for the specific language governing rights and limitations - * under the License." + * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. + * Please see the License for the specific language governing rights and + * limitations under the License. * * @APPLE_LICENSE_HEADER_END@ */ ==== //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/header.c#2 (text+ko) ==== @@ -3,21 +3,22 @@ * * @APPLE_LICENSE_HEADER_START@ * - * "Portions Copyright (c) 1999 Apple Computer, Inc. All Rights - * Reserved. This file contains Original Code and/or Modifications of - * Original Code as defined in and that are subject to the Apple Public - * Source License Version 1.0 (the 'License'). You may not use this file - * except in compliance with the License. Please obtain a copy of the - * License at http://www.apple.com/publicsource and read it before using - * this file. + * Copyright (c) 1999-2003 Apple Computer, Inc. All Rights Reserved. + * + * This file contains Original Code and/or Modifications of Original Code + * as defined in and that are subject to the Apple Public Source License + * Version 2.0 (the 'License'). You may not use this file except in + * compliance with the License. Please obtain a copy of the License at + * http://www.opensource.apple.com/apsl/ and read it before using this + * file. * * The Original Code and all software distributed under the License are * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT. Please see the - * License for the specific language governing rights and limitations - * under the License." + * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. + * Please see the License for the specific language governing rights and + * limitations under the License. * * @APPLE_LICENSE_HEADER_END@ */ @@ -113,23 +114,6 @@ } static void -WriteDefines(file) - FILE *file; -{ -} - -static void -WriteMigExternal(file) - FILE *file; -{ - fprintf(file, "#ifdef\tmig_external\n"); - fprintf(file, "mig_external\n"); - fprintf(file, "#else\n"); - fprintf(file, "extern\n"); - fprintf(file, "#endif\t/* mig_external */\n"); -} - -static void WriteProlog(file, protect, more, isuser) FILE *file; char *protect; @@ -146,7 +130,6 @@ if (more) { WriteIncludes(file, isuser, UseSplitHeaders); - WriteDefines(file); } fprintf(file, "#ifdef AUTOTEST\n"); fprintf(file, "#ifndef FUNCTION_PTR_T\n"); @@ -297,17 +280,40 @@ fatal("WriteHeader(): bad statement_kind_t (%d)", (int) stat->stKind); } - fprintf(file, "\n#ifdef __BeforeMigUserHeader\n"); + fprintf(file, "\n"); + fprintf(file, "#ifdef __BeforeMigUserHeader\n"); fprintf(file, "__BeforeMigUserHeader\n"); - fprintf(file, "#endif /* __BeforeMigUserHeader */\n\n"); + fprintf(file, "#endif /* __BeforeMigUserHeader */\n"); + fprintf(file, "\n"); + fprintf(file, "#include \n"); + fprintf(file, "__BEGIN_DECLS\n"); + fprintf(file, "\n"); for (stat = stats; stat != stNULL; stat = stat->stNext) { if (stat->stKind == skRoutine) WriteUserRoutine(file, stat->stRoutine); } + fprintf(file, "\n"); + fprintf(file, "__END_DECLS\n"); + + fprintf(file, "\n"); + fprintf(file, "/********************** Caution **************************/\n"); + fprintf(file, "/* The following data types should be used to calculate */\n"); + fprintf(file, "/* maximum message sizes only. The actual message may be */\n"); + fprintf(file, "/* smaller, and the position of the arguments within the */\n"); + fprintf(file, "/* message layout may vary from what is presented here. */\n"); + fprintf(file, "/* For example, if any of the arguments are variable- */\n"); + fprintf(file, "/* sized, and less than the maximum is sent, the data */\n"); + fprintf(file, "/* will be packed tight in the actual message to reduce */\n"); + fprintf(file, "/* the presence of holes. */\n"); + fprintf(file, "/********************** Caution **************************/\n"); + fprintf(file, "\n"); + WriteRequestTypes(file, stats); WriteUserRequestUnion(file, stats); + WriteReplyTypes(file, stats); WriteUserReplyUnion(file, stats); + WriteEpilog(file, protect, TRUE); } @@ -446,15 +452,19 @@ fprintf(file, "\n#ifdef __BeforeMigServerHeader\n"); fprintf(file, "__BeforeMigServerHeader\n"); fprintf(file, "#endif /* __BeforeMigServerHeader */\n\n"); - WriteRequestTypes(file, stats); - WriteServerRequestUnion(file, stats); - WriteReplyTypes(file, stats); - WriteServerReplyUnion(file, stats); + for (stat = stats; stat != stNULL; stat = stat->stNext) { if (stat->stKind == skRoutine) WriteServerRoutine(file, stat->stRoutine); } WriteDispatcher(file); + + WriteRequestTypes(file, stats); + WriteServerRequestUnion(file, stats); + + WriteReplyTypes(file, stats); + WriteServerReplyUnion(file, stats); + WriteEpilog(file, protect, FALSE); } ==== //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/i386/mig_machine.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/lexxer.h#2 (text+ko) ==== @@ -3,21 +3,22 @@ * * @APPLE_LICENSE_HEADER_START@ * - * "Portions Copyright (c) 1999 Apple Computer, Inc. All Rights - * Reserved. This file contains Original Code and/or Modifications of - * Original Code as defined in and that are subject to the Apple Public - * Source License Version 1.0 (the 'License'). You may not use this file - * except in compliance with the License. Please obtain a copy of the - * License at http://www.apple.com/publicsource and read it before using - * this file. + * Copyright (c) 1999-2003 Apple Computer, Inc. All Rights Reserved. + * + * This file contains Original Code and/or Modifications of Original Code + * as defined in and that are subject to the Apple Public Source License + * Version 2.0 (the 'License'). You may not use this file except in + * compliance with the License. Please obtain a copy of the License at + * http://www.opensource.apple.com/apsl/ and read it before using this + * file. * * The Original Code and all software distributed under the License are * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT. Please see the - * License for the specific language governing rights and limitations - * under the License." + * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. + * Please see the License for the specific language governing rights and + * limitations under the License. * * @APPLE_LICENSE_HEADER_END@ */ ==== //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/lexxer.l#2 (text+ko) ==== @@ -138,6 +138,9 @@ [Ss][Ee][Cc][Tt][Oo][Kk][Ee][Nn] RETURN(sySecToken); [Ss][Ee][Rr][Vv][Ee][Rr][Ss][Ee][Cc][Tt][Oo][Kk][Ee][Nn] RETURN(syServerSecToken); [Uu][Ss][Ee][Rr][Ss][Ee][Cc][Tt][Oo][Kk][Ee][Nn] RETURN(syUserSecToken); +[Aa][Uu][Dd][Ii][Tt][Tt][Oo][Kk][Ee][Nn] RETURN(syAuditToken); +[Ss][Ee][Rr][Vv][Ee][Rr][Aa][Uu][Dd][Ii][Tt][Tt][Oo][Kk][Ee][Nn] RETURN(syServerAuditToken); +[Uu][Ss][Ee][Rr][Aa][Uu][Dd][Ii][Tt][Tt][Oo][Kk][Ee][Nn] RETURN(syUserAuditToken); [Ii][Nn][Oo][Uu][Tt] RETURN(syInOut); [Rr][Ee][Qq][Uu][Ee][Ss][Tt][Pp][Oo][Rr][Tt] RETURN(syRequestPort); [Rr][Ee][Pp][Ll][Yy][Pp][Oo][Rr][Tt] RETURN(syReplyPort); @@ -243,6 +246,7 @@ BEGIN SkipToEOL; } ^\#\ *{Number} { doSharp(yytext+1); BEGIN SkipToEOL; } +^\#pragma { BEGIN SkipToEOL; } ^\# { yyerror("illegal # directive"); BEGIN SkipToEOL; } ==== //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/mig.c#2 (text+ko) ==== @@ -3,21 +3,22 @@ * * @APPLE_LICENSE_HEADER_START@ * - * "Portions Copyright (c) 1999 Apple Computer, Inc. All Rights - * Reserved. This file contains Original Code and/or Modifications of - * Original Code as defined in and that are subject to the Apple Public - * Source License Version 1.0 (the 'License'). You may not use this file - * except in compliance with the License. Please obtain a copy of the - * License at http://www.apple.com/publicsource and read it before using - * this file. + * Copyright (c) 1999-2003 Apple Computer, Inc. All Rights Reserved. + * + * This file contains Original Code and/or Modifications of Original Code + * as defined in and that are subject to the Apple Public Source License + * Version 2.0 (the 'License'). You may not use this file except in + * compliance with the License. Please obtain a copy of the License at + * http://www.opensource.apple.com/apsl/ and read it before using this + * file. * * The Original Code and all software distributed under the License are * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT. Please see the - * License for the specific language governing rights and limitations - * under the License." + * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. + * Please see the License for the specific language governing rights and + * limitations under the License. * * @APPLE_LICENSE_HEADER_END@ */ ==== //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/mig.sh#2 (text+ko) ==== @@ -47,10 +47,10 @@ # the rights to redistribute these changes. # -C=${MIGCC-cc} +C=${MIGCC-/usr/bin/cc} M=${MIGCOM-${NEXT_ROOT}/usr/libexec/migcom} -cppflags="-traditional-cpp -D__MACH30__" +cppflags="-D__MACH30__" migflags= files= arch=`/usr/bin/arch` @@ -85,14 +85,22 @@ esac done +# +# traditional-cpp is deprecated in gcc 3.3 and later +# +gcc_version=`$C --version | /usr/bin/cut -d' ' -f3` +if [ "$gcc_version" "<" "3.3" ]; then + cppflags="-traditional-cpp $cppflags" +fi + for file in $files do base="$(basename "$file" .defs)" >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Apr 20 09:40:38 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 677D616A4D0; Tue, 20 Apr 2004 09:40:38 -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 3829F16A4CE for ; Tue, 20 Apr 2004 09:40:38 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2D6A343D1F for ; Tue, 20 Apr 2004 09:40:38 -0700 (PDT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i3KGebGe027352 for ; Tue, 20 Apr 2004 09:40:37 -0700 (PDT) (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i3KGeZRx027339 for perforce@freebsd.org; Tue, 20 Apr 2004 09:40:35 -0700 (PDT) (envelope-from areisse@nailabs.com) Date: Tue, 20 Apr 2004 09:40:35 -0700 (PDT) Message-Id: <200404201640.i3KGeZRx027339@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Subject: PERFORCE change 51453 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: Tue, 20 Apr 2004 16:40:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=51453 Change 51453 by areisse@areisse_ibook on 2004/04/20 09:40:07 merge audit and label handling in mig Affected files ... .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/Makefile#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/Makefile.postamble#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/Makefile.preamble#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/PB.project#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/alloc.h#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/error.c#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/error.h#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/global.c#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/global.h#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/header.c#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/i386/mig_machine.h#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/lexxer.h#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/lexxer.l#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/mig.c#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/mig.sh#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/mig_machine.h#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/parser.y#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/ppc/mig_machine.h#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/routine.c#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/routine.h#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/server.c#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/statement.c#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/statement.h#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/strdefs.h#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/string.c#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/type.c#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/type.h#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/user.c#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/utils.c#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/utils.h#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/write.h#3 integrate Differences ... ==== //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/Makefile#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/Makefile.postamble#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/Makefile.preamble#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/PB.project#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/alloc.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/error.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/error.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/global.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/global.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/header.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/i386/mig_machine.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/lexxer.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/lexxer.l#3 (text+ko) ==== @@ -138,6 +138,9 @@ [Ss][Ee][Cc][Tt][Oo][Kk][Ee][Nn] RETURN(sySecToken); [Ss][Ee][Rr][Vv][Ee][Rr][Ss][Ee][Cc][Tt][Oo][Kk][Ee][Nn] RETURN(syServerSecToken); [Uu][Ss][Ee][Rr][Ss][Ee][Cc][Tt][Oo][Kk][Ee][Nn] RETURN(syUserSecToken); +[Mm][Ss][Gg][Ll][Aa][Bb][Ee][Ll][Ss] RETURN(syMsgLabels); +[Ss][Ee][Rr][Vv][Ee][Rr][Mm][Ss][Gg][Ll][Aa][Bb][Ee][Ll][Ss] RETURN(syServerMsgLabels); +[Uu][Ss][Ee][Rr][Mm][Ss][Gg][Ll][Aa][Bb][Ee][Ll][Ss] RETURN(syUserMsgLabels); [Aa][Uu][Dd][Ii][Tt][Tt][Oo][Kk][Ee][Nn] RETURN(syAuditToken); [Ss][Ee][Rr][Vv][Ee][Rr][Aa][Uu][Dd][Ii][Tt][Tt][Oo][Kk][Ee][Nn] RETURN(syServerAuditToken); [Uu][Ss][Ee][Rr][Aa][Uu][Dd][Ii][Tt][Tt][Oo][Kk][Ee][Nn] RETURN(syUserAuditToken); ==== //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/mig.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/mig.sh#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/mig_machine.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/parser.y#3 (text+ko) ==== @@ -100,9 +100,13 @@ %token syValueOf %token syCString + %token sySecToken %token syUserSecToken %token syServerSecToken +%token syMsgLabels +%token syUserMsgLabels +%token syServerMsgLabels %token syAuditToken %token syUserAuditToken %token syServerAuditToken @@ -684,6 +688,9 @@ | sySecToken { $$ = akSecToken; } | syServerSecToken { $$ = akServerSecToken; } | syUserSecToken { $$ = akUserSecToken; } + | syMsgLabels { $$ = akMsgLabels; } + | syServerMsgLabels { $$ = akServerMsgLabels; } + | syUserMsgLabels { $$ = akUserMsgLabels; } | syAuditToken { $$ = akAuditToken; } | syServerAuditToken { $$ = akServerAuditToken; } | syUserAuditToken { $$ = akUserAuditToken; } ==== //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/ppc/mig_machine.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/routine.c#3 (text+ko) ==== @@ -217,6 +217,9 @@ case akeSecToken: printf("SecToken\t"); break; + case akeMsgLabels: + printf("MsgLabels\t"); + break; case akeAuditToken: printf("AuditToken\t"); break; @@ -932,6 +935,9 @@ case akeSecToken: arg->argMsgField = "msgh_sender"; break; + case akeMsgLabels: + arg->argMsgField = "msgh_labels"; + break; case akeAuditToken: arg->argMsgField = "msgh_audit"; break; @@ -1203,6 +1209,9 @@ akIdent(arg->argKind) == akeAuditToken) itCheckTokenType(arg->argVarName, arg->argType); + if (akIdent(arg->argKind) == akeMsgLabels) + itCheckMsgLabelsType(arg->argVarName, arg->argType); + if (akIdent(arg->argKind) == akeMsgSeqno) itCheckIntType(arg->argVarName, arg->argType); /* @@ -1479,6 +1488,7 @@ register argument_t *arg; boolean_t sectoken = FALSE; boolean_t audittoken = FALSE; + boolean_t msglabels = FALSE; for (arg = rt->rtArgs; arg != argNULL; arg = arg->argNext) if (akCheckAll(arg->argKind, akbReturn|akbUserImplicit)) { @@ -1486,9 +1496,14 @@ sectoken = TRUE; else if (akIdent(arg->argKind) == akeAuditToken) audittoken = TRUE; + else if (akIdent(arg->argKind) == akeMsgLabels) + msglabels = TRUE; } - if (audittoken == TRUE) + if (msglabels == TRUE) + msgop->argVarName = strconcat(msgop->argVarName, + "|MACH_RCV_TRAILER_ELEMENTS(MACH_RCV_TRAILER_LABELS)"); + else if (audittoken == TRUE) msgop->argVarName = strconcat(msgop->argVarName, "|MACH_RCV_TRAILER_ELEMENTS(MACH_RCV_TRAILER_AUDIT)"); else if (sectoken == TRUE) ==== //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/routine.h#3 (text+ko) ==== @@ -77,7 +77,8 @@ #define akeImplicit (16) /* an implicit argument, from the trailer */ #define akeSecToken (17) /* an argument from the trailer: the security token */ #define akeAuditToken (18) /* an argument from the trailer: the audit token */ -#define akeSendTime (19) /* pointed at by rtWaitTime */ +#define akeMsgLabels (19) /* an argument from the trailer: message labels */ +#define akeSendTime (20) /* pointed at by rtWaitTime */ #define akeBITS (0x0000003f) #define akbRequest (0x00000040) /* has a msg_type in request */ @@ -237,6 +238,14 @@ akbServerArg|akbServerImplicit|akbSend|akbSendRcv| \ akbUserArg|akbUserImplicit|akbReturn|akbReturnRcv) +#define akServerMsgLabels akAddFeature(akeMsgLabels, \ + akbServerArg|akbServerImplicit|akbSend|akbSendRcv) +#define akUserMsgLabels akAddFeature(akeMsgLabels, \ + akbUserArg|akbUserImplicit|akbReturn|akbReturnRcv) +#define akMsgLabels akAddFeature(akeMsgLabels, \ + akbServerArg|akbServerImplicit|akbSend|akbSendRcv| \ + akbUserArg|akbUserImplicit|akbReturn|akbReturnRcv) + #define akServerAuditToken akAddFeature(akeAuditToken, \ akbServerArg|akbServerImplicit|akbSend|akbSendRcv) #define akUserAuditToken akAddFeature(akeAuditToken, \ ==== //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/server.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/statement.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/statement.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/strdefs.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/string.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/type.c#3 (text+ko) ==== @@ -948,3 +948,14 @@ error("argument %s isn't a proper Token", name); } + +void +itCheckMsgLabelsType(name, it) + identifier_t name; + ipc_type_t *it; +{ + if (it->itMigInLine || it->itNoOptArray || it->itString || + it->itTypeSize != 64 || !it->itInLine || !it->itStruct || + it->itVarArray || it->itPortType) + error("argument %s isn't a proper msg_labels_t", name); +} ==== //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/type.h#3 (text+ko) ==== @@ -260,6 +260,7 @@ extern void itCheckRequestPortType(/* identifier_t name, ipc_type_t *it */); extern void itCheckReplyPortType(/* identifier_t name, ipc_type_t *it */); extern void itCheckIntType(/* identifier_t name, ipc_type_t *it */); +extern void itCheckMsgLabelsType(/* identifier_t name, ipc_type_t *it */); extern void itCheckTokenType(/* identifier_t name, ipc_type_t *it */); #endif /* _TYPE_H */ ==== //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/user.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/utils.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/utils.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/bootstrap_cmds/migcom.tproj/write.h#3 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Tue Apr 20 10:37:54 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0DF7616A4D0; Tue, 20 Apr 2004 10:37:54 -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 DD73816A4CE for ; Tue, 20 Apr 2004 10:37:53 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D628343D58 for ; Tue, 20 Apr 2004 10:37:53 -0700 (PDT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i3KHbrGe040503 for ; Tue, 20 Apr 2004 10:37:53 -0700 (PDT) (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i3KHbp8B040500 for perforce@freebsd.org; Tue, 20 Apr 2004 10:37:51 -0700 (PDT) (envelope-from areisse@nailabs.com) Date: Tue, 20 Apr 2004 10:37:51 -0700 (PDT) Message-Id: <200404201737.i3KHbp8B040500@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Subject: PERFORCE change 51461 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: Tue, 20 Apr 2004 17:37:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=51461 Change 51461 by areisse@areisse_ibook on 2004/04/20 10:37:13 bring libsebsd over to sedarwin 7.3. Affected files ... .. //depot/projects/trustedbsd/sedarwin73/libsebsd/Makefile#1 branch .. //depot/projects/trustedbsd/sedarwin73/libsebsd/context.c#1 branch .. //depot/projects/trustedbsd/sedarwin73/libsebsd/get_default_type.c#1 branch .. //depot/projects/trustedbsd/sedarwin73/libsebsd/get_ordered_context_list.c#1 branch .. //depot/projects/trustedbsd/sedarwin73/libsebsd/getseccontext.c#1 branch .. //depot/projects/trustedbsd/sedarwin73/libsebsd/query_user_context.c#1 branch .. //depot/projects/trustedbsd/sedarwin73/libsebsd/sebsd.h#1 branch .. //depot/projects/trustedbsd/sedarwin73/libsebsd/sebsd_context.h#1 branch .. //depot/projects/trustedbsd/sedarwin73/libsebsd/sebsd_fs.h#1 branch .. //depot/projects/trustedbsd/sedarwin73/libsebsd/sebsd_proc.h#1 branch .. //depot/projects/trustedbsd/sedarwin73/libsebsd/sebsd_ss.h#1 branch .. //depot/projects/trustedbsd/sedarwin73/libsebsd/security_change_context.c#1 branch .. //depot/projects/trustedbsd/sedarwin73/libsebsd/security_compute_av.c#1 branch .. //depot/projects/trustedbsd/sedarwin73/libsebsd/security_get_user_contexts.c#1 branch .. //depot/projects/trustedbsd/sedarwin73/libsebsd/string_to_security_class.c#1 branch .. //depot/projects/trustedbsd/sedarwin73/libsebsd/system.c#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Tue Apr 20 16:38:41 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D341A16A4D0; Tue, 20 Apr 2004 16:38:40 -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 9D5C916A4CE for ; Tue, 20 Apr 2004 16:38:40 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 91A5B43D49 for ; Tue, 20 Apr 2004 16:38:40 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i3KNceGe026833 for ; Tue, 20 Apr 2004 16:38:40 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i3KNcd9r026830 for perforce@freebsd.org; Tue, 20 Apr 2004 16:38:39 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 20 Apr 2004 16:38:39 -0700 (PDT) Message-Id: <200404202338.i3KNcd9r026830@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 51484 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: Tue, 20 Apr 2004 23:38:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=51484 Change 51484 by rwatson@rwatson_paprika on 2004/04/20 16:38:04 Integrate netperf_socket: boot0ext loader fixes. DA_OLD_QUIRKS goes away. And, of course, more ndis evil (spl-like emulation, etc). geom concat panic fix. In kern_thr, make sure we walk the right process if the thread waking up another thread is in a different process (?). callout_stop() is gone. Ipfilter does IPv6 by default. Don't remove interface index until after protocol detach. Do less dereferencing in if_stf.c. More luigi route table simplification. Use random ephemeral port allocation. Introduction of random positive increments to callout for TCP connections during time wait to prevent identical sequence numbers between connections with the same ports/ips. Don't recurse in nd6_output(). Affected files ... .. //depot/projects/netperf_socket/sys/boot/i386/boot0/boot0.s#2 integrate .. //depot/projects/netperf_socket/sys/boot/i386/boot0/boot0ext.s#2 integrate .. //depot/projects/netperf_socket/sys/boot/i386/boot0/boot0sio.s#2 integrate .. //depot/projects/netperf_socket/sys/cam/scsi/scsi_da.c#3 integrate .. //depot/projects/netperf_socket/sys/compat/ndis/ntoskrnl_var.h#8 integrate .. //depot/projects/netperf_socket/sys/compat/ndis/subr_hal.c#4 integrate .. //depot/projects/netperf_socket/sys/conf/NOTES#14 integrate .. //depot/projects/netperf_socket/sys/conf/files#18 integrate .. //depot/projects/netperf_socket/sys/conf/options#10 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/Osd/OsdTable.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_acad.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_pcib.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-lowlevel.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-pci.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/ciss/ciss.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/hfa/fore_load.c#3 delete .. //depot/projects/netperf_socket/sys/dev/pci/pci.c#4 integrate .. //depot/projects/netperf_socket/sys/geom/concat/g_concat.c#6 integrate .. //depot/projects/netperf_socket/sys/i386/isa/atpic.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/kern_thr.c#6 integrate .. //depot/projects/netperf_socket/sys/kern/kern_timeout.c#4 integrate .. //depot/projects/netperf_socket/sys/modules/cam/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/ipfilter/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/net/if.c#7 integrate .. //depot/projects/netperf_socket/sys/net/if_stf.c#5 integrate .. //depot/projects/netperf_socket/sys/net/radix.c#4 integrate .. //depot/projects/netperf_socket/sys/net/route.c#8 integrate .. //depot/projects/netperf_socket/sys/net/route.h#8 integrate .. //depot/projects/netperf_socket/sys/net/rtsock.c#6 integrate .. //depot/projects/netperf_socket/sys/netinet/in_pcb.c#7 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_subr.c#6 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_var.h#5 integrate .. //depot/projects/netperf_socket/sys/netinet6/nd6.c#4 integrate .. //depot/projects/netperf_socket/sys/netinet6/nd6_nbr.c#3 integrate .. //depot/projects/netperf_socket/sys/netipsec/xform_tcp.c#2 integrate .. //depot/projects/netperf_socket/sys/pci/amdpm.c#3 integrate .. //depot/projects/netperf_socket/sys/pci/if_sk.c#7 integrate .. //depot/projects/netperf_socket/sys/sys/callout.h#4 integrate .. //depot/projects/netperf_socket/sys/sys/types.h#4 integrate Differences ... ==== //depot/projects/netperf_socket/sys/boot/i386/boot0/boot0.s#2 (text+ko) ==== @@ -13,7 +13,7 @@ # purpose. # -# $FreeBSD: src/sys/boot/i386/boot0/boot0.s,v 1.29 2003/12/11 20:40:12 jhb Exp $ +# $FreeBSD: src/sys/boot/i386/boot0/boot0.s,v 1.30 2004/04/20 03:15:59 obrien Exp $ # A 512-byte boot manager. @@ -91,12 +91,12 @@ jnz main.1 # Yes testb %dl,%dl # Drive number valid? js main.2 # Possibly (0x80 set) -main.1: movb _SETDRV(%bp),%dl # Drive number to use +main.1: movb _SETDRV(%bp),%dl # Drive number to use # # Whatever we decided to use, now store it into the fake # partition entry that lives in the data space above us. # -main.2: movb %dl,_FAKE(%bp) # Save drive number +main.2: movb %dl,_FAKE(%bp) # Save drive number callw putn # To new line pushw %dx # Save drive number # @@ -112,7 +112,7 @@ # Loop around on the partition table, printing values until we # pass a 256 byte boundary. The end of loop test is at main.5. # -main.3: movb %ch,-0x4(%bx) # Zero active flag (ch == 0) +main.3: movb %ch,-0x4(%bx) # Zero active flag (ch == 0) btw %dx,_FLAGS(%bp) # Entry enabled? jnc main.5 # No # @@ -139,10 +139,10 @@ # pointing at its first element which points to a "?". # addw $TBL1SZ,%di # Adjust -main.4: movb (%di),%cl # Partition +main.4: movb (%di),%cl # Partition addw %cx,%di # description callw putx # Display it -main.5: incw %dx # Next item +main.5: incw %dx # Next item addb $0x10,%bl # Next entry jnc main.3 # Till done # @@ -170,7 +170,7 @@ # This also is part of the printed drive string so add 0x80 to indicate # end of string. # -main.6: addb $'0'|0x80,%al # Save next +main.6: addb $'0'|0x80,%al # Save next movb %al,_NXTDRV(%bp) # drive number movw $drive,%di # Display callw putx # item @@ -178,7 +178,7 @@ # Now that we've printed the drive (if we needed to), display a prompt. # Get ready for the input by noting the time. # -main.7: movw $prompt,%si # Display +main.7: movw $prompt,%si # Display callw putstr # prompt movb _OPT(%bp),%dl # Display decw %si # default @@ -191,7 +191,7 @@ # Busy loop, looking for keystrokes but # keeping one eye on the time. # -main.8: movb $0x1,%ah # BIOS: Check +main.8: movb $0x1,%ah # BIOS: Check int $0x16 # for keypress jnz main.11 # Have one xorb %ah,%ah # BIOS: Get @@ -201,7 +201,7 @@ # # If timed out or defaulting, come here. # -main.9: movb _OPT(%bp),%al # Load default +main.9: movb _OPT(%bp),%al # Load default jmp main.12 # Join common code # # User's last try was bad, beep in displeasure. @@ -296,7 +296,7 @@ # Display routines # -putkey: movb $'F',%al # Display +putkey: movb $'F',%al # Display callw putchr # 'F' movb $'1',%al # Prepare addb %dl,%al # digit @@ -315,14 +315,14 @@ putn: movw $crlf,%si # To next line -putstr: lodsb # Get byte +putstr: lodsb # Get byte testb $0x80,%al # End of string? jnz putstr.2 # Yes putstr.1: callw putchr # Display char jmp putstr # Continue putstr.2: andb $~0x80,%al # Clear MSB -putchr: pushw %bx # Save +putchr: pushw %bx # Save movw $0x7,%bx # Page:attribute movb $0xe,%ah # BIOS: Display int $0x10 # character @@ -331,7 +331,7 @@ # One-sector disk I/O routine -intx13: movb 0x1(%si),%dh # Load head +intx13: movb 0x1(%si),%dh # Load head movw 0x2(%si),%cx # Load cylinder:sector movb $0x1,%al # Sector count pushw %si # Save @@ -355,7 +355,7 @@ # Menu strings item: .ascii " "; .byte ' '|0x80 -prompt: .ascii "\nDefault:"; .byte ' '|0x80 +prompt: .ascii "\nDefault:"; .byte ' '|0x80 crlf: .ascii "\r"; .byte '\n'|0x80 # Partition type tables @@ -391,10 +391,10 @@ # the end of the string. (not so great for Russians but...) # os_misc: .ascii "?"; .byte '?'|0x80 -os_dos: .ascii "DO"; .byte 'S'|0x80 +os_dos: .ascii "DO"; .byte 'S'|0x80 os_linux: .ascii "Linu"; .byte 'x'|0x80 os_freebsd: .ascii "Free" -os_bsd: .ascii "BS"; .byte 'D'|0x80 +os_bsd: .ascii "BS"; .byte 'D'|0x80 .org PRT_OFF-0xe,0x90 @@ -406,14 +406,14 @@ # is part of the same string. # drive: .ascii "Drive " -nxtdrv: .byte 0x0 # Next drive number +nxtdrv: .byte 0x0 # Next drive number opt: .byte 0x0 # Option -setdrv: .byte 0x80 # Drive to force +setdrv: .byte 0x80 # Drive to force flags: .byte FLAGS # Flags ticks: .word TICKS # Delay # # here is the 64 byte partition table that fdisk would fiddle with. # -partbl: .fill 0x40,0x1,0x0 # Partition table +partbl: .fill 0x40,0x1,0x0 # Partition table .word MAGIC # Magic number ==== //depot/projects/netperf_socket/sys/boot/i386/boot0/boot0ext.s#2 (text+ko) ==== @@ -13,7 +13,7 @@ # purpose. # -# $FreeBSD: src/sys/boot/i386/boot0/boot0ext.s,v 1.1 2004/03/26 18:46:31 obrien Exp $ +# $FreeBSD: src/sys/boot/i386/boot0/boot0ext.s,v 1.5 2004/04/20 13:34:18 obrien Exp $ # A 1024-byte boot manager. @@ -34,6 +34,7 @@ .set KEY_ENTER,0x1c # Enter key scan code .set KEY_F1,0x3b # F1 key scan code + .set KEY_1,0x02 # #1 key scan code # # Flag bits @@ -45,7 +46,7 @@ # Addresses in the sector of embedded data values. # Accessed with negative offsets from the end of the relocated sectors (%bp). # - .set _PRT_END,(FAKE-(ORIGIN+SECTOR_SIZE)) + .set _PRT_END,(FAKE-(ORIGIN+SECTOR_SIZE*(NUM_SECTORS-1))) .set _NXTDRV,-(_PRT_END+0x48) # Next drive .set _OPT,-(_PRT_END+0x47) # Default option .set _SETDRV,-(_PRT_END+0x46) # Drive to force @@ -71,9 +72,9 @@ movw %ax,%ds # data movw %ax,%ss # Set up movw $LOAD,%sp # stack -# +# # End signature code -# +# # # Set address for variable space beyond code, and clear it. # Notice that this is also used to point to the values embedded in the block, @@ -86,8 +87,18 @@ stosw # them incb -0xe(%di) # Sector number 1 # +# Check what flags were loaded with us; specifically, use a predefined Drive. +# If what the bios gives us is bad, use the '0' in the block instead, as well. +# + testb $FL_SETDRV,LOAD+flags-start # Set number drive? + jnz boot.1 # Yes + testb %dl,%dl # Drive number valid? + js boot.2 # Possibly (0x80 set) +boot.1: movb LOAD+setdrv-start,%dl # Drive number to use +boot.2: +# # Reload all of boot0 (including the extra sectors) into memory at the -# relocation address. +# relocation address. # push %dx # Save drive number movw $start,%bx # Origin we were linked for @@ -100,19 +111,10 @@ # jmp main+ORIGIN-LOAD # To relocated code # -# Check what flags were loaded with us; specifically, use a predefined Drive. -# If what the bios gives us is bad, use the '0' in the block instead, as well. -# -main: testb $FL_SETDRV,_FLAGS(%bp) # Set number drive? - jnz main.1 # Yes - testb %dl,%dl # Drive number valid? - js main.2 # Possibly (0x80 set) -main.1: movb _SETDRV(%bp),%dl # Drive number to use -# # Whatever we decided to use, now store it into the fake # partition entry that lives in the data space above us. # -main.2: movb %dl,_FAKE(%bp) # Save drive number +main: movb %dl,_FAKE(%bp) # Save drive number callw putn # To new line pushw %dx # Save drive number # @@ -128,7 +130,7 @@ # Loop around on the partition table, printing values until we # pass a 256 byte boundary. The end of loop test is at main.5. # -main.3: movb %ch,-0x4(%bx) # Zero active flag (ch == 0) +main.3: movb %ch,-0x4(%bx) # Zero active flag (ch == 0) btw %dx,_FLAGS(%bp) # Entry enabled? jnc main.5 # No # @@ -155,16 +157,16 @@ # pointing at its first element which points to a "?". # addw $TBL1SZ,%di # Adjust -main.4: movb (%di),%cl # Partition +main.4: movb (%di),%cl # Partition addw %cx,%di # description callw putx # Display it -main.5: incw %dx # Next item +main.5: incw %dx # Next item addb $0x10,%bl # Next entry jnc main.3 # Till done # # Passed a 256 byte boundary.. # table is finished. -# Add one to the drive number and check it is valid, +# Add one to the drive number and check it is valid, # popw %ax # Drive number subb $0x80-0x1,%al # Does next @@ -186,7 +188,7 @@ # This also is part of the printed drive string so add 0x80 to indicate # end of string. # -main.6: addb $'0'|0x80,%al # Save next +main.6: addb $'0'|0x80,%al # Save next movb %al,_NXTDRV(%bp) # drive number movw $drive,%di # Display callw putx # item @@ -194,7 +196,7 @@ # Now that we've printed the drive (if we needed to), display a prompt. # Get ready for the input by noting the time. # -main.7: movw $prompt,%si # Display +main.7: movw $prompt,%si # Display callw putstr # prompt movb _OPT(%bp),%dl # Display decw %si # default @@ -203,11 +205,11 @@ int $0x1a # system time movw %dx,%di # Ticks when addw _TICKS(%bp),%di # timeout -# +# # Busy loop, looking for keystrokes but # keeping one eye on the time. # -main.8: movb $0x1,%ah # BIOS: Check +main.8: movb $0x1,%ah # BIOS: Check int $0x16 # for keypress jnz main.11 # Have one xorb %ah,%ah # BIOS: Get @@ -217,12 +219,12 @@ # # If timed out or defaulting, come here. # -main.9: movb _OPT(%bp),%al # Load default +main.9: movb _OPT(%bp),%al # Load default jmp main.12 # Join common code # # User's last try was bad, beep in displeasure. # Since nothing was printed, just continue on as if the user -# hadn't done anything. This gives the effect of the user getting a beep +# hadn't done anything. This gives the effect of the user getting a beep # for all bad keystrokes but no action until either the timeout # occurs or the user hits a good key. # @@ -245,6 +247,9 @@ # subb $KEY_F1,%al # Less F1 scan code cmpb $0x4,%al # F1..F5? + jna main.12 # Yes + subb $(KEY_1 - KEY_F1),%al # Less #1 scan code + cmpb $0x4,%al # #1..#5? ja main.10 # No # # We have a selection. @@ -263,7 +268,7 @@ movw $fake,%si # Partition for write movb (%si),%dl # Drive number movw %si,%bx # Partition for read - cmpb $0x4,%al # F5 pressed? + cmpb $0x4,%al # F5/#5 pressed? pushf # Save je main.13 # Yes shlb $0x4,%al # Point to @@ -285,10 +290,10 @@ # If going to next drive, replace drive with selected one. # Remember to un-ascii it. Hey 0x80 is already set, cool! # - jne main.15 # If not F5 + jne main.15 # If not F5/#5 movb _NXTDRV(%bp),%dl # Next drive subb $'0',%dl # number -# +# # load selected bootsector to the LOAD location in RAM. # If it fails to read or isn't marked bootable, treat it # as a bad selection. @@ -306,7 +311,7 @@ # Display routines # -putkey: movb $'F',%al # Display +putkey: movb $'F',%al # Display callw putchr # 'F' movb $'1',%al # Prepare addb %dl,%al # digit @@ -325,14 +330,14 @@ putn: movw $crlf,%si # To next line -putstr: lodsb # Get byte +putstr: lodsb # Get byte testb $0x80,%al # End of string? jnz putstr.2 # Yes putstr.1: callw putchr # Display char jmp putstr # Continue putstr.2: andb $~0x80,%al # Clear MSB -putchr: pushw %bx # Save +putchr: pushw %bx # Save movw $0x7,%bx # Page:attribute movb $0xe,%ah # BIOS: Display int $0x10 # character @@ -355,7 +360,7 @@ # to use the EDD stuff with the LBA offset instead of CHS. However, # use CHS if at all possible. -intx13: movb 0x1(%si),%dh # Load head +intx13: movb 0x1(%si),%dh # Load head movw 0x2(%si),%cx # Load cylinder:sector pushw %si # Save movw %sp,%di # Save @@ -400,25 +405,25 @@ .org PRT_OFF-0xe,0x90 # # These values are sometimes changed before writing back to the drive -# Be especially careful that nxtdrv: must come after drive:, as it +# Be especially careful that nxtdrv: must come after drive:, as it # is part of the same string. # # Note that the 'drive' string variable is used as the second signature # check in boot0cfg(8). # version_minor: .byte 0x1 # minor version -version_major: .byte 0x1 # major version +version_major: .byte 0x1 # major version drive: .ascii "Drive " -nxtdrv: .byte 0x0 # Next drive number +nxtdrv: .byte 0x0 # Next drive number opt: .byte 0x0 # Option -setdrv: .byte 0x80 # Drive to force +setdrv: .byte 0x80 # Drive to force flags: .byte FLAGS # Flags ticks: .word TICKS # Delay # # here is the 64 byte partition table that fdisk would fiddle with. # -partbl: .fill 0x40,0x1,0x0 # Partition table +partbl: .fill 0x40,0x1,0x0 # Partition table .word MAGIC # Magic number # @@ -428,7 +433,7 @@ # Menu strings item: .ascii " "; .byte ' '|0x80 -prompt: .ascii "\nDefault:"; .byte ' '|0x80 +prompt: .ascii "\nDefault:"; .byte ' '|0x80 crlf: .ascii "\r"; .byte '\n'|0x80 # Partition type tables @@ -442,7 +447,7 @@ # # These values indicate bootable types we know the names of # -table1: .byte 0x1, 0x4, 0x6, 0x7, 0xb, 0xc, 0xe, 0x63, 0x83 +table1: .byte 0x1, 0x4, 0x6, 0x7, 0xb, 0xc, 0xe, 0x42, 0x63, 0x83 .byte 0x9f, 0xa5, 0xa6, 0xa9 table1_end: # @@ -453,10 +458,11 @@ .byte os_dos-. # DOS .byte os_dos-. # DOS .byte os_dos-. # DOS - .byte os_nt-. # NT or OS/2 + .byte os_nt-. # NT/XP or OS/2 + .byte os_windows-. # Windows 32-bit FAT + .byte os_windows-. # Windows 32-bit FAT ext int 13 .byte os_windows-. # Windows - .byte os_windows-. # Windows - .byte os_windows-. # Windows + .byte os_windows-. # Windows 2000 dyn ext .byte os_unix-. # UNIX .byte os_linux-. # Linux .byte os_bsdos-. # BSD/OS @@ -464,13 +470,13 @@ .byte os_openbsd-. # OpenBSD .byte os_netbsd-. # NetBSD # -# And here are the strings themselves. 0x80 or'd into a byte indicates +# And here are the strings themselves. 0x80 or'd into a byte indicates # the end of the string. (not so great for Russians but...) # os_misc: .ascii "Unknow"; .byte 'n'|0x80 -os_dos: .ascii "DO"; .byte 'S'|0x80 -os_nt: .ascii "Windows N"; .byte 'T'|0x80 -os_windows: .ascii "Window"; .byte 's'|0x80 +os_dos: .ascii "DO"; .byte 'S'|0x80 +os_nt: .ascii "Windows NT/X"; .byte 'P'|0x80 +os_windows: .ascii "Window"; .byte 's'|0x80 os_unix: .ascii "UNI"; .byte 'X'|0x80 os_linux: .ascii "Linu"; .byte 'x'|0x80 os_freebsd: .ascii "FreeBS"; .byte 'D'|0x80 ==== //depot/projects/netperf_socket/sys/boot/i386/boot0/boot0sio.s#2 (text+ko) ==== @@ -14,7 +14,7 @@ # purpose. # -# $FreeBSD: src/sys/boot/i386/boot0/boot0sio.s,v 1.3 2004/01/06 18:46:35 obrien Exp $ +# $FreeBSD: src/sys/boot/i386/boot0/boot0sio.s,v 1.4 2004/04/20 03:15:59 obrien Exp $ # A 512-byte boot manager which uses a serial console on COM1. @@ -107,12 +107,12 @@ jnz main.1 # Yes testb %dl,%dl # Drive number valid? js main.2 # Possibly (0x80 set) -main.1: movb _SETDRV(%bp),%dl # Drive number to use +main.1: movb _SETDRV(%bp),%dl # Drive number to use # # Whatever we decided to use, now store it into the fake # partition entry that lives in the data space above us. # -main.2: movb %dl,_FAKE(%bp) # Save drive number +main.2: movb %dl,_FAKE(%bp) # Save drive number callw putn # To new line pushw %dx # Save drive number # @@ -128,7 +128,7 @@ # Loop around on the partition table, printing values until we # pass a 256 byte boundary. The end of loop test is at main.5. # -main.3: movb %ch,-0x4(%bx) # Zero active flag (ch == 0) +main.3: movb %ch,-0x4(%bx) # Zero active flag (ch == 0) btw %dx,_FLAGS(%bp) # Entry enabled? jnc main.5 # No # @@ -155,10 +155,10 @@ # pointing at its first element which points to a "?". # addw $TBL1SZ,%di # Adjust -main.4: movb (%di),%cl # Partition +main.4: movb (%di),%cl # Partition addw %cx,%di # description callw putx # Display it -main.5: incw %dx # Next item +main.5: incw %dx # Next item addb $0x10,%bl # Next entry jnc main.3 # Till done # @@ -186,7 +186,7 @@ # This also is part of the printed drive string so add 0x80 to indicate # end of string. # -main.6: addb $'0'|0x80,%al # Save next +main.6: addb $'0'|0x80,%al # Save next movb %al,_NXTDRV(%bp) # drive number movw $drive,%di # Display callw putx # item @@ -194,7 +194,7 @@ # Now that we've printed the drive (if we needed to), display a prompt. # Get ready for the input byte noting the time. # -main.7: movw $prompt,%si # Display +main.7: movw $prompt,%si # Display callw putstr # prompt movb _OPT(%bp),%dl # Display decw %si # default @@ -224,7 +224,7 @@ # # If timed out or defaulting, come here. # -main.9: movb _OPT(%bp),%al # Load default +main.9: movb _OPT(%bp),%al # Load default jmp main.12 # Join common code # # User's last try was bad, beep in displeasure. @@ -239,7 +239,7 @@ # # Check the character we just got on the serial port. # -main.11: movb $0x02,%ah # BIOS: Receive +main.11: movb $0x02,%ah # BIOS: Receive int $0x14 # COM Byte # # If it's CR act as if timed out. @@ -316,7 +316,7 @@ # Display routines # -putkey: movb $ASCII_1,%al # Prepare +putkey: movb $ASCII_1,%al # Prepare addb %dl,%al # digit jmp putstr.1 # Display the rest @@ -333,7 +333,7 @@ putn: movw $crlf,%si # To next line -putstr: lodsb # Get byte +putstr: lodsb # Get byte testb $0x80,%al # End of string? jnz putstr.2 # Yes putstr.1: callw putchr # Display char @@ -350,7 +350,7 @@ # One-sector disk I/O routine -intx13: movb 0x1(%si),%dh # Load head +intx13: movb 0x1(%si),%dh # Load head movw 0x2(%si),%cx # Load cylinder:sector movb $0x1,%al # Sector count pushw %si # Save @@ -374,7 +374,7 @@ # Menu strings item: .ascii " "; .byte ' '|0x80 -prompt: .ascii "\nDef:"; .byte ' '|0x80 +prompt: .ascii "\nDef:"; .byte ' '|0x80 crlf: .ascii "\r"; .byte '\n'|0x80 # Partition type tables @@ -410,10 +410,10 @@ # the end of the string. (not so great for Russians but...) # os_misc: .ascii "?"; .byte '?'|0x80 -os_dos: .ascii "DO"; .byte 'S'|0x80 +os_dos: .ascii "DO"; .byte 'S'|0x80 os_linux: .ascii "Linu"; .byte 'x'|0x80 os_freebsd: .ascii "Free" -os_bsd: .ascii "BS"; .byte 'D'|0x80 +os_bsd: .ascii "BS"; .byte 'D'|0x80 .org PRT_OFF-0xe,0x90 @@ -425,14 +425,14 @@ # is part of the same string. # drive: .ascii "Drive " -nxtdrv: .byte 0x0 # Next drive number +nxtdrv: .byte 0x0 # Next drive number opt: .byte 0x0 # Option -setdrv: .byte 0x80 # Drive to force +setdrv: .byte 0x80 # Drive to force flags: .byte FLAGS # Flags ticks: .word TICKS # Delay # # here is the 64 byte partition table that fdisk would fiddle with. # -partbl: .fill 0x40,0x1,0x0 # Partition table +partbl: .fill 0x40,0x1,0x0 # Partition table .word MAGIC # Magic number ==== //depot/projects/netperf_socket/sys/cam/scsi/scsi_da.c#3 (text+ko) ==== @@ -27,10 +27,9 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.164 2004/02/22 01:14:54 cperciva Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.167 2004/04/19 13:38:10 mux Exp $"); #ifdef _KERNEL -#include "opt_da.h" #include "opt_hw_wdog.h" #endif /* _KERNEL */ @@ -238,151 +237,55 @@ {T_DIRECT, SIP_MEDIA_FIXED, "COMPAQ", "RAID*", "*"}, /*quirks*/ DA_Q_NO_SYNC_CACHE }, -#ifdef DA_OLD_QUIRKS - /* USB floppy devices supported by umass(4) */ - { - /* - * This USB floppy drive uses the UFI command set. This - * command set is a derivative of the ATAPI command set and - * does not support READ_6 commands only READ_10. It also does - * not support sync cache (0x35). - */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "Y-E DATA", "USB-FDU", "*"}, - /*quirks*/ DA_Q_NO_SYNC_CACHE - }, - { - /* Another USB floppy */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "MATSHITA", "FDD CF-VFDU*","*"}, - /*quirks*/ DA_Q_NO_SYNC_CACHE - }, - { - /* - * The vendor, product and version strings coming from the - * controller are null terminated instead of being padded with - * spaces. The trailing wildcard character '*' is required. - */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "SMSC*", "USB FDC*","*"}, - /*quirks*/ DA_Q_NO_SYNC_CACHE - }, - { - /* - * SmartDisk (Mitsumi) USB floppy drive - * PR: kern/50226 - */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "MITSUMI", "USB FDD", "*"}, - /*quirks*/ DA_Q_NO_SYNC_CACHE - }, /* USB mass storage devices supported by umass(4) */ { /* - * Sony Memory Stick adapter MSAC-US1 and - * Sony PCG-C1VJ Internal Memory Stick Slot (MSC-U01). - * Make all sony MS* products use this quirk. + * EXATELECOM (Sigmatel) i-Bead 100/105 USB Flash MP3 Player + * PR: kern/51675 */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "Sony", "MS*", "*"}, + {T_DIRECT, SIP_MEDIA_REMOVABLE, "EXATEL", "i-BEAD10*", "*"}, /*quirks*/ DA_Q_NO_SYNC_CACHE }, { /* - * Sony Memory Stick adapter for the CLIE series - * of PalmOS PDA's + * Power Quotient Int. (PQI) USB flash key + * PR: kern/53067 */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "Sony", "CLIE*", "*"}, - /*quirks*/ DA_Q_NO_SYNC_CACHE - }, - { - /* - * Intelligent Stick USB disk-on-key - * PR: kern/53005 - */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "USB Card", - "IntelligentStick*", "*"}, - /*quirks*/ DA_Q_NO_SYNC_CACHE - }, - { - /* - * Sony DSC cameras (DSC-S30, DSC-S50, DSC-S70) - */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "Sony", "Sony DSC", "*"}, - /*quirks*/ DA_Q_NO_SYNC_CACHE - }, - { - /* - * Microtech USB CameraMate - */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "eUSB Compact*", - "Compact Flash*", "*"}, - /*quirks*/ DA_Q_NO_SYNC_CACHE - }, - { - /* - * Olympus digital cameras (C-3040ZOOM, C-2040ZOOM, C-1) - */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "OLYMPUS", "C-*", "*"}, - /*quirks*/ DA_Q_NO_SYNC_CACHE - }, - { - /* - * Olympus digital cameras (E-100RS, E-10). - */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "OLYMPUS", "E-*", "*"}, - /*quirks*/ DA_Q_NO_SYNC_CACHE - }, - { - /* - * KingByte Pen Drives - */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "NO BRAND", "PEN DRIVE", "*"}, - /*quirks*/ DA_Q_NO_SYNC_CACHE + {T_DIRECT, SIP_MEDIA_REMOVABLE, "Generic*", "USB Flash Disk*", + "*"}, /*quirks*/ DA_Q_NO_SYNC_CACHE + }, + { + /* + * Creative Nomad MUVO mp3 player (USB) + * PR: kern/53094 + */ + {T_DIRECT, SIP_MEDIA_REMOVABLE, "CREATIVE", "NOMAD_MUVO", "*"}, + /*quirks*/ DA_Q_NO_SYNC_CACHE|DA_Q_NO_PREVENT }, { /* - * Minolta Dimage E203 + * Jungsoft NEXDISK USB flash key + * PR: kern/54737 */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "MINOLTA", "DiMAGE E203", "*"}, + {T_DIRECT, SIP_MEDIA_REMOVABLE, "JUNGSOFT", "NEXDISK*", "*"}, /*quirks*/ DA_Q_NO_SYNC_CACHE }, { /* - * Daisy Technology PhotoClip on Zoran chip - * PR: kern/43580 + * FreeDik USB Mini Data Drive + * PR: kern/54786 */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "ZORAN", "COACH", "*"}, - /*quirks*/ DA_Q_NO_SYNC_CACHE + {T_DIRECT, SIP_MEDIA_REMOVABLE, "FreeDik*", "Mini Data Drive", + "*"}, /*quirks*/ DA_Q_NO_SYNC_CACHE }, { /* - * Sony USB Key-Storage - * PR: kern/46386 + * Sigmatel USB Flash MP3 Player + * PR: kern/57046 */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "Sony", "Storage Media", "*"}, - /*quirks*/ DA_Q_NO_SYNC_CACHE + {T_DIRECT, SIP_MEDIA_REMOVABLE, "SigmaTel", "MSCN", "*"}, + /*quirks*/ DA_Q_NO_SYNC_CACHE|DA_Q_NO_PREVENT }, -#endif /* DA_OLD_QUIRKS */ - { - /* - * EXATELECOM (Sigmatel) i-Bead 100/105 USB Flash MP3 Player - * PR: kern/51675 - */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "EXATEL", "i-BEAD10*", "*"}, - /*quirks*/ DA_Q_NO_SYNC_CACHE - }, - { - /* - * Jungsoft NEXDISK USB flash key - * PR: kern/54737 - */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "JUNGSOFT", "NEXDISK*", "*"}, - /*quirks*/ DA_Q_NO_SYNC_CACHE - }, - { - /* - * Creative Nomad MUVO mp3 player (USB) - * PR: kern/53094 - */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "CREATIVE", "NOMAD_MUVO", "*"}, - /*quirks*/ DA_Q_NO_SYNC_CACHE|DA_Q_NO_PREVENT - }, }; static disk_strategy_t dastrategy; ==== //depot/projects/netperf_socket/sys/compat/ndis/ntoskrnl_var.h#8 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/ndis/ntoskrnl_var.h,v 1.14 2004/04/16 00:04:28 wpaul Exp $ + * $FreeBSD: src/sys/compat/ndis/ntoskrnl_var.h,v 1.15 2004/04/20 02:27:38 wpaul Exp $ */ #ifndef _NTOSKRNL_VAR_H_ @@ -204,7 +204,7 @@ ((td)->td_proc->p_flag & P_KTHREAD == FALSE) #define AT_DISPATCH_LEVEL(td) \ - ((td)->td_priority == PI_REALTIME) + ((td)->td_base_pri == PI_REALTIME) #define AT_DIRQL_LEVEL(td) \ ((td)->td_priority <= PI_NET) ==== //depot/projects/netperf_socket/sys/compat/ndis/subr_hal.c#4 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_hal.c,v 1.11 2004/04/16 00:04:28 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_hal.c,v 1.12 2004/04/19 22:39:04 wpaul Exp $"); #include #include @@ -313,9 +313,13 @@ if (irql < hal_irql()) panic("IRQL_NOT_LESS_THAN"); + if (hal_irql() == DISPATCH_LEVEL) + return(DISPATCH_LEVEL); + mtx_lock_spin(&sched_lock); - oldirql = curthread->td_priority; + oldirql = curthread->td_base_pri; sched_prio(curthread, PI_REALTIME); + curthread->td_base_pri = PI_REALTIME; mtx_unlock_spin(&sched_lock); return(oldirql); @@ -328,10 +332,14 @@ __asm__ __volatile__ ("" : "=c" (oldirql)); + if (oldirql == DISPATCH_LEVEL) + return; + if (hal_irql() != DISPATCH_LEVEL) panic("IRQL_NOT_GREATER_THAN"); mtx_lock_spin(&sched_lock); + curthread->td_base_pri = oldirql; sched_prio(curthread, oldirql); mtx_unlock_spin(&sched_lock); ==== //depot/projects/netperf_socket/sys/conf/NOTES#14 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1214 2004/04/12 02:36:51 imp Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1217 2004/04/20 13:07:53 bms Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -618,6 +618,14 @@ # options TCP_DROP_SYNFIN #drop TCP packets with SYN+FIN +# TCP_SIGNATURE adds support for RFC 2385 (TCP-MD5) digests. These are +# carried in TCP option 19. This option is commonly used to protect +# TCP sessions (e.g. BGP) where IPSEC is not available nor desirable. +# This is enabled on a per-socket basis using the TCP_MD5SIG socket option. +# This requires the use of 'device crypto', 'options FAST_IPSEC', and +# 'device cryptodev' as it depends on the non-KAME IPSEC SADB code. +#options TCP_SIGNATURE #include support for RFC 2385 + # DUMMYNET enables the "dummynet" bandwidth limiter. You need # IPFIREWALL as well. See the dummynet(4) and ipfw(8) manpages for more info. # When you run DUMMYNET it is advisable to also have "options HZ=1000" @@ -968,12 +976,6 @@ options SCSI_NO_OP_STRINGS options SCSI_DELAY=8000 # Be pessimistic about Joe SCSI device -# Options for the CAM SCSI disk driver: -# DA_OLD_QUIRKS: Restore old USB and firewire quirks that have been -# deprecated. Please also email scsi@freebsd.org if you -# have a device that needs this option. -options DA_OLD_QUIRKS - # Options for the CAM CDROM driver: # CHANGER_MIN_BUSY_SECONDS: Guaranteed minimum time quantum for a changer LUN # CHANGER_MAX_BUSY_SECONDS: Maximum time quantum per changer LUN, only ==== //depot/projects/netperf_socket/sys/conf/files#18 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.886 2004/04/14 18:13:16 njl Exp $ +# $FreeBSD: src/sys/conf/files,v 1.888 2004/04/20 15:42:16 njl Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -450,7 +450,6 @@ dev/hfa/fore_if.c optional hfa dev/hfa/fore_init.c optional hfa dev/hfa/fore_intr.c optional hfa -#dev/hfa/fore_load.c optional hfa nowerror dev/hfa/fore_output.c optional hfa dev/hfa/fore_receive.c optional hfa dev/hfa/fore_stats.c optional hfa ==== //depot/projects/netperf_socket/sys/conf/options#10 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.440 2004/04/11 20:01:18 imp Exp $ +# $FreeBSD: src/sys/conf/options,v 1.441 2004/04/19 03:33:55 njl Exp $ # >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Apr 20 17:41:00 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0911816A4D0; Tue, 20 Apr 2004 17:41:00 -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 BD7DE16A4CE for ; Tue, 20 Apr 2004 17:40:59 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B640B43D39 for ; Tue, 20 Apr 2004 17:40:59 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i3L0exGe045973 for ; Tue, 20 Apr 2004 17:40:59 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i3L0exoi045969 for perforce@freebsd.org; Tue, 20 Apr 2004 17:40:59 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 20 Apr 2004 17:40:59 -0700 (PDT) Message-Id: <200404210040.i3L0exoi045969@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 51489 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: Wed, 21 Apr 2004 00:41:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=51489 Change 51489 by rwatson@rwatson_paprika on 2004/04/20 17:40:45 Integrate netperf_socket: - More ACPI madness. Affected files ... .. //depot/projects/netperf_socket/sys/dev/acpica/acpi.c#15 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_cpu.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpivar.h#9 integrate Differences ... ==== //depot/projects/netperf_socket/sys/dev/acpica/acpi.c#15 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.139 2004/04/16 16:27:37 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.140 2004/04/21 00:36:15 njl Exp $ */ #include "opt_acpi.h" @@ -1372,6 +1372,21 @@ } } +/* Find the difference between two PM tick counts. */ +uint32_t +acpi_TimerDelta(uint32_t end, uint32_t start) +{ + uint32_t delta; + + if (end >= start) + delta = end - start; + else if (AcpiGbl_FADT->TmrValExt == 0) + delta = (((0x00FFFFFF - start) + end + 1) & 0x00FFFFFF); + else + delta = ((0xFFFFFFFF - start) + end + 1); + return (delta); +} + /* * Allocate a buffer with a preset data size. */ ==== //depot/projects/netperf_socket/sys/dev/acpica/acpi_cpu.c#6 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_cpu.c,v 1.33 2004/04/09 18:14:32 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_cpu.c,v 1.34 2004/04/21 00:36:15 njl Exp $"); #include "opt_acpi.h" #include @@ -160,7 +160,6 @@ static void acpi_cpu_throttle_set(uint32_t speed); static void acpi_cpu_idle(void); static void acpi_cpu_c1(void); -static void acpi_pm_ticksub(uint32_t *end, const uint32_t *start); static void acpi_cpu_notify(ACPI_HANDLE h, UINT32 notify, void *context); static int acpi_cpu_quirks(struct acpi_cpu_softc *sc); static int acpi_cpu_throttle_sysctl(SYSCTL_HANDLER_ARGS); @@ -875,7 +874,7 @@ } /* Find the actual time asleep in microseconds, minus overhead. */ - acpi_pm_ticksub(&end_time, &start_time); + end_time = acpi_TimerDelta(end_time, start_time); asleep = PM_USEC(end_time) - cx_next->trans_lat; /* Record statistics */ @@ -915,18 +914,6 @@ #endif } -/* Find the difference between two PM tick counts. */ -static void -acpi_pm_ticksub(uint32_t *end, const uint32_t *start) -{ - if (*end >= *start) - *end = *end - *start; - else if (AcpiGbl_FADT->TmrValExt == 0) - *end = (((0x00FFFFFF - *start) + *end + 1) & 0x00FFFFFF); - else - *end = ((0xFFFFFFFF - *start) + *end + 1); -} - /* * Re-evaluate the _PSS and _CST objects when we are notified that they * have changed. ==== //depot/projects/netperf_socket/sys/dev/acpica/acpivar.h#9 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpivar.h,v 1.61 2004/04/14 03:39:08 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpivar.h,v 1.62 2004/04/21 00:36:15 njl Exp $ */ #include "bus_if.h" @@ -233,6 +233,7 @@ extern BOOLEAN acpi_MatchHid(device_t dev, char *hid); extern ACPI_STATUS acpi_GetHandleInScope(ACPI_HANDLE parent, char *path, ACPI_HANDLE *result); +extern uint32_t acpi_TimerDelta(uint32_t end, uint32_t start); extern ACPI_BUFFER *acpi_AllocBuffer(int size); extern ACPI_STATUS acpi_ConvertBufferToInteger(ACPI_BUFFER *bufp, UINT32 *number); From owner-p4-projects@FreeBSD.ORG Tue Apr 20 17:44:06 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B65B816A4D0; Tue, 20 Apr 2004 17:44:05 -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 74EF416A4CE for ; Tue, 20 Apr 2004 17:44:05 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6B75E43D48 for ; Tue, 20 Apr 2004 17:44:05 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i3L0i5Ge047856 for ; Tue, 20 Apr 2004 17:44:05 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i3L0i51T047853 for perforce@freebsd.org; Tue, 20 Apr 2004 17:44:05 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 20 Apr 2004 17:44:05 -0700 (PDT) Message-Id: <200404210044.i3L0i51T047853@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 51492 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: Wed, 21 Apr 2004 00:44:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=51492 Change 51492 by rwatson@rwatson_paprika on 2004/04/20 17:43:09 Integrate netperf_socket: More ACPI cleanup. Affected files ... .. //depot/projects/netperf_socket/sys/dev/acpica/acpi.c#16 integrate Differences ... ==== //depot/projects/netperf_socket/sys/dev/acpica/acpi.c#16 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.140 2004/04/21 00:36:15 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.141 2004/04/21 00:38:54 njl Exp $ */ #include "opt_acpi.h" @@ -1381,7 +1381,7 @@ if (end >= start) delta = end - start; else if (AcpiGbl_FADT->TmrValExt == 0) - delta = (((0x00FFFFFF - start) + end + 1) & 0x00FFFFFF); + delta = ((0x00FFFFFF - start) + end + 1) & 0x00FFFFFF; else delta = ((0xFFFFFFFF - start) + end + 1); return (delta); From owner-p4-projects@FreeBSD.ORG Wed Apr 21 05:11:21 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C80D316A4D5; Wed, 21 Apr 2004 05:11:21 -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 8377D16A4D2 for ; Wed, 21 Apr 2004 05:11:21 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 66B8743D2F for ; Wed, 21 Apr 2004 05:11:21 -0700 (PDT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i3LCBLGe045830 for ; Wed, 21 Apr 2004 05:11:21 -0700 (PDT) (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i3LCBLRU045823 for perforce@freebsd.org; Wed, 21 Apr 2004 05:11:21 -0700 (PDT) (envelope-from areisse@nailabs.com) Date: Wed, 21 Apr 2004 05:11:21 -0700 (PDT) Message-Id: <200404211211.i3LCBLRU045823@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Subject: PERFORCE change 51513 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: Wed, 21 Apr 2004 12:11:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=51513 Change 51513 by areisse@areisse_ibook on 2004/04/21 05:10:44 bring extattr commands over to sedarwin 7.3. Affected files ... .. //depot/projects/trustedbsd/sedarwin73/extattr_cmds/Makefile#1 branch .. //depot/projects/trustedbsd/sedarwin73/extattr_cmds/extattrcmds.c#1 branch .. //depot/projects/trustedbsd/sedarwin73/extattr_cmds/extattrctl.8#1 branch .. //depot/projects/trustedbsd/sedarwin73/extattr_cmds/extattrctl.c#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Wed Apr 21 05:15:28 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B985816A4D0; Wed, 21 Apr 2004 05:15:27 -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 88B2C16A4CE for ; Wed, 21 Apr 2004 05:15:27 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6BA3E43D4C for ; Wed, 21 Apr 2004 05:15:27 -0700 (PDT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i3LCFRGe046939 for ; Wed, 21 Apr 2004 05:15:27 -0700 (PDT) (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i3LCFQAv046936 for perforce@freebsd.org; Wed, 21 Apr 2004 05:15:26 -0700 (PDT) (envelope-from areisse@nailabs.com) Date: Wed, 21 Apr 2004 05:15:26 -0700 (PDT) Message-Id: <200404211215.i3LCFQAv046936@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Subject: PERFORCE change 51515 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: Wed, 21 Apr 2004 12:15:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=51515 Change 51515 by areisse@areisse_ibook on 2004/04/21 05:14:58 bring libextattr over to sedarwin 7.3. Affected files ... .. //depot/projects/trustedbsd/sedarwin73/libextattr/Makefile#1 branch .. //depot/projects/trustedbsd/sedarwin73/libextattr/extattr.c#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Wed Apr 21 05:17:31 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E423616A4D0; Wed, 21 Apr 2004 05:17:30 -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 A875316A4CE for ; Wed, 21 Apr 2004 05:17:30 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A234843D5D for ; Wed, 21 Apr 2004 05:17:30 -0700 (PDT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i3LCHUGe046993 for ; Wed, 21 Apr 2004 05:17:30 -0700 (PDT) (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i3LCHUlT046990 for perforce@freebsd.org; Wed, 21 Apr 2004 05:17:30 -0700 (PDT) (envelope-from areisse@nailabs.com) Date: Wed, 21 Apr 2004 05:17:30 -0700 (PDT) Message-Id: <200404211217.i3LCHUlT046990@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Subject: PERFORCE change 51516 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: Wed, 21 Apr 2004 12:17:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=51516 Change 51516 by areisse@areisse_ibook on 2004/04/21 05:17:24 renumber syscalls Affected files ... .. //depot/projects/trustedbsd/sedarwin73/libextattr/extattr.c#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin73/libextattr/extattr.c#2 (text+ko) ==== @@ -74,76 +74,76 @@ int extattrctl(const char *_path, int _cmd, const char *_filename, int _attrnamespace, const char *_attrname) { - return syscall (350, _path, _cmd, _filename, _attrnamespace, _attrname); + return syscall (370, _path, _cmd, _filename, _attrnamespace, _attrname); } int extattr_delete_fd(int _fd, int _attrnamespace, const char *_attrname) { - return syscall (356, _fd, _attrnamespace, _attrname); + return syscall (376, _fd, _attrnamespace, _attrname); } int extattr_delete_file(const char *_path, int _attrnamespace, const char *_attrname) { - return syscall (353, _path, _attrnamespace, _attrname); + return syscall (373, _path, _attrnamespace, _attrname); } int extattr_delete_link(const char *_path, int _attrnamespace, const char *_attrname) { - return syscall (359, _path, _attrnamespace, _attrname); + return syscall (379, _path, _attrnamespace, _attrname); } ssize_t extattr_get_fd(int _fd, int _attrnamespace, const char *_attrname, void *_data, size_t _nbytes) { - return syscall (355, _fd, _attrnamespace, _attrname, _data, _nbytes); + return syscall (375, _fd, _attrnamespace, _attrname, _data, _nbytes); } ssize_t extattr_get_file(const char *_path, int _attrnamespace, const char *_attrname, void *_data, size_t _nbytes) { - return syscall (352, _path, _attrnamespace, _attrname, _data, _nbytes); + return syscall (372, _path, _attrnamespace, _attrname, _data, _nbytes); } ssize_t extattr_get_link(const char *_path, int _attrnamespace, const char *_attrname, void *_data, size_t _nbytes) { - return syscall (358, _path, _attrnamespace, _attrname, _data, _nbytes); + return syscall (378, _path, _attrnamespace, _attrname, _data, _nbytes); } int extattr_set_fd(int _fd, int _attrnamespace, const char *_attrname, const void *_data, size_t _nbytes) { - return syscall (354, _fd, _attrnamespace, _attrname, _data, _nbytes); + return syscall (374, _fd, _attrnamespace, _attrname, _data, _nbytes); } int extattr_set_file(const char *_path, int _attrnamespace, const char *_attrname, const void *_data, size_t _nbytes) { - return syscall (351, _path, _attrnamespace, _attrname, _data, _nbytes); + return syscall (371, _path, _attrnamespace, _attrname, _data, _nbytes); } int extattr_set_link(const char *_path, int _attrnamespace, const char *_attrname, const void *_data, size_t _nbytes) { - return syscall (357, _path, _attrnamespace, _attrname, _data, _nbytes); + return syscall (377, _path, _attrnamespace, _attrname, _data, _nbytes); } ssize_t extattr_list_file(const char *_path, int _attrnamespace, void *_data, size_t _nbytes) { - return syscall (361, _path, _attrnamespace, _data, _nbytes); + return syscall (381, _path, _attrnamespace, _data, _nbytes); } ssize_t extattr_list_link(const char *_path, int _attrnamespace, void *_data, size_t _nbytes) { - return syscall (362, _path, _attrnamespace, _data, _nbytes); + return syscall (382, _path, _attrnamespace, _data, _nbytes); } ssize_t extattr_list_fd(int fd, int _attrnamespace, void *_data, size_t _nbytes) { - return syscall (360, fd, _attrnamespace, _data, _nbytes); + return syscall (380, fd, _attrnamespace, _data, _nbytes); } From owner-p4-projects@FreeBSD.ORG Thu Apr 22 10:38:58 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8944516A4D0; Thu, 22 Apr 2004 10:38:58 -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 2D15A16A4CF for ; Thu, 22 Apr 2004 10:38:58 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 20BCC43D41 for ; Thu, 22 Apr 2004 10:38:58 -0700 (PDT) (envelope-from imp@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 i3MHcvGe070835 for ; Thu, 22 Apr 2004 10:38:57 -0700 (PDT) (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i3MHcuva070830 for perforce@freebsd.org; Thu, 22 Apr 2004 10:38:56 -0700 (PDT) (envelope-from imp@freebsd.org) Date: Thu, 22 Apr 2004 10:38:56 -0700 (PDT) Message-Id: <200404221738.i3MHcuva070830@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Subject: PERFORCE change 51574 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: Thu, 22 Apr 2004 17:38:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=51574 Change 51574 by imp@imp_pacopaco on 2004/04/22 10:38:07 IFC @51569 Affected files ... .. //depot/projects/power/sys/amd64/acpica/acpi_machdep.c#3 integrate .. //depot/projects/power/sys/boot/i386/boot0/boot0.s#4 integrate .. //depot/projects/power/sys/boot/i386/boot0/boot0ext.s#2 integrate .. //depot/projects/power/sys/boot/i386/boot0/boot0sio.s#3 integrate .. //depot/projects/power/sys/cam/scsi/scsi_da.c#6 integrate .. //depot/projects/power/sys/compat/ndis/kern_ndis.c#9 integrate .. //depot/projects/power/sys/compat/ndis/ntoskrnl_var.h#4 integrate .. //depot/projects/power/sys/compat/ndis/subr_hal.c#5 integrate .. //depot/projects/power/sys/conf/NOTES#13 integrate .. //depot/projects/power/sys/conf/files#11 integrate .. //depot/projects/power/sys/conf/options#13 integrate .. //depot/projects/power/sys/dev/acpica/Osd/OsdTable.c#4 integrate .. //depot/projects/power/sys/dev/acpica/acpi.c#20 integrate .. //depot/projects/power/sys/dev/acpica/acpi_acad.c#6 integrate .. //depot/projects/power/sys/dev/acpica/acpi_cpu.c#7 integrate .. //depot/projects/power/sys/dev/acpica/acpi_pcib.c#6 integrate .. //depot/projects/power/sys/dev/acpica/acpi_timer.c#4 integrate .. //depot/projects/power/sys/dev/acpica/acpivar.h#12 integrate .. //depot/projects/power/sys/dev/asr/asr.c#4 integrate .. //depot/projects/power/sys/dev/ata/ata-chipset.c#10 integrate .. //depot/projects/power/sys/dev/ata/ata-lowlevel.c#8 integrate .. //depot/projects/power/sys/dev/ata/ata-pci.c#8 integrate .. //depot/projects/power/sys/dev/ata/ata-pci.h#7 integrate .. //depot/projects/power/sys/dev/ciss/ciss.c#8 integrate .. //depot/projects/power/sys/dev/ciss/cissreg.h#4 integrate .. //depot/projects/power/sys/dev/hfa/fore_load.c#3 delete .. //depot/projects/power/sys/dev/if_ndis/if_ndis.c#8 integrate .. //depot/projects/power/sys/dev/pci/pci.c#13 integrate .. //depot/projects/power/sys/dev/sound/pci/cmi.c#5 integrate .. //depot/projects/power/sys/geom/concat/g_concat.c#2 integrate .. //depot/projects/power/sys/i386/acpica/acpi_machdep.c#5 integrate .. //depot/projects/power/sys/i386/conf/GENERIC#8 integrate .. //depot/projects/power/sys/i386/isa/atpic.c#4 integrate .. //depot/projects/power/sys/ia64/acpica/acpi_machdep.c#2 integrate .. //depot/projects/power/sys/kern/kern_thr.c#4 integrate .. //depot/projects/power/sys/kern/kern_timeout.c#7 integrate .. //depot/projects/power/sys/kern/vfs_export.c#3 integrate .. //depot/projects/power/sys/kern/vfs_syscalls.c#8 integrate .. //depot/projects/power/sys/modules/acpi/acpi/Makefile#4 integrate .. //depot/projects/power/sys/modules/asr/Makefile#2 integrate .. //depot/projects/power/sys/modules/cam/Makefile#3 integrate .. //depot/projects/power/sys/modules/ipfilter/Makefile#3 integrate .. //depot/projects/power/sys/net/if.c#10 integrate .. //depot/projects/power/sys/net/radix.c#5 integrate .. //depot/projects/power/sys/net/route.c#10 integrate .. //depot/projects/power/sys/net/route.h#8 integrate .. //depot/projects/power/sys/net/rtsock.c#7 integrate .. //depot/projects/power/sys/netinet/in_pcb.c#8 integrate .. //depot/projects/power/sys/netinet/tcp_subr.c#12 integrate .. //depot/projects/power/sys/netinet/tcp_var.h#6 integrate .. //depot/projects/power/sys/netinet6/nd6.c#8 integrate .. //depot/projects/power/sys/netinet6/nd6_nbr.c#5 integrate .. //depot/projects/power/sys/netipsec/xform_tcp.c#2 integrate .. //depot/projects/power/sys/pci/amdpm.c#4 integrate .. //depot/projects/power/sys/pci/if_sk.c#9 integrate .. //depot/projects/power/sys/powerpc/include/param.h#4 integrate .. //depot/projects/power/sys/powerpc/include/pmap.h#6 integrate .. //depot/projects/power/sys/sys/callout.h#4 integrate .. //depot/projects/power/sys/sys/types.h#4 integrate Differences ... ==== //depot/projects/power/sys/amd64/acpica/acpi_machdep.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.12 2003/09/22 22:12:46 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.13 2004/04/21 02:10:58 njl Exp $"); #include #include @@ -40,8 +40,7 @@ { struct acpi_softc *sc; - if ((sc = device_get_softc(dev)) == NULL) - return (ENXIO); + sc = device_get_softc(dev); acpi_install_wakeup_handler(sc); ==== //depot/projects/power/sys/boot/i386/boot0/boot0.s#4 (text+ko) ==== @@ -13,7 +13,7 @@ # purpose. # -# $FreeBSD: src/sys/boot/i386/boot0/boot0.s,v 1.29 2003/12/11 20:40:12 jhb Exp $ +# $FreeBSD: src/sys/boot/i386/boot0/boot0.s,v 1.30 2004/04/20 03:15:59 obrien Exp $ # A 512-byte boot manager. @@ -91,12 +91,12 @@ jnz main.1 # Yes testb %dl,%dl # Drive number valid? js main.2 # Possibly (0x80 set) -main.1: movb _SETDRV(%bp),%dl # Drive number to use +main.1: movb _SETDRV(%bp),%dl # Drive number to use # # Whatever we decided to use, now store it into the fake # partition entry that lives in the data space above us. # -main.2: movb %dl,_FAKE(%bp) # Save drive number +main.2: movb %dl,_FAKE(%bp) # Save drive number callw putn # To new line pushw %dx # Save drive number # @@ -112,7 +112,7 @@ # Loop around on the partition table, printing values until we # pass a 256 byte boundary. The end of loop test is at main.5. # -main.3: movb %ch,-0x4(%bx) # Zero active flag (ch == 0) +main.3: movb %ch,-0x4(%bx) # Zero active flag (ch == 0) btw %dx,_FLAGS(%bp) # Entry enabled? jnc main.5 # No # @@ -139,10 +139,10 @@ # pointing at its first element which points to a "?". # addw $TBL1SZ,%di # Adjust -main.4: movb (%di),%cl # Partition +main.4: movb (%di),%cl # Partition addw %cx,%di # description callw putx # Display it -main.5: incw %dx # Next item +main.5: incw %dx # Next item addb $0x10,%bl # Next entry jnc main.3 # Till done # @@ -170,7 +170,7 @@ # This also is part of the printed drive string so add 0x80 to indicate # end of string. # -main.6: addb $'0'|0x80,%al # Save next +main.6: addb $'0'|0x80,%al # Save next movb %al,_NXTDRV(%bp) # drive number movw $drive,%di # Display callw putx # item @@ -178,7 +178,7 @@ # Now that we've printed the drive (if we needed to), display a prompt. # Get ready for the input by noting the time. # -main.7: movw $prompt,%si # Display +main.7: movw $prompt,%si # Display callw putstr # prompt movb _OPT(%bp),%dl # Display decw %si # default @@ -191,7 +191,7 @@ # Busy loop, looking for keystrokes but # keeping one eye on the time. # -main.8: movb $0x1,%ah # BIOS: Check +main.8: movb $0x1,%ah # BIOS: Check int $0x16 # for keypress jnz main.11 # Have one xorb %ah,%ah # BIOS: Get @@ -201,7 +201,7 @@ # # If timed out or defaulting, come here. # -main.9: movb _OPT(%bp),%al # Load default +main.9: movb _OPT(%bp),%al # Load default jmp main.12 # Join common code # # User's last try was bad, beep in displeasure. @@ -296,7 +296,7 @@ # Display routines # -putkey: movb $'F',%al # Display +putkey: movb $'F',%al # Display callw putchr # 'F' movb $'1',%al # Prepare addb %dl,%al # digit @@ -315,14 +315,14 @@ putn: movw $crlf,%si # To next line -putstr: lodsb # Get byte +putstr: lodsb # Get byte testb $0x80,%al # End of string? jnz putstr.2 # Yes putstr.1: callw putchr # Display char jmp putstr # Continue putstr.2: andb $~0x80,%al # Clear MSB -putchr: pushw %bx # Save +putchr: pushw %bx # Save movw $0x7,%bx # Page:attribute movb $0xe,%ah # BIOS: Display int $0x10 # character @@ -331,7 +331,7 @@ # One-sector disk I/O routine -intx13: movb 0x1(%si),%dh # Load head +intx13: movb 0x1(%si),%dh # Load head movw 0x2(%si),%cx # Load cylinder:sector movb $0x1,%al # Sector count pushw %si # Save @@ -355,7 +355,7 @@ # Menu strings item: .ascii " "; .byte ' '|0x80 -prompt: .ascii "\nDefault:"; .byte ' '|0x80 +prompt: .ascii "\nDefault:"; .byte ' '|0x80 crlf: .ascii "\r"; .byte '\n'|0x80 # Partition type tables @@ -391,10 +391,10 @@ # the end of the string. (not so great for Russians but...) # os_misc: .ascii "?"; .byte '?'|0x80 -os_dos: .ascii "DO"; .byte 'S'|0x80 +os_dos: .ascii "DO"; .byte 'S'|0x80 os_linux: .ascii "Linu"; .byte 'x'|0x80 os_freebsd: .ascii "Free" -os_bsd: .ascii "BS"; .byte 'D'|0x80 +os_bsd: .ascii "BS"; .byte 'D'|0x80 .org PRT_OFF-0xe,0x90 @@ -406,14 +406,14 @@ # is part of the same string. # drive: .ascii "Drive " -nxtdrv: .byte 0x0 # Next drive number +nxtdrv: .byte 0x0 # Next drive number opt: .byte 0x0 # Option -setdrv: .byte 0x80 # Drive to force +setdrv: .byte 0x80 # Drive to force flags: .byte FLAGS # Flags ticks: .word TICKS # Delay # # here is the 64 byte partition table that fdisk would fiddle with. # -partbl: .fill 0x40,0x1,0x0 # Partition table +partbl: .fill 0x40,0x1,0x0 # Partition table .word MAGIC # Magic number ==== //depot/projects/power/sys/boot/i386/boot0/boot0ext.s#2 (text+ko) ==== @@ -13,7 +13,7 @@ # purpose. # -# $FreeBSD: src/sys/boot/i386/boot0/boot0ext.s,v 1.1 2004/03/26 18:46:31 obrien Exp $ +# $FreeBSD: src/sys/boot/i386/boot0/boot0ext.s,v 1.5 2004/04/20 13:34:18 obrien Exp $ # A 1024-byte boot manager. @@ -34,6 +34,7 @@ .set KEY_ENTER,0x1c # Enter key scan code .set KEY_F1,0x3b # F1 key scan code + .set KEY_1,0x02 # #1 key scan code # # Flag bits @@ -45,7 +46,7 @@ # Addresses in the sector of embedded data values. # Accessed with negative offsets from the end of the relocated sectors (%bp). # - .set _PRT_END,(FAKE-(ORIGIN+SECTOR_SIZE)) + .set _PRT_END,(FAKE-(ORIGIN+SECTOR_SIZE*(NUM_SECTORS-1))) .set _NXTDRV,-(_PRT_END+0x48) # Next drive .set _OPT,-(_PRT_END+0x47) # Default option .set _SETDRV,-(_PRT_END+0x46) # Drive to force @@ -71,9 +72,9 @@ movw %ax,%ds # data movw %ax,%ss # Set up movw $LOAD,%sp # stack -# +# # End signature code -# +# # # Set address for variable space beyond code, and clear it. # Notice that this is also used to point to the values embedded in the block, @@ -86,8 +87,18 @@ stosw # them incb -0xe(%di) # Sector number 1 # +# Check what flags were loaded with us; specifically, use a predefined Drive. +# If what the bios gives us is bad, use the '0' in the block instead, as well. +# + testb $FL_SETDRV,LOAD+flags-start # Set number drive? + jnz boot.1 # Yes + testb %dl,%dl # Drive number valid? + js boot.2 # Possibly (0x80 set) +boot.1: movb LOAD+setdrv-start,%dl # Drive number to use +boot.2: +# # Reload all of boot0 (including the extra sectors) into memory at the -# relocation address. +# relocation address. # push %dx # Save drive number movw $start,%bx # Origin we were linked for @@ -100,19 +111,10 @@ # jmp main+ORIGIN-LOAD # To relocated code # -# Check what flags were loaded with us; specifically, use a predefined Drive. -# If what the bios gives us is bad, use the '0' in the block instead, as well. -# -main: testb $FL_SETDRV,_FLAGS(%bp) # Set number drive? - jnz main.1 # Yes - testb %dl,%dl # Drive number valid? - js main.2 # Possibly (0x80 set) -main.1: movb _SETDRV(%bp),%dl # Drive number to use -# # Whatever we decided to use, now store it into the fake # partition entry that lives in the data space above us. # -main.2: movb %dl,_FAKE(%bp) # Save drive number +main: movb %dl,_FAKE(%bp) # Save drive number callw putn # To new line pushw %dx # Save drive number # @@ -128,7 +130,7 @@ # Loop around on the partition table, printing values until we # pass a 256 byte boundary. The end of loop test is at main.5. # -main.3: movb %ch,-0x4(%bx) # Zero active flag (ch == 0) +main.3: movb %ch,-0x4(%bx) # Zero active flag (ch == 0) btw %dx,_FLAGS(%bp) # Entry enabled? jnc main.5 # No # @@ -155,16 +157,16 @@ # pointing at its first element which points to a "?". # addw $TBL1SZ,%di # Adjust -main.4: movb (%di),%cl # Partition +main.4: movb (%di),%cl # Partition addw %cx,%di # description callw putx # Display it -main.5: incw %dx # Next item +main.5: incw %dx # Next item addb $0x10,%bl # Next entry jnc main.3 # Till done # # Passed a 256 byte boundary.. # table is finished. -# Add one to the drive number and check it is valid, +# Add one to the drive number and check it is valid, # popw %ax # Drive number subb $0x80-0x1,%al # Does next @@ -186,7 +188,7 @@ # This also is part of the printed drive string so add 0x80 to indicate # end of string. # -main.6: addb $'0'|0x80,%al # Save next +main.6: addb $'0'|0x80,%al # Save next movb %al,_NXTDRV(%bp) # drive number movw $drive,%di # Display callw putx # item @@ -194,7 +196,7 @@ # Now that we've printed the drive (if we needed to), display a prompt. # Get ready for the input by noting the time. # -main.7: movw $prompt,%si # Display +main.7: movw $prompt,%si # Display callw putstr # prompt movb _OPT(%bp),%dl # Display decw %si # default @@ -203,11 +205,11 @@ int $0x1a # system time movw %dx,%di # Ticks when addw _TICKS(%bp),%di # timeout -# +# # Busy loop, looking for keystrokes but # keeping one eye on the time. # -main.8: movb $0x1,%ah # BIOS: Check +main.8: movb $0x1,%ah # BIOS: Check int $0x16 # for keypress jnz main.11 # Have one xorb %ah,%ah # BIOS: Get @@ -217,12 +219,12 @@ # # If timed out or defaulting, come here. # -main.9: movb _OPT(%bp),%al # Load default +main.9: movb _OPT(%bp),%al # Load default jmp main.12 # Join common code # # User's last try was bad, beep in displeasure. # Since nothing was printed, just continue on as if the user -# hadn't done anything. This gives the effect of the user getting a beep +# hadn't done anything. This gives the effect of the user getting a beep # for all bad keystrokes but no action until either the timeout # occurs or the user hits a good key. # @@ -245,6 +247,9 @@ # subb $KEY_F1,%al # Less F1 scan code cmpb $0x4,%al # F1..F5? + jna main.12 # Yes + subb $(KEY_1 - KEY_F1),%al # Less #1 scan code + cmpb $0x4,%al # #1..#5? ja main.10 # No # # We have a selection. @@ -263,7 +268,7 @@ movw $fake,%si # Partition for write movb (%si),%dl # Drive number movw %si,%bx # Partition for read - cmpb $0x4,%al # F5 pressed? + cmpb $0x4,%al # F5/#5 pressed? pushf # Save je main.13 # Yes shlb $0x4,%al # Point to @@ -285,10 +290,10 @@ # If going to next drive, replace drive with selected one. # Remember to un-ascii it. Hey 0x80 is already set, cool! # - jne main.15 # If not F5 + jne main.15 # If not F5/#5 movb _NXTDRV(%bp),%dl # Next drive subb $'0',%dl # number -# +# # load selected bootsector to the LOAD location in RAM. # If it fails to read or isn't marked bootable, treat it # as a bad selection. @@ -306,7 +311,7 @@ # Display routines # -putkey: movb $'F',%al # Display +putkey: movb $'F',%al # Display callw putchr # 'F' movb $'1',%al # Prepare addb %dl,%al # digit @@ -325,14 +330,14 @@ putn: movw $crlf,%si # To next line -putstr: lodsb # Get byte +putstr: lodsb # Get byte testb $0x80,%al # End of string? jnz putstr.2 # Yes putstr.1: callw putchr # Display char jmp putstr # Continue putstr.2: andb $~0x80,%al # Clear MSB -putchr: pushw %bx # Save +putchr: pushw %bx # Save movw $0x7,%bx # Page:attribute movb $0xe,%ah # BIOS: Display int $0x10 # character @@ -355,7 +360,7 @@ # to use the EDD stuff with the LBA offset instead of CHS. However, # use CHS if at all possible. -intx13: movb 0x1(%si),%dh # Load head +intx13: movb 0x1(%si),%dh # Load head movw 0x2(%si),%cx # Load cylinder:sector pushw %si # Save movw %sp,%di # Save @@ -400,25 +405,25 @@ .org PRT_OFF-0xe,0x90 # # These values are sometimes changed before writing back to the drive -# Be especially careful that nxtdrv: must come after drive:, as it +# Be especially careful that nxtdrv: must come after drive:, as it # is part of the same string. # # Note that the 'drive' string variable is used as the second signature # check in boot0cfg(8). # version_minor: .byte 0x1 # minor version -version_major: .byte 0x1 # major version +version_major: .byte 0x1 # major version drive: .ascii "Drive " -nxtdrv: .byte 0x0 # Next drive number +nxtdrv: .byte 0x0 # Next drive number opt: .byte 0x0 # Option -setdrv: .byte 0x80 # Drive to force +setdrv: .byte 0x80 # Drive to force flags: .byte FLAGS # Flags ticks: .word TICKS # Delay # # here is the 64 byte partition table that fdisk would fiddle with. # -partbl: .fill 0x40,0x1,0x0 # Partition table +partbl: .fill 0x40,0x1,0x0 # Partition table .word MAGIC # Magic number # @@ -428,7 +433,7 @@ # Menu strings item: .ascii " "; .byte ' '|0x80 -prompt: .ascii "\nDefault:"; .byte ' '|0x80 +prompt: .ascii "\nDefault:"; .byte ' '|0x80 crlf: .ascii "\r"; .byte '\n'|0x80 # Partition type tables @@ -442,7 +447,7 @@ # # These values indicate bootable types we know the names of # -table1: .byte 0x1, 0x4, 0x6, 0x7, 0xb, 0xc, 0xe, 0x63, 0x83 +table1: .byte 0x1, 0x4, 0x6, 0x7, 0xb, 0xc, 0xe, 0x42, 0x63, 0x83 .byte 0x9f, 0xa5, 0xa6, 0xa9 table1_end: # @@ -453,10 +458,11 @@ .byte os_dos-. # DOS .byte os_dos-. # DOS .byte os_dos-. # DOS - .byte os_nt-. # NT or OS/2 + .byte os_nt-. # NT/XP or OS/2 + .byte os_windows-. # Windows 32-bit FAT + .byte os_windows-. # Windows 32-bit FAT ext int 13 .byte os_windows-. # Windows - .byte os_windows-. # Windows - .byte os_windows-. # Windows + .byte os_windows-. # Windows 2000 dyn ext .byte os_unix-. # UNIX .byte os_linux-. # Linux .byte os_bsdos-. # BSD/OS @@ -464,13 +470,13 @@ .byte os_openbsd-. # OpenBSD .byte os_netbsd-. # NetBSD # -# And here are the strings themselves. 0x80 or'd into a byte indicates +# And here are the strings themselves. 0x80 or'd into a byte indicates # the end of the string. (not so great for Russians but...) # os_misc: .ascii "Unknow"; .byte 'n'|0x80 -os_dos: .ascii "DO"; .byte 'S'|0x80 -os_nt: .ascii "Windows N"; .byte 'T'|0x80 -os_windows: .ascii "Window"; .byte 's'|0x80 +os_dos: .ascii "DO"; .byte 'S'|0x80 +os_nt: .ascii "Windows NT/X"; .byte 'P'|0x80 +os_windows: .ascii "Window"; .byte 's'|0x80 os_unix: .ascii "UNI"; .byte 'X'|0x80 os_linux: .ascii "Linu"; .byte 'x'|0x80 os_freebsd: .ascii "FreeBS"; .byte 'D'|0x80 ==== //depot/projects/power/sys/boot/i386/boot0/boot0sio.s#3 (text+ko) ==== @@ -14,7 +14,7 @@ # purpose. # -# $FreeBSD: src/sys/boot/i386/boot0/boot0sio.s,v 1.3 2004/01/06 18:46:35 obrien Exp $ +# $FreeBSD: src/sys/boot/i386/boot0/boot0sio.s,v 1.4 2004/04/20 03:15:59 obrien Exp $ # A 512-byte boot manager which uses a serial console on COM1. @@ -107,12 +107,12 @@ jnz main.1 # Yes testb %dl,%dl # Drive number valid? js main.2 # Possibly (0x80 set) -main.1: movb _SETDRV(%bp),%dl # Drive number to use +main.1: movb _SETDRV(%bp),%dl # Drive number to use # # Whatever we decided to use, now store it into the fake # partition entry that lives in the data space above us. # -main.2: movb %dl,_FAKE(%bp) # Save drive number +main.2: movb %dl,_FAKE(%bp) # Save drive number callw putn # To new line pushw %dx # Save drive number # @@ -128,7 +128,7 @@ # Loop around on the partition table, printing values until we # pass a 256 byte boundary. The end of loop test is at main.5. # -main.3: movb %ch,-0x4(%bx) # Zero active flag (ch == 0) +main.3: movb %ch,-0x4(%bx) # Zero active flag (ch == 0) btw %dx,_FLAGS(%bp) # Entry enabled? jnc main.5 # No # @@ -155,10 +155,10 @@ # pointing at its first element which points to a "?". # addw $TBL1SZ,%di # Adjust -main.4: movb (%di),%cl # Partition +main.4: movb (%di),%cl # Partition addw %cx,%di # description callw putx # Display it -main.5: incw %dx # Next item +main.5: incw %dx # Next item addb $0x10,%bl # Next entry jnc main.3 # Till done # @@ -186,7 +186,7 @@ # This also is part of the printed drive string so add 0x80 to indicate # end of string. # -main.6: addb $'0'|0x80,%al # Save next +main.6: addb $'0'|0x80,%al # Save next movb %al,_NXTDRV(%bp) # drive number movw $drive,%di # Display callw putx # item @@ -194,7 +194,7 @@ # Now that we've printed the drive (if we needed to), display a prompt. # Get ready for the input byte noting the time. # -main.7: movw $prompt,%si # Display +main.7: movw $prompt,%si # Display callw putstr # prompt movb _OPT(%bp),%dl # Display decw %si # default @@ -224,7 +224,7 @@ # # If timed out or defaulting, come here. # -main.9: movb _OPT(%bp),%al # Load default +main.9: movb _OPT(%bp),%al # Load default jmp main.12 # Join common code # # User's last try was bad, beep in displeasure. @@ -239,7 +239,7 @@ # # Check the character we just got on the serial port. # -main.11: movb $0x02,%ah # BIOS: Receive +main.11: movb $0x02,%ah # BIOS: Receive int $0x14 # COM Byte # # If it's CR act as if timed out. @@ -316,7 +316,7 @@ # Display routines # -putkey: movb $ASCII_1,%al # Prepare +putkey: movb $ASCII_1,%al # Prepare addb %dl,%al # digit jmp putstr.1 # Display the rest @@ -333,7 +333,7 @@ putn: movw $crlf,%si # To next line -putstr: lodsb # Get byte +putstr: lodsb # Get byte testb $0x80,%al # End of string? jnz putstr.2 # Yes putstr.1: callw putchr # Display char @@ -350,7 +350,7 @@ # One-sector disk I/O routine -intx13: movb 0x1(%si),%dh # Load head +intx13: movb 0x1(%si),%dh # Load head movw 0x2(%si),%cx # Load cylinder:sector movb $0x1,%al # Sector count pushw %si # Save @@ -374,7 +374,7 @@ # Menu strings item: .ascii " "; .byte ' '|0x80 -prompt: .ascii "\nDef:"; .byte ' '|0x80 +prompt: .ascii "\nDef:"; .byte ' '|0x80 crlf: .ascii "\r"; .byte '\n'|0x80 # Partition type tables @@ -410,10 +410,10 @@ # the end of the string. (not so great for Russians but...) # os_misc: .ascii "?"; .byte '?'|0x80 -os_dos: .ascii "DO"; .byte 'S'|0x80 +os_dos: .ascii "DO"; .byte 'S'|0x80 os_linux: .ascii "Linu"; .byte 'x'|0x80 os_freebsd: .ascii "Free" -os_bsd: .ascii "BS"; .byte 'D'|0x80 +os_bsd: .ascii "BS"; .byte 'D'|0x80 .org PRT_OFF-0xe,0x90 @@ -425,14 +425,14 @@ # is part of the same string. # drive: .ascii "Drive " -nxtdrv: .byte 0x0 # Next drive number +nxtdrv: .byte 0x0 # Next drive number opt: .byte 0x0 # Option -setdrv: .byte 0x80 # Drive to force +setdrv: .byte 0x80 # Drive to force flags: .byte FLAGS # Flags ticks: .word TICKS # Delay # # here is the 64 byte partition table that fdisk would fiddle with. # -partbl: .fill 0x40,0x1,0x0 # Partition table +partbl: .fill 0x40,0x1,0x0 # Partition table .word MAGIC # Magic number ==== //depot/projects/power/sys/cam/scsi/scsi_da.c#6 (text+ko) ==== @@ -27,10 +27,9 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.166 2004/04/19 04:14:09 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.167 2004/04/19 13:38:10 mux Exp $"); #ifdef _KERNEL -#include "opt_da.h" #include "opt_hw_wdog.h" #endif /* _KERNEL */ ==== //depot/projects/power/sys/compat/ndis/kern_ndis.c#9 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.52 2004/04/16 00:04:28 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.53 2004/04/22 07:08:39 wpaul Exp $"); #include #include @@ -99,6 +99,7 @@ int np_state; }; +static void ndis_return(void *); static int ndis_create_kthreads(void); static void ndis_destroy_kthreads(void); static void ndis_stop_thread(int); @@ -724,16 +725,37 @@ return(0); } +static void +ndis_return(arg) + void *arg; +{ + struct ndis_softc *sc; + __stdcall ndis_return_handler returnfunc; + ndis_handle adapter; + ndis_packet *p; + uint8_t irql; + + p = arg; + sc = p->np_softc; + adapter = sc->ndis_block.nmb_miniportadapterctx; + + if (adapter == NULL) + return; + + returnfunc = sc->ndis_chars.nmc_return_packet_func; + irql = FASTCALL1(hal_raise_irql, DISPATCH_LEVEL); + returnfunc(adapter, p); + FASTCALL1(hal_lower_irql, irql); + + return; +} + void ndis_return_packet(buf, arg) void *buf; /* not used */ void *arg; { - struct ndis_softc *sc; - ndis_handle adapter; ndis_packet *p; - __stdcall ndis_return_handler returnfunc; - uint8_t irql; if (arg == NULL) return; @@ -747,14 +769,7 @@ if (p->np_refcnt) return; - sc = p->np_softc; - returnfunc = sc->ndis_chars.nmc_return_packet_func; - adapter = sc->ndis_block.nmb_miniportadapterctx; - if (adapter != NULL) { - irql = FASTCALL1(hal_raise_irql, DISPATCH_LEVEL); - returnfunc(adapter, p); - FASTCALL1(hal_lower_irql, irql); - } + ndis_sched(ndis_return, p, NDIS_SWI); return; } ==== //depot/projects/power/sys/compat/ndis/ntoskrnl_var.h#4 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/ndis/ntoskrnl_var.h,v 1.14 2004/04/16 00:04:28 wpaul Exp $ + * $FreeBSD: src/sys/compat/ndis/ntoskrnl_var.h,v 1.15 2004/04/20 02:27:38 wpaul Exp $ */ #ifndef _NTOSKRNL_VAR_H_ @@ -204,7 +204,7 @@ ((td)->td_proc->p_flag & P_KTHREAD == FALSE) #define AT_DISPATCH_LEVEL(td) \ - ((td)->td_priority == PI_REALTIME) + ((td)->td_base_pri == PI_REALTIME) #define AT_DIRQL_LEVEL(td) \ ((td)->td_priority <= PI_NET) ==== //depot/projects/power/sys/compat/ndis/subr_hal.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_hal.c,v 1.11 2004/04/16 00:04:28 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_hal.c,v 1.12 2004/04/19 22:39:04 wpaul Exp $"); #include #include @@ -313,9 +313,13 @@ if (irql < hal_irql()) panic("IRQL_NOT_LESS_THAN"); + if (hal_irql() == DISPATCH_LEVEL) + return(DISPATCH_LEVEL); + mtx_lock_spin(&sched_lock); - oldirql = curthread->td_priority; + oldirql = curthread->td_base_pri; sched_prio(curthread, PI_REALTIME); + curthread->td_base_pri = PI_REALTIME; mtx_unlock_spin(&sched_lock); return(oldirql); @@ -328,10 +332,14 @@ __asm__ __volatile__ ("" : "=c" (oldirql)); + if (oldirql == DISPATCH_LEVEL) + return; + if (hal_irql() != DISPATCH_LEVEL) panic("IRQL_NOT_GREATER_THAN"); mtx_lock_spin(&sched_lock); + curthread->td_base_pri = oldirql; sched_prio(curthread, oldirql); mtx_unlock_spin(&sched_lock); ==== //depot/projects/power/sys/conf/NOTES#13 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1215 2004/04/19 03:33:54 njl Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1219 2004/04/21 20:18:06 scottl Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -27,7 +27,7 @@ # order. All device and option lines must be described by a comment that # doesn't just expand the device or option name. Use only a concise # comment on the same line if possible. Very detailed descriptions of -# devices and subsystems belong in manpages. +# devices and subsystems belong in man pages. # # A space followed by a tab separates 'options' from an option name. Two # spaces followed by a tab separate 'device' from a device name. Comments @@ -189,7 +189,7 @@ options WITNESS_SKIPSPIN # MUTEX_PROFILING - Profiling mutual exclusion locks (mutexes). See -# the MUTEX_PROFILING(9) manual page for details. +# MUTEX_PROFILING(9) for details. options MUTEX_PROFILING @@ -570,8 +570,8 @@ # from traceroute and similar tools. # # PFIL_HOOKS enables an abtraction layer which is meant to be used in -# network code where filtering is required. See the pfil(9) man page. -# This option is required by the IPFILTER option and the PF device. +# network code where filtering is required. See pfil(9). This option is +# required by the IPFILTER option and the PF device. # # TCPDEBUG enables code which keeps traces of the TCP state machine # for sockets with the SO_DEBUG option set, which can then be examined @@ -597,8 +597,7 @@ # The MBUF_STRESS_TEST option enables options which create # various random failures / extreme cases related to mbuf -# functions. See the mbuf(9) manpage for a list of available -# test cases. +# functions. See mbuf(9) for a list of available test cases. options MBUF_STRESS_TEST # RANDOM_IP_ID causes the ID field in IP packets to be randomized @@ -618,10 +617,18 @@ # options TCP_DROP_SYNFIN #drop TCP packets with SYN+FIN -# DUMMYNET enables the "dummynet" bandwidth limiter. You need -# IPFIREWALL as well. See the dummynet(4) and ipfw(8) manpages for more info. -# When you run DUMMYNET it is advisable to also have "options HZ=1000" -# to achieve a smoother scheduling of the traffic. +# TCP_SIGNATURE adds support for RFC 2385 (TCP-MD5) digests. These are +# carried in TCP option 19. This option is commonly used to protect +# TCP sessions (e.g. BGP) where IPSEC is not available nor desirable. +# This is enabled on a per-socket basis using the TCP_MD5SIG socket option. +# This requires the use of 'device crypto', 'options FAST_IPSEC', and +# 'device cryptodev' as it depends on the non-KAME IPSEC SADB code. +#options TCP_SIGNATURE #include support for RFC 2385 + +# DUMMYNET enables the "dummynet" bandwidth limiter. You need IPFIREWALL +# as well. See dummynet(4) and ipfw(8) for more info. When you run +# DUMMYNET it is advisable to also have "options HZ=1000" to achieve a +# smoother scheduling of the traffic. # # BRIDGE enables bridging between ethernet cards -- see bridge(4). # You can use IPFIREWALL and DUMMYNET together with bridging. @@ -1264,15 +1271,14 @@ # Aic7xxx driver debugging options. See sys/dev/aic7xxx/aic7xxx.h options AHC_DEBUG_OPTS -# Print register bitfields in debug output. Adds ~128k to driver. -# See the ahc(4) manpage +# Print register bitfields in debug output. Adds ~128k to driver +# See ahc(4). options AHC_REG_PRETTY_PRINT # Compile in aic79xx debugging code. options AHD_DEBUG -# Aic79xx driver debugging options. Adds ~215k to driver. -# See the ahd(4) manpage +# Aic79xx driver debugging options. Adds ~215k to driver. See ahd(4). options AHD_DEBUG_OPTS=0xFFFFFFFF # Print human-readable register definitions when debugging @@ -1756,8 +1762,7 @@ # # This has support for a large number of new audio cards, based on # CS423x, OPTi931, Yamaha OPL-SAx, and also for SB16, GusPnP. -# For more information about this driver and supported cards, -# see the pcm.4 man page. +# For more information about this driver and supported cards, see pcm(4). # # The flags of the device tells the device a bit more info about the # device that normally is obtained through the PnP interface. @@ -2401,8 +2406,6 @@ # items in loops, etc. # Yet more undocumented options for linting. -# Broken: -##options ASR_MEASURE_PERFORMANCE # BKTR_ALLOC_PAGES has no effect except to cause warnings, and # BROOKTREE_ALLOC_PAGES hasn't actually been superseded by it, since the # driver still mostly spells this option BROOKTREE_ALLOC_PAGES. ==== //depot/projects/power/sys/conf/files#11 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.886 2004/04/14 18:13:16 njl Exp $ +# $FreeBSD: src/sys/conf/files,v 1.888 2004/04/20 15:42:16 njl Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -450,7 +450,6 @@ dev/hfa/fore_if.c optional hfa dev/hfa/fore_init.c optional hfa dev/hfa/fore_intr.c optional hfa -#dev/hfa/fore_load.c optional hfa nowerror dev/hfa/fore_output.c optional hfa dev/hfa/fore_receive.c optional hfa dev/hfa/fore_stats.c optional hfa ==== //depot/projects/power/sys/conf/options#13 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.441 2004/04/19 03:33:55 njl Exp $ +# $FreeBSD: src/sys/conf/options,v 1.442 2004/04/21 20:18:06 scottl Exp $ # # On the handling of kernel options # @@ -413,9 +413,6 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Apr 22 20:16:53 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5686316A4D0; Thu, 22 Apr 2004 20:16:53 -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 25B1516A4CE for ; Thu, 22 Apr 2004 20:16:53 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 19CC443D48 for ; Thu, 22 Apr 2004 20:16:53 -0700 (PDT) (envelope-from marcel@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 i3N3GrGe008989 for ; Thu, 22 Apr 2004 20:16:53 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i3N3Gpat008986 for perforce@freebsd.org; Thu, 22 Apr 2004 20:16:51 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Thu, 22 Apr 2004 20:16:51 -0700 (PDT) Message-Id: <200404230316.i3N3Gpat008986@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 51596 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, 23 Apr 2004 03:16:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=51596 Change 51596 by marcel@marcel_nfs on 2004/04/22 20:16:19 IFC @51595 Affected files ... .. //depot/projects/gdb/UPDATING#11 integrate .. //depot/projects/gdb/bin/df/df.1#4 integrate .. //depot/projects/gdb/bin/df/df.c#7 integrate .. //depot/projects/gdb/crypto/openssh/.cvsignore#1 branch .. //depot/projects/gdb/crypto/openssh/ChangeLog#3 integrate .. //depot/projects/gdb/crypto/openssh/README#3 integrate .. //depot/projects/gdb/crypto/openssh/acconfig.h#3 integrate .. //depot/projects/gdb/crypto/openssh/auth-krb5.c#3 integrate .. //depot/projects/gdb/crypto/openssh/auth-pam.c#3 integrate .. //depot/projects/gdb/crypto/openssh/auth-pam.h#3 integrate .. //depot/projects/gdb/crypto/openssh/auth-passwd.c#3 integrate .. //depot/projects/gdb/crypto/openssh/auth-sia.c#3 integrate .. //depot/projects/gdb/crypto/openssh/auth-sia.h#2 integrate .. //depot/projects/gdb/crypto/openssh/auth-skey.c#2 integrate .. //depot/projects/gdb/crypto/openssh/auth.h#3 integrate .. //depot/projects/gdb/crypto/openssh/auth1.c#3 integrate .. //depot/projects/gdb/crypto/openssh/auth2.c#3 integrate .. //depot/projects/gdb/crypto/openssh/canohost.c#3 integrate .. //depot/projects/gdb/crypto/openssh/config.h#3 integrate .. //depot/projects/gdb/crypto/openssh/configure.ac#3 integrate .. //depot/projects/gdb/crypto/openssh/contrib/Makefile#1 branch .. //depot/projects/gdb/crypto/openssh/contrib/README#1 branch .. //depot/projects/gdb/crypto/openssh/contrib/aix/README#1 branch .. //depot/projects/gdb/crypto/openssh/contrib/aix/buildbff.sh#1 branch .. //depot/projects/gdb/crypto/openssh/contrib/aix/inventory.sh#1 branch .. //depot/projects/gdb/crypto/openssh/contrib/aix/pam.conf#1 branch .. //depot/projects/gdb/crypto/openssh/contrib/caldera/openssh.spec#1 branch .. //depot/projects/gdb/crypto/openssh/contrib/caldera/ssh-host-keygen#1 branch .. //depot/projects/gdb/crypto/openssh/contrib/caldera/sshd.init#1 branch .. //depot/projects/gdb/crypto/openssh/contrib/caldera/sshd.pam#1 branch .. //depot/projects/gdb/crypto/openssh/contrib/cygwin/Makefile#1 branch .. //depot/projects/gdb/crypto/openssh/contrib/cygwin/README#1 branch .. //depot/projects/gdb/crypto/openssh/contrib/cygwin/ssh-host-config#1 branch .. //depot/projects/gdb/crypto/openssh/contrib/cygwin/ssh-user-config#1 branch .. //depot/projects/gdb/crypto/openssh/contrib/findssl.sh#1 branch .. //depot/projects/gdb/crypto/openssh/contrib/gnome-ssh-askpass1.c#1 branch .. //depot/projects/gdb/crypto/openssh/contrib/gnome-ssh-askpass2.c#1 branch .. //depot/projects/gdb/crypto/openssh/contrib/hpux/README#1 branch .. //depot/projects/gdb/crypto/openssh/contrib/hpux/egd#1 branch .. //depot/projects/gdb/crypto/openssh/contrib/hpux/egd.rc#1 branch .. //depot/projects/gdb/crypto/openssh/contrib/hpux/sshd#1 branch .. //depot/projects/gdb/crypto/openssh/contrib/hpux/sshd.rc#1 branch .. //depot/projects/gdb/crypto/openssh/contrib/redhat/gnome-ssh-askpass.csh#1 branch .. //depot/projects/gdb/crypto/openssh/contrib/redhat/gnome-ssh-askpass.sh#1 branch .. //depot/projects/gdb/crypto/openssh/contrib/redhat/openssh.spec#1 branch .. //depot/projects/gdb/crypto/openssh/contrib/redhat/sshd.init#1 branch .. //depot/projects/gdb/crypto/openssh/contrib/redhat/sshd.pam#1 branch .. //depot/projects/gdb/crypto/openssh/contrib/solaris/README#1 branch .. //depot/projects/gdb/crypto/openssh/contrib/solaris/buildpkg.sh#1 branch .. //depot/projects/gdb/crypto/openssh/contrib/solaris/opensshd.in#1 branch .. //depot/projects/gdb/crypto/openssh/contrib/ssh-copy-id#1 branch .. //depot/projects/gdb/crypto/openssh/contrib/ssh-copy-id.1#1 branch .. //depot/projects/gdb/crypto/openssh/contrib/sshd.pam.freebsd#1 branch .. //depot/projects/gdb/crypto/openssh/contrib/sshd.pam.generic#1 branch .. //depot/projects/gdb/crypto/openssh/contrib/suse/openssh.spec#1 branch .. //depot/projects/gdb/crypto/openssh/contrib/suse/rc.config.sshd#1 branch .. //depot/projects/gdb/crypto/openssh/contrib/suse/rc.sshd#1 branch .. //depot/projects/gdb/crypto/openssh/defines.h#3 integrate .. //depot/projects/gdb/crypto/openssh/dh.c#3 integrate .. //depot/projects/gdb/crypto/openssh/gss-serv-krb5.c#3 integrate .. //depot/projects/gdb/crypto/openssh/loginrec.c#3 integrate .. //depot/projects/gdb/crypto/openssh/monitor.c#3 integrate .. //depot/projects/gdb/crypto/openssh/monitor_wrap.c#3 integrate .. //depot/projects/gdb/crypto/openssh/monitor_wrap.h#3 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/.cvsignore#1 branch .. //depot/projects/gdb/crypto/openssh/openbsd-compat/bsd-cygwin_util.c#2 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/bsd-misc.h#3 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/fake-rfc2553.h#4 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/setenv.c#3 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/xcrypt.c#3 integrate .. //depot/projects/gdb/crypto/openssh/readconf.c#3 integrate .. //depot/projects/gdb/crypto/openssh/readconf.h#3 integrate .. //depot/projects/gdb/crypto/openssh/regress/Makefile#3 integrate .. //depot/projects/gdb/crypto/openssh/regress/README.regress#3 integrate .. //depot/projects/gdb/crypto/openssh/regress/dynamic-forward.sh#2 integrate .. //depot/projects/gdb/crypto/openssh/regress/login-timeout.sh#1 branch .. //depot/projects/gdb/crypto/openssh/regress/sftp-cmds.sh#3 integrate .. //depot/projects/gdb/crypto/openssh/regress/ssh-com-client.sh#2 integrate .. //depot/projects/gdb/crypto/openssh/regress/ssh-com-keygen.sh#2 integrate .. //depot/projects/gdb/crypto/openssh/regress/ssh-com-sftp.sh#2 integrate .. //depot/projects/gdb/crypto/openssh/regress/ssh-com.sh#3 integrate .. //depot/projects/gdb/crypto/openssh/regress/test-exec.sh#3 integrate .. //depot/projects/gdb/crypto/openssh/regress/try-ciphers.sh#2 integrate .. //depot/projects/gdb/crypto/openssh/scard/.cvsignore#1 branch .. //depot/projects/gdb/crypto/openssh/scp.1#3 integrate .. //depot/projects/gdb/crypto/openssh/session.c#3 integrate .. //depot/projects/gdb/crypto/openssh/sftp-client.c#3 integrate .. //depot/projects/gdb/crypto/openssh/sftp.1#3 integrate .. //depot/projects/gdb/crypto/openssh/sftp.c#3 integrate .. //depot/projects/gdb/crypto/openssh/ssh-agent.c#3 integrate .. //depot/projects/gdb/crypto/openssh/ssh-keyscan.c#3 integrate .. //depot/projects/gdb/crypto/openssh/ssh.1#3 integrate .. //depot/projects/gdb/crypto/openssh/ssh.c#3 integrate .. //depot/projects/gdb/crypto/openssh/ssh_config#3 integrate .. //depot/projects/gdb/crypto/openssh/ssh_config.5#3 integrate .. //depot/projects/gdb/crypto/openssh/sshconnect2.c#3 integrate .. //depot/projects/gdb/crypto/openssh/sshd.c#3 integrate .. //depot/projects/gdb/crypto/openssh/sshd_config#5 integrate .. //depot/projects/gdb/crypto/openssh/sshd_config.5#5 integrate .. //depot/projects/gdb/crypto/openssh/sshlogin.c#2 integrate .. //depot/projects/gdb/crypto/openssh/version.h#3 integrate .. //depot/projects/gdb/etc/defaults/periodic.conf#2 integrate .. //depot/projects/gdb/etc/mtree/BSD.local.dist#5 integrate .. //depot/projects/gdb/etc/mtree/BSD.usr.dist#6 integrate .. //depot/projects/gdb/etc/periodic/security/610.ipf6denied#1 branch .. //depot/projects/gdb/etc/rc.d/ipfilter#5 integrate .. //depot/projects/gdb/etc/rc.d/ipmon#4 integrate .. //depot/projects/gdb/games/fortune/datfiles/fortunes#4 integrate .. //depot/projects/gdb/games/fortune/datfiles/fortunes.sp.ok#2 integrate .. //depot/projects/gdb/games/fortune/datfiles/fortunes2#3 integrate .. //depot/projects/gdb/gnu/lib/libg2c/Makefile#2 integrate .. //depot/projects/gdb/gnu/lib/libg2c/config.h#2 integrate .. //depot/projects/gdb/include/ctype.h#2 integrate .. //depot/projects/gdb/lib/Makefile#5 integrate .. //depot/projects/gdb/lib/libarchive/archive_entry.c#8 integrate .. //depot/projects/gdb/lib/libarchive/archive_platform.h#7 integrate .. //depot/projects/gdb/lib/libarchive/archive_read_extract.c#6 integrate .. //depot/projects/gdb/lib/libarchive/archive_read_support_format_tar.c#9 integrate .. //depot/projects/gdb/lib/libarchive/archive_write_set_format_pax.c#9 integrate .. //depot/projects/gdb/lib/libarchive/archive_write_set_format_shar.c#6 integrate .. //depot/projects/gdb/lib/libarchive/archive_write_set_format_ustar.c#7 integrate .. //depot/projects/gdb/lib/libc/gen/getpwent.c#3 integrate .. //depot/projects/gdb/lib/libc/net/res_query.c#2 integrate .. //depot/projects/gdb/lib/libc/stdio/vfprintf.c#4 integrate .. //depot/projects/gdb/lib/libc/stdio/vfwprintf.c#4 integrate .. //depot/projects/gdb/lib/libc/sys/kqueue.2#2 integrate .. //depot/projects/gdb/lib/libdisk/chunk.c#3 integrate .. //depot/projects/gdb/lib/libdisk/create_chunk.c#3 integrate .. //depot/projects/gdb/lib/libdisk/disk.c#3 integrate .. //depot/projects/gdb/lib/libdisk/libdisk.h#4 integrate .. //depot/projects/gdb/lib/libdisk/open_disk.c#4 integrate .. //depot/projects/gdb/lib/libdisk/write_powerpc_disk.c#1 branch .. //depot/projects/gdb/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#12 integrate .. //depot/projects/gdb/sbin/fsck_msdosfs/boot.c#2 integrate .. //depot/projects/gdb/share/colldef/Makefile#5 integrate .. //depot/projects/gdb/share/man/man4/acpi.4#4 integrate .. //depot/projects/gdb/share/man/man4/ip.4#2 integrate .. //depot/projects/gdb/share/man/man4/man4.i386/acpi_asus.4#1 branch .. //depot/projects/gdb/share/man/man4/ng_ether.4#2 integrate .. //depot/projects/gdb/share/mk/sys.mk#3 integrate .. //depot/projects/gdb/share/mklocale/Makefile#4 integrate .. //depot/projects/gdb/share/monetdef/Makefile#6 integrate .. //depot/projects/gdb/share/monetdef/he_IL.UTF-8.src#1 branch .. //depot/projects/gdb/share/msgdef/Makefile#5 integrate .. //depot/projects/gdb/share/msgdef/he_IL.UTF-8.src#1 branch .. //depot/projects/gdb/share/numericdef/Makefile#5 integrate .. //depot/projects/gdb/share/timedef/Makefile#6 integrate .. //depot/projects/gdb/share/timedef/he_IL.UTF-8.src#1 branch .. //depot/projects/gdb/sys/amd64/acpica/acpi_machdep.c#2 integrate .. //depot/projects/gdb/sys/boot/i386/boot0/boot0.s#2 integrate .. //depot/projects/gdb/sys/boot/i386/boot0/boot0ext.s#3 integrate .. //depot/projects/gdb/sys/boot/i386/boot0/boot0sio.s#2 integrate .. //depot/projects/gdb/sys/compat/ndis/kern_ndis.c#12 integrate .. //depot/projects/gdb/sys/compat/ndis/ntoskrnl_var.h#8 integrate .. //depot/projects/gdb/sys/conf/NOTES#13 integrate .. //depot/projects/gdb/sys/conf/files#17 integrate .. //depot/projects/gdb/sys/conf/files.i386#11 integrate .. //depot/projects/gdb/sys/conf/options#13 integrate .. //depot/projects/gdb/sys/dev/acpica/Osd/OsdTable.c#3 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi.c#13 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_acad.c#4 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_cpu.c#5 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_timer.c#5 integrate .. //depot/projects/gdb/sys/dev/acpica/acpivar.h#9 integrate .. //depot/projects/gdb/sys/dev/asr/asr.c#4 integrate .. //depot/projects/gdb/sys/dev/ata/ata-chipset.c#6 integrate .. //depot/projects/gdb/sys/dev/ata/ata-pci.c#5 integrate .. //depot/projects/gdb/sys/dev/ata/ata-pci.h#6 integrate .. //depot/projects/gdb/sys/dev/ciss/cissreg.h#3 integrate .. //depot/projects/gdb/sys/dev/hfa/fore_load.c#3 delete .. //depot/projects/gdb/sys/dev/if_ndis/if_ndis.c#11 integrate .. //depot/projects/gdb/sys/dev/pci/pci.c#6 integrate .. //depot/projects/gdb/sys/dev/sound/pci/cmi.c#5 integrate .. //depot/projects/gdb/sys/geom/concat/g_concat.c#4 integrate .. //depot/projects/gdb/sys/i386/acpica/acpi_asus.c#1 branch .. //depot/projects/gdb/sys/i386/acpica/acpi_machdep.c#3 integrate .. //depot/projects/gdb/sys/i386/conf/GENERIC#6 integrate .. //depot/projects/gdb/sys/i386/conf/NOTES#10 integrate .. //depot/projects/gdb/sys/ia64/acpica/acpi_machdep.c#2 integrate .. //depot/projects/gdb/sys/kern/imgact_elf.c#8 integrate .. //depot/projects/gdb/sys/kern/kern_exec.c#7 integrate .. //depot/projects/gdb/sys/kern/kern_timeout.c#4 integrate .. //depot/projects/gdb/sys/kern/sched_ule.c#9 integrate .. //depot/projects/gdb/sys/kern/vfs_export.c#3 integrate .. //depot/projects/gdb/sys/kern/vfs_syscalls.c#7 integrate .. //depot/projects/gdb/sys/modules/acpi/acpi/Makefile#3 integrate .. //depot/projects/gdb/sys/modules/acpi/acpi_asus/Makefile#1 branch .. //depot/projects/gdb/sys/modules/asr/Makefile#2 integrate .. //depot/projects/gdb/sys/modules/ipfilter/Makefile#2 integrate .. //depot/projects/gdb/sys/net/radix.c#4 integrate .. //depot/projects/gdb/sys/net/route.c#7 integrate .. //depot/projects/gdb/sys/net/route.h#6 integrate .. //depot/projects/gdb/sys/netinet/in_pcb.c#5 integrate .. //depot/projects/gdb/sys/netinet/tcp_subr.c#6 integrate .. //depot/projects/gdb/sys/netinet/tcp_var.h#5 integrate .. //depot/projects/gdb/sys/netipsec/xform_tcp.c#2 integrate .. //depot/projects/gdb/sys/pci/amdpm.c#3 integrate .. //depot/projects/gdb/sys/powerpc/include/param.h#3 integrate .. //depot/projects/gdb/sys/powerpc/include/pmap.h#5 integrate .. //depot/projects/gdb/sys/sys/callout.h#3 integrate .. //depot/projects/gdb/sys/sys/imgact.h#3 integrate .. //depot/projects/gdb/usr.bin/find/find.1#4 integrate .. //depot/projects/gdb/usr.bin/make/job.c#2 integrate .. //depot/projects/gdb/usr.bin/tar/write.c#5 integrate .. //depot/projects/gdb/usr.sbin/inetd/inetd.c#4 integrate .. //depot/projects/gdb/usr.sbin/rarpd/rarpd.c#2 integrate Differences ... ==== //depot/projects/gdb/UPDATING#11 (text+ko) ==== @@ -17,6 +17,11 @@ developers choose to disable these features on build machines to maximize performance. +20040420: + Due to changes in the callout ABI, kernels compiled after this + date may be incompatible with kernel modules compiled prior to + 20040406. + 20040414: The PCI bus power state stuff has been turned on. If this causes problems for your system, please disable it using the tunable @@ -1591,4 +1596,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.305 2004/04/16 18:36:52 brooks Exp $ +$FreeBSD: src/UPDATING,v 1.306 2004/04/20 15:49:30 cperciva Exp $ ==== //depot/projects/gdb/bin/df/df.1#4 (text+ko) ==== @@ -26,7 +26,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)df.1 8.3 (Berkeley) 5/8/95 -.\" $FreeBSD: src/bin/df/df.1,v 1.32 2004/04/18 20:56:31 obrien Exp $ +.\" $FreeBSD: src/bin/df/df.1,v 1.33 2004/04/22 16:33:54 obrien Exp $ .\" .Dd May 8, 1995 .Dt DF 1 @@ -37,7 +37,7 @@ .Sh SYNOPSIS .Nm .Oo -.Fl b | h | H | k | +.Fl b | g | h | H | k | .Fl m | P .Oc .Op Fl aciln ==== //depot/projects/gdb/bin/df/df.c#7 (text+ko) ==== @@ -44,7 +44,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.58 2004/04/18 20:56:31 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.60 2004/04/22 17:05:08 obrien Exp $"); #include #include @@ -115,13 +115,13 @@ static unit_t unitp [] = { NONE, KILO, MEGA, GIGA, TERA, PETA }; +static void addstat(struct statfs *, struct statfs *); static char *getmntpt(const char *); static int int64width(int64_t); static char *makenetvfslist(void); static void prthuman(const struct statfs *, int64_t); static void prthumanval(double); static void prtstat(struct statfs *, struct maxwidths *); -static void addstat(struct statfs *, struct statfs *); static size_t regetmntinfo(struct statfs **, long, const char **); static unit_t unit_adjust(double *); static void update_maxwidths(struct maxwidths *, const struct statfs *); @@ -140,8 +140,9 @@ main(int argc, char *argv[]) { struct stat stbuf; - struct statfs statfsbuf, totalbuf, *mntbuf; + struct statfs statfsbuf, totalbuf; struct maxwidths maxwidths; + struct statfs *mntbuf; const char *fstype; char *mntpath, *mntpt; const char **vfslist; @@ -150,24 +151,24 @@ fstype = "ufs"; - memset (&totalbuf, 0, sizeof (totalbuf)); + memset(&totalbuf, 0, sizeof(totalbuf)); totalbuf.f_bsize = DEV_BSIZE; - strncpy (totalbuf.f_mntfromname, "total", MNAMELEN); + strncpy(totalbuf.f_mntfromname, "total", MNAMELEN); vfslist = NULL; while ((ch = getopt(argc, argv, "abcgHhiklmnPt:")) != -1) switch (ch) { case 'a': aflag = 1; break; - case 'c': - cflag = 1; - break; case 'b': /* FALLTHROUGH */ case 'P': putenv("BLOCKSIZE=512"); hflag = 0; break; + case 'c': + cflag = 1; + break; case 'g': putenv("BLOCKSIZE=1g"); hflag = 0; @@ -428,12 +429,11 @@ static int headerlen, timesthrough = 0; static const char *header; int64_t used, availblks, inodes; - int total; if (++timesthrough == 1) { mwp->mntfrom = imax(mwp->mntfrom, (int)strlen("Filesystem")); if (hflag) { - header = " Size"; + header = " Size"; mwp->total = mwp->used = mwp->avail = (int)strlen(header); } else { @@ -470,15 +470,15 @@ } (void)printf(" %5.0f%%", availblks == 0 ? 100.0 : (double)used / (double)availblks * 100.0); - total = !*sfsp->f_mntonname && - strncmp(sfsp->f_mntfromname, "total", MNAMELEN) == 0; if (iflag) { inodes = sfsp->f_files; used = inodes - sfsp->f_ffree; (void)printf(" %*jd %*jd %4.0f%% ", mwp->iused, (intmax_t)used, mwp->ifree, (intmax_t)sfsp->f_ffree, inodes == 0 ? 100.0 : (double)used / (double)inodes * 100.0); - } else if (!total) + } else + (void)printf(" "); + if (strncmp(sfsp->f_mntfromname, "total", MNAMELEN) != 0) (void)printf(" %s", sfsp->f_mntonname); (void)printf("\n"); } @@ -486,8 +486,9 @@ void addstat(struct statfs *totalfsp, struct statfs *statfsp) { - double bsize = statfsp->f_bsize / totalfsp->f_bsize; + uint64_t bsize; + bsize = statfsp->f_bsize / totalfsp->f_bsize; totalfsp->f_blocks += statfsp->f_blocks * bsize; totalfsp->f_bfree += statfsp->f_bfree * bsize; totalfsp->f_bavail += statfsp->f_bavail * bsize; @@ -546,7 +547,7 @@ { (void)fprintf(stderr, - "usage: df [-b | -H | -h | -k | -m | -P] [-aciln] [-t type] [file | filesystem ...]\n"); +"usage: df [-b | -g | -H | -h | -k | -m | -P] [-aciln] [-t type] [file | filesystem ...]\n"); exit(EX_USAGE); } ==== //depot/projects/gdb/crypto/openssh/ChangeLog#3 (text+ko) ==== @@ -1,3 +1,192 @@ +20040418 + - (dtucker) [auth-pam.c] Log username and source host for failed PAM + authentication attempts. With & ok djm@ + - (djm) [openbsd-compat/bsd-cygwin_util.c] Recent versions of Cygwin allow + change of user context without a password, so relax auth method + restrictions; from vinschen AT redhat.com; ok dtucker@ + - Release 3.8.1p1 + +20040416 + - (dtucker) [regress/sftp-cmds.sh] Skip quoting test on Cygwin, since + FAT/NTFS does not permit quotes in filenames. From vinschen at redhat.com + - (djm) [auth-krb5.c auth.h session.c] Explicitly refer to Kerberos ccache + file using FILE: method, fixes problems on Mac OSX. + Patch from simon@sxw.org.uk; ok dtucker@ + - (tim) [configure.ac] Set SETEUID_BREAKS_SETUID, BROKEN_SETREUID and + BROKEN_SETREGID for SCO OpenServer 3 + +20040412 + - (dtucker) [sshd_config.5] Add PermitRootLogin without-password warning + from bug #701 (text from jfh at cise.ufl.edu). + - (dtucker) [acconfig.h configure.ac defines.h] Bug #673: check for 4-arg + skeychallenge(), eg on NetBSD. ok mouring@ + - (dtucker) [auth-skey.c defines.h monitor.c] Make skeychallenge explicitly + 4-arg, with compatibility for 3-arg versions. From djm@, ok me. + - (djm) [configure.ac] Fix detection of libwrap on OpenBSD; ok dtucker@ + +20040408 + - (dtucker) [loginrec.c] Use UT_LINESIZE if available, prevents truncating + pty name on Linux 2.6.x systems. Patch from jpe at eisenmenger.org. + - (bal) [monitor.c monitor_wrap.c] Second try. Put the zlib.h headers + back and #undef TARGET_OS_MAC instead. (Bug report pending with Apple) + - (dtucker) [defines.h loginrec.c] Define UT_LINESIZE if not defined and + simplify loginrec.c. ok tim@ + - (bal) [monitor.c monitor_wrap.c] Ok.. Last time. Promise. Tim suggested + limiting scope and dtucker@ agreed. + +20040407 + - (dtucker) [session.c] Flush stdout after displaying loginmsg. From + f_mohr at yahoo.de. + - (bal) [acconfig.h auth-krb5.c configure.ac gss-serv-krb5.c] Check to see + if Krb5 library exports krb5_init_etc() since some OSes (like MacOS/X) + are starting to restrict it as internal since it is not needed by + developers any more. (Patch based on Apple tree) + - (bal) [monitor.c monitor_wrap.c] monitor_wrap.c] moved zlib.h higher since + krb5 on MacOS/X conflicts. There may be a better solution, but this will + work for now. + +20040406 + - (dtucker) [acconfig.h configure.ac defines.h] Bug #820: don't use + updwtmpx() on IRIX since it seems to clobber utmp. ok djm@ + - (dtucker) [configure.ac] Bug #816, #748 (again): Attempt to detect + broken getaddrinfo and friends on HP-UX. ok djm@ + +20040330 + - (dtucker) [configure.ac] Bug #811: Use "!" for LOCKED_PASSWD_PREFIX on + Linuxes, since that's what many use. ok djm@ + - (dtucker) [auth-pam.c] rename the_authctxt to sshpam_authctxt in auth-pam.c + to reduce potential confusion with the one in sshd.c. ok djm@ + - (djm) Bug #825: Fix ip_options_check() for mapped IPv4/IPv6 connection; + with & ok dtucker@ + +20040327 + - (dtucker) [session.c] Bug #817: Clear loginmsg after fork to prevent + duplicate login messages for mutli-session logins. ok djm@ + +20040322 + - (djm) [sshd.c] Drop supplemental groups if started as root + - (djm) OpenBSD CVS Sync + - markus@cvs.openbsd.org 2004/03/09 22:11:05 + [ssh.c] + increase x11 cookie lifetime to 20 minutes; ok djm + - markus@cvs.openbsd.org 2004/03/10 09:45:06 + [ssh.c] + trim usage to match ssh(1) and look more like unix. ok djm@ + - markus@cvs.openbsd.org 2004/03/11 08:36:26 + [sshd.c] + trim usage; ok deraadt + - markus@cvs.openbsd.org 2004/03/11 10:21:17 + [ssh.c sshd.c] + ssh, sshd: sync version output, ok djm + - markus@cvs.openbsd.org 2004/03/20 10:40:59 + [version.h] + 3.8.1 + - (djm) Crank RPM spec versions + +20040311 + - (djm) [configure.ac] Add standard license to configure.ac; ok ben, dtucker + +20040310 + - (dtucker) [openbsd-compat/fake-rfc2553.h] Bug #812: #undef getaddrinfo + before redefining it, silences warnings on Tru64. + +20040308 + - (dtucker) [sshd.c] Back out rev 1.270 as it caused problems on some + platforms (eg SCO, HP-UX) with logging in the wrong TZ. ok djm@ + - (dtucker) [configure.ac sshd.c openbsd-compat/bsd-misc.h + openbsd-compat/setenv.c] Unset KRB5CCNAME on AIX to prevent it from being + inherited by the child. ok djm@ + - (dtucker) [auth-pam.c auth-pam.h auth1.c auth2.c monitor.c monitor_wrap.c + monitor_wrap.h] Bug #808: Ensure force_pwchange is correctly initialized + even if keyboard-interactive is not used by the client. Prevents + segfaults in some cases where the user's password is expired (note this + is not considered a security exposure). ok djm@ + - (djm) OpenBSD CVS Sync + - markus@cvs.openbsd.org 2004/03/03 06:47:52 + [sshd.c] + change proctiltle after accept(2); ok henning, deraadt, djm + - djm@cvs.openbsd.org 2004/03/03 09:30:42 + [sftp-client.c] + Don't print duplicate messages when progressmeter is off + Spotted by job317 AT mailvault.com; ok markus@ + - djm@cvs.openbsd.org 2004/03/03 09:31:20 + [sftp.c] + Fix initialisation of progress meter; ok markus@ + - markus@cvs.openbsd.org 2004/03/05 10:53:58 + [readconf.c readconf.h scp.1 sftp.1 ssh.1 ssh_config.5 sshconnect2.c] + add IdentitiesOnly; ok djm@, pb@ + - djm@cvs.openbsd.org 2004/03/08 09:38:05 + [ssh-keyscan.c] + explicitly initialise remote_major and remote_minor. + from cjwatson AT debian.org; ok markus@ + - dtucker@cvs.openbsd.org 2004/03/08 10:18:57 + [sshd_config.5] + Document KerberosGetAFSToken; ok markus@ + - (tim) [regress/README.regress] Document ssh-rand-helper issue. ok bal + +20040307 + - (tim) [regress/login-timeout.sh] fix building outside of source tree. + +20040304 + - (dtucker) [auth-pam.c] Don't try to export PAM when compiled with + -DUSE_POSIX_THREADS. From antoine.verheijen at ualbert ca. ok djm@ + - (dtucker) [auth-pam.c] Reset signal status when starting pam auth thread, + prevent hanging during PAM keyboard-interactive authentications. ok djm@ + - (dtucker) [auth-passwd.c auth-sia.c auth-sia.h defines.h + openbsd-compat/xcrypt.c] Bug #802: Fix build error on Tru64 when + configured --with-osfsia. ok djm@ + +20040303 + - (djm) [configure.ac ssh-agent.c] Use prctl to prevent ptrace on ssh-agent + ok dtucker + +20040229 + - (tim) [configure.ac] Put back bits mistakenly removed from Rev 1.188 + +20040229 + - (dtucker) OpenBSD CVS Sync + - djm@cvs.openbsd.org 2004/02/25 00:22:45 + [sshd.c] + typo in comment + - dtucker@cvs.openbsd.org 2004/02/27 22:42:47 + [dh.c] + Prevent sshd from sending DH groups with a primitive generator of zero or + one, even if they are listed in /etc/moduli. ok markus@ + - dtucker@cvs.openbsd.org 2004/02/27 22:44:56 + [dh.c] + Make /etc/moduli line buffer big enough for 8kbit primes, in case anyone + ever uses one. ok markus@ + - dtucker@cvs.openbsd.org 2004/02/27 22:49:27 + [dh.c] + Reset bit counter at the right time, fixes debug output in the case where + the DH group is rejected. ok markus@ + - dtucker@cvs.openbsd.org 2004/02/17 08:23:20 + [regress/Makefile regress/login-timeout.sh] + Add regression test for LoginGraceTime; ok markus@ + - markus@cvs.openbsd.org 2004/02/24 16:56:30 + [regress/test-exec.sh] + allow arguments in ${TEST_SSH_XXX} + - markus@cvs.openbsd.org 2004/02/24 17:06:52 + [regress/ssh-com-client.sh regress/ssh-com-keygen.sh + regress/ssh-com-sftp.sh regress/ssh-com.sh] + test against recent ssh.com releases + - dtucker@cvs.openbsd.org 2004/02/28 12:16:57 + [regress/dynamic-forward.sh] + Make dynamic-forward understand nc's new output. ok markus@ + - dtucker@cvs.openbsd.org 2004/02/28 13:44:45 + [regress/try-ciphers.sh] + Test acss too; ok markus@ + - (dtucker) [regress/try-ciphers.sh] Skip acss if not compiled in (eg if we + built with openssl < 0.9.7) + +20040226 + - (bal) KNF our sshlogin.c even if the code looks nothing like upstream + code due to diversity issues. + +20040225 + - (djm) Trim ChangeLog + - (djm) Don't specify path to PAM modules in Redhat sshd.pam; from Fedora + 20040224 - (dtucker) OpenBSD CVS Sync - markus@cvs.openbsd.org 2004/02/19 21:15:04 @@ -794,1139 +983,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -20030919 - - (djm) Bug #683: Remove reference to --with-ipv4-default from INSTALL; - djast AT cs.toronto.edu - - (djm) Bug #661: Remove duplicate check for basename; from - bugzilla-openssh AT thewrittenword.com - - (djm) Bug #641: Allow RedHat RPM building without GTK-2; Patch from - jason AT devrandom.org - - (djm) Bug #646: Fix location of x11-ssh-askpass; Jim - - (dtucker) [openbsd-compat/port-aix.h] Bug #640: Don't include audit.h - unless required. Reorder to reduce warnings. - - (dtucker) [session.c] Bug #643: Fix size_t -> u_int and fix null deref - when /etc/default/login doesn't exist or isn't readable. Fixes from - jparsons-lists at saffron.net and georg.oppenberg at deu mci com. - - (dtucker) [acconfig.h] Updated basename test needs HAVE_BASENAME - -20030918 - - (djm) Bug #652: Fix empty password auth - -20030917 - - (djm) Sync with V_3_7 branch - - (djm) OpenBSD Sync - - markus@cvs.openbsd.org 2003/09/16 21:02:40 - [buffer.c channels.c version.h] - more malloc/fatal fixes; ok millert/deraadt; ghudson at MIT.EDU - - (djm) Crank RPM spec file versions - - (tim) [openbsd-compat/inet_ntoa.c] 20030917 "Sync with V_3_7 branch" undid - 20030916 "Missed dead header in inet_ntoa.c" - -20030916 - - (dtucker) [acconfig.h configure.ac defines.h session.c] Bug #252: Retrieve - PATH (or SUPATH) and UMASK from /etc/default/login on platforms that have it - (eg Solaris, Reliant Unix). Patch from Robert.Dahlem at siemens.com. - ok djm@ - - (bal) OpenBSD Sync - - deraadt@cvs.openbsd.org 2003/09/16 03:03:47 - [buffer.c] - do not expand buffer before attempting to reallocate it; markus ok - - (tim) [configure.ac] Fix portability issues. - - (bal) Missed dead header in inet_ntoa.c - -20030914 - - (dtucker) [Makefile regress/Makefile] Fix portability issues preventing - the regression tests from running with Solaris' make. Patch from Brian - Poole (raj at cerias.purdue.edu). - - (dtucker) [regress/Makefile] AIX's make doesn't like " +=", so replace - with vanilla "=". - -20030913 - - (dtucker) [regress/agent-timeout.sh] Timeout of 5 sec is borderline for - slower hosts, increase to 10 sec. - - (dtucker) [auth-passwd.c] On AIX, call setauthdb() before loginsuccess(), - required to correctly reset failed login count when using a password - registry other than "files" (eg LDAP, see bug #543). - - (tim) [configure.ac] define WITH_ABBREV_NO_TTY for SCO. - Report by Roger Cornelius. - - (dtucker) [auth-pam.c] Use SSHD_PAM_SERVICE for PAM service name, patch - from cjwatson at debian.org. - -20030912 - - (tim) [regress/agent-ptrace.sh] sh doesn't like "if ! shell_function; then". - - (tim) [Makefile.in] only mkdir regress if it does not exist. - - (tim) [regress/yes-head.sh] shell portability fix. - -20030911 - - (dtucker) [configure.ac] Bug #588, #615: Move other libgen tests to after - the dirname test, to allow a broken dirname to be detected correctly. - Based partially on patch supplied by alex.kiernan at thus.net. ok djm@ - - (tim) [configure.ac] Move libgen tests to before libwrap to unbreak - UnixWare 2.03 using --with-tcp-wrappers. - - (tim) [configure.ac] Prefer setuid/setgid on UnixWare and Open Server. - - (tim) [regress/agent-ptrace.sh regress/dynamic-forward.sh - regress/sftp-cmds.sh regress/stderr-after-eof.sh regress/test-exec.sh] - no longer depends on which(1). patch by dtucker@ - -20030910 - - (dtucker) [configure.ac] Bug #636: Add support for Cray's new X1 machine. - Patch from wendyp at cray.com. - - (dtucker) [configure.ac] Part of bug #615: tcsendbreak might be a macro. - - (dtucker) [regressh/yes-head.sh] Some platforms (eg Solaris) don't have - "yes". - -20030909 - - (tim) [regress/Makefile] Fixes for building outside of a read-only - source tree. - - (tim) [regress/agent-timeout.sh] s/TIMEOUT/SSHAGENT_TIMEOUT/ Fixes conflict - with shell read-only variable. - - (tim) [regress/sftp-badcmds.sh regress/sftp-cmds.sh] Fix errors like - UX:rm: ERROR: Cannot remove '.' or '..' - -20030908 - - (tim) [configure.ac openbsd-compat/getrrsetbyname.c] wrap _getshort and - _getlong in #ifndef - - (tim) [configure.ac acconfig.h openbsd-compat/getrrsetbyname.c] test for - HEADER.ad in arpa/nameser.h - - (tim) [ssh-keygen.c] s/PATH_MAX/MAXPATHLEN/ ok mouring@ - -20030907 - - (dtucker) [agent-ptrace.sh dynamic-forward.sh (all regress/)] - Put "which" inside quotes. - - (dtucker) [dynamic-forward.sh forwarding.sh sftp-batch.sh (all regress/)] - Add ${EXEEXT}: required to work on Cygwin. - - (dtucker) [regress/sftp-batch.sh] Make temporary batch file name more - distinctive, so "rm ${BATCH}.*" doesn't match the script itself. - - (dtucker) [regress/sftp-cmds.sh] Skip quoted file test on Cygwin. - - (dtucker) [openbsd-compat/xcrypt.c] #elsif -> #elif - - (dtucker) [acconfig.h] Typo. - - (dtucker) [CREDITS Makefile.in configure.ac mdoc2man.awk mdoc2man.pl] - Replace mdoc2man.pl with mdoc2man.awk, provided by Peter Stuge. - -20030906 - - (dtucker) [acconfig.h configure.ac uidswap.c] Prefer setuid/setgid on AIX. - -20030905 - - (dtucker) [Makefile.in] Add distclean target for regress/, fix clean target. - -20030904 - - (dtucker) Portablize regression tests. Parts contributed by Roumen - Petrov, David M. Williams and Corinna Vinschen. - - [Makefile.in] Add "make tests" target and "make clean" hooks. - - [regress/agent-getpeereid.sh] Skip test on platforms that don't support - getpeereid. - - [regress/agent-ptrace.sh] Skip tests if platform doesn't support it or - gdb cannot be found. - - [regress/reconfigure/sh] Make path to sshd fully qualified if required. - - [regress/rekey.sh] Remove dependence on /dev/zero (not all platforms have - it). The sparse file will take less disk space too. - - [regress/sftp-cmds.sh] Ensure files used for test are readable. - - [regress/stderr-after-eof.sh] Search for a usable checksum program. - - [regress/sftp-badcmds.sh regress/sftp-cmds.sh regress/sftp.sh - regress/ssh-com-client.sh regress/ssh-com-sftp.sh regress/stderr-data.sh - regress/transfer.sh] Use ${EXEEXT} where appropriate. - - [regress/sftp.sh regress/ssh-com-sftp.sh] Remove dependency on /dev/stdin. - - [regress/agent-ptrace.sh regress/agent-timeout.sh] - "grep -q" -> "grep >/dev/null" - - [regress/agent.sh regress/proto-version.sh regress/ssh-com.sh - regress/test-exec.sh] Handle different ways of echoing without newlines. - - [regress/dynamic-forward.sh] Some "which" programs output on stderr. - - [regress/sftp-cmds.sh] Use portable "test" option. - - [regress/test-exec.sh] Use sudo, search for "whoami" equivalent, always - use Strictmodes no, wait longer for sshd startup. - - [regress/Makefile] Remove BSDisms. - - [regress/README.regress] Add a basic readme. - - [Makefile.in regress/agent-getpeereid.sh] config.h is now in $BUILDDIR - not $OBJ. - - [Makefile.in regress/agent-ptrace] Fix minor regress issues on Cygwin. - -20030903 - - (djm) OpenBSD CVS Sync - - markus@cvs.openbsd.org 2003/08/26 09:58:43 - [auth-passwd.c auth.c auth.h auth1.c auth2-none.c auth2-passwd.c] - [auth2.c monitor.c] - fix passwd auth for 'username leaks via timing'; with djm@, original - patches from solar - - markus@cvs.openbsd.org 2003/08/28 12:54:34 - [auth.h] - remove kerberos support from ssh1, since it has been replaced with GSSAPI; - but keep kerberos passwd auth for ssh1 and 2; ok djm, hin, henning, ... - - markus@cvs.openbsd.org 2003/09/02 16:40:29 - [version.h] - enter 3.7 - - jmc@cvs.openbsd.org 2003/09/02 18:50:06 - [sftp.1 ssh_config.5] - escape punctuation; - ok deraadt@ - -20030902 - - (djm) OpenBSD CVS Sync - - deraadt@cvs.openbsd.org 2003/08/24 17:36:51 - [auth2-gss.c] - 64 bit cleanups; markus ok - - markus@cvs.openbsd.org 2003/08/28 12:54:34 - [auth-krb5.c auth.h auth1.c monitor.c monitor.h monitor_wrap.c] - [monitor_wrap.h readconf.c servconf.c session.c ssh_config.5] - [sshconnect1.c sshd.c sshd_config sshd_config.5] - remove kerberos support from ssh1, since it has been replaced with GSSAPI; - but keep kerberos passwd auth for ssh1 and 2; ok djm, hin, henning, ... - - markus@cvs.openbsd.org 2003/08/29 10:03:15 - [compat.c compat.h] - SSH_BUG_K5USER is unused; ok henning@ - - markus@cvs.openbsd.org 2003/08/29 10:04:36 - [channels.c nchan.c] - be less chatty; debug -> debug2, cleanup; ok henning@ - - markus@cvs.openbsd.org 2003/08/31 10:26:04 - [progressmeter.c] - pass file_size + 1 to snprintf: fixes printing of truncated - file names; fix based on patch/report from sturm@; - - markus@cvs.openbsd.org 2003/08/31 12:14:22 - [progressmeter.c] - do write to buf[-1] - - markus@cvs.openbsd.org 2003/08/31 13:29:05 - [session.c] - call ssh_gssapi_storecreds conditionally from do_exec(); - with sxw@inf.ed.ac.uk - - markus@cvs.openbsd.org 2003/08/31 13:30:18 - [gss-serv.c] - correct string termination in parse_ename(); sxw@inf.ed.ac.uk - - markus@cvs.openbsd.org 2003/08/31 13:31:57 - [gss-serv.c] - whitspace KNF - - markus@cvs.openbsd.org 2003/09/01 09:50:04 - [sshd_config.5] - gss kex is not supported; sxw@inf.ed.ac.uk - - markus@cvs.openbsd.org 2003/09/01 12:50:46 - [readconf.c] - rm gssapidelegatecreds alias; never supported before - - markus@cvs.openbsd.org 2003/09/01 13:52:18 - [ssh.h] - rm whitespace - - markus@cvs.openbsd.org 2003/09/01 18:15:50 - [readconf.c readconf.h servconf.c servconf.h ssh.c] - remove unused kerberos code; ok henning@ - - markus@cvs.openbsd.org 2003/09/01 20:44:54 - [auth2-gss.c] - fix leak - - (djm) Don't initialise pam_conv structures inline. Avoids HP/UX compiler - error. Part of Bug #423, patch from michael_steffens AT hp.com - - (djm) Bug #423: reorder setting of PAM_TTY and calling of PAM session - management (now done in do_setusercontext). Largely from - michael_steffens AT hp.com - - (djm) Fix openbsd-compat/ again - remove references to strl(cpy|cat).h - -20030829 - - (bal) openbsd-compat/ clean up. Considate headers, add in Id on our - files, and added missing license to header. - -20030826 - - (djm) Bug #629: Mark ssh_config option "pamauthenticationviakbdint" - as deprecated. Remove mention from README.privsep. Patch from - aet AT cc.hut.fi - - (dtucker) OpenBSD CVS Sync - - markus@cvs.openbsd.org 2003/08/22 10:56:09 - [auth2.c auth2-gss.c auth.h compat.c compat.h gss-genr.c gss-serv-krb5.c - gss-serv.c monitor.c monitor.h monitor_wrap.c monitor_wrap.h readconf.c - readconf.h servconf.c servconf.h session.c session.h ssh-gss.h - ssh_config.5 sshconnect2.c sshd_config sshd_config.5] - support GSS API user authentication; patches from Simon Wilkinson, - stripped down and tested by Jakob and myself. - - markus@cvs.openbsd.org 2003/08/22 13:20:03 - [sshconnect2.c] - remove support for "kerberos-2@ssh.com" - - markus@cvs.openbsd.org 2003/08/22 13:22:27 - [auth2.c] (auth2-krb5.c removed) - nuke "kerberos-2@ssh.com" - - markus@cvs.openbsd.org 2003/08/22 20:55:06 - [LICENCE] - add Simon Wilkinson - - deraadt@cvs.openbsd.org 2003/08/24 17:36:52 - [monitor.c monitor_wrap.c sshconnect2.c] - 64 bit cleanups; markus ok - - fgsch@cvs.openbsd.org 2003/08/25 08:13:09 - [sftp-int.c] - fix div by zero when listing for filename lengths longer than width. - markus@ ok. - - djm@cvs.openbsd.org 2003/08/25 10:33:33 - [sshconnect2.c] - fprintf->logit to silence login banner with "ssh -q"; ok markus@ - - (dtucker) [Makefile.in acconfig.h auth-krb5.c auth-pam.c auth-pam.h - configure.ac defines.h gss-serv-krb5.c session.c ssh-gss.h sshconnect1.c - sshconnect2.c] Add Portable GSSAPI support, patch by Simon Wilkinson. - - (dtucker) [Makefile.in] Remove auth2-krb5. - - (dtucker) [contrib/aix/inventory.sh] Add public domain notice. ok mouring@ - (the original author) - - (dtucker) [auth.c] Do not check for locked accounts when PAM is enabled. - -20030825 - - (djm) Bug #621: Select OpenSC keys by usage attributes. Patch from - larsch@trustcenter.de - - (bal) openbsd-compat/ OpenBSD updates. Mostly licensing, ansifications - and minor fixes. OK djm@ - - (bal) redo how we handle 'mysignal()'. Move it to - openbsd-compat/bsd-misc.c, s/mysignal/signal/ and #define signal to - be our 'mysignal' by default. OK djm@ - - (dtucker) [acconfig.h auth.c configure.ac sshd.8] Bug #422 again: deny - any access to locked accounts. ok djm@ - - (djm) Bug #564: Perform PAM account checks for all authentications when - UsePAM=yes; ok dtucker - - (dtucker) [configure.ac] Bug #533, #551: define BROKEN_GETADDRINFO on - Tru64, solves getnameinfo and "bad addr or host" errors. ok djm@ - - (dtucker) [README buildbff.sh inventory.sh] (all in contrib/aix) - Update package builder: correctly handle config variables, use lsuser - rather than /etc/passwd, fix typos, add Id's. - -20030822 - - (djm) s/get_progname/ssh_get_progname/g to avoid conflict with Heimdal - -lbroken; ok dtucker - - (dtucker) [contrib/cygwin/ssh-user-config] Put keys in authorized_keys - rather that authorized_keys2. Patch from vinschen@redhat.com. - -20030821 - - (dtucker) OpenBSD CVS Sync - - markus@cvs.openbsd.org 2003/08/14 16:08:58 - [ssh-keygen.c] - exit after primetest, ok djm@ - - (dtucker) [defines.h] Put CMSG_DATA, CMSG_FIRSTHDR with other CMSG* macros, - change CMSG_DATA to use __CMSG_ALIGN (and thus work properly), reformat for - consistency. - - (dtucker) [configure.ac] Move openpty/ctty test outside of case statement - and after normal openpty test. - -20030813 - - (dtucker) [session.c] Remove #ifdef TIOCSBRK kludge. - - (dtucker) OpenBSD CVS Sync - - markus@cvs.openbsd.org 2003/08/13 08:33:02 - [session.c] - use more portable tcsendbreak(3) and ignore break_length; - ok deraadt, millert - - markus@cvs.openbsd.org 2003/08/13 08:46:31 - [auth1.c readconf.c readconf.h servconf.c servconf.h ssh.c ssh_config - ssh_config.5 sshconnect1.c sshd.8 sshd.c sshd_config sshd_config.5] - remove RhostsAuthentication; suggested by djm@ before; ok djm@, deraadt@, - fgsch@, miod@, henning@, jakob@ and others - - markus@cvs.openbsd.org 2003/08/13 09:07:10 - [readconf.c ssh.c] - socks4->socks, since with support both 4 and 5; dtucker@zip.com.au - - (dtucker) [configure.ac openbsd-compat/bsd-misc.c openbsd-compat/bsd-misc.h] - Add a tcsendbreak function for platforms that don't have one, based on the - one from OpenBSD. - -20030811 - - (dtucker) OpenBSD CVS Sync - (thanks to Simon Wilkinson for help with this -dt) - - markus@cvs.openbsd.org 2003/07/16 15:02:06 - [auth-krb5.c] - mcc -> fcc; from Love Hörnquist Åstrand - otherwise the kerberos credentinal is stored in a memory cache - in the privileged sshd. ok jabob@, hin@ (some time ago) - - (dtucker) [openbsd-compat/xcrypt.c] Remove Cygwin #ifdef block (duplicate - in bsd-cygwin_util.h). - -20030808 - - (dtucker) [openbsd-compat/fake-rfc2553.h] Older Linuxes have AI_PASSIVE and - AI_CANONNAME in netdb.h but not AI_NUMERICHOST, so check each definition - separately before defining them. - - (dtucker) [auth-pam.c] Don't set PAM_TTY if tty is null. ok djm@ - -20030807 - - (dtucker) [session.c] Have session_break_req not attempt to send a break - if TIOCSBRK and TIOCCBRK are not defined (eg Cygwin). - - (dtucker) [canohost.c] Bug #336: Only check ip options if IP_OPTIONS is - defined (fixes compile error on really old Linuxes). - - (dtucker) [defines.h] Bug #336: Add CMSG_DATA and CMSG_FIRSTHDR macros if - not already defined (eg Linux with some versions of libc5), based on those - from OpenBSD. - - (dtucker) [openbsd-compat/bsd-cygwin_util.c openbsd-compat/bsd-cygwin_util.h] - Remove incorrect filenames from comments (file names are in Id tags). - - (dtucker) [session.c openbsd-compat/bsd-cygwin_util.h] Move Cygwin - specific defines and includes to bsd-cygwin_util.h. Fixes build error too. - -20030802 - - (dtucker) [monitor.h monitor_wrap.h] Remove excess ident tags. - - (dtucker) OpenBSD CVS Sync - - markus@cvs.openbsd.org 2003/07/22 13:35:22 - [auth1.c auth.h auth-passwd.c monitor.c monitor.h monitor_wrap.c - monitor_wrap.h readconf.c readconf.h servconf.c servconf.h session.c ssh.1 - ssh.c ssh_config.5 sshconnect1.c sshd.c sshd_config.5 ssh.h] - remove (already disabled) KRB4/AFS support, re-enable -k in ssh(1); - test+ok henning@ - - (dtucker) [Makefile.in acconfig.h configure.ac] Remove KRB4/AFS support. - - (dtucker) [auth-krb4.c radix.c radix.h] Remove KRB4/AFS specific files. - - (dtucker) OpenBSD CVS Sync - - markus@cvs.openbsd.org 2003/07/23 07:42:43 - [sshd_config] - remove AFS; itojun@ - - djm@cvs.openbsd.org 2003/07/28 09:49:56 - [ssh-keygen.1 ssh-keygen.c] - Support for generating Diffie-Hellman groups (/etc/moduli) from ssh-keygen. - Based on code from Phil Karn, William Allen Simpson and Niels Provos. - ok markus@, thanks jmc@ - - markus@cvs.openbsd.org 2003/07/29 18:24:00 - [LICENCE progressmeter.c] - replace 4 clause BSD licensed progressmeter code with a replacement - from Nils Nordman and myself; ok deraadt@ - (copied from OpenBSD an re-applied portable changes) - - markus@cvs.openbsd.org 2003/07/29 18:26:46 - [progressmeter.c] - fix length for "- stalled -" (included with previous import) - - markus@cvs.openbsd.org 2003/07/30 07:44:14 - [progressmeter.c] - use only 4 digits in format_size (included with previous import) - - markus@cvs.openbsd.org 2003/07/30 07:53:27 - [progressmeter.c] - whitespace (included with previous import) - - markus@cvs.openbsd.org 2003/07/31 09:21:02 - [auth2-none.c] - check whether passwd auth is allowd, similar to proto 1; rob@pitman.co.za - ok henning - - avsm@cvs.openbsd.org 2003/07/31 15:50:16 - [atomicio.c] - correct comment: atomicio takes vwrite, not write; deraadt@ ok - - markus@cvs.openbsd.org 2003/07/31 22:34:03 - [progressmeter.c] - print rate similar old version; round instead truncate; - (included in previous progressmeter.c commit) - - (dtucker) [openbsd-compat/bsd-misc.c openbsd-compat/bsd-misc.h] - Add a tcgetpgrp function. - - (dtucker) [Makefile.in moduli.c moduli.h] Add new files and to Makefile. - - (dtucker) [openbsd-compat/bsd-misc.c] Fix cut-and-paste bug in tcgetpgrp. - -20030730 - - (djm) [auth-pam.c] Don't use crappy APIs like sprintf. Thanks bal - -20030726 - - (dtucker) [openbsd-compat/xcrypt.c] Fix typo: DISABLED_SHADOW -> - DISABLE_SHADOW. Fixes HP-UX compile error. - -20030724 - - (bal) [auth-passwd.c openbsd-compat/Makefile.in openbsd-compat/xcrypt.c - openbsd-compat/xcrypt.h] Split off encryption into xcrypt() interface, - and isolate shadow password functions. Tested in Solaris, but should - not break other platforms too badly (except maybe HP =). Also brings - auth-passwd.c into full sync with OpenBSD tree. - -20030723 - - (dtucker) [configure.ac] Back out change for bug #620. - -20030719 - - (dtucker) [configure.ac] Bug #620: Define BROKEN_GETADDRINFO for - Solaris/x86. Patch from jrhett at isite.net. - - (dtucker) OpenBSD CVS Sync - - markus@cvs.openbsd.org 2003/07/14 12:36:37 - [sshd.c] - remove undocumented -V option. would be only useful if openssh is used - as ssh v1 server for ssh.com's ssh v2. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Apr 22 20:22:00 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0745E16A4D0; Thu, 22 Apr 2004 20:22:00 -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 D559316A4CE for ; Thu, 22 Apr 2004 20:21:59 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CE83943D1D for ; Thu, 22 Apr 2004 20:21:59 -0700 (PDT) (envelope-from marcel@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 i3N3LxGe010298 for ; Thu, 22 Apr 2004 20:21:59 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i3N3LxhW010292 for perforce@freebsd.org; Thu, 22 Apr 2004 20:21:59 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Thu, 22 Apr 2004 20:21:59 -0700 (PDT) Message-Id: <200404230321.i3N3LxhW010292@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 51597 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, 23 Apr 2004 03:22:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=51597 Change 51597 by marcel@marcel_nfs on 2004/04/22 20:21:30 Provide a stopgap fix for the sparc64 ebus breakage due to the PCI mega-commit. Soon to appear in a CVS repository near you. Affected files ... .. //depot/projects/gdb/sys/dev/pci/pci.c#7 edit Differences ... ==== //depot/projects/gdb/sys/dev/pci/pci.c#7 (text+ko) ==== @@ -825,6 +825,12 @@ if (base == 0) return 1; + /* Sun EBus bridges contain the ranges for the devices beyond them */ + if ((pci_get_class(dev) == PCIC_BRIDGE) && + (pci_get_vendor(dev) == 0x108e) && + (pci_get_device(dev) == 0x1000 || pci_get_device(dev) == 0x1100)) + return 1; + start = base; end = base + (1 << ln2size) - 1; count = 1 << ln2size; From owner-p4-projects@FreeBSD.ORG Thu Apr 22 22:33:44 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E2A5E16A4D1; Thu, 22 Apr 2004 22:33:43 -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 B9AC316A4CE; Thu, 22 Apr 2004 22:33:43 -0700 (PDT) Received: from harmony.village.org (rover.bsdimp.com [204.144.255.66]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4678243D1D; Thu, 22 Apr 2004 22:33:43 -0700 (PDT) (envelope-from imp@bsdimp.com) Received: from localhost (warner@rover2.village.org [10.0.0.1]) by harmony.village.org (8.12.10/8.12.9) with ESMTP id i3N5Xggr075597; Thu, 22 Apr 2004 23:33:42 -0600 (MDT) (envelope-from imp@bsdimp.com) Date: Thu, 22 Apr 2004 23:33:50 -0600 (MDT) Message-Id: <20040422.233350.119859738.imp@bsdimp.com> To: marcel@freebsd.org From: "M. Warner Losh" In-Reply-To: <200404230321.i3N3LxhW010292@repoman.freebsd.org> References: <200404230321.i3N3LxhW010292@repoman.freebsd.org> X-Mailer: Mew version 3.3 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit cc: perforce@freebsd.org Subject: Re: PERFORCE change 51597 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, 23 Apr 2004 05:33:44 -0000 In message: <200404230321.i3N3LxhW010292@repoman.freebsd.org> Marcel Moolenaar writes: : http://perforce.freebsd.org/chv.cgi?CH=51597 : : Change 51597 by marcel@marcel_nfs on 2004/04/22 20:21:30 : : Provide a stopgap fix for the sparc64 ebus breakage : due to the PCI mega-commit. Soon to appear in a CVS : repository near you. : : Affected files ... : : .. //depot/projects/gdb/sys/dev/pci/pci.c#7 edit : : Differences ... : : ==== //depot/projects/gdb/sys/dev/pci/pci.c#7 (text+ko) ==== : : @@ -825,6 +825,12 @@ : if (base == 0) : return 1; : : + /* Sun EBus bridges contain the ranges for the devices beyond them */ : + if ((pci_get_class(dev) == PCIC_BRIDGE) && : + (pci_get_vendor(dev) == 0x108e) && : + (pci_get_device(dev) == 0x1000 || pci_get_device(dev) == 0x1100)) : + return 1; : + : start = base; : end = base + (1 << ln2size) - 1; : count = 1 << ln2size; Shouldn't the ebus bridge device be allocating the resources and giving them to their children? This isn't the right fix and I'd like to work with you to the fix at the right level... Warner From owner-p4-projects@FreeBSD.ORG Thu Apr 22 23:09:15 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4EEBC16A4D0; Thu, 22 Apr 2004 23:09:15 -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 1DD2016A4CE for ; Thu, 22 Apr 2004 23:09:15 -0700 (PDT) Received: from ns1.xcllnt.net (209-128-86-226.bayarea.net [209.128.86.226]) by mx1.FreeBSD.org (Postfix) with ESMTP id A4CC743D58 for ; Thu, 22 Apr 2004 23:09:14 -0700 (PDT) (envelope-from marcel@xcllnt.net) Received: from dhcp01.pn.xcllnt.net (dhcp01.pn.xcllnt.net [192.168.4.201]) by ns1.xcllnt.net (8.12.11/8.12.11) with ESMTP id i3N692jH011057; Thu, 22 Apr 2004 23:09:02 -0700 (PDT) (envelope-from marcel@piii.pn.xcllnt.net) Received: from dhcp01.pn.xcllnt.net (localhost [127.0.0.1]) i3N6926p019068; Thu, 22 Apr 2004 23:09:02 -0700 (PDT) (envelope-from marcel@dhcp01.pn.xcllnt.net) Received: (from marcel@localhost) by dhcp01.pn.xcllnt.net (8.12.11/8.12.11/Submit) id i3N692rk019067; Thu, 22 Apr 2004 23:09:02 -0700 (PDT) (envelope-from marcel) Date: Thu, 22 Apr 2004 23:09:02 -0700 From: Marcel Moolenaar To: "M. Warner Losh" Message-ID: <20040423060902.GA19060@dhcp01.pn.xcllnt.net> References: <200404230321.i3N3LxhW010292@repoman.freebsd.org> <20040422.233350.119859738.imp@bsdimp.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20040422.233350.119859738.imp@bsdimp.com> User-Agent: Mutt/1.4.2.1i cc: perforce@freebsd.org Subject: Re: PERFORCE change 51597 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, 23 Apr 2004 06:09:16 -0000 On Thu, Apr 22, 2004 at 11:33:50PM -0600, M. Warner Losh wrote: > : ==== //depot/projects/gdb/sys/dev/pci/pci.c#7 (text+ko) ==== > : > : @@ -825,6 +825,12 @@ > : if (base == 0) > : return 1; > : > : + /* Sun EBus bridges contain the ranges for the devices beyond them */ > : + if ((pci_get_class(dev) == PCIC_BRIDGE) && > : + (pci_get_vendor(dev) == 0x108e) && > : + (pci_get_device(dev) == 0x1000 || pci_get_device(dev) == 0x1100)) > : + return 1; > : + > : start = base; > : end = base + (1 << ln2size) - 1; > : count = 1 << ln2size; > > Shouldn't the ebus bridge device be allocating the resources and > giving them to their children? This isn't the right fix and I'd like > to work with you to the fix at the right level... Yes. tmm@ is working on that. I want to see the stopgap fix committed in the mean time to unbreak sparc64. I'm waiting to hear back from tmm@. Don't worry. The above change is not a solution. It's a quick fix to give us some breathing room. -- Marcel Moolenaar USPA: A-39004 marcel@xcllnt.net From owner-p4-projects@FreeBSD.ORG Thu Apr 22 23:26:59 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6C5AE16A4D0; Thu, 22 Apr 2004 23:26:59 -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 46E2416A4CE for ; Thu, 22 Apr 2004 23:26:59 -0700 (PDT) Received: from harmony.village.org (rover.bsdimp.com [204.144.255.66]) by mx1.FreeBSD.org (Postfix) with ESMTP id C5C1A43D5A for ; Thu, 22 Apr 2004 23:26:56 -0700 (PDT) (envelope-from imp@bsdimp.com) Received: from localhost (warner@rover2.village.org [10.0.0.1]) by harmony.village.org (8.12.10/8.12.9) with ESMTP id i3N6Qugr076178; Fri, 23 Apr 2004 00:26:56 -0600 (MDT) (envelope-from imp@bsdimp.com) Date: Fri, 23 Apr 2004 00:27:05 -0600 (MDT) Message-Id: <20040423.002705.51688668.imp@bsdimp.com> To: marcel@xcllnt.net From: "M. Warner Losh" In-Reply-To: <20040423060902.GA19060@dhcp01.pn.xcllnt.net> References: <200404230321.i3N3LxhW010292@repoman.freebsd.org> <20040422.233350.119859738.imp@bsdimp.com> <20040423060902.GA19060@dhcp01.pn.xcllnt.net> X-Mailer: Mew version 3.3 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit cc: perforce@freebsd.org Subject: Re: PERFORCE change 51597 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, 23 Apr 2004 06:27:00 -0000 In message: <20040423060902.GA19060@dhcp01.pn.xcllnt.net> Marcel Moolenaar writes: : On Thu, Apr 22, 2004 at 11:33:50PM -0600, M. Warner Losh wrote: : > : ==== //depot/projects/gdb/sys/dev/pci/pci.c#7 (text+ko) ==== : > : : > : @@ -825,6 +825,12 @@ : > : if (base == 0) : > : return 1; : > : : > : + /* Sun EBus bridges contain the ranges for the devices beyond them */ : > : + if ((pci_get_class(dev) == PCIC_BRIDGE) && : > : + (pci_get_vendor(dev) == 0x108e) && : > : + (pci_get_device(dev) == 0x1000 || pci_get_device(dev) == 0x1100)) : > : + return 1; : > : + : > : start = base; : > : end = base + (1 << ln2size) - 1; : > : count = 1 << ln2size; : > : > Shouldn't the ebus bridge device be allocating the resources and : > giving them to their children? This isn't the right fix and I'd like : > to work with you to the fix at the right level... : : Yes. tmm@ is working on that. I want to see the stopgap fix committed : in the mean time to unbreak sparc64. I'm waiting to hear back from : tmm@. Don't worry. The above change is not a solution. It's a quick : fix to give us some breathing room. Fair enough. Then commit away. Warner From owner-p4-projects@FreeBSD.ORG Fri Apr 23 10:36:49 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CA78516A4D0; Fri, 23 Apr 2004 10:36:48 -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 A4E3D16A4CE for ; Fri, 23 Apr 2004 10:36:48 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9F20E43D53 for ; Fri, 23 Apr 2004 10:36:48 -0700 (PDT) (envelope-from cvance@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i3NHamGe011492 for ; Fri, 23 Apr 2004 10:36:48 -0700 (PDT) (envelope-from cvance@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i3NHampl011489 for perforce@freebsd.org; Fri, 23 Apr 2004 10:36:48 -0700 (PDT) (envelope-from cvance@nailabs.com) Date: Fri, 23 Apr 2004 10:36:48 -0700 (PDT) Message-Id: <200404231736.i3NHampl011489@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cvance@nailabs.com using -f From: Chris Vance To: Perforce Change Reviews Subject: PERFORCE change 51619 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, 23 Apr 2004 17:36:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=51619 Change 51619 by cvance@cvance_g5 on 2004/04/23 10:36:19 Remove unknown vnode system flag... These flags may be valid for FreeBSD, and they may do no harm on Jaguar, but they cause much pain on Panther. Affected files ... .. //depot/projects/trustedbsd/sedarwin73/apsl/xnu/bsd/hfs/hfs_extattr.c#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin73/apsl/xnu/bsd/hfs/hfs_extattr.c#2 (text+ko) ==== @@ -354,7 +354,6 @@ goto unlock_free_exit; } - backing_vnode->v_flag |= VSYSTEM; LIST_INSERT_HEAD(&hfsmp->hfs_extattr.uepm_list, attribute, uele_entries); @@ -1036,7 +1035,6 @@ vn_lock(uele->uele_backing_vnode, LK_SHARED | LK_RETRY, p); /* XXX/TBD */ /* ASSERT_VOP_LOCKED(uele->uele_backing_vnode, "hfs_extattr_disable"); */ - uele->uele_backing_vnode->v_flag &= ~VSYSTEM; VOP_UNLOCK(uele->uele_backing_vnode, 0, p); error = vn_close(uele->uele_backing_vnode, FREAD|FWRITE, p->p_ucred, p); From owner-p4-projects@FreeBSD.ORG Fri Apr 23 20:29:55 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 55A9716A4D0; Fri, 23 Apr 2004 20:29:55 -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 2D65516A4CE for ; Fri, 23 Apr 2004 20:29:55 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2174343D39 for ; Fri, 23 Apr 2004 20:29:55 -0700 (PDT) (envelope-from marcel@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 i3O3TtGe051308 for ; Fri, 23 Apr 2004 20:29:55 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i3O3TsuC051305 for perforce@freebsd.org; Fri, 23 Apr 2004 20:29:54 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Fri, 23 Apr 2004 20:29:54 -0700 (PDT) Message-Id: <200404240329.i3O3TsuC051305@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 51635 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: Sat, 24 Apr 2004 03:29:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=51635 Change 51635 by marcel@marcel_nfs on 2004/04/23 20:29:12 IFC @51632 Affected files ... .. //depot/projects/gdb/UPDATING#12 integrate .. //depot/projects/gdb/etc/rc.d/ipfilter#6 integrate .. //depot/projects/gdb/etc/rc.d/ipmon#5 integrate .. //depot/projects/gdb/lib/libarchive/archive_entry.c#9 integrate .. //depot/projects/gdb/lib/libarchive/archive_read_extract.c#7 integrate .. //depot/projects/gdb/lib/libarchive/archive_write_set_format_shar.c#7 integrate .. //depot/projects/gdb/sbin/ipfw/ipfw.8#5 integrate .. //depot/projects/gdb/sbin/ipfw/ipfw2.c#4 integrate .. //depot/projects/gdb/share/man/man4/man4.i386/Makefile#6 integrate .. //depot/projects/gdb/sys/conf/NOTES#14 integrate .. //depot/projects/gdb/sys/conf/files#18 integrate .. //depot/projects/gdb/sys/conf/files.amd64#6 integrate .. //depot/projects/gdb/sys/conf/kern.pre.mk#8 integrate .. //depot/projects/gdb/sys/conf/options#14 integrate .. //depot/projects/gdb/sys/dev/gem/if_gem.c#3 integrate .. //depot/projects/gdb/sys/dev/if_ndis/if_ndis.c#12 integrate .. //depot/projects/gdb/sys/dev/pccbb/pccbb.c#7 integrate .. //depot/projects/gdb/sys/dev/pci/pci.c#8 integrate .. //depot/projects/gdb/sys/i386/acpica/acpi_asus.c#2 integrate .. //depot/projects/gdb/sys/modules/acpi/Makefile#3 integrate .. //depot/projects/gdb/sys/modules/acpi/acpi_asus/Makefile#2 integrate .. //depot/projects/gdb/sys/net/if_gre.c#4 integrate .. //depot/projects/gdb/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#3 integrate .. //depot/projects/gdb/sys/netinet/in_pcb.c#6 integrate .. //depot/projects/gdb/sys/netinet/ip_fw.h#4 integrate .. //depot/projects/gdb/sys/netinet/ip_fw2.c#4 integrate .. //depot/projects/gdb/sys/netinet/tcp_hostcache.c#2 integrate .. //depot/projects/gdb/sys/netinet/tcp_input.c#5 integrate .. //depot/projects/gdb/sys/powerpc/powermac/ata_kauai.c#4 integrate .. //depot/projects/gdb/sys/powerpc/powermac/ata_macio.c#3 integrate .. //depot/projects/gdb/sys/vm/device_pager.c#3 integrate .. //depot/projects/gdb/sys/vm/vnode_pager.c#3 integrate .. //depot/projects/gdb/usr.bin/tar/write.c#6 integrate .. //depot/projects/gdb/usr.bin/vmstat/vmstat.c#4 integrate Differences ... ==== //depot/projects/gdb/UPDATING#12 (text+ko) ==== @@ -17,6 +17,12 @@ developers choose to disable these features on build machines to maximize performance. +20040423: + Due to a new option in ipfw (versrcreach) the ipfw(8) command + needs to be recompiled. Normal accept/reject rules without + options are not affected but those with options may break until + ipfw(8) is recompiled. + 20040420: Due to changes in the callout ABI, kernels compiled after this date may be incompatible with kernel modules compiled prior to @@ -1596,4 +1602,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.306 2004/04/20 15:49:30 cperciva Exp $ +$FreeBSD: src/UPDATING,v 1.307 2004/04/23 14:33:30 andre Exp $ ==== //depot/projects/gdb/etc/rc.d/ipfilter#6 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: ipfilter,v 1.10 2001/02/28 17:03:50 lukem Exp $ -# $FreeBSD: src/etc/rc.d/ipfilter,v 1.20 2004/04/20 13:30:49 darrenr Exp $ +# $FreeBSD: src/etc/rc.d/ipfilter,v 1.21 2004/04/23 15:43:13 darrenr Exp $ # # PROVIDE: ipfilter ==== //depot/projects/gdb/etc/rc.d/ipmon#5 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: ipmon,v 2002/04/18 05:02:01 lukem Exp $ -# $FreeBSD: src/etc/rc.d/ipmon,v 1.10 2004/04/20 13:30:49 darrenr Exp $ +# $FreeBSD: src/etc/rc.d/ipmon,v 1.11 2004/04/23 15:43:13 darrenr Exp $ # # PROVIDE: ipmon ==== //depot/projects/gdb/lib/libarchive/archive_entry.c#9 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.8 2004/04/21 05:13:42 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.9 2004/04/23 17:15:48 kientzle Exp $"); #include #include @@ -150,13 +150,13 @@ aes_copy(struct aes *dest, struct aes *src) { *dest = *src; - if (src->aes_mbs_alloc != NULL) { - dest->aes_mbs_alloc = strdup(src->aes_mbs_alloc); + if (src->aes_mbs != NULL) { + dest->aes_mbs_alloc = strdup(src->aes_mbs); dest->aes_mbs = dest->aes_mbs_alloc; } - if (src->aes_wcs_alloc != NULL) { - dest->aes_wcs_alloc = malloc((wcslen(src->aes_wcs_alloc) + 1) + if (src->aes_wcs != NULL) { + dest->aes_wcs_alloc = malloc((wcslen(src->aes_wcs) + 1) * sizeof(wchar_t)); dest->aes_wcs = dest->aes_wcs_alloc; wcscpy(dest->aes_wcs_alloc, src->aes_wcs); @@ -292,12 +292,12 @@ memset(entry2, 0, sizeof(*entry2)); entry2->ae_stat = entry->ae_stat; - aes_copy(&entry2->ae_fflags ,&entry->ae_fflags); - aes_copy(&entry2->ae_gname ,&entry->ae_gname); - aes_copy(&entry2->ae_hardlink ,&entry->ae_hardlink); + aes_copy(&entry2->ae_fflags, &entry->ae_fflags); + aes_copy(&entry2->ae_gname, &entry->ae_gname); + aes_copy(&entry2->ae_hardlink, &entry->ae_hardlink); aes_copy(&entry2->ae_pathname, &entry->ae_pathname); - aes_copy(&entry2->ae_symlink ,&entry->ae_symlink); - aes_copy(&entry2->ae_uname ,&entry->ae_uname); + aes_copy(&entry2->ae_symlink, &entry->ae_symlink); + aes_copy(&entry2->ae_uname, &entry->ae_uname); return (entry2); } ==== //depot/projects/gdb/lib/libarchive/archive_read_extract.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_extract.c,v 1.7 2004/04/21 05:13:42 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_extract.c,v 1.8 2004/04/23 16:27:37 kientzle Exp $"); #include #include @@ -803,7 +803,7 @@ #ifdef HAVE_CHFLAGS fflags_p = fflags; - if (strtofflags(&fflags_p, &set, &clear) != 0 && + if (strtofflags(&fflags_p, &set, &clear) == 0 && stat(name, &st) == 0) { st.st_flags &= ~clear; st.st_flags |= set; ==== //depot/projects/gdb/lib/libarchive/archive_write_set_format_shar.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_shar.c,v 1.6 2004/04/20 20:21:36 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_shar.c,v 1.7 2004/04/23 17:13:40 kientzle Exp $"); #include #include @@ -130,7 +130,11 @@ int archive_write_set_format_shar_dump(struct archive *a) { + struct shar *shar; + archive_write_set_format_shar(a); + shar = a->format_data; + shar->dump = 1; a->format_write_data = archive_write_shar_data_uuencode; a->archive_format = ARCHIVE_FORMAT_SHAR_DUMP; a->archive_format_name = "shar dump"; ==== //depot/projects/gdb/sbin/ipfw/ipfw.8#5 (text+ko) ==== @@ -1,5 +1,5 @@ .\" -.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.142 2004/03/27 14:13:53 ceri Exp $ +.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.143 2004/04/23 14:28:38 andre Exp $ .\" .Dd December 1, 2003 .Dt IPFW 8 @@ -1230,7 +1230,23 @@ .Pp .Dl ip verify unicast reverse-path .Pp -This option can be used to make anti-spoofing rules. +This option can be used to make anti-spoofing rules to reject all +packets with source addresses not from this interface. +.It Cm versrcreach +For incoming packets, +a routing table lookup is done on the packet's source address. +If a route to the source address exists, but not the default route, +the packet matches. +Otherwise the packet does not match. +All outgoing packets match. +.Pp +The name and functionality of the option is intentionally similar to +the Cisco IOS command: +.Pp +.Dl ip verify unicast source reachable-via any +.Pp +This option can be used to make anti-spoofing rules to reject all +packets whose source address is unreachable. .El .Sh SETS OF RULES Each rule belongs to one of 32 different ==== //depot/projects/gdb/sbin/ipfw/ipfw2.c#4 (text+ko) ==== @@ -17,7 +17,7 @@ * * NEW command line interface for IP firewall facility * - * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.46 2004/04/09 17:26:01 maxim Exp $ + * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.47 2004/04/23 14:28:38 andre Exp $ */ #include @@ -226,6 +226,7 @@ TOK_MAC, TOK_MACTYPE, TOK_VERREVPATH, + TOK_VERSRCREACH, TOK_IPSEC, TOK_COMMENT, @@ -338,6 +339,7 @@ { "mac", TOK_MAC }, { "mac-type", TOK_MACTYPE }, { "verrevpath", TOK_VERREVPATH }, + { "versrcreach", TOK_VERSRCREACH }, { "ipsec", TOK_IPSEC }, { "//", TOK_COMMENT }, @@ -1268,6 +1270,10 @@ printf(" verrevpath"); break; + case O_VERSRCREACH: + printf(" versrcreach"); + break; + case O_IPSEC: printf(" ipsec"); break; @@ -1874,7 +1880,7 @@ " ipttl LIST | ipversion VER | keep-state | layer2 | limit ... |\n" " mac ... | mac-type LIST | proto LIST | {recv|xmit|via} {IF|IPADDR} |\n" " setup | {tcpack|tcpseq|tcpwin} NN | tcpflags SPEC | tcpoptions SPEC |\n" -" verrevpath\n" +" verrevpath | versrcreach\n" ); exit(0); } @@ -3400,6 +3406,10 @@ fill_cmd(cmd, O_VERREVPATH, 0, 0); break; + case TOK_VERSRCREACH: + fill_cmd(cmd, O_VERSRCREACH, 0, 0); + break; + case TOK_IPSEC: fill_cmd(cmd, O_IPSEC, 0, 0); break; ==== //depot/projects/gdb/share/man/man4/man4.i386/Makefile#6 (text+ko) ==== @@ -1,6 +1,7 @@ -# $FreeBSD: src/share/man/man4/man4.i386/Makefile,v 1.167 2004/03/26 06:26:45 non Exp $ +# $FreeBSD: src/share/man/man4/man4.i386/Makefile,v 1.168 2004/04/23 06:29:08 philip Exp $ -MAN= acpi_toshiba.4 \ +MAN= acpi_asus.4 \ + acpi_toshiba.4 \ aic.4 \ alpm.4 \ amdpm.4 \ ==== //depot/projects/gdb/sys/conf/NOTES#14 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1219 2004/04/21 20:18:06 scottl Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1220 2004/04/23 19:48:43 emax Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -441,6 +441,16 @@ options NETGRAPH_VJC options NETGRAPH_ATM_ATMPIF +# NgBluetooth - Netgraph Bluetooth +options NETGRAPH_BLUETOOTH # Common parts +options NETGRAPH_BLUETOOTH_BT3C # 3COM Bluetooth PCCARD +options NETGRAPH_BLUETOOTH_H4 # H4 line discipline +options NETGRAPH_BLUETOOTH_UBT # Bluetooth USB dongle +options NETGRAPH_BLUETOOTH_UBTBCMFW # Firmware driver for BCM2033 +options NETGRAPH_BLUETOOTH_HCI # Bluetooth HCI layer +options NETGRAPH_BLUETOOTH_L2CAP # Bluetooth L2CAP layer +options NETGRAPH_BLUETOOTH_SOCKET # Bluetooth sockets layer + # NgATM - Netgraph ATM options NGATM_ATM options NGATM_ATMBASE ==== //depot/projects/gdb/sys/conf/files#18 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.888 2004/04/20 15:42:16 njl Exp $ +# $FreeBSD: src/sys/conf/files,v 1.889 2004/04/23 19:48:43 emax Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1354,6 +1354,27 @@ contrib/ngatm/netnatm/sig/sig_uni.c optional ngatm_uni contrib/ngatm/netnatm/sig/sig_unimsgcpy.c optional ngatm_uni contrib/ngatm/netnatm/sig/sig_verify.c optional ngatm_uni +netgraph/bluetooth/common/ng_bluetooth.c optional netgraph_bluetooth +netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c optional netgraph_bluetooth_bt3c +netgraph/bluetooth/drivers/h4/ng_h4.c optional netgraph_bluetooth_h4 +netgraph/bluetooth/drivers/ubt/ng_ubt.c optional netgraph_bluetooth_ubt +netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c optional netgraph_bluetooth_ubtbcmfw +netgraph/bluetooth/hci/ng_hci_cmds.c optional netgraph_bluetooth_hci +netgraph/bluetooth/hci/ng_hci_evnt.c optional netgraph_bluetooth_hci +netgraph/bluetooth/hci/ng_hci_main.c optional netgraph_bluetooth_hci +netgraph/bluetooth/hci/ng_hci_misc.c optional netgraph_bluetooth_hci +netgraph/bluetooth/hci/ng_hci_ulpi.c optional netgraph_bluetooth_hci +netgraph/bluetooth/l2cap/ng_l2cap_cmds.c optional netgraph_bluetooth_l2cap +netgraph/bluetooth/l2cap/ng_l2cap_evnt.c optional netgraph_bluetooth_l2cap +netgraph/bluetooth/l2cap/ng_l2cap_llpi.c optional netgraph_bluetooth_l2cap +netgraph/bluetooth/l2cap/ng_l2cap_main.c optional netgraph_bluetooth_l2cap +netgraph/bluetooth/l2cap/ng_l2cap_misc.c optional netgraph_bluetooth_l2cap +netgraph/bluetooth/l2cap/ng_l2cap_ulpi.c optional netgraph_bluetooth_l2cap +netgraph/bluetooth/socket/ng_btsocket.c optional netgraph_bluetooth_socket +netgraph/bluetooth/socket/ng_btsocket_hci_raw.c optional netgraph_bluetooth_socket +netgraph/bluetooth/socket/ng_btsocket_l2cap.c optional netgraph_bluetooth_socket +netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c optional netgraph_bluetooth_socket +netgraph/bluetooth/socket/ng_btsocket_rfcomm.c optional netgraph_bluetooth_socket netgraph/ng_UI.c optional netgraph_UI netgraph/ng_async.c optional netgraph_async netgraph/ng_atmllc.c optional netgraph_atmllc ==== //depot/projects/gdb/sys/conf/files.amd64#6 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.amd64,v 1.30 2004/03/20 19:36:29 alc Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.31 2004/04/23 14:41:23 tjr Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -90,6 +90,9 @@ crypto/des/des_enc.c optional ipsec ipsec_esp crypto/blowfish/bf_enc.c optional crypto crypto/des/des_enc.c optional crypto +crypto/des/des_ecb.c optional netsmbcrypto +crypto/des/des_enc.c optional netsmbcrypto +crypto/des/des_setkey.c optional netsmbcrypto dev/fb/fb.c optional fb dev/fb/fb.c optional vga dev/fb/splash.c optional splash ==== //depot/projects/gdb/sys/conf/kern.pre.mk#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.50 2004/03/29 01:15:39 kensmith Exp $ +# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.51 2004/04/23 19:48:43 emax Exp $ # Part of a unified Makefile for building kernels. This part contains all # of the definitions that need to be before %BEFORE_DEPEND. @@ -63,6 +63,15 @@ # ... and the same for the NgATM stuff INCLUDES+= -I$S/contrib/ngatm +# ... and the same for the NgBluetooth stuff +INCLUDES+= -I$S/netgraph/bluetooth/include +INCLUDES+= -I$S/netgraph/bluetooth/drivers/bt3c +INCLUDES+= -I$S/netgraph/bluetooth/drivers/h4 +INCLUDES+= -I$S/netgraph/bluetooth/drivers/ubt +INCLUDES+= -I$S/netgraph/bluetooth/drivers/ubtbcmfw +INCLUDES+= -I$S/netgraph/bluetooth/hci +INCLUDES+= -I$S/netgraph/bluetooth/l2cap + COPTS= ${INCLUDES} -D_KERNEL -include opt_global.h CFLAGS= ${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS} .if ${CC} != "icc" ==== //depot/projects/gdb/sys/conf/options#14 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.442 2004/04/21 20:18:06 scottl Exp $ +# $FreeBSD: src/sys/conf/options,v 1.443 2004/04/23 19:48:43 emax Exp $ # # On the handling of kernel options # @@ -383,6 +383,16 @@ NETGRAPH_VJC opt_netgraph.h NETGRAPH_ATM_ATMPIF opt_netgraph.h +# NgBluetooth options +NETGRAPH_BLUETOOTH opt_netgraph.h +NETGRAPH_BLUETOOTH_BT3C opt_netgraph.h +NETGRAPH_BLUETOOTH_H4 opt_netgraph.h +NETGRAPH_BLUETOOTH_UBT opt_netgraph.h +NETGRAPH_BLUETOOTH_UBTBCMFW opt_netgraph.h +NETGRAPH_BLUETOOTH_HCI opt_netgraph.h +NETGRAPH_BLUETOOTH_L2CAP opt_netgraph.h +NETGRAPH_BLUETOOTH_SOCKET opt_netgraph.h + # NgATM options NGATM_ATM opt_netgraph.h NGATM_ATMBASE opt_netgraph.h ==== //depot/projects/gdb/sys/dev/gem/if_gem.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/gem/if_gem.c,v 1.21 2004/03/20 20:12:12 mdodd Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/gem/if_gem.c,v 1.22 2004/04/23 19:43:35 tmm Exp $"); /* * Driver for Sun GEM ethernet controllers. @@ -237,11 +237,11 @@ /* Get RX FIFO size */ sc->sc_rxfifosize = 64 * bus_space_read_4(sc->sc_bustag, sc->sc_h, GEM_RX_FIFO_SIZE); - printf(", %uKB RX fifo", sc->sc_rxfifosize / 1024); /* Get TX FIFO size */ v = bus_space_read_4(sc->sc_bustag, sc->sc_h, GEM_TX_FIFO_SIZE); - printf(", %uKB TX fifo\n", v / 16); + device_printf(sc->sc_dev, "%ukB RX FIFO, %ukB TX FIFO\n", + sc->sc_rxfifosize / 1024, v / 16); /* Initialize ifnet structure. */ ifp->if_softc = sc; ==== //depot/projects/gdb/sys/dev/if_ndis/if_ndis.c#12 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis.c,v 1.56 2004/04/22 21:49:18 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis.c,v 1.57 2004/04/23 17:15:14 wpaul Exp $"); #include "opt_bdg.h" @@ -687,9 +687,9 @@ struct ifnet *ifp; sc = device_get_softc(dev); - KASSERT(mtx_initialized(sc->ndis_mtx), + KASSERT(mtx_initialized(&sc->ndis_mtx), ("ndis mutex not initialized")); - KASSERT(mtx_initialized(sc->ndis_intrmtx), + KASSERT(mtx_initialized(&sc->ndis_intrmtx), ("ndis interrupt mutex not initialized")); NDIS_LOCK(sc); ifp = &sc->arpcom.ac_if; @@ -1032,6 +1032,8 @@ ndis_media_state linkstate; int error, len; + mtx_unlock(&Giant); + sc = xsc; hangfunc = sc->ndis_chars.nmc_checkhang_func; @@ -1066,6 +1068,8 @@ NDIS_UNLOCK(sc); + mtx_lock(&Giant); + return; } ==== //depot/projects/gdb/sys/dev/pccbb/pccbb.c#7 (text+ko) ==== @@ -73,7 +73,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/pccbb/pccbb.c,v 1.108 2004/04/13 14:39:26 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/pccbb/pccbb.c,v 1.109 2004/04/23 05:25:13 imp Exp $"); #include #include @@ -683,9 +683,12 @@ static int cbb_attach(device_t brdev) { + static int curr_bus_number = 1; /* XXX EVILE BAD (see below) */ struct cbb_softc *sc = (struct cbb_softc *)device_get_softc(brdev); - int rid; + int rid, bus, pribus; + device_t parent; + parent = device_get_parent(brdev); mtx_init(&sc->mtx, device_get_nameunit(brdev), "cbb", MTX_DEF); cv_init(&sc->cv, "cbb cv"); sc->chipset = cbb_chipset(pci_get_devid(brdev), NULL); @@ -759,6 +762,32 @@ sc->exca.chipset = EXCA_CARDBUS; cbb_chipinit(sc); + /* + * This is a gross hack. We should be scanning the entire pci + * tree, assigning bus numbers in a way such that we (1) can + * reserve 1 extra bus just in case and (2) all sub busses + * are in an appropriate range. + */ + bus = pci_read_config(brdev, PCIR_SECBUS_2, 1); + pribus = pcib_get_bus(parent); + DEVPRINTF((brdev, "Secondary bus is %d\n", bus)); + if (bus == 0) { + if (curr_bus_number < pribus) + curr_bus_number = pribus + 1; + if (pci_read_config(brdev, PCIR_PRIBUS_2, 1) != pribus) { + DEVPRINTF((brdev, "Setting primary bus to %d\n", pribus)); + pci_write_config(brdev, PCIR_PRIBUS_2, pribus, 1); + } + bus = curr_bus_number; + DEVPRINTF((brdev, "Secondary bus set to %d subbus %d\n", bus, + bus + 1)); + sc->secbus = bus; + sc->subbus = bus + 1; + pci_write_config(brdev, PCIR_SECBUS_2, bus, 1); + pci_write_config(brdev, PCIR_SUBBUS_2, bus + 1, 1); + curr_bus_number += 2; + } + /* attach children */ sc->cbdev = device_add_child(brdev, "cardbus", -1); if (sc->cbdev == NULL) ==== //depot/projects/gdb/sys/dev/pci/pci.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/pci/pci.c,v 1.247 2004/04/21 20:19:56 imp Exp $ + * $FreeBSD: src/sys/dev/pci/pci.c,v 1.248 2004/04/23 15:48:48 marius Exp $ * */ @@ -825,11 +825,13 @@ if (base == 0) return 1; +#ifdef __sparc64__ /* Sun EBus bridges contain the ranges for the devices beyond them */ if ((pci_get_class(dev) == PCIC_BRIDGE) && (pci_get_vendor(dev) == 0x108e) && (pci_get_device(dev) == 0x1000 || pci_get_device(dev) == 0x1100)) return 1; +#endif start = base; end = base + (1 << ln2size) - 1; ==== //depot/projects/gdb/sys/i386/acpica/acpi_asus.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/acpica/acpi_asus.c,v 1.1 2004/04/22 21:29:01 philip Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/acpica/acpi_asus.c,v 1.2 2004/04/23 17:41:04 philip Exp $"); /* * Driver for extra ACPI-controlled gadgets (hotkeys, leds, etc) found on @@ -40,10 +40,6 @@ * Asus laptop which doesn't appear to be supported, or strange things happen * when using this driver, please report to . * - * XXX: - * Led support is disabled for the time being because it causes the kernel to - * panic when unloading the module. This is being investigated. - * */ #include "opt_acpi.h" @@ -173,11 +169,9 @@ static int acpi_asus_attach(device_t dev); static int acpi_asus_detach(device_t dev); -#ifdef notyet static void acpi_asus_mled(device_t dev, int state); static void acpi_asus_tled(device_t dev, int state); static void acpi_asus_wled(device_t dev, int state); -#endif static int acpi_asus_sysctl_brn(SYSCTL_HANDLER_ARGS); static int acpi_asus_sysctl_lcd(SYSCTL_HANDLER_ARGS); @@ -285,7 +279,6 @@ SYSCTL_CHILDREN(acpi_sc->acpi_sysctl_tree), OID_AUTO, "asus", CTLFLAG_RD, 0, ""); -#ifdef notyet /* Attach leds */ if (sc->model->mled_set) sc->s_mled = led_create((led_t *)acpi_asus_mled, dev, "mled"); @@ -295,7 +288,6 @@ if (sc->model->wled_set) sc->s_wled = led_create((led_t *)acpi_asus_wled, dev, "wled"); -#endif /* Attach brightness for GPLV/SPLV models */ if (sc->model->brn_get && @@ -385,7 +377,6 @@ sc = device_get_softc(dev); -#ifdef notyet /* Turn the lights off */ if (sc->model->mled_set) led_destroy(sc->s_mled); @@ -395,7 +386,6 @@ if (sc->model->wled_set) led_destroy(sc->s_wled); -#endif /* Remove notify handler */ AcpiRemoveNotifyHandler(sc->handle, @@ -407,7 +397,6 @@ return (0); } -#ifdef notyet static void acpi_asus_mled(device_t dev, int state) { @@ -467,7 +456,6 @@ AcpiEvaluateObject(sc->handle, sc->model->wled_set, &Args, NULL); } -#endif static int acpi_asus_sysctl_brn(SYSCTL_HANDLER_ARGS) ==== //depot/projects/gdb/sys/modules/acpi/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ -# $FreeBSD: src/sys/modules/acpi/Makefile,v 1.38 2004/03/01 08:15:26 njl Exp $ +# $FreeBSD: src/sys/modules/acpi/Makefile,v 1.39 2004/04/23 06:29:08 philip Exp $ -SUBDIR= acpi acpi_toshiba acpi_video +SUBDIR= acpi acpi_asus acpi_toshiba acpi_video .include ==== //depot/projects/gdb/sys/modules/acpi/acpi_asus/Makefile#2 (text+ko) ==== @@ -1,10 +1,9 @@ -# $FreeBSD: src/sys/modules/acpi/acpi_asus/Makefile,v 1.1 2004/04/22 21:30:56 philip Exp $ +# $FreeBSD: src/sys/modules/acpi/acpi_asus/Makefile,v 1.2 2004/04/23 17:41:05 philip Exp $ -.PATH: ${.CURDIR}/../../../i386/acpica \ - ${.CURDIR}/../../../dev/led +.PATH: ${.CURDIR}/../../../i386/acpica KMOD= acpi_asus CFLAGS+= -I${.CURDIR}/../../../contrib/dev/acpica -SRCS= acpi_asus.c led.c opt_acpi.h device_if.h bus_if.h +SRCS= acpi_asus.c opt_acpi.h device_if.h bus_if.h .include ==== //depot/projects/gdb/sys/net/if_gre.c#4 (text+ko) ==== @@ -359,7 +359,7 @@ goto end; } - if (m == NULL) { /* impossible */ + if (m == NULL) { /* mbuf allocation failed */ _IF_DROP(&ifp->if_snd); error = ENOBUFS; goto end; @@ -385,8 +385,12 @@ ifp->if_opackets++; ifp->if_obytes += m->m_pkthdr.len; - /* send it off */ - error = ip_output(m, NULL, &sc->route, 0, + /* + * Send it off and with IP_FORWARD flag to prevent it from + * overwriting the ip_id again. ip_id is already set to the + * ip_id of the encapsulated packet. + */ + error = ip_output(m, NULL, &sc->route, IP_FORWARDING, (struct ip_moptions *)NULL, (struct inpcb *)NULL); end: sc->called = 0; ==== //depot/projects/gdb/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * $Id: ng_btsocket_rfcomm.c,v 1.28 2003/09/14 23:29:06 max Exp $ - * $FreeBSD: src/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c,v 1.4 2004/03/01 03:14:22 rwatson Exp $ + * $FreeBSD: src/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c,v 1.5 2004/04/23 20:21:17 emax Exp $ */ #include @@ -2065,9 +2065,12 @@ if (dlci == 0) { /* XXX FIXME assume that remote side will close the socket */ error = ng_btsocket_rfcomm_send_command(s, RFCOMM_FRAME_UA, 0); - if (error == 0) - s->state = NG_BTSOCKET_RFCOMM_SESSION_DISCONNECTING; - else + if (error == 0) { + if (s->state == NG_BTSOCKET_RFCOMM_SESSION_DISCONNECTING) + s->state = NG_BTSOCKET_RFCOMM_SESSION_CLOSED; /* XXX */ + else + s->state = NG_BTSOCKET_RFCOMM_SESSION_DISCONNECTING; + } else s->state = NG_BTSOCKET_RFCOMM_SESSION_CLOSED; /* XXX */ ng_btsocket_rfcomm_session_clean(s); ==== //depot/projects/gdb/sys/netinet/in_pcb.c#6 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)in_pcb.c 8.4 (Berkeley) 5/24/95 - * $FreeBSD: src/sys/netinet/in_pcb.c,v 1.145 2004/04/22 08:34:55 silby Exp $ + * $FreeBSD: src/sys/netinet/in_pcb.c,v 1.146 2004/04/23 23:29:49 silby Exp $ */ #include "opt_ipsec.h" @@ -416,7 +416,8 @@ * counting down */ if (ipport_randomized) - *lastport = first - (arc4random() % (first - last)); + *lastport = first - + (arc4random() % (first - last)); count = first - last; do { @@ -433,7 +434,8 @@ * counting up */ if (ipport_randomized) - *lastport = first + (arc4random() % (last - first)); + *lastport = first + + (arc4random() % (last - first)); count = last - first; do { ==== //depot/projects/gdb/sys/netinet/ip_fw.h#4 (text+ko) ==== @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/netinet/ip_fw.h,v 1.83 2004/02/25 19:55:28 mlaier Exp $ + * $FreeBSD: src/sys/netinet/ip_fw.h,v 1.84 2004/04/23 14:27:27 andre Exp $ */ #ifndef _IPFW2_H @@ -95,6 +95,7 @@ O_TCPOPTS, /* arg1 = 2*u8 bitmap */ O_VERREVPATH, /* none */ + O_VERSRCREACH, /* none */ O_PROBE_STATE, /* none */ O_KEEP_STATE, /* none */ ==== //depot/projects/gdb/sys/netinet/ip_fw2.c#4 (text+ko) ==== @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/netinet/ip_fw2.c,v 1.56 2004/02/25 19:55:28 mlaier Exp $ + * $FreeBSD: src/sys/netinet/ip_fw2.c,v 1.57 2004/04/23 14:27:27 andre Exp $ */ #define DEB(x) @@ -439,21 +439,27 @@ } /* + * The verify_path function checks if a route to the src exists and + * if it is reachable via ifp (when provided). + * * The 'verrevpath' option checks that the interface that an IP packet * arrives on is the same interface that traffic destined for the - * packet's source address would be routed out of. This is a measure - * to block forged packets. This is also commonly known as "anti-spoofing" - * or Unicast Reverse Path Forwarding (Unicast RFP) in Cisco-ese. The - * name of the knob is purposely reminisent of the Cisco IOS command, + * packet's source address would be routed out of. The 'versrcreach' + * option just checks that the source address is reachable via any route + * (except default) in the routing table. These two are a measure to block + * forged packets. This is also commonly known as "anti-spoofing" or Unicast + * Reverse Path Forwarding (Unicast RFP) in Cisco-ese. The name of the knobs + * is purposely reminiscent of the Cisco IOS command, * * ip verify unicast reverse-path + * ip verify unicast source reachable-via any * * which implements the same functionality. But note that syntax is * misleading. The check may be performed on all IP packets whether unicast, * multicast, or broadcast. */ static int -verify_rev_path(struct in_addr src, struct ifnet *ifp) +verify_path(struct in_addr src, struct ifnet *ifp) { struct route ro; struct sockaddr_in *dst; @@ -468,10 +474,21 @@ if (ro.ro_rt == NULL) return 0; - if ((ifp == NULL) || (ro.ro_rt->rt_ifp->if_index != ifp->if_index)) { + + /* if ifp is provided, check for equality with rtentry */ + if (ifp != NULL && ro.ro_rt->rt_ifp != ifp) { + RTFREE(ro.ro_rt); + return 0; + } + + /* if no ifp provided, check if rtentry is not default route */ + if (ifp == NULL && + satosin(rt_key(ro.ro_rt))->sin_addr.s_addr == INADDR_ANY) { RTFREE(ro.ro_rt); return 0; } + + /* found valid route */ RTFREE(ro.ro_rt); return 1; } @@ -1911,7 +1928,13 @@ /* Outgoing packets automatically pass/match */ match = ((oif != NULL) || (m->m_pkthdr.rcvif == NULL) || - verify_rev_path(src_ip, m->m_pkthdr.rcvif)); + verify_path(src_ip, m->m_pkthdr.rcvif)); + break; + + case O_VERSRCREACH: + /* Outgoing packets automatically pass/match */ + match = ((oif != NULL) || + verify_path(src_ip, NULL)); break; case O_IPSEC: @@ -2546,6 +2569,7 @@ case O_TCPOPTS: case O_ESTAB: case O_VERREVPATH: + case O_VERSRCREACH: case O_IPSEC: if (cmdlen != F_INSN_SIZE(ipfw_insn)) goto bad_size; ==== //depot/projects/gdb/sys/netinet/tcp_hostcache.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/netinet/tcp_hostcache.c,v 1.3 2003/12/02 21:25:12 andre Exp $ + * $FreeBSD: src/sys/netinet/tcp_hostcache.c,v 1.4 2004/04/23 13:54:28 andre Exp $ */ /* @@ -700,7 +700,7 @@ static void tcp_hc_purge(void *arg) { - struct hc_metrics *hc_entry; + struct hc_metrics *hc_entry, *hc_next; int all = (intptr_t)arg; int i; @@ -711,8 +711,8 @@ for (i = 0; i < tcp_hostcache.hashsize; i++) { THC_LOCK(&tcp_hostcache.hashbase[i].hch_mtx); - TAILQ_FOREACH(hc_entry, &tcp_hostcache.hashbase[i].hch_bucket, - rmx_q) { + TAILQ_FOREACH_SAFE(hc_entry, &tcp_hostcache.hashbase[i].hch_bucket, + rmx_q, hc_next) { if (all || hc_entry->rmx_expire <= 0) { TAILQ_REMOVE(&tcp_hostcache.hashbase[i].hch_bucket, hc_entry, rmx_q); ==== //depot/projects/gdb/sys/netinet/tcp_input.c#5 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)tcp_input.c 8.12 (Berkeley) 5/24/95 - * $FreeBSD: src/sys/netinet/tcp_input.c,v 1.233 2004/04/07 20:46:13 imp Exp $ + * $FreeBSD: src/sys/netinet/tcp_input.c,v 1.234 2004/04/23 22:44:59 andre Exp $ */ #include "opt_ipfw.h" /* for ipfw_fwd */ @@ -2793,7 +2793,7 @@ so = inp->inp_socket; /* - * no route to sender, take default mss and return + * no route to sender, stay with default mss and return */ if (maxmtu == 0) return; @@ -2851,7 +2851,7 @@ * else, use the link mtu. */ if (metrics.rmx_mtu) - mss = metrics.rmx_mtu - min_protoh; + mss = min(metrics.rmx_mtu, maxmtu) - min_protoh; else { #ifdef INET6 if (isipv6) { ==== //depot/projects/gdb/sys/powerpc/powermac/ata_kauai.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ * */ #include -__FBSDID("$FreeBSD: src/sys/powerpc/powermac/ata_kauai.c,v 1.3 2004/03/31 07:40:46 grehan Exp $"); +__FBSDID("$FreeBSD: src/sys/powerpc/powermac/ata_kauai.c,v 1.4 2004/04/23 23:39:53 grehan Exp $"); /* * Mac 'Kauai' PCI ATA controller @@ -169,6 +169,7 @@ } ch = device_get_softc(dev); + bzero(ch, sizeof(struct ata_channel)); rid = PCIR_BARS; mem = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, RF_ACTIVE); @@ -192,6 +193,7 @@ ch->locking = ata_kauai_locknoop; ch->device[MASTER].setmode = ata_kauai_setmode; ch->device[SLAVE].setmode = ata_kauai_setmode; + ata_generic_hw(ch); return (ata_probe(dev)); } ==== //depot/projects/gdb/sys/powerpc/powermac/ata_macio.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/powerpc/powermac/ata_macio.c,v 1.9 2004/01/15 23:52:32 grehan Exp $ + * $FreeBSD: src/sys/powerpc/powermac/ata_macio.c,v 1.10 2004/04/23 23:39:53 grehan Exp $ */ /* @@ -50,9 +50,9 @@ #include #include -/* +/* * Offset to control registers from base -*/ + */ #define ATA_MACIO_ALTOFFSET 0x160 /* >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Apr 24 14:18:46 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7252416A4D0; Sat, 24 Apr 2004 14:18:46 -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 4E62A16A4CE for ; Sat, 24 Apr 2004 14:18:46 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4778843D62 for ; Sat, 24 Apr 2004 14:18:46 -0700 (PDT) (envelope-from julian@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 i3OLIkGe018190 for ; Sat, 24 Apr 2004 14:18:46 -0700 (PDT) (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i3OLIjei018187 for perforce@freebsd.org; Sat, 24 Apr 2004 14:18:45 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Sat, 24 Apr 2004 14:18:45 -0700 (PDT) Message-Id: <200404242118.i3OLIjei018187@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Subject: PERFORCE change 51666 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: Sat, 24 Apr 2004 21:18:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=51666 Change 51666 by julian@julian_jules1 on 2004/04/24 14:18:13 flush changes hanging around.. change a function name to better describe it. Affected files ... .. //depot/projects/nsched/sys/kern/sched_4bsd.c#5 edit Differences ... ==== //depot/projects/nsched/sys/kern/sched_4bsd.c#5 (text+ko) ==== @@ -163,7 +163,7 @@ void kse_stash(struct kse *ke); void kse_reassign(struct kse *ke); void sched_fork_kse(struct thread *parenttd, struct kse *newke); -void sched_exit_kse(struct proc *parent, struct thread *childtd); +void sched_unrun_kse(struct proc *parent, struct thread *childtd); #define KTR_4BSD 0x0 @@ -651,6 +651,8 @@ { sched_exit_ksegrp(parent, childtd); sched_exit_thread(parent, childtd); + if (childtd->td_kse) + sched_unrun_kse(parent, childtd); } /* This PROBABLY gives the estcpu to the wrong kseg */ @@ -670,8 +672,6 @@ { if ((childtd->td_proc->p_flag & P_NOLOAD) == 0) sched_tdcnt--; - if (childtd->td_kse) - sched_exit_kse(parent, childtd); } void @@ -1098,7 +1098,7 @@ ke->ke_state = KES_UNQUEUED; ke->ke_thread = NULL; kse_unlink(ke); - sched_exit_kse(td->td_proc->p_pptr, td); + sched_unrun_kse(td->td_proc->p_pptr, td); td->td_kse = NULL; td->td_last_kse = NULL; } @@ -1266,15 +1266,19 @@ } } +/* + * The current KSE is being dumped. Clear stuff and + * look to see if another thread needs us. + */ void -sched_exit_kse(struct proc *parent, struct thread *childtd) +sched_unrun_kse(struct proc *parent, struct thread *childtd) { struct ksegrp *kg; struct kse *ke; kg = childtd->td_ksegrp; ke = childtd->td_kse; - KASSERT((ke),("unexpected null KSE ptr in sched_exit_kse()")); + KASSERT((ke),("unexpected null KSE ptr in sched_unrun_kse()")); ke->ke_state = KES_UNQUEUED; ke->ke_thread = NULL; /* From owner-p4-projects@FreeBSD.ORG Sat Apr 24 15:19:02 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 80E4216A4D0; Sat, 24 Apr 2004 15:19:02 -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 4384516A4CE for ; Sat, 24 Apr 2004 15:19:02 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 37B1843D1D for ; Sat, 24 Apr 2004 15:19:02 -0700 (PDT) (envelope-from marcel@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 i3OMJ2Ge031376 for ; Sat, 24 Apr 2004 15:19:02 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i3OMJ1PU031373 for perforce@freebsd.org; Sat, 24 Apr 2004 15:19:01 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Sat, 24 Apr 2004 15:19:01 -0700 (PDT) Message-Id: <200404242219.i3OMJ1PU031373@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 51671 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: Sat, 24 Apr 2004 22:19:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=51671 Change 51671 by marcel@marcel_nfs on 2004/04/24 15:18:26 IFC @51667 Affected files ... .. //depot/projects/gdb/lib/libthr/thread/thr_spinlock.c#3 integrate .. //depot/projects/gdb/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#13 integrate .. //depot/projects/gdb/share/Makefile#3 integrate .. //depot/projects/gdb/share/man/man4/aue.4#2 integrate .. //depot/projects/gdb/share/snmp/Makefile#1 branch .. //depot/projects/gdb/share/snmp/mibs/FREEBSD-MIB.txt#1 branch .. //depot/projects/gdb/share/snmp/mibs/Makefile#1 branch .. //depot/projects/gdb/sys/alpha/alpha/pmap.c#5 integrate .. //depot/projects/gdb/sys/compat/freebsd32/freebsd32_misc.c#5 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_timer.c#6 integrate .. //depot/projects/gdb/sys/dev/ata/ata-chipset.c#7 integrate .. //depot/projects/gdb/sys/dev/ata/ata-pci.c#6 integrate .. //depot/projects/gdb/sys/dev/puc/pucdata.c#4 integrate .. //depot/projects/gdb/sys/pci/agp.c#5 integrate .. //depot/projects/gdb/sys/pci/agp_i810.c#4 integrate .. //depot/projects/gdb/sys/sys/imgact.h#4 integrate .. //depot/projects/gdb/sys/vm/vm_kern.c#4 integrate .. //depot/projects/gdb/sys/vm/vm_map.c#6 integrate .. //depot/projects/gdb/sys/vm/vm_map.h#4 integrate .. //depot/projects/gdb/sys/vm/vm_page.c#6 integrate Differences ... ==== //depot/projects/gdb/lib/libthr/thread/thr_spinlock.c#3 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_spinlock.c,v 1.9 2004/01/22 15:31:56 mtm Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_spinlock.c,v 1.10 2004/04/24 09:38:41 mtm Exp $ * */ @@ -80,10 +80,6 @@ { struct pthread_spinlock *s; - if (*lock != NULL) { - if ((*lock)->s_magic == THR_SPIN_MAGIC) - return (EBUSY); - } s = (struct pthread_spinlock *)malloc(sizeof(struct pthread_spinlock)); if (s == NULL) return (ENOMEM); ==== //depot/projects/gdb/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#13 (text+ko) ==== @@ -3,7 +3,7 @@ The FreeBSD Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.720 2004/04/20 18:37:33 hrs Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.721 2004/04/24 17:30:32 hrs Exp $ 2000 @@ -186,6 +186,10 @@ Kernel Changes + The &man.acpi.asus.4; driver has been added + to use ACPI-controlled hardware features such as hot keys and + LCD on ASUSTek laptops. + The &man.acpi.toshiba.4; driver has been added to use Toshiba's Hardware Control Interface to manipulate certain hardware features on Toshiba laptops. @@ -358,7 +362,7 @@ The &man.ng.hub.4; Netgraph node type, which supports a simple packet distribution that acts like an Ethernet hub - has been added. + has been added. &merged; The &man.ng.vlan.4; Netgraph node type, which supports IEEE 802.1Q VLAN tagging has been added. &merged; @@ -390,7 +394,7 @@ support for USB Ethernet adapters based on the Davicom DM9601 chipset. - The &man.vr.4; driver now supports &man.polling.4;. + The &man.vr.4; driver now supports &man.polling.4;. &merged; The hardware TX checksum support in the &man.xl.4; driver has been disabled as it does not work correctly and slows down @@ -401,7 +405,7 @@ (&man.dc.4;, &man.fxp.4;, &man.em.4;, &man.nge.4;, &man.re.4;, &man.rl.4;, &man.sis.4;, &man.ste.4;, and &man.vr.4;) now also support this capability and it can be controlled - via &man.ifconfig.8;. + via &man.ifconfig.8;. &merged; @@ -414,6 +418,20 @@ The &man.gre.4; tunnel driver now supports WCCP version 2. + &man.ipfw.4; rules now support the versrcreach + option to verify that a valid route to the source address + of a packet exists in the routing table. + This option is very useful for routers with a complete view of + the Internet (BGP) in the routing table to reject packets with + spoofed or unroutable source addresses. For example, + + deny ip from any to any not versrcreach + + is equivalent to the following in Cisco IOS syntax: + + ip verify unicast source reachable-via any + + Some bugs in the IPsec implementation from the KAME Project have been fixed. These bugs were related to freeing memory objects before all references to them were removed, and @@ -455,7 +473,9 @@ be increasing, no matter how quickly the port is recycled. The random ephemeral port allocation, which come from OpenBSD - has been implemented. + has been implemented. This is enabled by default and can be disabled + using the net.inet.ip.portrange.randomized + sysctl. &merged; @@ -649,6 +669,9 @@ for the benefit of the misc/utf8locale port. + An Israel Hebrew locale he_IL.UTF-8 + has been added. + The &man.logins.1; utility has been added to display information about user and system accounts. ==== //depot/projects/gdb/share/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/5/93 -# $FreeBSD: src/share/Makefile,v 1.31 2004/01/20 13:09:29 ru Exp $ +# $FreeBSD: src/share/Makefile,v 1.32 2004/04/24 19:54:54 phk Exp $ # Do not include `info' in the SUBDIR list, it is handled separately. @@ -18,6 +18,7 @@ numericdef \ ${_sendmail} \ skel \ + snmp \ syscons \ tabset \ termcap \ ==== //depot/projects/gdb/share/man/man4/aue.4#2 (text+ko) ==== @@ -28,7 +28,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/aue.4,v 1.17 2004/01/09 15:47:54 simon Exp $ +.\" $FreeBSD: src/share/man/man4/aue.4,v 1.18 2004/04/24 12:30:59 simon Exp $ .\" .Dd December 25, 1999 .Dt AUE 4 @@ -79,6 +79,8 @@ .It Planex UE-200TX .It +Sandberg USB to Network Link (model number 133\-06) +.It Siemens Speedstream .It SmartBridges smartNIC ==== //depot/projects/gdb/sys/alpha/alpha/pmap.c#5 (text+ko) ==== @@ -148,7 +148,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.143 2004/04/11 05:08:26 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.144 2004/04/24 20:53:54 alc Exp $"); #include #include @@ -1194,8 +1194,6 @@ VM_OBJECT_LOCK(pmap->pm_pteobj); m = vm_page_grab(pmap->pm_pteobj, ptepindex, VM_ALLOC_WIRED | VM_ALLOC_ZERO | VM_ALLOC_RETRY); - if ((m->flags & PG_ZERO) == 0) - pmap_zero_page(m); KASSERT(m->queue == PQ_NONE, ("_pmap_allocpte: %p->queue != PQ_NONE", m)); @@ -1242,7 +1240,6 @@ vm_page_lock_queues(); m->valid = VM_PAGE_BITS_ALL; - vm_page_flag_clear(m, PG_ZERO); vm_page_wakeup(m); vm_page_unlock_queues(); if (!is_object_locked) ==== //depot/projects/gdb/sys/compat/freebsd32/freebsd32_misc.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.21 2004/04/14 23:17:37 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.22 2004/04/24 04:31:59 marcel Exp $"); #include "opt_compat.h" @@ -120,6 +120,7 @@ return (error); } +#ifdef COMPAT_FREEBSD4 static void copy_statfs(struct statfs *in, struct statfs32 *out) { @@ -146,7 +147,9 @@ bcopy(in->f_mntfromname, out->f_mntfromname, min(MNAMELEN, FREEBSD4_MNAMELEN)); } +#endif +#ifdef COMPAT_FREEBSD4 int freebsd4_freebsd32_getfsstat(struct thread *td, struct freebsd4_freebsd32_getfsstat_args *uap) { @@ -179,6 +182,7 @@ } return (error); } +#endif struct sigaltstack32 { u_int32_t ss_sp; @@ -869,6 +873,7 @@ return (error); } +#ifdef COMPAT_FREEBSD4 int freebsd4_freebsd32_statfs(struct thread *td, struct freebsd4_freebsd32_statfs_args *uap) { @@ -895,7 +900,9 @@ } return (error); } +#endif +#ifdef COMPAT_FREEBSD4 int freebsd4_freebsd32_fstatfs(struct thread *td, struct freebsd4_freebsd32_fstatfs_args *uap) { @@ -922,7 +929,9 @@ } return (error); } +#endif +#ifdef COMPAT_FREEBSD4 int freebsd4_freebsd32_fhstatfs(struct thread *td, struct freebsd4_freebsd32_fhstatfs_args *uap) { @@ -949,6 +958,7 @@ } return (error); } +#endif int freebsd32_semsys(struct thread *td, struct freebsd32_semsys_args *uap) ==== //depot/projects/gdb/sys/dev/acpica/acpi_timer.c#6 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi_timer.c,v 1.31 2004/04/22 01:50:08 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi_timer.c,v 1.32 2004/04/24 16:25:00 njl Exp $ */ #include "opt_acpi.h" #include @@ -99,12 +99,7 @@ static u_int acpi_timer_read() { - uint32_t tv; - - tv = bus_space_read_4(acpi_timer_bst, acpi_timer_bsh, 0); - bus_space_barrier(acpi_timer_bst, acpi_timer_bsh, 0, 4, - BUS_SPACE_BARRIER_READ); - return (tv); + return (bus_space_read_4(acpi_timer_bst, acpi_timer_bsh, 0)); } /* @@ -277,9 +272,13 @@ { uint32_t last, this; int min, max, n, delta; + register_t s; min = 10000000; max = 0; + + /* Test the timer with interrupts disabled to get accurate results. */ + s = intr_disable(); last = acpi_timer_read(); for (n = 0; n < N; n++) { this = acpi_timer_read(); @@ -290,6 +289,8 @@ min = delta; last = this; } + intr_restore(s); + if (max - min > 2) n = 0; else if (min < 0 || max == 0) ==== //depot/projects/gdb/sys/dev/ata/ata-chipset.c#7 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.69 2004/04/21 20:03:26 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.70 2004/04/24 15:54:20 sos Exp $"); #include "opt_ata.h" #include @@ -2350,15 +2350,15 @@ break; case SIS66: case SIS100OLD: - pci_write_config(dev, 0x52, pci_read_config(dev, 0x52, 1) | 0x04, 1); + pci_write_config(dev, 0x52, pci_read_config(dev, 0x52, 1) & ~0x04, 1); break; case SIS100NEW: case SIS133OLD: - pci_write_config(dev, 0x49, pci_read_config(dev, 0x49, 1) | 0x01, 1); + pci_write_config(dev, 0x49, pci_read_config(dev, 0x49, 1) & ~0x01, 1); break; case SIS133NEW: - pci_write_config(dev, 0x50, pci_read_config(dev, 0x50, 2) & 0xfff7, 2); - pci_write_config(dev, 0x52, pci_read_config(dev, 0x52, 2) & 0xfff7, 2); + pci_write_config(dev, 0x50, pci_read_config(dev, 0x50, 2) | 0x0008, 2); + pci_write_config(dev, 0x52, pci_read_config(dev, 0x52, 2) | 0x0008, 2); break; case SISSATA: pci_write_config(dev, 0x04, pci_read_config(dev, 0x04, 2) & ~0x0400, 2); ==== //depot/projects/gdb/sys/dev/ata/ata-pci.c#6 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.80 2004/04/21 20:03:26 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.81 2004/04/24 16:32:06 sos Exp $"); #include "opt_ata.h" #include @@ -177,25 +177,9 @@ ctlr->locking = ata_pci_locknoop; progif = pci_read_config(dev, PCIR_PROGIF, 1); - if ((progif & 0x85) == 0x80) + if ((progif & 0x80)) prisec = 1; - /* if this device supports PCI native addressing use it */ -#if 0 - if ((progif & 0x8a) == 0x8a) { - if (pci_read_config(dev, PCIR_BAR(0), 4) && - pci_read_config(dev, PCIR_BAR(2), 4)) { - device_printf(dev, "setting native PCI addressing mode "); - pci_write_config(dev, PCIR_PROGIF, progif | 0x05, 1); - if ((pci_read_config(dev, PCIR_PROGIF, 1) & 0x05) != 0x05) { - pci_write_config(dev, PCIR_PROGIF, progif & ~0x05, 1); - printf("failed, using compat method\n"); - } - else - printf("succeded\n"); - } - } -#endif /* if needed try to enable busmastering */ cmd = pci_read_config(dev, PCIR_COMMAND, 2); if (!(cmd & PCIM_CMD_BUSMASTEREN)) { ==== //depot/projects/gdb/sys/dev/puc/pucdata.c#4 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/puc/pucdata.c,v 1.43 2004/04/18 14:37:27 bde Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/puc/pucdata.c,v 1.44 2004/04/24 13:04:00 sobomax Exp $"); /* * PCI "universal" communications card driver configuration data (used to @@ -1063,6 +1063,51 @@ }, }, + { "IC Book Labs Gunboat x2 Low Profile", + { 0xb00c, 0x0a1c, 0, 0 }, + { 0xffff, 0xffff, 0, 0 }, + { + { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ }, + }, + }, + + { "IC Book Labs Gunboat x4 Lite", + { 0xb00c, 0x021c, 0, 0 }, + { 0xffff, 0xffff, 0, 0 }, + { + { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x10, 0x10, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ }, + }, + PUC_ILR_TYPE_DIGI, { 0x07 }, + }, + + { "IC Book Labs Gunboat x4 Pro", + { 0xb00c, 0x031c, 0, 0 }, + { 0xffff, 0xffff, 0, 0 }, + { + { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x10, 0x10, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ }, + }, + PUC_ILR_TYPE_DIGI, { 0x07 }, + }, + + { "IC Book Labs Gunboat x4 Low Profile", + { 0xb00c, 0x0b1c, 0, 0 }, + { 0xffff, 0xffff, 0, 0 }, + { + { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x10, 0x10, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ }, + }, + PUC_ILR_TYPE_DIGI, { 0x07 }, + }, + { "IC Book Labs Ironclad x8 Lite", { 0xb00c, 0x041c, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, ==== //depot/projects/gdb/sys/pci/agp.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/pci/agp.c,v 1.38 2004/03/17 17:50:52 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/pci/agp.c,v 1.39 2004/04/24 20:53:54 alc Exp $"); #include "opt_bus.h" @@ -524,8 +524,6 @@ m = vm_page_grab(mem->am_obj, OFF_TO_IDX(i), VM_ALLOC_WIRED | VM_ALLOC_ZERO | VM_ALLOC_RETRY); VM_OBJECT_UNLOCK(mem->am_obj); - if ((m->flags & PG_ZERO) == 0) - pmap_zero_page(m); AGP_DPF("found page pa=%#x\n", VM_PAGE_TO_PHYS(m)); /* ==== //depot/projects/gdb/sys/pci/agp_i810.c#4 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/pci/agp_i810.c,v 1.27 2004/04/03 22:55:12 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/pci/agp_i810.c,v 1.28 2004/04/24 20:53:54 alc Exp $"); #include "opt_bus.h" @@ -612,8 +612,6 @@ m = vm_page_grab(mem->am_obj, 0, VM_ALLOC_WIRED | VM_ALLOC_ZERO | VM_ALLOC_RETRY); VM_OBJECT_UNLOCK(mem->am_obj); - if ((m->flags & PG_ZERO) == 0) - pmap_zero_page(m); vm_page_lock_queues(); mem->am_physical = VM_PAGE_TO_PHYS(m); vm_page_wakeup(m); ==== //depot/projects/gdb/sys/sys/imgact.h#4 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/imgact.h,v 1.35 2004/04/23 03:01:40 alc Exp $ + * $FreeBSD: src/sys/sys/imgact.h,v 1.36 2004/04/24 06:44:33 bde Exp $ */ #ifndef _SYS_IMGACT_H_ @@ -34,12 +34,6 @@ #define MAXSHELLCMDLEN 128 -struct label; -struct sf_buf; -struct sysentvec; -struct thread; -struct vm_object; - struct image_params { struct proc *proc; /* our process struct */ char **userspace_argv; /* system call argument */ @@ -67,6 +61,9 @@ }; #ifdef _KERNEL +struct sysentvec; +struct thread; + int exec_check_permissions(struct image_params *); register_t *exec_copyout_strings(struct image_params *); int exec_extract_strings(struct image_params *); ==== //depot/projects/gdb/sys/vm/vm_kern.c#4 (text+ko) ==== @@ -63,7 +63,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_kern.c,v 1.115 2004/04/06 20:15:36 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_kern.c,v 1.116 2004/04/24 20:53:55 alc Exp $"); #include #include @@ -198,8 +198,6 @@ mem = vm_page_grab(kernel_object, OFF_TO_IDX(offset + i), VM_ALLOC_ZERO | VM_ALLOC_RETRY); - if ((mem->flags & PG_ZERO) == 0) - pmap_zero_page(mem); mem->valid = VM_PAGE_BITS_ALL; vm_page_lock_queues(); vm_page_unmanage(mem); ==== //depot/projects/gdb/sys/vm/vm_map.c#6 (text+ko) ==== @@ -63,7 +63,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_map.c,v 1.332 2004/04/06 20:15:36 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_map.c,v 1.333 2004/04/24 03:46:44 alc Exp $"); #include #include @@ -877,7 +877,7 @@ #endif if (cow & (MAP_PREFAULT|MAP_PREFAULT_PARTIAL)) { - vm_map_pmap_enter(map, start, + vm_map_pmap_enter(map, start, prot, object, OFF_TO_IDX(offset), end - start, cow & MAP_PREFAULT_PARTIAL); } @@ -1243,19 +1243,19 @@ /* * vm_map_pmap_enter: * - * Preload the mappings for the given object into the specified + * Preload read-only mappings for the given object into the specified * map. This eliminates the soft faults on process startup and * immediately after an mmap(2). */ void -vm_map_pmap_enter(vm_map_t map, vm_offset_t addr, +vm_map_pmap_enter(vm_map_t map, vm_offset_t addr, vm_prot_t prot, vm_object_t object, vm_pindex_t pindex, vm_size_t size, int flags) { vm_offset_t tmpidx; int psize; vm_page_t p, mpte; - if (object == NULL) + if ((prot & VM_PROT_READ) == 0 || object == NULL) return; mtx_lock(&Giant); VM_OBJECT_LOCK(object); @@ -1547,6 +1547,7 @@ if (behav == MADV_WILLNEED) { vm_map_pmap_enter(map, useStart, + current->protection, current->object.vm_object, pindex, (count << PAGE_SHIFT), ==== //depot/projects/gdb/sys/vm/vm_map.h#4 (text+ko) ==== @@ -57,7 +57,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $FreeBSD: src/sys/vm/vm_map.h,v 1.108 2004/04/06 20:15:36 imp Exp $ + * $FreeBSD: src/sys/vm/vm_map.h,v 1.109 2004/04/24 03:46:44 alc Exp $ */ /* @@ -333,7 +333,7 @@ vm_pindex_t *, vm_prot_t *, boolean_t *); void vm_map_lookup_done (vm_map_t, vm_map_entry_t); boolean_t vm_map_lookup_entry (vm_map_t, vm_offset_t, vm_map_entry_t *); -void vm_map_pmap_enter(vm_map_t map, vm_offset_t addr, +void vm_map_pmap_enter(vm_map_t map, vm_offset_t addr, vm_prot_t prot, vm_object_t object, vm_pindex_t pindex, vm_size_t size, int flags); int vm_map_protect (vm_map_t, vm_offset_t, vm_offset_t, vm_prot_t, boolean_t); int vm_map_remove (vm_map_t, vm_offset_t, vm_offset_t); ==== //depot/projects/gdb/sys/vm/vm_page.c#6 (text+ko) ==== @@ -97,7 +97,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_page.c,v 1.279 2004/04/06 20:15:37 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_page.c,v 1.281 2004/04/24 21:36:23 alc Exp $"); #include #include @@ -1421,7 +1421,8 @@ /* * Grab a page, waiting until we are waken up due to the page * changing state. We keep on waiting, if the page continues - * to be in the object. If the page doesn't exist, allocate it. + * to be in the object. If the page doesn't exist, first allocate it + * and then conditionally zero it. * * This routine may block. */ @@ -1447,21 +1448,21 @@ vm_page_wire(m); vm_page_busy(m); vm_page_unlock_queues(); - return m; + return (m); } } - m = vm_page_alloc(object, pindex, allocflags & ~VM_ALLOC_RETRY); if (m == NULL) { VM_OBJECT_UNLOCK(object); VM_WAIT; VM_OBJECT_LOCK(object); if ((allocflags & VM_ALLOC_RETRY) == 0) - return NULL; + return (NULL); goto retrylookup; } - - return m; + if (allocflags & VM_ALLOC_ZERO && (m->flags & PG_ZERO) == 0) + pmap_zero_page(m); + return (m); } /* From owner-p4-projects@FreeBSD.ORG Sat Apr 24 18:29:58 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A660A16A4D0; Sat, 24 Apr 2004 18:29:57 -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 816B616A4CE for ; Sat, 24 Apr 2004 18:29:57 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 755F343D5D for ; Sat, 24 Apr 2004 18:29:57 -0700 (PDT) (envelope-from marcel@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 i3P1TvGe078588 for ; Sat, 24 Apr 2004 18:29:57 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i3P1TuZV078585 for perforce@freebsd.org; Sat, 24 Apr 2004 18:29:56 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Sat, 24 Apr 2004 18:29:56 -0700 (PDT) Message-Id: <200404250129.i3P1TuZV078585@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 51679 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: Sun, 25 Apr 2004 01:29:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=51679 Change 51679 by marcel@marcel_nfs on 2004/04/24 18:29:55 Remove the DDB_NOKLDSYM option. The DDB debugger will use both the ELF sybol table as well as the kernel linker for symbol resolution. The ELF symbol table will take precedence. This may need to be changed... Have ksym_start and ksym_end defined by DDB and declared extern in all other cases. Remove db_elf.c and db_kld.c Affected files ... .. //depot/projects/gdb/sys/alpha/alpha/machdep.c#8 edit .. //depot/projects/gdb/sys/amd64/amd64/machdep.c#7 edit .. //depot/projects/gdb/sys/conf/NOTES#15 edit .. //depot/projects/gdb/sys/ddb/db_elf.c#3 delete .. //depot/projects/gdb/sys/ddb/db_kld.c#3 delete .. //depot/projects/gdb/sys/ddb/db_main.c#4 edit .. //depot/projects/gdb/sys/i386/i386/machdep.c#5 edit .. //depot/projects/gdb/sys/ia64/ia64/machdep.c#7 edit .. //depot/projects/gdb/sys/pc98/i386/machdep.c#5 edit .. //depot/projects/gdb/sys/powerpc/powerpc/machdep.c#5 edit .. //depot/projects/gdb/sys/sparc64/sparc64/machdep.c#6 edit Differences ... ==== //depot/projects/gdb/sys/alpha/alpha/machdep.c#8 (text+ko) ==== @@ -91,6 +91,7 @@ __FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.219 2004/04/01 20:56:43 jhb Exp $"); #include "opt_compat.h" +#include "opt_ddb.h" #include "opt_kstack_pages.h" #include "opt_msgbuf.h" #include "opt_maxmem.h" @@ -168,9 +169,8 @@ static char cpu_model[128]; SYSCTL_STRING(_hw, HW_MODEL, model, CTLFLAG_RD, cpu_model, 0, ""); -#ifdef KDB -/* start and end of kernel symbol table */ -void *ksym_start, *ksym_end; +#ifdef DDB +extern vm_offset_t ksym_start, ksym_end; #endif int alpha_unaligned_print = 1; /* warn about unaligned accesses */ @@ -604,9 +604,9 @@ * stack). */ kernstart = trunc_page(kernel_text) - 2 * PAGE_SIZE; -#ifdef KDB - ksym_start = (void *)bootinfo.ssym; - ksym_end = (void *)bootinfo.esym; +#ifdef DDB + ksym_start = bootinfo.ssym; + ksym_end = bootinfo.esym; kernend = (vm_offset_t)round_page(ksym_end); #else kernend = (vm_offset_t)round_page(_end); @@ -930,11 +930,6 @@ /* * Look at arguments passed to us and compute boothowto. */ - -#ifdef KADB - boothowto |= RB_KDB; -#endif -/* boothowto |= RB_KDB | RB_GDB; */ for (p = bootinfo.boot_flags; p && *p != '\0'; p++) { /* * Note that we'd really like to differentiate case here, ==== //depot/projects/gdb/sys/amd64/amd64/machdep.c#7 (text+ko) ==== @@ -141,6 +141,10 @@ static int set_fpcontext(struct thread *td, const mcontext_t *mcp); SYSINIT(cpu, SI_SUB_CPU, SI_ORDER_FIRST, cpu_startup, NULL) +#ifdef DDB +extern vm_offset_t ksym_start, ksym_end; +#endif + int _udatasel, _ucodesel, _ucode32sel; u_long atdevbase; @@ -1214,6 +1218,11 @@ atpic_startup(); #endif +#ifdef DDB + ksym_start = bootinfo.bi_symtab; + ksym_end = bootinfo.bi_esymtab; +#endif + kdb_init(); #ifdef KDB @@ -1774,12 +1783,12 @@ return 0; } -#ifdef DDB +#ifdef KDB /* * Provide inb() and outb() as functions. They are normally only * available as macros calling inlined functions, thus cannot be - * called inside DDB. + * called from the debugger * * The actual code is stolen from , and de-inlined. */ @@ -1818,4 +1827,4 @@ __asm __volatile("outb %0,%%dx" : : "a" (al), "d" (port)); } -#endif /* DDB */ +#endif /* KDB */ ==== //depot/projects/gdb/sys/conf/NOTES#15 (text+ko) ==== @@ -251,14 +251,6 @@ options DDB # -# Use direct symbol lookup routines for ddb instead of the kernel linker -# ones, so that symbols (mostly) work before the kernel linker has been -# initialized. This is not the default because it breaks ddb's lookup of -# symbols in loaded modules. -# -#!options DDB_NOKLDSYM - -# # Print the numerical value of symbols in addition to the symbolic # representation. # ==== //depot/projects/gdb/sys/ddb/db_main.c#4 (text+ko) ==== @@ -50,9 +50,8 @@ KDB_BACKEND(ddb, db_init, db_trace, db_trap); -extern jmp_buf db_jmpbuf; - db_regs_t ddb_regs; +vm_offset_t ksym_start, ksym_end; boolean_t X_db_line_at_pc(db_symtab_t *symtab, c_db_sym_t sym, char **file, int *line, @@ -64,23 +63,76 @@ c_db_sym_t X_db_lookup(db_symtab_t *symtab, const char *symbol) { - c_linker_sym_t sym; + c_linker_sym_t lsym; + Elf_Sym *sym; - return (c_db_sym_t)((!linker_ddb_lookup(symbol, &sym)) ? sym : NULL); + if (symtab->private == NULL) { + return ((c_db_sym_t)((!linker_ddb_lookup(symbol, &lsym)) + ? lsym : NULL)); + } else { + sym = (Elf_Sym *)symtab->start; + while ((char *)sym < symtab->end) { + if (sym->st_name != 0 && + !strcmp(symtab->private + sym->st_name, symbol)) + return ((c_db_sym_t)sym); + sym++; + } + } + return (NULL); } c_db_sym_t X_db_search_symbol(db_symtab_t *symtab, db_addr_t off, db_strategy_t strat, db_expr_t *diffp) { - c_linker_sym_t sym; - long diff; + c_linker_sym_t lsym; + Elf_Sym *sym, *match; + unsigned long diff; + + if (symtab->private == NULL) { + if (!linker_ddb_search_symbol((caddr_t)off, &lsym, &diff)) { + *diffp = (db_expr_t)diff; + return ((c_db_sym_t)lsym); + } + return (NULL); + } - if (!linker_ddb_search_symbol((caddr_t)off, &sym, &diff)) { - *diffp = (db_expr_t)diff; - return (c_db_sym_t) sym; + diff = ~0UL; + match = NULL; + for (sym = (Elf_Sym*)symtab->start; (char*)sym < symtab->end; sym++) { + if (sym->st_name == 0) + continue; + if (off < sym->st_value) + continue; + if (ELF_ST_TYPE(sym->st_info) != STT_OBJECT && + ELF_ST_TYPE(sym->st_info) != STT_FUNC && + ELF_ST_TYPE(sym->st_info) != STT_NOTYPE) + continue; + if ((off - sym->st_value) > diff) + continue; + if ((off - sym->st_value) < diff) { + diff = off - sym->st_value; + match = sym; + } else { + if (match == NULL) + match = sym; + else if (ELF_ST_BIND(match->st_info) == STB_LOCAL && + ELF_ST_BIND(sym->st_info) != STB_LOCAL) + match = sym; + } + if (diff == 0) { + if (strat == DB_STGY_PROC && + ELF_ST_TYPE(sym->st_info) == STT_FUNC && + ELF_ST_BIND(sym->st_info) != STB_LOCAL) + break; + if (strat == DB_STGY_ANY && + ELF_ST_BIND(sym->st_info) != STB_LOCAL) + break; + } } - return 0; + + *diffp = (match == NULL) ? off : diff; + return ((c_db_sym_t)match); } boolean_t @@ -94,20 +146,40 @@ X_db_symbol_values(db_symtab_t *symtab, c_db_sym_t sym, const char **namep, db_expr_t *valp) { - c_linker_sym_t lsym = (c_linker_sym_t)sym; linker_symval_t lval; - linker_ddb_symbol_values(lsym, &lval); - if (namep) - *namep = (const char*)lval.name; - if (valp) - *valp = (db_expr_t)lval.value; + if (symtab->private == NULL) { + linker_ddb_symbol_values((c_linker_sym_t)sym, &lval); + if (namep != NULL) + *namep = (const char*)lval.name; + if (valp != NULL) + *valp = (db_expr_t)lval.value; + } else { + if (namep != NULL) + *namep = (const char *)symtab->private + + ((const Elf_Sym *)sym)->st_name; + if (valp != NULL) + *valp = (db_expr_t)((const Elf_Sym *)sym)->st_value; + } } static int db_init(void) { - db_add_symbol_table(0, 0, "kernel", 0); + uintptr_t symtab, strtab; + Elf_Size tabsz, strsz; + + if (ksym_end > ksym_start && ksym_start != 0) { + symtab = ksym_start; + tabsz = *((Elf_Size*)symtab)++; + strtab = symtab + tabsz; + strsz = *((Elf_Size*)strtab)++; + if (strtab + strsz <= ksym_end) { + db_add_symbol_table((char *)symtab, + (char *)(symtab + tabsz), "elf", (char *)strtab); + } + } + db_add_symbol_table(NULL, NULL, "kld", NULL); return (1); /* We're the default debugger. */ } @@ -120,6 +192,8 @@ static int db_trap(int type, int code) { + jmp_buf jb; + void *prev_jb; boolean_t bkpt, watchpt; /* @@ -146,9 +220,11 @@ else db_printf("Stopped at\t"); db_dot = PC_REGS(DDB_REGS); - if (setjmp(db_jmpbuf) == 0) + prev_jb = kdb_jmpbuf(jb); + if (setjmp(jb) == 0) db_print_loc_and_inst(db_dot); db_command_loop(); + (void)kdb_jmpbuf(prev_jb); } db_restart_at_pc(watchpt); ==== //depot/projects/gdb/sys/i386/i386/machdep.c#5 (text+ko) ==== @@ -160,6 +160,10 @@ #endif /* CPU_ENABLE_SSE */ SYSINIT(cpu, SI_SUB_CPU, SI_ORDER_FIRST, cpu_startup, NULL) +#ifdef DDB +extern vm_offset_t ksym_start, ksym_end; +#endif + int _udatasel, _ucodesel; u_int atdevbase, basemem; @@ -2099,6 +2103,11 @@ atpic_startup(); #endif +#ifdef DDB + ksym_start = bootinfo.bi_symtab; + ksym_end = bootinfo.bi_esymtab; +#endif + kdb_init(); #ifdef KDB @@ -2842,12 +2851,12 @@ } #endif -#ifdef DDB +#ifdef KDB /* * Provide inb() and outb() as functions. They are normally only * available as macros calling inlined functions, thus cannot be - * called inside DDB. + * called from the debugger. * * The actual code is stolen from , and de-inlined. */ @@ -2886,4 +2895,4 @@ __asm __volatile("outb %0,%%dx" : : "a" (al), "d" (port)); } -#endif /* DDB */ +#endif /* KDB */ ==== //depot/projects/gdb/sys/ia64/ia64/machdep.c#7 (text+ko) ==== @@ -127,8 +127,7 @@ "The CPU family name"); #ifdef DDB -/* start and end of kernel symbol table */ -void *ksym_start, *ksym_end; +extern vm_offset_t ksym_start, ksym_end; #endif static void cpu_startup(void *); @@ -587,8 +586,8 @@ */ kernstart = trunc_page(kernel_text); #ifdef DDB - ksym_start = (void *)bootinfo.bi_symtab; - ksym_end = (void *)bootinfo.bi_esymtab; + ksym_start = bootinfo.bi_symtab; + ksym_end = bootinfo.bi_esymtab; kernend = (vm_offset_t)round_page(ksym_end); #else kernend = (vm_offset_t)round_page(_end); ==== //depot/projects/gdb/sys/pc98/i386/machdep.c#5 (text+ko) ==== @@ -167,6 +167,10 @@ int need_post_dma_flush; /* If 1, use invd after DMA transfer. */ #endif +#ifdef DDB +extern vm_offset_t ksym_start, ksym_end; +#endif + int _udatasel, _ucodesel; u_int atdevbase, basemem; @@ -2165,6 +2169,11 @@ atpic_startup(); #endif +#ifdef DDB + ksym_start = bootinfo.bi_symtab; + ksym_end = bootinfo.bi_esymtab; +#endif + kdb_init(); #ifdef KDB @@ -2803,12 +2812,12 @@ return 0; } -#ifdef DDB +#ifdef KDB /* * Provide inb() and outb() as functions. They are normally only * available as macros calling inlined functions, thus cannot be - * called inside DDB. + * called from the debugger. * * The actual code is stolen from , and de-inlined. */ @@ -2847,4 +2856,4 @@ __asm __volatile("outb %0,%%dx" : : "a" (al), "d" (port)); } -#endif /* DDB */ +#endif /* KDB */ ==== //depot/projects/gdb/sys/powerpc/powerpc/machdep.c#5 (text+ko) ==== @@ -135,8 +135,7 @@ CTLFLAG_RD, &cacheline_size, 0, ""); #ifdef DDB -/* start and end of kernel symbol table */ -void *ksym_start, *ksym_end; +extern vm_offset_t ksym_start, ksym_end; #endif /* DDB */ static void cpu_startup(void *); ==== //depot/projects/gdb/sys/sparc64/sparc64/machdep.c#6 (text+ko) ==== @@ -110,6 +110,10 @@ typedef int ofw_vec_t(void *); +#ifdef DDB +extern vm_offset_t ksym_start, ksym_end; +#endif + struct tlb_entry *kernel_tlbs; int kernel_tlb_slots; From owner-p4-projects@FreeBSD.ORG Sat Apr 24 18:38:08 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 74D5316A4D0; Sat, 24 Apr 2004 18:38:08 -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 505B116A4CE for ; Sat, 24 Apr 2004 18:38:08 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 30C3343D2F for ; Sat, 24 Apr 2004 18:38:08 -0700 (PDT) (envelope-from marcel@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 i3P1c7Ge080522 for ; Sat, 24 Apr 2004 18:38:07 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i3P1c7gH080519 for perforce@freebsd.org; Sat, 24 Apr 2004 18:38:07 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Sat, 24 Apr 2004 18:38:07 -0700 (PDT) Message-Id: <200404250138.i3P1c7gH080519@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 51680 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: Sun, 25 Apr 2004 01:38:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=51680 Change 51680 by marcel@marcel_nfs on 2004/04/24 18:37:23 Terminate a sentence with a period. Affected files ... .. //depot/projects/gdb/sys/amd64/amd64/machdep.c#8 edit Differences ... ==== //depot/projects/gdb/sys/amd64/amd64/machdep.c#8 (text+ko) ==== @@ -1788,7 +1788,7 @@ /* * Provide inb() and outb() as functions. They are normally only * available as macros calling inlined functions, thus cannot be - * called from the debugger + * called from the debugger. * * The actual code is stolen from , and de-inlined. */ From owner-p4-projects@FreeBSD.ORG Sat Apr 24 21:41:57 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6AE8816A4D0; Sat, 24 Apr 2004 21:41:57 -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 4362C16A4CE for ; Sat, 24 Apr 2004 21:41:57 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 371D443D5C for ; Sat, 24 Apr 2004 21:41:57 -0700 (PDT) (envelope-from marcel@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 i3P4fvGe027188 for ; Sat, 24 Apr 2004 21:41:57 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i3P4fujt027179 for perforce@freebsd.org; Sat, 24 Apr 2004 21:41:56 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Sat, 24 Apr 2004 21:41:56 -0700 (PDT) Message-Id: <200404250441.i3P4fujt027179@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 51689 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: Sun, 25 Apr 2004 04:41:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=51689 Change 51689 by marcel@marcel_nfs on 2004/04/24 21:41:06 IFC @51688 Affected files ... .. //depot/projects/gdb/lib/msun/src/math.h#3 integrate .. //depot/projects/gdb/sys/alpha/include/float.h#3 integrate .. //depot/projects/gdb/sys/amd64/include/float.h#3 integrate .. //depot/projects/gdb/sys/conf/NOTES#16 integrate .. //depot/projects/gdb/sys/conf/files#19 integrate .. //depot/projects/gdb/sys/conf/options#15 integrate .. //depot/projects/gdb/sys/dev/uart/uart_dev_sab82532.c#2 integrate .. //depot/projects/gdb/sys/dev/vinum/vinumio.c#4 integrate .. //depot/projects/gdb/sys/i386/include/float.h#3 integrate .. //depot/projects/gdb/sys/ia64/include/float.h#3 integrate .. //depot/projects/gdb/sys/isa/fd.c#6 integrate .. //depot/projects/gdb/sys/kern/kern_timeout.c#5 integrate .. //depot/projects/gdb/sys/net/bridge.c#4 integrate .. //depot/projects/gdb/sys/net/if.c#8 integrate .. //depot/projects/gdb/sys/net/if_ethersubr.c#9 integrate .. //depot/projects/gdb/sys/net/if_fddisubr.c#6 integrate .. //depot/projects/gdb/sys/net/if_iso88025subr.c#5 integrate .. //depot/projects/gdb/sys/net/if_vlan.c#2 integrate .. //depot/projects/gdb/sys/net/route.c#8 integrate .. //depot/projects/gdb/sys/net/route.h#7 integrate .. //depot/projects/gdb/sys/powerpc/include/float.h#4 integrate .. //depot/projects/gdb/sys/sparc64/include/float.h#3 integrate .. //depot/projects/gdb/sys/sparc64/pci/psycho.c#3 integrate .. //depot/projects/gdb/sys/sparc64/pci/psychoreg.h#2 integrate .. //depot/projects/gdb/sys/sparc64/pci/psychovar.h#2 integrate .. //depot/projects/gdb/sys/sparc64/sparc64/iommu.c#4 integrate .. //depot/projects/gdb/sys/vm/phys_pager.c#2 integrate Differences ... ==== //depot/projects/gdb/lib/msun/src/math.h#3 (text+ko) ==== @@ -11,7 +11,7 @@ /* * from: @(#)fdlibm.h 5.1 93/09/24 - * $FreeBSD: src/lib/msun/src/math.h,v 1.29 2004/03/12 12:05:38 bde Exp $ + * $FreeBSD: src/lib/msun/src/math.h,v 1.31 2004/04/25 02:35:42 das Exp $ */ #ifndef _MATH_H_ @@ -32,19 +32,19 @@ float __uf; } __nan; +#define HUGE_VAL (__infinity.__ud) + +#if __ISO_C_VISIBLE >= 1999 #define FP_ILOGB0 (-0x7fffffff - 1) /* INT_MIN */ #define FP_ILOGBNAN 0x7fffffff /* INT_MAX */ -#define HUGE_VAL (__infinity.__ud) #define HUGE_VALF (float)HUGE_VAL #define HUGE_VALL (long double)HUGE_VAL #define INFINITY HUGE_VALF #define NAN (__nan.__uf) -#if __ISO_C_VISIBLE >= 1999 #define MATH_ERRNO 1 #define MATH_ERREXCEPT 2 #define math_errhandling 0 -#endif /* Symbolic constants to classify floating point numbers. */ #define FP_INFINITE 0x01 @@ -60,7 +60,6 @@ #define isfinite(x) ((fpclassify(x) & (FP_INFINITE|FP_NAN)) == 0) #define isinf(x) (fpclassify(x) == FP_INFINITE) #define isnan(x) (fpclassify(x) == FP_NAN) -#define isnanf(x) isnan(x) #define isnormal(x) (fpclassify(x) == FP_NORMAL) #define isgreater(x, y) (!isunordered((x), (y)) && (x) > (y)) @@ -75,11 +74,12 @@ typedef __double_t double_t; typedef __float_t float_t; +#endif /* __ISO_C_VISIBLE >= 1999 */ /* * XOPEN/SVID */ -#if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE) +#if __BSD_VISIBLE || __XSI_VISIBLE #define M_E 2.7182818284590452354 /* e */ #define M_LOG2E 1.4426950408889634074 /* log 2e */ #define M_LOG10E 0.43429448190325182765 /* log 10e */ @@ -96,8 +96,9 @@ #define MAXFLOAT ((float)3.40282346638528860e+38) extern int signgam; +#endif /* __BSD_VISIBLE || __XSI_VISIBLE */ -#if !defined(_XOPEN_SOURCE) +#if __BSD_VISIBLE enum fdversion {fdlibm_ieee = -1, fdlibm_svid, fdlibm_xopen, fdlibm_posix}; #define _LIB_VERSION_TYPE enum fdversion @@ -129,6 +130,8 @@ }; #endif +#define isnanf(x) isnan(x) + #if 0 /* Old value from 4.4BSD-Lite math.h; this is probably better. */ #define HUGE HUGE_VAL @@ -136,13 +139,8 @@ #define HUGE MAXFLOAT #endif -/* - * set X_TLOSS = pi*2**52, which is possibly defined in - * (one may replace the following line by "#include ") - */ +#define X_TLOSS 1.41484755040568800000e+16 /* pi*2**52 */ -#define X_TLOSS 1.41484755040568800000e+16 - #define DOMAIN 1 #define SING 2 #define OVERFLOW 3 @@ -150,8 +148,7 @@ #define TLOSS 5 #define PLOSS 6 -#endif /* !_XOPEN_SOURCE */ -#endif /* !_ANSI_SOURCE && !_POSIX_SOURCE */ +#endif /* __BSD_VISIBLE */ #include @@ -202,65 +199,70 @@ * These functions are not in C90 so they can be "right". The ones that * never set errno in lib/msun are declared as __pure2. */ -#if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE) +#if __BSD_VISIBLE || __ISO_C_VISIBLE >= 1999 || __XSI_VISIBLE +double acosh(double); +double asinh(double); +double atanh(double); +double cbrt(double) __pure2; double erf(double); double erfc(double) __pure2; -int finite(double) __pure2; -double gamma(double); +double expm1(double) __pure2; double hypot(double, double); +int ilogb(double); +double lgamma(double); +double log1p(double) __pure2; +double logb(double) __pure2; +double nextafter(double, double); +double remainder(double, double); +double rint(double) __pure2; +#endif /* __BSD_VISIBLE || __ISO_C_VISIBLE >= 1999 || __XSI_VISIBLE */ + +#if __BSD_VISIBLE || __XSI_VISIBLE double j0(double); double j1(double); double jn(int, double); -double lgamma(double); +double scalb(double, double); double y0(double); double y1(double); double yn(int, double); -#if !defined(_XOPEN_SOURCE) -double acosh(double); -double asinh(double); -double atanh(double); -double cbrt(double) __pure2; -double logb(double) __pure2; -double nextafter(double, double); -double remainder(double, double); -double scalb(double, double); -double tgamma(double); - -#ifndef __cplusplus -int matherr(struct exception *); +#if __XSI_VISIBLE <= 500 || __BSD_VISIBLE +double gamma(double); #endif +#endif /* __BSD_VISIBLE || __XSI_VISIBLE */ -/* - * IEEE Test Vector - */ -double significand(double); - -/* - * Functions callable from C, intended to support IEEE arithmetic. - */ +#if __BSD_VISIBLE || __ISO_C_VISIBLE >= 1999 double copysign(double, double) __pure2; -int ilogb(double); -double rint(double) __pure2; double scalbn(double, int); +double tgamma(double); +#endif /* * BSD math library entry points */ +#if __BSD_VISIBLE double drem(double, double); -double expm1(double) __pure2; -double log1p(double) __pure2; +int finite(double) __pure2; /* * Reentrant version of gamma & lgamma; passes signgam back by reference * as the second argument; user must allocate space for signgam. */ -#if __BSD_VISIBLE double gamma_r(double, int *); double lgamma_r(double, int *); + +/* + * IEEE Test Vector + */ +double significand(double); + +#ifndef __cplusplus +int matherr(struct exception *); +#endif #endif /* __BSD_VISIBLE */ /* float versions of ANSI/POSIX functions */ +#if __ISO_C_VISIBLE >= 1999 float acosf(float); float asinf(float); float atanf(float); @@ -274,10 +276,13 @@ float tanhf(float); float expf(float); +float expm1f(float) __pure2; float frexpf(float, int *); /* fundamentally !__pure2 */ +int ilogbf(float); float ldexpf(float, int); +float log10f(float); +float log1pf(float) __pure2; float logf(float); -float log10f(float); float modff(float, float *); /* fundamentally !__pure2 */ float powf(float, float); @@ -290,60 +295,54 @@ float erff(float); float erfcf(float) __pure2; -int finitef(float) __pure2; -float gammaf(float); float hypotf(float, float) __pure2; -float j0f(float); -float j1f(float); -float jnf(int, float); float lgammaf(float); -float y0f(float); -float y1f(float); -float ynf(int, float); float acoshf(float); float asinhf(float); float atanhf(float); float cbrtf(float) __pure2; float logbf(float) __pure2; +float copysignf(float, float) __pure2; float nextafterf(float, float); float remainderf(float, float); -float scalbf(float, float); - -/* - * float version of IEEE Test Vector - */ -float significandf(float); - -/* - * Float versions of functions callable from C, intended to support - * IEEE arithmetic. - */ -float copysignf(float, float) __pure2; -int ilogbf(float); float rintf(float); float scalbnf(float, int); +#endif /* * float versions of BSD math library entry points */ +#if __BSD_VISIBLE float dremf(float, float); -float expm1f(float) __pure2; -float log1pf(float) __pure2; +int finitef(float) __pure2; +float gammaf(float); +float j0f(float); +float j1f(float); +float jnf(int, float); +float scalbf(float, float); +float y0f(float); +float y1f(float); +float ynf(int, float); /* * Float versions of reentrant version of gamma & lgamma; passes * signgam back by reference as the second argument; user must * allocate space for signgam. */ -#if __BSD_VISIBLE float gammaf_r(float, int *); float lgammaf_r(float, int *); + +/* + * float version of IEEE Test Vector + */ +float significandf(float); #endif /* __BSD_VISIBLE */ /* * long double versions of ISO/POSIX math functions */ +#if __ISO_C_VISIBLE >= 1999 #if 0 long double acoshl(long double); long double acosl(long double); @@ -408,8 +407,7 @@ long double truncl(long double); #endif -#endif /* !_XOPEN_SOURCE */ -#endif /* !_ANSI_SOURCE && !_POSIX_SOURCE */ +#endif /* __ISO_C_VISIBLE >= 1999 */ __END_DECLS #endif /* !_MATH_H_ */ ==== //depot/projects/gdb/sys/alpha/include/float.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/include/float.h,v 1.5 2004/04/05 21:00:50 imp Exp $ */ +/* $FreeBSD: src/sys/alpha/include/float.h,v 1.6 2004/04/25 02:36:28 das Exp $ */ /* From: NetBSD: float.h,v 1.6 1997/07/17 21:36:03 thorpej Exp */ /* @@ -41,8 +41,10 @@ #define FLT_RADIX 2 /* b */ #define FLT_ROUNDS __flt_rounds() +#if __ISO_C_VISIBLE >= 1999 #define FLT_EVAL_METHOD 0 /* no promotions */ #define DECIMAL_DIG 17 /* max precision in decimal digits */ +#endif #define FLT_MANT_DIG 24 /* p */ #define FLT_EPSILON 1.19209290E-07F /* b**(1-p) */ ==== //depot/projects/gdb/sys/amd64/include/float.h#3 (text+ko) ==== @@ -27,16 +27,20 @@ * SUCH DAMAGE. * * from: @(#)float.h 7.1 (Berkeley) 5/8/90 - * $FreeBSD: src/sys/amd64/include/float.h,v 1.11 2004/04/05 21:25:51 imp Exp $ + * $FreeBSD: src/sys/amd64/include/float.h,v 1.12 2004/04/25 02:36:28 das Exp $ */ #ifndef _MACHINE_FLOAT_H_ #define _MACHINE_FLOAT_H_ 1 +#include + #define FLT_RADIX 2 /* b */ #define FLT_ROUNDS 1 /* FP addition rounds to nearest */ +#if __ISO_C_VISIBLE >= 1999 #define FLT_EVAL_METHOD (-1) /* i387 semantics are...interesting */ #define DECIMAL_DIG 21 /* max precision in decimal digits */ +#endif #define FLT_MANT_DIG 24 /* p */ #define FLT_EPSILON 1.19209290E-07F /* b**(1-p) */ ==== //depot/projects/gdb/sys/conf/NOTES#16 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1220 2004/04/23 19:48:43 emax Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1221 2004/04/24 22:03:01 rik Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -427,6 +427,7 @@ options NETGRAPH_RFC1490 options NETGRAPH_SOCKET options NETGRAPH_SPLIT +options NETGRAPH_SPPP options NETGRAPH_TEE options NETGRAPH_TTY options NETGRAPH_UI ==== //depot/projects/gdb/sys/conf/files#19 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.889 2004/04/23 19:48:43 emax Exp $ +# $FreeBSD: src/sys/conf/files,v 1.890 2004/04/24 22:03:02 rik Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1408,6 +1408,7 @@ netgraph/ng_rfc1490.c optional netgraph_rfc1490 netgraph/ng_socket.c optional netgraph_socket netgraph/ng_split.c optional netgraph_split +netgraph/ng_sppp.c optional netgraph_sppp netgraph/ng_tee.c optional netgraph_tee netgraph/ng_tty.c optional netgraph_tty netgraph/ng_vjc.c optional netgraph_vjc ==== //depot/projects/gdb/sys/conf/options#15 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.443 2004/04/23 19:48:43 emax Exp $ +# $FreeBSD: src/sys/conf/options,v 1.444 2004/04/24 22:03:02 rik Exp $ # # On the handling of kernel options # @@ -377,6 +377,7 @@ NETGRAPH_RFC1490 opt_netgraph.h NETGRAPH_SOCKET opt_netgraph.h NETGRAPH_SPLIT opt_netgraph.h +NETGRAPH_SPPP opt_netgraph.h NETGRAPH_TEE opt_netgraph.h NETGRAPH_TTY opt_netgraph.h NETGRAPH_UI opt_netgraph.h ==== //depot/projects/gdb/sys/dev/uart/uart_dev_sab82532.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_sab82532.c,v 1.5 2003/09/26 05:14:56 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_sab82532.c,v 1.6 2004/04/25 04:30:40 marcel Exp $"); #include #include @@ -252,7 +252,7 @@ sab82532_param(bas, baudrate, databits, stopbits, parity); /* Clear interrupts. */ - uart_setreg(bas, SAB_IMR0, 0xff); + uart_setreg(bas, SAB_IMR0, (unsigned char)~SAB_IMR0_TCD); uart_setreg(bas, SAB_IMR1, 0xff); uart_barrier(bas); uart_getreg(bas, SAB_ISR0); ==== //depot/projects/gdb/sys/dev/vinum/vinumio.c#4 (text+ko) ==== @@ -34,7 +34,7 @@ * advised of the possibility of such damage. * * $Id: vinumio.c,v 1.39 2003/05/23 00:59:53 grog Exp grog $ - * $FreeBSD: src/sys/dev/vinum/vinumio.c,v 1.97 2004/03/11 14:11:08 le Exp $ + * $FreeBSD: src/sys/dev/vinum/vinumio.c,v 1.98 2004/04/24 23:41:21 le Exp $ */ #include @@ -878,6 +878,7 @@ drive->flags |= VF_CONFIGURED; /* this drive's configuration is complete */ } + Free(config_line); Free(config_text); Free(drivelist); vinum_conf.flags &= ~VF_READING_CONFIG; /* no longer reading from disk */ ==== //depot/projects/gdb/sys/i386/include/float.h#3 (text+ko) ==== @@ -27,16 +27,20 @@ * SUCH DAMAGE. * * from: @(#)float.h 7.1 (Berkeley) 5/8/90 - * $FreeBSD: src/sys/i386/include/float.h,v 1.11 2004/04/07 20:46:05 imp Exp $ + * $FreeBSD: src/sys/i386/include/float.h,v 1.12 2004/04/25 02:36:28 das Exp $ */ #ifndef _MACHINE_FLOAT_H_ #define _MACHINE_FLOAT_H_ 1 +#include + #define FLT_RADIX 2 /* b */ #define FLT_ROUNDS 1 /* FP addition rounds to nearest */ +#if __ISO_C_VISIBLE >= 1999 #define FLT_EVAL_METHOD (-1) /* i387 semantics are...interesting */ #define DECIMAL_DIG 21 /* max precision in decimal digits */ +#endif #define FLT_MANT_DIG 24 /* p */ #define FLT_EPSILON 1.19209290E-07F /* b**(1-p) */ ==== //depot/projects/gdb/sys/ia64/include/float.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/ia64/include/float.h,v 1.5 2004/04/07 20:46:07 imp Exp $ */ +/* $FreeBSD: src/sys/ia64/include/float.h,v 1.6 2004/04/25 02:36:29 das Exp $ */ /* From: NetBSD: float.h,v 1.6 1997/07/17 21:36:03 thorpej Exp */ /* @@ -37,8 +37,10 @@ #define FLT_RADIX 2 /* b */ #define FLT_ROUNDS 1 /* FP addition rounds to nearest */ +#if __ISO_C_VISIBLE >= 1999 #define FLT_EVAL_METHOD 0 /* no promotions */ #define DECIMAL_DIG 35 /* max precision in decimal digits */ +#endif #define FLT_MANT_DIG 24 /* p */ #define FLT_EPSILON 1.19209290E-07F /* b**(1-p) */ ==== //depot/projects/gdb/sys/isa/fd.c#6 (text+ko) ==== @@ -49,7 +49,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/isa/fd.c,v 1.269 2004/04/07 20:46:08 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/isa/fd.c,v 1.270 2004/04/25 04:33:56 bde Exp $"); #include "opt_fdc.h" #include "card.h" @@ -2600,9 +2600,16 @@ return (0); case FD_STYPE: /* set drive type */ - if (suser(td) != 0) - return (EPERM); + /* + * Allow setting drive type temporarily iff + * currently unset. Used for fdformat so any + * user can set it, and then start formatting. + */ + if (fd->ft) + return (EINVAL); /* already set */ fd->fts[0] = *(struct fd_type *)addr; + fd->ft = &fd->fts[0]; + fd->flags |= FD_UA; return (0); case FD_GOPTS: /* get drive options */ ==== //depot/projects/gdb/sys/kern/kern_timeout.c#5 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_timeout.c,v 1.88 2004/04/20 15:49:30 cperciva Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_timeout.c,v 1.89 2004/04/25 04:10:17 hmp Exp $"); #include #include @@ -160,7 +160,7 @@ * George Varghese, published in a technical report entitled "Redesigning * the BSD Callout and Timer Facilities" and modified slightly for inclusion * in FreeBSD by Justin T. Gibbs. The original work on the data structures - * used in this implementation was published by G.Varghese and A. Lauck in + * used in this implementation was published by G. Varghese and T. Lauck in * the paper "Hashed and Hierarchical Timing Wheels: Data Structures for * the Efficient Implementation of a Timer Facility" in the Proceedings of * the 11th ACM Annual Symposium on Operating Systems Principles, ==== //depot/projects/gdb/sys/net/bridge.c#4 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/net/bridge.c,v 1.76 2004/02/25 19:55:27 mlaier Exp $ + * $FreeBSD: src/sys/net/bridge.c,v 1.77 2004/04/24 22:11:13 luigi Exp $ */ /* @@ -99,15 +99,16 @@ #include #include +#include #include +#include /* for struct arpcom */ #include #include -#include /* for struct arpcom */ +#include #include #include #include -#include /* for struct arpcom */ #ifdef PFIL_HOOKS #include @@ -299,7 +300,7 @@ * updating pointers in ifp2sc. */ static struct cluster_softc * -add_cluster(u_int16_t cluster_id, struct arpcom *ac) +add_cluster(u_int16_t cluster_id, struct ifnet *ifp) { struct cluster_softc *c = NULL; int i; @@ -353,7 +354,7 @@ n_clusters++; found: c = clusters + i; /* the right cluster ... */ - ETHER_ADDR_COPY(c->my_macs[c->ports].etheraddr, ac->ac_enaddr); + ETHER_ADDR_COPY(c->my_macs[c->ports].etheraddr, IFP2AC(ifp)->ac_enaddr); c->ports++; return c; bad: @@ -532,7 +533,7 @@ printf("%s already used, skipping\n", ifp->if_xname); break; } - b->cluster = add_cluster(htons(cluster), (struct arpcom *)ifp); + b->cluster = add_cluster(htons(cluster), ifp); b->flags |= IFF_USED ; snprintf(bdg_stats.s[ifp->if_index].name, sizeof(bdg_stats.s[ifp->if_index].name), ==== //depot/projects/gdb/sys/net/if.c#8 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)if.c 8.5 (Berkeley) 1/9/95 - * $FreeBSD: src/sys/net/if.c,v 1.190 2004/04/19 17:28:15 luigi Exp $ + * $FreeBSD: src/sys/net/if.c,v 1.191 2004/04/24 22:24:48 luigi Exp $ */ #include "opt_compat.h" @@ -319,7 +319,7 @@ case IFT_ISO88025: case IFT_L2VLAN: snprintf(eaddr, 18, "%6D", - ((struct arpcom *)ifp->if_softc)->ac_enaddr, ":"); + IFP2AC(ifp)->ac_enaddr, ":"); break; default: eaddr[0] = '\0'; @@ -1979,7 +1979,7 @@ case IFT_XETHER: case IFT_ISO88025: case IFT_L2VLAN: - bcopy(lladdr, ((struct arpcom *)ifp->if_softc)->ac_enaddr, len); + bcopy(lladdr, IFP2AC(ifp)->ac_enaddr, len); /* * XXX We also need to store the lladdr in LLADDR(sdl), * which is done below. This is a pain because we must ==== //depot/projects/gdb/sys/net/if_ethersubr.c#9 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)if_ethersubr.c 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/net/if_ethersubr.c,v 1.167 2004/04/18 11:01:15 luigi Exp $ + * $FreeBSD: src/sys/net/if_ethersubr.c,v 1.168 2004/04/24 21:59:41 luigi Exp $ */ #include "opt_atalk.h" @@ -138,7 +138,6 @@ struct ether_header *eh; int loop_copy = 0; int hlen; /* link layer header length */ - struct arpcom *ac = IFP2AC(ifp); #ifdef MAC error = mac_check_ifnet_transmit(ifp, m); @@ -193,7 +192,7 @@ #endif #ifdef INET6 case AF_INET6: - if (!nd6_storelladdr(&ac->ac_if, rt, m, dst, (u_char *)edst)) { + if (!nd6_storelladdr(ifp, rt, m, dst, (u_char *)edst)) { /* Something bad happened */ return(0); } @@ -220,7 +219,7 @@ if ((aa = at_ifawithnet((struct sockaddr_at *)dst)) == NULL) { goto bad; } - if (!aarpresolve(ac, m, (struct sockaddr_at *)dst, edst)) + if (!aarpresolve(IFP2AC(ifp), m, (struct sockaddr_at *)dst, edst)) return (0); /* * In the phase 2 case, need to prepend an mbuf for the llc header. @@ -280,7 +279,7 @@ (void)memcpy(eh->ether_shost, esrc, sizeof(eh->ether_shost)); else - (void)memcpy(eh->ether_shost, ac->ac_enaddr, + (void)memcpy(eh->ether_shost, IFP2AC(ifp)->ac_enaddr, sizeof(eh->ether_shost)); /* ==== //depot/projects/gdb/sys/net/if_fddisubr.c#6 (text+ko) ==== @@ -33,7 +33,7 @@ * SUCH DAMAGE. * * from: if_ethersubr.c,v 1.5 1994/12/13 22:31:45 wollman Exp - * $FreeBSD: src/sys/net/if_fddisubr.c,v 1.92 2004/04/18 11:01:15 luigi Exp $ + * $FreeBSD: src/sys/net/if_fddisubr.c,v 1.93 2004/04/24 21:59:41 luigi Exp $ */ #include "opt_atalk.h" @@ -119,7 +119,6 @@ u_char esrc[FDDI_ADDR_LEN], edst[FDDI_ADDR_LEN]; struct rtentry *rt; struct fddi_header *fh; - struct arpcom *ac = IFP2AC(ifp); #ifdef MAC error = mac_check_ifnet_transmit(ifp, m); @@ -192,7 +191,7 @@ #ifdef NETATALK case AF_APPLETALK: { struct at_ifaddr *aa; - if (!aarpresolve(ac, m, (struct sockaddr_at *)dst, edst)) + if (!aarpresolve(IFP2AC(ifp), m, (struct sockaddr_at *)dst, edst)) return (0); /* * ifaddr is the first thing in at_ifaddr @@ -314,7 +313,7 @@ if (hdrcmplt) bcopy((caddr_t)esrc, (caddr_t)fh->fddi_shost, FDDI_ADDR_LEN); else - bcopy((caddr_t)ac->ac_enaddr, (caddr_t)fh->fddi_shost, + bcopy(IFP2AC(ifp)->ac_enaddr, (caddr_t)fh->fddi_shost, FDDI_ADDR_LEN); /* ==== //depot/projects/gdb/sys/net/if_iso88025subr.c#5 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/net/if_iso88025subr.c,v 1.62 2004/04/18 01:15:32 luigi Exp $ + * $FreeBSD: src/sys/net/if_iso88025subr.c,v 1.63 2004/04/24 21:59:41 luigi Exp $ * */ @@ -246,7 +246,6 @@ struct iso88025_header gen_th; struct sockaddr_dl *sdl = NULL; struct rtentry *rt; - struct arpcom *ac = IFP2AC(ifp); #ifdef MAC error = mac_check_ifnet_transmit(ifp, m); @@ -272,7 +271,7 @@ /* Generate a generic 802.5 header for the packet */ gen_th.ac = TR_AC; gen_th.fc = TR_LLC_FRAME; - (void)memcpy((caddr_t)gen_th.iso88025_shost, (caddr_t)ac->ac_enaddr, + (void)memcpy((caddr_t)gen_th.iso88025_shost, IFP2AC(ifp)->ac_enaddr, ISO88025_ADDR_LEN); if (rif_len) { gen_th.iso88025_shost[0] |= TR_RII; @@ -321,7 +320,7 @@ #endif /* INET */ #ifdef INET6 case AF_INET6: - if (!nd6_storelladdr(&ac->ac_if, rt, m, dst, (u_char *)edst)) { + if (!nd6_storelladdr(ifp, rt, m, dst, (u_char *)edst)) { /* Something bad happened */ return(0); } ==== //depot/projects/gdb/sys/net/if_vlan.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/net/if_vlan.c,v 1.57 2004/01/03 03:33:39 sam Exp $ + * $FreeBSD: src/sys/net/if_vlan.c,v 1.58 2004/04/24 22:24:48 luigi Exp $ */ /* @@ -691,7 +691,7 @@ struct sockaddr *sa; sa = (struct sockaddr *) &ifr->ifr_data; - bcopy(((struct arpcom *)ifp->if_softc)->ac_enaddr, + bcopy(IFP2AC(ifp)->ac_enaddr, (caddr_t) sa->sa_data, ETHER_ADDR_LEN); } break; ==== //depot/projects/gdb/sys/net/route.c#8 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)route.c 8.3.1.1 (Berkeley) 2/23/95 - * $FreeBSD: src/sys/net/route.c,v 1.102 2004/04/21 15:16:08 luigi Exp $ + * $FreeBSD: src/sys/net/route.c,v 1.104 2004/04/25 01:39:00 luigi Exp $ */ #include "opt_inet.h" @@ -1207,17 +1207,36 @@ } /* - * Validate the route rt0 to the specified destination. If the - * route is marked down try to find a new route. If the route + * rt_check() is invoked on each layer 2 output path, prior to + * encapsulating outbound packets. + * + * The function is mostly used to find a routing entry for the gateway, + * which in some protocol families could also point to the link-level + * address for the gateway itself (the side effect of revalidating the + * route to the destination is rather pointless at this stage, we did it + * already a moment before in the pr_output() routine to locate the ifp + * and gateway to use). + * + * When we remove the layer-3 to layer-2 mapping tables from the + * routing table, this function can be removed. + * + * === On input === + * *dst is the address of the NEXT HOP (which coincides with the + * final destination if directly reachable); + * *lrt0 points to the cached route to the final destination; + * *lrt is not meaningful; + * + * === Operation === + * If the route is marked down try to find a new route. If the route * to the gateway is gone, try to setup a new route. Otherwise, * if the route is marked for packets to be rejected, enforce that. * - * On return lrt contains the route to the destination and lrt0 - * contains the route to the next hop. Their values are meaningul - * ONLY if no error is returned. + * === On return === + * *dst is unchanged; + * *lrt0 points to the (possibly new) route to the final destination + * *lrt points to the route to the next hop * - * This routine is invoked on each layer 2 output path, prior to - * encapsulating outbound packets. + * Their values are meaningful ONLY if no error is returned. */ int rt_check(struct rtentry **lrt, struct rtentry **lrt0, struct sockaddr *dst) ==== //depot/projects/gdb/sys/net/route.h#7 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)route.h 8.4 (Berkeley) 1/9/95 - * $FreeBSD: src/sys/net/route.h,v 1.59 2004/04/20 07:03:30 luigi Exp $ + * $FreeBSD: src/sys/net/route.h,v 1.60 2004/04/24 23:34:04 luigi Exp $ */ #ifndef _NET_ROUTE_H_ @@ -324,10 +324,22 @@ void rt_missmsg(int, struct rt_addrinfo *, int, int); void rt_newaddrmsg(int, struct ifaddr *, int, struct rtentry *); void rt_newmaddrmsg(int, struct ifmultiaddr *); -void rtalloc(struct route *); int rt_setgate(struct rtentry *, struct sockaddr *, struct sockaddr *); -void rtalloc_ign(struct route *, u_long); -/* NB: the rtentry is returned locked */ + +/* + * Note the following locking behavior: + * + * rtalloc_ign() and rtalloc() return ro->ro_rt unlocked + * + * rtalloc1() returns a locked rtentry + * + * rtfree() and RTFREE_LOCKED() require a locked rtentry + * + * RTFREE() uses an unlocked entry. + */ + +void rtalloc_ign(struct route *ro, u_long ignflags); +void rtalloc(struct route *ro); /* XXX deprecated, use rtalloc_ign(ro, 0) */ struct rtentry *rtalloc1(struct sockaddr *, int, u_long); int rtexpunge(struct rtentry *); void rtfree(struct rtentry *); ==== //depot/projects/gdb/sys/powerpc/include/float.h#4 (text+ko) ==== @@ -28,16 +28,20 @@ * * from: @(#)float.h 7.1 (Berkeley) 5/8/90 * from: FreeBSD: src/sys/i386/include/float.h,v 1.8 1999/08/28 00:44:11 - * $FreeBSD: src/sys/powerpc/include/float.h,v 1.4 2004/04/07 04:59:59 imp Exp $ + * $FreeBSD: src/sys/powerpc/include/float.h,v 1.5 2004/04/25 02:36:29 das Exp $ */ #ifndef _MACHINE_FLOAT_H_ #define _MACHINE_FLOAT_H_ 1 +#include + #define FLT_RADIX 2 /* b */ #define FLT_ROUNDS 1 /* FP addition rounds to nearest */ +#if __ISO_C_VISIBLE >= 1999 #define FLT_EVAL_METHOD 1 /* operands promoted to double */ #define DECIMAL_DIG 35 /* max precision in decimal digits */ +#endif #define FLT_MANT_DIG 24 /* p */ #define FLT_EPSILON 1.19209290E-07F /* b**(1-p) */ ==== //depot/projects/gdb/sys/sparc64/include/float.h#3 (text+ko) ==== @@ -32,7 +32,7 @@ * * @(#)float.h 8.1 (Berkeley) 6/11/93 * from: NetBSD: float.h,v 1.3 2001/09/21 20:48:02 eeh Exp - * $FreeBSD: src/sys/sparc64/include/float.h,v 1.4 2004/04/07 05:00:00 imp Exp $ + * $FreeBSD: src/sys/sparc64/include/float.h,v 1.5 2004/04/25 02:36:29 das Exp $ */ #ifndef _MACHINE_FLOAT_H_ @@ -46,8 +46,10 @@ #define FLT_RADIX 2 /* b */ #define FLT_ROUNDS __flt_rounds() +#if __ISO_C_VISIBLE >= 1999 #define FLT_EVAL_METHOD 0 /* no promotion */ #define DECIMAL_DIG 35 /* max precision in decimal digits */ +#endif #define FLT_MANT_DIG 24 /* p */ #define FLT_EPSILON 1.19209290E-7F /* b**(1-p) */ ==== //depot/projects/gdb/sys/sparc64/pci/psycho.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ * * from: NetBSD: psycho.c,v 1.39 2001/10/07 20:30:41 eeh Exp * - * $FreeBSD: src/sys/sparc64/pci/psycho.c,v 1.45 2003/12/26 14:04:19 obrien Exp $ + * $FreeBSD: src/sys/sparc64/pci/psycho.c,v 1.46 2004/04/25 00:30:28 tmm Exp $ */ /* @@ -75,7 +75,6 @@ #include "pcib_if.h" -static void psycho_get_ranges(phandle_t, struct upa_ranges **, int *); static void psycho_set_intr(struct psycho_softc *, int, device_t, bus_addr_t, int, driver_intr_t); static int psycho_find_intrmap(struct psycho_softc *, int, bus_addr_t *, @@ -202,8 +201,8 @@ * the IIi. The APB let's the IIi handle two independednt PCI buses, and * appears as two "simba"'s underneath the sabre. * - * "psycho" and "psycho+" is a dual UPA to PCI bridge. It sits on the UPA bus - * and manages two PCI buses. "psycho" has two 64-bit 33MHz buses, while + * "psycho" and "psycho+" are dual UPA to PCI bridges. They sit on the UPA bus + * and manage two PCI buses. "psycho" has two 64-bit 33MHz buses, while * "psycho+" controls both a 64-bit 33Mhz and a 64-bit 66Mhz PCI bus. You * will usually find a "psycho+" since I don't think the original "psycho" * ever shipped, and if it did it would be in the U30. @@ -219,17 +218,6 @@ * * On UltraII machines, there can be any number of "psycho+" ICs, each * providing two PCI buses. - * - * - * XXXX The psycho/sabre node has an `interrupts' attribute. They contain - * the values of the following interrupts in this order: - * - * PCI Bus Error (30) - * DMA UE (2e) - * DMA CE (2f) - * Power Fail (25) - * - * We really should attach handlers for each. */ #ifdef DEBUGGER_ON_POWERFAIL #define PSYCHO_PWRFAIL_INT_FLAGS INTR_FAST @@ -303,18 +291,6 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Apr 24 22:09:32 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 13F0016A4D0; Sat, 24 Apr 2004 22:09:32 -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 DE13C16A4CE for ; Sat, 24 Apr 2004 22:09:31 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C10AB43D2D for ; Sat, 24 Apr 2004 22:09:31 -0700 (PDT) (envelope-from marcel@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 i3P59VGe032747 for ; Sat, 24 Apr 2004 22:09:31 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i3P59VWu032744 for perforce@freebsd.org; Sat, 24 Apr 2004 22:09:31 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Sat, 24 Apr 2004 22:09:31 -0700 (PDT) Message-Id: <200404250509.i3P59VWu032744@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 51690 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: Sun, 25 Apr 2004 05:09:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=51690 Change 51690 by marcel@marcel_nfs on 2004/04/24 22:09:22 I forgot to add these: MD functions and prototypes for alpha and sparc64. Affected files ... .. //depot/projects/gdb/sys/alpha/include/kdb.h#1 add .. //depot/projects/gdb/sys/sparc64/include/kdb.h#1 add Differences ...