From owner-p4-projects@FreeBSD.ORG Sun May 4 16:38:33 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 39F631065674; Sun, 4 May 2008 16:38:33 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F06631065670 for ; Sun, 4 May 2008 16:38:32 +0000 (UTC) (envelope-from carvay@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 029B98FC12 for ; Sun, 4 May 2008 16:38:33 +0000 (UTC) (envelope-from carvay@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m44GcW8E050100 for ; Sun, 4 May 2008 16:38:32 GMT (envelope-from carvay@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m44GcW5U050098 for perforce@freebsd.org; Sun, 4 May 2008 16:38:32 GMT (envelope-from carvay@freebsd.org) Date: Sun, 4 May 2008 16:38:32 GMT Message-Id: <200805041638.m44GcW5U050098@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to carvay@freebsd.org using -f From: "J. Vicente Carrasco" To: Perforce Change Reviews Cc: Subject: PERFORCE change 141144 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 May 2008 16:38:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=141144 Change 141144 by carvay@carvay_zolocho.tugurbio.org on 2008/05/04 16:38:02 - Start translation Affected files ... .. //depot/projects/docproj_es/src/release/doc/es_ES.ISO8859-1/readme/article.sgml#3 edit Differences ... ==== //depot/projects/docproj_es/src/release/doc/es_ES.ISO8859-1/readme/article.sgml#3 (text+ko) ==== @@ -23,6 +23,7 @@ 2005 2006 2007 + 2008 The &os; Documentation Project @@ -36,11 +37,11 @@ + Este documento es una breve introducción a &os; This document gives a brief introduction to &os; - &release.current;. It includes some information on how to - obtain &os;, a listing of various ways to contact the &os; - Project, and pointers to some other sources of - information. + &release.current;. Incluye información sobre cómo + conseguir &os;, una lista de maneras de contactar con el Proyecto + &os; y se citan otras fuentes de información. From owner-p4-projects@FreeBSD.ORG Sun May 4 17:24:23 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2579F1065671; Sun, 4 May 2008 17:24:23 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DC3DF106564A for ; Sun, 4 May 2008 17:24:22 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E33058FC1B for ; Sun, 4 May 2008 17:24:22 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m44HOMAp062102 for ; Sun, 4 May 2008 17:24:22 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m44HOM7x062100 for perforce@freebsd.org; Sun, 4 May 2008 17:24:22 GMT (envelope-from sam@freebsd.org) Date: Sun, 4 May 2008 17:24:22 GMT Message-Id: <200805041724.m44HOM7x062100@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 141148 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 May 2008 17:24:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=141148 Change 141148 by sam@sam_ebb on 2008/05/04 17:23:58 save intmit sysctl knob; not useful w/ hal in cvs Affected files ... .. //depot/projects/vap/sys/dev/ath/if_ath.c#70 edit .. //depot/projects/vap/sys/dev/ath/if_athvar.h#23 edit Differences ... ==== //depot/projects/vap/sys/dev/ath/if_ath.c#70 (text+ko) ==== @@ -6582,6 +6582,19 @@ } static int +ath_sysctl_intmit(SYSCTL_HANDLER_ARGS) +{ + struct ath_softc *sc = arg1; + int intmit, error; + + intmit = ath_hal_getintmit(sc->sc_ah); + error = sysctl_handle_int(oidp, &intmit, 0, req); + if (error || !req->newptr) + return error; + return !ath_hal_setintmit(sc->sc_ah, intmit) ? EINVAL : 0; +} + +static int ath_sysctl_wmetkipmic(SYSCTL_HANDLER_ARGS) { struct ath_softc *sc = arg1; @@ -6694,6 +6707,11 @@ "rfkill", CTLTYPE_INT | CTLFLAG_RW, sc, 0, ath_sysctl_rfkill, "I", "enable/disable RF kill switch"); } + if (ath_hal_hasintmit(ah)) { + SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, + "intmit", CTLTYPE_INT | CTLFLAG_RW, sc, 0, + ath_sysctl_intmit, "I", "interference mitigation"); + } sc->sc_monpass = HAL_RXERR_DECRYPT | HAL_RXERR_MIC; SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, "monpass", CTLFLAG_RW, &sc->sc_monpass, 0, ==== //depot/projects/vap/sys/dev/ath/if_athvar.h#23 (text+ko) ==== @@ -596,6 +596,12 @@ (ath_hal_getcapability(_ah, HAL_CAP_TPC_CTS, 0, _ptpcts) == HAL_OK) #define ath_hal_settpcts(_ah, _tpcts) \ ath_hal_setcapability(_ah, HAL_CAP_TPC_CTS, 0, _tpcts, NULL) +#define ath_hal_hasintmit(_ah) \ + (ath_hal_getcapability(_ah, HAL_CAP_INTMIT, 0, NULL) == HAL_OK) +#define ath_hal_getintmit(_ah) \ + (ath_hal_getcapability(_ah, HAL_CAP_INTMIT, 1, NULL) == HAL_OK) +#define ath_hal_setintmit(_ah, _v) \ + ath_hal_setcapability(_ah, HAL_CAP_INTMIT, 1, _v, NULL) #define ath_hal_getchannoise(_ah, _c) \ ((*(_ah)->ah_getChanNoise)((_ah), (_c))) #if HAL_ABI_VERSION < 0x05122200 From owner-p4-projects@FreeBSD.ORG Sun May 4 18:41:46 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 175211065671; Sun, 4 May 2008 18:41:46 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C90DF106566C for ; Sun, 4 May 2008 18:41:45 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CCC448FC2B for ; Sun, 4 May 2008 18:41:45 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m44Ifjt4065743 for ; Sun, 4 May 2008 18:41:45 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m44IfjtP065741 for perforce@freebsd.org; Sun, 4 May 2008 18:41:45 GMT (envelope-from sam@freebsd.org) Date: Sun, 4 May 2008 18:41:45 GMT Message-Id: <200805041841.m44IfjtP065741@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 141149 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 May 2008 18:41:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=141149 Change 141149 by sam@sam_ebb on 2008/05/04 18:41:34 Cleanup opmode handling a bit: o add sta mode capability flag now we have free bits o mark all drivers as sta mode capable o move IEEE80211_C_OPMODE to ieee80211_var.h so it's more clear it needs to be kept consistent with the set of opmode capabilities o add ieee80211_opcap array to map an opmode to the corresponding capability bit for use internal to net80211 o update ddb capability bit decoding Affected files ... .. //depot/projects/vap/sys/dev/ath/if_ath.c#71 edit .. //depot/projects/vap/sys/dev/bwi/if_bwi.c#18 edit .. //depot/projects/vap/sys/dev/if_ndis/if_ndis.c#19 edit .. //depot/projects/vap/sys/dev/ipw/if_ipw.c#18 edit .. //depot/projects/vap/sys/dev/iwi/if_iwi.c#31 edit .. //depot/projects/vap/sys/dev/iwn/if_iwn.c#19 edit .. //depot/projects/vap/sys/dev/malo/if_malo.c#9 edit .. //depot/projects/vap/sys/dev/mwl/if_mwl.c#9 edit .. //depot/projects/vap/sys/dev/ral/rt2560.c#34 edit .. //depot/projects/vap/sys/dev/ral/rt2661.c#32 edit .. //depot/projects/vap/sys/dev/usb/if_rum.c#23 edit .. //depot/projects/vap/sys/dev/usb/if_ural.c#21 edit .. //depot/projects/vap/sys/dev/usb/if_zyd.c#22 edit .. //depot/projects/vap/sys/dev/wi/if_wi.c#31 edit .. //depot/projects/vap/sys/dev/wpi/if_wpi.c#24 edit .. //depot/projects/vap/sys/net80211/ieee80211.c#44 edit .. //depot/projects/vap/sys/net80211/ieee80211_ddb.c#14 edit .. //depot/projects/vap/sys/net80211/ieee80211_proto.h#21 edit .. //depot/projects/vap/sys/net80211/ieee80211_var.h#41 edit Differences ... ==== //depot/projects/vap/sys/dev/ath/if_ath.c#71 (text+ko) ==== @@ -515,7 +515,8 @@ ic->ic_phytype = IEEE80211_T_OFDM; ic->ic_opmode = IEEE80211_M_STA; ic->ic_caps = - IEEE80211_C_IBSS /* ibss, nee adhoc, mode */ + IEEE80211_C_STA /* station mode */ + | IEEE80211_C_IBSS /* ibss, nee adhoc, mode */ | IEEE80211_C_HOSTAP /* hostap mode */ | IEEE80211_C_MONITOR /* monitor mode */ | IEEE80211_C_AHDEMO /* adhoc demo mode */ ==== //depot/projects/vap/sys/dev/bwi/if_bwi.c#18 (text+ko) ==== @@ -506,7 +506,8 @@ ieee80211_init_channels(ic, NULL, &bands); ic->ic_ifp = ifp; - ic->ic_caps = IEEE80211_C_SHSLOT | + ic->ic_caps = IEEE80211_C_STA | + IEEE80211_C_SHSLOT | IEEE80211_C_SHPREAMBLE | IEEE80211_C_WPA | IEEE80211_C_MONITOR; ==== //depot/projects/vap/sys/dev/if_ndis/if_ndis.c#19 (text+ko) ==== @@ -719,7 +719,7 @@ ic->ic_ifp = ifp; ic->ic_opmode = IEEE80211_M_STA; ic->ic_phytype = IEEE80211_T_DS; - ic->ic_caps = IEEE80211_C_IBSS; + ic->ic_caps = IEEE80211_C_STA | IEEE80211_C_IBSS; setbit(ic->ic_modecaps, IEEE80211_MODE_AUTO); len = 0; r = ndis_get_info(sc, OID_802_11_NETWORK_TYPES_SUPPORTED, ==== //depot/projects/vap/sys/dev/ipw/if_ipw.c#18 (text+ko) ==== @@ -305,7 +305,9 @@ ic->ic_phytype = IEEE80211_T_DS; /* set device capabilities */ - ic->ic_caps = IEEE80211_C_IBSS /* IBSS mode supported */ + ic->ic_caps = + IEEE80211_C_STA /* station mode supported */ + | IEEE80211_C_IBSS /* IBSS mode supported */ | IEEE80211_C_MONITOR /* monitor mode supported */ | IEEE80211_C_PMGT /* power save supported */ | IEEE80211_C_SHPREAMBLE /* short preamble supported */ ==== //depot/projects/vap/sys/dev/iwi/if_iwi.c#31 (text+ko) ==== @@ -388,7 +388,8 @@ /* set device capabilities */ ic->ic_caps = - IEEE80211_C_IBSS /* IBSS mode supported */ + IEEE80211_C_STA /* station mode supported */ + | IEEE80211_C_IBSS /* IBSS mode supported */ | IEEE80211_C_MONITOR /* monitor mode supported */ | IEEE80211_C_PMGT /* power save supported */ | IEEE80211_C_SHPREAMBLE /* short preamble supported */ ==== //depot/projects/vap/sys/dev/iwn/if_iwn.c#19 (text+kox) ==== @@ -379,7 +379,8 @@ /* set device capabilities */ ic->ic_caps = - IEEE80211_C_MONITOR /* monitor mode supported */ + IEEE80211_C_STA /* station mode supported */ + | IEEE80211_C_MONITOR /* monitor mode supported */ | IEEE80211_C_TXPMGT /* tx power management */ | IEEE80211_C_SHSLOT /* short slot time supported */ | IEEE80211_C_WPA ==== //depot/projects/vap/sys/dev/malo/if_malo.c#9 (text+ko) ==== @@ -301,7 +301,8 @@ ic->ic_phytype = IEEE80211_T_OFDM; ic->ic_opmode = IEEE80211_M_STA; ic->ic_caps = - IEEE80211_C_BGSCAN /* capable of bg scanning */ + IEEE80211_C_STA /* station mode supported */ + | IEEE80211_C_BGSCAN /* capable of bg scanning */ | IEEE80211_C_MONITOR /* monitor mode */ | IEEE80211_C_SHPREAMBLE /* short preamble supported */ | IEEE80211_C_SHSLOT /* short slot time supported */ ==== //depot/projects/vap/sys/dev/mwl/if_mwl.c#9 (text+ko) ==== @@ -427,7 +427,8 @@ ic->ic_phytype = IEEE80211_T_OFDM; ic->ic_opmode = IEEE80211_M_STA; ic->ic_caps = - IEEE80211_C_HOSTAP /* hostap mode */ + IEEE80211_C_STA /* station mode supported */ + | IEEE80211_C_HOSTAP /* hostap mode */ | IEEE80211_C_MONITOR /* monitor mode */ #if 0 | IEEE80211_C_IBSS /* ibss, nee adhoc, mode */ ==== //depot/projects/vap/sys/dev/ral/rt2560.c#34 (text) ==== @@ -278,7 +278,8 @@ /* set device capabilities */ ic->ic_caps = - IEEE80211_C_IBSS /* ibss, nee adhoc, mode */ + IEEE80211_C_STA /* station mode supported */ + | IEEE80211_C_IBSS /* ibss, nee adhoc, mode */ | IEEE80211_C_HOSTAP /* hostap mode */ | IEEE80211_C_MONITOR /* monitor mode */ | IEEE80211_C_AHDEMO /* adhoc demo mode */ ==== //depot/projects/vap/sys/dev/ral/rt2661.c#32 (text) ==== @@ -280,7 +280,8 @@ /* set device capabilities */ ic->ic_caps = - IEEE80211_C_IBSS /* ibss, nee adhoc, mode */ + IEEE80211_C_STA /* station mode supported */ + | IEEE80211_C_IBSS /* ibss, nee adhoc, mode */ | IEEE80211_C_HOSTAP /* hostap mode */ | IEEE80211_C_MONITOR /* monitor mode */ | IEEE80211_C_AHDEMO /* adhoc demo mode */ ==== //depot/projects/vap/sys/dev/usb/if_rum.c#23 (text+ko) ==== @@ -490,7 +490,8 @@ /* set device capabilities */ ic->ic_caps = - IEEE80211_C_IBSS /* IBSS mode supported */ + IEEE80211_C_STA /* station mode supported */ + | IEEE80211_C_IBSS /* IBSS mode supported */ | IEEE80211_C_MONITOR /* monitor mode supported */ | IEEE80211_C_HOSTAP /* HostAp mode supported */ | IEEE80211_C_TXPMGT /* tx power management */ ==== //depot/projects/vap/sys/dev/usb/if_ural.c#21 (text+ko) ==== @@ -479,7 +479,8 @@ /* set device capabilities */ ic->ic_caps = - IEEE80211_C_IBSS /* IBSS mode supported */ + IEEE80211_C_STA /* station mode supported */ + | IEEE80211_C_IBSS /* IBSS mode supported */ | IEEE80211_C_MONITOR /* monitor mode supported */ | IEEE80211_C_HOSTAP /* HostAp mode supported */ | IEEE80211_C_TXPMGT /* tx power management */ ==== //depot/projects/vap/sys/dev/usb/if_zyd.c#22 (text+ko) ==== @@ -390,7 +390,8 @@ /* set device capabilities */ ic->ic_caps = - IEEE80211_C_MONITOR /* monitor mode */ + IEEE80211_C_STA /* station mode supported */ + | IEEE80211_C_MONITOR /* monitor mode */ | IEEE80211_C_SHPREAMBLE /* short preamble supported */ | IEEE80211_C_SHSLOT /* short slot time supported */ | IEEE80211_C_BGSCAN /* capable of bg scanning */ ==== //depot/projects/vap/sys/dev/wi/if_wi.c#31 (text+ko) ==== @@ -331,8 +331,9 @@ ic->ic_ifp = ifp; ic->ic_phytype = IEEE80211_T_DS; ic->ic_opmode = IEEE80211_M_STA; - ic->ic_caps = IEEE80211_C_PMGT + ic->ic_caps = IEEE80211_C_STA | IEEE80211_C_MONITOR + | IEEE80211_C_PMGT ; /* ==== //depot/projects/vap/sys/dev/wpi/if_wpi.c#24 (text+ko) ==== @@ -623,7 +623,8 @@ /* set device capabilities */ ic->ic_caps = - IEEE80211_C_MONITOR /* monitor mode supported */ + IEEE80211_C_STA /* station mode supported */ + | IEEE80211_C_MONITOR /* monitor mode supported */ | IEEE80211_C_TXPMGT /* tx power management */ | IEEE80211_C_SHSLOT /* short slot time supported */ | IEEE80211_C_SHPREAMBLE /* short preamble supported */ ==== //depot/projects/vap/sys/net80211/ieee80211.c#44 (text+ko) ==== @@ -49,18 +49,28 @@ #include -const char *ieee80211_phymode_name[] = { - "auto", /* IEEE80211_MODE_AUTO */ - "11a", /* IEEE80211_MODE_11A */ - "11b", /* IEEE80211_MODE_11B */ - "11g", /* IEEE80211_MODE_11G */ - "FH", /* IEEE80211_MODE_FH */ - "turboA", /* IEEE80211_MODE_TURBO_A */ - "turboG", /* IEEE80211_MODE_TURBO_G */ - "sturboA", /* IEEE80211_MODE_STURBO_A */ - "11na", /* IEEE80211_MODE_11NA */ - "11ng", /* IEEE80211_MODE_11NG */ +const char *ieee80211_phymode_name[IEEE80211_MODE_MAX] = { + [IEEE80211_MODE_AUTO] = "auto", + [IEEE80211_MODE_11A] = "11a", + [IEEE80211_MODE_11B] = "11b", + [IEEE80211_MODE_11G] = "11g", + [IEEE80211_MODE_FH] = "FH", + [IEEE80211_MODE_TURBO_A] = "turboA", + [IEEE80211_MODE_TURBO_G] = "turboG", + [IEEE80211_MODE_STURBO_A] = "sturboA", + [IEEE80211_MODE_11NA] = "11na", + [IEEE80211_MODE_11NG] = "11ng", +}; +/* map ieee80211_opmode to the corresponding capability bit */ +const int ieee80211_opcap[IEEE80211_OPMODE_MAX] = { + [IEEE80211_M_IBSS] = IEEE80211_C_IBSS, + [IEEE80211_M_WDS] = IEEE80211_C_WDS, + [IEEE80211_M_STA] = IEEE80211_C_STA, + [IEEE80211_M_AHDEMO] = IEEE80211_C_AHDEMO, + [IEEE80211_M_HOSTAP] = IEEE80211_C_HOSTAP, + [IEEE80211_M_MONITOR] = IEEE80211_C_MONITOR, }; + static const uint8_t ieee80211broadcastaddr[IEEE80211_ADDR_LEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; @@ -310,9 +320,6 @@ const uint8_t bssid[IEEE80211_ADDR_LEN], const uint8_t macaddr[IEEE80211_ADDR_LEN]) { -#define IEEE80211_C_OPMODE \ - (IEEE80211_C_IBSS | IEEE80211_C_HOSTAP | IEEE80211_C_AHDEMO | \ - IEEE80211_C_MONITOR | IEEE80211_C_WDS) struct ifnet *ifp; ifp = if_alloc(IFT_ETHER); @@ -341,26 +348,14 @@ vap->iv_caps = ic->ic_caps &~ IEEE80211_C_OPMODE; vap->iv_htcaps = ic->ic_htcaps; vap->iv_opmode = opmode; + vap->iv_caps |= ieee80211_opcap[opmode]; switch (opmode) { case IEEE80211_M_STA: /* auto-enable s/w beacon miss support */ if (flags & IEEE80211_CLONE_NOBEACONS) vap->iv_flags_ext |= IEEE80211_FEXT_SWBMISS; break; - case IEEE80211_M_IBSS: - vap->iv_caps |= IEEE80211_C_IBSS; - break; - case IEEE80211_M_AHDEMO: - vap->iv_caps |= IEEE80211_C_AHDEMO; - break; - case IEEE80211_M_HOSTAP: - vap->iv_caps |= IEEE80211_C_HOSTAP; - break; - case IEEE80211_M_MONITOR: - vap->iv_caps |= IEEE80211_C_MONITOR; - break; case IEEE80211_M_WDS: - vap->iv_caps |= IEEE80211_C_WDS; /* * WDS links must specify the bssid of the far end. * For legacy operation this is a static relationship. @@ -417,7 +412,6 @@ ieee80211_regdomain_vattach(vap); return 0; -#undef IEEE80211_C_OPMODE } /* ==== //depot/projects/vap/sys/net80211/ieee80211_ddb.c#14 (text+ko) ==== @@ -71,7 +71,7 @@ #define IEEE80211_FVEN_BITS "\20" #define IEEE80211_C_BITS \ - "\20\7FF\10TURBOP\11IBSS\12PMGT" \ + "\20\1STA\7FF\10TURBOP\11IBSS\12PMGT" \ "\13HOSTAP\14AHDEMO\15SWRETRY\16TXPMGT\17SHSLOT\20SHPREAMBLE" \ "\21MONITOR\30WPA1\31WPA2\32BURST\33WME\34WDS\36BGSCAN" \ "\37TXFRAG" ==== //depot/projects/vap/sys/net80211/ieee80211_proto.h#21 (text+ko) ==== @@ -48,7 +48,8 @@ ((*(_ni)->ni_ic->ic_send_mgmt)(_ni, _type, _arg)) extern const char *ieee80211_mgt_subtype_name[]; -extern const char *ieee80211_phymode_name[]; +extern const char *ieee80211_phymode_name[IEEE80211_MODE_MAX]; +extern const int ieee80211_opcap[IEEE80211_OPMODE_MAX]; void ieee80211_proto_attach(struct ieee80211com *); void ieee80211_proto_detach(struct ieee80211com *); ==== //depot/projects/vap/sys/net80211/ieee80211_var.h#41 (text+ko) ==== @@ -493,6 +493,7 @@ /* ic_caps/iv_caps: device driver capabilities */ /* 0x2f available */ +#define IEEE80211_C_STA 0x00000001 /* CAPABILITY: STA available */ #define IEEE80211_C_FF 0x00000040 /* CAPABILITY: ATH FF avail */ #define IEEE80211_C_TURBOP 0x00000080 /* CAPABILITY: ATH Turbo avail*/ #define IEEE80211_C_IBSS 0x00000100 /* CAPABILITY: IBSS available */ @@ -516,6 +517,10 @@ #define IEEE80211_C_TXFRAG 0x40000000 /* CAPABILITY: tx fragments */ /* XXX protection/barker? */ +#define IEEE80211_C_OPMODE \ + (IEEE80211_C_STA | IEEE80211_C_IBSS | IEEE80211_C_HOSTAP | \ + IEEE80211_C_AHDEMO | IEEE80211_C_MONITOR | IEEE80211_C_WDS) + /* * ic_htcaps/iv_htcaps: HT-specific device/driver capabilities * From owner-p4-projects@FreeBSD.ORG Sun May 4 18:44:51 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C71CC1065676; Sun, 4 May 2008 18:44:51 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 89A3F1065674 for ; Sun, 4 May 2008 18:44:51 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8DAFD8FC1C for ; Sun, 4 May 2008 18:44:51 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m44IipGg065819 for ; Sun, 4 May 2008 18:44:51 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m44IipbB065817 for perforce@freebsd.org; Sun, 4 May 2008 18:44:51 GMT (envelope-from sam@freebsd.org) Date: Sun, 4 May 2008 18:44:51 GMT Message-Id: <200805041844.m44IipbB065817@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 141150 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 May 2008 18:44:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=141150 Change 141150 by sam@sam_ebb on 2008/05/04 18:44:47 o validate opmode parameter at top level of clone work so every driver doesn't need to do it o disambiguate error returns Note: printf's left in place for now; will move to something like DIAGNOSTIC eventually Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_freebsd.c#29 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_freebsd.c#29 (text+ko) ==== @@ -108,11 +108,22 @@ ifp = ifunit(cp.icp_parent); if (ifp == NULL) return ENXIO; + /* XXX move printfs to DIAGNOSTIC before release */ if (ifp->if_type != IFT_IEEE80211) { if_printf(ifp, "%s: reject, not an 802.11 device\n", __func__); + return ENXIO; + } + if (cp.icp_opmode >= IEEE80211_OPMODE_MAX) { + if_printf(ifp, "%s: invalid opmode %d\n", + __func__, cp.icp_opmode); return EINVAL; } ic = ifp->if_l2com; + if ((ic->ic_caps & ieee80211_opcap[cp.icp_opmode]) == 0) { + if_printf(ifp, "%s mode not supported\n", + ieee80211_opmode_name[cp.icp_opmode]); + return EOPNOTSUPP; + } vap = ic->ic_vap_create(ic, ifc->ifc_name, unit, cp.icp_opmode, cp.icp_flags, cp.icp_bssid, cp.icp_flags & IEEE80211_CLONE_MACADDR ? From owner-p4-projects@FreeBSD.ORG Sun May 4 19:02:09 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A4A521065676; Sun, 4 May 2008 19:02:09 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 65EC81065671 for ; Sun, 4 May 2008 19:02:09 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 675AF8FC19 for ; Sun, 4 May 2008 19:02:09 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m44J292J066345 for ; Sun, 4 May 2008 19:02:09 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m44J29T3066343 for perforce@freebsd.org; Sun, 4 May 2008 19:02:09 GMT (envelope-from sam@freebsd.org) Date: Sun, 4 May 2008 19:02:09 GMT Message-Id: <200805041902.m44J29T3066343@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 141151 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 May 2008 19:02:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=141151 Change 141151 by sam@sam_ebb on 2008/05/04 19:01:26 add DFS capability bit Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211.c#45 edit .. //depot/projects/vap/sys/net80211/ieee80211_ddb.c#15 edit .. //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#57 edit .. //depot/projects/vap/sys/net80211/ieee80211_var.h#42 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211.c#45 (text+ko) ==== @@ -386,9 +386,10 @@ if (vap->iv_opmode == IEEE80211_M_STA && (vap->iv_caps & IEEE80211_C_BGSCAN)) vap->iv_flags |= IEEE80211_F_BGSCAN; - vap->iv_flags |= IEEE80211_F_DOTH; /* XXX out of caps, just ena */ - /* XXX out of caps, just ena */ - if (vap->iv_opmode == IEEE80211_M_HOSTAP) + vap->iv_flags |= IEEE80211_F_DOTH; /* XXX no cap, just ena */ + /* NB: DFS support only makes sense for ap mode right now */ + if (vap->iv_opmode == IEEE80211_M_HOSTAP && + (vap->iv_caps & IEEE80211_C_DFS)) vap->iv_flags_ext |= IEEE80211_FEXT_DFS; vap->iv_des_chan = IEEE80211_CHAN_ANYC; /* any channel is ok */ ==== //depot/projects/vap/sys/net80211/ieee80211_ddb.c#15 (text+ko) ==== @@ -73,7 +73,7 @@ #define IEEE80211_C_BITS \ "\20\1STA\7FF\10TURBOP\11IBSS\12PMGT" \ "\13HOSTAP\14AHDEMO\15SWRETRY\16TXPMGT\17SHSLOT\20SHPREAMBLE" \ - "\21MONITOR\30WPA1\31WPA2\32BURST\33WME\34WDS\36BGSCAN" \ + "\21MONITOR\22DFS\30WPA1\31WPA2\32BURST\33WME\34WDS\36BGSCAN" \ "\37TXFRAG" #define IEEE80211_C_CRYPTO_BITS \ ==== //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#57 (text+ko) ==== @@ -3027,11 +3027,8 @@ break; case IEEE80211_IOC_DFS: if (ireq->i_val) { -#if 0 - /* XXX no capability */ if ((vap->iv_caps & IEEE80211_C_DFS) == 0) return EOPNOTSUPP; -#endif /* NB: DFS requires 11h support */ if ((vap->iv_flags & IEEE80211_F_DOTH) == 0) return EINVAL; ==== //depot/projects/vap/sys/net80211/ieee80211_var.h#42 (text+ko) ==== @@ -505,7 +505,8 @@ #define IEEE80211_C_SHSLOT 0x00004000 /* CAPABILITY: short slottime */ #define IEEE80211_C_SHPREAMBLE 0x00008000 /* CAPABILITY: short preamble */ #define IEEE80211_C_MONITOR 0x00010000 /* CAPABILITY: monitor mode */ -/* 0x20000 available */ +#define IEEE80211_C_DFS 0x00020000 /* CAPABILITY: DFS/radar avail*/ +/* 0x7c0000 available */ #define IEEE80211_C_WPA1 0x00800000 /* CAPABILITY: WPA1 avail */ #define IEEE80211_C_WPA2 0x01000000 /* CAPABILITY: WPA2 avail */ #define IEEE80211_C_WPA 0x01800000 /* CAPABILITY: WPA1+WPA2 avail*/ From owner-p4-projects@FreeBSD.ORG Sun May 4 19:04:12 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EFCD11065679; Sun, 4 May 2008 19:04:11 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B19F91065678 for ; Sun, 4 May 2008 19:04:11 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 996A38FC2C for ; Sun, 4 May 2008 19:04:11 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m44J4B4K067446 for ; Sun, 4 May 2008 19:04:11 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m44J4Bhe067444 for perforce@freebsd.org; Sun, 4 May 2008 19:04:11 GMT (envelope-from sam@freebsd.org) Date: Sun, 4 May 2008 19:04:11 GMT Message-Id: <200805041904.m44J4Bhe067444@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 141153 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 May 2008 19:04:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=141153 Change 141153 by sam@sam_ebb on 2008/05/04 19:03:16 mark driver DFS capable Affected files ... .. //depot/projects/vap/sys/dev/mwl/if_mwl.c#10 edit Differences ... ==== //depot/projects/vap/sys/dev/mwl/if_mwl.c#10 (text+ko) ==== @@ -443,6 +443,7 @@ | IEEE80211_C_BGSCAN /* capable of bg scanning */ | IEEE80211_C_TXFRAG /* handle tx frags */ | IEEE80211_C_TXPMGT /* capable of txpow mgt */ + | IEEE80211_C_DFS /* DFS supported */ ; ic->ic_htcaps = From owner-p4-projects@FreeBSD.ORG Sun May 4 19:04:12 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A0EAF106573C; Sun, 4 May 2008 19:04:12 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C2F13106566B for ; Sun, 4 May 2008 19:04:11 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C37E38FC1F for ; Sun, 4 May 2008 19:04:11 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m44J4Bex067451 for ; Sun, 4 May 2008 19:04:11 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m44J4BoU067449 for perforce@freebsd.org; Sun, 4 May 2008 19:04:11 GMT (envelope-from thompsa@freebsd.org) Date: Sun, 4 May 2008 19:04:11 GMT Message-Id: <200805041904.m44J4BoU067449@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 141154 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 May 2008 19:04:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=141154 Change 141154 by thompsa@thompsa_burger on 2008/05/04 19:03:39 Associate from a taskq as we can (and will) deadlock on the ndis hal and the com lock. Affected files ... .. //depot/projects/vap/sys/dev/if_ndis/if_ndis.c#20 edit .. //depot/projects/vap/sys/dev/if_ndis/if_ndisvar.h#12 edit Differences ... ==== //depot/projects/vap/sys/dev/if_ndis/if_ndis.c#20 (text+ko) ==== @@ -164,11 +164,13 @@ static void ndis_watchdog (struct ifnet *); static int ndis_ifmedia_upd (struct ifnet *); static void ndis_ifmedia_sts (struct ifnet *, struct ifmediareq *); +static void ndis_auth (void *, int); +static void ndis_assoc (void *, int); static int ndis_get_assoc (struct ndis_softc *, ndis_wlan_bssid_ex **); static int ndis_probe_offload (struct ndis_softc *); static int ndis_set_offload (struct ndis_softc *); static void ndis_getstate_80211 (struct ndis_softc *); -static void ndis_setstate_80211 (struct ndis_softc *); +static void ndis_auth_and_assoc (struct ndis_softc *, struct ieee80211vap *); static int ndis_set_cipher (struct ndis_softc *, int); static int ndis_set_wpa (struct ndis_softc *, void *, int); static int ndis_add_key (struct ieee80211vap *, @@ -714,6 +716,8 @@ taskqueue_start_threads(&sc->ndis_tq, 1, PI_NET, "%s taskq", device_get_nameunit(dev)); TASK_INIT(&sc->ndis_scantask, 0, ndis_scan, sc); + TASK_INIT(&sc->ndis_authtask, 0, ndis_auth, sc); + TASK_INIT(&sc->ndis_assoctask, 0, ndis_assoc, sc); ifp->if_ioctl = ndis_ioctl_80211; ic->ic_ifp = ifp; @@ -1003,8 +1007,11 @@ } else NDIS_UNLOCK(sc); - if (sc->ndis_80211) + if (sc->ndis_80211) { taskqueue_drain(sc->ndis_tq, &sc->ndis_scantask); + taskqueue_drain(sc->ndis_tq, &sc->ndis_authtask); + taskqueue_drain(sc->ndis_tq, &sc->ndis_assoctask); + } if (sc->ndis_tickitem != NULL) IoFreeWorkItem(sc->ndis_tickitem); @@ -2196,11 +2203,35 @@ } static void -ndis_setstate_80211(sc) +ndis_auth(void *arg, int npending) +{ + struct ndis_softc *sc = arg; + struct ifnet *ifp = sc->ifp; + struct ieee80211com *ic = ifp->if_l2com; + struct ieee80211vap *vap = TAILQ_FIRST(&ic->ic_vaps); + + vap->iv_state = IEEE80211_S_AUTH; + ndis_auth_and_assoc(sc, vap); +} + +static void +ndis_assoc(void *arg, int npending) +{ + struct ndis_softc *sc = arg; + struct ifnet *ifp = sc->ifp; + struct ieee80211com *ic = ifp->if_l2com; + struct ieee80211vap *vap = TAILQ_FIRST(&ic->ic_vaps); + + vap->iv_state = IEEE80211_S_ASSOC; + ndis_auth_and_assoc(sc, vap); +} + +static void +ndis_auth_and_assoc(sc, vap) struct ndis_softc *sc; + struct ieee80211vap *vap; { struct ieee80211com *ic; - struct ieee80211vap *vap; struct ieee80211_node *ni; ndis_80211_ssid ssid; ndis_80211_macaddr bssid; @@ -2212,7 +2243,6 @@ ifp = sc->ifp; ic = ifp->if_l2com; - vap = TAILQ_FIRST(&ic->ic_vaps); ni = vap->iv_bss; if (!NDIS_INITIALIZED(sc)) { @@ -3131,16 +3161,15 @@ case IEEE80211_S_INIT: case IEEE80211_S_SCAN: return nvp->newstate(vap, nstate, arg); - case IEEE80211_S_ASSOC: - if (ostate != IEEE80211_S_AUTH) - ndis_setstate_80211(sc); + if (ostate != IEEE80211_S_AUTH) { + taskqueue_enqueue(sc->ndis_tq, &sc->ndis_assoctask); + return EINPROGRESS; + } break; - case IEEE80211_S_AUTH: - ndis_setstate_80211(sc); - break; - + taskqueue_enqueue(sc->ndis_tq, &sc->ndis_authtask); + return EINPROGRESS; default: break; } ==== //depot/projects/vap/sys/dev/if_ndis/if_ndisvar.h#12 (text+ko) ==== @@ -177,6 +177,8 @@ struct taskqueue *ndis_tq; /* private task queue */ struct task ndis_scantask; + struct task ndis_authtask; + struct task ndis_assoctask; int (*ndis_newstate)(struct ieee80211com *, enum ieee80211_state, int); }; From owner-p4-projects@FreeBSD.ORG Sun May 4 19:06:14 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 34F351065689; Sun, 4 May 2008 19:06:14 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EA8B0106564A for ; Sun, 4 May 2008 19:06:13 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EAE5A8FC2D for ; Sun, 4 May 2008 19:06:13 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m44J6DWE067538 for ; Sun, 4 May 2008 19:06:13 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m44J6DsW067536 for perforce@freebsd.org; Sun, 4 May 2008 19:06:13 GMT (envelope-from sam@freebsd.org) Date: Sun, 4 May 2008 19:06:13 GMT Message-Id: <200805041906.m44J6DsW067536@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 141155 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 May 2008 19:06:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=141155 Change 141155 by sam@sam_ebb on 2008/05/04 19:06:03 sync w/ kernel Affected files ... .. //depot/projects/vap/sbin/ifconfig/ifieee80211.c#20 edit Differences ... ==== //depot/projects/vap/sbin/ifconfig/ifieee80211.c#20 (text+ko) ==== @@ -3061,9 +3061,9 @@ } #define IEEE80211_C_BITS \ - "\20\7FF\10TURBOP\11IBSS\12PMGT" \ + "\20\1STA\7FF\10TURBOP\11IBSS\12PMGT" \ "\13HOSTAP\14AHDEMO\15SWRETRY\16TXPMGT\17SHSLOT\20SHPREAMBLE" \ - "\21MONITOR\30WPA1\31WPA2\32BURST\33WME\34WDS\36BGSCAN" \ + "\21MONITOR\22DFS\30WPA1\31WPA2\32BURST\33WME\34WDS\36BGSCAN" \ "\37TXFRAG" #define IEEE80211_CRYPTO_BITS \ From owner-p4-projects@FreeBSD.ORG Sun May 4 19:07:15 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C97471065670; Sun, 4 May 2008 19:07:15 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 71E75106566B for ; Sun, 4 May 2008 19:07:15 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 709358FC16 for ; Sun, 4 May 2008 19:07:15 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m44J7FmF067568 for ; Sun, 4 May 2008 19:07:15 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m44J7FLO067566 for perforce@freebsd.org; Sun, 4 May 2008 19:07:15 GMT (envelope-from jb@freebsd.org) Date: Sun, 4 May 2008 19:07:15 GMT Message-Id: <200805041907.m44J7FLO067566@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 141156 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 May 2008 19:07:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=141156 Change 141156 by jb@freebsd3 on 2008/05/04 19:07:12 IFC Affected files ... .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/remote-install/article.sgml#5 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#16 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/slides/common/freebsd-dev-model.xml#5 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/printing/chapter.sgml#5 integrate .. //depot/projects/dtrace/doc/share/pgpkeys/brix.key#2 integrate .. //depot/projects/dtrace/ports/Mk/bsd.sites.mk#30 integrate .. //depot/projects/dtrace/ports/UPDATING#69 integrate .. //depot/projects/dtrace/src/etc/defaults/rc.conf#34 integrate .. //depot/projects/dtrace/src/gnu/lib/libstdc++/config.h#6 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/binutils/objdump/Makefile#4 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/gdb/kgdb/kthr.c#11 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/gdb/kgdb/trgt.c#9 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/gdb/kgdb/trgt_amd64.c#7 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/gdb/kgdb/trgt_arm.c#6 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/gdb/kgdb/trgt_i386.c#8 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/gdb/kgdb/trgt_ia64.c#5 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/gdb/kgdb/trgt_powerpc.c#5 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/gdb/kgdb/trgt_sparc64.c#5 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/sort/config.h#4 integrate .. //depot/projects/dtrace/src/include/stdio.h#10 integrate .. //depot/projects/dtrace/src/lib/csu/mips/Makefile#1 branch .. //depot/projects/dtrace/src/lib/csu/mips/crt1.c#1 branch .. //depot/projects/dtrace/src/lib/csu/mips/crti.S#1 branch .. //depot/projects/dtrace/src/lib/csu/mips/crtn.S#1 branch .. //depot/projects/dtrace/src/lib/libc/Versions.def#5 integrate .. //depot/projects/dtrace/src/lib/libc/net/nsdispatch.c#8 integrate .. //depot/projects/dtrace/src/lib/libc/stdio/Makefile.inc#5 integrate .. //depot/projects/dtrace/src/lib/libc/stdio/Symbol.map#6 integrate .. //depot/projects/dtrace/src/lib/libc/stdio/clrerr.c#5 integrate .. //depot/projects/dtrace/src/lib/libc/stdio/feof.c#5 integrate .. //depot/projects/dtrace/src/lib/libc/stdio/ferror.c#5 integrate .. //depot/projects/dtrace/src/lib/libc/stdio/fileno.c#5 integrate .. //depot/projects/dtrace/src/lib/libc/stdio/getc.c#5 integrate .. //depot/projects/dtrace/src/lib/libc/stdio/getchar.c#5 integrate .. //depot/projects/dtrace/src/lib/libc/stdio/local.h#7 integrate .. //depot/projects/dtrace/src/lib/libc/stdio/putc.c#5 integrate .. //depot/projects/dtrace/src/lib/libc/stdio/putchar.c#5 integrate .. //depot/projects/dtrace/src/lib/libc/stdio/stdio.c#5 integrate .. //depot/projects/dtrace/src/lib/libc/stdio/unlocked.c#4 delete .. //depot/projects/dtrace/src/lib/libc/stdio/xprintf.c#6 integrate .. //depot/projects/dtrace/src/lib/libc/stdlib/malloc.c#23 integrate .. //depot/projects/dtrace/src/lib/libc/stdlib/rb.h#2 integrate .. //depot/projects/dtrace/src/lib/libftpio/ftpio.c#4 integrate .. //depot/projects/dtrace/src/lib/msun/mips/Symbol.map#2 integrate .. //depot/projects/dtrace/src/share/man/man4/auditpipe.4#6 integrate .. //depot/projects/dtrace/src/share/man/man4/wlan.4#7 integrate .. //depot/projects/dtrace/src/share/misc/bsd-family-tree#16 integrate .. //depot/projects/dtrace/src/sys/amd64/conf/GENERIC#38 integrate .. //depot/projects/dtrace/src/sys/conf/NOTES#48 integrate .. //depot/projects/dtrace/src/sys/conf/files.sun4v#15 integrate .. //depot/projects/dtrace/src/sys/dev/ath/if_ath.c#21 integrate .. //depot/projects/dtrace/src/sys/dev/ath/if_athvar.h#13 integrate .. //depot/projects/dtrace/src/sys/dev/bge/if_bge.c#29 integrate .. //depot/projects/dtrace/src/sys/dev/mpt/mpt.h#22 integrate .. //depot/projects/dtrace/src/sys/dev/mpt/mpt_cam.c#28 integrate .. //depot/projects/dtrace/src/sys/dev/mpt/mpt_raid.c#13 integrate .. //depot/projects/dtrace/src/sys/dev/usb/usbdevs#33 integrate .. //depot/projects/dtrace/src/sys/i386/conf/GENERIC#35 integrate .. //depot/projects/dtrace/src/sys/i386/cpufreq/est.c#8 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_subr.c#40 integrate .. //depot/projects/dtrace/src/sys/mips/include/am29lv081b.h#2 delete .. //depot/projects/dtrace/src/sys/mips/include/cp0.h#2 delete .. //depot/projects/dtrace/src/sys/mips/include/float.h#2 integrate .. //depot/projects/dtrace/src/sys/mips/mips/mips_subr.c#2 delete .. //depot/projects/dtrace/src/sys/modules/esp/Makefile#4 integrate .. //depot/projects/dtrace/src/sys/modules/hfa/Makefile#4 integrate .. //depot/projects/dtrace/src/sys/modules/hme/Makefile#4 integrate .. //depot/projects/dtrace/src/sys/modules/isp/Makefile#5 integrate .. //depot/projects/dtrace/src/sys/modules/ispfw/Makefile#6 integrate .. //depot/projects/dtrace/src/sys/modules/le/Makefile#6 integrate .. //depot/projects/dtrace/src/sys/modules/scc/Makefile#4 integrate .. //depot/projects/dtrace/src/sys/modules/sound/driver/Makefile#6 integrate .. //depot/projects/dtrace/src/sys/modules/wlan/Makefile#7 integrate .. //depot/projects/dtrace/src/sys/net80211/ieee80211_node.c#10 integrate .. //depot/projects/dtrace/src/sys/netinet/libalias/alias.c#9 integrate .. //depot/projects/dtrace/src/sys/pc98/conf/GENERIC#18 integrate .. //depot/projects/dtrace/src/sys/sparc64/conf/GENERIC#22 integrate .. //depot/projects/dtrace/src/sys/sparc64/pci/ofw_pcibus.c#11 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/bus_common.h#5 delete .. //depot/projects/dtrace/src/sys/sun4v/sun4v/nexus.c#8 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/vnex.c#9 integrate .. //depot/projects/dtrace/src/usr.bin/tar/bsdtar.1#10 integrate .. //depot/projects/dtrace/src/usr.bin/tar/bsdtar.c#9 integrate .. //depot/projects/dtrace/src/usr.bin/tar/test/Makefile#1 branch .. //depot/projects/dtrace/src/usr.bin/tar/test/main.c#1 branch .. //depot/projects/dtrace/src/usr.bin/tar/test/test.h#1 branch .. //depot/projects/dtrace/src/usr.bin/tar/test/test_0.c#1 branch .. //depot/projects/dtrace/src/usr.bin/tar/test/test_basic.c#1 branch .. //depot/projects/dtrace/src/usr.bin/tar/test/test_copy.c#1 branch .. //depot/projects/dtrace/src/usr.bin/tar/test/test_getdate.c#1 branch .. //depot/projects/dtrace/src/usr.bin/tar/test/test_help.c#1 branch .. //depot/projects/dtrace/src/usr.bin/tar/test/test_option_T.c#1 branch .. //depot/projects/dtrace/src/usr.bin/tar/test/test_stdio.c#1 branch .. //depot/projects/dtrace/src/usr.bin/tar/test/test_version.c#1 branch .. //depot/projects/dtrace/src/usr.bin/tar/write.c#9 integrate .. //depot/projects/dtrace/src/usr.bin/tip/tip/cmds.c#5 integrate .. //depot/projects/dtrace/src/usr.bin/tip/tip/tip.c#5 integrate .. //depot/projects/dtrace/src/usr.bin/tip/tip/tip.h#5 integrate .. //depot/projects/dtrace/src/usr.bin/tip/tip/uucplock.c#5 integrate .. //depot/projects/dtrace/src/usr.bin/unifdef/unifdef.1#4 integrate .. //depot/projects/dtrace/src/usr.sbin/pkg_install/Makefile.inc#4 integrate .. //depot/projects/dtrace/src/usr.sbin/pkg_install/add/perform.c#7 integrate .. //depot/projects/dtrace/src/usr.sbin/pkg_install/delete/perform.c#6 integrate .. //depot/projects/dtrace/src/usr.sbin/pkg_install/lib/lib.h#9 integrate .. //depot/projects/dtrace/src/usr.sbin/pkg_install/lib/match.c#6 integrate .. //depot/projects/dtrace/src/usr.sbin/sade/Makefile#4 integrate .. //depot/projects/dtrace/www/en/cgi/man.cgi#12 integrate .. //depot/projects/dtrace/www/en/projects/ideas/ideas.xml#19 integrate .. //depot/projects/dtrace/www/es/docproj/sgml.sgml#5 integrate .. //depot/projects/dtrace/www/es/index.xsl#10 integrate .. //depot/projects/dtrace/www/es/internet.sgml#8 integrate .. //depot/projects/dtrace/www/es/platforms/i386.sgml#5 integrate .. //depot/projects/dtrace/www/es/platforms/index.sgml#7 integrate .. //depot/projects/dtrace/www/es/search/index-site.sgml#5 integrate .. //depot/projects/dtrace/www/es/search/search-mid.sgml#5 integrate .. //depot/projects/dtrace/www/es/search/searchhints.sgml#5 integrate .. //depot/projects/dtrace/www/es/send-pr.sgml#7 integrate .. //depot/projects/dtrace/www/es/share/sgml/navibar.l10n.ent#5 integrate .. //depot/projects/dtrace/www/hu/Makefile#4 integrate .. //depot/projects/dtrace/www/hu/community.sgml#3 delete .. //depot/projects/dtrace/www/hu/community.xsl#1 branch .. //depot/projects/dtrace/www/hu/docs/books.sgml#5 integrate .. //depot/projects/dtrace/www/hu/internet.sgml#3 integrate .. //depot/projects/dtrace/www/hu/projects/projects.sgml#5 integrate .. //depot/projects/dtrace/www/hu/search/index-site.sgml#2 integrate .. //depot/projects/dtrace/www/hu/search/search-mid.sgml#2 integrate .. //depot/projects/dtrace/www/hu/search/search.sgml#4 integrate .. //depot/projects/dtrace/www/hu/search/searchhints.sgml#2 integrate .. //depot/projects/dtrace/www/hu/send-pr.sgml#3 integrate Differences ... ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/remote-install/article.sgml#5 (text+ko) ==== @@ -17,7 +17,7 @@ - $FreeBSD: doc/en_US.ISO8859-1/articles/remote-install/article.sgml,v 1.4 2008/04/19 23:40:22 brd Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/remote-install/article.sgml,v 1.5 2008/05/03 08:26:12 loader Exp $ &tm-attrib.freebsd; @@ -392,6 +392,7 @@ Create a UFS2 file system on each mirrored partition. + ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#16 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -3433,7 +3433,7 @@ Now restart inetd: - &prompt.root; kill -HUP `cat /var/run/inetd.pid` + &prompt.root; /etc/rc.d/inetd restart ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/slides/common/freebsd-dev-model.xml#5 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -38,13 +38,13 @@ Only the committers have write access to the CVS repository. - 488 total committers in FreeBSD (includes source, + 353 total committers in FreeBSD (includes source, documentation, and ports committers). - 203 active committers to src/ (exlucind sys) in the last 12 + 181 active committers to src/ (excluding sys) in the last 12 months. - 144 active committers to src/sys in the last 12 + 147 active committers to src/sys in the last 12 months. ==== //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/printing/chapter.sgml#5 (text+ko) ==== @@ -2,7 +2,7 @@ The FreeBSD Documentation Project The FreeBSD French Documentation Project - $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/printing/chapter.sgml,v 1.5 2007/12/30 16:04:20 blackend Exp $ + $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/printing/chapter.sgml,v 1.6 2008/05/03 08:50:04 blackend Exp $ Original revision: 1.96 --> @@ -1712,52 +1712,2875 @@ - Advanced Printer Setup ** Traduction en Cours ** - + Configuration avancée de l'imprimante + + Cette section décrit les filtres à utiliser + pour imprimer des fichiers au formatage particulier, des pages + d'en-tête, pour imprimer en réseau, et pour + restreindre et comptabiliser l'utilisation de + l'imprimante. - Filters + Les filtres + + + imprimer + filtres + + + Bien que LPD gère les + protocoles réseaux, les files d'attente, le + contrôle d'accès et d'autres aspects de + l'impression, la plus grande partie du + véritable travail intervient dans + les filtres. Les filtres sont des + programmes qui communiquent avec l'imprimante et gèrent + ses dépendances matérielles ainsi que ses + besoins particuliers. Dans la configuration simple de + l'imprimante, nous avons installé un filtre texte + simple— un filtre particulièrement basique qui + devrait fonctionner avec la plupart des imprimantes (voir la + section Installer le + filtre texte). + + Toutefois, afin de profiter de la conversion de format, de + la comptabilisation de l'utilisation de l'imprimante, de + particularités matérielles, et ainsi de suite, + il vous faut comprendre le fonctionnement des filtres. En + dernier ressort, il incombera au filtre de gérer ces + aspects. Et la mauvaise nouvelle, c'est que la plupart du + temps, c'est vous qui devrez produire ces + filtres vous-même. La bonne nouvelle, c'est que + beaucoup existent déjà et que, sinon, ils sont + en général assez faciles à + écrire. + + Par ailleurs, il en est un livré avec &os;, + /usr/libexec/lpr/lpf, qui fonctionne avec + beaucoup d'imprimantes capables d'imprimer du texte brut. (Il + gère les retours arrière et les tabulations dans + le fichier, effectue une comptabilisation, mais c'est à + peu près tout). Vous trouverez également + d'autres filtres et composants de filtres dans le catalogue + des logiciels portés de &os;. + + Voici ce que vous trouverez dans cette section: + + + + La section + Fonctionnement + des filtres tâche de donner une vue + générale du rôle des filtres dans le + processus d'impression. Il vous faut lire cette section + pour comprendre ce qui se passe sous le + capot lorsque LPD + utilise des filtres. Cette connaissance vous permettra + d'anticiper et de résoudre les problèmes que + vous pourriez rencontrer quand vous installerez de plus en + plus de filtres pour chacune de vos imprimantes. + + + + LPD s'attend à ce + que toutes les imprimantes sachent imprimer du texte brut + par défaut. Cela pose un problème pour les + imprimantes &postscript; (ou les imprimantes basées + sur un autre langage) qui ne peut pas imprimer du texte + brut directement. La section Gérer les + travaux d'impression de texte brut sur des imprimantes + &postscript; vous indique la marche à suivre + pour résoudre ce problème. Vous devrez lire + cette section si vous avez une imprimante + &postscript;. + + + + &postscript; est un format de sortie courant pour + beaucoup d'applications. Certaines personnes + écrivent même du code &postscript; + directement. Malheureusement, les imprimantes + &postscript; sont onéreuses. La section Emuler du &postscript; sur + les imprimantes non-&postscript; vous indiquera + comment modifier un filtre texte pour qu'une imprimante + non-&postscript; accepte et imprime + du &postscript;. Vous devrez lire cette section si vous + ne disposez pas d'une imprimante &postscript;. + + + + La section + Filtres de + conversion vous apprendra à automatiser la + conversion de formats de fichiers spécifiques, + comme des graphiques ou des données de composition, + en formats compréhensibles par l'imprimante. + Après avoir lu cette section, vous serez en mesure + de configurer vos imprimantes de telle sorte que vos + utilisateurs pourront entrer la commande lpr + -t pour imprimer du troff, ou lpr + -d pour imprimer le format DVI produit par + &tex;, ou lpr -v pour imprimer des + images en mode point, etc. Nous recommandons la lecture + de cette section. + + + + La section Filtres de sortie + révèle tout d'une fonctionnalité peu + utilisée de LPD: les + filtres de sortie. A moins que vous n'imprimiez des pages + d'en-têtes (voir la section Pages + d'en-tête), vous pouvez probablement + complètement ignorer cette section. + + + + La section lpf: + un filtre texte détaille + lpf, un filtre texte destiné aux + imprimantes en ligne (et aux imprimantes laser se + comportant comme telles) plutôt complet + malgré sa simplicité, et livré avec + &os;. Si vous avez besoin de mettre rapidement en place + la comptabilisation de l'utilisation de l'imprimante pour + du texte brut, ou si vous avez une imprimante qui fume + lorsqu'elle voit passer des caractères de retour + arrière, vous devez vraiment penser à + lpf. + + + + + Une copie des différents scripts + présentés ci-dessous se trouve dans le + répertoire /usr/share/examples/printing. + + + - How Filters Work - + Fonctionnement des filtres + + Comme expliqué précédemment, un + filtre est un programme exécutable lancé par + LPD pour gérer la partie + de la communication avec l'imprimante qui est + dépendante du périphérique. + + Lorsque LPD veut imprimer un + fichier d'un travail d'impression, il lance un programme de + filtre. Il redirige l'entrée standard du filtre sur + le fichier à imprimer, sa sortie standard vers + l'imprimante, et l'erreur standard vers le fichier journal + des erreurs (spécifié dans le paramètre + lf du fichier + /etc/printcap, ou + /dev/console par défaut). + + + troff + + + Le filtre lancé par + LPD ainsi que les + paramètres qui lui sont donnés + dépendent de ce qui est placé dans le fichier + /etc/printcap et des paramètres + que l'utilisateur a passé sur la ligne de commande + &man.lpr.1; pour ce travail d'impression. Par exemple, si + l'utilisateur a entré lpr -t, + LPD aurait lancé le filtre + troff, précisé par la paramètre + tf pour l'imprimante de destination. Si + l'utilisateur veut imprimer du texte brut, il lancerait le + filtre if (c'est vrai la plupart du + temps: lisez la section Filtres de sortie pour + plus de détails). + + Il existe trois types de filtres que vous pouvez + spécifier dans + /etc/printcap: + + + + Le filtre texte, + confusément appelé filtre + d'entrée dans la documentation + LPD, gère l'impression + de texte classique. Considérez-le comme le + filtre par défaut. + LPD s'attend à ce que + toutes les imprimantes sachent imprimer du texte brut + par défaut, et c'est au filtre texte de s'assurer + que les retours arrière, tabulations et autres + caractères spéciaux ne trompent pas + l'imprimante. Si vous êtes dans un environnement + où il vous faut rendre compte de l'utilisation de + l'imprimante, le filtre texte doit également + comptabiliser les pages imprimées, + généralement en comptant le nombre de + lignes imprimées et en le comparant avec le + nombre de lignes par page supporté par + l'imprimante. Le filtre texte est exécuté + avec la liste de paramètres suivante: + + + nom_du_filtre + -c + -w + largeur + -l + hauteur + -i + indentation + -n + utilisateur + -h + machine + fichier_comptabilité + + + où + + + + + + + apparaît si le travail d'impression est + lancé par la commande lpr + -l + + + + + largeur + + + est la valeur du paramètre + pw (page width, + pour largeur de page) + spécifié dans + /etc/printcap, et + possédant la valeur par défaut + 132. + + + + + hauteur + + + est la valeur du paramètre + pl (page length, + pour hauteur de page), par + défaut: 66. + + + + + indentation + + + est le nombre d'indentations + inséré par lpr + -i, par défaut: 0. + + + + + utilisateur + + + est le nom du compte de l'utilisateur + imprimant le fichier. + + + + + machine + + + est le nom de la machine depuis + laquelle le travail d'impression a + été soumis. + + + + + fichier_comptabilité + + + est le nom du fichier de comptabilisation + spécifié par le paramètre + af. + + + + + + + imprimer + filtres + + + + Un filtre de conversion + convertit un format de fichier spécifique en un + autre que l'imprimante saura imprimer sur papier. Par + exemple, des données de composition ditroff ne + peuvent être imprimées directement, mais il + vous est possible d'installer un filtre de conversion + ditroff afin de convertir ces données ditroff en + une forme que l'imprimante sait ingérer et + imprimer. La section Filtres de + conversion vous dira tout sur ce sujet. Les + filtres de conversion doivent également tenir des + statistiques, si vous avez besoin de comptabiliser les + impressions. Les filtres de conversion sont + lancés avec les paramètres + suivants: + + + nom-du-filtre + -x + largeur-en-pixels + -y + hauteur-en-pixels + -n + login + -h + hôte + fichier_comptabilité + + + où + largeur-en-pixels est la + valeur du paramètre px (0 par + défaut) et + hauteur-en-pixels est la + valeur du paramètre py (0 par + défaut). + + + + Le filtre de sortie n'est + utilisé que s'il n'y a pas de filtre texte, ou si + les pages d'en-tête ont été + activées. D'après notre + expérience, les filtres de sortie sont rarement + employés. La section Filtres de sortie + les détaillera. Un filtre de sortie ne prend que + deux paramètres: + + + nom-du-filtre + -w + largeur + -l + hauteur + + + qui sont identiques aux paramètres + et des filtres + textes. + + + + Les filtres doivent également + retourner avec le code de retour + suivant: + + + + exit 0 + + + Si le filtre a imprimé avec succès + le fichier. + + + + + exit 1 + + + Si le filtre n'a pu imprimer le fichier, mais + désire que LPD + essaie de l'imprimer à nouveau. + LPD relancera un filtre + s'il retourne avec ce code. + + + + + exit 2 + + + Si le filtre n'a pu imprimer le fichier et ne veut + pas que LPD retente + l'impression. LPD + rejettera le fichier. + + + + + Le filtre texte livré avec &os;, + /usr/libexec/lpr/lpf, tire parti des + paramètres de largeur et hauteur de page pour savoir + quand envoyer une instruction de saut de page et comment + comptabiliser l'utilisation de l'imprimante. Il utilise les + paramètres nom d'utilisateur, nom de machine, et + fichier de comptabilisation pour enregistrer les + entrées concernant la consommation. + + Si vous recherchez des filtres, prenez garde à ce + qu'ils soient compatibles avec LPD. Si c'est le cas, ils + doivent se conformer à la liste de paramètres + décrite ci-dessus. Si vous songez à + écrire des filtres à usage + général, alors faites en sorte qu'ils se + conforment à ces mêmes listes de + paramètres et de codes de retour. - Accommodating Plain Text Jobs on &postscript; Printers - + Gérer les travaux d'impression de texte brut sur + des imprimantes &postscript; + + travaux d'impression + + Si vous êtes l'unique utilisateur de votre + ordinateur et de votre imprimante &postscript; (ou + basée sur un autre langage), et que vous promettez de + ne jamais envoyer de texte brut à votre imprimante et + de ne jamais utiliser les fonctionnalités des divers + programmes qui voudraient lui en envoyer, alors vous pouvez + tout à fait passer cette section l'esprit + tranquille. + + Toutefois, si vous désirez envoyer du + &postscript; et du texte brut à l'imprimante, alors + vous êtes instamment priés de compléter + la configuration de votre imprimante. Pour ce faire, nous + chargerons le filtre texte de détecter si le travail + d'impression est du texte brut ou du &postscript;. Tous les + travaux d'impression &postscript; doivent débuter par + %! (en ce qui concerne les autres + langages, référez-vous à la + documentation de l'imprimante). Si ces deux + caractères sont les deux premiers du travail + d'impression, il s'agit de &postscript; et le reste du + travail d'impression peut être passé + directement à l'imprimante. Dans le cas contraire, + alors le filtre convertit le texte en &postscript; et + imprime le résultat. + + Comment procéder? + + + imprimantes + série + + + Si vous disposez d'une imprimante série, une + bonne façon de faire est d'installer + lprps. Il s'agit d'un filtre + d'impression &postscript; qui assure une communication en + duplex avec l'imprimante. Il met à jour le fichier + d'état de l'imprimante avec des informations + détaillées que cette dernière lui + fournit, de sorte que les utilisateurs et les + administrateurs puissent connaître + précisément l'état de l'imprimante (par + exemple niveau de toner bas ou + bourrage papier). Mais plus + important encore, il inclut un programme nommé + psif qui détecte si le travail + d'impression qui vient d'arriver est du texte brut et lance + textps (un autre programme fourni avec + lprps) pour le convertir en &postscript;. + Il utilise alors lprps pour envoyer le + travail d'impression à l'imprimante. + + lprps fait partie du catalogue des + logiciels portés &os; (lisez la section Le catalogue des logiciels + portés). Vous pouvez installer un des deux + logiciels portés print/lprps-a4 et print/lprps-letter en fonction du + format de papier utilisé. Après avoir + installé lprps, précisez + simplement le chemin vers le programme + psif qui fait partie de + lprps. Si vous avez installé + lprps en recourant au catalogue des + logiciels portés, placez les valeurs suivantes pour + l'entrée de l'imprimante série &postscript; + dans /etc/printcap: + + :if=/usr/local/libexec/psif: + + Vous devrez également renseigner le + paramètre rw qui indique à + LPD de requérir + l'imprimante en mode lecture/écriture. + + Si vous disposez d'une imprimante &postscript; + parallèle (et ne pouvez donc pas utiliser la + communication en duplex avec l'imprimante dont a besoin + lprps), vous pouvez recourir à la + procédure suivante en tant que filtre texte: + + #!/bin/sh +# +# psif - Imprime du PostScript ou du texte brut sur une imprimante PostScript +# Version script; CECI N'EST PAS la version fournie avec lprps +# Fichier /usr/local/libexec/psif +# + +IFS="" read -r first_line +first_two_chars=`expr "$first_line" : '\(..\)'` + +if [ "$first_two_chars" = "%!" ]; then + # + # Travail PostScript, l'imprimer. + # + echo "$first_line" && cat && printf "\004" && exit 0 + exit 2 +else + # + # Texte brut, le convertir, puis l'imprimer. + # + ( echo "$first_line"; cat ) | /usr/local/bin/textps && printf "\004" && exit 0 + exit 2 +fi + + Dans la procédure ci-dessus, + textps est un programme que nous avons + installé séparément pour convertir du + texte en &postscript;. Vous pouvez recourir à + n'importe quel programme texte-vers-&postscript;, selon + votre désir. Le catalogue des logiciels + portés de &os; (voir la section Le catalogue des logiciels + portés) comprend un programme de conversion + texte-vers-&postscript; complet nommée + a2ps, qui pourrait vous + intéresser. - Simulating &postscript; on Non &postscript; Printers - + Emuler du &postscript; sur les imprimantes + non-&postscript; + + + PostScript + émulation + + + Ghostscript + + + &postscript; est le standard de + fait pour l'impression et la composition de haute + qualité. Cependant, &postscript; est un standard + onéreux. Heureusement, Aladdin + Enterprises propose un succédané gratuit de + &postscript; nommé + Ghostscript qui fonctionne sous + &os;. Ghostscript peut lire la + majorité des fichiers &postscript; et peut produire + leurs pages sur une diversité de + périphériques, incluant beaucoup de marques + d'imprimantes non-&postscript;. En installant + Ghostscript et en recourant + à un filtre texte spécial, vous pouvez obtenir + de votre imprimante non-&postscript; qu'elle se comporte + comme une véritable imprimante &postscript;. + + Ghostscript fait partie du + catalogue des logiciels portés, de nombreuses + versions sont disponibles, la version la plus couramment + utilisée est print/ghostscript-gpl. + + Pour émuler du &postscript;, il nous faut faire + en sorte que le filtre texte détecte s'il imprime un + fichier &postscript;. Si ce n'est pas le cas, alors le + filtre doit passer le fichier directement à + l'imprimante; sinon il recourra à + Ghostscript pour tout d'abord le + convertir dans un format que l'imprimante saura + interpréter. + + Voici un exemple: la procédure suivante est un + filtre texte pour les imprimantes Hewlett Packard Deskjet + 500. Pour d'autres modèles, changez le + paramètre de la commande + gs + (Ghostscript). (Entrez + gs -h pour obtenir une liste des + périphériques reconnus par l'installation + actuelle de Ghostscript). + + #!/bin/sh +# +# ifhp - Imprime du PostScript émulé par Ghostscript sur une DeskJet 500 +# Fichier /usr/local/libexec/ifhp + +# +# Traite LF comme CR+LF (pour éviter l'"effet d'escalier" sur les +# imprimantes HP/PCL): +# +printf "\033&k2G" || exit 2 + +# +# Lit les deux premiers caractères du fichier +# +IFS="" read -r first_line +first_two_chars=`expr "$first_line" : '\(..\)'` + +if [ "$first_two_chars" = "%!" ]; then + # + # Si c'est du PostScript; utiliser Ghostscript pour le convertir et l'imprimer + # + /usr/local/bin/gs -dSAFER -dNOPAUSE -q -sDEVICE=djet500 \ + -sOutputFile=- - && exit 0 +else + # + # Texte brut ou HP/PCL, donc impression directe; effectuer un + # saut de page à la fin pour éjecter la dernière page. + # + echo "$first_line" && cat && printf "\033&l0H" && +exit 0 +fi + +exit 2 + + Pour finir, vous devez communiquer à + LPD le filtre utilisé en + positionnant le paramètre + if: + + :if=/usr/local/libexec/ifhp: + + Voilà. Vous pouvez entrer lpr + texte.simple et + lpr + peuimporte.ps, et + chacune des deux commandes devrait imprimer avec + succès. - Conversion Filters - + Filtres de conversion + + Après avoir mené à bien la + configuration basique décrite à la section + Configuration simple de + l'imprimante, la première chose que vous + souhaiterez probablement faire sera d'installer des filtres + de conversion pour vos formats de fichiers favoris (le + simple texte ASCII mis à part). + + + Pourquoi installer des filtres de conversion? + + &tex; + imprimer des fichiers DVI + + + Les filtres de conversion facilitent l'impression de + différentes sortes de fichiers. Par exemple, + supposons que nous travaillions énormément + avec le système de composition &tex;, et que nous + ayons une imprimante &postscript;. Chaque fois que nous + générerons un fichier DVI à partir de + &tex;, nous ne pouvons l'imprimer directement avant + d'avoir converti ce fichier DVI en &postscript;. La + séquence de commandes serait la suivante: + + &prompt.user; dvips seaweed-analysis.dvi +&prompt.user; lpr seaweed-analysis.ps + + En installant un filtre de conversion pour fichiers + DVI, nous pouvons à chaque fois nous passer de + l'étape de conversion manuelle en chargeant + LPD de le faire à notre + place. Maintenant, à chaque fois que nous avons un + fichier DVI, nous ne sommes plus qu'à un pas de + l'impression: + + &prompt.user; lpr -d seaweed-analysis.dvi + + Nous faisons en sorte que + LPD se charge de la conversion + du fichier DVI à notre place en positionnant + l'option . La section Options de + conversion et de formatage donne la liste des + options de conversion. + + Pour chacune des options de conversion que vous voulez + faire accepter par une imprimante, installez un + filtre de conversion et indiquez son + chemin d'accès dans + /etc/printcap. Un filtre de + conversion ressemble au filtre texte de notre + configuration de base (voir la section Installer le filtre + texte), à ceci près qu'au lieu + d'imprimer du texte brut, le filtre convertit le fichier + en un format compréhensible par + l'imprimante. + + + + Quels filtres de conversion dois-je + installer? + + Vous devez installer les filtres de conversion que + vous vous attendez à utiliser. Si vous imprimez + beaucoup de données DVI, alors un filtre de + conversion DVI est dans la logique des choses. Si vous + devez imprimer beaucoup de troff, alors vous aurez + sûrement besoin d'un filtre troff. + + Le tableau suivant récapitule les filtres avec + lesquels LPD fonctionne, leurs + paramètres /etc/printcap, et + comment les invoquer avec la + lpr: + + + + + + Type de fichier + paramètre /etc/printcap + + option lpr + + + + + + cifplot + cf + + >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun May 4 19:34:44 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 080EE1065681; Sun, 4 May 2008 19:34:44 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BE102106567C for ; Sun, 4 May 2008 19:34:43 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BB5668FC17 for ; Sun, 4 May 2008 19:34:43 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m44JYhkM069206 for ; Sun, 4 May 2008 19:34:43 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m44JYhjm069202 for perforce@freebsd.org; Sun, 4 May 2008 19:34:43 GMT (envelope-from thompsa@freebsd.org) Date: Sun, 4 May 2008 19:34:43 GMT Message-Id: <200805041934.m44JYhjm069202@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 141158 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 May 2008 19:34:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=141158 Change 141158 by thompsa@thompsa_burger on 2008/05/04 19:34:00 Keep ic_curchan in sync with the scan results. Affected files ... .. //depot/projects/vap/sys/dev/if_ndis/if_ndis.c#21 edit Differences ... ==== //depot/projects/vap/sys/dev/if_ndis/if_ndis.c#21 (text+ko) ==== @@ -3237,6 +3237,7 @@ ndis_wlan_bssid_ex *wb; struct ieee80211_scanparams sp; struct ieee80211_frame wh; + struct ieee80211_channel *saved_chan; int i, j; int error, len, rssi, noise, freq, chanflag; static long rstamp; @@ -3246,6 +3247,7 @@ ic = sc->ifp->if_l2com; vap = TAILQ_FIRST(&ic->ic_vaps); + saved_chan = ic->ic_curchan; noise = -96; len = sizeof(uint32_t) + (sizeof(ndis_wlan_bssid_ex) * 16); @@ -3306,6 +3308,11 @@ chanflag = ndis_nettype_chan(wb->nwbx_nettype); freq = wb->nwbx_config.nc_dsconfig / 1000; sp.chan = sp.bchan = ieee80211_mhz2ieee(freq, chanflag); + /* Hack ic->ic_curchan to be in sync with the scan result */ + ic->ic_curchan = ieee80211_find_channel(ic, freq, chanflag); + if (ic->ic_curchan == NULL) + ic->ic_curchan = &ic->ic_channels[0]; + /* Process extended info from AP */ if (wb->nwbx_len > sizeof(ndis_wlan_bssid)) { @@ -3340,6 +3347,8 @@ wb = (ndis_wlan_bssid_ex *)((char *)wb + wb->nwbx_len); } free(bl, M_DEVBUF); + /* Restore the channel after messing with it */ + ic->ic_curchan = saved_chan; } static void From owner-p4-projects@FreeBSD.ORG Mon May 5 01:57:25 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 909221065682; Mon, 5 May 2008 01:57:25 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 52D721065672 for ; Mon, 5 May 2008 01:57:25 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 33D1F8FC26 for ; Mon, 5 May 2008 01:57:25 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m451vPrB009237 for ; Mon, 5 May 2008 01:57:25 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m451vP4U009235 for perforce@freebsd.org; Mon, 5 May 2008 01:57:25 GMT (envelope-from thompsa@freebsd.org) Date: Mon, 5 May 2008 01:57:25 GMT Message-Id: <200805050157.m451vP4U009235@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 141164 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 May 2008 01:57:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=141164 Change 141164 by thompsa@thompsa_burger on 2008/05/05 01:56:38 Turn beacon promiscuity off except when scanning. We do not need to see other beacons when we are associated and the number of beacons per second can get quite high (like in my apartment building :). Affected files ... .. //depot/projects/vap/sys/dev/bwi/bwimac.c#6 edit .. //depot/projects/vap/sys/dev/bwi/if_bwi.c#19 edit Differences ... ==== //depot/projects/vap/sys/dev/bwi/bwimac.c#6 (text+ko) ==== @@ -1250,7 +1250,6 @@ CSR_CLRBITS_4(sc, BWI_MAC_STATUS, BWI_MAC_STATUS_INFRA); CSR_SETBITS_4(sc, BWI_MAC_STATUS, BWI_MAC_STATUS_INFRA); - CSR_SETBITS_4(sc, BWI_MAC_STATUS, BWI_MAC_STATUS_PASS_BCN); /* Set probe resp timeout to infinite */ MOBJ_WRITE_2(mac, BWI_COMM_MOBJ, BWI_COMM_MOBJ_PROBE_RESP_TO, 0); @@ -1262,6 +1261,7 @@ mac_status = CSR_READ_4(sc, BWI_MAC_STATUS); mac_status &= ~(BWI_MAC_STATUS_OPMODE_HOSTAP | BWI_MAC_STATUS_PASS_CTL | + BWI_MAC_STATUS_PASS_BCN | BWI_MAC_STATUS_PASS_BADPLCP | BWI_MAC_STATUS_PASS_BADFCS | BWI_MAC_STATUS_PROMISC); ==== //depot/projects/vap/sys/dev/bwi/if_bwi.c#19 (text+ko) ==== @@ -1711,6 +1711,12 @@ static void bwi_scan_start(struct ieee80211com *ic) { + struct bwi_softc *sc = ic->ic_ifp->if_softc; + + BWI_LOCK(sc); + /* Enable MAC beacon promiscuity */ + CSR_SETBITS_4(sc, BWI_MAC_STATUS, BWI_MAC_STATUS_PASS_BCN); + BWI_UNLOCK(sc); } static void @@ -1742,6 +1748,11 @@ static void bwi_scan_end(struct ieee80211com *ic) { + struct bwi_softc *sc = ic->ic_ifp->if_softc; + + BWI_LOCK(sc); + CSR_CLRBITS_4(sc, BWI_MAC_STATUS, BWI_MAC_STATUS_PASS_BCN); + BWI_UNLOCK(sc); } static int From owner-p4-projects@FreeBSD.ORG Mon May 5 03:57:34 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7C7341065673; Mon, 5 May 2008 03:57:34 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3BD371065670 for ; Mon, 5 May 2008 03:57:34 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F3DD38FC17 for ; Mon, 5 May 2008 03:57:33 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m453vX2e015112 for ; Mon, 5 May 2008 03:57:33 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m453vXJY015110 for perforce@freebsd.org; Mon, 5 May 2008 03:57:33 GMT (envelope-from thompsa@freebsd.org) Date: Mon, 5 May 2008 03:57:33 GMT Message-Id: <200805050357.m453vXJY015110@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 141168 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 May 2008 03:57:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=141168 Change 141168 by thompsa@thompsa_burger on 2008/05/05 03:57:14 Be sure to stop the callouts before we shut down the chip. Affected files ... .. //depot/projects/vap/sys/dev/bwi/if_bwi.c#20 edit Differences ... ==== //depot/projects/vap/sys/dev/bwi/if_bwi.c#20 (text+ko) ==== @@ -1523,6 +1523,9 @@ BWI_ASSERT_LOCKED(sc); + callout_stop(&sc->sc_calib_ch); + callout_stop(&sc->sc_led_blink_ch); + sc->sc_led_blinking = 0; sc->sc_flags |= BWI_F_STOP; if (ifp->if_drv_flags & IFF_DRV_RUNNING) { From owner-p4-projects@FreeBSD.ORG Mon May 5 05:27:12 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 829A01065678; Mon, 5 May 2008 05:27:12 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 43CFE1065672 for ; Mon, 5 May 2008 05:27:12 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1EBF28FC19 for ; Mon, 5 May 2008 05:27:12 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m455RC6j030166 for ; Mon, 5 May 2008 05:27:12 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m455RBmJ030164 for perforce@freebsd.org; Mon, 5 May 2008 05:27:11 GMT (envelope-from pgj@FreeBSD.org) Date: Mon, 5 May 2008 05:27:11 GMT Message-Id: <200805050527.m455RBmJ030164@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 141171 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 May 2008 05:27:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=141171 Change 141171 by pgj@disznohal on 2008/05/05 05:26:13 Cleanup in Chapter 24. Affected files ... .. //depot/projects/docproj_hu/books/handbook/serialcomms/chapter.sgml#4 edit Differences ... ==== //depot/projects/docproj_hu/books/handbook/serialcomms/chapter.sgml#4 (text+ko) ==== @@ -21,13 +21,13 @@ kommunikációt. Tulajdonképpen az elsõ &unix;-os gépek is soros vonalon kapták a felhasználóktól a bemenetet és - ugyanígy küldték vissza a kimenetet. Sokat - változtak már az idõk azóta, hogy egy + ugyanígy küldték vissza a kimenetet. Az + idõk azóta már sokat változtak, hogy egy átlagos terminál mindössze egy 10 karakter per másodperc sebességû soros nyomtatóból és egy billentyûzetbõl állt. Ebben a fejezetben ismertetünk - néhány olyan megoldást, amivel a &os; + néhány olyan megoldást, amellyel a &os; képes soros vonalon keresztül kommunikálni. @@ -35,33 +35,46 @@ megismerjük: - hogyan kapcsoljunk terminálokat a &os; - rendszerünkre - hogyan tárcsázzunk modem - segítségével távoli - számítógépeket - hogyan tegyük lehetõvé - gépünkre a bejelentkezést távoli - felhasználók - számára - hogyan indítsuk a rendszerünket soros - konzolról + + hogyan kapcsoljunk terminálokat a &os; + rendszerünkre; + + + hogyan tárcsázzunk modem + segítségével távoli + számítógépeket; + + + hogyan tegyük lehetõvé + gépünkre a bejelentkezést távoli + felhasználók számára; + + + hogyan indítsuk a rendszerünket soros + konzolról. + A fejezet elolvasásához ajánlott: - egy új rendszermag - beállításának és - telepítésének ismerete (). - a &unix;-os engedélyek és a benne - futtatott programok mûködtetésének - megértése (). - annak a soros vonali hardver (modem vagy - többportos kártya) kézikönyve, amit a - &os;-vel használni szeretnénk + + egy új rendszermag + beállításának és + telepítésének ismerete (); + + + a &unix;-os engedélyek és a &unix; alatt + futtatott programok mûködtetésének + megértése (); + + annak a soros vonali hardvernek (modemnek vagy + többportos kártyának a) + kézikönyve, amelyet a &os;-vel használni + szeretnénk + @@ -146,8 +159,8 @@ A soros kábeleknek több különbözõ típusa van. - Közülük a céljainkhoz leginkább - illesztedõ két legismertebb változatuk az + Közülük a céljainknak leginkább + megfelelõ két legismertebb változatuk az ún. null-modem és a szabványos (egyenes) RS-232-es soros kábelek. A hardverhez tartozó dokumentációban @@ -166,21 +179,21 @@ felcserélten. Például az átküldött adat (Transmitted Data, TD) jelzésû tû a kábel - másik végen a fogadott adat - (Received Data, RD) tûhöz fut be. + másik végén a fogadott + adat (Received Data, RD) tûhöz fut + be. A terminálokhoz akár saját magunk - is le tudunk gyártani egy null-modem kábelt (pl. - ha a boltiakkal nem vagyunk megelégedve). A - következõ táblázatban az RS-232C - jeleit - és érintkezõinek - számozását láthatjuk egy - DB-25-ös csatlakozó esetében. - Vegyük észre, hogy a szabvány a - kábel két 1-es tûjét - összekapcsoló vonalat - védõföldnek + is le tudunk gyártani egy null-modem kábelt + (például ha a boltiakkal nem lennénk + megelégedve). A következõ + táblázatban az RS-232C jeleit és + érintkezõinek számozását + láthatjuk egy DB-25-ös csatlakozó + esetében. A szabvány a kábel + két 1-es tûjét összekapcsoló + vonalat védõföldnek (Protective Ground, PD) nevezi, de ezt gyakran el is hagyják. Némely terminál remekül mûködik mindössze a 2-es, 3-as és 7-es @@ -190,7 +203,7 @@ igényelnek. - DB-25 DB-25 közti null-modem + <title>A DB-25 DB-25 közti null-modem kábel @@ -284,7 +297,8 @@ két séma.
- DB-9 DB-9 null-modem kábel + A DB-9 DB-9 közti null-modem + kábel @@ -373,8 +387,8 @@
- - DB-9 DB-25 null-modem kábel +
DB-9 DB-25 közti + null-modem kábel @@ -469,18 +483,18 @@ azt általában úgy valósítják meg, hogy a két tût a saját oldalukon összekötik, - majd ezt hozzákapcsolják a harmadik + majd ezt kapcsolják hozzá a harmadik tûhöz.Ezek a megoldások a legnépszerûbbek. Természetesen a tûk összekötésének több más - variációja is létezik (amirõl az + variációja is létezik (ezekrõl az RS-232 Made Easy c. könyvben olvashatunk bõvebben), ahol az SG párja az SG, a - TD párja az RD, a RTS és a CTS párja az - DCD, a DTR párja a DSR és ugyanezek + TD párja az RD, az RTS és a CTS párja + az DCD, a DTR párja a DSR és ugyanezek fordítva. @@ -500,7 +514,8 @@ kábeleket többnyire a számítógépek és a modemek között alkalmazzák, de egyes - terminál esetében is kellhet. + termináltípusok esetében is + szükségünk lehet rá. @@ -508,7 +523,7 @@ A portok - A soros port olyan eszköz, amiken keresztül a + A soros port olyan eszköz, amelyen keresztül a &os;-s gép és a terminál között adatokat tudunk közvetíteni. Ebben a szakaszban az ilyen portok különféle típusait @@ -519,27 +534,28 @@ A portok típusai A soros portoknak több típusa - létezik. Mielõtt vásárolnánk - egy készítenénk egy soros - kábelt, mindenképpen gyõzödjünk - meg róla, hogy csatlakoztatni tudjuk-e a &os;-s - rendszerünkhöz és a - terminálhoz. + létezik. Mielõtt + vásárolnánk egy + készítenénk egy soros kábelt, + mindenképpen gyõzödjünk meg + róla, hogy csatlakoztatni tudjuk majd a &os;-s + rendszerünkhöz és a terminálhoz + egyaránt. A legtöbb terminálon DB-25-ös portot találunk. A személyi számítógépek, köztük azok, amelyeken &os; fut, DB-25-ös és DB-9es portokkal rendelkeznek. Ha a gépünkben egy - többportos soros kártya van, akkor rajtuk + többportos soros kártya van, akkor ezeken kívül még RJ-12-es és RJ-45-ös portjaink is lehetnek. A hardverhez tartozó - dokumentációból tudjuk kideríteni - az adott port konkrét fajtáját, de - gyakran a port vizuális vizsgálata is - segíthet eldönteni a + dokumentációból tudjuk + kideríteni az adott port konkrét + fajtáját, de gyakran a port vizuális + vizsgálata is segíthet eldönteni a kérdést. @@ -571,14 +587,15 @@ A híváshoz használt portok - nevei + nevei /dev/cuadN alakúak. A hívó portokat terminálok esetében ritkán alkalmazzák, helyettük inkább csak - modemekhez. A hívó portokat akkor - érdemes használni, ha a soros kábel - vagy a terminál nem ismeri a DCD jelet. + modemekhez használják. A + hívó portokat akkor érdemes + használni, ha a soros kábel vagy a + terminál nem ismeri a DCD jelet. A &os; 5.X és korábbi @@ -590,12 +607,11 @@ Ha a terminált az elsõ soros portra (ami - &ms-dos;-ban a COM1) csatlakoztattuk, - akkor a /dev/ttyd0 + &ms-dos;-ban a COM1) + csatlakoztattuk, akkor a /dev/ttyd0 segítségével fogunk rá hivatkozni. Ha viszont a második soros porton - (más néven a - COM2-ön) + (más néven COM2) található, akkor a /dev/ttyd1 eszközt használjuk, és így @@ -617,17 +633,17 @@ többportos soros csatolókártyákat is, például a BocaBoard 1008 és 2016 típusokat, valamint több intelligensebb - többportos kártyát, mondjuk a Digiboard - és a Stallion Technologies gyártmányait. - Azonban az alap rendszermag csak a szabványos COM - portokat keresi. + többportos kártyát, például a + Digiboard és a Stallion Technologies + gyártmányait. Az alap rendszermag azonban csak a + szabványos COM portokat keresi. Ha ellenõrizni akarjuk, hogy a rendszermag rendben megtalálta a soros portokat, akkor figyelmesen olvassuk el a rendszerindítás során megjelenõ üzeneteket, vagy az /sbin/dmesg parancs - kiadásával játsszuk vissza a rendszermag - üzeneteit. Különösen a + kiadásával kérdezzük vissza a + rendszermag üzeneteit. Különösen a sio kezdetû sorokra kell figyelnünk. @@ -639,7 +655,7 @@ &prompt.root; /sbin/dmesg | grep 'sio' - Például ha négy soros port + Például, ha négy soros port található a rendszerünkben, akkor a rájuk vonatkozó rendszerüzenetek a következõk lesznek: @@ -659,7 +675,7 @@ kell módosítanunk. Tegyük megjegyzésbe vagy akár teljesen távolítsuk is el azokat az eszközöket, - amikkel nem rendelkezünk. + amelyekkel nem rendelkezünk. A soros portok és a többportos kártyák beállításával @@ -681,14 +697,13 @@ adott porthoz tartozó gyakori címeket képviselik. A 4-es, 3-as, 5-ös és 9 megszakítások is igen általánosak - ezeknél. Azonban szeretnénk hozzátenni, - hogy a hagyományos soros portok az ISA buszos PC-ken - nem képesek a - megszakításokon osztozni. (A többportos - kártyák azonban lehetõvé teszik az - összes 16550A számára, hogy mindössze - egy vagy két megszakítást - használjon.) + ezeknél. A hagyományos soros portok viszont az + ISA buszos PC-k esetében nem + képesek a megszakításokon + osztozni. (A többportos kártyák azonban + lehetõvé teszik az 16550A számára, + hogy mindössze egy vagy két + megszakítást használjon.) @@ -728,19 +743,19 @@ és /dev/cualaN &os; 5.X alatt) Az inicializációs - állományokat a port megnyitásakor + állományok a port megnyitásakor használhatóak a hozzátartozó paraméterek beállítására, például így tudjuk elküldeni a crtscts utasítást az olyan modemeknek, amelyek a forgalom irányítását - RTS/CTS jelezéssel + RTS/CTS jelzéseken keresztül valósítják meg. A zároló állományokkal a portokra vonatkozó zárolásokat állíthatjuk be, így a felhasználók vagy a programok nem - lesznek képesek bizonyos paraméterek + lesznek képesek bizonyos paramétereket megváltoztatni. A &man.termios.4;, &man.sio.4; és &man.stty.1; man oldalakon olvashatunk részletesebben a terminálok beállításairól, @@ -753,73 +768,75 @@ A soros port beállítása - ttyd - cuad + ttyd + cuad - A ttydN - (vagy cuadN) - lesz az az eszköz, amit majd az - alkalmazásainkból el akarunk érni. Amikor - egy futó program megnyit egy ilyen eszközt, mindig - tartoznak hozzá alapértelmezett terminál I/O - beállítások. Ezeket a következõ - paranccsal tudjuk lekérdezni: + A ttydN + (vagy cuadN) + lesz az az eszköz, amit majd az + alkalmazásainkból el akarunk érni. Amikor + egy futó program megnyit egy ilyen eszközt, mindig + tartoznak hozzá alapértelmezett terminál + I/O beállítások. Ezeket a + következõ paranccsal tudjuk lekérdezni: - &prompt.root; stty -a -f /dev/ttyd1 + &prompt.root; stty -a -f /dev/ttyd1 - Ha megváltoztatjuk az eszköz - beállításait, akkor azok egészen addig - érvényben is maradnak, amíg le nem - zárjuk. Ha tehát ezután újra - megnyitjuk, akkor minden visszaáll az - alapértelmezett állapotra. Az - alapértelmezett beállítások - megváltoztatásához a kezdeti - állapotot szimbolizáló eszközt - kell megnyitnunk és átállítanunk. - Például ha alapból engedélyezni - akarjuk a módot, a 8 bites - kommunikációt és a - típusú forgalomirányítást a - ttyd5 eszközön, akkor a - következõt gépeljük be: + Ha megváltoztatjuk az eszköz + beállításait, akkor azok egészen + addig érvényben is maradnak, amíg le nem + zárjuk. Ha tehát ezután újra + megnyitjuk, akkor minden visszaáll az + alapértelmezett állapotra. Az + alapértelmezett beállítások + megváltoztatásához a kezdeti + állapotot szimbolizáló eszközt + kell megnyitnunk és átállítanunk. + Például, ha alapból engedélyezni + akarjuk a módot, a 8 bites + kommunikációt és a + típusú + forgalomirányítást a + ttyd5 eszközön, akkor a + következõt gépeljük be: - &prompt.root; stty -f /dev/ttyd5.init clocal cs8 ixon ixoff + &prompt.root; stty -f /dev/ttyd5.init clocal cs8 ixon ixoff - - rc állományok - rc.serial - + + rc állományok + rc.serial + - A soros eszközök rendszerszintû - inicializálását az - /etc/rc.d/serial állomány - vezérli. Lényegében ez határozza meg - az összes soros eszköz alapértelmezett - beállítását. + A soros eszközök rendszerszintû + inicializálását az + /etc/rc.d/serial állomány + vezérli. Lényegében ez határozza + meg az összes soros eszköz alapértelmezett + beállítását. - Ha bizonyos beállítások - megváltoztatását tiltani szeretnénk az - alkalmazások felé, akkor azt a zárolt - állapotot tartalmazó eszközben kell - rögzítenünk. Például ha a - ttyd5 eszköz - sebességét fixen 57600 bps-ra akarjuk - beállítani, akkor írjuk be ezt: + Ha bizonyos beállítások + megváltoztatását tiltani szeretnénk + az alkalmazások felé, akkor azt a + zárolt állapotot tartalmazó + eszközben kell rögzítenünk. + Például, ha a ttyd5 + eszköz sebességét fixen 57600 bps-ra + akarjuk beállítani, akkor írjuk be + ezt: - &prompt.root; stty -f /dev/ttyd5.lock 57600 + &prompt.root; stty -f /dev/ttyd5.lock 57600 - Ezután ha egy alkalmazás megnyitja a - ttyd5 eszközt és - megpróbálja a port sebességét - átállítani, akkor az továbbra is - 57600 bps marad. + Ezután ha egy alkalmazás megnyitja a + ttyd5 eszközt és + megpróbálja a port sebességét + átállítani, akkor az továbbra is + 57600 bps marad. - A kezdeti és a zárolt állapotot - képezõ eszközöket általában csak - a root felhasználó - számára szabad írhatóvá - tenni. + A kezdeti és a zárolt állapotot + képezõ eszközöket általában + csak a root felhasználó + számára szabad írhatóvá + tenni. @@ -862,13 +879,13 @@ és vele szöveges módban dolgozunk. Napjaink személyi - számítógépein azonban + számítógépein azonban találhatunk már akár nagy felbontású megjelenítéssel megáldott konzolokat is, habár a soros porton keresztüli bejelentkezés lehetõsége még mind a mai napig elérhetõ a legtöbb - &unix; alapú rendszerben. Ez alól a &os; sem + &unix;-alapú rendszerben. Ez alól a &os; sem kivétel. Ha rákötünk egy terminált a gépünk egyik üres soros portjára, akkor a megszokott módon képesek @@ -895,18 +912,18 @@ - a buta (dumb) + A buta (dumb) terminálok - a terminálként + A terminálként funkcionáló személyi számítógépek - az X + Az X terminálok @@ -919,7 +936,7 @@ A buta terminál alatt olyan speciálizált eszközt értünk, - amivel soros vonalon keresztül csatlakozunk + amellyel soros vonalon keresztül csatlakozunk számítógépekhez. Azért nevezik ezeket butának, mert csupán annyi számítási @@ -931,16 +948,18 @@ számítógép fogja a szövegszerkesztõt, fordítóprogramot, levelezõ klienst, játékot és a - többit futtatni, amire vele kapcsolódtunk. + többit futtatni, amelyre vele + kapcsolódtunk. A buta termináloknak többszáz, különbözõ gyártmányú - fajtája létezik. Ilyenek mondjuk a Digital - Equipment VT-100 vagy a Wyse WY-75 típusú - termináljai. A &os; szinte mindegyiküket ismeri. - Egyes drágább terminálok még - grafikus megjelenítésre is képesek, de - ezeket a lehetõségeket csak bizonyos szoftverek + fajtája létezik. Ilyenek például + a Digital Equipment VT-100 vagy a Wyse WY-75 + típusú termináljai. A &os; szinte + mindegyiküket ismeri. Egyes drágább + terminálok még grafikus + megjelenítésre is képesek, de ezeket a + lehetõségeket csak bizonyos szoftverek tudják ténylegesen kihasználni. A buta terminálok leginkább olyan @@ -968,7 +987,7 @@ szükségünk. Az ilyen fajta megoldás nagyon elterjedt az otthoni - használat esetén. Például ha + használat esetén. Például, ha valamelyik családtagunk éppen szorgalmasan dolgozik a &os; rendszerkonzolján, akkor a rákapcsolt terminálon keresztül még @@ -987,10 +1006,11 @@ Ahol a soros-vonali-eszköz a rendszerünkben a soros portot jelölõ - speciális eszköz neve. A &os; 6.0 elõtti - változataiban ezek neve + speciális eszköz neve. A &os; 6.0 + elõtti változataiban ezek neve /dev/cuaaN, - illetve a &os; 6.0 utáni változataiban pedig + illetve a &os; 6.0 utáni változataiban + pedig /dev/cuadN. Az eszköz nevében az N-es @@ -998,13 +1018,13 @@ meg. - Vegyük észre, hogy a &os;-ben az - eszközök sorszámozása - nullától kezdõdik, nem pedig egytõl - (ellentétben tehát azzal, ahogy azt az - &ms-dos; rendszerekben és leszármazottaikban - már megszokhattuk). Ez azt jelenti, hogy amit az - &ms-dos; alapú rendszerekben COM1-nek + A &os;-ben az eszközök + sorszámozása nullától + kezdõdik, nem pedig egytõl (ellentétben + tehát azzal, ahogy azt az &ms-dos; rendszerekben + és leszármazottaikban már + megszokhattuk). Ez azt jelenti, hogy amit az &ms-dos; + alapú rendszerekben COM1-nek hívnak, az a &os;-ben általában a /dev/cuad0. @@ -1014,9 +1034,9 @@ Portgyûjteménybõl is elérhetõ programokat szeretnek inkább használni. A portok között találhatunk elég sok - olyan szoftvert, ami a &man.cu.1; és a &man.tip.1; + olyan szoftvert, amely a &man.cu.1; és a &man.tip.1; programokhoz hasonlóan mûködik. Ilyen - mondjuk a comms/minicom. @@ -1026,16 +1046,16 @@ Az X terminálok Az X terminálok a terminálok közül - a legfejlettebbek. Általában nem is soros porton, - hanem hálózaton, például + a legfejlettebbek. Általában nem is soros + porton, hanem hálózaton, például Etherneten keresztül csatlakoznak. Természetesen nem csak szöveges alkalmazásokat, hanem lényegében bármilyen X alkalmazást képesek megjeleníteni. Az X terminálokról itt most csak a - teljesség kedvéért szólunk, de ebben - a fejezetben nem + teljesség kedvéért szólunk, de + ebben a fejezetben nem szándékozunk tárgyalni az X terminálok csatlakoztatását, beállítását és @@ -1049,29 +1069,29 @@ Ebben a fejezetben ismertetjük mindazt, ami ahhoz kell, hogy a &os; rendszerünkön engedélyezni tudjuk a - terminálokon keresztül történõ - bejelentkezéseket. Feltételezzük, hogy a - rendszermagunk támogatja a terminálok által - használt soros portokat — illetve hogy ezeket - már csatlakoztattuk is. + terminálon keresztüli bejelentkezéseket. + Feltételezzük, hogy a rendszermagunk + támogatja a terminálok által + használt soros portokat, illetve, hogy ezeket már + csatlakoztattuk is. Ha visszagondolunk a re, akkor - eszünkbe juthat, hogy a rendszer indításakor az - init nevû program felelõs az + eszünkbe juthat, hogy a rendszer indításakor + az init nevû program felelõs az összes futó program irányításáért és inicializálódásáért. Az - init egy feladata, hogy beolvassa az + init egyik feladata, hogy beolvassa az /etc/ttys állományt és - neki megfelelõen elindítsa az elérhetõ - terminálokon a getty programot. A - getty felelõs a bejelentkezéshez - szükséges azonosító - beolvasásáért és a - login program + neki megfelelõen az elérhetõ + terminálokon elindítsa a getty + programot. A getty felelõs a + bejelentkezéshez szükséges + azonosító beolvasásáért + és a login program elindításáért. - Ennek megfelelõen tehát ha a &os; + Ennek megfelelõen tehát, ha a &os; rendszerünkön terminálokat akarunk beállítani, akkor ehhez a következõ lépéseket kell megtennünk @@ -1119,10 +1139,10 @@ - Kiegészítõ lépésként - a második lépéshez az + A másik lépés + kiegészítõ lépéseként az /etc/gettytab állományban mi - magunk is készíthetünk egy saját + magunk is létrehozhatunk egy saját getty típust. A fejezetben ehhez ugyan nem adunk segítséget, de ha érdekel minket a téma, akkor ezzel kapcsolatban a @@ -1131,35 +1151,36 @@ Egy bejegyzés felvétele az - <filename>/etc/ttys</filename> állományba + /etc/ttys + állományba Az /etc/ttys - állományban találhatjuk meg az összes - portot, ahonnan a &os; rendszerünk engedélyezi a - bejelentkezést. Például a - ttyv0 elsõ virtuális konzol - is szerepel benne. Ezen a bejegyzésen keresztül - tudunk bejelentkezni a konzolra. Ebben az - állományban találjuk még a - többi virtuális konzol, soros port és - pszeudo terminál bejegyzéseit is. A - rögzített terminálok esetén + állományban találhatjuk meg az + összes portot, ahonnan a &os; rendszerünk + engedélyezi a bejelentkezést. + Például a ttyv0, az + elsõ virtuális konzol is szerepel benne. Ezen a + bejegyzésen keresztül tudunk bejelentkezni a + konzolra. Ebben az állományban találjuk + meg még a többi virtuális konzol, soros + port és pszeudoterminál bejegyzéseit is. + A rögzített terminálok esetén egyszerûen csak adjuk meg a soros porthoz tartozó - /dev-beli eszközt a - /dev elõtag nélkül - (így például a + /dev könyvtárbeli + eszközt a /dev elõtag + nélkül (így például a /dev/ttyv0 ttyv0 néven fog megjelenni). Az alap &os; telepítésben egy olyan /etc/ttys állomány - található, ami tartalmazza az elsõ - négy soros portot, a - ttyd0-tól kezdve a - ttyd3-ig. Ha tehát ezekre a - portokra csatlakoztatnunk egy terminált, akkor - már nem kell egy újabb bejegyzést - felvennünk hozzájuk. + található, amely tartalmazza az elsõ + négy soros portot, a ttyd0 + eszköztõl kezdve a ttyd3 + eszközig. Ha tehát ezekre a portokra + csatlakoztatnunk egy terminált, akkor már nem + kell egy újabb bejegyzést felvennünk + hozzájuk. Terminálok felvétele az @@ -1168,15 +1189,17 @@ <para>Tegyük fel, hogy két eszközt szeretnénk a rendszerünkhöz csatlakoztatni: - egy Wyse-50-es terminált és régi 286-os - IBM PC-t, amin a <application>Procomm</application> + egy Wyse-50-es terminált és egy régi + 286-os IBM PC-t, amelyen a + <application>Procomm</application> terminálszoftverrel emulálunk egy VT-100-as terminált. A Wyse terminált a második - soros portja kötjük, míg a 286-ost a - hatodik soros portra (mondjuk egy többportos soros - vonali kártyán). A nekik megfelelõ - <filename>/etc/ttys</filename>-beli bejegyzések - így fognak kinézni:</para> + soros portunkra kötjük, míg a 286-ost a + hatodik soros portra (például egy + többportos soros vonali kártyán). A + nekik megfelelõ <filename>/etc/ttys</filename> + állománybeli bejegyzések így + fognak kinézni:</para> <programlisting>ttyd1<co id="co-ttys-line1col1"> "/usr/libexec/getty std.38400"<co @@ -1191,7 +1214,7 @@ <callout arearefs="co-ttys-line1col1"> <para>Az elsõ mezõben általában a terminálhoz tartozó eszközt - nevezzük meg, ami a <filename>/dev</filename> + nevezzük meg, amely a <filename>/dev</filename> könyvtárban található.</para> </callout> @@ -1212,7 +1235,7 @@ ilyen <replaceable>getty</replaceable> típus szabja meg a terminálhoz tartozó vonal jellemzõit, például az - adatátviteli sebességet és + adatátviteli sebességet és a paritást. A <command>getty</command> ezeket a jellemzõket az <filename>/etc/gettytab</filename> állományból olvassa be.</para> @@ -1225,7 +1248,7 @@ mûködnek a hardveres terminálokkal. Az ilyen bejegyzések figyelmen kívül hagyják a paritást. 110 és - 115 200 bps között minden + 115 200 bps között minden adatátviteli sebességhez tartozik egy-egy <literal>std</literal> bejegyzés. Természetesen ebbe az állományba @@ -1245,8 +1268,7 @@ nem használ paritást és 38 400 bps-en üzemel. A 286-os gép szintén nem dolgozik paritással - és 19 200 bps-sel - kapcsolódik.</para> + és 19200 bps-sel kapcsolódik.</para> </callout> <callout arearefs="co-ttys-line1col3"> @@ -1258,7 +1280,7 @@ <literal>dialup</literal>, mivel ezeken keresztül a felhasználók gyakorlatilag szinte bármilyen típusú terminállal - vagy szoftverre be tudnak jelentkezni. A hardveres + vagy szoftverrel be tudnak jelentkezni. A hardveres termináloknál a terminál típusa azonban nem változik, ezért a &man.termcap.5; adatbázisban keressük ki a @@ -1266,8 +1288,8 @@ mezõben.</para> <para>A példánkban a Wyse-50 egy - valós termináltípust használ, - miközben a 286-oson futó + valós termináltípust + használ, miközben a 286-oson futó <application>Procomm</application> egy VT-100-as típusú terminált emulál.</para> @@ -1368,8 +1390,8 @@ képernyõ Ellenõrizzük, hogy a terminált rendesen - csatlakoztattuk és áram alá helyeztük. - Amikor egy személyi + csatlakoztattuk és áram alá + helyeztük. Amikor egy személyi számítógépet használunk terminálnak, akkor nézzük meg, hogy a terminál emulációs program a @@ -1388,7 +1410,7 @@ terminálunk van, akkor a kontrasztot és fényerõsséget is ellenõrizzük. Ha nyomtatós terminálunk van, akkor - vizsgáljuk meg a papír és tinta + vizsgáljuk meg a papír és a tinta állapotát. Gyõzõdjünk meg róla, hogy a @@ -1396,15 +1418,15 @@ kiszolgálja a terminált. Például a ps paranccsal listázzuk ki az összes jelenleg futó programot és - keressük meg köztük a - getty-t: + keressük meg köztük a getty + programot: &prompt.root; ps -axww|grep getty Ekkor látnunk kell a terminálhoz - tartozó bejegyzést. Például ha a + tartozó bejegyzést. Például, ha a getty második soros portot - jelképezõ ttyd1 + jelképezõ ttyd1 eszközön fut, és az /etc/gettytab állományból az @@ -1426,20 +1448,21 @@ képernyõt, vagy megjelenik, de nem tudunk gépelni, akkor elõfordulhat, hogy a terminál vagy kábel nem támogatja a - hardveres kézfogást. Próbáljuk - meg az /etc/ttys + hardveres kézfogást (handshaking). + Próbáljuk meg az /etc/ttys állományban levõ std.38400 bejegyzést az 3wire.38400 bejegyzésre kicserélni (de utána ne felejtsük el kiadni a kill -HUP 1 parancsot). A - 3wire nagyon az std - bejegyzéshez, de elhagyja a hardveres - kézfogást. A 3wire + 3wire nagyon hasonlít az + std bejegyzéshez, de elhagyja a + hardveres kézfogást. A 3wire alkalmazásakor viszont a puffer telítõdésének megelõzése - miatt próbálkozzunk az adatátviteli - sebesség csökkentésével vagy + érdekében próbálkozzunk az + adatátviteli sebesség + csökkentésével vagy engedélyezzük a szoftveres forgalomirányítást. @@ -1454,7 +1477,7 @@ sebességet és paritási beállítást használja. Nézzük meg a futó getty - programokat, hogy a megfelelõ + programokat, és hogy a megfelelõ getty típussal mennek-e. Ha nem, módosítsuk az /etc/ttys állományt @@ -1468,8 +1491,8 @@ begépelésekor látható Állítsuk át a terminált (vagy - a terminál emulációs szofvert) half - duplex vagy local echo + a terminál emulációs szofvert) + half duplex vagy local echo módról full duplex módra. @@ -1511,7 +1534,7 @@ Külsõ kontra belsõ modemek - A külsõ modemek sokkal kényelmesebben + A külsõ modemek sokkal kényelmesebbnek tûnnek betárcsázás szempontjából, mivel az ilyenek gyakran a statikus memóriájukban tárolt @@ -1520,14 +1543,14 @@ és sok esetben a fontosabb RS-232 jeleket külön lámpácskákkal mutatják. A villogó lámpák - könnyen el tudják kápráztatni a - látogatóinkat, de emellett igen fontosak a modem + könnyen elkápráztatják a laikusokat, + de emellett igen fontosak a modem mûködõképességének megállapításában is. Ezzel szemben a belsõ modemeken nem - található statikus memória, ezért a - paramétereik csak DIP kapcsolókkal + található statikus memória, ezért + a paramétereik csak DIP kapcsolókkal módosíthatóak. Még ha egy belsõ modemem látunk is lámpákat, akkor sem könnyû figyelni rájuk, mert a @@ -1611,24 +1634,24 @@
- A &os;-nek 2 400 bps felett a forgalom + A &os;-nek 2400 bps felett a forgalom irányításához az RTS és CTS jelekre van szüksége. A CD jellel állapítja meg, hogy a hívás létrejött vagy a bontották a vonalat, - és az DTR jel hozza + és a DTR jel hozza alapállapotba a modemet a munkamenet befejezése után. Egyes kábelekben nem mindegyik jelet - vezették át, így ha mondjuk gondjaink - akadnak a bejelentkezõ képernyõvel amikor a - vonalat bontjuk, akkor érdemes + vezették át, így ha például + gondjaink akadnak a bejelentkezõ képernyõvel + amikor a vonalat bontjuk, akkor érdemes >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon May 5 12:42:51 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 537051065676; Mon, 5 May 2008 12:42:51 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1160C1065671 for ; Mon, 5 May 2008 12:42:51 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EF6B48FC1A for ; Mon, 5 May 2008 12:42:50 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m45CgojT067886 for ; Mon, 5 May 2008 12:42:50 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m45CgoFa067884 for perforce@freebsd.org; Mon, 5 May 2008 12:42:50 GMT (envelope-from gabor@freebsd.org) Date: Mon, 5 May 2008 12:42:50 GMT Message-Id: <200805051242.m45CgoFa067884@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 141180 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 May 2008 12:42:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=141180 Change 141180 by gabor@gabor_server on 2008/05/05 12:41:59 IFC Affected files ... .. //depot/projects/docproj_es/doc/share/pgpkeys/brix.key#2 integrate .. //depot/projects/docproj_es/www/en/cgi/man.cgi#4 integrate .. //depot/projects/docproj_es/www/en/projects/ideas/ideas.xml#2 integrate .. //depot/projects/docproj_es/www/es/docproj/sgml.sgml#3 integrate .. //depot/projects/docproj_es/www/es/index.xsl#3 integrate .. //depot/projects/docproj_es/www/es/internet.sgml#4 integrate .. //depot/projects/docproj_es/www/es/platforms/i386.sgml#3 integrate .. //depot/projects/docproj_es/www/es/platforms/index.sgml#3 integrate .. //depot/projects/docproj_es/www/es/search/index-site.sgml#3 integrate .. //depot/projects/docproj_es/www/es/search/search-mid.sgml#3 integrate .. //depot/projects/docproj_es/www/es/search/searchhints.sgml#3 integrate .. //depot/projects/docproj_es/www/es/send-pr.sgml#3 integrate .. //depot/projects/docproj_es/www/es/share/sgml/navibar.l10n.ent#3 integrate Differences ... ==== //depot/projects/docproj_es/doc/share/pgpkeys/brix.key#2 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -6,7 +6,6 @@ pub 1024D/54E278F8 2003-04-09 Key fingerprint = 7B63 EF32 7831 A704 220D 7E61 BFE4 387E 54E2 78F8 uid Henrik Brix Andersen -uid Henrik Brix Andersen uid Henrik Brix Andersen uid Henrik Brix Andersen sub 1024g/3B13C209 2003-04-09 @@ -65,159 +64,161 @@ 4NYf0GWIcwQQEQIAMwUCQ/8J+wWDAeEzgCYaaHR0cDovL3d3dy5jYWNlcnQub3Jn L2luZGV4LnBocD9pZD0xMAAKCRDSuw0BZdD9WJv1AKCeEY8AF53YFwkwiQBXbR84 jlXVRwCfcT0zhAl57VR4Ijt1D4cJ6g3A8qW0IkhlbnJpayBCcml4IEFuZGVyc2Vu -IDxicml4QHBpbC5kaz6IXgQTEQIAHgUCQgFQNgIbAwYLCQgHAwIDFQIDAxYCAQIe -AQIXgAAKCRC/5Dh+VOJ4+BwWAJ0XDcS0nTWbWGS0/J65xCBT3sirHACfaTWqV/4z -+J5UUY0jaFyAVDPacoaIRgQTEQIABgUCQgoIZgAKCRDVCFOpIhPncp82AJwOTmRd -hjhBNF0rbozKDAfzm9kpyACdFr78039yVcjhacuJ9TryX+sP/PaIRgQTEQIABgUC -QiyUOwAKCRDuniwkh809vTUBAJ4tRY6maegjAvifM9Sx3lRmOElxUQCfUlNXI32J -yF11laaBw2lemWR8osSIRgQQEQIABgUCQmvCJQAKCRCrL1pbFSVpkFpIAJ9gE6av -LyOYKPShubfQtzDcvk1FPQCgsGqOWEWjBDcILsEjSAZf2s15YaSIRgQQEQIABgUC -Q8xynAAKCRA3TL6fUzeajR6QAJ9EJ+inLsddYSrMzPjUIg5KN/NS0ACffc6FKBmE -xNgfb0fDWhWo6CzlZqeInAQQAQIABgUCRAwPdgAKCRAff6kIA1j8vQQkA/4hBEQU -moD7f9qCtcthstfHJatafSdgGt/+ZUdA+L+nSVBBV+w/lQn9Quh78Dch8n3RRi1j -odco95NelcMGGw2RcbycCj8YhMYelBgvOtvb70siUOm/dvEXUGqfG70tEbyTZARV -nPyObvJ7cKsWsPwKDP5PYsdBlJrVGAkkIsMPdIhGBBARAgAGBQJEDJx+AAoJEAnE -54mQFu9QbDQAn3yrCh2cVJ6Q7xusvvbCsjOhT754AJsEEQjfk7n0WUuIiR217JSU -3WV7QIhGBBARAgAGBQJEMUjJAAoJEPPeeYLzX6TPZpYAn1diR1oFxnftj+Xvj7az -wnMU+bONAJ9vsUccKZArvPjiUMHN62Jyk9/N7IhGBBARAgAGBQJEzPxIAAoJEF1W -juu0ta7br0YAn1e+UFgxNqCNoL3pk3JWnGdDR0/KAJ4h32cbcVycxt3cai3+8xJu -IfanLIhGBBMRAgAGBQJFDUupAAoJEJ93wKxvehFf7+AAoKr10orISa6VpbVLtB8b -q7yifos6AJwMyQi25YY/+89ucuuj5D/ENOdJJohGBBIRAgAGBQJDEWGEAAoJEPNM -8i8UkicnL+0Ani1X8NQYrQwLNUqddTQaPjU2kFhUAKDRh4aU40EjT/awjFaoL1QS -cRaD2okCSAQQAQIAMgUCRVcq8SsaaHR0cDovL3d3dy5wYWVwcy5jeC9ncGcvc2ln -bmluZy1wb2xpY3kuYXNjAAoJECZJ5ijF000FI/EP/2CKJioV5P2l3B9Y00u5N/9/ -lRVujKoOh1HcOFndNi7tZpKOiBxP5nQRvVGH8O9qSdsYAUA0/1KK7+FAgUrPL91s -/d6cG0srtAGMFd+0lxy8nvfYPn0AKAuuumCXjclZsm7H2zoMsaAP0TGO5zGq8tKJ -oIhA2jZyR6qUYc6UmcrTTTLMJEcPNoQtk6WOehpZ6+ZXok9O3Oj/lKTeIOfxMVlW -lZK9fc0ErL0umNp1n2lYmzub0cAtPOLpLN659BfPc7p30oGyavg7YcmstUSH7KcX -aHL2EBFE03iY7p2tVRRkuWgTwZQL7OJ2i7p81XTHNwt43G2PR6sVrwcAJaBCzG+5 -nFLt9B/9ZFZSO7Al+2X741vAHMpeSpPrZs/jCYypJ56xvOWLgyGqjoJ7iuftTrI2 -KUijZpR3yc+EQT0TMbKkMmH0Fwmc6lMriokw5Uv0MTbmQryAOrDmmI3EW+bn4c1W -xyprujfzXNckuvoCP7cO+PMaw62/MiVTubjjahuzyjyBBDBDnv+AcHtFYEvI79Pp -5A4tN7KwO2VfNyeiiMboHZo/e1z/ftb9yE6CPPfJ8trbRD+BYiI2pXNsd2WZOWJi -OQLjnQGNWIDDiGLDQkuCFapP/9GPE+2wnGUPFpzCl61TmhPFytA/ktMbrSvAdeO4 -ZG+A+uffHw3bvx7Io18kiEYEEBECAAYFAkVY5j0ACgkQrpRlPV0TrEW1qgCfcXyz -F96vs56ANzRmKDYIRUdaRM8An2dlIMNig/8QOZiQMlWttQW18FQwiEYEEBECAAYF -AkVaEA0ACgkQFGWX3NzDmcfKhQCeOLI4ezcjAFLpx6yi6IhzhuIHmxMAoK6FE9S5 -NTnBHNVE8E03DhHDBj8piEYEEBECAAYFAkVjZ/IACgkQF3Kdd/SoUS/85ACZAb6T -KVDKJfYeUujPSjT8oMluXOEAoIvwHipR6LSx62c0IIRtPvjGRJk+iEYEEBECAAYF -AkbvBYYACgkQntdYP8FOsoK0cQCfVwXURwpyhvvRovOqCeg7KSOvLVIAn2I8XtcA -KxViE70DShYy7fDV+5DQiEYEEBECAAYFAkbvf1AACgkQIaZGm9HvuqZCsgCghy8K -FNI13rJZQx9HYRWYomYOvQoAnR330uULJKZ3OXoEFl8cxBSL/kCwiGsEEBECACsF -AkbxirEFgwHihQAeGmh0dHA6Ly93d3cuY2FjZXJ0Lm9yZy9jcHMucGhwAAoJENK7 -DQFl0P1YDMcAnA1nZbi9QGODZxTjjFrSHj5mrXSBAJ4gY3iMB9HESMIXNmJvQQ/O -7IJrYIhGBBARAgAGBQJFWOY5AAoJEK6UZT1dE6xFcTAAniEErsWgnAb4i0ZcxL/v -novt79NBAKCJEJqzGFauU0MYKCHmh64FbdwN94hzBBARAgAzBQJCVxbXBYMB4TOA -JhpodHRwOi8vd3d3LmNhY2VydC5vcmcvaW5kZXgucGhwP2lkPTEwAAoJENK7DQFl -0P1YrSQAn2OAkKvtEH72NjoIzkZfT0mLcyFsAJ4hEiR0DQGTBRklTgzoZoC0CWh3 -k4icBBABAgAGBQJEDA9yAAoJEB9/qQgDWPy99QED/jNAIt5GmHGuD6OnZ2dIhpl5 -8zhucqJ+xbCvp8NFvhOjBJNX+sAaI/S1OmPgaI1LefnvSDjDYQ7+Ou1357t3HFAH -I6uRI/kABJDYUEV29YEc2acvIw0dAY95F2DEUYBTJF1C6mUpl1CkyYjrg+Cn2NNH -GbFV1iphNo526dVizkH7tCRIZW5yaWsgQnJpeCBBbmRlcnNlbiA8YnJpeEBhYXV1 -Zy5kaz6IXgQTEQIAHgUCQ0JEJQIbAwYLCQgHAwIDFQIDAxYCAQIeAQIXgAAKCRC/ -5Dh+VOJ4+EHrAJ0SX5TjZM6JK8DH0QJNIpHakTJigQCePQ74xyOwLGB5Y4CIfGQf -pLUxIDmIRgQQEQIABgUCQ8xynAAKCRA3TL6fUzeajcljAKC8lebtK/fRJIX++RQD -uVhmcxemTgCgmGr1vSItbirCA2GCthhsETpz7qmInAQQAQIABgUCRAwPdgAKCRAf -f6kIA1j8vX7lA/sHHMOfH5JgCqYBa52Y7mCpHPCEHgv2eu09reEaRY0Qy7EmMEKQ -kkehf+vExiRHZl1IUgVf77tjeqwjt3YZQIwGAKo3zN1/Ba+umMEE2ktJWWI3C8S6 -MCLUGZOLENuKrgIrBqLqDGwUQNiwDTlxfY2ODVthtf9eNFwak1A8q6drwYhGBBAR -AgAGBQJEDJx+AAoJEAnE54mQFu9Q3okAn18cdHUyzT2tjJqMytrRpf7tdpSzAJwK -M2hrJlCV/7oOQkFpAWIaL8UxMIhGBBARAgAGBQJEMUjNAAoJEPPeeYLzX6TPb7QA -niksYFwY0wFYAg66Nql5hB8qJ/ZNAJwKByscvCbtu1RNtoccPWDkszClp4hGBBAR -AgAGBQJEzPxIAAoJEF1Wjuu0ta7bwbgAn3ZNw8fR8zrz816sYlEDlC2xib0LAJ0c -K5pvfwwBa/XXnC9utctBkrgdw4hGBBMRAgAGBQJFDUupAAoJEJ93wKxvehFfe08A -oIy56uksH0GiHf2GyZxV/DwxmOWCAKDuQyGvkwjr9rbPagu9qRejYCgzkohGBBAR -AgAGBQJFLNmpAAoJENUIU6kiE+dyj3AAn3d94rNoE4x+U0SlkfgH6O03lub2AKCu -2GedBOgw1mXdvlFa8uI/R/SkDIkCSAQQAQIAMgUCRVcq8SsaaHR0cDovL3d3dy5w -YWVwcy5jeC9ncGcvc2lnbmluZy1wb2xpY3kuYXNjAAoJECZJ5ijF000FcHgP+wW0 -iY6h1ZRpHZBpwSIVR24gro1LkOF+JbZ9e0RQB0WiHYgTwjCVzrUNUox/WNIWQgVo -yzg51Odi6IzvTbH0JbZetPmk7g5ExcAKmYKmoslThGhQqkTZjkAGvCK3cyoZQWjK -6d5ueFz0iAi2snrbRqwebRF8jAjksLp9X7rC5KIRLXOGyD/M9nxpOdhN8YKH+8K2 -2rEOa7FQSxUr0TtPXtdkkIt5X49H3csuswO9VLJHAks5KSkKqAYv+Dr9qy/D+UZf -SDwbhaYeZBbjYWu2l8EkX6FHA7Z32Itnm5vOpx1GTJ3A4HH/He3M+PEKOr5Tfa2d -ILKzVgCj2ZhoJ9hBy69prQ/iF2K00DKkAlg5HEH6KTvC1eiKgPTylRwDYGHGAqNR -7cPWv4LzHueNnyVZLAZ4lo3FSGaxGi7lIjWcb1wbhuUdYw0aD+OcZcCjOZxrlVEf -NAmhNpsGDzhMhd1sHNNAQI8FQmnSvr2uhicXdGanKi/iIcd7mC0hD0eBbYDtcMw3 -INV4S1geLw6qE49WLZz+xT+ZZMw/mfnDXv4f4Ac+tk/6IVFJESchwS6cGUqDdN8G -AhP6KwxW0bUdwQY25BBMdWCvH8lKMu7BRbF3I6DbcoVqcEzaBj6nplhCeDzFrZ8Y -LivNCYj7/jGgCJ7LzEShgtTYPKkS6Elp0VSFJTHhiEYEEBECAAYFAkVY5j0ACgkQ -rpRlPV0TrEXlKgCghOznZkB/pJUHwUFP94ufHk2LYrUAnjaspyPwcxs1B/hs6NqY -k2uWjtgdiEYEEBECAAYFAkVaEBkACgkQFGWX3NzDmcdDxwCcD32/HX9Mh23+vaHV -vIesKA+81NoAn3M/Kj0jNmUnmhKIYOjRyv9GTDXniEYEEBECAAYFAkVjaB0ACgkQ -F3Kdd/SoUS+OIwCdEoOP88LbrbrpP6x0tl9LJGeBvWgAnitvFrIQiq7reKBG4IGy -4C86u1MGiEYEEBECAAYFAkbvBYYACgkQntdYP8FOsoKxAgCfYvCf2XlS0MRxWTkT -aSdm1V8NfnMAnAx8jBXy73bXM3KlyCnNLCQt2uYoiEYEEBECAAYFAkbvf1AACgkQ -IaZGm9HvuqaFzwCgrjOxhu4iFit1hX4d8HnGK/DO5HQAmwQ7f8U3Ac6d6ICRGpQ/ -mjQO2qtciGsEEBECACsFAkbxirEFgwHihQAeGmh0dHA6Ly93d3cuY2FjZXJ0Lm9y -Zy9jcHMucGhwAAoJENK7DQFl0P1YJcUAoI33Kbgxo8muXWtc8sfueEjfyJJSAJ9e -LfzoaS/Aopm5nN46KJvNxuOdq4hzBBARAgAzBQJD/wn7BYMB4TOAJhpodHRwOi8v -d3d3LmNhY2VydC5vcmcvaW5kZXgucGhwP2lkPTEwAAoJENK7DQFl0P1YuVcAniY/ -d5PXyWwSKNmxCjrlxcJPGcJsAJ9i9rsXp67YTZ0bZPMwNv97xNNOD7QjSGVucmlr -IEJyaXggQW5kZXJzZW4gPDAxMDc5QGloYS5kaz6ISQQwEQIACQUCRLk+yQIdIAAK -CRC/5Dh+VOJ4+PgHAJ0RbR1AKKcMZ1K+9Uu5aUXXSZy/UwCgp5XdCZ70Y4bcogOL -b7RhhV8AtYyIRgQQEQIABgUCQ8xynAAKCRA3TL6fUzeajf2TAJ4tiHqqMvvmm8Ji -c+W7twBpaWgg+wCgrNWuHKtY9q+kM6mNQc0rpo6NHieIRgQQEQIABgUCRAycfgAK -CRAJxOeJkBbvUAUzAJ9mWE5KXCnIqms2+D2g2AztwOmjvQCgjPb/+uy3IHeEGYXu -b8cO0NHMDP2IRgQQEQIABgUCRDFIzQAKCRDz3nmC81+kz44hAJ4v2+3Vtzbru10N -tLEVa9JS7VZ44gCeP4S0HP5DjKL05TqzTU44DfXKMfqIRgQQEQIABgUCRVjmPQAK -CRCulGU9XROsRS/AAJ9+iYvEwRhECR3HMSRwCEvNLfUX6wCgjAIUN0d/NuAxuw/i -zlbZ8JfUtYKIXgQTEQIAHgUCQ00DIgIbAwYLCQgHAwIDFQIDAxYCAQIeAQIXgAAK -CRC/5Dh+VOJ4+FC0AJ9TM8beIF/8EwtCXXsLqGX1tI4oAwCdEqAaIpaL76R5ZbF8 -Hn+oM1XE3OaIcwQQEQIAMwUCQ/8J+wWDAeEzgCYaaHR0cDovL3d3dy5jYWNlcnQu -b3JnL2luZGV4LnBocD9pZD0xMAAKCRDSuw0BZdD9WGlLAJ9rRFhM8qgeHo6CybaH -tJwcdRheiwCfT1DsbGR81tGDvjnNaA+RG3kcRWCInAQQAQIABgUCRAwPdgAKCRAf -f6kIA1j8vdG1A/4g8kULXJSrk+CbcsRpQMHyeDEVg/Yg9DcofR6GZt7g4dTRz0Tn -KHVWI2VgpYrFNSFQo9Qwk+M4RIp2ZTRYEeudDkUpmavwr+4YJ0dT6WFhDDOAxiSN -OfsBLjhi6RkuRDj3Rk/mWFUy0VYsl1URkYrWg7RtJ5FwHREzCtP7PWA1h7QkSGVu -cmlrIEJyaXggQW5kZXJzZW4gPGJyaXhAZ2ltcC5vcmc+iEkEMBECAAkFAkIKBUwC -HSAACgkQv+Q4flTiePgzugCfcsChoTb1941q9SnD+GoPR/iec+QAn01l6uhmRfT2 -GUYO8DiWILfgM9EjiEYEEBECAAYFAkPMcpwACgkQN0y+n1M3mo3M7gCfUhjb2cPR -swP/mHEO0lS3yo7XHe8An12Utvjjx2B2nEtR0MJ/dp4c6WaliEYEEhECAAYFAkHZ -UikACgkQrp/nBQgMTKXuhwCghy925sEUUKbGbDB4aFeBTZJfqVAAmwRibqOg4xna -04sDxZwrOCEyQYMEiFkEExECABkFAj6UQlgECwcDAgMVAgMDFgIBAh4BAheAAAoJ -EL/kOH5U4nj48x4An0LnxAzLNAGALlIZSKR4UDnrorR2AJ0SIyC4nQLSrC2MRHOd -2ayJjsM6YoheBBMRAgAeBQJCCgUXAhsDBgsJCAcDAgMVAgMDFgIBAh4BAheAAAoJ -EL/kOH5U4nj4Gk0AnAkHLv4180NBzFZT7oMoeRYAii8rAJ9Y+T7RLvg4E7HT41Rc -7G1yr+YIRLQmSGVucmlrIEJyaXggQW5kZXJzZW4gPGJyaXhAZ2VudG9vLm9yZz6I -SQQwEQIACQUCRQxpeAIdIAAKCRC/5Dh+VOJ4+FYZAKCWWIFlZr8dT7Sq1Bme3+sh -GfVv4gCeKJO0XQuX3QDvvSkwiOwnxxd7wB+IRgQQEQIABgUCQmvCIQAKCRCrL1pb -FSVpkGWCAKDgKn6UeT4zocpuGgQAcrlezNUdCgCgj7jbaiEViejDhukf7ewlcA3I -dzqIRgQQEQIABgUCQ8xymQAKCRA3TL6fUzeaje2CAJ4v45rjjRbhRWbPYIe9SWjL -SiJFSACgtEdrjTqIQEKARJ2yXkj0tbD3mlGIRgQQEQIABgUCRAycdwAKCRAJxOeJ -kBbvUOuKAJ0V+IrjlZOvnhHuQYUnwJt2/ku0OQCfYUnN2CWCXpkk+ezU5ZmWKl45 -qCiIRgQQEQIABgUCRDFIBQAKCRDz3nmC81+kzyeLAJ46G4BwFYY9A+7ECwaPZPN7 -5uwILwCfbp2Qz1rkSQOSMXf7aUn0NTfVID2IRgQQEQIABgUCRMz8RwAKCRBdVo7r -tLWu23XNAKDUqB1ZMQgPxYz5QMVrkFygywg/9gCg9ZAMqutTl7SJlnpTI+/8K8bB -ReOIRgQQEQIABgUCRVjmOQAKCRCulGU9XROsRXEwAJ4hBK7FoJwG+ItGXMS/756L -7e/TQQCgiRCasxhWrlNDGCgh5oeuBW3cDfeIRgQSEQIABgUCQdlSKAAKCRCun+cF -CAxMpQF6AKCNLiuIdY8oyJuqGF0LW7nQNtV2jgCffbfz1ocIJJQg84/FQPeqAPQB -WH6IRgQSEQIABgUCQxFhhAAKCRDzTPIvFJInJ0sRAJ40qmXNWNcdjuqoML3ELFsa -b9oShQCfdyuTHnzRdQpFRM/nHSZObwNtTbOIRgQTEQIABgUCQgoIaAAKCRDVCFOp -IhPnciQ+AJ0ak5LIn6akWvMZkWCH8uPwGfE1qwCeLXE95w87H+Nsy8yPOQMX+1Op -gcWIRgQTEQIABgUCQiyUOAAKCRDuniwkh809vSgnAJ9wSk0FBhjWP5b2awAWWRIy -LodwMwCgrsGH0702X3E8dTuyv8gMi7pH5LiIXgQTEQIAHgIbAwYLCQgHAwIDFQID -AxYCAQIeAQIXgAUCRQxpGgAKCRC/5Dh+VOJ4+Ig8AJsHy23a7eityD/kfEiZGdqi -ZztMswCdG/Q8hR0WIR8rWX6BLa7BJeKNrTSIXgQTEQIAHgUCQVbLjAIbAwYLCQgH -AwIDFQIDAxYCAQIeAQIXgAAKCRC/5Dh+VOJ4+LwxAKDGhPJUUfBYrGGdIqkVP9C5 -keY2PQCgv6Qv/cIHjQPnImdXyWD7C9AgavyIYQQTEQIAIQIbAwYLCQgHAwIDFQID -AxYCAQIeAQIXgAUCQgoLDwIZAQAKCRC/5Dh+VOJ4+HQIAJ9Q8GLp70kleUuYOagN -T5gNxSz55ACeIWoWHJI66pXlf89rery2AK0cNOOIcwQQEQIAMwUCQlcW1wWDAeEz -gCYaaHR0cDovL3d3dy5jYWNlcnQub3JnL2luZGV4LnBocD9pZD0xMAAKCRDSuw0B -ZdD9WKvGAJ9a9MkNFi0AS/AE6ZYdZPbHYMhqtwCfXzkVUX+7dtH4QIuq2xP6INnP -jP+InAQQAQIABgUCRAwPcgAKCRAff6kIA1j8vfUBA/4zQCLeRphxrg+jp2dnSIaZ -efM4bnKifsWwr6fDRb4TowSTV/rAGiP0tTpj4GiNS3n570g4w2EO/jrtd+e7dxxQ -ByOrkSP5AASQ2FBFdvWBHNmnLyMNHQGPeRdgxFGAUyRdQuplKZdQpMmI64Pgp9jT -RxmxVdYqYTaOdunVYs5B+7QnSGVucmlrIEJyaXggQW5kZXJzZW4gPGJyaXhARnJl -ZUJTRC5vcmc+iGAEExECACAFAkcpBP4CGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIX -gAAKCRC/5Dh+VOJ4+Gp5AJ9bHRWLLALFKQTHKqBpKpU1cfz5WwCguhErOQMUYMYz -y2H9yhvL1y7vdh65AQ0EPpRCXxAEAPrtI7bQ5JzA/f+gmvW2OY0VMgEFOjXQm3X+ -YEyUWniuQRvKy9yO/a+mlFhGNsbsTC5jJ9F5sDpcsX6X0r5kIirkgIyq2jtQo3I2 -damPD3AvCI+R4xyTlCuZcLz9sfU8dcLDybo3FKJFh3Zhstg78StKEN8ytkmL3C3S -lj3uzquTAAMGA/46ARDbChaPCTez0Dr5wagYIP83ziY1IEWXotU6qIBOSAXOb1V6 -cOxXUu5Vu93x381Rn6ObYA0AsXGWArF6q2EmEVktdkhySnkZU9GqtQkpq4XTh9Bn -zD0kjoqnduudo3rBrSfELempjBl0GMNSNo616zbtSqqVNhfSxBoMszQBEYhGBBgR -AgAGBQI+lEJfAAoJEL/kOH5U4nj49GcAnin5+1aKIIFGp8edGF/elOXPEYNRAKDD -4mSrC96PYoIx+3Zdq9zvDaphVQ== -=Sa4u +IDxicml4QHBpbC5kaz6IZQQwEQIAJQUCSBwuXh4dIE5vIGxvbmdlciBlbXBsb3ll +ZCBieSBwaWwuZGsACgkQv+Q4flTiePhGPQCeJ651G2UDB+TxQDFT3RDjc6XCUB8A +nAqb8b6bFhpo6Uqnxmyw2d3XNoGpiF4EExECAB4FAkIBUDYCGwMGCwkIBwMCAxUC +AwMWAgECHgECF4AACgkQv+Q4flTiePgcFgCdFw3EtJ01m1hktPyeucQgU97IqxwA +n2k1qlf+M/ieVFGNI2hcgFQz2nKGiEYEExECAAYFAkIKCGYACgkQ1QhTqSIT53Kf +NgCcDk5kXYY4QTRdK26MygwH85vZKcgAnRa+/NN/clXI4WnLifU68l/rD/z2iEYE +ExECAAYFAkIslDsACgkQ7p4sJIfNPb01AQCeLUWOpmnoIwL4nzPUsd5UZjhJcVEA +n1JTVyN9ichddZWmgcNpXplkfKLEiEYEEBECAAYFAkJrwiUACgkQqy9aWxUlaZBa +SACfYBOmry8jmCj0obm30Lcw3L5NRT0AoLBqjlhFowQ3CC7BI0gGX9rNeWGkiEYE +EBECAAYFAkPMcpwACgkQN0y+n1M3mo0ekACfRCfopy7HXWEqzMz41CIOSjfzUtAA +n33OhSgZhMTYH29Hw1oVqOgs5WaniJwEEAECAAYFAkQMD3YACgkQH3+pCANY/L0E +JAP+IQREFJqA+3/agrXLYbLXxyWrWn0nYBrf/mVHQPi/p0lQQVfsP5UJ/ULoe/A3 +IfJ90UYtY6HXKPeTXpXDBhsNkXG8nAo/GITGHpQYLzrb2+9LIlDpv3bxF1Bqnxu9 +LRG8k2QEVZz8jm7ye3CrFrD8Cgz+T2LHQZSa1RgJJCLDD3SIRgQQEQIABgUCRAyc +fgAKCRAJxOeJkBbvUGw0AJ98qwodnFSekO8brL72wrIzoU++eACbBBEI35O59FlL +iIkdteyUlN1le0CIRgQQEQIABgUCRDFIyQAKCRDz3nmC81+kz2aWAJ9XYkdaBcZ3 +7Y/l74+2s8JzFPmzjQCfb7FHHCmQK7z44lDBzeticpPfzeyIRgQQEQIABgUCRMz8 +SAAKCRBdVo7rtLWu269GAJ9XvlBYMTagjaC96ZNyVpxnQ0dPygCeId9nG3FcnMbd +3Got/vMSbiH2pyyIRgQTEQIABgUCRQ1LqQAKCRCfd8Csb3oRX+/gAKCq9dKKyEmu +laW1S7QfG6u8on6LOgCcDMkItuWGP/vPbnLro+Q/xDTnSSaIRgQSEQIABgUCQxFh +hAAKCRDzTPIvFJInJy/tAJ4tV/DUGK0MCzVKnXU0Gj41NpBYVACg0YeGlONBI0/2 +sIxWqC9UEnEWg9qJAkgEEAECADIFAkVXKvErGmh0dHA6Ly93d3cucGFlcHMuY3gv +Z3BnL3NpZ25pbmctcG9saWN5LmFzYwAKCRAmSeYoxdNNBSPxD/9giiYqFeT9pdwf +WNNLuTf/f5UVboyqDodR3DhZ3TYu7WaSjogcT+Z0Eb1Rh/DvaknbGAFANP9Siu/h +QIFKzy/dbP3enBtLK7QBjBXftJccvJ732D59ACgLrrpgl43JWbJux9s6DLGgD9Ex +jucxqvLSiaCIQNo2ckeqlGHOlJnK000yzCRHDzaELZOljnoaWevmV6JPTtzo/5Sk +3iDn8TFZVpWSvX3NBKy9LpjadZ9pWJs7m9HALTzi6SzeufQXz3O6d9KBsmr4O2HJ +rLVEh+ynF2hy9hARRNN4mO6drVUUZLloE8GUC+zidou6fNV0xzcLeNxtj0erFa8H +ACWgQsxvuZxS7fQf/WRWUjuwJftl++NbwBzKXkqT62bP4wmMqSeesbzli4Mhqo6C +e4rn7U6yNilIo2aUd8nPhEE9EzGypDJh9BcJnOpTK4qJMOVL9DE25kK8gDqw5piN +xFvm5+HNVscqa7o381zXJLr6Aj+3DvjzGsOtvzIlU7m442obs8o8gQQwQ57/gHB7 +RWBLyO/T6eQOLTeysDtlXzcnoojG6B2aP3tc/37W/chOgjz3yfLa20Q/gWIiNqVz +bHdlmTliYjkC450BjViAw4hiw0JLghWqT//RjxPtsJxlDxacwpetU5oTxcrQP5LT +G60rwHXjuGRvgPrn3x8N278eyKNfJIhGBBARAgAGBQJFWOY9AAoJEK6UZT1dE6xF +taoAn3F8sxfer7OegDc0Zig2CEVHWkTPAJ9nZSDDYoP/EDmYkDJVrbUFtfBUMIhG +BBARAgAGBQJFWhANAAoJEBRll9zcw5nHyoUAnjiyOHs3IwBS6cesouiIc4biB5sT +AKCuhRPUuTU5wRzVRPBNNw4RwwY/KYhGBBARAgAGBQJFY2fyAAoJEBdynXf0qFEv +/OQAmQG+kylQyiX2HlLoz0o0/KDJblzhAKCL8B4qUei0setnNCCEbT74xkSZPohG +BBARAgAGBQJG7wWGAAoJEJ7XWD/BTrKCtHEAn1cF1EcKcob70aLzqgnoOykjry1S +AJ9iPF7XACsVYhO9A0oWMu3w1fuQ0IhGBBARAgAGBQJG739QAAoJECGmRpvR77qm +QrIAoIcvChTSNd6yWUMfR2EVmKJmDr0KAJ0d99LlCySmdzl6BBZfHMQUi/5AsIhr +BBARAgArBQJG8YqxBYMB4oUAHhpodHRwOi8vd3d3LmNhY2VydC5vcmcvY3BzLnBo +cAAKCRDSuw0BZdD9WAzHAJwNZ2W4vUBjg2cU44xa0h4+Zq10gQCeIGN4jAfRxEjC +FzZib0EPzuyCa2CIRgQQEQIABgUCRVjmOQAKCRCulGU9XROsRXEwAJ4hBK7FoJwG ++ItGXMS/756L7e/TQQCgiRCasxhWrlNDGCgh5oeuBW3cDfeIcwQQEQIAMwUCQlcW +1wWDAeEzgCYaaHR0cDovL3d3dy5jYWNlcnQub3JnL2luZGV4LnBocD9pZD0xMAAK +CRDSuw0BZdD9WK0kAJ9jgJCr7RB+9jY6CM5GX09Ji3MhbACeIRIkdA0BkwUZJU4M +6GaAtAlod5OInAQQAQIABgUCRAwPcgAKCRAff6kIA1j8vfUBA/4zQCLeRphxrg+j +p2dnSIaZefM4bnKifsWwr6fDRb4TowSTV/rAGiP0tTpj4GiNS3n570g4w2EO/jrt +d+e7dxxQByOrkSP5AASQ2FBFdvWBHNmnLyMNHQGPeRdgxFGAUyRdQuplKZdQpMmI +64Pgp9jTRxmxVdYqYTaOdunVYs5B+7QkSGVucmlrIEJyaXggQW5kZXJzZW4gPGJy +aXhAYWF1dWcuZGs+iF4EExECAB4FAkNCRCUCGwMGCwkIBwMCAxUCAwMWAgECHgEC +F4AACgkQv+Q4flTiePhB6wCdEl+U42TOiSvAx9ECTSKR2pEyYoEAnj0O+McjsCxg +eWOAiHxkH6S1MSA5iEYEEBECAAYFAkPMcpwACgkQN0y+n1M3mo3JYwCgvJXm7Sv3 +0SSF/vkUA7lYZnMXpk4AoJhq9b0iLW4qwgNhgrYYbBE6c+6piJwEEAECAAYFAkQM +D3YACgkQH3+pCANY/L1+5QP7BxzDnx+SYAqmAWudmO5gqRzwhB4L9nrtPa3hGkWN +EMuxJjBCkJJHoX/rxMYkR2ZdSFIFX++7Y3qsI7d2GUCMBgCqN8zdfwWvrpjBBNpL +SVliNwvEujAi1BmTixDbiq4CKwai6gxsFEDYsA05cX2Njg1bYbX/XjRcGpNQPKun +a8GIRgQQEQIABgUCRAycfgAKCRAJxOeJkBbvUN6JAJ9fHHR1Ms09rYyajMra0aX+ +7XaUswCcCjNoayZQlf+6DkJBaQFiGi/FMTCIRgQQEQIABgUCRDFIzQAKCRDz3nmC +81+kz2+0AJ4pLGBcGNMBWAIOujapeYQfKif2TQCcCgcrHLwm7btUTbaHHD1g5LMw +paeIRgQQEQIABgUCRMz8SAAKCRBdVo7rtLWu28G4AJ92TcPH0fM68/NerGJRA5Qt +sYm9CwCdHCuab38MAWv115wvbrXLQZK4HcOIRgQTEQIABgUCRQ1LqQAKCRCfd8Cs +b3oRX3tPAKCMuerpLB9Boh39hsmcVfw8MZjlggCg7kMhr5MI6/a2z2oLvakXo2Ao +M5KIRgQQEQIABgUCRSzZqQAKCRDVCFOpIhPnco9wAJ93feKzaBOMflNEpZH4B+jt +N5bm9gCgrthnnQToMNZl3b5RWvLiP0f0pAyJAkgEEAECADIFAkVXKvErGmh0dHA6 +Ly93d3cucGFlcHMuY3gvZ3BnL3NpZ25pbmctcG9saWN5LmFzYwAKCRAmSeYoxdNN +BXB4D/sFtImOodWUaR2QacEiFUduIK6NS5DhfiW2fXtEUAdFoh2IE8Iwlc61DVKM +f1jSFkIFaMs4OdTnYuiM702x9CW2XrT5pO4ORMXACpmCpqLJU4RoUKpE2Y5ABrwi +t3MqGUFoyunebnhc9IgItrJ620asHm0RfIwI5LC6fV+6wuSiES1zhsg/zPZ8aTnY +TfGCh/vCttqxDmuxUEsVK9E7T17XZJCLeV+PR93LLrMDvVSyRwJLOSkpCqgGL/g6 +/asvw/lGX0g8G4WmHmQW42FrtpfBJF+hRwO2d9iLZ5ubzqcdRkydwOBx/x3tzPjx +Cjq+U32tnSCys1YAo9mYaCfYQcuvaa0P4hditNAypAJYORxB+ik7wtXoioD08pUc +A2BhxgKjUe3D1r+C8x7njZ8lWSwGeJaNxUhmsRou5SI1nG9cG4blHWMNGg/jnGXA +ozmca5VRHzQJoTabBg84TIXdbBzTQECPBUJp0r69roYnF3Rmpyov4iHHe5gtIQ9H +gW2A7XDMNyDVeEtYHi8OqhOPVi2c/sU/mWTMP5n5w17+H+AHPrZP+iFRSREnIcEu +nBlKg3TfBgIT+isMVtG1HcEGNuQQTHVgrx/JSjLuwUWxdyOg23KFanBM2gY+p6ZY +Qng8xa2fGC4rzQmI+/4xoAiey8xEoYLU2DypEuhJadFUhSUx4YhGBBARAgAGBQJF +WOY9AAoJEK6UZT1dE6xF5SoAoITs52ZAf6SVB8FBT/eLnx5Ni2K1AJ42rKcj8HMb +NQf4bOjamJNrlo7YHYhGBBARAgAGBQJFWhAZAAoJEBRll9zcw5nHQ8cAnA99vx1/ +TIdt/r2h1byHrCgPvNTaAJ9zPyo9IzZlJ5oSiGDo0cr/Rkw154hGBBARAgAGBQJF +Y2gdAAoJEBdynXf0qFEvjiMAnRKDj/PC26266T+sdLZfSyRngb1oAJ4rbxayEIqu +63igRuCBsuAvOrtTBohGBBARAgAGBQJG7wWGAAoJEJ7XWD/BTrKCsQIAn2Lwn9l5 +UtDEcVk5E2knZtVfDX5zAJwMfIwV8u921zNypcgpzSwkLdrmKIhGBBARAgAGBQJG +739QAAoJECGmRpvR77qmhc8AoK4zsYbuIhYrdYV+HfB5xivwzuR0AJsEO3/FNwHO +neiAkRqUP5o0DtqrXIhrBBARAgArBQJG8YqxBYMB4oUAHhpodHRwOi8vd3d3LmNh +Y2VydC5vcmcvY3BzLnBocAAKCRDSuw0BZdD9WCXFAKCN9ym4MaPJrl1rXPLH7nhI +38iSUgCfXi386GkvwKKZuZzeOiibzcbjnauIcwQQEQIAMwUCQ/8J+wWDAeEzgCYa +aHR0cDovL3d3dy5jYWNlcnQub3JnL2luZGV4LnBocD9pZD0xMAAKCRDSuw0BZdD9 +WLlXAJ4mP3eT18lsEijZsQo65cXCTxnCbACfYva7F6eu2E2dG2TzMDb/e8TTTg+0 +I0hlbnJpayBCcml4IEFuZGVyc2VuIDwwMTA3OUBpaGEuZGs+iEkEMBECAAkFAkS5 +PskCHSAACgkQv+Q4flTiePj4BwCdEW0dQCinDGdSvvVLuWlF10mcv1MAoKeV3Qme +9GOG3KIDi2+0YYVfALWMiEYEEBECAAYFAkPMcpwACgkQN0y+n1M3mo39kwCeLYh6 +qjL75pvCYnPlu7cAaWloIPsAoKzVrhyrWPavpDOpjUHNK6aOjR4niEYEEBECAAYF +AkQMnH4ACgkQCcTniZAW71AFMwCfZlhOSlwpyKprNvg9oNgM7cDpo70AoIz2//rs +tyB3hBmF7m/HDtDRzAz9iEYEEBECAAYFAkQxSM0ACgkQ8955gvNfpM+OIQCeL9vt +1bc267tdDbSxFWvSUu1WeOIAnj+EtBz+Q4yi9OU6s01OOA31yjH6iEYEEBECAAYF +AkVY5j0ACgkQrpRlPV0TrEUvwACffomLxMEYRAkdxzEkcAhLzS31F+sAoIwCFDdH +fzbgMbsP4s5W2fCX1LWCiF4EExECAB4FAkNNAyICGwMGCwkIBwMCAxUCAwMWAgEC +HgECF4AACgkQv+Q4flTiePhQtACfUzPG3iBf/BMLQl17C6hl9bSOKAMAnRKgGiKW +i++keWWxfB5/qDNVxNzmiHMEEBECADMFAkP/CfsFgwHhM4AmGmh0dHA6Ly93d3cu +Y2FjZXJ0Lm9yZy9pbmRleC5waHA/aWQ9MTAACgkQ0rsNAWXQ/VhpSwCfa0RYTPKo +Hh6Ogsm2h7ScHHUYXosAn09Q7GxkfNbRg745zWgPkRt5HEVgiJwEEAECAAYFAkQM +D3YACgkQH3+pCANY/L3RtQP+IPJFC1yUq5Pgm3LEaUDB8ngxFYP2IPQ3KH0ehmbe +4OHU0c9E5yh1ViNlYKWKxTUhUKPUMJPjOESKdmU0WBHrnQ5FKZmr8K/uGCdHU+lh +YQwzgMYkjTn7AS44YukZLkQ490ZP5lhVMtFWLJdVEZGK1oO0bSeRcB0RMwrT+z1g +NYe0JEhlbnJpayBCcml4IEFuZGVyc2VuIDxicml4QGdpbXAub3JnPohJBDARAgAJ +BQJCCgVMAh0gAAoJEL/kOH5U4nj4M7oAn3LAoaE29feNavUpw/hqD0f4nnPkAJ9N +ZeroZkX09hlGDvA4liC34DPRI4hGBBARAgAGBQJDzHKcAAoJEDdMvp9TN5qNzO4A +n1IY29nD0bMD/5hxDtJUt8qO1x3vAJ9dlLb448dgdpxLUdDCf3aeHOlmpYhGBBIR +AgAGBQJB2VIpAAoJEK6f5wUIDEyl7ocAoIcvdubBFFCmxmwweGhXgU2SX6lQAJsE +Ym6joOMZ2tOLA8WcKzghMkGDBIhZBBMRAgAZBQI+lEJYBAsHAwIDFQIDAxYCAQIe +AQIXgAAKCRC/5Dh+VOJ4+PMeAJ9C58QMyzQBgC5SGUikeFA566K0dgCdEiMguJ0C +0qwtjERzndmsiY7DOmKIXgQTEQIAHgUCQgoFFwIbAwYLCQgHAwIDFQIDAxYCAQIe +AQIXgAAKCRC/5Dh+VOJ4+BpNAJwJBy7+NfNDQcxWU+6DKHkWAIovKwCfWPk+0S74 +OBOx0+NUXOxtcq/mCES0JkhlbnJpayBCcml4IEFuZGVyc2VuIDxicml4QGdlbnRv +by5vcmc+iEkEMBECAAkFAkUMaXgCHSAACgkQv+Q4flTiePhWGQCglliBZWa/HU+0 +qtQZnt/rIRn1b+IAniiTtF0Ll90A770pMIjsJ8cXe8AfiEYEEBECAAYFAkJrwiEA +CgkQqy9aWxUlaZBlggCg4Cp+lHk+M6HKbhoEAHK5XszVHQoAoI+422ohFYnow4bp +H+3sJXANyHc6iEYEEBECAAYFAkPMcpkACgkQN0y+n1M3mo3tggCeL+Oa440W4UVm +z2CHvUloy0oiRUgAoLRHa406iEBCgESdsl5I9LWw95pRiEYEEBECAAYFAkQMnHcA +CgkQCcTniZAW71DrigCdFfiK45WTr54R7kGFJ8Cbdv5LtDkAn2FJzdglgl6ZJPns +1OWZlipeOagoiEYEEBECAAYFAkQxSAUACgkQ8955gvNfpM8niwCeOhuAcBWGPQPu +xAsGj2Tze+bsCC8An26dkM9a5EkDkjF3+2lJ9DU31SA9iEYEEBECAAYFAkTM/EcA +CgkQXVaO67S1rtt1zQCg1KgdWTEID8WM+UDFa5BcoMsIP/YAoPWQDKrrU5e0iZZ6 +UyPv/CvGwUXjiEYEEBECAAYFAkVY5jkACgkQrpRlPV0TrEVxMACeIQSuxaCcBviL +RlzEv++ei+3v00EAoIkQmrMYVq5TQxgoIeaHrgVt3A33iEYEEhECAAYFAkHZUigA +CgkQrp/nBQgMTKUBegCgjS4riHWPKMibqhhdC1u50DbVdo4An32389aHCCSUIPOP +xUD3qgD0AVh+iEYEEhECAAYFAkMRYYQACgkQ80zyLxSSJydLEQCeNKplzVjXHY7q +qDC9xCxbGm/aEoUAn3crkx580XUKRUTP5x0mTm8DbU2ziEYEExECAAYFAkIKCGgA +CgkQ1QhTqSIT53IkPgCdGpOSyJ+mpFrzGZFgh/Lj8BnxNasAni1xPecPOx/jbMvM +jzkDF/tTqYHFiEYEExECAAYFAkIslDgACgkQ7p4sJIfNPb0oJwCfcEpNBQYY1j+W +9msAFlkSMi6HcDMAoK7Bh9O9Nl9xPHU7sr/IDIu6R+S4iF4EExECAB4CGwMGCwkI +BwMCAxUCAwMWAgECHgECF4AFAkUMaRoACgkQv+Q4flTiePiIPACbB8tt2u3orcg/ +5HxImRnaomc7TLMAnRv0PIUdFiEfK1l+gS2uwSXija00iF4EExECAB4FAkFWy4wC +GwMGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQv+Q4flTiePi8MQCgxoTyVFHwWKxh +nSKpFT/QuZHmNj0AoL+kL/3CB40D5yJnV8lg+wvQIGr8iGEEExECACECGwMGCwkI +BwMCAxUCAwMWAgECHgECF4AFAkIKCw8CGQEACgkQv+Q4flTiePh0CACfUPBi6e9J +JXlLmDmoDU+YDcUs+eQAniFqFhySOuqV5X/Pa3q8tgCtHDTjiHMEEBECADMFAkJX +FtcFgwHhM4AmGmh0dHA6Ly93d3cuY2FjZXJ0Lm9yZy9pbmRleC5waHA/aWQ9MTAA +CgkQ0rsNAWXQ/VirxgCfWvTJDRYtAEvwBOmWHWT2x2DIarcAn185FVF/u3bR+ECL +qtsT+iDZz4z/iJwEEAECAAYFAkQMD3IACgkQH3+pCANY/L31AQP+M0Ai3kaYca4P +o6dnZ0iGmXnzOG5yon7FsK+nw0W+E6MEk1f6wBoj9LU6Y+BojUt5+e9IOMNhDv46 +7Xfnu3ccUAcjq5Ej+QAEkNhQRXb1gRzZpy8jDR0Bj3kXYMRRgFMkXULqZSmXUKTJ +iOuD4KfY00cZsVXWKmE2jnbp1WLOQfu0J0hlbnJpayBCcml4IEFuZGVyc2VuIDxi +cml4QEZyZWVCU0Qub3JnPohgBBMRAgAgBQJHKQT+AhsDBgsJCAcDAgQVAggDBBYC +AwECHgECF4AACgkQv+Q4flTiePhqeQCfWx0ViywCxSkExyqgaSqVNXH8+VsAoLoR +KzkDFGDGM8th/coby9cu73YeuQENBD6UQl8QBAD67SO20OScwP3/oJr1tjmNFTIB +BTo10Jt1/mBMlFp4rkEbysvcjv2vppRYRjbG7EwuYyfRebA6XLF+l9K+ZCIq5ICM +qto7UKNyNnWpjw9wLwiPkeMck5QrmXC8/bH1PHXCw8m6NxSiRYd2YbLYO/ErShDf +MrZJi9wt0pY97s6rkwADBgP+OgEQ2woWjwk3s9A6+cGoGCD/N84mNSBFl6LVOqiA +TkgFzm9VenDsV1LuVbvd8d/NUZ+jm2ANALFxlgKxeqthJhFZLXZIckp5GVPRqrUJ +KauF04fQZ8w9JI6Kp3brnaN6wa0nxC3pqYwZdBjDUjaOtes27UqqlTYX0sQaDLM0 +ARGIRgQYEQIABgUCPpRCXwAKCRC/5Dh+VOJ4+PRnAJ4p+ftWiiCBRqfHnRhf3pTl +zxGDUQCgw+Jkqwvej2KCMft2Xavc7w2qYVU= +=KjaD -----END PGP PUBLIC KEY BLOCK----- ]]> ==== //depot/projects/docproj_es/www/en/cgi/man.cgi#4 (text+ko) ==== @@ -34,7 +34,7 @@ # Dual CGI/Plexus mode and new interface by sanders@bsdi.com 9/22/1995 # # $Id: man.cgi,v 1.172 2007/11/28 18:51:29 hrs Exp $ -# $FreeBSD: www/en/cgi/man.cgi,v 1.203 2008/04/29 17:28:53 wosch Exp $ +# $FreeBSD: www/en/cgi/man.cgi,v 1.206 2008/05/01 15:08:26 wosch Exp $ ############################################################################ # !!! man.cgi is stale perl4 code !!! @@ -131,6 +131,8 @@ 'OpenBSD 3.9' => { 'path' => '1:2:3:3p:4:5:6:7:8:9', }, 'OpenBSD 4.0' => { 'path' => '1:2:3:3p:4:5:6:7:8:9', }, 'OpenBSD 4.1' => { 'path' => '1:2:3:3p:4:5:6:7:8:9', }, + 'OpenBSD 4.2' => { 'path' => '1:2:3:3p:4:5:6:7:8:9', }, + 'OpenBSD 4.3' => { 'path' => '1:2:3:3p:4:5:6:7:8:9', }, }; foreach my $os ( keys %$sectionpath ) { @@ -151,7 +153,7 @@ ); $manLocalDir = '/usr/local/www/bsddoc/man'; -$manPathDefault = 'FreeBSD 6.3-RELEASE'; +$manPathDefault = 'FreeBSD 7.0-RELEASE'; %manPath = ( @@ -246,6 +248,8 @@ 'OpenBSD 3.9', "$manLocalDir/OpenBSD-3.9", 'OpenBSD 4.0', "$manLocalDir/OpenBSD-4.0", 'OpenBSD 4.1', "$manLocalDir/OpenBSD-4.1", + 'OpenBSD 4.2', "$manLocalDir/OpenBSD-4.2", + 'OpenBSD 4.3', "$manLocalDir/OpenBSD-4.3", #'NetBSD 0.9', "$manLocalDir/NetBSD-0.9", 'NetBSD 1.0', "$manLocalDir/NetBSD-1.0", @@ -311,6 +315,7 @@ 'SuSE Linux/i386 8.0', "$manLocalDir/SuSE-8.0-i386", 'SuSE Linux/i386 8.1', "$manLocalDir/SuSE-8.1-i386", 'SuSE Linux/i386 8.2', "$manLocalDir/SuSE-8.2-i386", + 'SuSE Linux/i386 10.1', "$manLocalDir/SLES-10-SP1-i386", 'HP-UX 11.22', "$manLocalDir/HP-UX-11.22", 'HP-UX 11.20', "$manLocalDir/HP-UX-11.20", @@ -395,14 +400,14 @@ 'slackware', 'Linux Slackware 3.1', 'linux-de', 'deutsch - Linux/GNU', 'redhat', 'Red Hat Linux/i386 9', - 'suse', 'SuSE Linux/i386 8.2', + 'suse', 'SuSE Linux/i386 10.1', 'linux', 'Red Hat Linux/i386 9', 'darwin', 'Darwin 8.0.1/ppc', 'opendarwin', 'OpenDarwin 7.2.1', 'macosx', 'Darwin 8.0.1/ppc', 'netbsd', 'NetBSD 4.0', - 'openbsd', 'OpenBSD 4.1', + 'openbsd', 'OpenBSD 4.3', 'v7', 'Unix Seventh Edition', 'v7man', 'Unix Seventh Edition', 'x11', 'X11R7.2', @@ -1244,7 +1249,7 @@ if $manPathAliases{$_}; } - local $id = '$FreeBSD: www/en/cgi/man.cgi,v 1.203 2008/04/29 17:28:53 wosch Exp $'; + local $id = '$FreeBSD: www/en/cgi/man.cgi,v 1.206 2008/05/01 15:08:26 wosch Exp $'; return qq{\ 
 Copyright (c) 1996-2008 Wolfram Schneider

==== //depot/projects/docproj_es/www/en/projects/ideas/ideas.xml#2 (text+ko) ====

@@ -15,7 +15,7 @@
 
   
     
-      $FreeBSD: www/en/projects/ideas/ideas.xml,v 1.85 2008/04/08 10:44:33 jkoshy Exp $
+      $FreeBSD: www/en/projects/ideas/ideas.xml,v 1.86 2008/05/03 11:25:24 netchild Exp $
     
   
 
@@ -1744,7 +1744,8 @@
 
Create/port BSD-licensed versions of one or more of the text processing
    tools that are currently missing from the FreeBSD distribution:
    sort,
-   diff, and the
+   diff,
+   groff/troff and the
    grep family.
    Licensed versions of some or all of these tools are already included
    in OpenBSD, so this task involves more porting and feature completion
@@ -1752,6 +1753,14 @@
    Emphasis should be placed on performance, standards-compliance, and support
    for handling wide character sets.
 

+
Regarding groff/troff, there exist the OpenSolaris
+   versions at SourceForge which at least do not come with a viral license
+   like the current GNU versions we use. Additionally this implementation has
+   support for common vector fonts and unicode. If those utilities are
+   option-compatible or not has to be analyzed. A port of this is already
+   available as textproc/heirloom-doctools.
+

 
Requirements:

 
    
  
  • Knowledge of C.
    • 

==== //depot/projects/docproj_es/www/es/docproj/sgml.sgml#3 (text+ko) ====

@@ -1,6 +1,6 @@
 
-
+
 
 
 ]>

==== //depot/projects/docproj_es/www/es/index.xsl#3 (text+ko) ====

@@ -10,7 +10,7 @@
 
   
 
-  
+  
 
   

==== //depot/projects/docproj_es/www/es/internet.sgml#4 (text+ko) ====

@@ -1,5 +1,5 @@
 
+
 
 
 ]>

==== //depot/projects/docproj_es/www/es/platforms/i386.sgml#3 (text+ko) ====

@@ -1,6 +1,6 @@
 
-
+
 
 
 ]>

==== //depot/projects/docproj_es/www/es/platforms/index.sgml#3 (text+ko) ====

@@ -2,7 +2,7 @@
 
 
 
-
+
 ]>
 
 
+
 
 

From owner-p4-projects@FreeBSD.ORG  Mon May  5 16:38:07 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C3E851065672; Mon,  5 May 2008 16:38:06 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 818CA106566C
	for ; Mon,  5 May 2008 16:38:06 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 6DA0E8FC1A
	for ; Mon,  5 May 2008 16:38:06 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m45Gc6Ie090698
	for ; Mon, 5 May 2008 16:38:06 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m45Gc4l5090694
	for perforce@freebsd.org; Mon, 5 May 2008 16:38:04 GMT
	(envelope-from imp@freebsd.org)
Date: Mon, 5 May 2008 16:38:04 GMT
Message-Id: <200805051638.m45Gc4l5090694@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 
Cc: 
Subject: PERFORCE change 141188 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Mon, 05 May 2008 16:38:07 -0000

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

Change 141188 by imp@imp_paco-paco on 2008/05/05 16:38:02

	IFC @141185

Affected files ...

.. //depot/projects/arm/src/Makefile#19 integrate
.. //depot/projects/arm/src/ObsoleteFiles.inc#36 integrate
.. //depot/projects/arm/src/UPDATING#27 integrate
.. //depot/projects/arm/src/bin/sh/arith.h#2 integrate
.. //depot/projects/arm/src/bin/sh/arith.y#2 integrate
.. //depot/projects/arm/src/bin/sh/expand.c#3 integrate
.. //depot/projects/arm/src/bin/sh/shell.h#2 integrate
.. //depot/projects/arm/src/cddl/compat/opensolaris/include/devid.h#2 integrate
.. //depot/projects/arm/src/cddl/compat/opensolaris/include/libintl.h#2 integrate
.. //depot/projects/arm/src/cddl/compat/opensolaris/include/mnttab.h#2 integrate
.. //depot/projects/arm/src/cddl/compat/opensolaris/include/priv.h#2 integrate
.. //depot/projects/arm/src/cddl/compat/opensolaris/include/solaris.h#2 integrate
.. //depot/projects/arm/src/cddl/compat/opensolaris/include/zone.h#2 integrate
.. //depot/projects/arm/src/cddl/compat/opensolaris/lib/libumem/umem.c#2 integrate
.. //depot/projects/arm/src/cddl/compat/opensolaris/lib/libumem/umem.h#2 integrate
.. //depot/projects/arm/src/cddl/compat/opensolaris/misc/mkdirp.c#2 integrate
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/README#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/baddof/baddof.c#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/badioctl/badioctl.c#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/chkargs.c#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/Getopt.java#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/JDTrace.java#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/exception.lst#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/jdtrace.c#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/manifest/jdtrace.jar-manifest#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dstyle.pl#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_FUNC.bad.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_MDIM.bad.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_NULL.bad.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_REDEF.redef.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.avgtoofew.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.maxnoarg.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.mintoofew.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.quantizetoofew.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.sumtoofew.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_CLEAR_AGGARG.bad.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_CLEAR_PROTO.bad.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_FUNC_IDENT.bad.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_FUNC_UNDEF.badaggfunc.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.badexpr.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.badkey3.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.noeffect.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey1.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey2.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey4.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASETYPE.lqbad1.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASETYPE.lqshort.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASEVAL.bad.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_LIMTYPE.lqbad1.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_LIMVAL.bad.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHBASE.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHBASE.order.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHLIM.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHLIM.order.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHSTEP.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MISMATCH.lqbadarg.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPLARGE.lqtoofew.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPSMALL.bad.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPTYPE.lqbadinc.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPVAL.bad.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_AGGARG.bad.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_PROTO.bad.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_SCALAR.bad.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_ARG.lquantizetoofew.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.avgnoarg.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.avgtoomany.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.counttoomany.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.lquantizenoarg.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.lquantizetoomany.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.maxnoarg.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.maxtoomany.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.minnoarg.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.mintoomany.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.quantizenoarg.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.quantizetoomany.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.sumnoarg.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.sumtoomany.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_AGGARG.bad.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_PROTO.badmany.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_PROTO.badnone.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_SCALAR.bad.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.allquant.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.allquant.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg_neg.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg_neg.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clear.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clear.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg2.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg2.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.cleardenormalize.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.cleardenormalize.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearlquantize.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearlquantize.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearnormalize.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearnormalize.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count2.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count2.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count3.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalize.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalize.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalizeonly.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalizeonly.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.fmtnormalize.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.fmtnormalize.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.forms.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.forms.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.goodkey.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.keysort.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.keysort.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantize.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantize.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantnormal.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantnormal.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantrange.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantrange.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantround.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantround.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantzero.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantzero.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max_neg.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max_neg.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min_neg.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min_neg.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs1.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs2.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs2.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs3.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs3.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multinormalize.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multinormalize.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.neglquant.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.neglquant.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negorder.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negorder.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negquant.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negquant.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtrunc.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtrunc.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtruncquant.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtruncquant.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.normalize.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.normalize.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.order.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.order.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantize.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantize.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantmany.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantmany.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantround.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantround.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantzero.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantzero.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signature.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeys.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeys.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeyspos.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeyspos.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.stddev.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.stddev.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.subr.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sum.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sum.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc0.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc0.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.truncquant.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.truncquant.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.valsortkeypos.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.valsortkeypos.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0_1.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0_2.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.modby0.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.addmin.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.divmin.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.muladd.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.muldiv.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.basics.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.complex.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_ARR_BADREF.bad.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRBIG.toobig.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRNULL.bad.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRSUB.bad.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_PROTO_TYPE.badtuple.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_IDENT_UNDEF.badureg.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic1.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic2.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic3.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic4.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic5.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic6.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.uregsarray.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupgtype.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupttype.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.this.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_ARG.badsig.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_LEN.toofew.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_LEN.toomany.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_SYNTAX.errassign.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.tupoflow.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.cpyarray.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.diffprofile.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.initialize.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.invalidref.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.misc.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.orthogonality.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.this.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.valassign.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/err.D_PDESC_ZERO.begin.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/err.D_PDESC_ZERO.tick.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.begin.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.begin.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.multibegin.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.multibegin.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_ADDROF_BITFIELD.BitfieldAddress.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFCONST.NegBitField.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFCONST.ZeroBitField.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFSIZE.ExceedBaseType.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFSIZE.GreaterThan64.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFTYPE.badtype.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_OFFSETOF_BITFIELD.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_SIZEOF_BITFIELD.SizeofBitfield.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/tst.BitFieldPromotion.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/tst.SizeofBitField.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.end.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize1.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize2.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize3.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.zerobuf.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.alignring.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.cputime.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.dynvarsize.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.fill1.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.fill1.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize1.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize2.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize3.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring1.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring2.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring2.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring3.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring3.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.smallring.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.switch1.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.switch1.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.cpuusage.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.nice.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.priority.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.prsize.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.rssize.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg0.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg0clause.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1to8.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1to8clause.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.caller.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.caller1.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.epid.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.epid1.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.errno.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.errno1.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.execname.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.hpriority.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.id.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.id1.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.ipl.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.ipl1.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.lwpsinfo.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.lwpsinfo1.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.pid.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.pid1.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo1.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.tid.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.tid1.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.timestamp.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.vtimestamp.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.aggfun.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.aggtup.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.arrtup.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.body.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.both.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.pred.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.nopred.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.pred.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.predfirst.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.predlast.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_LOCASSC.NonLocalAssoc.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_LONGINT.LongStruct.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PARMCLASS.BadStorageClass.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_NAME.VoidName.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_TYPE.Dyn.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_VARARGS.VarLenArgs.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_VOID.NonSoleVoid.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_SIGNINT.UnsignedStruct.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_VOIDATTR.ShortVoidDecl.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.arrays.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.basics.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.funcs.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.pointers.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.varargsfuncs.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/badptr.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/countdown.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/counter.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/errorpath.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/hello.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/kstat.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/ksyms.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/renormalize.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rtime.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rw.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rwinfo.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rwtime.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/specopen.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/truss.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/trussrw.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/userfunc.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_AGGREGATION.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_DBLERROR.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_DYNAMIC.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_PRINCIPAL.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_PRINCIPAL.end.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_SPEC.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_SPECUNAVAIL.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_STKSTROVERFLOW.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/err.D_PDESC_ZERO.InvalidDescription1.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.APIVersion.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.AddSearchPath.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.CoalesceTrace.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ELFGeneration.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.IncludedFilePath.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithFunctions#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithIDs#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithModules#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithNames#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithProviders#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ShowCompilerCode.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceFunctions#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceIDs#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceModule#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceNames#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceProvider#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.VerboseStabilityReport.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.AddSearchPath.d.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeGiga.d.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeKilo.d.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeMega.d.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeTera.d.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DataModel32.d.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DataModel64.d.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DefineNameWithCPP.d.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DefineNameWithCPP.d.ksh.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithFunction.d.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithFunction.d.ksh.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithID.d.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithID.d.ksh.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithModule.d.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithModule.d.ksh.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithName.d.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithName.d.ksh.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithProvider.d.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithProvider.d.ksh.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithoutW.d.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ELFGenerationOut.d.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ELFGenerationWithO.d.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExitStatus1.d.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExitStatus2.d.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExtraneousProbeIds.d.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidFuncName1.d.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidFuncName2.d.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId1.d.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId2.d.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId3.d.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule1.d.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule2.d.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule3.d.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule4.d.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProbeIdentifier.d.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider1.d.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider2.d.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider3.d.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider4.d.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc1.d.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc2.d.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc3.d.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc4.d.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc5.d.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc6.d.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc7.d.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc8.d.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc9.d.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID1.d.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID2.d.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID3.d.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID4.d.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID5.d.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID6.d.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID7.d.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule1.d.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule2.d.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule3.d.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule4.d.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule5.d.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule6.d.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule7.d.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule8.d.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName1.d.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName2.d.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName3.d.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName4.d.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName5.d.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName6.d.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName7.d.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName8.d.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName9.d.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider1.d.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider2.d.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider3.d.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider4.d.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider5.d.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.MultipleInvalidProbeId.d.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.PreprocessorStatement.d.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.QuietMode.d.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.QuietMode.d.ksh.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.TestCompile.d.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.TestCompile.d.ksh.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.UnDefineNameWithCPP.d.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroFunctionProbes.d.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroFunctionProbes.d.ksh.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroModuleProbes.d.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroModuleProbes.d.ksh.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroNameProbes.d.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroNameProbes.d.ksh.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProbeIdentfier.d.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProbesWithoutZ.d.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProviderProbes.d.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProviderProbes.d.ksh.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/err.D_IDENT_UNDEF.timespent.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.end.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.endwithoutbegin.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.multibeginend.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.multiend.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/err.D_DECL_IDRED.EnumSameName.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/err.D_UNKNOWN.RepeatIdentifiers.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumEquality.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumSameValue.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumValAssign.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_BADADDR.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_DIVZERO.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_UNKNOWN.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.error.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.errorend.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/err.D_PROTO_LEN.noarg.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/err.exitarg1.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/tst.basic1.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/err.D_PDESC_ZERO.notreturn.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.basic.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionentry.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionreturnvalue.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.ioctlargs.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offset.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offsetzero.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.return.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.return0.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.tailcall.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_FUNC_UNDEF.progenyofbad1.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_OP_VFPTR.badop.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.chillbadarg.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.copyoutbadarg.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.mobadarg.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.raisebadarg.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.allocanoarg.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.badbreakpoint.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.chilltoofew.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.chilltoomany.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyoutstrbadarg.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyoutstrtoofew.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyouttoofew.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyouttoomany.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.motoofew.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.motoomany.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtabadarg.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtatoofew.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtatoomany.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.panicbadarg.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.progenyofbad2.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.stopbadarg.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_STRINGOF_TYPE.badstringof.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_VAR_UNDEF.badvar.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badalloca.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badalloca2.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy1.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy2.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy3.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy4.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy5.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy6.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badchill.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.chillbadarg.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyout.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyoutbadaddr.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyoutstrbadaddr.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntoa6badaddr.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntoabadaddr.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntopbadaddr.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntopbadarg.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.badfreopen.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.basename.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.basename.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.bcopy.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.chill.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.cleanpath.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.cleanpath.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.copyin.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.copyinto.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.ddi_pathname.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.default.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.freopen.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.ftruncate.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.ftruncate.ksh.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.hton.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.index.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.index.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa6.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa6.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntop.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntop.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.lltostr.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.lltostr.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_owned.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_owner.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_type_adaptive.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.progenyof.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.rand.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strchr.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strchr.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strjoin.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strjoin.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strstr.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strstr.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strtok.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strtok.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strtok_null.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.substr.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.substr.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.substrminate.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.substrminate.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.system.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.system.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/grammar/err.D_ADDROF_LVAL.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/grammar/err.D_EMPTY.empty.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/grammar/tst.clauses.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/grammar/tst.stmts.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_DECL_IDRED.redef1.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_DECL_IDRED.redef2.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_IDENT_UNDEF.recur.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.baddef1.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.baddef2.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.badxlate.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineDataAssign.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineExpression.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineKinds.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineKinds.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineTypedef.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineWritableAssign.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.c#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/manifest/test.jar-manifest#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestAbort.java#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestBean.java#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestClose.java#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestDrop.java#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestEnable.java#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestFunctionLookup.java#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestMaxConsumers.java#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestMultiAggPrinta.java#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestProbeData.java#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestProbeDescription.java#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestStateMachine.java#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestStopLock.java#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Abort.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Abort.ksh.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Bean.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Bean.ksh.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Close.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Close.ksh.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Drop.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Drop.ksh.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Enable.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Enable.ksh.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.FunctionLookup.c#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.FunctionLookup.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.FunctionLookup.ksh.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.MaxConsumers.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.MaxConsumers.ksh.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.MultiAggPrinta.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.MultiAggPrinta.ksh.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeData.c#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeData.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeData.ksh.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeDescription.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeDescription.ksh.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.StateMachine.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.StateMachine.ksh.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.StopLock.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.StopLock.ksh.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.printa.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.printa.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_CHR_NL.char.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_CHR_NULL.char.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_INT_DIGIT.InvalidDigit.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_INT_OFLOW.BigInt.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_STR_NL.string.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brace1.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brace2.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brack1.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brack2.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brack3.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.paren1.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.paren2.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.paren3.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/tst.D_MACRO_OFLOW.ParIntOvflow.d.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/mdb/tst.dtracedcmd.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/mib/tst.icmp.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/mib/tst.tcp.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/mib/tst.udp.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/err.D_PRAGMA_OPTSET.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.badopt.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.boolopt.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.boolopt.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.dynopt.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.dynopt.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.enablerace.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.haslam.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.include.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.roch.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.schrock.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/err.D_PRINTA_AGGKEY.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/err.D_PRINTA_AGGPROTO.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.many.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.many.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.same.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.same.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.sort.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.sort.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.sortpos.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.sortpos.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.tuplecompat.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.tuplecompat.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero2.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero2.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero3.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero3.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/nfs/tst.call.c#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/nfs/tst.call.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/nfs/tst.call3.c#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/nfs/tst.call3.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_OFFSETOF_BITFIELD.bitfield.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_OFFSETOF_TYPE.badtype.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_OFFSETOF_TYPE.notsou.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_UNKNOWN.OffsetofNULL.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_UNKNOWN.badmemb.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.OffsetofAlias.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.OffsetofArith.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.OffsetofUnion.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.struct.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.struct.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.union.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.union.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/operators/tst.ternary.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/operators/tst.ternary.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PDESC_ZERO.badlib.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PDESC_ZERO.badproc1.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_BADPID.badproc2.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_CREATEFAIL.many.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_FUNC.badfunc.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_LIB.libdash.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.alldash.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.badname.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.globdash.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_OFF.toobig.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.addprobes.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.args1.c#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.args1.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.coverage.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.emptystack.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.emptystack.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.float.c#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.float.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.fork.c#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.fork.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.gcc.c#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.gcc.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.main.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.manypids.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.newprobes.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.newprobes.ksh.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.probemod.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex1.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex2.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex2.ksh.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex3.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex3.ksh.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex4.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex4.ksh.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret1.c#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret1.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret2.c#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret2.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.vfork.c#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.vfork.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak1.c#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak1.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak2.c#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak2.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.available.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.libmap.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.BadAlign.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_ADDROF_VAR.ArrayVar.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_ADDROF_VAR.DynamicVar.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_ADDROF_VAR.agg.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_DEREF_NONPTR.noptr.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_DEREF_VOID.VoidPointerDeref.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_ARRFUN.ArrayAssignment.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_INCOMPAT.VoidPointerArith.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_LVAL.AddressChange.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_PTR.NonPointerAccess.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_PTR.badpointer.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_SOU.BadPointerAccess.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_SOU.badpointer.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress1.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress2.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress3.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress4.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress5.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ArrayPointer1.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ArrayPointer2.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ArrayPointer3.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.GlobalVar.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.IntegerArithmetic1.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.PointerArithmetic1.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.PointerArithmetic2.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.PointerArithmetic3.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.PointerAssignment.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ValidPointer1.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ValidPointer2.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.VoidCast.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.basic1.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.basic2.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.D_PRAGERR.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.D_PRAGMA_DEPEND.main.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.D_PRAGMA_INVAL.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.D_PRAGMA_MALFORM.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.D_PRAGMA_UNUSED.UnusedPragma.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.circlibdep.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.invalidlibdep.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/tst.libchain.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/tst.libdep.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/tst.libdepfullyconnected.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/err.D_PRED_SCALAR.NonScalarPred.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/err.D_SYNTAX.invalid.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/err.D_SYNTAX.operr.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.argsnotcached.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.basics.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.basics.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.complex.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.complex.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.predcache.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.D_IDENT_UNDEF.afterprobe.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.D_PRAGCTL_INVAL.tabdefine.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.D_SYNTAX.withoutpound.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.defincomp.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.ifdefelsenotendif.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.ifdefincomp.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.ifdefnotendif.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.incompelse.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.mulelse.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifdef.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifdef.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifndef.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifndef.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifnotdef.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifnotdef.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicaland.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicaland.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicalandor.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicalandor.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicalor.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicalor.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.muland.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.muland.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.mulor.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.mulor.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.precondi.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.precondi.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.predicatedeclare.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexp.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexp.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpelse.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpelse.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpif.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpif.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpifelse.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpifelse.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.withinprobe.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTA_AGGARG.badagg.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTA_AGGARG.badfmt.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTA_AGGARG.badval.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTA_PROTO.bad.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTF_ARG_TYPE.jstack.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTF_ARG_TYPE.stack.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTF_ARG_TYPE.ustack.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.basics.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.basics.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.def.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.def.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.dynwidth.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.dynwidth.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.fmt.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.fmt.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.many.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.manyval.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.manyval.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.stack.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.tuple.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.tuple.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.walltimestamp.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.walltimestamp.ksh.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_AGG_CONV.aggfmt.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_EXTRA.toomany.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_EXTRA.widths.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_FMT.badfmt.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_PROTO.novalue.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_TYPE.aggarg.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_TYPE.recursive.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_DYN_PROTO.noprec.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_DYN_PROTO.nowidth.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_DYN_TYPE.badprec.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_DYN_TYPE.badwidth.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PROTO_LEN.toofew.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_SYNTAX.badconv1.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_SYNTAX.badconv2.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_SYNTAX.badconv3.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.basics.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.basics.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.flags.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.flags.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.hello.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.hello.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.ints.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.ints.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.precs.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.precs.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.print-f.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.print-f.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printT.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printT.ksh.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printY.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printY.ksh.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printcont.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printcont.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printeE.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printeE.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printgG.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printgG.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.rawfmt.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.rawfmt.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.str.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.str.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.sym.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.sym.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.uints.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.uints.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.widths.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.widths.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.widths1.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.wp.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.wp.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.func_access.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.op_access.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.unpriv_funcs.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_PDESC_ZERO.probeqtn.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_PDESC_ZERO.probestar.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_PDESC_ZERO.tickstar.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.assign.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.declare.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.declarein.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.lbraces.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.probespec.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.rbraces.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.recdec.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.basic1.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.check.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.declare.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.declareafter.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.emptyprobe.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.pragma.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.pragmaaftertab.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.pragmainside.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.pragmaoutside.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.probestar.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.create.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.discard.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exec.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.execfail.ENOENT.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.execfail.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitcore.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitexit.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitkilled.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.signal.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.sigwait.c#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.sigwait.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.startexit.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZERO.profile.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZEROonens.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZEROonensec.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZEROoneus.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZEROoneusec.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.argtest.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.argtest.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.basic.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.basic.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.func.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.mod.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilehz.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilehz.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilems.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilems.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilemsec.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilemsec.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilenhz.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilenhz.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilens.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilens.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilensec.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilensec.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profiles.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profiles.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilesec.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilesec.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profileus.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profileus.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profileusec.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profileusec.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.sym.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufunc.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufuncsort.c#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufuncsort.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufuncsort.ksh.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.umod.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.usym.ksh#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/err.D_PDESC_INVAL.wrongdec4.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/err.D_PDESC_ZERO.nonprofile.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/err.D_PDESC_ZERO.wrongdec1.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/err.D_PDESC_ZERO.wrongdec2.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/err.D_PDESC_ZERO.wrongdec3.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.basics.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.basics.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.beginexit.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.beginprof.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.beginprof.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probattrs.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probattrs.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probefunc.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probefunc.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probemod.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probemod.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probename.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probename.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probprov.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probprov.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.profend.d#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.profend.d.out#1 branch
.. //depot/projects/arm/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.profexit.d#1 branch

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Mon May  5 17:29:09 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8C989106567A; Mon,  5 May 2008 17:29:09 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4A9B9106566B
	for ; Mon,  5 May 2008 17:29:09 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 37A398FC1D
	for ; Mon,  5 May 2008 17:29:09 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m45HT9cE003714
	for ; Mon, 5 May 2008 17:29:09 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m45HT4Tt003712
	for perforce@freebsd.org; Mon, 5 May 2008 17:29:04 GMT
	(envelope-from imp@freebsd.org)
Date: Mon, 5 May 2008 17:29:04 GMT
Message-Id: <200805051729.m45HT4Tt003712@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 
Cc: 
Subject: PERFORCE change 141191 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Mon, 05 May 2008 17:29:09 -0000

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

Change 141191 by imp@imp_paco-paco on 2008/05/05 17:28:59

	IFC @141185

Affected files ...

.. //depot/projects/mips2/src/Makefile#10 integrate
.. //depot/projects/mips2/src/Makefile.inc1#18 integrate
.. //depot/projects/mips2/src/ObsoleteFiles.inc#18 integrate
.. //depot/projects/mips2/src/UPDATING#14 integrate
.. //depot/projects/mips2/src/bin/sh/arith.h#2 integrate
.. //depot/projects/mips2/src/bin/sh/arith.y#2 integrate
.. //depot/projects/mips2/src/bin/sh/expand.c#3 integrate
.. //depot/projects/mips2/src/bin/sh/shell.h#2 integrate
.. //depot/projects/mips2/src/cddl/compat/opensolaris/include/devid.h#2 integrate
.. //depot/projects/mips2/src/cddl/compat/opensolaris/include/libintl.h#2 integrate
.. //depot/projects/mips2/src/cddl/compat/opensolaris/include/mnttab.h#2 integrate
.. //depot/projects/mips2/src/cddl/compat/opensolaris/include/priv.h#2 integrate
.. //depot/projects/mips2/src/cddl/compat/opensolaris/include/solaris.h#2 integrate
.. //depot/projects/mips2/src/cddl/compat/opensolaris/include/zone.h#2 integrate
.. //depot/projects/mips2/src/cddl/compat/opensolaris/lib/libumem/umem.c#2 integrate
.. //depot/projects/mips2/src/cddl/compat/opensolaris/lib/libumem/umem.h#2 integrate
.. //depot/projects/mips2/src/cddl/compat/opensolaris/misc/mkdirp.c#2 integrate
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/README#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/baddof/baddof.c#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/badioctl/badioctl.c#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/chkargs.c#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/Getopt.java#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/JDTrace.java#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/exception.lst#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/jdtrace.c#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/manifest/jdtrace.jar-manifest#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dstyle.pl#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_FUNC.bad.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_MDIM.bad.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_NULL.bad.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_REDEF.redef.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.avgtoofew.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.maxnoarg.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.mintoofew.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.quantizetoofew.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.sumtoofew.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_CLEAR_AGGARG.bad.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_CLEAR_PROTO.bad.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_FUNC_IDENT.bad.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_FUNC_UNDEF.badaggfunc.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.badexpr.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.badkey3.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.noeffect.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey1.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey2.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey4.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASETYPE.lqbad1.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASETYPE.lqshort.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASEVAL.bad.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_LIMTYPE.lqbad1.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_LIMVAL.bad.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHBASE.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHBASE.order.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHLIM.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHLIM.order.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHSTEP.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MISMATCH.lqbadarg.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPLARGE.lqtoofew.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPSMALL.bad.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPTYPE.lqbadinc.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPVAL.bad.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_AGGARG.bad.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_PROTO.bad.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_SCALAR.bad.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_ARG.lquantizetoofew.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.avgnoarg.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.avgtoomany.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.counttoomany.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.lquantizenoarg.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.lquantizetoomany.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.maxnoarg.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.maxtoomany.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.minnoarg.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.mintoomany.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.quantizenoarg.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.quantizetoomany.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.sumnoarg.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.sumtoomany.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_AGGARG.bad.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_PROTO.badmany.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_PROTO.badnone.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_SCALAR.bad.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.allquant.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.allquant.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg_neg.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg_neg.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clear.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clear.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg2.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg2.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.cleardenormalize.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.cleardenormalize.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearlquantize.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearlquantize.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearnormalize.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearnormalize.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count2.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count2.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count3.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalize.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalize.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalizeonly.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalizeonly.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.fmtnormalize.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.fmtnormalize.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.forms.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.forms.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.goodkey.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.keysort.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.keysort.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantize.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantize.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantnormal.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantnormal.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantrange.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantrange.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantround.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantround.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantzero.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantzero.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max_neg.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max_neg.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min_neg.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min_neg.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs1.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs2.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs2.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs3.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs3.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multinormalize.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multinormalize.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.neglquant.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.neglquant.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negorder.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negorder.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negquant.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negquant.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtrunc.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtrunc.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtruncquant.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtruncquant.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.normalize.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.normalize.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.order.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.order.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantize.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantize.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantmany.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantmany.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantround.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantround.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantzero.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantzero.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signature.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeys.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeys.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeyspos.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeyspos.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.stddev.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.stddev.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.subr.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sum.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sum.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc0.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc0.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.truncquant.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.truncquant.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.valsortkeypos.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.valsortkeypos.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0_1.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0_2.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.modby0.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.addmin.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.divmin.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.muladd.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.muldiv.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.basics.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.complex.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_ARR_BADREF.bad.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRBIG.toobig.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRNULL.bad.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRSUB.bad.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_PROTO_TYPE.badtuple.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_IDENT_UNDEF.badureg.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic1.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic2.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic3.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic4.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic5.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic6.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.uregsarray.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupgtype.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupttype.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.this.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_ARG.badsig.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_LEN.toofew.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_LEN.toomany.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_SYNTAX.errassign.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.tupoflow.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.cpyarray.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.diffprofile.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.initialize.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.invalidref.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.misc.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.orthogonality.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.this.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.valassign.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/err.D_PDESC_ZERO.begin.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/err.D_PDESC_ZERO.tick.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.begin.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.begin.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.multibegin.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.multibegin.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_ADDROF_BITFIELD.BitfieldAddress.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFCONST.NegBitField.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFCONST.ZeroBitField.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFSIZE.ExceedBaseType.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFSIZE.GreaterThan64.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFTYPE.badtype.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_OFFSETOF_BITFIELD.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_SIZEOF_BITFIELD.SizeofBitfield.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/tst.BitFieldPromotion.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/tst.SizeofBitField.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.end.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize1.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize2.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize3.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.zerobuf.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.alignring.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.cputime.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.dynvarsize.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.fill1.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.fill1.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize1.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize2.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize3.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring1.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring2.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring2.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring3.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring3.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.smallring.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.switch1.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.switch1.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.cpuusage.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.nice.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.priority.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.prsize.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.rssize.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg0.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg0clause.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1to8.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1to8clause.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.caller.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.caller1.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.epid.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.epid1.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.errno.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.errno1.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.execname.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.hpriority.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.id.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.id1.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.ipl.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.ipl1.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.lwpsinfo.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.lwpsinfo1.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.pid.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.pid1.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo1.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.tid.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.tid1.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.timestamp.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.vtimestamp.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.aggfun.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.aggtup.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.arrtup.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.body.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.both.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.pred.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.nopred.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.pred.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.predfirst.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.predlast.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_LOCASSC.NonLocalAssoc.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_LONGINT.LongStruct.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PARMCLASS.BadStorageClass.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_NAME.VoidName.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_TYPE.Dyn.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_VARARGS.VarLenArgs.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_VOID.NonSoleVoid.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_SIGNINT.UnsignedStruct.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_VOIDATTR.ShortVoidDecl.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.arrays.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.basics.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.funcs.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.pointers.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.varargsfuncs.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/badptr.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/countdown.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/counter.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/errorpath.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/hello.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/kstat.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/ksyms.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/renormalize.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rtime.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rw.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rwinfo.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rwtime.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/specopen.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/truss.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/trussrw.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/userfunc.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_AGGREGATION.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_DBLERROR.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_DYNAMIC.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_PRINCIPAL.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_PRINCIPAL.end.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_SPEC.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_SPECUNAVAIL.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_STKSTROVERFLOW.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/err.D_PDESC_ZERO.InvalidDescription1.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.APIVersion.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.AddSearchPath.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.CoalesceTrace.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ELFGeneration.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.IncludedFilePath.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithFunctions#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithIDs#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithModules#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithNames#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithProviders#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ShowCompilerCode.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceFunctions#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceIDs#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceModule#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceNames#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceProvider#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.VerboseStabilityReport.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.AddSearchPath.d.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeGiga.d.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeKilo.d.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeMega.d.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeTera.d.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DataModel32.d.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DataModel64.d.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DefineNameWithCPP.d.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DefineNameWithCPP.d.ksh.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithFunction.d.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithFunction.d.ksh.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithID.d.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithID.d.ksh.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithModule.d.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithModule.d.ksh.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithName.d.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithName.d.ksh.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithProvider.d.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithProvider.d.ksh.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithoutW.d.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ELFGenerationOut.d.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ELFGenerationWithO.d.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExitStatus1.d.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExitStatus2.d.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExtraneousProbeIds.d.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidFuncName1.d.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidFuncName2.d.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId1.d.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId2.d.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId3.d.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule1.d.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule2.d.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule3.d.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule4.d.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProbeIdentifier.d.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider1.d.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider2.d.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider3.d.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider4.d.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc1.d.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc2.d.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc3.d.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc4.d.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc5.d.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc6.d.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc7.d.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc8.d.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc9.d.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID1.d.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID2.d.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID3.d.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID4.d.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID5.d.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID6.d.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID7.d.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule1.d.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule2.d.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule3.d.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule4.d.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule5.d.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule6.d.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule7.d.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule8.d.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName1.d.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName2.d.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName3.d.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName4.d.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName5.d.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName6.d.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName7.d.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName8.d.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName9.d.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider1.d.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider2.d.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider3.d.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider4.d.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider5.d.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.MultipleInvalidProbeId.d.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.PreprocessorStatement.d.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.QuietMode.d.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.QuietMode.d.ksh.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.TestCompile.d.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.TestCompile.d.ksh.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.UnDefineNameWithCPP.d.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroFunctionProbes.d.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroFunctionProbes.d.ksh.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroModuleProbes.d.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroModuleProbes.d.ksh.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroNameProbes.d.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroNameProbes.d.ksh.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProbeIdentfier.d.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProbesWithoutZ.d.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProviderProbes.d.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProviderProbes.d.ksh.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/err.D_IDENT_UNDEF.timespent.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.end.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.endwithoutbegin.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.multibeginend.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.multiend.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/err.D_DECL_IDRED.EnumSameName.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/err.D_UNKNOWN.RepeatIdentifiers.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumEquality.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumSameValue.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumValAssign.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_BADADDR.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_DIVZERO.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_UNKNOWN.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.error.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.errorend.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/err.D_PROTO_LEN.noarg.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/err.exitarg1.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/tst.basic1.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/err.D_PDESC_ZERO.notreturn.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.basic.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionentry.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionreturnvalue.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.ioctlargs.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offset.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offsetzero.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.return.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.return0.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.tailcall.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_FUNC_UNDEF.progenyofbad1.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_OP_VFPTR.badop.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.chillbadarg.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.copyoutbadarg.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.mobadarg.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.raisebadarg.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.allocanoarg.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.badbreakpoint.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.chilltoofew.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.chilltoomany.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyoutstrbadarg.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyoutstrtoofew.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyouttoofew.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyouttoomany.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.motoofew.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.motoomany.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtabadarg.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtatoofew.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtatoomany.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.panicbadarg.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.progenyofbad2.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.stopbadarg.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_STRINGOF_TYPE.badstringof.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_VAR_UNDEF.badvar.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badalloca.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badalloca2.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy1.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy2.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy3.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy4.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy5.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy6.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badchill.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.chillbadarg.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyout.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyoutbadaddr.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyoutstrbadaddr.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntoa6badaddr.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntoabadaddr.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntopbadaddr.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntopbadarg.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.badfreopen.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.basename.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.basename.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.bcopy.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.chill.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.cleanpath.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.cleanpath.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.copyin.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.copyinto.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.ddi_pathname.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.default.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.freopen.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.ftruncate.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.ftruncate.ksh.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.hton.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.index.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.index.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa6.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa6.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntop.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntop.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.lltostr.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.lltostr.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_owned.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_owner.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_type_adaptive.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.progenyof.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.rand.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strchr.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strchr.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strjoin.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strjoin.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strstr.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strstr.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strtok.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strtok.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strtok_null.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.substr.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.substr.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.substrminate.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.substrminate.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.system.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.system.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/grammar/err.D_ADDROF_LVAL.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/grammar/err.D_EMPTY.empty.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/grammar/tst.clauses.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/grammar/tst.stmts.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_DECL_IDRED.redef1.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_DECL_IDRED.redef2.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_IDENT_UNDEF.recur.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.baddef1.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.baddef2.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.badxlate.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineDataAssign.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineExpression.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineKinds.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineKinds.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineTypedef.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineWritableAssign.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.c#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/manifest/test.jar-manifest#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestAbort.java#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestBean.java#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestClose.java#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestDrop.java#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestEnable.java#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestFunctionLookup.java#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestMaxConsumers.java#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestMultiAggPrinta.java#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestProbeData.java#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestProbeDescription.java#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestStateMachine.java#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestStopLock.java#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Abort.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Abort.ksh.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Bean.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Bean.ksh.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Close.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Close.ksh.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Drop.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Drop.ksh.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Enable.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Enable.ksh.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.FunctionLookup.c#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.FunctionLookup.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.FunctionLookup.ksh.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.MaxConsumers.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.MaxConsumers.ksh.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.MultiAggPrinta.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.MultiAggPrinta.ksh.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeData.c#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeData.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeData.ksh.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeDescription.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeDescription.ksh.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.StateMachine.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.StateMachine.ksh.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.StopLock.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.StopLock.ksh.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.printa.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.printa.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_CHR_NL.char.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_CHR_NULL.char.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_INT_DIGIT.InvalidDigit.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_INT_OFLOW.BigInt.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_STR_NL.string.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brace1.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brace2.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brack1.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brack2.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brack3.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.paren1.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.paren2.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.paren3.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/tst.D_MACRO_OFLOW.ParIntOvflow.d.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/mdb/tst.dtracedcmd.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/mib/tst.icmp.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/mib/tst.tcp.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/mib/tst.udp.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/err.D_PRAGMA_OPTSET.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.badopt.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.boolopt.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.boolopt.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.dynopt.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.dynopt.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.enablerace.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.haslam.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.include.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.roch.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.schrock.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/err.D_PRINTA_AGGKEY.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/err.D_PRINTA_AGGPROTO.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.many.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.many.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.same.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.same.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.sort.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.sort.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.sortpos.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.sortpos.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.tuplecompat.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.tuplecompat.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero2.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero2.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero3.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero3.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/nfs/tst.call.c#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/nfs/tst.call.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/nfs/tst.call3.c#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/nfs/tst.call3.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_OFFSETOF_BITFIELD.bitfield.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_OFFSETOF_TYPE.badtype.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_OFFSETOF_TYPE.notsou.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_UNKNOWN.OffsetofNULL.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_UNKNOWN.badmemb.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.OffsetofAlias.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.OffsetofArith.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.OffsetofUnion.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.struct.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.struct.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.union.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.union.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/operators/tst.ternary.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/operators/tst.ternary.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PDESC_ZERO.badlib.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PDESC_ZERO.badproc1.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_BADPID.badproc2.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_CREATEFAIL.many.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_FUNC.badfunc.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_LIB.libdash.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.alldash.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.badname.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.globdash.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_OFF.toobig.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.addprobes.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.args1.c#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.args1.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.coverage.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.emptystack.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.emptystack.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.float.c#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.float.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.fork.c#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.fork.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.gcc.c#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.gcc.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.main.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.manypids.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.newprobes.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.newprobes.ksh.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.probemod.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex1.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex2.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex2.ksh.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex3.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex3.ksh.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex4.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex4.ksh.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret1.c#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret1.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret2.c#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret2.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.vfork.c#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.vfork.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak1.c#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak1.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak2.c#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak2.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.available.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.libmap.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.BadAlign.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_ADDROF_VAR.ArrayVar.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_ADDROF_VAR.DynamicVar.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_ADDROF_VAR.agg.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_DEREF_NONPTR.noptr.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_DEREF_VOID.VoidPointerDeref.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_ARRFUN.ArrayAssignment.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_INCOMPAT.VoidPointerArith.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_LVAL.AddressChange.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_PTR.NonPointerAccess.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_PTR.badpointer.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_SOU.BadPointerAccess.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_SOU.badpointer.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress1.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress2.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress3.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress4.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress5.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ArrayPointer1.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ArrayPointer2.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ArrayPointer3.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.GlobalVar.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.IntegerArithmetic1.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.PointerArithmetic1.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.PointerArithmetic2.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.PointerArithmetic3.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.PointerAssignment.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ValidPointer1.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ValidPointer2.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.VoidCast.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.basic1.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.basic2.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.D_PRAGERR.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.D_PRAGMA_DEPEND.main.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.D_PRAGMA_INVAL.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.D_PRAGMA_MALFORM.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.D_PRAGMA_UNUSED.UnusedPragma.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.circlibdep.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.invalidlibdep.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/tst.libchain.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/tst.libdep.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/tst.libdepfullyconnected.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/err.D_PRED_SCALAR.NonScalarPred.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/err.D_SYNTAX.invalid.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/err.D_SYNTAX.operr.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.argsnotcached.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.basics.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.basics.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.complex.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.complex.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.predcache.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.D_IDENT_UNDEF.afterprobe.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.D_PRAGCTL_INVAL.tabdefine.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.D_SYNTAX.withoutpound.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.defincomp.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.ifdefelsenotendif.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.ifdefincomp.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.ifdefnotendif.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.incompelse.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.mulelse.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifdef.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifdef.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifndef.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifndef.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifnotdef.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifnotdef.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicaland.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicaland.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicalandor.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicalandor.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicalor.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicalor.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.muland.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.muland.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.mulor.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.mulor.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.precondi.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.precondi.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.predicatedeclare.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexp.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexp.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpelse.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpelse.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpif.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpif.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpifelse.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpifelse.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.withinprobe.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTA_AGGARG.badagg.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTA_AGGARG.badfmt.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTA_AGGARG.badval.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTA_PROTO.bad.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTF_ARG_TYPE.jstack.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTF_ARG_TYPE.stack.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTF_ARG_TYPE.ustack.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.basics.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.basics.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.def.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.def.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.dynwidth.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.dynwidth.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.fmt.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.fmt.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.many.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.manyval.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.manyval.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.stack.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.tuple.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.tuple.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.walltimestamp.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.walltimestamp.ksh.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_AGG_CONV.aggfmt.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_EXTRA.toomany.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_EXTRA.widths.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_FMT.badfmt.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_PROTO.novalue.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_TYPE.aggarg.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_TYPE.recursive.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_DYN_PROTO.noprec.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_DYN_PROTO.nowidth.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_DYN_TYPE.badprec.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_DYN_TYPE.badwidth.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PROTO_LEN.toofew.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_SYNTAX.badconv1.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_SYNTAX.badconv2.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_SYNTAX.badconv3.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.basics.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.basics.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.flags.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.flags.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.hello.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.hello.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.ints.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.ints.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.precs.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.precs.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.print-f.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.print-f.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printT.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printT.ksh.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printY.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printY.ksh.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printcont.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printcont.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printeE.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printeE.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printgG.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printgG.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.rawfmt.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.rawfmt.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.str.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.str.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.sym.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.sym.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.uints.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.uints.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.widths.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.widths.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.widths1.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.wp.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.wp.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.func_access.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.op_access.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.unpriv_funcs.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_PDESC_ZERO.probeqtn.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_PDESC_ZERO.probestar.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_PDESC_ZERO.tickstar.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.assign.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.declare.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.declarein.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.lbraces.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.probespec.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.rbraces.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.recdec.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.basic1.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.check.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.declare.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.declareafter.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.emptyprobe.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.pragma.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.pragmaaftertab.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.pragmainside.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.pragmaoutside.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.probestar.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.create.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.discard.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exec.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.execfail.ENOENT.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.execfail.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitcore.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitexit.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitkilled.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.signal.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.sigwait.c#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.sigwait.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.startexit.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZERO.profile.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZEROonens.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZEROonensec.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZEROoneus.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZEROoneusec.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.argtest.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.argtest.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.basic.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.basic.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.func.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.mod.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilehz.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilehz.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilems.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilems.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilemsec.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilemsec.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilenhz.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilenhz.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilens.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilens.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilensec.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilensec.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profiles.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profiles.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilesec.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilesec.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profileus.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profileus.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profileusec.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profileusec.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.sym.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufunc.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufuncsort.c#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufuncsort.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufuncsort.ksh.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.umod.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.usym.ksh#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/err.D_PDESC_INVAL.wrongdec4.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/err.D_PDESC_ZERO.nonprofile.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/err.D_PDESC_ZERO.wrongdec1.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/err.D_PDESC_ZERO.wrongdec2.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/err.D_PDESC_ZERO.wrongdec3.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.basics.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.basics.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.beginexit.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.beginprof.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.beginprof.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probattrs.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probattrs.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probefunc.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probefunc.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probemod.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probemod.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probename.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probename.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probprov.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probprov.d.out#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.profend.d#1 branch
.. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.profend.d.out#1 branch

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Mon May  5 18:15:08 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D1DE41065678; Mon,  5 May 2008 18:15:07 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8F310106566C
	for ; Mon,  5 May 2008 18:15:07 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 7C5A38FC1C
	for ; Mon,  5 May 2008 18:15:07 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m45IF6uD006250
	for ; Mon, 5 May 2008 18:15:07 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m45IF3Cx006212
	for perforce@freebsd.org; Mon, 5 May 2008 18:15:03 GMT
	(envelope-from imp@freebsd.org)
Date: Mon, 5 May 2008 18:15:03 GMT
Message-Id: <200805051815.m45IF3Cx006212@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 
Cc: 
Subject: PERFORCE change 141192 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Mon, 05 May 2008 18:15:08 -0000

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

Change 141192 by imp@imp_paco-paco on 2008/05/05 18:14:47

	IF mips2 @141191

Affected files ...

.. //depot/projects/mips2-jnpr/src/Makefile#8 integrate
.. //depot/projects/mips2-jnpr/src/Makefile.inc1#10 integrate
.. //depot/projects/mips2-jnpr/src/ObsoleteFiles.inc#7 integrate
.. //depot/projects/mips2-jnpr/src/UPDATING#6 integrate
.. //depot/projects/mips2-jnpr/src/bin/sh/arith.h#2 integrate
.. //depot/projects/mips2-jnpr/src/bin/sh/arith.y#2 integrate
.. //depot/projects/mips2-jnpr/src/bin/sh/expand.c#2 integrate
.. //depot/projects/mips2-jnpr/src/bin/sh/shell.h#2 integrate
.. //depot/projects/mips2-jnpr/src/cddl/compat/opensolaris/include/devid.h#2 integrate
.. //depot/projects/mips2-jnpr/src/cddl/compat/opensolaris/include/libintl.h#2 integrate
.. //depot/projects/mips2-jnpr/src/cddl/compat/opensolaris/include/mnttab.h#2 integrate
.. //depot/projects/mips2-jnpr/src/cddl/compat/opensolaris/include/priv.h#2 integrate
.. //depot/projects/mips2-jnpr/src/cddl/compat/opensolaris/include/solaris.h#2 integrate
.. //depot/projects/mips2-jnpr/src/cddl/compat/opensolaris/include/zone.h#2 integrate
.. //depot/projects/mips2-jnpr/src/cddl/compat/opensolaris/lib/libumem/umem.c#2 integrate
.. //depot/projects/mips2-jnpr/src/cddl/compat/opensolaris/lib/libumem/umem.h#2 integrate
.. //depot/projects/mips2-jnpr/src/cddl/compat/opensolaris/misc/mkdirp.c#2 integrate
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/README#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/baddof/baddof.c#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/badioctl/badioctl.c#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/chkargs.c#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/Getopt.java#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/JDTrace.java#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/exception.lst#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/jdtrace.c#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/manifest/jdtrace.jar-manifest#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dstyle.pl#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_FUNC.bad.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_MDIM.bad.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_NULL.bad.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_REDEF.redef.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.avgtoofew.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.maxnoarg.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.mintoofew.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.quantizetoofew.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.sumtoofew.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_CLEAR_AGGARG.bad.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_CLEAR_PROTO.bad.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_FUNC_IDENT.bad.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_FUNC_UNDEF.badaggfunc.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.badexpr.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.badkey3.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.noeffect.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey1.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey2.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey4.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASETYPE.lqbad1.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASETYPE.lqshort.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASEVAL.bad.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_LIMTYPE.lqbad1.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_LIMVAL.bad.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHBASE.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHBASE.order.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHLIM.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHLIM.order.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHSTEP.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MISMATCH.lqbadarg.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPLARGE.lqtoofew.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPSMALL.bad.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPTYPE.lqbadinc.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPVAL.bad.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_AGGARG.bad.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_PROTO.bad.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_SCALAR.bad.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_ARG.lquantizetoofew.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.avgnoarg.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.avgtoomany.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.counttoomany.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.lquantizenoarg.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.lquantizetoomany.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.maxnoarg.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.maxtoomany.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.minnoarg.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.mintoomany.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.quantizenoarg.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.quantizetoomany.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.sumnoarg.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.sumtoomany.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_AGGARG.bad.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_PROTO.badmany.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_PROTO.badnone.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_SCALAR.bad.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.allquant.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.allquant.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg_neg.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg_neg.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clear.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clear.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg2.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg2.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.cleardenormalize.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.cleardenormalize.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearlquantize.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearlquantize.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearnormalize.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearnormalize.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count2.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count2.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count3.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalize.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalize.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalizeonly.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalizeonly.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.fmtnormalize.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.fmtnormalize.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.forms.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.forms.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.goodkey.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.keysort.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.keysort.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantize.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantize.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantnormal.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantnormal.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantrange.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantrange.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantround.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantround.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantzero.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantzero.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max_neg.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max_neg.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min_neg.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min_neg.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs1.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs2.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs2.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs3.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs3.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multinormalize.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multinormalize.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.neglquant.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.neglquant.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negorder.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negorder.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negquant.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negquant.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtrunc.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtrunc.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtruncquant.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtruncquant.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.normalize.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.normalize.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.order.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.order.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantize.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantize.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantmany.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantmany.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantround.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantround.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantzero.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantzero.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signature.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeys.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeys.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeyspos.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeyspos.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.stddev.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.stddev.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.subr.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sum.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sum.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc0.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc0.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.truncquant.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.truncquant.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.valsortkeypos.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.valsortkeypos.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0_1.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0_2.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.modby0.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.addmin.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.divmin.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.muladd.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.muldiv.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.basics.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.complex.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_ARR_BADREF.bad.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRBIG.toobig.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRNULL.bad.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRSUB.bad.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_PROTO_TYPE.badtuple.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_IDENT_UNDEF.badureg.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic1.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic2.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic3.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic4.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic5.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic6.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.uregsarray.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupgtype.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupttype.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.this.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_ARG.badsig.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_LEN.toofew.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_LEN.toomany.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_SYNTAX.errassign.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.tupoflow.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.cpyarray.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.diffprofile.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.initialize.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.invalidref.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.misc.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.orthogonality.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.this.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.valassign.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/err.D_PDESC_ZERO.begin.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/err.D_PDESC_ZERO.tick.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.begin.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.begin.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.multibegin.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.multibegin.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_ADDROF_BITFIELD.BitfieldAddress.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFCONST.NegBitField.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFCONST.ZeroBitField.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFSIZE.ExceedBaseType.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFSIZE.GreaterThan64.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFTYPE.badtype.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_OFFSETOF_BITFIELD.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_SIZEOF_BITFIELD.SizeofBitfield.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/tst.BitFieldPromotion.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/tst.SizeofBitField.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.end.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize1.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize2.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize3.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.zerobuf.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.alignring.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.cputime.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.dynvarsize.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.fill1.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.fill1.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize1.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize2.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize3.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring1.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring2.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring2.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring3.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring3.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.smallring.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.switch1.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.switch1.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.cpuusage.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.nice.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.priority.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.prsize.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.rssize.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg0.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg0clause.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1to8.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1to8clause.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.caller.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.caller1.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.epid.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.epid1.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.errno.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.errno1.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.execname.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.hpriority.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.id.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.id1.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.ipl.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.ipl1.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.lwpsinfo.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.lwpsinfo1.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.pid.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.pid1.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo1.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.tid.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.tid1.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.timestamp.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.vtimestamp.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.aggfun.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.aggtup.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.arrtup.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.body.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.both.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.pred.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.nopred.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.pred.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.predfirst.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.predlast.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_LOCASSC.NonLocalAssoc.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_LONGINT.LongStruct.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PARMCLASS.BadStorageClass.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_NAME.VoidName.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_TYPE.Dyn.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_VARARGS.VarLenArgs.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_VOID.NonSoleVoid.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_SIGNINT.UnsignedStruct.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_VOIDATTR.ShortVoidDecl.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.arrays.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.basics.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.funcs.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.pointers.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.varargsfuncs.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/badptr.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/countdown.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/counter.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/errorpath.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/hello.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/kstat.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/ksyms.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/renormalize.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rtime.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rw.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rwinfo.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rwtime.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/specopen.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/truss.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/trussrw.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/userfunc.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_AGGREGATION.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_DBLERROR.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_DYNAMIC.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_PRINCIPAL.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_PRINCIPAL.end.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_SPEC.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_SPECUNAVAIL.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_STKSTROVERFLOW.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/err.D_PDESC_ZERO.InvalidDescription1.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.APIVersion.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.AddSearchPath.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.CoalesceTrace.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ELFGeneration.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.IncludedFilePath.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithFunctions#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithIDs#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithModules#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithNames#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithProviders#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ShowCompilerCode.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceFunctions#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceIDs#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceModule#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceNames#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceProvider#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.VerboseStabilityReport.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.AddSearchPath.d.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeGiga.d.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeKilo.d.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeMega.d.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeTera.d.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DataModel32.d.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DataModel64.d.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DefineNameWithCPP.d.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DefineNameWithCPP.d.ksh.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithFunction.d.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithFunction.d.ksh.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithID.d.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithID.d.ksh.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithModule.d.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithModule.d.ksh.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithName.d.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithName.d.ksh.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithProvider.d.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithProvider.d.ksh.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithoutW.d.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ELFGenerationOut.d.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ELFGenerationWithO.d.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExitStatus1.d.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExitStatus2.d.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExtraneousProbeIds.d.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidFuncName1.d.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidFuncName2.d.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId1.d.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId2.d.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId3.d.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule1.d.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule2.d.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule3.d.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule4.d.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProbeIdentifier.d.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider1.d.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider2.d.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider3.d.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider4.d.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc1.d.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc2.d.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc3.d.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc4.d.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc5.d.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc6.d.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc7.d.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc8.d.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc9.d.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID1.d.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID2.d.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID3.d.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID4.d.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID5.d.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID6.d.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID7.d.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule1.d.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule2.d.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule3.d.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule4.d.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule5.d.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule6.d.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule7.d.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule8.d.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName1.d.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName2.d.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName3.d.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName4.d.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName5.d.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName6.d.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName7.d.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName8.d.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName9.d.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider1.d.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider2.d.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider3.d.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider4.d.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider5.d.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.MultipleInvalidProbeId.d.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.PreprocessorStatement.d.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.QuietMode.d.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.QuietMode.d.ksh.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.TestCompile.d.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.TestCompile.d.ksh.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.UnDefineNameWithCPP.d.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroFunctionProbes.d.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroFunctionProbes.d.ksh.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroModuleProbes.d.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroModuleProbes.d.ksh.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroNameProbes.d.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroNameProbes.d.ksh.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProbeIdentfier.d.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProbesWithoutZ.d.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProviderProbes.d.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProviderProbes.d.ksh.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/err.D_IDENT_UNDEF.timespent.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.end.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.endwithoutbegin.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.multibeginend.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.multiend.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/err.D_DECL_IDRED.EnumSameName.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/err.D_UNKNOWN.RepeatIdentifiers.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumEquality.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumSameValue.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumValAssign.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_BADADDR.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_DIVZERO.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_UNKNOWN.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.error.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.errorend.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/err.D_PROTO_LEN.noarg.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/err.exitarg1.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/tst.basic1.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/err.D_PDESC_ZERO.notreturn.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.basic.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionentry.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionreturnvalue.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.ioctlargs.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offset.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offsetzero.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.return.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.return0.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.tailcall.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_FUNC_UNDEF.progenyofbad1.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_OP_VFPTR.badop.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.chillbadarg.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.copyoutbadarg.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.mobadarg.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.raisebadarg.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.allocanoarg.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.badbreakpoint.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.chilltoofew.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.chilltoomany.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyoutstrbadarg.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyoutstrtoofew.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyouttoofew.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyouttoomany.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.motoofew.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.motoomany.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtabadarg.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtatoofew.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtatoomany.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.panicbadarg.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.progenyofbad2.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.stopbadarg.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_STRINGOF_TYPE.badstringof.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_VAR_UNDEF.badvar.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badalloca.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badalloca2.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy1.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy2.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy3.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy4.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy5.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy6.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badchill.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.chillbadarg.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyout.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyoutbadaddr.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyoutstrbadaddr.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntoa6badaddr.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntoabadaddr.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntopbadaddr.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntopbadarg.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.badfreopen.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.basename.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.basename.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.bcopy.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.chill.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.cleanpath.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.cleanpath.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.copyin.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.copyinto.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.ddi_pathname.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.default.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.freopen.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.ftruncate.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.ftruncate.ksh.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.hton.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.index.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.index.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa6.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa6.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntop.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntop.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.lltostr.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.lltostr.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_owned.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_owner.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_type_adaptive.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.progenyof.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.rand.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strchr.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strchr.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strjoin.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strjoin.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strstr.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strstr.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strtok.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strtok.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strtok_null.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.substr.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.substr.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.substrminate.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.substrminate.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.system.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.system.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/grammar/err.D_ADDROF_LVAL.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/grammar/err.D_EMPTY.empty.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/grammar/tst.clauses.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/grammar/tst.stmts.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_DECL_IDRED.redef1.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_DECL_IDRED.redef2.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_IDENT_UNDEF.recur.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.baddef1.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.baddef2.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.badxlate.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineDataAssign.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineExpression.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineKinds.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineKinds.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineTypedef.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineWritableAssign.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.c#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/manifest/test.jar-manifest#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestAbort.java#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestBean.java#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestClose.java#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestDrop.java#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestEnable.java#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestFunctionLookup.java#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestMaxConsumers.java#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestMultiAggPrinta.java#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestProbeData.java#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestProbeDescription.java#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestStateMachine.java#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestStopLock.java#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Abort.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Abort.ksh.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Bean.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Bean.ksh.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Close.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Close.ksh.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Drop.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Drop.ksh.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Enable.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Enable.ksh.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.FunctionLookup.c#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.FunctionLookup.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.FunctionLookup.ksh.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.MaxConsumers.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.MaxConsumers.ksh.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.MultiAggPrinta.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.MultiAggPrinta.ksh.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeData.c#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeData.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeData.ksh.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeDescription.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeDescription.ksh.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.StateMachine.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.StateMachine.ksh.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.StopLock.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.StopLock.ksh.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.printa.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.printa.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_CHR_NL.char.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_CHR_NULL.char.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_INT_DIGIT.InvalidDigit.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_INT_OFLOW.BigInt.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_STR_NL.string.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brace1.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brace2.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brack1.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brack2.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brack3.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.paren1.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.paren2.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.paren3.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/tst.D_MACRO_OFLOW.ParIntOvflow.d.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/mdb/tst.dtracedcmd.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/mib/tst.icmp.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/mib/tst.tcp.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/mib/tst.udp.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/err.D_PRAGMA_OPTSET.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.badopt.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.boolopt.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.boolopt.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.dynopt.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.dynopt.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.enablerace.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.haslam.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.include.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.roch.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.schrock.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/err.D_PRINTA_AGGKEY.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/err.D_PRINTA_AGGPROTO.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.many.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.many.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.same.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.same.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.sort.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.sort.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.sortpos.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.sortpos.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.tuplecompat.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.tuplecompat.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero2.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero2.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero3.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero3.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/nfs/tst.call.c#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/nfs/tst.call.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/nfs/tst.call3.c#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/nfs/tst.call3.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_OFFSETOF_BITFIELD.bitfield.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_OFFSETOF_TYPE.badtype.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_OFFSETOF_TYPE.notsou.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_UNKNOWN.OffsetofNULL.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_UNKNOWN.badmemb.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.OffsetofAlias.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.OffsetofArith.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.OffsetofUnion.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.struct.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.struct.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.union.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.union.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/operators/tst.ternary.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/operators/tst.ternary.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PDESC_ZERO.badlib.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PDESC_ZERO.badproc1.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_BADPID.badproc2.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_CREATEFAIL.many.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_FUNC.badfunc.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_LIB.libdash.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.alldash.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.badname.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.globdash.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_OFF.toobig.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.addprobes.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.args1.c#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.args1.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.coverage.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.emptystack.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.emptystack.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.float.c#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.float.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.fork.c#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.fork.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.gcc.c#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.gcc.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.main.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.manypids.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.newprobes.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.newprobes.ksh.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.probemod.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex1.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex2.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex2.ksh.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex3.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex3.ksh.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex4.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex4.ksh.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret1.c#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret1.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret2.c#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret2.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.vfork.c#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.vfork.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak1.c#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak1.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak2.c#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak2.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.available.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.libmap.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.BadAlign.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_ADDROF_VAR.ArrayVar.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_ADDROF_VAR.DynamicVar.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_ADDROF_VAR.agg.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_DEREF_NONPTR.noptr.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_DEREF_VOID.VoidPointerDeref.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_ARRFUN.ArrayAssignment.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_INCOMPAT.VoidPointerArith.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_LVAL.AddressChange.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_PTR.NonPointerAccess.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_PTR.badpointer.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_SOU.BadPointerAccess.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_SOU.badpointer.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress1.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress2.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress3.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress4.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress5.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ArrayPointer1.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ArrayPointer2.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ArrayPointer3.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.GlobalVar.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.IntegerArithmetic1.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.PointerArithmetic1.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.PointerArithmetic2.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.PointerArithmetic3.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.PointerAssignment.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ValidPointer1.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ValidPointer2.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.VoidCast.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.basic1.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.basic2.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.D_PRAGERR.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.D_PRAGMA_DEPEND.main.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.D_PRAGMA_INVAL.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.D_PRAGMA_MALFORM.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.D_PRAGMA_UNUSED.UnusedPragma.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.circlibdep.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.invalidlibdep.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/tst.libchain.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/tst.libdep.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/tst.libdepfullyconnected.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/err.D_PRED_SCALAR.NonScalarPred.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/err.D_SYNTAX.invalid.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/err.D_SYNTAX.operr.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.argsnotcached.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.basics.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.basics.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.complex.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.complex.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.predcache.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.D_IDENT_UNDEF.afterprobe.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.D_PRAGCTL_INVAL.tabdefine.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.D_SYNTAX.withoutpound.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.defincomp.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.ifdefelsenotendif.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.ifdefincomp.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.ifdefnotendif.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.incompelse.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.mulelse.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifdef.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifdef.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifndef.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifndef.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifnotdef.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifnotdef.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicaland.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicaland.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicalandor.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicalandor.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicalor.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicalor.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.muland.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.muland.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.mulor.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.mulor.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.precondi.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.precondi.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.predicatedeclare.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexp.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexp.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpelse.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpelse.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpif.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpif.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpifelse.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpifelse.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.withinprobe.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTA_AGGARG.badagg.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTA_AGGARG.badfmt.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTA_AGGARG.badval.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTA_PROTO.bad.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTF_ARG_TYPE.jstack.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTF_ARG_TYPE.stack.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTF_ARG_TYPE.ustack.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.basics.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.basics.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.def.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.def.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.dynwidth.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.dynwidth.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.fmt.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.fmt.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.many.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.manyval.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.manyval.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.stack.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.tuple.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.tuple.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.walltimestamp.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.walltimestamp.ksh.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_AGG_CONV.aggfmt.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_EXTRA.toomany.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_EXTRA.widths.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_FMT.badfmt.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_PROTO.novalue.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_TYPE.aggarg.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_TYPE.recursive.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_DYN_PROTO.noprec.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_DYN_PROTO.nowidth.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_DYN_TYPE.badprec.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_DYN_TYPE.badwidth.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PROTO_LEN.toofew.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_SYNTAX.badconv1.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_SYNTAX.badconv2.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_SYNTAX.badconv3.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.basics.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.basics.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.flags.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.flags.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.hello.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.hello.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.ints.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.ints.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.precs.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.precs.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.print-f.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.print-f.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printT.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printT.ksh.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printY.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printY.ksh.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printcont.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printcont.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printeE.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printeE.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printgG.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printgG.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.rawfmt.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.rawfmt.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.str.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.str.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.sym.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.sym.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.uints.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.uints.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.widths.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.widths.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.widths1.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.wp.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.wp.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.func_access.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.op_access.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.unpriv_funcs.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_PDESC_ZERO.probeqtn.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_PDESC_ZERO.probestar.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_PDESC_ZERO.tickstar.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.assign.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.declare.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.declarein.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.lbraces.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.probespec.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.rbraces.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.recdec.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.basic1.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.check.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.declare.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.declareafter.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.emptyprobe.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.pragma.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.pragmaaftertab.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.pragmainside.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.pragmaoutside.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.probestar.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.create.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.discard.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exec.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.execfail.ENOENT.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.execfail.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitcore.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitexit.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitkilled.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.signal.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.sigwait.c#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.sigwait.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.startexit.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZERO.profile.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZEROonens.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZEROonensec.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZEROoneus.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZEROoneusec.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.argtest.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.argtest.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.basic.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.basic.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.func.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.mod.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilehz.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilehz.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilems.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilems.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilemsec.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilemsec.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilenhz.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilenhz.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilens.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilens.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilensec.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilensec.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profiles.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profiles.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilesec.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilesec.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profileus.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profileus.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profileusec.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profileusec.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.sym.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufunc.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufuncsort.c#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufuncsort.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufuncsort.ksh.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.umod.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.usym.ksh#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/err.D_PDESC_INVAL.wrongdec4.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/err.D_PDESC_ZERO.nonprofile.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/err.D_PDESC_ZERO.wrongdec1.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/err.D_PDESC_ZERO.wrongdec2.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/err.D_PDESC_ZERO.wrongdec3.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.basics.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.basics.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.beginexit.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.beginprof.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.beginprof.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probattrs.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probattrs.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probefunc.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probefunc.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probemod.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probemod.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probename.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probename.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probprov.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probprov.d.out#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.profend.d#1 branch
.. //depot/projects/mips2-jnpr/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.profend.d.out#1 branch

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Mon May  5 18:33:35 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id F21B81065670; Mon,  5 May 2008 18:33:34 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B383A106564A
	for ; Mon,  5 May 2008 18:33:34 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id A2DFE8FC1C
	for ; Mon,  5 May 2008 18:33:34 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m45IXYO6006852
	for ; Mon, 5 May 2008 18:33:34 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m45IXY7E006850
	for perforce@freebsd.org; Mon, 5 May 2008 18:33:34 GMT
	(envelope-from imp@freebsd.org)
Date: Mon, 5 May 2008 18:33:34 GMT
Message-Id: <200805051833.m45IXY7E006850@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 
Cc: 
Subject: PERFORCE change 141194 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Mon, 05 May 2008 18:33:35 -0000

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

Change 141194 by imp@imp_paco-paco on 2008/05/05 18:32:44

	IFC @141192

Affected files ...

.. //depot/projects/arm/src/etc/rc.subr#13 integrate
.. //depot/projects/arm/src/gnu/usr.bin/sort/config.h#3 integrate
.. //depot/projects/arm/src/include/stdio.h#5 integrate
.. //depot/projects/arm/src/lib/libc/Versions.def#5 integrate
.. //depot/projects/arm/src/lib/libc/stdio/Symbol.map#5 integrate
.. //depot/projects/arm/src/lib/libc/stdio/clrerr.c#4 integrate
.. //depot/projects/arm/src/lib/libc/stdio/feof.c#4 integrate
.. //depot/projects/arm/src/lib/libc/stdio/ferror.c#4 integrate
.. //depot/projects/arm/src/lib/libc/stdio/fileno.c#4 integrate
.. //depot/projects/arm/src/lib/libc/stdio/getc.c#4 integrate
.. //depot/projects/arm/src/lib/libc/stdio/getchar.c#4 integrate
.. //depot/projects/arm/src/lib/libc/stdio/local.h#4 integrate
.. //depot/projects/arm/src/lib/libc/stdio/putc.c#4 integrate
.. //depot/projects/arm/src/lib/libc/stdio/putchar.c#4 integrate
.. //depot/projects/arm/src/lib/libc/stdio/stdio.c#4 integrate
.. //depot/projects/arm/src/lib/libc/stdio/xprintf.c#4 integrate

Differences ...

==== //depot/projects/arm/src/etc/rc.subr#13 (text+ko) ====

@@ -1,5 +1,5 @@
 # $NetBSD: rc.subr,v 1.67 2006/10/07 11:25:15 elad Exp $
-# $FreeBSD: src/etc/rc.subr,v 1.81 2008/05/05 07:43:48 mtm Exp $
+# $FreeBSD: src/etc/rc.subr,v 1.83 2008/05/05 15:52:54 maxim Exp $
 #
 # Copyright (c) 1997-2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -171,15 +171,15 @@
 {
 	local always
 
-        case $1 in
-                #       "yes", "true", "on", or "1"
+	case $1 in
+		#	"yes", "true", "on", or "1"
         [Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1)
 		always=true
 		;;
 	*)
 		always=false
 		;;
-	fi
+	esac
 	if [ "$autoboot" = yes -o "$always" = true ]; then
 		echo "ERROR: ABORTING BOOT (sending SIGTERM to parent)!"
 		kill -TERM ${RC_PID}

==== //depot/projects/arm/src/gnu/usr.bin/sort/config.h#3 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD: src/gnu/usr.bin/sort/config.h,v 1.9 2008/05/03 23:36:00 marcel Exp $ */
+/* $FreeBSD: src/gnu/usr.bin/sort/config.h,v 1.10 2008/05/05 16:12:28 jhb Exp $ */
 /* config.h.  Generated by configure.  */
 /* config.hin.  Generated from configure.ac by autoheader.  */
 
@@ -1240,7 +1240,7 @@
 #define PACKAGE_VERSION "5.3.0-20040812-FreeBSD"
 
 /* the number of pending output bytes on stream `fp' */
-#define PENDING_OUTPUT_N_BYTES __fgetpendout(fp)
+#define PENDING_OUTPUT_N_BYTES fp->_p - fp->_bf._base
 
 /* Define if  exists and defines unusable PRI* macros. */
 /* #undef PRI_MACROS_BROKEN */

==== //depot/projects/arm/src/include/stdio.h#5 (text+ko) ====

@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)stdio.h	8.5 (Berkeley) 4/29/95
- * $FreeBSD: src/include/stdio.h,v 1.69 2008/05/03 23:35:59 marcel Exp $
+ * $FreeBSD: src/include/stdio.h,v 1.72 2008/05/05 16:14:02 jhb Exp $
  */
 
 #ifndef	_STDIO_H_
@@ -60,8 +60,84 @@
 
 #define	_FSTDIO			/* Define for new stdio with functions. */
 
-struct __sFILE;
-typedef	struct __sFILE FILE;
+/*
+ * NB: to fit things in six character monocase externals, the stdio
+ * code uses the prefix `__s' for stdio objects, typically followed
+ * by a three-character attempt at a mnemonic.
+ */
+
+/* stdio buffers */
+struct __sbuf {
+	unsigned char *_base;
+	int	_size;
+};
+
+/*
+ * stdio state variables.
+ *
+ * The following always hold:
+ *
+ *	if (_flags&(__SLBF|__SWR)) == (__SLBF|__SWR),
+ *		_lbfsize is -_bf._size, else _lbfsize is 0
+ *	if _flags&__SRD, _w is 0
+ *	if _flags&__SWR, _r is 0
+ *
+ * This ensures that the getc and putc macros (or inline functions) never
+ * try to write or read from a file that is in `read' or `write' mode.
+ * (Moreover, they can, and do, automatically switch from read mode to
+ * write mode, and back, on "r+" and "w+" files.)
+ *
+ * _lbfsize is used only to make the inline line-buffered output stream
+ * code as compact as possible.
+ *
+ * _ub, _up, and _ur are used when ungetc() pushes back more characters
+ * than fit in the current _bf, or when ungetc() pushes back a character
+ * that does not match the previous one in _bf.  When this happens,
+ * _ub._base becomes non-nil (i.e., a stream has ungetc() data iff
+ * _ub._base!=NULL) and _up and _ur save the current values of _p and _r.
+ *
+ * Certain members of __sFILE are accessed directly via macros or
+ * inline functions.  To preserve ABI compat, these members must not
+ * be disturbed.  These members are marked below with (*).
+ */
+typedef	struct __sFILE {
+	unsigned char *_p;	/* (*) current position in (some) buffer */
+	int	_r;		/* (*) read space left for getc() */
+	int	_w;		/* (*) write space left for putc() */
+	short	_flags;		/* (*) flags, below; this FILE is free if 0 */
+	short	_file;		/* (*) fileno, if Unix descriptor, else -1 */
+	struct	__sbuf _bf;	/* the buffer (at least 1 byte, if !NULL) */
+	int	_lbfsize;	/* (*) 0 or -_bf._size, for inline putc */
+
+	/* operations */
+	void	*_cookie;	/* (*) cookie passed to io functions */
+	int	(*_close)(void *);
+	int	(*_read)(void *, char *, int);
+	fpos_t	(*_seek)(void *, fpos_t, int);
+	int	(*_write)(void *, const char *, int);
+
+	/* separate buffer for long sequences of ungetc() */
+	struct	__sbuf _ub;	/* ungetc buffer */
+	unsigned char	*_up;	/* saved _p when _p is doing ungetc data */
+	int	_ur;		/* saved _r when _r is counting ungetc data */
+
+	/* tricks to meet minimum requirements even when malloc() fails */
+	unsigned char _ubuf[3];	/* guarantee an ungetc() buffer */
+	unsigned char _nbuf[1];	/* guarantee a getc() buffer */
+
+	/* separate buffer for fgetln() when line crosses buffer boundary */
+	struct	__sbuf _lb;	/* buffer for fgetln() */
+
+	/* Unix stdio files get aligned to block boundaries on fseek() */
+	int	_blksize;	/* stat.st_blksize (may be != _bf._size) */
+	fpos_t	_offset;	/* current lseek offset */
+
+	struct pthread_mutex *_fl_mutex;	/* used for MT-safety */
+	struct pthread *_fl_owner;	/* current owner */
+	int	_fl_count;	/* recursive lock count */
+	int	_orientation;	/* orientation for fwide() */
+	__mbstate_t _mbstate;	/* multibyte conversion state */
+} FILE;
 
 #ifndef _STDSTREAM_DECLARED
 __BEGIN_DECLS
@@ -72,11 +148,32 @@
 #define	_STDSTREAM_DECLARED
 #endif
 
+#define	__SLBF	0x0001		/* line buffered */
+#define	__SNBF	0x0002		/* unbuffered */
+#define	__SRD	0x0004		/* OK to read */
+#define	__SWR	0x0008		/* OK to write */
+	/* RD and WR are never simultaneously asserted */
+#define	__SRW	0x0010		/* open for reading & writing */
+#define	__SEOF	0x0020		/* found EOF */
+#define	__SERR	0x0040		/* found error */
+#define	__SMBF	0x0080		/* _buf is from malloc */
+#define	__SAPP	0x0100		/* fdopen()ed in append mode */
+#define	__SSTR	0x0200		/* this is an sprintf/snprintf string */
+#define	__SOPT	0x0400		/* do fseek() optimization */
+#define	__SNPT	0x0800		/* do not do fseek() optimization */
+#define	__SOFF	0x1000		/* set iff _offset is in fact correct */
+#define	__SMOD	0x2000		/* true => fgetln modified _p text */
+#define	__SALC	0x4000		/* allocate string space dynamically */
+#define	__SIGN	0x8000		/* ignore this file in _fwalk */
+
 /*
  * The following three definitions are for ANSI C, which took them
  * from System V, which brilliantly took internal interface macros and
  * made them official arguments to setvbuf(), without renaming them.
  * Hence, these ugly _IOxxx names are *supposed* to appear in user code.
+ *
+ * Although numbered as their counterparts above, the implementation
+ * does not rely on this.
  */
 #define	_IOFBF	0		/* setvbuf should set fully buffered */
 #define	_IOLBF	1		/* setvbuf should set line buffered */
@@ -204,8 +301,8 @@
 void	 funlockfile(FILE *);
 
 /*
- * See ISO/IEC 9945-1 ANSI/IEEE Std 1003.1 Second Edition 1996-07-12
- * B.8.2.7 for the rationale behind the *_unlocked() functions.
+ * These are normally used through macros as defined below, but POSIX
+ * requires functions as well.
  */
 int	 getc_unlocked(FILE *);
 int	 getchar_unlocked(void);
@@ -249,12 +346,6 @@
 int	 vasprintf(char **, const char *, __va_list)
 	    __printflike(2, 0);
 
-/* XXX used by libftpio */
-void	*__fgetcookie(FILE *);
-void	__fsetfileno(FILE *, int);
-/* XXX used by sort */
-size_t	__fgetpendout(FILE *);
-
 /*
  * The system error table contains messages for the first sys_nerr
  * positive errno values.  Use strerror() or strerror_r() from 
@@ -295,5 +386,76 @@
 #endif
 #endif /* __BSD_VISIBLE */
 
+/*
+ * Functions internal to the implementation.
+ */
+int	__srget(FILE *);
+int	__swbuf(int, FILE *);
+
+/*
+ * The __sfoo macros are here so that we can
+ * define function versions in the C library.
+ */
+#define	__sgetc(p) (--(p)->_r < 0 ? __srget(p) : (int)(*(p)->_p++))
+#if defined(__GNUC__) && defined(__STDC__)
+static __inline int __sputc(int _c, FILE *_p) {
+	if (--_p->_w >= 0 || (_p->_w >= _p->_lbfsize && (char)_c != '\n'))
+		return (*_p->_p++ = _c);
+	else
+		return (__swbuf(_c, _p));
+}
+#else
+/*
+ * This has been tuned to generate reasonable code on the vax using pcc.
+ */
+#define	__sputc(c, p) \
+	(--(p)->_w < 0 ? \
+		(p)->_w >= (p)->_lbfsize ? \
+			(*(p)->_p = (c)), *(p)->_p != '\n' ? \
+				(int)*(p)->_p++ : \
+				__swbuf('\n', p) : \
+			__swbuf((int)(c), p) : \
+		(*(p)->_p = (c), (int)*(p)->_p++))
+#endif
+
+#define	__sfeof(p)	(((p)->_flags & __SEOF) != 0)
+#define	__sferror(p)	(((p)->_flags & __SERR) != 0)
+#define	__sclearerr(p)	((void)((p)->_flags &= ~(__SERR|__SEOF)))
+#define	__sfileno(p)	((p)->_file)
+
+extern int __isthreaded;
+
+#define	feof(p)		(!__isthreaded ? __sfeof(p) : (feof)(p))
+#define	ferror(p)	(!__isthreaded ? __sferror(p) : (ferror)(p))
+#define	clearerr(p)	(!__isthreaded ? __sclearerr(p) : (clearerr)(p))
+
+#if __POSIX_VISIBLE
+#define	fileno(p)	(!__isthreaded ? __sfileno(p) : (fileno)(p))
+#endif
+
+#define	getc(fp)	(!__isthreaded ? __sgetc(fp) : (getc)(fp))
+#define	putc(x, fp)	(!__isthreaded ? __sputc(x, fp) : (putc)(x, fp))
+
+#define	getchar()	getc(stdin)
+#define	putchar(x)	putc(x, stdout)
+
+#if __BSD_VISIBLE
+/*
+ * See ISO/IEC 9945-1 ANSI/IEEE Std 1003.1 Second Edition 1996-07-12
+ * B.8.2.7 for the rationale behind the *_unlocked() macros.
+ */
+#define	feof_unlocked(p)	__sfeof(p)
+#define	ferror_unlocked(p)	__sferror(p)
+#define	clearerr_unlocked(p)	__sclearerr(p)
+#define	fileno_unlocked(p)	__sfileno(p)
+#endif
+#if __POSIX_VISIBLE >= 199506
+#define	getc_unlocked(fp)	__sgetc(fp)
+#define	putc_unlocked(x, fp)	__sputc(x, fp)
+
+#define	getchar_unlocked()	getc_unlocked(stdin)
+#define	putchar_unlocked(x)	putc_unlocked(x, stdout)
+#endif
+
 __END_DECLS
 #endif /* !_STDIO_H_ */

==== //depot/projects/arm/src/lib/libc/Versions.def#5 (text) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libc/Versions.def,v 1.5 2008/05/04 04:11:00 marcel Exp $
+# $FreeBSD: src/lib/libc/Versions.def,v 1.6 2008/05/05 16:14:02 jhb Exp $
 
 # This is our first version; it depends on no other.
 # This version was first added to 7.0-current.
@@ -15,6 +15,3 @@
 # simple ABI-checking tools.
 FBSDprivate_1.0 {
 } FBSD_1.0;
-
-FBSDprivate_1.1 {
-} FBSD_1.1;

==== //depot/projects/arm/src/lib/libc/stdio/Symbol.map#5 (text) ====

@@ -1,5 +1,5 @@
 /*
- * $FreeBSD: src/lib/libc/stdio/Symbol.map,v 1.7 2008/05/04 04:11:01 marcel Exp $
+ * $FreeBSD: src/lib/libc/stdio/Symbol.map,v 1.8 2008/05/05 16:14:02 jhb Exp $
  */
 
 FBSD_1.0 {
@@ -149,9 +149,3 @@
 	__printf_arginfo_vis;
 	__printf_render_vis;
 };
-
-FBSDprivate_1.1 {
-	__fgetcookie;
-	__fgetpendout;
-	__fsetfileno;
-};

==== //depot/projects/arm/src/lib/libc/stdio/clrerr.c#4 (text+ko) ====

@@ -34,15 +34,15 @@
 static char sccsid[] = "@(#)clrerr.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include 
-__FBSDID("$FreeBSD: src/lib/libc/stdio/clrerr.c,v 1.11 2008/05/02 15:25:07 jhb Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/clrerr.c,v 1.12 2008/05/05 16:03:52 jhb Exp $");
 
 #include "namespace.h"
 #include 
 #include "un-namespace.h"
-#include "local.h"
 #include "libc_private.h"
 
-#define	__sclearerr(p)	((void)((p)->_flags &= ~(__SERR|__SEOF)))
+#undef clearerr
+#undef clearerr_unlocked
 
 void
 clearerr(fp)

==== //depot/projects/arm/src/lib/libc/stdio/feof.c#4 (text+ko) ====

@@ -34,15 +34,15 @@
 static char sccsid[] = "@(#)feof.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include 
-__FBSDID("$FreeBSD: src/lib/libc/stdio/feof.c,v 1.11 2008/05/02 15:25:07 jhb Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/feof.c,v 1.12 2008/05/05 16:03:52 jhb Exp $");
 
 #include "namespace.h"
 #include 
 #include "un-namespace.h"
-#include "local.h"
 #include "libc_private.h"
 
-#define	__sfeof(p)	(((p)->_flags & __SEOF) != 0)
+#undef feof
+#undef feof_unlocked
 
 int
 feof(FILE *fp)

==== //depot/projects/arm/src/lib/libc/stdio/ferror.c#4 (text+ko) ====

@@ -34,14 +34,16 @@
 static char sccsid[] = "@(#)ferror.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include 
-__FBSDID("$FreeBSD: src/lib/libc/stdio/ferror.c,v 1.11 2008/05/02 15:25:07 jhb Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/ferror.c,v 1.12 2008/05/05 16:03:52 jhb Exp $");
 
 #include "namespace.h"
 #include 
 #include "un-namespace.h"
-#include "local.h"
 #include "libc_private.h"
 
+#undef ferror
+#undef ferror_unlocked
+
 int
 ferror(FILE *fp)
 {

==== //depot/projects/arm/src/lib/libc/stdio/fileno.c#4 (text+ko) ====

@@ -34,15 +34,15 @@
 static char sccsid[] = "@(#)fileno.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include 
-__FBSDID("$FreeBSD: src/lib/libc/stdio/fileno.c,v 1.12 2008/05/02 15:25:07 jhb Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/fileno.c,v 1.13 2008/05/05 16:03:52 jhb Exp $");
 
 #include "namespace.h"
 #include 
 #include "un-namespace.h"
-#include "local.h"
 #include "libc_private.h"
 
-#define	__sfileno(p)	((p)->_file)
+#undef fileno
+#undef fileno_unlocked
 
 int
 fileno(FILE *fp)

==== //depot/projects/arm/src/lib/libc/stdio/getc.c#4 (text+ko) ====

@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)getc.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include 
-__FBSDID("$FreeBSD: src/lib/libc/stdio/getc.c,v 1.15 2008/05/02 15:25:07 jhb Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/getc.c,v 1.16 2008/05/05 16:03:52 jhb Exp $");
 
 #include "namespace.h"
 #include 
@@ -42,6 +42,9 @@
 #include "libc_private.h"
 #include "local.h"
 
+#undef getc
+#undef getc_unlocked
+
 int
 getc(FILE *fp)
 {

==== //depot/projects/arm/src/lib/libc/stdio/getchar.c#4 (text+ko) ====

@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)getchar.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include 
-__FBSDID("$FreeBSD: src/lib/libc/stdio/getchar.c,v 1.14 2008/05/02 15:25:07 jhb Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/getchar.c,v 1.15 2008/05/05 16:03:52 jhb Exp $");
 
 /*
  * A subroutine version of the macro getchar.
@@ -45,6 +45,9 @@
 #include "local.h"
 #include "libc_private.h"
 
+#undef getchar
+#undef getchar_unlocked
+
 int
 getchar()
 {

==== //depot/projects/arm/src/lib/libc/stdio/local.h#4 (text+ko) ====

@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)local.h	8.3 (Berkeley) 7/3/94
- * $FreeBSD: src/lib/libc/stdio/local.h,v 1.32 2008/05/02 15:25:07 jhb Exp $
+ * $FreeBSD: src/lib/libc/stdio/local.h,v 1.33 2008/05/05 16:03:52 jhb Exp $
  */
 
 #include 	/* for off_t */
@@ -39,105 +39,9 @@
 #include 
 
 /*
- * Information local to this implementation of stdio, in particular,
- * macros, private functions, private variables, and the definition of
- * FILE.
- *
- * NB: to fit things in six character monocase externals, the stdio
- * code uses the prefix `__s' for stdio objects, typically followed
- * by a three-character attempt at a mnemonic.
- */
-
-/* stdio buffers */
-struct __sbuf {
-	unsigned char *_base;
-	int	_size;
-};
-
-/*
- * stdio state variables.
- *
- * The following always hold:
- *
- *	if (_flags&(__SLBF|__SWR)) == (__SLBF|__SWR),
- *		_lbfsize is -_bf._size, else _lbfsize is 0
- *	if _flags&__SRD, _w is 0
- *	if _flags&__SWR, _r is 0
- *
- * This ensures that the getc and putc macros (or inline functions) never
- * try to write or read from a file that is in `read' or `write' mode.
- * (Moreover, they can, and do, automatically switch from read mode to
- * write mode, and back, on "r+" and "w+" files.)
- *
- * _lbfsize is used only to make the inline line-buffered output stream
- * code as compact as possible.
- *
- * _ub, _up, and _ur are used when ungetc() pushes back more characters
- * than fit in the current _bf, or when ungetc() pushes back a character
- * that does not match the previous one in _bf.  When this happens,
- * _ub._base becomes non-nil (i.e., a stream has ungetc() data iff
- * _ub._base!=NULL) and _up and _ur save the current values of _p and _r.
- *
- * Certain members of __sFILE are accessed directly via macros or
- * inline functions.  To preserve ABI compat, these members must not
- * be disturbed.  These members are marked below with (*).
+ * Information local to this implementation of stdio,
+ * in particular, macros and private variables.
  */
-struct __sFILE {
-	unsigned char *_p;	/* (*) current position in (some) buffer */
-	int	_r;		/* (*) read space left for getc() */
-	int	_w;		/* (*) write space left for putc() */
-	short	_flags;		/* (*) flags, below; this FILE is free if 0 */
-	short	_file;		/* (*) fileno, if Unix descriptor, else -1 */
-	struct	__sbuf _bf;	/* the buffer (at least 1 byte, if !NULL) */
-	int	_lbfsize;	/* (*) 0 or -_bf._size, for inline putc */
-
-	/* operations */
-	void	*_cookie;	/* cookie passed to io functions */
-	int	(*_close)(void *);
-	int	(*_read)(void *, char *, int);
-	fpos_t	(*_seek)(void *, fpos_t, int);
-	int	(*_write)(void *, const char *, int);
-
-	/* separate buffer for long sequences of ungetc() */
-	struct	__sbuf _ub;	/* ungetc buffer */
-	unsigned char	*_up;	/* saved _p when _p is doing ungetc data */
-	int	_ur;		/* saved _r when _r is counting ungetc data */
-
-	/* tricks to meet minimum requirements even when malloc() fails */
-	unsigned char _ubuf[3];	/* guarantee an ungetc() buffer */
-	unsigned char _nbuf[1];	/* guarantee a getc() buffer */
-
-	/* separate buffer for fgetln() when line crosses buffer boundary */
-	struct	__sbuf _lb;	/* buffer for fgetln() */
-
-	/* Unix stdio files get aligned to block boundaries on fseek() */
-	int	_blksize;	/* stat.st_blksize (may be != _bf._size) */
-	fpos_t	_offset;	/* current lseek offset */
-
-	pthread_mutex_t _fl_mutex;	/* used for MT-safety */
-	pthread_t _fl_owner;	/* current owner */
-	int	_fl_count;	/* recursive lock count */
-	int	_orientation;	/* orientation for fwide() */
-	mbstate_t _mbstate;	/* multibyte conversion state */
-};
-
-#define	__SLBF	0x0001		/* line buffered */
-#define	__SNBF	0x0002		/* unbuffered */
-#define	__SRD	0x0004		/* OK to read */
-#define	__SWR	0x0008		/* OK to write */
-	/* RD and WR are never simultaneously asserted */
-#define	__SRW	0x0010		/* open for reading & writing */
-#define	__SEOF	0x0020		/* found EOF */
-#define	__SERR	0x0040		/* found error */
-#define	__SMBF	0x0080		/* _buf is from malloc */
-#define	__SAPP	0x0100		/* fdopen()ed in append mode */
-#define	__SSTR	0x0200		/* this is an sprintf/snprintf string */
-#define	__SOPT	0x0400		/* do fseek() optimization */
-#define	__SNPT	0x0800		/* do not do fseek() optimization */
-#define	__SOFF	0x1000		/* set iff _offset is in fact correct */
-#define	__SMOD	0x2000		/* true => fgetln modified _p text */
-#define	__SALC	0x4000		/* allocate string space dynamically */
-#define	__SIGN	0x8000		/* ignore this file in _fwalk */
 
 extern int	_sread(FILE *, char *, int);
 extern int	_swrite(FILE *, char const *, int);
@@ -153,8 +57,6 @@
 extern int	__slbexpand(FILE *, size_t);
 extern int	__srefill(FILE *);
 extern int	__sread(void *, char *, int);
-extern int	__srget(FILE *);
-extern int	__swbuf(int, FILE *);
 extern int	__swrite(void *, char const *, int);
 extern fpos_t	__sseek(void *, fpos_t, int);
 extern int	__sclose(void *);
@@ -179,38 +81,6 @@
 
 
 /*
- * Get and store individual characters from a file stream.
- */
-#define	__sgetc(p) (--(p)->_r < 0 ? __srget(p) : (int)(*(p)->_p++))
-#if defined(__GNUC__) && defined(__STDC__)
-static __inline int
-__sputc(int _c, FILE *_p)
-{
-	if (--_p->_w >= 0 || (_p->_w >= _p->_lbfsize && (char)_c != '\n'))
-		return (*_p->_p++ = _c);
-	else
-		return (__swbuf(_c, _p));
-}
-#else
-/*
- * This has been tuned to generate reasonable code on the vax using pcc.
- */
-#define	__sputc(c, p) \
-	(--(p)->_w < 0 ? \
-		(p)->_w >= (p)->_lbfsize ? \
-			(*(p)->_p = (c)), *(p)->_p != '\n' ? \
-				(int)*(p)->_p++ : \
-				__swbuf('\n', p) : \
-			__swbuf((int)(c), p) : \
-		(*(p)->_p = (c), (int)*(p)->_p++))
-#endif
-
-/*
- * Return true if the file stream has encountered an error.
- */
-#define	__sferror(p)	(((p)->_flags & __SERR) != 0)
-
-/*
  * Prepare the given FILE for writing, and return 0 iff it
  * can be written now.  Otherwise, return EOF and set errno.
  */

==== //depot/projects/arm/src/lib/libc/stdio/putc.c#4 (text+ko) ====

@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)putc.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include 
-__FBSDID("$FreeBSD: src/lib/libc/stdio/putc.c,v 1.15 2008/05/02 15:25:07 jhb Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/putc.c,v 1.16 2008/05/05 16:03:52 jhb Exp $");
 
 #include "namespace.h"
 #include 
@@ -42,6 +42,9 @@
 #include "local.h"
 #include "libc_private.h"
 
+#undef putc
+#undef putc_unlocked
+
 int
 putc(c, fp)
 	int c;

==== //depot/projects/arm/src/lib/libc/stdio/putchar.c#4 (text+ko) ====

@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)putchar.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include 
-__FBSDID("$FreeBSD: src/lib/libc/stdio/putchar.c,v 1.15 2008/05/02 15:25:07 jhb Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/putchar.c,v 1.16 2008/05/05 16:03:52 jhb Exp $");
 
 #include "namespace.h"
 #include 
@@ -42,6 +42,9 @@
 #include "local.h"
 #include "libc_private.h"
 
+#undef putchar
+#undef putchar_unlocked
+
 /*
  * A subroutine version of the macro putchar
  */

==== //depot/projects/arm/src/lib/libc/stdio/stdio.c#4 (text+ko) ====

@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)stdio.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include 
-__FBSDID("$FreeBSD: src/lib/libc/stdio/stdio.c,v 1.27 2008/05/03 23:35:59 marcel Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/stdio.c,v 1.28 2008/05/05 16:14:02 jhb Exp $");
 
 #include "namespace.h"
 #include 
@@ -46,27 +46,6 @@
 #include "un-namespace.h"
 #include "local.h"
 
-void *
-__fgetcookie(FILE *fp)
-{
-
-	return (fp->_cookie);
-}
-
-size_t
-__fgetpendout(FILE *fp)
-{
-
-	return (fp->_p - fp->_bf._base);
-}
-
-void
-__fsetfileno(FILE *fp, int fd)
-{
-
-	fp->_file = fd;
-}
-
 /*
  * Small standard I/O/seek/close functions.
  */

==== //depot/projects/arm/src/lib/libc/stdio/xprintf.c#4 (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/libc/stdio/xprintf.c,v 1.7 2008/05/02 15:25:07 jhb Exp $
+ * $FreeBSD: src/lib/libc/stdio/xprintf.c,v 1.8 2008/05/05 16:03:52 jhb Exp $
  */
 
 #include "namespace.h"
@@ -47,7 +47,6 @@
 #include 
 #include 
 #include "un-namespace.h"
-#include "local.h"
 
 #include "printf.h"
 #include "fvwrite.h"

From owner-p4-projects@FreeBSD.ORG  Mon May  5 18:38:40 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 44D981065674; Mon,  5 May 2008 18:38:40 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 05216106566B
	for ; Mon,  5 May 2008 18:38:40 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id E7F978FC14
	for ; Mon,  5 May 2008 18:38:39 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m45IcdoX007141
	for ; Mon, 5 May 2008 18:38:39 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m45IcdjZ007139
	for perforce@freebsd.org; Mon, 5 May 2008 18:38:39 GMT
	(envelope-from imp@freebsd.org)
Date: Mon, 5 May 2008 18:38:39 GMT
Message-Id: <200805051838.m45IcdjZ007139@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 
Cc: 
Subject: PERFORCE change 141195 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Mon, 05 May 2008 18:38:40 -0000

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

Change 141195 by imp@imp_paco-paco on 2008/05/05 18:38:12

	IFC @141192

Affected files ...

.. //depot/projects/mips2/src/etc/etc.mips/ttys#2 integrate
.. //depot/projects/mips2/src/etc/rc.subr#8 integrate
.. //depot/projects/mips2/src/gnu/usr.bin/gdb/arch/mips/Makefile#2 integrate
.. //depot/projects/mips2/src/gnu/usr.bin/gdb/arch/mips/config.h#2 integrate
.. //depot/projects/mips2/src/gnu/usr.bin/gdb/arch/mips/init.c#2 integrate
.. //depot/projects/mips2/src/gnu/usr.bin/sort/config.h#3 integrate
.. //depot/projects/mips2/src/include/stdio.h#5 integrate
.. //depot/projects/mips2/src/lib/csu/mips/Makefile#2 integrate
.. //depot/projects/mips2/src/lib/csu/mips/crt1.c#7 integrate
.. //depot/projects/mips2/src/lib/csu/mips/crti.S#4 integrate
.. //depot/projects/mips2/src/lib/csu/mips/crtn.S#2 integrate
.. //depot/projects/mips2/src/lib/libc/Versions.def#5 integrate
.. //depot/projects/mips2/src/lib/libc/mips/Makefile.inc#4 integrate
.. //depot/projects/mips2/src/lib/libc/mips/SYS.h#5 integrate
.. //depot/projects/mips2/src/lib/libc/mips/Symbol.map#4 integrate
.. //depot/projects/mips2/src/lib/libc/mips/_fpmath.h#2 integrate
.. //depot/projects/mips2/src/lib/libc/mips/arith.h#2 integrate
.. //depot/projects/mips2/src/lib/libc/mips/gd_qnan.h#2 integrate
.. //depot/projects/mips2/src/lib/libc/mips/gdtoa/Makefile.inc#2 integrate
.. //depot/projects/mips2/src/lib/libc/mips/gdtoa/arith.h#2 integrate
.. //depot/projects/mips2/src/lib/libc/mips/gen/Makefile.inc#4 integrate
.. //depot/projects/mips2/src/lib/libc/mips/gen/_set_tp.c#2 integrate
.. //depot/projects/mips2/src/lib/libc/mips/gen/_setjmp.S#5 integrate
.. //depot/projects/mips2/src/lib/libc/mips/gen/fabs.S#3 integrate
.. //depot/projects/mips2/src/lib/libc/mips/gen/flt_rounds.c#2 integrate
.. //depot/projects/mips2/src/lib/libc/mips/gen/fpgetmask.c#3 integrate
.. //depot/projects/mips2/src/lib/libc/mips/gen/fpgetround.c#3 integrate
.. //depot/projects/mips2/src/lib/libc/mips/gen/fpgetsticky.c#3 integrate
.. //depot/projects/mips2/src/lib/libc/mips/gen/fpsetmask.c#3 integrate
.. //depot/projects/mips2/src/lib/libc/mips/gen/fpsetround.c#3 integrate
.. //depot/projects/mips2/src/lib/libc/mips/gen/fpsetsticky.c#2 integrate
.. //depot/projects/mips2/src/lib/libc/mips/gen/infinity.c#2 integrate
.. //depot/projects/mips2/src/lib/libc/mips/gen/ldexp.S#3 integrate
.. //depot/projects/mips2/src/lib/libc/mips/gen/longjmp.c#3 integrate
.. //depot/projects/mips2/src/lib/libc/mips/gen/makecontext.c#3 integrate
.. //depot/projects/mips2/src/lib/libc/mips/gen/modf.S#3 integrate
.. //depot/projects/mips2/src/lib/libc/mips/gen/setjmp.S#4 integrate
.. //depot/projects/mips2/src/lib/libc/mips/gen/signalcontext.c#3 integrate
.. //depot/projects/mips2/src/lib/libc/mips/gen/sigsetjmp.S#4 integrate
.. //depot/projects/mips2/src/lib/libc/mips/net/Makefile.inc#3 integrate
.. //depot/projects/mips2/src/lib/libc/mips/net/htonl.S#3 integrate
.. //depot/projects/mips2/src/lib/libc/mips/net/htons.S#3 integrate
.. //depot/projects/mips2/src/lib/libc/mips/net/ntohl.S#3 integrate
.. //depot/projects/mips2/src/lib/libc/mips/net/ntohs.S#3 integrate
.. //depot/projects/mips2/src/lib/libc/mips/softfloat/milieu.h#2 integrate
.. //depot/projects/mips2/src/lib/libc/mips/softfloat/mips-gcc.h#2 integrate
.. //depot/projects/mips2/src/lib/libc/mips/softfloat/softfloat.h#3 integrate
.. //depot/projects/mips2/src/lib/libc/mips/stdlib/Makefile.inc#3 integrate
.. //depot/projects/mips2/src/lib/libc/mips/string/Makefile.inc#2 integrate
.. //depot/projects/mips2/src/lib/libc/mips/string/bcmp.S#3 integrate
.. //depot/projects/mips2/src/lib/libc/mips/string/bcopy.S#2 integrate
.. //depot/projects/mips2/src/lib/libc/mips/string/bzero.S#3 integrate
.. //depot/projects/mips2/src/lib/libc/mips/string/ffs.S#2 integrate
.. //depot/projects/mips2/src/lib/libc/mips/string/index.S#3 integrate
.. //depot/projects/mips2/src/lib/libc/mips/string/memcpy.S#2 integrate
.. //depot/projects/mips2/src/lib/libc/mips/string/memmove.S#2 integrate
.. //depot/projects/mips2/src/lib/libc/mips/string/rindex.S#3 integrate
.. //depot/projects/mips2/src/lib/libc/mips/string/strcmp.S#3 integrate
.. //depot/projects/mips2/src/lib/libc/mips/string/strlen.S#2 integrate
.. //depot/projects/mips2/src/lib/libc/mips/sys/Makefile.inc#3 integrate
.. //depot/projects/mips2/src/lib/libc/mips/sys/Ovfork.S#2 integrate
.. //depot/projects/mips2/src/lib/libc/mips/sys/brk.S#3 integrate
.. //depot/projects/mips2/src/lib/libc/mips/sys/cerror.S#4 integrate
.. //depot/projects/mips2/src/lib/libc/mips/sys/exect.S#2 integrate
.. //depot/projects/mips2/src/lib/libc/mips/sys/fork.S#3 integrate
.. //depot/projects/mips2/src/lib/libc/mips/sys/pipe.S#3 integrate
.. //depot/projects/mips2/src/lib/libc/mips/sys/ptrace.S#3 integrate
.. //depot/projects/mips2/src/lib/libc/mips/sys/sbrk.S#7 integrate
.. //depot/projects/mips2/src/lib/libc/mips/sys/shmat.S#2 integrate
.. //depot/projects/mips2/src/lib/libc/mips/sys/syscall.S#3 integrate
.. //depot/projects/mips2/src/lib/libc/stdio/Symbol.map#5 integrate
.. //depot/projects/mips2/src/lib/libc/stdio/clrerr.c#4 integrate
.. //depot/projects/mips2/src/lib/libc/stdio/feof.c#4 integrate
.. //depot/projects/mips2/src/lib/libc/stdio/ferror.c#4 integrate
.. //depot/projects/mips2/src/lib/libc/stdio/fileno.c#4 integrate
.. //depot/projects/mips2/src/lib/libc/stdio/getc.c#4 integrate
.. //depot/projects/mips2/src/lib/libc/stdio/getchar.c#4 integrate
.. //depot/projects/mips2/src/lib/libc/stdio/local.h#4 integrate
.. //depot/projects/mips2/src/lib/libc/stdio/putc.c#4 integrate
.. //depot/projects/mips2/src/lib/libc/stdio/putchar.c#4 integrate
.. //depot/projects/mips2/src/lib/libc/stdio/stdio.c#4 integrate
.. //depot/projects/mips2/src/lib/libc/stdio/xprintf.c#4 integrate
.. //depot/projects/mips2/src/lib/libdisk/write_mips_disk.c#2 integrate
.. //depot/projects/mips2/src/lib/libthr/arch/mips/Makefile.inc#2 integrate
.. //depot/projects/mips2/src/lib/msun/mips/Makefile.inc#2 integrate
.. //depot/projects/mips2/src/lib/msun/mips/Symbol.map#2 integrate
.. //depot/projects/mips2/src/lib/msun/mips/fenv.c#2 integrate
.. //depot/projects/mips2/src/lib/msun/mips/fenv.h#2 integrate

Differences ...

==== //depot/projects/mips2/src/etc/etc.mips/ttys#2 (text+ko) ====


==== //depot/projects/mips2/src/etc/rc.subr#8 (text+ko) ====

@@ -1,5 +1,5 @@
 # $NetBSD: rc.subr,v 1.67 2006/10/07 11:25:15 elad Exp $
-# $FreeBSD: src/etc/rc.subr,v 1.81 2008/05/05 07:43:48 mtm Exp $
+# $FreeBSD: src/etc/rc.subr,v 1.83 2008/05/05 15:52:54 maxim Exp $
 #
 # Copyright (c) 1997-2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -171,15 +171,15 @@
 {
 	local always
 
-        case $1 in
-                #       "yes", "true", "on", or "1"
+	case $1 in
+		#	"yes", "true", "on", or "1"
         [Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1)
 		always=true
 		;;
 	*)
 		always=false
 		;;
-	fi
+	esac
 	if [ "$autoboot" = yes -o "$always" = true ]; then
 		echo "ERROR: ABORTING BOOT (sending SIGTERM to parent)!"
 		kill -TERM ${RC_PID}

==== //depot/projects/mips2/src/gnu/usr.bin/gdb/arch/mips/Makefile#2 (text+ko) ====


==== //depot/projects/mips2/src/gnu/usr.bin/gdb/arch/mips/config.h#2 (text+ko) ====


==== //depot/projects/mips2/src/gnu/usr.bin/gdb/arch/mips/init.c#2 (text+ko) ====


==== //depot/projects/mips2/src/gnu/usr.bin/sort/config.h#3 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD: src/gnu/usr.bin/sort/config.h,v 1.9 2008/05/03 23:36:00 marcel Exp $ */
+/* $FreeBSD: src/gnu/usr.bin/sort/config.h,v 1.10 2008/05/05 16:12:28 jhb Exp $ */
 /* config.h.  Generated by configure.  */
 /* config.hin.  Generated from configure.ac by autoheader.  */
 
@@ -1240,7 +1240,7 @@
 #define PACKAGE_VERSION "5.3.0-20040812-FreeBSD"
 
 /* the number of pending output bytes on stream `fp' */
-#define PENDING_OUTPUT_N_BYTES __fgetpendout(fp)
+#define PENDING_OUTPUT_N_BYTES fp->_p - fp->_bf._base
 
 /* Define if  exists and defines unusable PRI* macros. */
 /* #undef PRI_MACROS_BROKEN */

==== //depot/projects/mips2/src/include/stdio.h#5 (text+ko) ====

@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)stdio.h	8.5 (Berkeley) 4/29/95
- * $FreeBSD: src/include/stdio.h,v 1.69 2008/05/03 23:35:59 marcel Exp $
+ * $FreeBSD: src/include/stdio.h,v 1.72 2008/05/05 16:14:02 jhb Exp $
  */
 
 #ifndef	_STDIO_H_
@@ -60,8 +60,84 @@
 
 #define	_FSTDIO			/* Define for new stdio with functions. */
 
-struct __sFILE;
-typedef	struct __sFILE FILE;
+/*
+ * NB: to fit things in six character monocase externals, the stdio
+ * code uses the prefix `__s' for stdio objects, typically followed
+ * by a three-character attempt at a mnemonic.
+ */
+
+/* stdio buffers */
+struct __sbuf {
+	unsigned char *_base;
+	int	_size;
+};
+
+/*
+ * stdio state variables.
+ *
+ * The following always hold:
+ *
+ *	if (_flags&(__SLBF|__SWR)) == (__SLBF|__SWR),
+ *		_lbfsize is -_bf._size, else _lbfsize is 0
+ *	if _flags&__SRD, _w is 0
+ *	if _flags&__SWR, _r is 0
+ *
+ * This ensures that the getc and putc macros (or inline functions) never
+ * try to write or read from a file that is in `read' or `write' mode.
+ * (Moreover, they can, and do, automatically switch from read mode to
+ * write mode, and back, on "r+" and "w+" files.)
+ *
+ * _lbfsize is used only to make the inline line-buffered output stream
+ * code as compact as possible.
+ *
+ * _ub, _up, and _ur are used when ungetc() pushes back more characters
+ * than fit in the current _bf, or when ungetc() pushes back a character
+ * that does not match the previous one in _bf.  When this happens,
+ * _ub._base becomes non-nil (i.e., a stream has ungetc() data iff
+ * _ub._base!=NULL) and _up and _ur save the current values of _p and _r.
+ *
+ * Certain members of __sFILE are accessed directly via macros or
+ * inline functions.  To preserve ABI compat, these members must not
+ * be disturbed.  These members are marked below with (*).
+ */
+typedef	struct __sFILE {
+	unsigned char *_p;	/* (*) current position in (some) buffer */
+	int	_r;		/* (*) read space left for getc() */
+	int	_w;		/* (*) write space left for putc() */
+	short	_flags;		/* (*) flags, below; this FILE is free if 0 */
+	short	_file;		/* (*) fileno, if Unix descriptor, else -1 */
+	struct	__sbuf _bf;	/* the buffer (at least 1 byte, if !NULL) */
+	int	_lbfsize;	/* (*) 0 or -_bf._size, for inline putc */
+
+	/* operations */
+	void	*_cookie;	/* (*) cookie passed to io functions */
+	int	(*_close)(void *);
+	int	(*_read)(void *, char *, int);
+	fpos_t	(*_seek)(void *, fpos_t, int);
+	int	(*_write)(void *, const char *, int);
+
+	/* separate buffer for long sequences of ungetc() */
+	struct	__sbuf _ub;	/* ungetc buffer */
+	unsigned char	*_up;	/* saved _p when _p is doing ungetc data */
+	int	_ur;		/* saved _r when _r is counting ungetc data */
+
+	/* tricks to meet minimum requirements even when malloc() fails */
+	unsigned char _ubuf[3];	/* guarantee an ungetc() buffer */
+	unsigned char _nbuf[1];	/* guarantee a getc() buffer */
+
+	/* separate buffer for fgetln() when line crosses buffer boundary */
+	struct	__sbuf _lb;	/* buffer for fgetln() */
+
+	/* Unix stdio files get aligned to block boundaries on fseek() */
+	int	_blksize;	/* stat.st_blksize (may be != _bf._size) */
+	fpos_t	_offset;	/* current lseek offset */
+
+	struct pthread_mutex *_fl_mutex;	/* used for MT-safety */
+	struct pthread *_fl_owner;	/* current owner */
+	int	_fl_count;	/* recursive lock count */
+	int	_orientation;	/* orientation for fwide() */
+	__mbstate_t _mbstate;	/* multibyte conversion state */
+} FILE;
 
 #ifndef _STDSTREAM_DECLARED
 __BEGIN_DECLS
@@ -72,11 +148,32 @@
 #define	_STDSTREAM_DECLARED
 #endif
 
+#define	__SLBF	0x0001		/* line buffered */
+#define	__SNBF	0x0002		/* unbuffered */
+#define	__SRD	0x0004		/* OK to read */
+#define	__SWR	0x0008		/* OK to write */
+	/* RD and WR are never simultaneously asserted */
+#define	__SRW	0x0010		/* open for reading & writing */
+#define	__SEOF	0x0020		/* found EOF */
+#define	__SERR	0x0040		/* found error */
+#define	__SMBF	0x0080		/* _buf is from malloc */
+#define	__SAPP	0x0100		/* fdopen()ed in append mode */
+#define	__SSTR	0x0200		/* this is an sprintf/snprintf string */
+#define	__SOPT	0x0400		/* do fseek() optimization */
+#define	__SNPT	0x0800		/* do not do fseek() optimization */
+#define	__SOFF	0x1000		/* set iff _offset is in fact correct */
+#define	__SMOD	0x2000		/* true => fgetln modified _p text */
+#define	__SALC	0x4000		/* allocate string space dynamically */
+#define	__SIGN	0x8000		/* ignore this file in _fwalk */
+
 /*
  * The following three definitions are for ANSI C, which took them
  * from System V, which brilliantly took internal interface macros and
  * made them official arguments to setvbuf(), without renaming them.
  * Hence, these ugly _IOxxx names are *supposed* to appear in user code.
+ *
+ * Although numbered as their counterparts above, the implementation
+ * does not rely on this.
  */
 #define	_IOFBF	0		/* setvbuf should set fully buffered */
 #define	_IOLBF	1		/* setvbuf should set line buffered */
@@ -204,8 +301,8 @@
 void	 funlockfile(FILE *);
 
 /*
- * See ISO/IEC 9945-1 ANSI/IEEE Std 1003.1 Second Edition 1996-07-12
- * B.8.2.7 for the rationale behind the *_unlocked() functions.
+ * These are normally used through macros as defined below, but POSIX
+ * requires functions as well.
  */
 int	 getc_unlocked(FILE *);
 int	 getchar_unlocked(void);
@@ -249,12 +346,6 @@
 int	 vasprintf(char **, const char *, __va_list)
 	    __printflike(2, 0);
 
-/* XXX used by libftpio */
-void	*__fgetcookie(FILE *);
-void	__fsetfileno(FILE *, int);
-/* XXX used by sort */
-size_t	__fgetpendout(FILE *);
-
 /*
  * The system error table contains messages for the first sys_nerr
  * positive errno values.  Use strerror() or strerror_r() from 
@@ -295,5 +386,76 @@
 #endif
 #endif /* __BSD_VISIBLE */
 
+/*
+ * Functions internal to the implementation.
+ */
+int	__srget(FILE *);
+int	__swbuf(int, FILE *);
+
+/*
+ * The __sfoo macros are here so that we can
+ * define function versions in the C library.
+ */
+#define	__sgetc(p) (--(p)->_r < 0 ? __srget(p) : (int)(*(p)->_p++))
+#if defined(__GNUC__) && defined(__STDC__)
+static __inline int __sputc(int _c, FILE *_p) {
+	if (--_p->_w >= 0 || (_p->_w >= _p->_lbfsize && (char)_c != '\n'))
+		return (*_p->_p++ = _c);
+	else
+		return (__swbuf(_c, _p));
+}
+#else
+/*
+ * This has been tuned to generate reasonable code on the vax using pcc.
+ */
+#define	__sputc(c, p) \
+	(--(p)->_w < 0 ? \
+		(p)->_w >= (p)->_lbfsize ? \
+			(*(p)->_p = (c)), *(p)->_p != '\n' ? \
+				(int)*(p)->_p++ : \
+				__swbuf('\n', p) : \
+			__swbuf((int)(c), p) : \
+		(*(p)->_p = (c), (int)*(p)->_p++))
+#endif
+
+#define	__sfeof(p)	(((p)->_flags & __SEOF) != 0)
+#define	__sferror(p)	(((p)->_flags & __SERR) != 0)
+#define	__sclearerr(p)	((void)((p)->_flags &= ~(__SERR|__SEOF)))
+#define	__sfileno(p)	((p)->_file)
+
+extern int __isthreaded;
+
+#define	feof(p)		(!__isthreaded ? __sfeof(p) : (feof)(p))
+#define	ferror(p)	(!__isthreaded ? __sferror(p) : (ferror)(p))
+#define	clearerr(p)	(!__isthreaded ? __sclearerr(p) : (clearerr)(p))
+
+#if __POSIX_VISIBLE
+#define	fileno(p)	(!__isthreaded ? __sfileno(p) : (fileno)(p))
+#endif
+
+#define	getc(fp)	(!__isthreaded ? __sgetc(fp) : (getc)(fp))
+#define	putc(x, fp)	(!__isthreaded ? __sputc(x, fp) : (putc)(x, fp))
+
+#define	getchar()	getc(stdin)
+#define	putchar(x)	putc(x, stdout)
+
+#if __BSD_VISIBLE
+/*
+ * See ISO/IEC 9945-1 ANSI/IEEE Std 1003.1 Second Edition 1996-07-12
+ * B.8.2.7 for the rationale behind the *_unlocked() macros.
+ */
+#define	feof_unlocked(p)	__sfeof(p)
+#define	ferror_unlocked(p)	__sferror(p)
+#define	clearerr_unlocked(p)	__sclearerr(p)
+#define	fileno_unlocked(p)	__sfileno(p)
+#endif
+#if __POSIX_VISIBLE >= 199506
+#define	getc_unlocked(fp)	__sgetc(fp)
+#define	putc_unlocked(x, fp)	__sputc(x, fp)
+
+#define	getchar_unlocked()	getc_unlocked(stdin)
+#define	putchar_unlocked(x)	putc_unlocked(x, stdout)
+#endif
+
 __END_DECLS
 #endif /* !_STDIO_H_ */

==== //depot/projects/mips2/src/lib/csu/mips/Makefile#2 (text+ko) ====


==== //depot/projects/mips2/src/lib/csu/mips/crt1.c#7 (text+ko) ====


==== //depot/projects/mips2/src/lib/csu/mips/crti.S#4 (text+ko) ====


==== //depot/projects/mips2/src/lib/csu/mips/crtn.S#2 (text+ko) ====


==== //depot/projects/mips2/src/lib/libc/Versions.def#5 (text) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libc/Versions.def,v 1.5 2008/05/04 04:11:00 marcel Exp $
+# $FreeBSD: src/lib/libc/Versions.def,v 1.6 2008/05/05 16:14:02 jhb Exp $
 
 # This is our first version; it depends on no other.
 # This version was first added to 7.0-current.
@@ -15,6 +15,3 @@
 # simple ABI-checking tools.
 FBSDprivate_1.0 {
 } FBSD_1.0;
-
-FBSDprivate_1.1 {
-} FBSD_1.1;

==== //depot/projects/mips2/src/lib/libc/mips/Makefile.inc#4 (text+ko) ====


==== //depot/projects/mips2/src/lib/libc/mips/SYS.h#5 (text+ko) ====


==== //depot/projects/mips2/src/lib/libc/mips/Symbol.map#4 (text+ko) ====


==== //depot/projects/mips2/src/lib/libc/mips/_fpmath.h#2 (text+ko) ====


==== //depot/projects/mips2/src/lib/libc/mips/arith.h#2 (text+ko) ====


==== //depot/projects/mips2/src/lib/libc/mips/gd_qnan.h#2 (text+ko) ====


==== //depot/projects/mips2/src/lib/libc/mips/gdtoa/Makefile.inc#2 (text+ko) ====


==== //depot/projects/mips2/src/lib/libc/mips/gdtoa/arith.h#2 (text+ko) ====


==== //depot/projects/mips2/src/lib/libc/mips/gen/Makefile.inc#4 (text+ko) ====


==== //depot/projects/mips2/src/lib/libc/mips/gen/_set_tp.c#2 (text+ko) ====


==== //depot/projects/mips2/src/lib/libc/mips/gen/_setjmp.S#5 (text+ko) ====


==== //depot/projects/mips2/src/lib/libc/mips/gen/fabs.S#3 (text+ko) ====


==== //depot/projects/mips2/src/lib/libc/mips/gen/flt_rounds.c#2 (text+ko) ====


==== //depot/projects/mips2/src/lib/libc/mips/gen/fpgetmask.c#3 (text+ko) ====


==== //depot/projects/mips2/src/lib/libc/mips/gen/fpgetround.c#3 (text+ko) ====


==== //depot/projects/mips2/src/lib/libc/mips/gen/fpgetsticky.c#3 (text+ko) ====


==== //depot/projects/mips2/src/lib/libc/mips/gen/fpsetmask.c#3 (text+ko) ====


==== //depot/projects/mips2/src/lib/libc/mips/gen/fpsetround.c#3 (text+ko) ====


==== //depot/projects/mips2/src/lib/libc/mips/gen/fpsetsticky.c#2 (text+ko) ====


==== //depot/projects/mips2/src/lib/libc/mips/gen/infinity.c#2 (text+ko) ====


==== //depot/projects/mips2/src/lib/libc/mips/gen/ldexp.S#3 (text+ko) ====


==== //depot/projects/mips2/src/lib/libc/mips/gen/longjmp.c#3 (text+ko) ====


==== //depot/projects/mips2/src/lib/libc/mips/gen/makecontext.c#3 (text+ko) ====


==== //depot/projects/mips2/src/lib/libc/mips/gen/modf.S#3 (text+ko) ====


==== //depot/projects/mips2/src/lib/libc/mips/gen/setjmp.S#4 (text+ko) ====


==== //depot/projects/mips2/src/lib/libc/mips/gen/signalcontext.c#3 (text+ko) ====


==== //depot/projects/mips2/src/lib/libc/mips/gen/sigsetjmp.S#4 (text+ko) ====


==== //depot/projects/mips2/src/lib/libc/mips/net/Makefile.inc#3 (text+ko) ====


==== //depot/projects/mips2/src/lib/libc/mips/net/htonl.S#3 (text+ko) ====


==== //depot/projects/mips2/src/lib/libc/mips/net/htons.S#3 (text+ko) ====


==== //depot/projects/mips2/src/lib/libc/mips/net/ntohl.S#3 (text+ko) ====


==== //depot/projects/mips2/src/lib/libc/mips/net/ntohs.S#3 (text+ko) ====


==== //depot/projects/mips2/src/lib/libc/mips/softfloat/milieu.h#2 (text+ko) ====


==== //depot/projects/mips2/src/lib/libc/mips/softfloat/mips-gcc.h#2 (text+ko) ====


==== //depot/projects/mips2/src/lib/libc/mips/softfloat/softfloat.h#3 (text+ko) ====


==== //depot/projects/mips2/src/lib/libc/mips/stdlib/Makefile.inc#3 (text+ko) ====


==== //depot/projects/mips2/src/lib/libc/mips/string/Makefile.inc#2 (text+ko) ====


==== //depot/projects/mips2/src/lib/libc/mips/string/bcmp.S#3 (text+ko) ====


==== //depot/projects/mips2/src/lib/libc/mips/string/bcopy.S#2 (text+ko) ====


==== //depot/projects/mips2/src/lib/libc/mips/string/bzero.S#3 (text+ko) ====


==== //depot/projects/mips2/src/lib/libc/mips/string/ffs.S#2 (text+ko) ====


==== //depot/projects/mips2/src/lib/libc/mips/string/index.S#3 (text+ko) ====


==== //depot/projects/mips2/src/lib/libc/mips/string/memcpy.S#2 (text+ko) ====


==== //depot/projects/mips2/src/lib/libc/mips/string/memmove.S#2 (text+ko) ====


==== //depot/projects/mips2/src/lib/libc/mips/string/rindex.S#3 (text+ko) ====


==== //depot/projects/mips2/src/lib/libc/mips/string/strcmp.S#3 (text+ko) ====


==== //depot/projects/mips2/src/lib/libc/mips/string/strlen.S#2 (text+ko) ====


==== //depot/projects/mips2/src/lib/libc/mips/sys/Makefile.inc#3 (text+ko) ====


==== //depot/projects/mips2/src/lib/libc/mips/sys/Ovfork.S#2 (text+ko) ====


==== //depot/projects/mips2/src/lib/libc/mips/sys/brk.S#3 (text+ko) ====


==== //depot/projects/mips2/src/lib/libc/mips/sys/cerror.S#4 (text+ko) ====


==== //depot/projects/mips2/src/lib/libc/mips/sys/exect.S#2 (text+ko) ====


==== //depot/projects/mips2/src/lib/libc/mips/sys/fork.S#3 (text+ko) ====


==== //depot/projects/mips2/src/lib/libc/mips/sys/pipe.S#3 (text+ko) ====


==== //depot/projects/mips2/src/lib/libc/mips/sys/ptrace.S#3 (text+ko) ====


==== //depot/projects/mips2/src/lib/libc/mips/sys/sbrk.S#7 (text+ko) ====


==== //depot/projects/mips2/src/lib/libc/mips/sys/shmat.S#2 (text+ko) ====


==== //depot/projects/mips2/src/lib/libc/mips/sys/syscall.S#3 (text+ko) ====


==== //depot/projects/mips2/src/lib/libc/stdio/Symbol.map#5 (text) ====

@@ -1,5 +1,5 @@
 /*
- * $FreeBSD: src/lib/libc/stdio/Symbol.map,v 1.7 2008/05/04 04:11:01 marcel Exp $
+ * $FreeBSD: src/lib/libc/stdio/Symbol.map,v 1.8 2008/05/05 16:14:02 jhb Exp $
  */
 
 FBSD_1.0 {
@@ -149,9 +149,3 @@
 	__printf_arginfo_vis;
 	__printf_render_vis;
 };
-
-FBSDprivate_1.1 {
-	__fgetcookie;
-	__fgetpendout;
-	__fsetfileno;
-};

==== //depot/projects/mips2/src/lib/libc/stdio/clrerr.c#4 (text+ko) ====

@@ -34,15 +34,15 @@
 static char sccsid[] = "@(#)clrerr.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include 
-__FBSDID("$FreeBSD: src/lib/libc/stdio/clrerr.c,v 1.11 2008/05/02 15:25:07 jhb Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/clrerr.c,v 1.12 2008/05/05 16:03:52 jhb Exp $");
 
 #include "namespace.h"
 #include 
 #include "un-namespace.h"
-#include "local.h"
 #include "libc_private.h"
 
-#define	__sclearerr(p)	((void)((p)->_flags &= ~(__SERR|__SEOF)))
+#undef clearerr
+#undef clearerr_unlocked
 
 void
 clearerr(fp)

==== //depot/projects/mips2/src/lib/libc/stdio/feof.c#4 (text+ko) ====

@@ -34,15 +34,15 @@
 static char sccsid[] = "@(#)feof.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include 
-__FBSDID("$FreeBSD: src/lib/libc/stdio/feof.c,v 1.11 2008/05/02 15:25:07 jhb Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/feof.c,v 1.12 2008/05/05 16:03:52 jhb Exp $");
 
 #include "namespace.h"
 #include 
 #include "un-namespace.h"
-#include "local.h"
 #include "libc_private.h"
 
-#define	__sfeof(p)	(((p)->_flags & __SEOF) != 0)
+#undef feof
+#undef feof_unlocked
 
 int
 feof(FILE *fp)

==== //depot/projects/mips2/src/lib/libc/stdio/ferror.c#4 (text+ko) ====

@@ -34,14 +34,16 @@
 static char sccsid[] = "@(#)ferror.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include 
-__FBSDID("$FreeBSD: src/lib/libc/stdio/ferror.c,v 1.11 2008/05/02 15:25:07 jhb Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/ferror.c,v 1.12 2008/05/05 16:03:52 jhb Exp $");
 
 #include "namespace.h"
 #include 
 #include "un-namespace.h"
-#include "local.h"
 #include "libc_private.h"
 
+#undef ferror
+#undef ferror_unlocked
+
 int
 ferror(FILE *fp)
 {

==== //depot/projects/mips2/src/lib/libc/stdio/fileno.c#4 (text+ko) ====

@@ -34,15 +34,15 @@
 static char sccsid[] = "@(#)fileno.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include 
-__FBSDID("$FreeBSD: src/lib/libc/stdio/fileno.c,v 1.12 2008/05/02 15:25:07 jhb Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/fileno.c,v 1.13 2008/05/05 16:03:52 jhb Exp $");
 
 #include "namespace.h"
 #include 
 #include "un-namespace.h"
-#include "local.h"
 #include "libc_private.h"
 
-#define	__sfileno(p)	((p)->_file)
+#undef fileno
+#undef fileno_unlocked
 
 int
 fileno(FILE *fp)

==== //depot/projects/mips2/src/lib/libc/stdio/getc.c#4 (text+ko) ====

@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)getc.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include 
-__FBSDID("$FreeBSD: src/lib/libc/stdio/getc.c,v 1.15 2008/05/02 15:25:07 jhb Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/getc.c,v 1.16 2008/05/05 16:03:52 jhb Exp $");
 
 #include "namespace.h"
 #include 
@@ -42,6 +42,9 @@
 #include "libc_private.h"
 #include "local.h"
 
+#undef getc
+#undef getc_unlocked
+
 int
 getc(FILE *fp)
 {

==== //depot/projects/mips2/src/lib/libc/stdio/getchar.c#4 (text+ko) ====

@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)getchar.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include 
-__FBSDID("$FreeBSD: src/lib/libc/stdio/getchar.c,v 1.14 2008/05/02 15:25:07 jhb Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/getchar.c,v 1.15 2008/05/05 16:03:52 jhb Exp $");
 
 /*
  * A subroutine version of the macro getchar.
@@ -45,6 +45,9 @@
 #include "local.h"
 #include "libc_private.h"
 
+#undef getchar
+#undef getchar_unlocked
+
 int
 getchar()
 {

==== //depot/projects/mips2/src/lib/libc/stdio/local.h#4 (text+ko) ====

@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)local.h	8.3 (Berkeley) 7/3/94
- * $FreeBSD: src/lib/libc/stdio/local.h,v 1.32 2008/05/02 15:25:07 jhb Exp $
+ * $FreeBSD: src/lib/libc/stdio/local.h,v 1.33 2008/05/05 16:03:52 jhb Exp $
  */
 
 #include 	/* for off_t */
@@ -39,105 +39,9 @@
 #include 
 
 /*
- * Information local to this implementation of stdio, in particular,
- * macros, private functions, private variables, and the definition of
- * FILE.
- *
- * NB: to fit things in six character monocase externals, the stdio
- * code uses the prefix `__s' for stdio objects, typically followed
- * by a three-character attempt at a mnemonic.
- */
-
-/* stdio buffers */
-struct __sbuf {
-	unsigned char *_base;
-	int	_size;
-};
-
-/*
- * stdio state variables.
- *
- * The following always hold:
- *
- *	if (_flags&(__SLBF|__SWR)) == (__SLBF|__SWR),
- *		_lbfsize is -_bf._size, else _lbfsize is 0
- *	if _flags&__SRD, _w is 0
- *	if _flags&__SWR, _r is 0
- *
- * This ensures that the getc and putc macros (or inline functions) never
- * try to write or read from a file that is in `read' or `write' mode.
- * (Moreover, they can, and do, automatically switch from read mode to
- * write mode, and back, on "r+" and "w+" files.)
- *
- * _lbfsize is used only to make the inline line-buffered output stream
- * code as compact as possible.
- *
- * _ub, _up, and _ur are used when ungetc() pushes back more characters
- * than fit in the current _bf, or when ungetc() pushes back a character
- * that does not match the previous one in _bf.  When this happens,
- * _ub._base becomes non-nil (i.e., a stream has ungetc() data iff
- * _ub._base!=NULL) and _up and _ur save the current values of _p and _r.
- *
- * Certain members of __sFILE are accessed directly via macros or
- * inline functions.  To preserve ABI compat, these members must not
- * be disturbed.  These members are marked below with (*).
+ * Information local to this implementation of stdio,
+ * in particular, macros and private variables.
  */
-struct __sFILE {
-	unsigned char *_p;	/* (*) current position in (some) buffer */
-	int	_r;		/* (*) read space left for getc() */
-	int	_w;		/* (*) write space left for putc() */
-	short	_flags;		/* (*) flags, below; this FILE is free if 0 */
-	short	_file;		/* (*) fileno, if Unix descriptor, else -1 */
-	struct	__sbuf _bf;	/* the buffer (at least 1 byte, if !NULL) */
-	int	_lbfsize;	/* (*) 0 or -_bf._size, for inline putc */
-
-	/* operations */
-	void	*_cookie;	/* cookie passed to io functions */
-	int	(*_close)(void *);
-	int	(*_read)(void *, char *, int);
-	fpos_t	(*_seek)(void *, fpos_t, int);
-	int	(*_write)(void *, const char *, int);
-
-	/* separate buffer for long sequences of ungetc() */
-	struct	__sbuf _ub;	/* ungetc buffer */
-	unsigned char	*_up;	/* saved _p when _p is doing ungetc data */
-	int	_ur;		/* saved _r when _r is counting ungetc data */
-
-	/* tricks to meet minimum requirements even when malloc() fails */
-	unsigned char _ubuf[3];	/* guarantee an ungetc() buffer */
-	unsigned char _nbuf[1];	/* guarantee a getc() buffer */
-
-	/* separate buffer for fgetln() when line crosses buffer boundary */
-	struct	__sbuf _lb;	/* buffer for fgetln() */
-
-	/* Unix stdio files get aligned to block boundaries on fseek() */
-	int	_blksize;	/* stat.st_blksize (may be != _bf._size) */
-	fpos_t	_offset;	/* current lseek offset */
-
-	pthread_mutex_t _fl_mutex;	/* used for MT-safety */
-	pthread_t _fl_owner;	/* current owner */
-	int	_fl_count;	/* recursive lock count */
-	int	_orientation;	/* orientation for fwide() */
-	mbstate_t _mbstate;	/* multibyte conversion state */
-};
-
-#define	__SLBF	0x0001		/* line buffered */
-#define	__SNBF	0x0002		/* unbuffered */
-#define	__SRD	0x0004		/* OK to read */
-#define	__SWR	0x0008		/* OK to write */
-	/* RD and WR are never simultaneously asserted */
-#define	__SRW	0x0010		/* open for reading & writing */
-#define	__SEOF	0x0020		/* found EOF */
-#define	__SERR	0x0040		/* found error */
-#define	__SMBF	0x0080		/* _buf is from malloc */
-#define	__SAPP	0x0100		/* fdopen()ed in append mode */
-#define	__SSTR	0x0200		/* this is an sprintf/snprintf string */
-#define	__SOPT	0x0400		/* do fseek() optimization */
-#define	__SNPT	0x0800		/* do not do fseek() optimization */
-#define	__SOFF	0x1000		/* set iff _offset is in fact correct */
-#define	__SMOD	0x2000		/* true => fgetln modified _p text */
-#define	__SALC	0x4000		/* allocate string space dynamically */
-#define	__SIGN	0x8000		/* ignore this file in _fwalk */
 
 extern int	_sread(FILE *, char *, int);
 extern int	_swrite(FILE *, char const *, int);
@@ -153,8 +57,6 @@
 extern int	__slbexpand(FILE *, size_t);
 extern int	__srefill(FILE *);
 extern int	__sread(void *, char *, int);
-extern int	__srget(FILE *);
-extern int	__swbuf(int, FILE *);
 extern int	__swrite(void *, char const *, int);
 extern fpos_t	__sseek(void *, fpos_t, int);
 extern int	__sclose(void *);
@@ -179,38 +81,6 @@
 
 
 /*
- * Get and store individual characters from a file stream.
- */
-#define	__sgetc(p) (--(p)->_r < 0 ? __srget(p) : (int)(*(p)->_p++))
-#if defined(__GNUC__) && defined(__STDC__)
-static __inline int
-__sputc(int _c, FILE *_p)
-{
-	if (--_p->_w >= 0 || (_p->_w >= _p->_lbfsize && (char)_c != '\n'))
-		return (*_p->_p++ = _c);
-	else
-		return (__swbuf(_c, _p));
-}
-#else
-/*
- * This has been tuned to generate reasonable code on the vax using pcc.
- */
-#define	__sputc(c, p) \
-	(--(p)->_w < 0 ? \
-		(p)->_w >= (p)->_lbfsize ? \
-			(*(p)->_p = (c)), *(p)->_p != '\n' ? \
-				(int)*(p)->_p++ : \
-				__swbuf('\n', p) : \
-			__swbuf((int)(c), p) : \
-		(*(p)->_p = (c), (int)*(p)->_p++))
-#endif
-
-/*
- * Return true if the file stream has encountered an error.
- */
-#define	__sferror(p)	(((p)->_flags & __SERR) != 0)
-
-/*
  * Prepare the given FILE for writing, and return 0 iff it
  * can be written now.  Otherwise, return EOF and set errno.
  */

==== //depot/projects/mips2/src/lib/libc/stdio/putc.c#4 (text+ko) ====

@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)putc.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include 
-__FBSDID("$FreeBSD: src/lib/libc/stdio/putc.c,v 1.15 2008/05/02 15:25:07 jhb Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/putc.c,v 1.16 2008/05/05 16:03:52 jhb Exp $");
 
 #include "namespace.h"
 #include 
@@ -42,6 +42,9 @@
 #include "local.h"
 #include "libc_private.h"
 
+#undef putc
+#undef putc_unlocked
+
 int
 putc(c, fp)
 	int c;

==== //depot/projects/mips2/src/lib/libc/stdio/putchar.c#4 (text+ko) ====

@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)putchar.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include 
-__FBSDID("$FreeBSD: src/lib/libc/stdio/putchar.c,v 1.15 2008/05/02 15:25:07 jhb Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/putchar.c,v 1.16 2008/05/05 16:03:52 jhb Exp $");
 
 #include "namespace.h"
 #include 
@@ -42,6 +42,9 @@
 #include "local.h"
 #include "libc_private.h"
 
+#undef putchar
+#undef putchar_unlocked
+
 /*
  * A subroutine version of the macro putchar
  */

==== //depot/projects/mips2/src/lib/libc/stdio/stdio.c#4 (text+ko) ====

@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)stdio.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include 
-__FBSDID("$FreeBSD: src/lib/libc/stdio/stdio.c,v 1.27 2008/05/03 23:35:59 marcel Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/stdio.c,v 1.28 2008/05/05 16:14:02 jhb Exp $");
 
 #include "namespace.h"
 #include 
@@ -46,27 +46,6 @@
 #include "un-namespace.h"
 #include "local.h"
 
-void *
-__fgetcookie(FILE *fp)
-{
-
-	return (fp->_cookie);
-}
-
-size_t
-__fgetpendout(FILE *fp)
-{
-
-	return (fp->_p - fp->_bf._base);
-}
-
-void
-__fsetfileno(FILE *fp, int fd)
-{
-
-	fp->_file = fd;
-}
-
 /*
  * Small standard I/O/seek/close functions.
  */

==== //depot/projects/mips2/src/lib/libc/stdio/xprintf.c#4 (text+ko) ====

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Mon May  5 18:42:45 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1D1A0106566B; Mon,  5 May 2008 18:42:45 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D1CB51065679
	for ; Mon,  5 May 2008 18:42:44 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id C09D38FC0A
	for ; Mon,  5 May 2008 18:42:44 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m45IgiNF007393
	for ; Mon, 5 May 2008 18:42:44 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m45Igiaw007391
	for perforce@freebsd.org; Mon, 5 May 2008 18:42:44 GMT
	(envelope-from imp@freebsd.org)
Date: Mon, 5 May 2008 18:42:44 GMT
Message-Id: <200805051842.m45Igiaw007391@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 
Cc: 
Subject: PERFORCE change 141198 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Mon, 05 May 2008 18:42:45 -0000

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

Change 141198 by imp@imp_paco-paco on 2008/05/05 18:41:59

	IF mips2 @141195

Affected files ...

.. //depot/projects/mips2-jnpr/src/etc/etc.mips/ttys#2 integrate
.. //depot/projects/mips2-jnpr/src/etc/rc.subr#4 integrate
.. //depot/projects/mips2-jnpr/src/gnu/usr.bin/gdb/arch/mips/Makefile#2 integrate
.. //depot/projects/mips2-jnpr/src/gnu/usr.bin/gdb/arch/mips/config.h#2 integrate
.. //depot/projects/mips2-jnpr/src/gnu/usr.bin/gdb/arch/mips/init.c#2 integrate
.. //depot/projects/mips2-jnpr/src/gnu/usr.bin/sort/config.h#3 integrate
.. //depot/projects/mips2-jnpr/src/include/stdio.h#4 integrate
.. //depot/projects/mips2-jnpr/src/lib/csu/mips/Makefile#2 integrate
.. //depot/projects/mips2-jnpr/src/lib/csu/mips/crt1.c#4 integrate
.. //depot/projects/mips2-jnpr/src/lib/csu/mips/crti.S#2 integrate
.. //depot/projects/mips2-jnpr/src/lib/csu/mips/crtn.S#2 integrate
.. //depot/projects/mips2-jnpr/src/lib/libc/Versions.def#3 integrate
.. //depot/projects/mips2-jnpr/src/lib/libc/mips/Makefile.inc#2 integrate
.. //depot/projects/mips2-jnpr/src/lib/libc/mips/SYS.h#2 integrate
.. //depot/projects/mips2-jnpr/src/lib/libc/mips/Symbol.map#2 integrate
.. //depot/projects/mips2-jnpr/src/lib/libc/mips/_fpmath.h#3 integrate
.. //depot/projects/mips2-jnpr/src/lib/libc/mips/arith.h#3 integrate
.. //depot/projects/mips2-jnpr/src/lib/libc/mips/gd_qnan.h#3 integrate
.. //depot/projects/mips2-jnpr/src/lib/libc/mips/gdtoa/Makefile.inc#2 integrate
.. //depot/projects/mips2-jnpr/src/lib/libc/mips/gdtoa/arith.h#2 integrate
.. //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/Makefile.inc#3 integrate
.. //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/_set_tp.c#2 integrate
.. //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/_setjmp.S#7 integrate
.. //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/fabs.S#4 integrate
.. //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/fabs.c#2 integrate
.. //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/flt_rounds.c#2 integrate
.. //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/fpgetmask.c#2 integrate
.. //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/fpgetround.c#2 integrate
.. //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/fpgetsticky.c#2 integrate
.. //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/fpsetmask.c#2 integrate
.. //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/fpsetround.c#2 integrate
.. //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/fpsetsticky.c#2 integrate
.. //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/infinity.c#2 integrate
.. //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/ldexp.S#4 integrate
.. //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/longjmp.c#2 integrate
.. //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/makecontext.c#3 integrate
.. //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/modf.S#4 integrate
.. //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/modf.c#2 integrate
.. //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/setjmp.S#5 integrate
.. //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/signalcontext.c#2 integrate
.. //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/sigsetjmp.S#4 integrate
.. //depot/projects/mips2-jnpr/src/lib/libc/mips/net/Makefile.inc#2 integrate
.. //depot/projects/mips2-jnpr/src/lib/libc/mips/net/htonl.S#2 integrate
.. //depot/projects/mips2-jnpr/src/lib/libc/mips/net/htons.S#2 integrate
.. //depot/projects/mips2-jnpr/src/lib/libc/mips/net/ntohl.S#2 integrate
.. //depot/projects/mips2-jnpr/src/lib/libc/mips/net/ntohs.S#2 integrate
.. //depot/projects/mips2-jnpr/src/lib/libc/mips/softfloat/milieu.h#2 integrate
.. //depot/projects/mips2-jnpr/src/lib/libc/mips/softfloat/mips-gcc.h#2 integrate
.. //depot/projects/mips2-jnpr/src/lib/libc/mips/softfloat/softfloat.h#2 integrate
.. //depot/projects/mips2-jnpr/src/lib/libc/mips/stdlib/Makefile.inc#2 integrate
.. //depot/projects/mips2-jnpr/src/lib/libc/mips/string/Makefile.inc#2 integrate
.. //depot/projects/mips2-jnpr/src/lib/libc/mips/string/bcmp.S#2 integrate
.. //depot/projects/mips2-jnpr/src/lib/libc/mips/string/bcopy.S#2 integrate
.. //depot/projects/mips2-jnpr/src/lib/libc/mips/string/bzero.S#2 integrate
.. //depot/projects/mips2-jnpr/src/lib/libc/mips/string/ffs.S#2 integrate
.. //depot/projects/mips2-jnpr/src/lib/libc/mips/string/index.S#2 integrate
.. //depot/projects/mips2-jnpr/src/lib/libc/mips/string/memcpy.S#2 integrate
.. //depot/projects/mips2-jnpr/src/lib/libc/mips/string/memmove.S#2 integrate
.. //depot/projects/mips2-jnpr/src/lib/libc/mips/string/rindex.S#2 integrate
.. //depot/projects/mips2-jnpr/src/lib/libc/mips/string/strcmp.S#2 integrate
.. //depot/projects/mips2-jnpr/src/lib/libc/mips/string/strlen.S#2 integrate
.. //depot/projects/mips2-jnpr/src/lib/libc/mips/sys/Makefile.inc#2 integrate
.. //depot/projects/mips2-jnpr/src/lib/libc/mips/sys/Ovfork.S#2 integrate
.. //depot/projects/mips2-jnpr/src/lib/libc/mips/sys/brk.S#2 integrate
.. //depot/projects/mips2-jnpr/src/lib/libc/mips/sys/cerror.S#2 integrate
.. //depot/projects/mips2-jnpr/src/lib/libc/mips/sys/exect.S#2 integrate
.. //depot/projects/mips2-jnpr/src/lib/libc/mips/sys/fork.S#2 integrate
.. //depot/projects/mips2-jnpr/src/lib/libc/mips/sys/pipe.S#2 integrate
.. //depot/projects/mips2-jnpr/src/lib/libc/mips/sys/ptrace.S#2 integrate
.. //depot/projects/mips2-jnpr/src/lib/libc/mips/sys/sbrk.S#3 integrate
.. //depot/projects/mips2-jnpr/src/lib/libc/mips/sys/shmat.S#2 integrate
.. //depot/projects/mips2-jnpr/src/lib/libc/mips/sys/syscall.S#2 integrate
.. //depot/projects/mips2-jnpr/src/lib/libc/stdio/Symbol.map#3 integrate
.. //depot/projects/mips2-jnpr/src/lib/libc/stdio/clrerr.c#3 integrate
.. //depot/projects/mips2-jnpr/src/lib/libc/stdio/feof.c#3 integrate
.. //depot/projects/mips2-jnpr/src/lib/libc/stdio/ferror.c#3 integrate
.. //depot/projects/mips2-jnpr/src/lib/libc/stdio/fileno.c#3 integrate
.. //depot/projects/mips2-jnpr/src/lib/libc/stdio/getc.c#3 integrate
.. //depot/projects/mips2-jnpr/src/lib/libc/stdio/getchar.c#3 integrate
.. //depot/projects/mips2-jnpr/src/lib/libc/stdio/local.h#3 integrate
.. //depot/projects/mips2-jnpr/src/lib/libc/stdio/putc.c#3 integrate
.. //depot/projects/mips2-jnpr/src/lib/libc/stdio/putchar.c#3 integrate
.. //depot/projects/mips2-jnpr/src/lib/libc/stdio/stdio.c#3 integrate
.. //depot/projects/mips2-jnpr/src/lib/libc/stdio/xprintf.c#3 integrate
.. //depot/projects/mips2-jnpr/src/lib/libdisk/write_mips_disk.c#2 integrate
.. //depot/projects/mips2-jnpr/src/lib/libthr/arch/mips/Makefile.inc#4 integrate
.. //depot/projects/mips2-jnpr/src/lib/msun/mips/Makefile.inc#2 integrate
.. //depot/projects/mips2-jnpr/src/lib/msun/mips/Symbol.map#2 integrate
.. //depot/projects/mips2-jnpr/src/lib/msun/mips/fenv.c#2 integrate
.. //depot/projects/mips2-jnpr/src/lib/msun/mips/fenv.h#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/mips/include/_bus_octeon.h#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/mips/include/archtype.h#3 integrate
.. //depot/projects/mips2-jnpr/src/sys/mips/include/bootinfo.h#3 integrate
.. //depot/projects/mips2-jnpr/src/sys/mips/include/bswap.h#3 integrate
.. //depot/projects/mips2-jnpr/src/sys/mips/include/bus_octeon.h#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/mips/include/clockvar.h#3 integrate
.. //depot/projects/mips2-jnpr/src/sys/mips/include/defs.h#3 integrate
.. //depot/projects/mips2-jnpr/src/sys/mips/include/ieee.h#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/mips/include/intr.h#7 integrate
.. //depot/projects/mips2-jnpr/src/sys/mips/include/pltfm.h#3 integrate
.. //depot/projects/mips2-jnpr/src/sys/mips/include/queue.h#3 integrate
.. //depot/projects/mips2-jnpr/src/sys/mips/include/regdef.h#5 integrate
.. //depot/projects/mips2-jnpr/src/sys/mips/include/rm7000.h#3 integrate
.. //depot/projects/mips2-jnpr/src/sys/mips/mips/fp.S#4 integrate
.. //depot/projects/mips2-jnpr/src/sys/mips/mips/gdb_machdep.c#3 integrate
.. //depot/projects/mips2-jnpr/src/sys/mips/mips/mainbus.c#4 integrate
.. //depot/projects/mips2-jnpr/src/sys/mips/mips/mp_machdep.c#3 integrate
.. //depot/projects/mips2-jnpr/src/sys/mips/mips/pm_machdep.c#7 integrate
.. //depot/projects/mips2-jnpr/src/sys/mips/mips/psraccess.S#10 integrate
.. //depot/projects/mips2-jnpr/src/sys/mips/mips/tlb.S#10 integrate

Differences ...

==== //depot/projects/mips2-jnpr/src/etc/etc.mips/ttys#2 (text+ko) ====


==== //depot/projects/mips2-jnpr/src/etc/rc.subr#4 (text+ko) ====

@@ -1,5 +1,5 @@
 # $NetBSD: rc.subr,v 1.67 2006/10/07 11:25:15 elad Exp $
-# $FreeBSD: src/etc/rc.subr,v 1.81 2008/05/05 07:43:48 mtm Exp $
+# $FreeBSD: src/etc/rc.subr,v 1.83 2008/05/05 15:52:54 maxim Exp $
 #
 # Copyright (c) 1997-2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -171,15 +171,15 @@
 {
 	local always
 
-        case $1 in
-                #       "yes", "true", "on", or "1"
+	case $1 in
+		#	"yes", "true", "on", or "1"
         [Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1)
 		always=true
 		;;
 	*)
 		always=false
 		;;
-	fi
+	esac
 	if [ "$autoboot" = yes -o "$always" = true ]; then
 		echo "ERROR: ABORTING BOOT (sending SIGTERM to parent)!"
 		kill -TERM ${RC_PID}

==== //depot/projects/mips2-jnpr/src/gnu/usr.bin/gdb/arch/mips/Makefile#2 (text+ko) ====


==== //depot/projects/mips2-jnpr/src/gnu/usr.bin/gdb/arch/mips/config.h#2 (text+ko) ====


==== //depot/projects/mips2-jnpr/src/gnu/usr.bin/gdb/arch/mips/init.c#2 (text+ko) ====


==== //depot/projects/mips2-jnpr/src/gnu/usr.bin/sort/config.h#3 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD: src/gnu/usr.bin/sort/config.h,v 1.9 2008/05/03 23:36:00 marcel Exp $ */
+/* $FreeBSD: src/gnu/usr.bin/sort/config.h,v 1.10 2008/05/05 16:12:28 jhb Exp $ */
 /* config.h.  Generated by configure.  */
 /* config.hin.  Generated from configure.ac by autoheader.  */
 
@@ -1240,7 +1240,7 @@
 #define PACKAGE_VERSION "5.3.0-20040812-FreeBSD"
 
 /* the number of pending output bytes on stream `fp' */
-#define PENDING_OUTPUT_N_BYTES __fgetpendout(fp)
+#define PENDING_OUTPUT_N_BYTES fp->_p - fp->_bf._base
 
 /* Define if  exists and defines unusable PRI* macros. */
 /* #undef PRI_MACROS_BROKEN */

==== //depot/projects/mips2-jnpr/src/include/stdio.h#4 (text+ko) ====

@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)stdio.h	8.5 (Berkeley) 4/29/95
- * $FreeBSD: src/include/stdio.h,v 1.69 2008/05/03 23:35:59 marcel Exp $
+ * $FreeBSD: src/include/stdio.h,v 1.72 2008/05/05 16:14:02 jhb Exp $
  */
 
 #ifndef	_STDIO_H_
@@ -60,8 +60,84 @@
 
 #define	_FSTDIO			/* Define for new stdio with functions. */
 
-struct __sFILE;
-typedef	struct __sFILE FILE;
+/*
+ * NB: to fit things in six character monocase externals, the stdio
+ * code uses the prefix `__s' for stdio objects, typically followed
+ * by a three-character attempt at a mnemonic.
+ */
+
+/* stdio buffers */
+struct __sbuf {
+	unsigned char *_base;
+	int	_size;
+};
+
+/*
+ * stdio state variables.
+ *
+ * The following always hold:
+ *
+ *	if (_flags&(__SLBF|__SWR)) == (__SLBF|__SWR),
+ *		_lbfsize is -_bf._size, else _lbfsize is 0
+ *	if _flags&__SRD, _w is 0
+ *	if _flags&__SWR, _r is 0
+ *
+ * This ensures that the getc and putc macros (or inline functions) never
+ * try to write or read from a file that is in `read' or `write' mode.
+ * (Moreover, they can, and do, automatically switch from read mode to
+ * write mode, and back, on "r+" and "w+" files.)
+ *
+ * _lbfsize is used only to make the inline line-buffered output stream
+ * code as compact as possible.
+ *
+ * _ub, _up, and _ur are used when ungetc() pushes back more characters
+ * than fit in the current _bf, or when ungetc() pushes back a character
+ * that does not match the previous one in _bf.  When this happens,
+ * _ub._base becomes non-nil (i.e., a stream has ungetc() data iff
+ * _ub._base!=NULL) and _up and _ur save the current values of _p and _r.
+ *
+ * Certain members of __sFILE are accessed directly via macros or
+ * inline functions.  To preserve ABI compat, these members must not
+ * be disturbed.  These members are marked below with (*).
+ */
+typedef	struct __sFILE {
+	unsigned char *_p;	/* (*) current position in (some) buffer */
+	int	_r;		/* (*) read space left for getc() */
+	int	_w;		/* (*) write space left for putc() */
+	short	_flags;		/* (*) flags, below; this FILE is free if 0 */
+	short	_file;		/* (*) fileno, if Unix descriptor, else -1 */
+	struct	__sbuf _bf;	/* the buffer (at least 1 byte, if !NULL) */
+	int	_lbfsize;	/* (*) 0 or -_bf._size, for inline putc */
+
+	/* operations */
+	void	*_cookie;	/* (*) cookie passed to io functions */
+	int	(*_close)(void *);
+	int	(*_read)(void *, char *, int);
+	fpos_t	(*_seek)(void *, fpos_t, int);
+	int	(*_write)(void *, const char *, int);
+
+	/* separate buffer for long sequences of ungetc() */
+	struct	__sbuf _ub;	/* ungetc buffer */
+	unsigned char	*_up;	/* saved _p when _p is doing ungetc data */
+	int	_ur;		/* saved _r when _r is counting ungetc data */
+
+	/* tricks to meet minimum requirements even when malloc() fails */
+	unsigned char _ubuf[3];	/* guarantee an ungetc() buffer */
+	unsigned char _nbuf[1];	/* guarantee a getc() buffer */
+
+	/* separate buffer for fgetln() when line crosses buffer boundary */
+	struct	__sbuf _lb;	/* buffer for fgetln() */
+
+	/* Unix stdio files get aligned to block boundaries on fseek() */
+	int	_blksize;	/* stat.st_blksize (may be != _bf._size) */
+	fpos_t	_offset;	/* current lseek offset */
+
+	struct pthread_mutex *_fl_mutex;	/* used for MT-safety */
+	struct pthread *_fl_owner;	/* current owner */
+	int	_fl_count;	/* recursive lock count */
+	int	_orientation;	/* orientation for fwide() */
+	__mbstate_t _mbstate;	/* multibyte conversion state */
+} FILE;
 
 #ifndef _STDSTREAM_DECLARED
 __BEGIN_DECLS
@@ -72,11 +148,32 @@
 #define	_STDSTREAM_DECLARED
 #endif
 
+#define	__SLBF	0x0001		/* line buffered */
+#define	__SNBF	0x0002		/* unbuffered */
+#define	__SRD	0x0004		/* OK to read */
+#define	__SWR	0x0008		/* OK to write */
+	/* RD and WR are never simultaneously asserted */
+#define	__SRW	0x0010		/* open for reading & writing */
+#define	__SEOF	0x0020		/* found EOF */
+#define	__SERR	0x0040		/* found error */
+#define	__SMBF	0x0080		/* _buf is from malloc */
+#define	__SAPP	0x0100		/* fdopen()ed in append mode */
+#define	__SSTR	0x0200		/* this is an sprintf/snprintf string */
+#define	__SOPT	0x0400		/* do fseek() optimization */
+#define	__SNPT	0x0800		/* do not do fseek() optimization */
+#define	__SOFF	0x1000		/* set iff _offset is in fact correct */
+#define	__SMOD	0x2000		/* true => fgetln modified _p text */
+#define	__SALC	0x4000		/* allocate string space dynamically */
+#define	__SIGN	0x8000		/* ignore this file in _fwalk */
+
 /*
  * The following three definitions are for ANSI C, which took them
  * from System V, which brilliantly took internal interface macros and
  * made them official arguments to setvbuf(), without renaming them.
  * Hence, these ugly _IOxxx names are *supposed* to appear in user code.
+ *
+ * Although numbered as their counterparts above, the implementation
+ * does not rely on this.
  */
 #define	_IOFBF	0		/* setvbuf should set fully buffered */
 #define	_IOLBF	1		/* setvbuf should set line buffered */
@@ -204,8 +301,8 @@
 void	 funlockfile(FILE *);
 
 /*
- * See ISO/IEC 9945-1 ANSI/IEEE Std 1003.1 Second Edition 1996-07-12
- * B.8.2.7 for the rationale behind the *_unlocked() functions.
+ * These are normally used through macros as defined below, but POSIX
+ * requires functions as well.
  */
 int	 getc_unlocked(FILE *);
 int	 getchar_unlocked(void);
@@ -249,12 +346,6 @@
 int	 vasprintf(char **, const char *, __va_list)
 	    __printflike(2, 0);
 
-/* XXX used by libftpio */
-void	*__fgetcookie(FILE *);
-void	__fsetfileno(FILE *, int);
-/* XXX used by sort */
-size_t	__fgetpendout(FILE *);
-
 /*
  * The system error table contains messages for the first sys_nerr
  * positive errno values.  Use strerror() or strerror_r() from 
@@ -295,5 +386,76 @@
 #endif
 #endif /* __BSD_VISIBLE */
 
+/*
+ * Functions internal to the implementation.
+ */
+int	__srget(FILE *);
+int	__swbuf(int, FILE *);
+
+/*
+ * The __sfoo macros are here so that we can
+ * define function versions in the C library.
+ */
+#define	__sgetc(p) (--(p)->_r < 0 ? __srget(p) : (int)(*(p)->_p++))
+#if defined(__GNUC__) && defined(__STDC__)
+static __inline int __sputc(int _c, FILE *_p) {
+	if (--_p->_w >= 0 || (_p->_w >= _p->_lbfsize && (char)_c != '\n'))
+		return (*_p->_p++ = _c);
+	else
+		return (__swbuf(_c, _p));
+}
+#else
+/*
+ * This has been tuned to generate reasonable code on the vax using pcc.
+ */
+#define	__sputc(c, p) \
+	(--(p)->_w < 0 ? \
+		(p)->_w >= (p)->_lbfsize ? \
+			(*(p)->_p = (c)), *(p)->_p != '\n' ? \
+				(int)*(p)->_p++ : \
+				__swbuf('\n', p) : \
+			__swbuf((int)(c), p) : \
+		(*(p)->_p = (c), (int)*(p)->_p++))
+#endif
+
+#define	__sfeof(p)	(((p)->_flags & __SEOF) != 0)
+#define	__sferror(p)	(((p)->_flags & __SERR) != 0)
+#define	__sclearerr(p)	((void)((p)->_flags &= ~(__SERR|__SEOF)))
+#define	__sfileno(p)	((p)->_file)
+
+extern int __isthreaded;
+
+#define	feof(p)		(!__isthreaded ? __sfeof(p) : (feof)(p))
+#define	ferror(p)	(!__isthreaded ? __sferror(p) : (ferror)(p))
+#define	clearerr(p)	(!__isthreaded ? __sclearerr(p) : (clearerr)(p))
+
+#if __POSIX_VISIBLE
+#define	fileno(p)	(!__isthreaded ? __sfileno(p) : (fileno)(p))
+#endif
+
+#define	getc(fp)	(!__isthreaded ? __sgetc(fp) : (getc)(fp))
+#define	putc(x, fp)	(!__isthreaded ? __sputc(x, fp) : (putc)(x, fp))
+
+#define	getchar()	getc(stdin)
+#define	putchar(x)	putc(x, stdout)
+
+#if __BSD_VISIBLE
+/*
+ * See ISO/IEC 9945-1 ANSI/IEEE Std 1003.1 Second Edition 1996-07-12
+ * B.8.2.7 for the rationale behind the *_unlocked() macros.
+ */
+#define	feof_unlocked(p)	__sfeof(p)
+#define	ferror_unlocked(p)	__sferror(p)
+#define	clearerr_unlocked(p)	__sclearerr(p)
+#define	fileno_unlocked(p)	__sfileno(p)
+#endif
+#if __POSIX_VISIBLE >= 199506
+#define	getc_unlocked(fp)	__sgetc(fp)
+#define	putc_unlocked(x, fp)	__sputc(x, fp)
+
+#define	getchar_unlocked()	getc_unlocked(stdin)
+#define	putchar_unlocked(x)	putc_unlocked(x, stdout)
+#endif
+
 __END_DECLS
 #endif /* !_STDIO_H_ */

==== //depot/projects/mips2-jnpr/src/lib/csu/mips/Makefile#2 (text+ko) ====


==== //depot/projects/mips2-jnpr/src/lib/csu/mips/crt1.c#4 (text+ko) ====


==== //depot/projects/mips2-jnpr/src/lib/csu/mips/crti.S#2 (text+ko) ====


==== //depot/projects/mips2-jnpr/src/lib/csu/mips/crtn.S#2 (text+ko) ====


==== //depot/projects/mips2-jnpr/src/lib/libc/Versions.def#3 (text) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libc/Versions.def,v 1.5 2008/05/04 04:11:00 marcel Exp $
+# $FreeBSD: src/lib/libc/Versions.def,v 1.6 2008/05/05 16:14:02 jhb Exp $
 
 # This is our first version; it depends on no other.
 # This version was first added to 7.0-current.
@@ -15,6 +15,3 @@
 # simple ABI-checking tools.
 FBSDprivate_1.0 {
 } FBSD_1.0;
-
-FBSDprivate_1.1 {
-} FBSD_1.1;

==== //depot/projects/mips2-jnpr/src/lib/libc/mips/Makefile.inc#2 (text+ko) ====


==== //depot/projects/mips2-jnpr/src/lib/libc/mips/SYS.h#2 (text+ko) ====


==== //depot/projects/mips2-jnpr/src/lib/libc/mips/Symbol.map#2 (text+ko) ====


==== //depot/projects/mips2-jnpr/src/lib/libc/mips/_fpmath.h#3 (text+ko) ====


==== //depot/projects/mips2-jnpr/src/lib/libc/mips/arith.h#3 (text+ko) ====


==== //depot/projects/mips2-jnpr/src/lib/libc/mips/gd_qnan.h#3 (text+ko) ====


==== //depot/projects/mips2-jnpr/src/lib/libc/mips/gdtoa/Makefile.inc#2 (text+ko) ====


==== //depot/projects/mips2-jnpr/src/lib/libc/mips/gdtoa/arith.h#2 (text+ko) ====


==== //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/Makefile.inc#3 (text+ko) ====


==== //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/_set_tp.c#2 (text+ko) ====


==== //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/_setjmp.S#7 (text+ko) ====


==== //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/fabs.S#4 (text+ko) ====


==== //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/fabs.c#2 (text+ko) ====


==== //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/flt_rounds.c#2 (text+ko) ====


==== //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/fpgetmask.c#2 (text+ko) ====


==== //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/fpgetround.c#2 (text+ko) ====


==== //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/fpgetsticky.c#2 (text+ko) ====


==== //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/fpsetmask.c#2 (text+ko) ====


==== //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/fpsetround.c#2 (text+ko) ====


==== //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/fpsetsticky.c#2 (text+ko) ====


==== //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/infinity.c#2 (text+ko) ====


==== //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/ldexp.S#4 (text+ko) ====


==== //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/longjmp.c#2 (text+ko) ====


==== //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/makecontext.c#3 (text+ko) ====


==== //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/modf.S#4 (text+ko) ====


==== //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/modf.c#2 (text+ko) ====


==== //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/setjmp.S#5 (text+ko) ====


==== //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/signalcontext.c#2 (text+ko) ====


==== //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/sigsetjmp.S#4 (text+ko) ====


==== //depot/projects/mips2-jnpr/src/lib/libc/mips/net/Makefile.inc#2 (text+ko) ====


==== //depot/projects/mips2-jnpr/src/lib/libc/mips/net/htonl.S#2 (text+ko) ====


==== //depot/projects/mips2-jnpr/src/lib/libc/mips/net/htons.S#2 (text+ko) ====


==== //depot/projects/mips2-jnpr/src/lib/libc/mips/net/ntohl.S#2 (text+ko) ====


==== //depot/projects/mips2-jnpr/src/lib/libc/mips/net/ntohs.S#2 (text+ko) ====


==== //depot/projects/mips2-jnpr/src/lib/libc/mips/softfloat/milieu.h#2 (text+ko) ====


==== //depot/projects/mips2-jnpr/src/lib/libc/mips/softfloat/mips-gcc.h#2 (text+ko) ====


==== //depot/projects/mips2-jnpr/src/lib/libc/mips/softfloat/softfloat.h#2 (text+ko) ====


==== //depot/projects/mips2-jnpr/src/lib/libc/mips/stdlib/Makefile.inc#2 (text+ko) ====


==== //depot/projects/mips2-jnpr/src/lib/libc/mips/string/Makefile.inc#2 (text+ko) ====


==== //depot/projects/mips2-jnpr/src/lib/libc/mips/string/bcmp.S#2 (text+ko) ====


==== //depot/projects/mips2-jnpr/src/lib/libc/mips/string/bcopy.S#2 (text+ko) ====


==== //depot/projects/mips2-jnpr/src/lib/libc/mips/string/bzero.S#2 (text+ko) ====


==== //depot/projects/mips2-jnpr/src/lib/libc/mips/string/ffs.S#2 (text+ko) ====


==== //depot/projects/mips2-jnpr/src/lib/libc/mips/string/index.S#2 (text+ko) ====


==== //depot/projects/mips2-jnpr/src/lib/libc/mips/string/memcpy.S#2 (text+ko) ====


==== //depot/projects/mips2-jnpr/src/lib/libc/mips/string/memmove.S#2 (text+ko) ====


==== //depot/projects/mips2-jnpr/src/lib/libc/mips/string/rindex.S#2 (text+ko) ====


==== //depot/projects/mips2-jnpr/src/lib/libc/mips/string/strcmp.S#2 (text+ko) ====


==== //depot/projects/mips2-jnpr/src/lib/libc/mips/string/strlen.S#2 (text+ko) ====


==== //depot/projects/mips2-jnpr/src/lib/libc/mips/sys/Makefile.inc#2 (text+ko) ====


==== //depot/projects/mips2-jnpr/src/lib/libc/mips/sys/Ovfork.S#2 (text+ko) ====


==== //depot/projects/mips2-jnpr/src/lib/libc/mips/sys/brk.S#2 (text+ko) ====


==== //depot/projects/mips2-jnpr/src/lib/libc/mips/sys/cerror.S#2 (text+ko) ====


==== //depot/projects/mips2-jnpr/src/lib/libc/mips/sys/exect.S#2 (text+ko) ====


==== //depot/projects/mips2-jnpr/src/lib/libc/mips/sys/fork.S#2 (text+ko) ====


==== //depot/projects/mips2-jnpr/src/lib/libc/mips/sys/pipe.S#2 (text+ko) ====


==== //depot/projects/mips2-jnpr/src/lib/libc/mips/sys/ptrace.S#2 (text+ko) ====


==== //depot/projects/mips2-jnpr/src/lib/libc/mips/sys/sbrk.S#3 (text+ko) ====


==== //depot/projects/mips2-jnpr/src/lib/libc/mips/sys/shmat.S#2 (text+ko) ====


==== //depot/projects/mips2-jnpr/src/lib/libc/mips/sys/syscall.S#2 (text+ko) ====


==== //depot/projects/mips2-jnpr/src/lib/libc/stdio/Symbol.map#3 (text) ====

@@ -1,5 +1,5 @@
 /*
- * $FreeBSD: src/lib/libc/stdio/Symbol.map,v 1.7 2008/05/04 04:11:01 marcel Exp $
+ * $FreeBSD: src/lib/libc/stdio/Symbol.map,v 1.8 2008/05/05 16:14:02 jhb Exp $
  */
 
 FBSD_1.0 {
@@ -149,9 +149,3 @@
 	__printf_arginfo_vis;
 	__printf_render_vis;
 };
-
-FBSDprivate_1.1 {
-	__fgetcookie;
-	__fgetpendout;
-	__fsetfileno;
-};

==== //depot/projects/mips2-jnpr/src/lib/libc/stdio/clrerr.c#3 (text+ko) ====

@@ -34,15 +34,15 @@
 static char sccsid[] = "@(#)clrerr.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include 
-__FBSDID("$FreeBSD: src/lib/libc/stdio/clrerr.c,v 1.11 2008/05/02 15:25:07 jhb Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/clrerr.c,v 1.12 2008/05/05 16:03:52 jhb Exp $");
 
 #include "namespace.h"
 #include 
 #include "un-namespace.h"
-#include "local.h"
 #include "libc_private.h"
 
-#define	__sclearerr(p)	((void)((p)->_flags &= ~(__SERR|__SEOF)))
+#undef clearerr
+#undef clearerr_unlocked
 
 void
 clearerr(fp)

==== //depot/projects/mips2-jnpr/src/lib/libc/stdio/feof.c#3 (text+ko) ====

@@ -34,15 +34,15 @@
 static char sccsid[] = "@(#)feof.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include 
-__FBSDID("$FreeBSD: src/lib/libc/stdio/feof.c,v 1.11 2008/05/02 15:25:07 jhb Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/feof.c,v 1.12 2008/05/05 16:03:52 jhb Exp $");
 
 #include "namespace.h"
 #include 
 #include "un-namespace.h"
-#include "local.h"
 #include "libc_private.h"
 
-#define	__sfeof(p)	(((p)->_flags & __SEOF) != 0)
+#undef feof
+#undef feof_unlocked
 
 int
 feof(FILE *fp)

==== //depot/projects/mips2-jnpr/src/lib/libc/stdio/ferror.c#3 (text+ko) ====

@@ -34,14 +34,16 @@
 static char sccsid[] = "@(#)ferror.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include 
-__FBSDID("$FreeBSD: src/lib/libc/stdio/ferror.c,v 1.11 2008/05/02 15:25:07 jhb Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/ferror.c,v 1.12 2008/05/05 16:03:52 jhb Exp $");
 
 #include "namespace.h"
 #include 
 #include "un-namespace.h"
-#include "local.h"
 #include "libc_private.h"
 
+#undef ferror
+#undef ferror_unlocked
+
 int
 ferror(FILE *fp)
 {

==== //depot/projects/mips2-jnpr/src/lib/libc/stdio/fileno.c#3 (text+ko) ====

@@ -34,15 +34,15 @@
 static char sccsid[] = "@(#)fileno.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include 
-__FBSDID("$FreeBSD: src/lib/libc/stdio/fileno.c,v 1.12 2008/05/02 15:25:07 jhb Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/fileno.c,v 1.13 2008/05/05 16:03:52 jhb Exp $");
 
 #include "namespace.h"
 #include 
 #include "un-namespace.h"
-#include "local.h"
 #include "libc_private.h"
 
-#define	__sfileno(p)	((p)->_file)
+#undef fileno
+#undef fileno_unlocked
 
 int
 fileno(FILE *fp)

==== //depot/projects/mips2-jnpr/src/lib/libc/stdio/getc.c#3 (text+ko) ====

@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)getc.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include 
-__FBSDID("$FreeBSD: src/lib/libc/stdio/getc.c,v 1.15 2008/05/02 15:25:07 jhb Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/getc.c,v 1.16 2008/05/05 16:03:52 jhb Exp $");
 
 #include "namespace.h"
 #include 
@@ -42,6 +42,9 @@
 #include "libc_private.h"
 #include "local.h"
 
+#undef getc
+#undef getc_unlocked
+
 int
 getc(FILE *fp)
 {

==== //depot/projects/mips2-jnpr/src/lib/libc/stdio/getchar.c#3 (text+ko) ====

@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)getchar.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include 
-__FBSDID("$FreeBSD: src/lib/libc/stdio/getchar.c,v 1.14 2008/05/02 15:25:07 jhb Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/getchar.c,v 1.15 2008/05/05 16:03:52 jhb Exp $");
 
 /*
  * A subroutine version of the macro getchar.
@@ -45,6 +45,9 @@
 #include "local.h"
 #include "libc_private.h"
 
+#undef getchar
+#undef getchar_unlocked
+
 int
 getchar()
 {

==== //depot/projects/mips2-jnpr/src/lib/libc/stdio/local.h#3 (text+ko) ====

@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)local.h	8.3 (Berkeley) 7/3/94
- * $FreeBSD: src/lib/libc/stdio/local.h,v 1.32 2008/05/02 15:25:07 jhb Exp $
+ * $FreeBSD: src/lib/libc/stdio/local.h,v 1.33 2008/05/05 16:03:52 jhb Exp $
  */
 
 #include 	/* for off_t */
@@ -39,105 +39,9 @@
 #include 
 
 /*
- * Information local to this implementation of stdio, in particular,
- * macros, private functions, private variables, and the definition of
- * FILE.
- *
- * NB: to fit things in six character monocase externals, the stdio
- * code uses the prefix `__s' for stdio objects, typically followed
- * by a three-character attempt at a mnemonic.
- */
-
-/* stdio buffers */
-struct __sbuf {
-	unsigned char *_base;
-	int	_size;
-};
-
-/*
- * stdio state variables.
- *
- * The following always hold:
- *
- *	if (_flags&(__SLBF|__SWR)) == (__SLBF|__SWR),
- *		_lbfsize is -_bf._size, else _lbfsize is 0
- *	if _flags&__SRD, _w is 0
- *	if _flags&__SWR, _r is 0
- *
- * This ensures that the getc and putc macros (or inline functions) never
- * try to write or read from a file that is in `read' or `write' mode.
- * (Moreover, they can, and do, automatically switch from read mode to
- * write mode, and back, on "r+" and "w+" files.)
- *
- * _lbfsize is used only to make the inline line-buffered output stream
- * code as compact as possible.
- *
- * _ub, _up, and _ur are used when ungetc() pushes back more characters
- * than fit in the current _bf, or when ungetc() pushes back a character
- * that does not match the previous one in _bf.  When this happens,
- * _ub._base becomes non-nil (i.e., a stream has ungetc() data iff
- * _ub._base!=NULL) and _up and _ur save the current values of _p and _r.
- *
- * Certain members of __sFILE are accessed directly via macros or
- * inline functions.  To preserve ABI compat, these members must not
- * be disturbed.  These members are marked below with (*).
+ * Information local to this implementation of stdio,
+ * in particular, macros and private variables.
  */
-struct __sFILE {
-	unsigned char *_p;	/* (*) current position in (some) buffer */
-	int	_r;		/* (*) read space left for getc() */
-	int	_w;		/* (*) write space left for putc() */
-	short	_flags;		/* (*) flags, below; this FILE is free if 0 */
-	short	_file;		/* (*) fileno, if Unix descriptor, else -1 */
-	struct	__sbuf _bf;	/* the buffer (at least 1 byte, if !NULL) */
-	int	_lbfsize;	/* (*) 0 or -_bf._size, for inline putc */
-
-	/* operations */
-	void	*_cookie;	/* cookie passed to io functions */
-	int	(*_close)(void *);
-	int	(*_read)(void *, char *, int);
-	fpos_t	(*_seek)(void *, fpos_t, int);
-	int	(*_write)(void *, const char *, int);
-
-	/* separate buffer for long sequences of ungetc() */
-	struct	__sbuf _ub;	/* ungetc buffer */
-	unsigned char	*_up;	/* saved _p when _p is doing ungetc data */
-	int	_ur;		/* saved _r when _r is counting ungetc data */
-
-	/* tricks to meet minimum requirements even when malloc() fails */
-	unsigned char _ubuf[3];	/* guarantee an ungetc() buffer */
-	unsigned char _nbuf[1];	/* guarantee a getc() buffer */
-
-	/* separate buffer for fgetln() when line crosses buffer boundary */
-	struct	__sbuf _lb;	/* buffer for fgetln() */
-
-	/* Unix stdio files get aligned to block boundaries on fseek() */
-	int	_blksize;	/* stat.st_blksize (may be != _bf._size) */
-	fpos_t	_offset;	/* current lseek offset */
-
-	pthread_mutex_t _fl_mutex;	/* used for MT-safety */
-	pthread_t _fl_owner;	/* current owner */
-	int	_fl_count;	/* recursive lock count */
-	int	_orientation;	/* orientation for fwide() */
-	mbstate_t _mbstate;	/* multibyte conversion state */
-};
-
-#define	__SLBF	0x0001		/* line buffered */
-#define	__SNBF	0x0002		/* unbuffered */
-#define	__SRD	0x0004		/* OK to read */
-#define	__SWR	0x0008		/* OK to write */
-	/* RD and WR are never simultaneously asserted */
-#define	__SRW	0x0010		/* open for reading & writing */
-#define	__SEOF	0x0020		/* found EOF */
-#define	__SERR	0x0040		/* found error */
-#define	__SMBF	0x0080		/* _buf is from malloc */
-#define	__SAPP	0x0100		/* fdopen()ed in append mode */
-#define	__SSTR	0x0200		/* this is an sprintf/snprintf string */
-#define	__SOPT	0x0400		/* do fseek() optimization */
-#define	__SNPT	0x0800		/* do not do fseek() optimization */
-#define	__SOFF	0x1000		/* set iff _offset is in fact correct */
-#define	__SMOD	0x2000		/* true => fgetln modified _p text */
-#define	__SALC	0x4000		/* allocate string space dynamically */
-#define	__SIGN	0x8000		/* ignore this file in _fwalk */
 
 extern int	_sread(FILE *, char *, int);
 extern int	_swrite(FILE *, char const *, int);
@@ -153,8 +57,6 @@
 extern int	__slbexpand(FILE *, size_t);
 extern int	__srefill(FILE *);
 extern int	__sread(void *, char *, int);
-extern int	__srget(FILE *);
-extern int	__swbuf(int, FILE *);
 extern int	__swrite(void *, char const *, int);
 extern fpos_t	__sseek(void *, fpos_t, int);
 extern int	__sclose(void *);
@@ -179,38 +81,6 @@
 
 
 /*
- * Get and store individual characters from a file stream.
- */
-#define	__sgetc(p) (--(p)->_r < 0 ? __srget(p) : (int)(*(p)->_p++))
-#if defined(__GNUC__) && defined(__STDC__)
-static __inline int
-__sputc(int _c, FILE *_p)
-{
-	if (--_p->_w >= 0 || (_p->_w >= _p->_lbfsize && (char)_c != '\n'))
-		return (*_p->_p++ = _c);
-	else
-		return (__swbuf(_c, _p));
-}
-#else
-/*
- * This has been tuned to generate reasonable code on the vax using pcc.
- */
-#define	__sputc(c, p) \
-	(--(p)->_w < 0 ? \
-		(p)->_w >= (p)->_lbfsize ? \
-			(*(p)->_p = (c)), *(p)->_p != '\n' ? \
-				(int)*(p)->_p++ : \
-				__swbuf('\n', p) : \
-			__swbuf((int)(c), p) : \
-		(*(p)->_p = (c), (int)*(p)->_p++))
-#endif
-
-/*
- * Return true if the file stream has encountered an error.
- */
-#define	__sferror(p)	(((p)->_flags & __SERR) != 0)
-
-/*
  * Prepare the given FILE for writing, and return 0 iff it
  * can be written now.  Otherwise, return EOF and set errno.
  */

==== //depot/projects/mips2-jnpr/src/lib/libc/stdio/putc.c#3 (text+ko) ====

@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)putc.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include 
-__FBSDID("$FreeBSD: src/lib/libc/stdio/putc.c,v 1.15 2008/05/02 15:25:07 jhb Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/putc.c,v 1.16 2008/05/05 16:03:52 jhb Exp $");
 
 #include "namespace.h"
 #include 
@@ -42,6 +42,9 @@
 #include "local.h"
 #include "libc_private.h"
 
+#undef putc
+#undef putc_unlocked
+
 int
 putc(c, fp)
 	int c;

==== //depot/projects/mips2-jnpr/src/lib/libc/stdio/putchar.c#3 (text+ko) ====

@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)putchar.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include 
-__FBSDID("$FreeBSD: src/lib/libc/stdio/putchar.c,v 1.15 2008/05/02 15:25:07 jhb Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/putchar.c,v 1.16 2008/05/05 16:03:52 jhb Exp $");
 
 #include "namespace.h"
 #include 
@@ -42,6 +42,9 @@
 #include "local.h"
 #include "libc_private.h"
 
+#undef putchar
+#undef putchar_unlocked
+
 /*
  * A subroutine version of the macro putchar
  */

==== //depot/projects/mips2-jnpr/src/lib/libc/stdio/stdio.c#3 (text+ko) ====

@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)stdio.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include 
-__FBSDID("$FreeBSD: src/lib/libc/stdio/stdio.c,v 1.27 2008/05/03 23:35:59 marcel Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/stdio.c,v 1.28 2008/05/05 16:14:02 jhb Exp $");
 
 #include "namespace.h"
 #include 
@@ -46,27 +46,6 @@
 #include "un-namespace.h"
 #include "local.h"
 
-void *
-__fgetcookie(FILE *fp)

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Mon May  5 18:44:54 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8504D1065675; Mon,  5 May 2008 18:44:54 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 462F3106566C
	for ; Mon,  5 May 2008 18:44:54 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 1E2FB8FC1B
	for ; Mon,  5 May 2008 18:44:54 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m45IinL3007446
	for ; Mon, 5 May 2008 18:44:49 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m45Iimmt007443
	for perforce@freebsd.org; Mon, 5 May 2008 18:44:48 GMT
	(envelope-from imp@freebsd.org)
Date: Mon, 5 May 2008 18:44:48 GMT
Message-Id: <200805051844.m45Iimmt007443@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 
Cc: 
Subject: PERFORCE change 141199 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Mon, 05 May 2008 18:44:54 -0000

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

Change 141199 by imp@imp_paco-paco on 2008/05/05 18:43:48

	IF mips2 again, this time -d @141198

Affected files ...

.. //depot/projects/mips2-jnpr/src/sys/mips/include/am29lv081b.h#3 delete
.. //depot/projects/mips2-jnpr/src/sys/mips/include/cp0.h#3 delete
.. //depot/projects/mips2-jnpr/src/sys/mips/include/ns16550.h#4 delete
.. //depot/projects/mips2-jnpr/src/sys/mips/mips/mips_subr.c#5 delete

Differences ...

From owner-p4-projects@FreeBSD.ORG  Tue May  6 02:59:58 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E36081065670; Tue,  6 May 2008 02:59:57 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A4BD0106566B
	for ; Tue,  6 May 2008 02:59:57 +0000 (UTC)
	(envelope-from rfrench@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 81E868FC13
	for ; Tue,  6 May 2008 02:59:57 +0000 (UTC)
	(envelope-from rfrench@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m462xvUw095923
	for ; Tue, 6 May 2008 02:59:57 GMT
	(envelope-from rfrench@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m462xvhN095921
	for perforce@freebsd.org; Tue, 6 May 2008 02:59:57 GMT
	(envelope-from rfrench@FreeBSD.org)
Date: Tue, 6 May 2008 02:59:57 GMT
Message-Id: <200805060259.m462xvhN095921@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	rfrench@FreeBSD.org using -f
From: Ryan French 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 141225 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Tue, 06 May 2008 02:59:58 -0000

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

Change 141225 by rfrench@rfrench_mpls on 2008/05/06 02:59:06

	First submission for MPLS project. Contains begginings of mpls-needle, a small program used ot inject mpls packets onto the network stack.
	PR:		rfrench-mpls
	Submitted by:	Ryan French

Affected files ...

.. //depot/projects/soc2008/rfrench_mpls/mpls-needle/mpls-needle.c#1 add

Differences ...

From owner-p4-projects@FreeBSD.ORG  Tue May  6 04:01:03 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id EE7CC1065670; Tue,  6 May 2008 04:01:02 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AE5EF106564A
	for ; Tue,  6 May 2008 04:01:02 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id A52898FC0A
	for ; Tue,  6 May 2008 04:01:02 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m46412xu099119
	for ; Tue, 6 May 2008 04:01:02 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m46412k7099117
	for perforce@freebsd.org; Tue, 6 May 2008 04:01:02 GMT
	(envelope-from sam@freebsd.org)
Date: Tue, 6 May 2008 04:01:02 GMT
Message-Id: <200805060401.m46412k7099117@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 141226 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Tue, 06 May 2008 04:01:03 -0000

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

Change 141226 by sam@sam_ebb on 2008/05/06 04:00:11

	Bring in old fix; when forming ADDBA request use the starting
	seq# from the state block so a BA stream starts off with the
	expected seq#.  We carefully do this after calling back into
	the driver so it has a chance to fillin this value as it may
	have to come out of the device (in case it's handling BA's).

Affected files ...

.. //depot/projects/vap/sys/net80211/ieee80211_ht.c#22 edit

Differences ...

==== //depot/projects/vap/sys/net80211/ieee80211_ht.c#22 (text+ko) ====

@@ -1651,9 +1651,6 @@
 		| SM(IEEE80211_AGGR_BAWMAX, IEEE80211_BAPS_BUFSIZ)
 		;
 	args[2] = 0;	/* batimeout */
-	args[3] = SM(0, IEEE80211_BASEQ_START)
-		| SM(0, IEEE80211_BASEQ_FRAG)
-		;
 	/* NB: do first so there's no race against reply */
 	if (!ic->ic_addba_request(ni, tap, dialogtoken, args[1], args[2])) {
 		/* unable to setup state, don't make request */
@@ -1668,6 +1665,10 @@
 		return 0;
 	}
 	tokens = dialogtoken;			/* allocate token */
+	/* NB: after calling ic_addba_request so driver can set seqstart */
+	args[3] = SM(tap->txa_seqstart, IEEE80211_BASEQ_START)
+		| SM(0, IEEE80211_BASEQ_FRAG)
+		;
 	return ic->ic_send_action(ni, IEEE80211_ACTION_CAT_BA,
 		IEEE80211_ACTION_BA_ADDBA_REQUEST, args);
 }

From owner-p4-projects@FreeBSD.ORG  Tue May  6 17:47:41 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4D7DA1065677; Tue,  6 May 2008 17:47:41 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EA1711065670
	for ; Tue,  6 May 2008 17:47:40 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id D57458FC13
	for ; Tue,  6 May 2008 17:47:40 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m46Hle2s085467
	for ; Tue, 6 May 2008 17:47:40 GMT
	(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m46Hlejw085465
	for perforce@freebsd.org; Tue, 6 May 2008 17:47:40 GMT
	(envelope-from pgj@FreeBSD.org)
Date: Tue, 6 May 2008 17:47:40 GMT
Message-Id: <200805061747.m46Hlejw085465@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	pgj@FreeBSD.org using -f
From: Gabor Pali 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 141247 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Tue, 06 May 2008 17:47:41 -0000

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

Change 141247 by pgj@disznohal on 2008/05/06 17:47:05

	Cleanup in Chapter 25.

Affected files ...

.. //depot/projects/docproj_hu/books/handbook/ppp-and-slip/chapter.sgml#4 edit

Differences ...

==== //depot/projects/docproj_hu/books/handbook/ppp-and-slip/chapter.sgml#4 (text+ko) ====

@@ -14,8 +14,8 @@
       
 	Jim
 	Mock
-	Újjászervezte, újrarendezte
-	  és frissítette: 
+	Átdolgozta, átrendezte és
+	  aktualizálta: 
       
     
   
@@ -25,12 +25,8 @@
   
     Áttekintés
 
-    
-      PPP
-    
-    
-      SLIP
-    
+    PPP
+    SLIP
 
     A &os; számos módon képes
       összekötni két
@@ -39,7 +35,7 @@
       hálózati vagy internetes kapcsolatot
       felépíteni, esetleg azt szeretnénk, hogy
       mások képesek legyenek minket ilyen módon
-      elérni, akkor ahhoz PPP-t ill.  SLIP-et kell
+      elérni, akkor ahhoz PPP-t, illetve SLIP-et kell
       használnunk.  Ebben a fejezetben a modemes
       kommunikáció beállításait
       mutatjuk be részletesebben.
@@ -50,25 +46,25 @@
     
       
 	hogyan állítsunk be
-	  felhasználói PPP-t
+	  felhasználói PPP-t;
       
       
 	hogyan állítsunk be rendszerszintû
-	  PPP-t
+	  PPP-t;
       
       
 	hogyan állítsunk be egy
 	  PPPoE (PPP over Ethernet, vagyis PPP
-	  Ethernet felett) kapcsolatot
+	  Ethernet felett) kapcsolatot;
       
       
 	hogyan állítsunk be egy
 	  PPPoA (PPP over ATM, vagyis PPP ATM
-	  felett) kapcsolatot
-	
+	  felett) kapcsolatot;
+      
       
 	hogyan állítsunk be SLIP klienst és
-	  szervert
+	  szervert.
       
     
 
@@ -90,12 +86,12 @@
     
       
 	az alapvetõ hálózati
-	  technológiák ismerete
+	  technológiák ismerete;
       
       
 	a betárcsázós kapcsolatok, a PPP
 	  és/vagy SLIP alapjainak és céljainak
-	  megértése
+	  megértése.
       
     
 
@@ -122,7 +118,7 @@
 	egyszerûen csak ppp néven
 	fogjuk hivatkozni, hacsak nem lesz szükséges
 	különbséget tennünk közte és
-	más PPP szoftverek, mint mondjuk a
+	más PPP szoftverek, mint például a
 	pppd között.  Ha
 	mást nem mondunk, akkor a fejezetben ismertetett
 	összes parancsot root
@@ -137,7 +133,7 @@
 	
 	  Tom
 	  Rhodes
-	  Frissítette és feljavította:
+	  Frissítette és javította:
 	    
 	
       
@@ -152,7 +148,7 @@
 	
 	  Nik
 	  Clayton
-	  A bemenetet szolgáltatta: 
+	  Segített még: 
 	
 	
 	  Dirk
@@ -177,46 +173,36 @@
 	  rendelkezünk a következõkkel:
 
 	
-	  
-	    internet szolgáltató
-	  
-	  
-	    PPP kapcsolat
-	  
+	  internet-szolgáltató
+	  PPP
+	    kapcsolat
 
 	  
-	    olyan internet elõfizetés, ahol PPP-n
+	    Olyan internet-elõfizetés, ahol PPP-n
 	      keresztül csatlakozunk
 	  
 
 	  
-	    egy modem vagy más olyan
-	      rendszerünkhöz csatlakozó eszköz, amin
-	      keresztül el tudjuk érni az internet
-	      szolgáltatónkat
+	    Egy modem vagy más olyan
+	      rendszerünkhöz csatlakozó eszköz,
+	      amelyen keresztül el tudjuk érni az
+	      internet-szolgáltatónkat
 	  
 
 	  
-	    az internet elõfizetés
-	      betárcsázáshoz szükséges
-	      telefonszáma(i)
+	    Az internet-elõfizetés
+	      betárcsázásához
+	      szükséges telefonszámok
 	  
 
-	  
-	    PAP
-	  
-	  
-	    CHAP
-	  
-	  
-	    UNIX
-	  
-	  
-	    bejelentkezési név
-	  
-	  
-	    jelszó
-	  
+	  PAP
+	  CHAP
+	  UNIX
+	  bejelentkezési
+	    név
+	  jelszó
 
 	  
 	    A bejelentkezési nevünk és
@@ -227,23 +213,22 @@
 	      jelszó.)
 	  
 
-	  
-	    névszerver
-	  
+	  névszerver
 
 	  
 	    Egy vagy több névszerver IP-címe.
-	      Ehhez az internet szolgáltatók
+	      Ehhez az internet-szolgáltatók
 	      általában két IP-címet adnak
 	      meg.  Ha egyet sem kaptunk, akkor a
 	      ppp.conf állományban
-	      erre a célra használhatjuk a enable
-	      dns parancsot, és ekkor a
+	      erre a célra használhatjuk az
+	      enable dns parancsot, és ekkor a
 	      ppp majd automatikusan be fogja
 	      állítani nekünk a
 	      névszervereket.  Ezt a lehetõséget az
-	      befolyásolja, hogy az internet
-	      szolgáltató oldalán
+	      befolyásolja, hogy az
+	      internet-szolgáltató oldalán
 	      mûködõ PPP implementáció
 	      támogatja-e a névfeloldás
 	      egyeztetését (DNS negotiation).
@@ -251,16 +236,17 @@
 	
 
 	A következõ információkat is
-	  megkaphatjuk az internet elõfizetésünkhöz,
-	  de nem feltétlenül szükségesek:
+	  megkaphatjuk az
+	  internet-elõfizetésünkhöz, de nem
+	  feltétlenül szükségesek:
 
 	
 	  
-	    Az internet szolgáltató
-	      átjárójának IP-címe.  Az
-	      átjáró az a gép, amin
+	    Az internet-szolgáltató
+	      átjárójának IP-címe.
+	      Az átjáró az a gép, amelyen
 	      keresztül a gépünk csatlakozik és
-	      számára az lesz az
+	      számára ez lesz az
 	      alapértelmezett
 	      átjáró.  Ha nem
 	      rendelkezünk ezzel az információval,
@@ -275,36 +261,35 @@
 
 	  
 	    A használandó hálózati
-	      maszk.  Amennyiben a szolgáltató ezt nem adta
-	      meg, nyugodtan használjuk erre a 255.255.255.255
 	      értéket.
 	  
 
-	  
-	    statikus IP-cím
-	  
+	  statikus
+	    IP-cím
 
 	  
 	    Ha a szolgáltatónk statikus
 	      IP-címet és rögzített
-	      hálózati nevet is biztosít nekünk,
-	      ezt is megadhatjuk.  Minden más esetben
-	      egyszerûen csak hagyjuk, hogy a rendszer
+	      hálózati nevet is biztosít
+	      nekünk, ezt is megadhatjuk.  Minden más
+	      esetben egyszerûen csak hagyjuk, hogy a rendszer
 	      automatikusan válasszon nekünk egyet.
 	  
 	
- 
+
 	Ha a szükséges információknak
 	  nem vagyunk birtokában, akkor vegyük fel a
-	  kapcsolatot az internet szolgáltatókkal.
+	  kapcsolatot az internet-szolgáltatókkal.
 
 	
 	  Ebben a szakaszban a példákban
 	    szereplõ konfigurációs
 	    állományok sorait számozva
-	    láthatjuk.  Ezek a sorszámok a bemutatás
-	    és a tárgyalás
+	    láthatjuk.  Ezek a sorszámok a
+	    bemutatás és a tárgyalás
 	    megkönnyítése érdekében
 	    szerepelnek, és nem az eredeti
 	    állományok részei.  Mindezek mellett a
@@ -329,7 +314,7 @@
 	  /etc/ppp könyvtárban
 	  található konfigurációs
 	  állományokat használja.  A
-	  felhasználói PPP-hez ezen kívül
+	  felhasználói PPP-hez ezenkívül
 	  még a /usr/share/examples/ppp/
 	  könyvtárban vannak példák.
 
@@ -362,9 +347,9 @@
 
 	  
 	    A : karakterrel
-	      végzõdõ sorok mindig az elsõ oszlopban
-	      kezdõdnek (tehát a sor elején),
-	      míg az összes többi sort
+	      végzõdõ sorok mindig az elsõ
+	      oszlopban kezdõdnek (tehát a sor
+	      elején), míg az összes többi sort
 	      tabulátorok vagy szóközök
 	      használatával bentebb kell raknunk.
 	  
@@ -394,9 +379,9 @@
 
 	      
 		Ez azonosítja be az alapértelmezett
-		  bejegyzést.  Az itt szereplõ parancsok a ppp
-		  minden egyes futásakor magukból
-		  végrehajtódnak.
+		  bejegyzést.  Az itt szereplõ parancsok a
+		  ppp minden egyes futásakor
+		  magukból végrehajtódnak.
 	      
 	    
 
@@ -413,8 +398,8 @@
 
 		set log phase tun
 
-		amivel jelentõs mértékben
-		  vissza tudjuk fogni a naplózás
+		Ezzel jelentõs mértékben vissza
+		  tudjuk fogni a naplózás
 		  mértékét.
 	      
 	    
@@ -423,13 +408,14 @@
 	      3. sor:
 
 	      
-		Ezzel mondjuk a PPP-nek, hogy a többiek
+		Ezzel mondjuk meg a PPP-nek, hogy a többiek
 		  felé miként azonosítsa
 		  magát.  A PPP akkor azonosítja
-		  magát a társak felé, ha valamilyen
-		  gondja akad az egyeztetésekkel és a
-		  kapcsolat beállításával.
-		  Az így továbbított
+		  magát a társak felé, ha
+		  valamilyen gondja akad az egyeztetésekkel
+		  és a kapcsolat
+		  beállításával.  Az
+		  így továbbított
 		  információk a másik oldal
 		  rendszergazdái számára
 		  nyújthatnak segítséget az ilyen
@@ -442,7 +428,7 @@
 	      4. sor:
 
 	      
-		Itt adjuk meg az eszközt, amire a modem
+		Itt adjuk meg az eszközt, amelyre a modem
 		  csatlakozik.  A COM1 neve
 		  /dev/cuaa0, a
 		  COM2 neve pedig
@@ -455,11 +441,11 @@
 
 	      
 		A csatlakozás sebességét
-		  adjuk meg.  Ha a 115200 érték itt nem
-		  mûködne (ami egyébként minden
-		  újabb gyártmányú modem
-		  esetében elfogadható), akkor helyette
-		  használjuk a 38400-as
+		  adjuk meg.  Ha a 115 200-as érték
+		  itt nem mûködne (ez egyébként
+		  minden újabb gyártmányú
+		  modem esetében elfogadható), akkor
+		  helyette használjuk a 38400-as
 		  beállítást.
 	      
 	    
@@ -474,18 +460,18 @@
 
 	      
 		A híváshoz használt
-		  karakterlánc.  A felhasználói PPP a
-		  &man.chat.8; programhoz hasonló
+		  karakterlánc.  A felhasználói PPP
+		  a &man.chat.8; programhoz hasonló
 		  küldök-várok
 		  típusú szerkesztést alkalmaz.  A
-		  nyelv lehetõségeirõl a man
-		  oldalán olvashatunk
-		  részletesebben.
+		  kihasználható
+		  lehetõségekrõl a man oldalán
+		  olvashatunk részletesebben.
 
-		Vegyük észre, hogy az
-		  olvashatóság kedvéért a
-		  parancs a következõ sorban folytatódik.
-		  A ppp.conf
+		Az olvashatóság
+		  kedvéért a parancs a következõ
+		  sorban folytatódik.  A
+		  ppp.conf
 		  állományban bármelyik parancs,
 		  ahol a \ karakterrel zárjuk a
 		  sort, az ugyanígy folytatható a
@@ -499,9 +485,9 @@
 	      
 		A kapcsolathoz tartozó
 		  üresjárati idõt állítja
-		  be.  Ennek értéke alapból 180
-		  másodperc, így ez a sor pusztán
-		  csak az érthetõséget
+		  be.  Ennek értéke alapból
+		  180 másodperc, így ez a sor
+		  pusztán csak az érthetõséget
 		  szolgálja.
 	      
 	    
@@ -515,7 +501,7 @@
 		  névfeloldó
 		  beállításait.  Ha saját
 		  névszervert futtatunk, akkor ezt a sort
-		  tegyük megjegyzésbe vagy
+		  tegyük inkább megjegyzésbe vagy
 		  töröljük ki.
 	      
 	    
@@ -538,10 +524,10 @@
 	      
 		Itt kezdõdik a szolgaltato
 		  nevû szolgáltatóhoz tartozó
-		  bejegyzés.  Ezt késõbb akár ki
-		  is cserélhetjük az internet
-		  szolgáltatónk nevére, így
-		  a 
+		  bejegyzés.  Ezt késõbb akár
+		  ki is cserélhetjük az
+		  internet-szolgáltatónk nevére,
+		  így a 
 		  beállítással tudjuk majd
 		  beindítani a kapcsolatot.
 	      
@@ -628,9 +614,9 @@
 		  bejelentkezés valahogy így néz
 		  ki:
 
-		Csodálatos Véletlen Szolgáltató
-login: ize
-password: mize
+		A Világ Legjobb Szolgáltatója
+login: izé
+password: mizé
 protocol: ppp
 
 		Ezt a szkriptet alakítsuk a saját
@@ -655,8 +641,8 @@
 		Beállítjuk a kapcsolathoz
 		  tartozó alapértelmezett
 		  idõkorlátot (másodpercben).  Itt a
-		  kapcsolat automatikusan lezárul 300
-		  másodperc tétlenséget
+		  kapcsolat automatikusan lezárul
+		  300 másodperc tétlenséget
 		  követõen.  Ha nem akarunk ilyen
 		  korlátot szabni, akkor ezt az
 		  értéket állítsuk
@@ -668,8 +654,8 @@
 
 	    
 	      17. sor:
-	      internet
-		szolgáltató
+
+	      internet-szolgáltató
 
 	      
 		A felülethez tartozó címeket
@@ -680,16 +666,16 @@
 		  y.y.y.y helyett pedig a
 		  szolgáltató
 		  átjárója kerül be
-		  (lényegében az a gép, amihez
-		  csatlakozunk).  Amennyiben az internet
-		  szolgáltatónk nem adott meg semmilyen
-		  átjárót, erre a célra a
-		  10.0.0.2/0
-		  címet is használhatjuk.  Amikor
-		  ki kell találnunk ezeket a
-		  címeket, akkor ne felejtsünk el
-		  létrehozni hozzájuk egy
-		  bejegyzést a
+		  (lényegében az a gép, amelyhez
+		  csatlakozunk).  Amennyiben az
+		  internet-szolgáltatónk nem adott meg
+		  semmilyen átjárót, erre a
+		  célra a 10.0.0.2/0 címet is
+		  használhatjuk.  Amikor nekünk kell
+		  kitalálnunk ezeket a címeket,
+		  akkor ne felejtsünk el létrehozni
+		  hozzájuk egy bejegyzést az
 		  /etc/ppp/ppp.linkup
 		  állományban a PPP dinamikus
@@ -716,26 +702,26 @@
 		  HISADDR nem lesz képes
 		  inicializálódni.
 
-		Ha a ppp-t nem akarjuk 
-		  módban futtatni, akkor ezt a sor a
-		  ppp.linkup állományba
-		  is átrakhatjuk.
+		Ha a ppp parancsot nem akarjuk
+		   módban futtatni, akkor ezt
+		  a sort a ppp.linkup
+		  állományba is átrakhatjuk.
 	      
 	    
 	  
 
 	  Ha statikus IP-címmel rendelkezünk és
-	    a ppp  módban fut, akkor a
-	    ppp.linkup állományba
-	    egészen addig nem kell semmit sem írnunk,
-	    amíg a csatlakozás elõtt az
-	    útválasztási
+	    a ppp 
+	    módban fut, akkor a ppp.linkup
+	    állományba egészen addig nem kell
+	    semmit sem írnunk, amíg a csatlakozás
+	    elõtt az útválasztási
 	    táblázatokban a megfelelõ adatok
-	    találhatóak.  Azonban olyankor is jól
+	    találhatóak.  Olyankor is jól
 	    jöhet, amikor a csatlakozást követõen
 	    meg akarunk hívni bizonyos programokat.  Ezt majd a
-	    sendmailes példában fogjuk bõvebben
-	    kifejteni.
+	    sendmailes példában
+	    fogjuk bõvebben kifejteni.
 
 	  Erre példákat a
 	    /usr/share/examples/ppp/
@@ -753,7 +739,7 @@
 
 	  IPCP
 
-	  Ha az internet szolgáltatónktól nem
+	  Ha az internet-szolgáltatónktól nem
 	    kaptunk statikus IP-címet, akkor a
 	    ppp paranccsal is be tudjuk
 	    állítani a helyi és távoli
@@ -790,8 +776,8 @@
 		  fog.
 
 		Az utolsó paraméterrel
-		  (0.0.0.0) azt mondjuk a PPP-nek, hogy
-		  az egyeztetést ne a 0.0.0.0) azt mondjuk a PPP-nek,
+		  hogy az egyeztetést ne a 10.0.0.1, hanem a 0.0.0.0 címmel kezdje
 		  meg, amire egyes szolgáltatók
@@ -839,7 +825,7 @@
 		  megtalálni.  Ha ez nem sikerül, akkor az
 		  átjárónknak megfelelõ
 		  bejegyzést kezdi el keresni.  Ez egy
-		  négy bájtból álló,
+		  négy byte-ból álló,
 		  felírásában az IP-címekhez
 		  hasonlító címke.  Ha még
 		  ez a címke sem található, akkor a
@@ -854,12 +840,12 @@
 	      
 		Ez a sor mondja meg a ppp
 		  programnak, hogy vegyen fel egy
-		  HISADDR címre vonatkozó
-		  alapértelmezett útvonalat.  A
-		  HISADDR címet az IPCP
-		  által egyeztetett átjáró
-		  IP-címére cseréljük
-		  ki.
+		  HISADDR címre
+		  vonatkozó alapértelmezett
+		  útvonalat.  A HISADDR
+		  címet az IPCP által egyeztetett
+		  átjáró IP-címére
+		  cseréljük ki.
 	      
 	    
 	  
@@ -897,11 +883,11 @@
 	    hálózatunkon ki kell osztani egy
 	    külön címet és az
 	    /etc/ppp/ppp.conf
-	    állományban meg kell adnunk a enable
-	    proxy parancsot.  Emellett még az
-	    /etc/rc.conf állományban
-	    se feleljtsük el megadni a következõ
-	    sort:
+	    állományban, és meg kell adnunk az
+	    enable proxy parancsot.  Emellett
+	    még az /etc/rc.conf
+	    állományban se feleljtsük el megadni a
+	    következõ sort:
 
 	  gateway_enable="YES"
 
@@ -912,8 +898,9 @@
 
 	  A &os;
 	    beállítása
-	    betárcsázós kapcsolatokhoz nagyon
-	    jól bemutatja a betárcsázós
+	    betárcsázós kapcsolatokhoz
+	    nagyon jól bemutatja a
+	    betárcsázós
 	    szolgáltatások
 	    beállítását a &man.getty.8;
 	    segítségével.
@@ -928,7 +915,7 @@
 
 	  A mgetty használatának
 	    többek közt az egyik elõnye, hogy
-	    aktívan tartja a kapcsolatot a
+	    aktívan tartja a kapcsolatot a
 	    modemekkel, tehát hogy ha az
 	    /etc/ttys állományban
 	    letiltjuk a modemet, akkor nem is fog válaszolni a
@@ -943,8 +930,8 @@
 	    a szerverünket.
 
 	  Ha errõl többet akarunk megtudni, akkor az
-	    mgetty paranccsal kapcsolatban olvassuk el
-	    Az mgetty és az
+	    mgetty paranccsal kapcsolatban olvassuk
+	    el Az mgetty és az
 	    AutoPPP címû szakaszt.
 
 	
@@ -955,8 +942,8 @@
 
 	  A ppp parancsot
 	    általában root
-	    felhasználóként kell futtatni.  Azonban
-	    ha a ppp parancsot tetszõleges
+	    felhasználóként kell futtatni.  Ha
+	    viszont a ppp parancsot tetszõleges
 	    felhasználóval akarjuk szerver módban
 	    futtatni az iméntiek szerint, akkor ahhoz fel kell
 	    vennünk az /etc/group
@@ -987,7 +974,7 @@
 
 	  Hozzunk létre egy
 	    /etc/ppp/ppp-shell nevû
-	    állományt, amiben a következõk
+	    állományt, amelyben a következõk
 	    szerepelnek:
 
 	  #!/bin/sh
@@ -1028,15 +1015,15 @@
 
 	  Hozzunk létre egy /home/ppp
 	    nevû könyvtárat a következõ
-	    bárki által olvasható 0 bájtos
+	    bárki által olvasható 0 byte-os
 	    állományokkal:
 
 	  -r--r--r--   1 root     wheel           0 May 27 02:23 .hushlogin
 -r--r--r--   1 root     wheel           0 May 27 02:22 .rhosts
 
-	  amelyek hatására az
-	    /etc/motd állomány tartalma
-	    nem jelenik meg.
+	  Ezek hatására az
+	    /etc/motd állomány
+	    tartalma nem jelenik meg.
 
 	
 
@@ -1054,13 +1041,13 @@
 	    szimbolikus linket a ppp-shell
 	    szkriptre.
 
-	  Például ha három
+	  Például, ha három
 	    betárcsázós ügyfelünk van,
-	    fred, sam és
-	    mary, feléjük 24 bites CIDR
-	    hálózatokat közvetítünk,
-	    akkor a következõket kell
-	    begépelnünk:
+	    fred, sam
+	    és mary, feléjük
+	    24 bites CIDR hálózatokat
+	    közvetítünk, akkor a következõket
+	    kell begépelnünk:
 
 	  &prompt.root; ln -s /etc/ppp/ppp-shell /etc/ppp/ppp-fred
 &prompt.root; ln -s /etc/ppp/ppp-shell /etc/ppp/ppp-sam
@@ -1104,7 +1091,7 @@
 	  A default: szakasz minden kapcsolat
 	    esetén betöltõdik.  Az
 	    /etc/ttys állományban
-	    engedélyezett mindenegyik
+	    engedélyezett mindegyik
 	    betárcsázós vonal létrehoz a
 	    fenti ttyd0: szakaszhoz hasonló
 	    bejegyzést.  Minden vonal kap egy egyedi
@@ -1121,13 +1108,13 @@
 
 	  A /usr/share/examples/ppp/ppp.conf
 	    állományban szereplõ tartalom mellett az
-	    összes statikus kiosztású IP-címmel
-	    rendelkezõ betárcsázó
-	    felhasználóhoz még hozzá kell
-	    tennünk egy szakaszt.  A példánkban ezek
-	    továbbra is fred,
-	    sam és
-	    mary.
+	    összes statikus kiosztású
+	    IP-címmel rendelkezõ
+	    betárcsázó felhasználóhoz
+	    még hozzá kell tennünk egy szakaszt.  A
+	    példánkban ezek továbbra is
+	    fred, sam
+	    és mary.
 
 	  fred:
   set ifaddr 203.14.100.1 203.14.101.1 255.255.255.255
@@ -1169,16 +1156,16 @@
 	  LCP
 
 	  Ha az mgetty programot az
-	    AUTO_PPP beállítással
-	    fordítjuk le, akkor azzal az mgetty
-	    képessé válik a PPP kapcsolatok LCP
-	    fázisát észlelni és
-	    magától létrehozni hozzá egy ppp
-	    shellt.  Azonban mivel az alapértelmezett
-	    név/jelszó páros ilyenkor nem jelenik
-	    meg, ezért a felhasználókat a PAP vagy
-	    a CHAP protokollon keresztül lehet
-	    hitelesíteni.
+	    AUTO_PPP
+	    beállítással fordítjuk le, akkor
+	    azzal az mgetty képessé
+	    válik a PPP kapcsolatok LCP fázisát
+	    észlelni és magától
+	    létrehozni hozzá egy ppp shellt.  Mivel az
+	    alapértelmezett név/jelszó páros
+	    azonban ilyenkor nem jelenik meg, a
+	    felhasználókat a PAP vagy a CHAP protokollon
+	    keresztül lehet hitelesíteni.
 
 	  Ez a szakasz most feltételezi, hogy a sikeresen
 	    beállítottuk, lefordítottuk és
@@ -1188,9 +1175,10 @@
 	    opció engedélyezésével.
 
 	  Az
-	    /usr/local/etc/mgetty+sendfax/login.config
-	    állományban ne felejtsük ellenõrizni,
-	    hogy szerepel a következõ:
+	  /usr/local/etc/mgetty+sendfax/login.config
+	    állományban ne felejtsük
+	    ellenõrizni, hogy szerepel a
+	    következõ:
 
 	  /AutoPPP/ -     -		      /etc/ppp/ppp-pap-dialup
 
@@ -1201,8 +1189,9 @@
 
 	  Hozzunk létre az
 	    /etc/ppp/ppp-pap-dialup nevû
-	    állományt, amiben majd a következõk
-	    fognak szerepelni (az állomány legyen
+	    állományt, amelyben majd a
+	    következõk fognak szerepelni (az
+	    állomány legyen
 	    végrehajtható):
 
 	  #!/bin/sh
@@ -1222,17 +1211,17 @@
   set ifaddr 203.14.100.1 203.14.100.20-203.14.100.40
   enable proxy
 
-	  Minden olyan felhasználónak, amivel ezzel
-	    a módszerrel jelentkezik be, szüksége lesz
+	  Minden olyan felhasználónak, aki ezzel a
+	    módszerrel jelentkezik be, szüksége lesz
 	    egy név/jelszó kombinációra az
 	    /etc/ppp/ppp.secret
 	    állományban, vagy az alábbi
 	    beállítás megadásával
-	    választhatjuk a felhasználók
-	    azonosítását az
+	    választhatjuk azt is, hogy a
+	    felhasználókat az
 	    /etc/passwd állományon
 	    keresztül a PAP protokoll
-	    segítségével.
+	    segítségével azonosítjuk.
 
 	  enable passwdauth
 
@@ -1280,12 +1269,13 @@
 set nbns 203.14.100.5
 
 	  Ezzel a kliens megkapja az elsõdleges és
-	    másodlagos névszerverek címeit valamint a
-	    NetBIOS névszervert.
+	    másodlagos névszerverek címeit,
+	    valamint a NetBIOS névszervert.
 
-	  Ha a második és az azt következõ
-	    verziókban a set dns sort elhagyjuk,
-	    akkor a PPP az /etc/resolv.conf
+	  Ha a második és az azt követõ
+	    verziókban a set dns sort
+	    elhagyjuk, akkor a PPP az
+	    /etc/resolv.conf
 	    állományban található
 	    értékeket fogja használni.
 
@@ -1297,7 +1287,7 @@
 	  PAP
 	  CHAP
 
-	  Egyes internet szolgáltatók úgy
+	  Egyes internet-szolgáltatók úgy
 	    állítják be a rendszerüket, hogy a
 	    kapcsolat felépítése során a
 	    hitelesítés a PAP vagy CHAP mechanizmusok
@@ -1311,8 +1301,9 @@
 	    a biztonság nem is annyira fontos, mivel a jelszavak,
 	    amelyeket ugyan a PAP titkosítatlan formában
 	    küld tovább, csak egy soros vonalon haladnak
-	    át.  A rossz indulatú
-	    támadók itt nem sok mindent tudnak lehallgatni.
+	    át.  A rossz indulatú támadók
+	    itt nem sok mindent tudnak
+	    lehallgatni.
 
 	  A PPP statikus
 	    IP-címmel és a 
 		Ebben a sorban adjuk meg a PAP/CHAP
-		  felhasználói nevünket.
+		  felhasználói nevünket, amelyet
 		  AFelhasználóiNevem
 		  helyett kell beírni.
 	      
@@ -1350,15 +1341,15 @@
 		  egyértelmûsítése
 		  érdekében ezek mellett még egy
 		  további sort is érdemes felvennünk,
-		  ami az:
+		  tehát:
 
 		16      accept PAP
 
-		vagy az
+		vagy
 
 		16      accept CHAP
 
-		de alapértelmezés szerint a PAP
+		Alapértelmezés szerint a PAP
 		  és CHAP is egyaránt elfogadott.
 	      
 	    
@@ -1368,10 +1359,10 @@
 
 	      
 		A PAP és CHAP alkalmazásakor
-		  általában nem is kell bejelentkeznünk
-		  a szolgáltató szerverére.
-		  Ezért a set login
-		  parancsnál használt
+		  általában nem is kell
+		  bejelentkeznünk a szolgáltató
+		  szerverére.  Ezért a set
+		  login parancsnál használt
 		  karakterláncot le is kell tiltanunk.
 	      
 	    
@@ -1385,8 +1376,8 @@
 	    megváltoztatása menet közben
 
 	  A háttérben futó
-	    ppp programhoz menet közben is tudunk
-	    beszélni, de csak olyankor, amikor az ehhez
+	    ppp programhoz menet közben is
+	    tudunk beszélni, de csak olyankor, amikor az ehhez
 	    szükséges portot megadtuk.  Ezt úgy
 	    tudjuk megtenni, ha beállítások
 	    közé felvesszük az alábbit:
@@ -1394,7 +1385,7 @@
 	  set server /var/run/ppp-tun%d DiagnosticPassword 0177
 
 	  Így a PPP az elõre megadott &unix;
-	    tartománybeli csatlakozáson keresztül fogja
+	    tartománybeli socketen keresztül fogja
 	    várni a kapcsolódásunkat, és a
 	    konkrét hozzáféréshez
 	    jelszót kér.  A névben szereplõ
@@ -1404,8 +1395,9 @@
 
 	  Miután a csatlakozás
 	    beállítódott, a szkriptekben a
-	    &man.pppctl.8; program használható a futó
-	    program vezérléséhez.
+	    &man.pppctl.8; program használható a
+	    futó program
+	    vezérléséhez.
 
 	
       
@@ -1419,29 +1411,30 @@
 	PPPNAT
 
 	A PPP képes a rendszermag
-	  rásegítése nélkül képes
-	  hálózati címfordítást
-	  végezni.  Ezt a lehetõséget a
-	  következõ sor hozzáadásával
-	  tudjuk aktiválni az
+	  rásegítése nélkül
+	  képes hálózati
+	  címfordítást végezni.  Ezt a
+	  lehetõséget a következõ sor
+	  hozzáadásával tudjuk aktiválni az
 	  /etc/ppp/ppp.conf
 	  állományban:
 
 	nat enable yes
 
-	Vagy a PPP-be épített hálózati
+	A PPP-be épített hálózati
 	  címfordítás a -nat
 	  parancssori paraméterrel is bekapcsolható.  Az
 	  /etc/rc.conf állományban is
 	  található hozzá egy
-	  ppp_nat változó, ami
+	  ppp_nat változó, amely
 	  alapértelmezés szerint
 	  engedélyezett.
 
 	Amikor használjuk ezt a lehetõséget, az
-	  /etc/ppp/ppp.conf állományban
-	  a következõ opciókkal
-	  engedélyezhetjük a bejövõ kapcsolatok
+	  /etc/ppp/ppp.conf
+	  állományban a következõ
+	  opciókkal engedélyezhetjük a
+	  bejövõ kapcsolatok
 	  továbbítását:
 
 	nat port tcp 10.0.0.2:ftp ftp
@@ -1465,7 +1458,7 @@
 
 	Mostanra ugyan már beállítottuk a
 	  ppp programot, azonban még
-	  néhány dolgot be kell állítanunk
+	  néhány dolgot be kell állítanunk,
 	  mielõtt ténylegesen nekilátnánk
 	  használni.  Ezek mindegyike az
 	  /etc/rc.conf állomány
@@ -1474,7 +1467,7 @@
 	Az állományt fentrõl lefelé
 	  fogjuk feldolgozni, de elõtte ne felejtsünk el
 	  értéket adni a hostname=
-	  változónak, mondjuk:
+	  változónak, például:
 
 	hostname="ize.minta.com"
 
@@ -1486,7 +1479,7 @@
 	Keressük meg a network_interfaces
 	  változót.  Ha a rendszerünkben
 	  kérésre akarjuk tárcsázni a
-	  szolgáltatónkat, akkor
+	  szolgáltatónkat, akkor a
 	  tun0 eszközt mindenképpen
 	  vegyük fel az értékébe, minden
 	  más esetben pedig távolítsuk el.
@@ -1496,18 +1489,18 @@
 
 	
 	  Az ifconfig_tun0
-	    változónak üres értéket kell
-	    megadnunk, és létre kell hoznunk egy

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Tue May  6 22:10:23 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6C1E5106567E; Tue,  6 May 2008 22:10:23 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2E224106567B
	for ; Tue,  6 May 2008 22:10:23 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 19C9C8FC14
	for ; Tue,  6 May 2008 22:10:23 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m46MAM1t037977
	for ; Tue, 6 May 2008 22:10:22 GMT
	(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m46MAM1n037975
	for perforce@freebsd.org; Tue, 6 May 2008 22:10:22 GMT
	(envelope-from gabor@freebsd.org)
Date: Tue, 6 May 2008 22:10:22 GMT
Message-Id: <200805062210.m46MAM1n037975@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gabor@freebsd.org using -f
From: Gabor Kovesdan 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 141256 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Tue, 06 May 2008 22:10:23 -0000

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

Change 141256 by gabor@gabor_server on 2008/05/06 22:09:30

	- Use new naming convention for structs

Affected files ...

.. //depot/projects/soc2008/gabor_textproc/grep/binary.c#3 edit
.. //depot/projects/soc2008/gabor_textproc/grep/file.c#3 edit
.. //depot/projects/soc2008/gabor_textproc/grep/grep.c#3 edit
.. //depot/projects/soc2008/gabor_textproc/grep/grep.h#4 edit
.. //depot/projects/soc2008/gabor_textproc/grep/mmfile.c#3 edit
.. //depot/projects/soc2008/gabor_textproc/grep/queue.c#4 edit
.. //depot/projects/soc2008/gabor_textproc/grep/util.c#4 edit

Differences ...

==== //depot/projects/soc2008/gabor_textproc/grep/binary.c#3 (text+ko) ====

@@ -91,7 +91,7 @@
 }
 
 int
-mmbin_file(mmf_t *f)
+mmbin_file(struct mmfile *f)
 {
 	int	 i;
 

==== //depot/projects/soc2008/gabor_textproc/grep/file.c#3 (text+ko) ====

@@ -53,11 +53,11 @@
 #define FILE_GZIP	2
 
 struct file {
-	int	 type;
-	int	 noseek;
-	FILE	*f;
-	mmf_t	*mmf;
-	gzFile	*gzf;
+	int		 type;
+	int		 noseek;
+	FILE		*f;
+	struct mmfile	*mmf;
+	gzFile		*gzf;
 };
 
 static char *
@@ -96,10 +96,10 @@
 	return (lnbuf);
 }
 
-file_t *
+struct file *
 grep_fdopen(int fd, char *mode)
 {
-	file_t	*f;
+	struct file	*f;
 
 	if (fd == STDIN_FILENO)
 		snprintf(fname, sizeof fname, "(standard input)");
@@ -125,10 +125,10 @@
 	return (NULL);
 }
 
-file_t *
+struct file *
 grep_open(char *path, char *mode)
 {
-	file_t	*f;
+	struct file	*f;
 
 	snprintf(fname, sizeof fname, "%s", path);
 
@@ -156,7 +156,7 @@
 }
 
 int
-grep_bin_file(file_t *f)
+grep_bin_file(struct file *f)
 {
 	if (f->noseek)
 		return (0);
@@ -175,7 +175,7 @@
 }
 
 char *
-grep_fgetln(file_t *f, size_t *l)
+grep_fgetln(struct file *f, size_t *l)
 {
 	switch (f->type) {
 	case FILE_STDIO:
@@ -191,7 +191,7 @@
 }
 
 void
-grep_close(file_t *f)
+grep_close(struct file *f)
 {
 	switch (f->type) {
 	case FILE_STDIO:

==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#3 (text+ko) ====

@@ -59,7 +59,7 @@
 int		 patterns, pattern_sz;
 char		**pattern;
 regex_t		*r_pattern;
-fastgrep_t	*fg_pattern;
+struct fastgrep	*fg_pattern;
 
 /* For regex errors  */
 char	 re_error[RE_ERROR_BUF + 1];

==== //depot/projects/soc2008/gabor_textproc/grep/grep.h#4 (text+ko) ====

@@ -37,15 +37,15 @@
 #define BIN_FILE_SKIP	1
 #define BIN_FILE_TEXT	2
 
-typedef struct str {
+struct str {
 	size_t		 len;
 	int		 line_no;
 	off_t		 off;
 	char		*file;
 	char		*dat;
-} str_t ;
+};
 
-typedef struct {
+struct fastgrep {
 	unsigned char	*pattern;
 	int		 patternLen;
 	int		 qsBc[UCHAR_MAX + 1];
@@ -54,7 +54,7 @@
 	int		 eol;
 	int		 wmatch;
 	int		 reversedSearch;
-} fastgrep_t;
+};
 
 /* Flags passed to regcomp() and regexec() */
 extern int	 cflags, eflags;
@@ -68,7 +68,7 @@
 
 extern int	 first, matchall, patterns, tail;
 extern char    **pattern;
-extern fastgrep_t *fg_pattern;
+extern struct fastgrep *fg_pattern;
 extern regex_t	*r_pattern;
 
 /* For regex errors  */
@@ -82,8 +82,8 @@
 void	*grep_calloc(size_t nmemb, size_t size);
 void	*grep_realloc(void *ptr, size_t size);
 void	 printline(struct str *line, int sep);
-int	 fastcomp(fastgrep_t *, const char *);
-void	 fgrepcomp(fastgrep_t *, const char *);
+int	 fastcomp(struct fastgrep *, const char *);
+void	 fgrepcomp(struct fastgrep *, const char *);
 
 /* queue.c */
 void	 initqueue(void);
@@ -92,27 +92,26 @@
 void	 clearqueue(void);
 
 /* mmfile.c */
-typedef struct mmfile {
+struct mmfile {
 	int	 fd;
 	size_t	 len;
 	char	*base, *end, *ptr;
-} mmf_t;
+};
 
-mmf_t	*mmopen(char *fn, char *mode);
-void	 mmclose(mmf_t *mmf);
-char	*mmfgetln(mmf_t *mmf, size_t *l);
+struct mmfile	*mmopen(char *fn, char *mode);
+void		 mmclose(struct mmfile *mmf);
+char		*mmfgetln(struct mmfile *mmf, size_t *l);
 
 /* file.c */
 struct file;
-typedef struct file file_t;
 
-file_t	*grep_fdopen(int fd, char *mode);
-file_t	*grep_open(char *path, char *mode);
-int	 grep_bin_file(file_t *f);
-char	*grep_fgetln(file_t *f, size_t *l);
-void	 grep_close(file_t *f);
+struct file	*grep_fdopen(int fd, char *mode);
+struct file	*grep_open(char *path, char *mode);
+int		 grep_bin_file(struct file *f);
+char		*grep_fgetln(struct file *f, size_t *l);
+void		 grep_close(struct file *f);
 
 /* binary.c */
 int	 bin_file(FILE * f);
 int	 gzbin_file(gzFile * f);
-int	 mmbin_file(mmf_t *f);
+int	 mmbin_file(struct mmfile *f);

==== //depot/projects/soc2008/gabor_textproc/grep/mmfile.c#3 (text+ko) ====

@@ -47,10 +47,10 @@
 
 #define MAX_MAP_LEN	1048576
 
-mmf_t *
+struct mmfile *
 mmopen(char *fn, char *mode)
 {
-	mmf_t		*mmf;
+	struct mmfile	*mmf;
 	struct stat	 st;
 
 	/* XXX ignore mode for now */
@@ -82,7 +82,7 @@
 }
 
 void
-mmclose(mmf_t *mmf)
+mmclose(struct mmfile *mmf)
 {
 	munmap(mmf->base, mmf->len);
 	close(mmf->fd);
@@ -90,7 +90,7 @@
 }
 
 char *
-mmfgetln(mmf_t *mmf, size_t *l)
+mmfgetln(struct mmfile *mmf, size_t *l)
 {
 	static char	*p;
 

==== //depot/projects/soc2008/gabor_textproc/grep/queue.c#4 (text+ko) ====

@@ -46,10 +46,10 @@
 
 #include "grep.h"
 
-typedef struct queue {
+struct queue {
 	struct queue	*next;
 	struct str	 data;
-} queue_t ;
+};
 
 static struct queue	*q_head, *q_tail;
 static int		 count;

==== //depot/projects/soc2008/gabor_textproc/grep/util.c#4 (text+ko) ====

@@ -56,7 +56,7 @@
 
 static int	 linesqueued;
 static int	 procline(struct str *l, int);
-static int	 grep_search(fastgrep_t *, unsigned char *, size_t, regmatch_t *pmatch);
+static int	 grep_search(struct fastgrep *, unsigned char *, size_t, regmatch_t *pmatch);
 static int	 grep_cmp(const unsigned char *, const unsigned char *, size_t);
 static void	 grep_revstr(unsigned char *, int);
 
@@ -104,7 +104,7 @@
 procfile(char *fn)
 {
 	struct str	 ln;
-	file_t		*f;
+	struct file	*f;
 	int		 c, t, z, nottext;
 
 	if (fn == NULL) {
@@ -233,7 +233,7 @@
 }
 
 void
-fgrepcomp(fastgrep_t *fg, const char *pattern)
+fgrepcomp(struct fastgrep *fg, const char *pattern)
 {
 	int	 i;
 
@@ -275,7 +275,7 @@
  * Returns: -1 on failure, 0 on success
  */
 int
-fastcomp(fastgrep_t *fg, const char *pattern)
+fastcomp(struct fastgrep *fg, const char *pattern)
 {
 	int	 i;
 	int	 bol = 0;
@@ -431,7 +431,7 @@
 	  e > s && isword(d[s]) && isword(d[e-1]))
 
 static int
-grep_search(fastgrep_t *fg, unsigned char *data, size_t dataLen, regmatch_t *pmatch)
+grep_search(struct fastgrep *fg, unsigned char *data, size_t dataLen, regmatch_t *pmatch)
 {
 	int	 j;
 	int	 rtrnVal = REG_NOMATCH;

From owner-p4-projects@FreeBSD.ORG  Wed May  7 02:07:35 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0EE8D1065672; Wed,  7 May 2008 02:07:35 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id ABF6E1065670
	for ; Wed,  7 May 2008 02:07:34 +0000 (UTC)
	(envelope-from cokane@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 964148FC13
	for ; Wed,  7 May 2008 02:07:34 +0000 (UTC)
	(envelope-from cokane@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m4727YBY059541
	for ; Wed, 7 May 2008 02:07:34 GMT
	(envelope-from cokane@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m4727VU2059539
	for perforce@freebsd.org; Wed, 7 May 2008 02:07:31 GMT
	(envelope-from cokane@freebsd.org)
Date: Wed, 7 May 2008 02:07:31 GMT
Message-Id: <200805070207.m4727VU2059539@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	cokane@freebsd.org using -f
From: Coleman Kane 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 141260 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 07 May 2008 02:07:35 -0000

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

Change 141260 by cokane@cokane_erwin on 2008/05/07 02:07:24

	Import of expat 2.0.1 into the tree, to replace the venerable
	       expat 1.95.5 that was imported long ago. The libbsdxml is derived
	       from expat.
	Reviewed by:	phk
	Approved by:	thompsa, sam
	MFP4 after:	1 week

Affected files ...

.. //depot/projects/vap/contrib/expat/COPYING#3 edit
.. //depot/projects/vap/contrib/expat/Changes#3 edit
.. //depot/projects/vap/contrib/expat/MANIFEST#3 edit
.. //depot/projects/vap/contrib/expat/Makefile.in#3 edit
.. //depot/projects/vap/contrib/expat/README#3 edit
.. //depot/projects/vap/contrib/expat/configure#3 edit
.. //depot/projects/vap/contrib/expat/configure.in#3 edit
.. //depot/projects/vap/contrib/expat/doc/reference.html#3 edit
.. //depot/projects/vap/contrib/expat/doc/style.css#3 edit
.. //depot/projects/vap/contrib/expat/doc/xmlwf.1#3 edit
.. //depot/projects/vap/contrib/expat/doc/xmlwf.sgml#3 edit
.. //depot/projects/vap/contrib/expat/examples/elements.c#3 edit
.. //depot/projects/vap/contrib/expat/examples/outline.c#3 edit
.. //depot/projects/vap/contrib/expat/expat_config.h.in#3 edit
.. //depot/projects/vap/contrib/expat/lib/ascii.h#3 edit
.. //depot/projects/vap/contrib/expat/lib/expat.h#3 edit
.. //depot/projects/vap/contrib/expat/lib/expat_external.h#1 add
.. //depot/projects/vap/contrib/expat/lib/internal.h#3 edit
.. //depot/projects/vap/contrib/expat/lib/winconfig.h#3 edit
.. //depot/projects/vap/contrib/expat/lib/xmlparse.c#3 edit
.. //depot/projects/vap/contrib/expat/lib/xmlrole.c#3 edit
.. //depot/projects/vap/contrib/expat/lib/xmlrole.h#3 edit
.. //depot/projects/vap/contrib/expat/lib/xmltok.c#3 edit
.. //depot/projects/vap/contrib/expat/lib/xmltok.h#3 edit
.. //depot/projects/vap/contrib/expat/lib/xmltok_impl.c#3 edit
.. //depot/projects/vap/contrib/expat/lib/xmltok_ns.c#3 edit
.. //depot/projects/vap/contrib/expat/tests/README.txt#3 edit
.. //depot/projects/vap/contrib/expat/tests/benchmark/README.txt#1 add
.. //depot/projects/vap/contrib/expat/tests/benchmark/benchmark.c#1 add
.. //depot/projects/vap/contrib/expat/tests/benchmark/benchmark.dsp#1 add
.. //depot/projects/vap/contrib/expat/tests/benchmark/benchmark.dsw#1 add
.. //depot/projects/vap/contrib/expat/tests/chardata.c#3 edit
.. //depot/projects/vap/contrib/expat/tests/chardata.h#3 edit
.. //depot/projects/vap/contrib/expat/tests/minicheck.c#1 add
.. //depot/projects/vap/contrib/expat/tests/minicheck.h#1 add
.. //depot/projects/vap/contrib/expat/tests/runtests.c#3 edit
.. //depot/projects/vap/contrib/expat/tests/runtestspp.cpp#1 add
.. //depot/projects/vap/contrib/expat/tests/xmltest.sh#3 edit
.. //depot/projects/vap/contrib/expat/xmlwf/codepage.c#3 edit
.. //depot/projects/vap/contrib/expat/xmlwf/readfilemap.c#3 edit
.. //depot/projects/vap/contrib/expat/xmlwf/unixfilemap.c#3 edit
.. //depot/projects/vap/contrib/expat/xmlwf/xmlfile.c#3 edit
.. //depot/projects/vap/contrib/expat/xmlwf/xmlfile.h#3 edit
.. //depot/projects/vap/contrib/expat/xmlwf/xmlwf.c#3 edit
.. //depot/projects/vap/lib/libexpat/Makefile#3 edit
.. //depot/projects/vap/lib/libexpat/libbsdxml.3#3 edit
.. //depot/projects/vap/sbin/ifconfig/regdomain.c#3 edit

Differences ...

==== //depot/projects/vap/contrib/expat/COPYING#3 (text+ko) ====

@@ -1,6 +1,6 @@
 Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
                                and Clark Cooper
-Copyright (c) 2001, 2002 Expat maintainers.
+Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006 Expat maintainers.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

==== //depot/projects/vap/contrib/expat/Changes#3 (text+ko) ====

@@ -1,3 +1,73 @@
+Release 2.0.1 Tue June 5 2007
+        - Fixed bugs #1515266, 1515600: The character data handler's calling
+          of XML_StopParser() was not handled properly; if the parser was
+          stopped and the handler set to NULL, the parser would segfault.
+        - Fixed bug #1690883: Expat failed on EBCDIC systems as it assumed
+          some character constants to be ASCII encoded.
+        - Minor cleanups of the test harness.
+        - Fixed xmlwf bug #1513566: "out of memory" error on file size zero.
+        - Fixed outline.c bug #1543233: missing a final XML_ParserFree() call.
+        - Fixes and improvements for Windows platform:
+          bugs #1409451, #1476160, 1548182, 1602769, 1717322.
+        - Build fixes for various platforms:
+          HP-UX, Tru64, Solaris 9: patch #1437840, bug #1196180.
+          All Unix: #1554618 (refreshed config.sub/config.guess).
+                    #1490371, #1613457: support both, DESTDIR and INSTALL_ROOT,
+                    without relying on GNU-Make specific features.
+          #1647805: Patched configure.in to work better with Intel compiler.
+        - Fixes to Makefile.in to have make check work correctly:
+          bugs #1408143, #1535603, #1536684.
+        - Added Open Watcom support: patch #1523242.
+
+Release 2.0.0 Wed Jan 11 2006
+        - We no longer use the "check" library for C unit testing; we
+          always use the (partial) internal implementation of the API.
+        - Report XML_NS setting via XML_GetFeatureList().
+        - Fixed headers for use from C++.
+        - XML_GetCurrentLineNumber() and  XML_GetCurrentColumnNumber()
+          now return unsigned integers.
+        - Added XML_LARGE_SIZE switch to enable 64-bit integers for
+          byte indexes and line/column numbers.
+        - Updated to use libtool 1.5.22 (the most recent).
+        - Added support for AmigaOS.
+        - Some mostly minor bug fixes. SF issues include: 1006708,
+          1021776, 1023646, 1114960, 1156398, 1221160, 1271642.
+
+Release 1.95.8 Fri Jul 23 2004
+        - Major new feature: suspend/resume.  Handlers can now request
+          that a parse be suspended for later resumption or aborted
+          altogether.  See "Temporarily Stopping Parsing" in the
+          documentation for more details.
+        - Some mostly minor bug fixes, but compilation should no
+          longer generate warnings on most platforms.  SF issues
+          include: 827319, 840173, 846309, 888329, 896188, 923913,
+          928113, 961698, 985192.
+
+Release 1.95.7 Mon Oct 20 2003
+        - Fixed enum XML_Status issue (reported on SourceForge many
+          times), so compilers that are properly picky will be happy.
+        - Introduced an XMLCALL macro to control the calling
+          convention used by the Expat API; this macro should be used
+          to annotate prototypes and definitions of callback
+          implementations in code compiled with a calling convention
+          other than the default convention for the host platform.
+        - Improved ability to build without the configure-generated
+          expat_config.h header.  This is useful for applications
+          which embed Expat rather than linking in the library.
+        - Fixed a variety of bugs: see SF issues 458907, 609603,
+          676844, 679754, 692878, 692964, 695401, 699323, 699487,
+          820946.
+        - Improved hash table lookups.
+        - Added more regression tests and improved documentation.
+
+Release 1.95.6 Tue Jan 28 2003
+        - Added XML_FreeContentModel().
+        - Added XML_MemMalloc(), XML_MemRealloc(), XML_MemFree().
+        - Fixed a variety of bugs: see SF issues 615606, 616863,
+          618199, 653180, 673791.
+        - Enhanced the regression test suite.
+        - Man page improvements: includes SF issue 632146.
+
 Release 1.95.5 Fri Sep 6 2002
         - Added XML_UseForeignDTD() for improved SAX2 support.
         - Added XML_GetFeatureList().
@@ -7,7 +77,7 @@
         - Fixed UTF-8 decoding bug that caused legal UTF-8 to be rejected.
         - Finally fixed bug where default handler would report DTD
           events that were already handled by another handler.
-          Initial patch contributed by Darryl Miller.
+          Initial patch contributed by Darryl Miles.
         - Removed unnecessary DllMain() function that caused static
           linking into a DLL to be difficult.
         - Added VC++ projects for building static libraries.

==== //depot/projects/vap/contrib/expat/MANIFEST#3 (text+ko) ====

@@ -1,22 +1,33 @@
-Changes
-COPYING
-MANIFEST
-Makefile.in
-README
-configure
-configure.in
-expat_config.h.in
-bcb5/ExpatGroup.bpg
-bcb5/ReadMe.txt
+amiga/stdlib.c
+amiga/launch.c
+amiga/expat_vectors.c
+amiga/expat_lib.c
+amiga/expat.xml
+amiga/README.txt
+amiga/Makefile
+amiga/include/proto/expat.h
+amiga/include/libraries/expat.h
+amiga/include/interfaces/expat.h
+amiga/include/inline4/expat.h
+bcb5/README.txt
+bcb5/all_projects.bpg
 bcb5/elements.bpf
 bcb5/elements.bpr
 bcb5/elements.mak
-bcb5/libexpat.bpf
-bcb5/libexpat.bpr
-bcb5/libexpat.mak
-bcb5/libexpatw.bpf
-bcb5/libexpatw.bpr
-bcb5/libexpatw.mak
+bcb5/expat.bpf
+bcb5/expat.bpr
+bcb5/expat.mak
+bcb5/expat_static.bpf
+bcb5/expat_static.bpr
+bcb5/expat_static.mak
+bcb5/expatw.bpf
+bcb5/expatw.bpr
+bcb5/expatw.mak
+bcb5/expatw_static.bpf
+bcb5/expatw_static.bpr
+bcb5/expatw_static.mak
+bcb5/libexpat_mtd.def
+bcb5/libexpatw_mtd.def
 bcb5/makefile.mak
 bcb5/outline.bpf
 bcb5/outline.bpr
@@ -25,30 +36,54 @@
 bcb5/xmlwf.bpf
 bcb5/xmlwf.bpr
 bcb5/xmlwf.mak
+doc/expat.png
+doc/reference.html
+doc/style.css
+doc/valid-xhtml10.png
+doc/xmlwf.1
+doc/xmlwf.sgml
+COPYING
+Changes
+MANIFEST
+Makefile.in
+README
+configure
+configure.in
+expat_config.h.in
+expat.dsw
 conftools/PrintPath
 conftools/ac_c_bigendian_cross.m4
 conftools/config.guess
 conftools/config.sub
 conftools/expat.m4
+conftools/get-version.sh
 conftools/install-sh
 conftools/libtool.m4
 conftools/ltmain.sh
 conftools/mkinstalldirs
-doc/reference.html
-doc/style.css
-doc/valid-xhtml10.png
-doc/xmlwf.1
-doc/xmlwf.sgml
 examples/elements.c
+examples/elements.dsp
 examples/outline.c
+examples/outline.dsp
+lib/Makefile.MPW
+lib/amigaconfig.h
 lib/ascii.h
 lib/asciitab.h
+lib/expat.dsp
 lib/expat.h
+lib/expat_external.h
+lib/expat_static.dsp
+lib/expatw.dsp
+lib/expatw_static.dsp
 lib/iasciitab.h
 lib/internal.h
 lib/latin1tab.h
+lib/libexpat.def
+lib/libexpatw.def
+lib/macconfig.h
 lib/nametab.h
 lib/utf8tab.h
+lib/winconfig.h
 lib/xmlparse.c
 lib/xmlrole.c
 lib/xmlrole.h
@@ -57,17 +92,24 @@
 lib/xmltok_impl.c
 lib/xmltok_impl.h
 lib/xmltok_ns.c
-lib/winconfig.h
+tests/benchmark/README.txt
+tests/benchmark/benchmark.c
+tests/benchmark/benchmark.dsp
+tests/benchmark/benchmark.dsw
 tests/README.txt
 tests/chardata.c
 tests/chardata.h
+tests/minicheck.c
+tests/minicheck.h
 tests/runtests.c
+tests/runtestspp.cpp
 tests/xmltest.sh
+vms/README.vms
 vms/descrip.mms
 vms/expat_config.h
-vms/README.vms
+win32/MANIFEST.txt
+win32/README.txt
 win32/expat.iss
-win32/MANIFEST.txt
 xmlwf/codepage.c
 xmlwf/codepage.h
 xmlwf/ct.c
@@ -82,4 +124,5 @@
 xmlwf/xmltchar.h
 xmlwf/xmlurl.h
 xmlwf/xmlwf.c
+xmlwf/xmlwf.dsp
 xmlwf/xmlwin32url.cxx

==== //depot/projects/vap/contrib/expat/Makefile.in#3 (text+ko) ====

@@ -30,7 +30,7 @@
 bindir = @bindir@
 libdir = @libdir@
 includedir = @includedir@
-mandir = ${prefix}/man/man1
+man1dir = @mandir@/man1
 
 top_builddir = .
 
@@ -41,9 +41,10 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/conftools/mkinstalldirs
 
 MANFILE = $(srcdir)/doc/xmlwf.1
-APIHEADER = $(srcdir)/lib/expat.h
+APIHEADER = $(srcdir)/lib/expat.h $(srcdir)/lib/expat_external.h
 LIBRARY = libexpat.la
 
+DESTDIR = $(INSTALL_ROOT)
 
 default:  buildlib xmlwf/xmlwf
 
@@ -55,9 +56,12 @@
 	cd lib && rm -f $(LIBRARY) *.o *.lo && rm -rf .libs _libs
 	cd xmlwf && rm -f xmlwf *.o *.lo && rm -rf .libs _libs
 	cd examples && rm -f elements outline *.o *.lo && rm -rf .libs _libs
-	cd tests && rm -rf .libs runtests runtests.o chardata.o
+	cd tests && rm -rf .libs runtests runtests.o runtestspp runtestspp.o
+	cd tests && rm -f chardata.o minicheck.o
 	rm -rf .libs libexpat.la
-	find . -name core | xargs rm -f
+	rm -f examples/core tests/core xmlwf/core
+
+clobber: clean
 
 distclean: clean
 	rm -f expat_config.h config.status config.log config.cache libtool
@@ -67,26 +71,28 @@
 	rm -f expat_config.h.in configure
 	rm -f conftools/ltconfig conftools/ltmain.sh conftools/libtool.m4
 
-check: tests/runtests
+check: tests/runtests tests/runtestspp
 	tests/runtests
+	tests/runtestspp
 
 install: xmlwf/xmlwf installlib
-	$(mkinstalldirs) $(bindir) $(mandir)
-	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) xmlwf/xmlwf $(bindir)/xmlwf
-	$(INSTALL_DATA) $(MANFILE) $(mandir)
+	$(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(man1dir)
+	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) xmlwf/xmlwf $(DESTDIR)$(bindir)/xmlwf
+	$(INSTALL_DATA) $(MANFILE) $(DESTDIR)$(man1dir)
 
 installlib: $(LIBRARY) $(APIHEADER)
-	$(mkinstalldirs) $(libdir) $(includedir)
-	$(LIBTOOL) --mode=install $(INSTALL) $(LIBRARY) $(libdir)/$(LIBRARY)
-	$(INSTALL_DATA) $(APIHEADER) $(includedir)
+	$(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)
+	$(LIBTOOL) --mode=install $(INSTALL) $(LIBRARY) $(DESTDIR)$(libdir)/$(LIBRARY)
+	for FN in $(APIHEADER) ; do $(INSTALL_DATA) $$FN $(DESTDIR)$(includedir) ; done
 
 uninstall: uninstalllib
-	$(LIBTOOL) --mode=uninstall rm -f $(bindir)/xmlwf
-	rm -f $(mandir)/xmlwf.1
+	$(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(bindir)/xmlwf
+	rm -f $(DESTDIR)$(man1dir)/xmlwf.1
 
 uninstalllib:
-	$(LIBTOOL) --mode=uninstall rm -f $(libdir)/$(LIBRARY)
-	rm -f $(includedir)/$(APIHEADER)
+	$(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$(LIBRARY)
+	rm -f $(DESTDIR)$(includedir)/expat.h
+	rm -f $(DESTDIR)$(includedir)/expat_external.h
 
 # for VPATH builds (invoked by configure)
 mkdir-init:
@@ -95,36 +101,40 @@
 	done
 
 CC = @CC@
+CXX = @CXX@
 LIBTOOL = @LIBTOOL@
 
 INCLUDES = -I$(srcdir)/lib -I.
 LDFLAGS = @LDFLAGS@
-CPPFLAGS = @CPPFLAGS@
+CPPFLAGS = @CPPFLAGS@ -DHAVE_EXPAT_CONFIG_H
 CFLAGS = @CFLAGS@
+CXXFLAGS = @CXXFLAGS@
 VSNFLAG = -version-info @LIBCURRENT@:@LIBREVISION@:@LIBAGE@
 
 ### autoconf this?
 LTFLAGS = --silent
 
-COMPILE = $(CC) $(CFLAGS) $(DEFS) $(CPPFLAGS) $(INCLUDES)
+COMPILE = $(CC) $(INCLUDES) $(CFLAGS) $(DEFS) $(CPPFLAGS)
+CXXCOMPILE = $(CXX) $(INCLUDES) $(CXXFLAGS) $(DEFS) $(CPPFLAGS)
 LTCOMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE)
 LINK_LIB = $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) -no-undefined $(VSNFLAG) -rpath $(libdir) $(LDFLAGS) -o $@
 LINK_EXE = $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) $(LDFLAGS) -o $@
+LINK_CXX_EXE = $(LIBTOOL) $(LTFLAGS) --mode=link $(CXXCOMPILE) $(LDFLAGS) -o $@
 
 LIB_OBJS = lib/xmlparse.lo lib/xmltok.lo lib/xmlrole.lo
 $(LIBRARY): $(LIB_OBJS)
 	$(LINK_LIB) $(LIB_OBJS)
 
 lib/xmlparse.lo: lib/xmlparse.c lib/expat.h lib/xmlrole.h lib/xmltok.h \
-	$(top_builddir)/expat_config.h lib/internal.h
+	$(top_builddir)/expat_config.h lib/expat_external.h lib/internal.h
 
 lib/xmlrole.lo: lib/xmlrole.c lib/ascii.h lib/xmlrole.h \
-	$(top_builddir)/expat_config.h lib/internal.h
+	$(top_builddir)/expat_config.h lib/expat_external.h lib/internal.h
 
 lib/xmltok.lo: lib/xmltok.c lib/xmltok_impl.c lib/xmltok_ns.c \
 	lib/ascii.h lib/asciitab.h lib/iasciitab.h lib/latin1tab.h \
 	lib/nametab.h lib/utf8tab.h lib/xmltok.h lib/xmltok_impl.h \
-	$(top_builddir)/expat_config.h
+	$(top_builddir)/expat_config.h lib/expat_external.h lib/internal.h
 
 
 XMLWF_OBJS = xmlwf/xmlwf.o xmlwf/xmlfile.o xmlwf/codepage.o xmlwf/@FILEMAP@.o
@@ -144,9 +154,13 @@
 	$(LINK_EXE) $< $(LIBRARY)
 
 tests/chardata.o: tests/chardata.c tests/chardata.h
+tests/minicheck.o: tests/minicheck.c tests/minicheck.h
 tests/runtests.o: tests/runtests.c tests/chardata.h
-tests/runtests: tests/runtests.o tests/chardata.o $(LIBRARY)
-	$(LINK_EXE) $^ -lcheck
+tests/runtests: tests/runtests.o tests/chardata.o tests/minicheck.o $(LIBRARY)
+	$(LINK_EXE) tests/runtests.o tests/chardata.o tests/minicheck.o $(LIBRARY)
+tests/runtestspp.o: tests/runtestspp.cpp tests/runtests.c tests/chardata.h
+tests/runtestspp: tests/runtestspp.o tests/chardata.o tests/minicheck.o $(LIBRARY)
+	$(LINK_CXX_EXE) tests/runtestspp.o tests/chardata.o tests/minicheck.o $(LIBRARY)
 
 tests/xmlts.zip:
 	wget --output-document=tests/xmlts.zip \
@@ -158,8 +172,10 @@
 run-xmltest: xmlwf/xmlwf tests/XML-Test-Suite
 	tests/xmltest.sh
 
-.SUFFIXES: .c .lo .o
+.SUFFIXES: .c .cpp .lo .o
 
+.cpp.o:
+	$(CXXCOMPILE) -o $@ -c $<
 .c.o:
 	$(COMPILE) -o $@ -c $<
 .c.lo:

==== //depot/projects/vap/contrib/expat/README#3 (text+ko) ====

@@ -1,5 +1,5 @@
 
-                        Expat, Release 1.95.5
+                        Expat, Release 2.0.1
 
 This is Expat, a C library for parsing XML, written by James Clark.
 Expat is a stream-oriented XML parser.  This means that you register
@@ -9,7 +9,7 @@
 structures for which you may register handlers.
 
 Windows users should use the expat_win32bin package, which includes
-both precompiled libraries and executalbes, and source code for
+both precompiled libraries and executables, and source code for
 developers.
 
 Expat is free software.  You may copy, distribute, and modify it under
@@ -25,8 +25,8 @@
 If you are building Expat from a check-out from the CVS repository,
 you need to run a script that generates the configure script using the
 GNU autoconf and libtool tools.  To do this, you need to have
-autoconf 2.52 or newer and libtool 1.4 or newer.  Run the script like
-this:
+autoconf 2.52 or newer and libtool 1.4 or newer (1.5 or newer preferred).
+Run the script like this:
 
         ./buildconf.sh
 
@@ -48,15 +48,25 @@
 /home/me/mystuff/bin, you can tell configure about that with:
 
         ./configure --prefix=/home/me/mystuff
+        
+Another interesting option is to enable 64-bit integer support for
+line and column numbers and the over-all byte index:
 
+        ./configure CPPFLAGS=-DXML_LARGE_SIZE
+        
+However, such a modification would be a breaking change to the ABI
+and is therefore not recommended for general use - e.g. as part of
+a Linux distribution - but rather for builds with special requirements.
+
 After running the configure script, the "make" command will build
 things and "make install" will install things into their proper
-location.  Note that you need to have write permission into the
-directories into which things will be installed.
+location.  Have a look at the "Makefile" to learn about additional
+"make" options.  Note that you need to have write permission into
+the directories into which things will be installed.
 
 If you are interested in building Expat to provide document
-information in UTF-16 rather than the default UTF-8, following these
-instructions:
+information in UTF-16 rather than the default UTF-8, follow these
+instructions (after having run "make distclean"):
 
         1. For UTF-16 output as unsigned short (and version/error
            strings as char), run:
@@ -80,8 +90,23 @@
            (Note the additional "w" in the library name.)
 
         3. Run "make buildlib" (which builds the library only).
+           Or, to save step 2, run "make buildlib LIBRARY=libexpatw.la".
 
         4. Run "make installlib" (which installs the library only).
+           Or, if step 2 was omitted, run "make installlib LIBRARY=libexpatw.la".
+           
+Using DESTDIR or INSTALL_ROOT is enabled, with INSTALL_ROOT being the default
+value for DESTDIR, and the rest of the make file using only DESTDIR.
+It works as follows:
+   $ make install DESTDIR=/path/to/image
+overrides the in-makefile set DESTDIR, while both
+   $ INSTALL_ROOT=/path/to/image make install
+   $ make install INSTALL_ROOT=/path/to/image
+use DESTDIR=$(INSTALL_ROOT), even if DESTDIR eventually is defined in the
+environment, because variable-setting priority is
+1) commandline
+2) in-makefile
+3) environment           
 
 Note for Solaris users:  The "ar" command is usually located in
 "/usr/ccs/bin", which is not in the default PATH.  You will need to
@@ -109,4 +134,4 @@
 place on expat-discuss@mail.libexpat.org.  Archives of this list and
 other Expat-related lists may be found at:
 
-        http://mail.libexpat.org/mailman-21/listinfo/
+        http://mail.libexpat.org/mailman/listinfo/

==== //depot/projects/vap/contrib/expat/configure#3 (text+ko) ====

@@ -1,228 +1,71 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.53 for expat 1.95.5.
+# Generated by GNU Autoconf 2.59 for expat 2.0.1.
 #
-# Report bugs to .
+# Report bugs to .
 #
-# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 2003 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
+## --------------------- ##
+## M4sh Initialization.  ##
+## --------------------- ##
 
-# Find the correct PATH separator.  Usually this is `:', but
-# DJGPP uses `;' like DOS.
-if test "X${PATH_SEPARATOR+set}" != Xset; then
-  UNAME=${UNAME-`uname 2>/dev/null`}
-  case X$UNAME in
-    *-DOS) lt_cv_sys_path_separator=';' ;;
-    *)     lt_cv_sys_path_separator=':' ;;
-  esac
-  PATH_SEPARATOR=$lt_cv_sys_path_separator
+# Be Bourne compatible
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+  set -o posix
 fi
+DUALCASE=1; export DUALCASE # for MKS sh
 
-
-# Check that we are running under the correct shell.
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-case X$ECHO in
-X*--fallback-echo)
-  # Remove one level of quotation (which was required for Make).
-  ECHO=`echo "$ECHO" | sed 's,\\\\\$\\$0,'$0','`
-  ;;
-esac
-
-echo=${ECHO-echo}
-if test "X$1" = X--no-reexec; then
-  # Discard the --no-reexec flag, and continue.
-  shift
-elif test "X$1" = X--fallback-echo; then
-  # Avoid inline document here, it may be left over
-  :
-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
-  # Yippee, $echo works!
-  :
+# Support unset when possible.
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  as_unset=unset
 else
-  # Restart under the correct shell.
-  exec $SHELL "$0" --no-reexec ${1+"$@"}
+  as_unset=false
 fi
 
-if test "X$1" = X--fallback-echo; then
-  # used as fallback echo
-  shift
-  cat </dev/null &&
-       echo_test_string="`eval $cmd`" &&
-       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
-    then
-      break
-    fi
-  done
-fi
-
-if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
-   test "X$echo_testing_string" = "X$echo_test_string"; then
-  :
-else
-  # The Solaris, AIX, and Digital Unix default echo programs unquote
-  # backslashes.  This makes it impossible to quote backslashes using
-  #   echo "$something" | sed 's/\\/\\\\/g'
-  #
-  # So, first we look for a working echo in the user's PATH.
-
-  IFS="${IFS= 	}"; save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for dir in $PATH /usr/ucb; do
-    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
-       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
-       echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
-       test "X$echo_testing_string" = "X$echo_test_string"; then
-      echo="$dir/echo"
-      break
-    fi
-  done
-  IFS="$save_ifs"
-
-  if test "X$echo" = Xecho; then
-    # We didn't find a better echo, so look for alternatives.
-    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
-       echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
-       test "X$echo_testing_string" = "X$echo_test_string"; then
-      # This shell has a builtin print -r that does the trick.
-      echo='print -r'
-    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
-	 test "X$CONFIG_SHELL" != X/bin/ksh; then
-      # If we have ksh, try running configure again with it.
-      ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-      export ORIGINAL_CONFIG_SHELL
-      CONFIG_SHELL=/bin/ksh
-      export CONFIG_SHELL
-      exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
-    else
-      # Try using printf.
-      echo='printf %s\n'
-      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-	 echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
-	 test "X$echo_testing_string" = "X$echo_test_string"; then
-	# Cool, printf works
-	:
-      elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
-	   test "X$echo_testing_string" = 'X\t' &&
-	   echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	   test "X$echo_testing_string" = "X$echo_test_string"; then
-	CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
-	export CONFIG_SHELL
-	SHELL="$CONFIG_SHELL"
-	export SHELL
-	echo="$CONFIG_SHELL $0 --fallback-echo"
-      elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
-	   test "X$echo_testing_string" = 'X\t' &&
-	   echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	   test "X$echo_testing_string" = "X$echo_test_string"; then
-	echo="$CONFIG_SHELL $0 --fallback-echo"
-      else
-	# maybe with a smaller string...
-	prev=:
-
-	for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
-	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
-	  then
-	    break
-	  fi
-	  prev="$cmd"
-	done
-
-	if test "$prev" != 'sed 50q "$0"'; then
-	  echo_test_string=`eval $prev`
-	  export echo_test_string
-	  exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
-	else
-	  # Oops.  We lost completely, so just stick with echo.
-	  echo=echo
-	fi
-      fi
-    fi
+# NLS nuisances.
+for as_var in \
+  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
+  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
+  LC_TELEPHONE LC_TIME
+do
+  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
+    eval $as_var=C; export $as_var
+  else
+    $as_unset $as_var
   fi
-fi
-fi
+done
 
-# Copy echo and quote the copy suitably for passing to libtool from
-# the Makefile, instead of quoting the original, which is used later.
-ECHO=$echo
-if test "X$ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
-   ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
-fi
-
-
-
+# Required to use basename.
 if expr a : '\(a\)' >/dev/null 2>&1; then
   as_expr=expr
 else
   as_expr=false
 fi
 
-
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
-fi
-
-# NLS nuisances.
-# Support unset when possible.
-if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
-  as_unset=unset
+if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
+  as_basename=basename
 else
-  as_unset=false
+  as_basename=false
 fi
 
-(set +x; test -n "`(LANG=C; export LANG) 2>&1`") &&
-    { $as_unset LANG || test "${LANG+set}" != set; } ||
-      { LANG=C; export LANG; }
-(set +x; test -n "`(LC_ALL=C; export LC_ALL) 2>&1`") &&
-    { $as_unset LC_ALL || test "${LC_ALL+set}" != set; } ||
-      { LC_ALL=C; export LC_ALL; }
-(set +x; test -n "`(LC_TIME=C; export LC_TIME) 2>&1`") &&
-    { $as_unset LC_TIME || test "${LC_TIME+set}" != set; } ||
-      { LC_TIME=C; export LC_TIME; }
-(set +x; test -n "`(LC_CTYPE=C; export LC_CTYPE) 2>&1`") &&
-    { $as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set; } ||
-      { LC_CTYPE=C; export LC_CTYPE; }
-(set +x; test -n "`(LANGUAGE=C; export LANGUAGE) 2>&1`") &&
-    { $as_unset LANGUAGE || test "${LANGUAGE+set}" != set; } ||
-      { LANGUAGE=C; export LANGUAGE; }
-(set +x; test -n "`(LC_COLLATE=C; export LC_COLLATE) 2>&1`") &&
-    { $as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set; } ||
-      { LC_COLLATE=C; export LC_COLLATE; }
-(set +x; test -n "`(LC_NUMERIC=C; export LC_NUMERIC) 2>&1`") &&
-    { $as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set; } ||
-      { LC_NUMERIC=C; export LC_NUMERIC; }
-(set +x; test -n "`(LC_MESSAGES=C; export LC_MESSAGES) 2>&1`") &&
-    { $as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set; } ||
-      { LC_MESSAGES=C; export LC_MESSAGES; }
-
 
 # Name of the executable.
-as_me=`(basename "$0") 2>/dev/null ||
+as_me=`$as_basename "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)$' \| \
@@ -233,6 +76,7 @@
   	  /^X\/\(\/\).*/{ s//\1/; q; }
   	  s/.*/./; q'`
 
+
 # PATH needs CR, and LINENO needs CR and PATH.
 # Avoid depending upon Character Ranges.
 as_cr_letters='abcdefghijklmnopqrstuvwxyz'
@@ -243,15 +87,15 @@
 
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conftest.sh
-  echo  "exit 0"   >>conftest.sh
-  chmod +x conftest.sh
-  if (PATH=".;."; conftest.sh) >/dev/null 2>&1; then
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
     PATH_SEPARATOR=';'
   else
     PATH_SEPARATOR=:
   fi
-  rm -f conftest.sh
+  rm -f conf$$.sh
 fi
 
 
@@ -299,6 +143,8 @@
   as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
   test "x$as_lineno_1" != "x$as_lineno_2" &&
   test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
+	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
+	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
 	     CONFIG_SHELL=$as_dir/$as_base
 	     export CONFIG_SHELL
 	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
@@ -371,13 +217,20 @@
 fi
 rm -f conf$$ conf$$.exe conf$$.file
 
+if mkdir -p . 2>/dev/null; then
+  as_mkdir_p=:
+else
+  test -d ./-p && rmdir ./-p
+  as_mkdir_p=false
+fi
+
 as_executable_p="test -f"
 
 # Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
 
 # Sed expression to map a string onto a valid variable name.
-as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
 
 # IFS
@@ -387,8 +240,162 @@
 IFS=" 	$as_nl"
 
 # CDPATH.
-$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=$PATH_SEPARATOR; export CDPATH; }
+$as_unset CDPATH
+
+
+
+# Check that we are running under the correct shell.
+SHELL=${CONFIG_SHELL-/bin/sh}
+
+case X$ECHO in
+X*--fallback-echo)
+  # Remove one level of quotation (which was required for Make).
+  ECHO=`echo "$ECHO" | sed 's,\\\\\$\\$0,'$0','`
+  ;;
+esac
+
+echo=${ECHO-echo}
+if test "X$1" = X--no-reexec; then
+  # Discard the --no-reexec flag, and continue.
+  shift
+elif test "X$1" = X--fallback-echo; then
+  # Avoid inline document here, it may be left over
+  :
+elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
+  # Yippee, $echo works!
+  :
+else
+  # Restart under the correct shell.
+  exec $SHELL "$0" --no-reexec ${1+"$@"}
+fi
+
+if test "X$1" = X--fallback-echo; then
+  # used as fallback echo
+  shift
+  cat </dev/null 2>&1 && unset CDPATH
+
+if test -z "$ECHO"; then
+if test "X${echo_test_string+set}" != Xset; then
+# find a string as large as possible, as long as the shell can cope with it
+  for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
+    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
+    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
+       echo_test_string=`eval $cmd` &&
+       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
+    then
+      break
+    fi
+  done
+fi
+
+if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
+   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
+   test "X$echo_testing_string" = "X$echo_test_string"; then
+  :
+else
+  # The Solaris, AIX, and Digital Unix default echo programs unquote
+  # backslashes.  This makes it impossible to quote backslashes using
+  #   echo "$something" | sed 's/\\/\\\\/g'
+  #
+  # So, first we look for a working echo in the user's PATH.
+
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  for dir in $PATH /usr/ucb; do
+    IFS="$lt_save_ifs"
+    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
+       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
+       echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
+       test "X$echo_testing_string" = "X$echo_test_string"; then
+      echo="$dir/echo"
+      break
+    fi
+  done
+  IFS="$lt_save_ifs"
+
+  if test "X$echo" = Xecho; then
+    # We didn't find a better echo, so look for alternatives.
+    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
+       echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
+       test "X$echo_testing_string" = "X$echo_test_string"; then
+      # This shell has a builtin print -r that does the trick.
+      echo='print -r'
+    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
+	 test "X$CONFIG_SHELL" != X/bin/ksh; then
+      # If we have ksh, try running configure again with it.
+      ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
+      export ORIGINAL_CONFIG_SHELL
+      CONFIG_SHELL=/bin/ksh
+      export CONFIG_SHELL
+      exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
+    else
+      # Try using printf.
+      echo='printf %s\n'
+      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
+	 echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
+	 test "X$echo_testing_string" = "X$echo_test_string"; then
+	# Cool, printf works
+	:
+      elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
+	   test "X$echo_testing_string" = 'X\t' &&
+	   echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+	   test "X$echo_testing_string" = "X$echo_test_string"; then
+	CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
+	export CONFIG_SHELL
+	SHELL="$CONFIG_SHELL"
+	export SHELL
+	echo="$CONFIG_SHELL $0 --fallback-echo"
+      elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
+	   test "X$echo_testing_string" = 'X\t' &&

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Wed May  7 02:20:51 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 42F401065677; Wed,  7 May 2008 02:20:51 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E00A6106564A
	for ; Wed,  7 May 2008 02:20:50 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id CA21F8FC12
	for ; Wed,  7 May 2008 02:20:50 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m472KoJa060008
	for ; Wed, 7 May 2008 02:20:50 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m472KoAk060006
	for perforce@freebsd.org; Wed, 7 May 2008 02:20:50 GMT
	(envelope-from sam@freebsd.org)
Date: Wed, 7 May 2008 02:20:50 GMT
Message-Id: <200805070220.m472KoAk060006@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 141262 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 07 May 2008 02:20:51 -0000

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

Change 141262 by sam@sam_ebb on 2008/05/07 02:20:26

	IFC @ 141260

Affected files ...

.. //depot/projects/vap/etc/etc.mips/ttys#1 branch
.. //depot/projects/vap/etc/rc.d/hostid#4 integrate
.. //depot/projects/vap/etc/rc.subr#4 integrate
.. //depot/projects/vap/gnu/lib/libstdc++/config.h#3 integrate
.. //depot/projects/vap/gnu/usr.bin/binutils/objdump/Makefile#3 integrate
.. //depot/projects/vap/gnu/usr.bin/sort/config.h#3 integrate
.. //depot/projects/vap/include/stdio.h#6 integrate
.. //depot/projects/vap/lib/libc/Versions.def#4 integrate
.. //depot/projects/vap/lib/libc/gen/readdir.c#4 integrate
.. //depot/projects/vap/lib/libc/gen/telldir.c#4 integrate
.. //depot/projects/vap/lib/libc/gen/telldir.h#3 integrate
.. //depot/projects/vap/lib/libc/stdio/Symbol.map#4 integrate
.. //depot/projects/vap/lib/libc/stdio/clrerr.c#4 integrate
.. //depot/projects/vap/lib/libc/stdio/feof.c#4 integrate
.. //depot/projects/vap/lib/libc/stdio/ferror.c#4 integrate
.. //depot/projects/vap/lib/libc/stdio/fileno.c#4 integrate
.. //depot/projects/vap/lib/libc/stdio/getc.c#4 integrate
.. //depot/projects/vap/lib/libc/stdio/getchar.c#4 integrate
.. //depot/projects/vap/lib/libc/stdio/local.h#5 integrate
.. //depot/projects/vap/lib/libc/stdio/putc.c#4 integrate
.. //depot/projects/vap/lib/libc/stdio/putchar.c#4 integrate
.. //depot/projects/vap/lib/libc/stdio/stdio.c#4 integrate
.. //depot/projects/vap/lib/libc/stdio/xprintf.c#5 integrate
.. //depot/projects/vap/lib/libdisk/disk.c#4 integrate
.. //depot/projects/vap/lib/libdisk/libdisk.h#3 integrate
.. //depot/projects/vap/lib/libdisk/write_mips_disk.c#1 branch
.. //depot/projects/vap/lib/libftpio/ftpio.c#4 integrate
.. //depot/projects/vap/lib/libthr/thread/thr_exit.c#8 integrate
.. //depot/projects/vap/lib/msun/mips/Symbol.map#2 integrate
.. //depot/projects/vap/libexec/rtld-elf/rtld.c#4 integrate
.. //depot/projects/vap/libexec/rtld-elf/rtld_lock.c#3 integrate
.. //depot/projects/vap/libexec/rtld-elf/rtld_lock.h#3 integrate
.. //depot/projects/vap/sys/arm/at91/uart_dev_at91usart.c#4 integrate
.. //depot/projects/vap/sys/conf/NOTES#18 integrate
.. //depot/projects/vap/sys/conf/files#38 integrate
.. //depot/projects/vap/sys/contrib/rdma/core_priv.h#1 branch
.. //depot/projects/vap/sys/contrib/rdma/ib_addr.h#1 branch
.. //depot/projects/vap/sys/contrib/rdma/ib_cache.h#1 branch
.. //depot/projects/vap/sys/contrib/rdma/ib_cm.h#1 branch
.. //depot/projects/vap/sys/contrib/rdma/ib_fmr_pool.h#1 branch
.. //depot/projects/vap/sys/contrib/rdma/ib_mad.h#1 branch
.. //depot/projects/vap/sys/contrib/rdma/ib_marshall.h#1 branch
.. //depot/projects/vap/sys/contrib/rdma/ib_pack.h#1 branch
.. //depot/projects/vap/sys/contrib/rdma/ib_sa.h#1 branch
.. //depot/projects/vap/sys/contrib/rdma/ib_smi.h#1 branch
.. //depot/projects/vap/sys/contrib/rdma/ib_umem.h#1 branch
.. //depot/projects/vap/sys/contrib/rdma/ib_user_cm.h#1 branch
.. //depot/projects/vap/sys/contrib/rdma/ib_user_mad.h#1 branch
.. //depot/projects/vap/sys/contrib/rdma/ib_user_sa.h#1 branch
.. //depot/projects/vap/sys/contrib/rdma/ib_user_verbs.h#1 branch
.. //depot/projects/vap/sys/contrib/rdma/ib_verbs.h#1 branch
.. //depot/projects/vap/sys/contrib/rdma/iw_cm.h#1 branch
.. //depot/projects/vap/sys/contrib/rdma/krping/getopt.c#1 branch
.. //depot/projects/vap/sys/contrib/rdma/krping/getopt.h#1 branch
.. //depot/projects/vap/sys/contrib/rdma/krping/krping.c#1 branch
.. //depot/projects/vap/sys/contrib/rdma/krping/krping.h#1 branch
.. //depot/projects/vap/sys/contrib/rdma/krping/krping_dev.c#1 branch
.. //depot/projects/vap/sys/contrib/rdma/rdma_addr.c#1 branch
.. //depot/projects/vap/sys/contrib/rdma/rdma_cache.c#1 branch
.. //depot/projects/vap/sys/contrib/rdma/rdma_cm.h#1 branch
.. //depot/projects/vap/sys/contrib/rdma/rdma_cm_ib.h#1 branch
.. //depot/projects/vap/sys/contrib/rdma/rdma_cma.c#1 branch
.. //depot/projects/vap/sys/contrib/rdma/rdma_device.c#1 branch
.. //depot/projects/vap/sys/contrib/rdma/rdma_iwcm.c#1 branch
.. //depot/projects/vap/sys/contrib/rdma/rdma_user_cm.h#1 branch
.. //depot/projects/vap/sys/contrib/rdma/rdma_verbs.c#1 branch
.. //depot/projects/vap/sys/contrib/rdma/types.h#1 branch
.. //depot/projects/vap/sys/dev/ath/if_ath.c#72 integrate
.. //depot/projects/vap/sys/dev/ath/if_athvar.h#24 integrate
.. //depot/projects/vap/sys/dev/bge/if_bge.c#14 integrate
.. //depot/projects/vap/sys/dev/bge/if_bgereg.h#10 integrate
.. //depot/projects/vap/sys/dev/cxgb/cxgb_config.h#4 integrate
.. //depot/projects/vap/sys/dev/cxgb/cxgb_main.c#9 integrate
.. //depot/projects/vap/sys/dev/cxgb/cxgb_offload.c#6 integrate
.. //depot/projects/vap/sys/dev/cxgb/cxgb_osdep.h#5 integrate
.. //depot/projects/vap/sys/dev/cxgb/t3cdev.h#3 integrate
.. //depot/projects/vap/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#1 branch
.. //depot/projects/vap/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.h#1 branch
.. //depot/projects/vap/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#1 branch
.. //depot/projects/vap/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.h#1 branch
.. //depot/projects/vap/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cq.c#1 branch
.. //depot/projects/vap/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_dbg.c#1 branch
.. //depot/projects/vap/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_ev.c#1 branch
.. //depot/projects/vap/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.c#1 branch
.. //depot/projects/vap/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.h#1 branch
.. //depot/projects/vap/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_mem.c#1 branch
.. //depot/projects/vap/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.c#1 branch
.. //depot/projects/vap/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.h#1 branch
.. //depot/projects/vap/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_qp.c#1 branch
.. //depot/projects/vap/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_resource.c#1 branch
.. //depot/projects/vap/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_resource.h#1 branch
.. //depot/projects/vap/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_user.h#1 branch
.. //depot/projects/vap/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_wr.h#1 branch
.. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#7 integrate
.. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#8 integrate
.. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_ddp.c#4 integrate
.. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_tcp_offload.h#2 integrate
.. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_toepcb.h#3 integrate
.. //depot/projects/vap/sys/dev/dcons/dcons_os.c#6 integrate
.. //depot/projects/vap/sys/dev/mpt/mpt.h#6 integrate
.. //depot/projects/vap/sys/dev/mpt/mpt_user.c#1 branch
.. //depot/projects/vap/sys/dev/ofw/ofw_console.c#7 integrate
.. //depot/projects/vap/sys/dev/sio/sio.c#7 integrate
.. //depot/projects/vap/sys/dev/uart/uart_core.c#7 integrate
.. //depot/projects/vap/sys/kern/kern_cpu.c#6 integrate
.. //depot/projects/vap/sys/kern/subr_blist.c#3 integrate
.. //depot/projects/vap/sys/kern/subr_kdb.c#7 integrate
.. //depot/projects/vap/sys/kern/vfs_subr.c#17 integrate
.. //depot/projects/vap/sys/modules/cxgb/Makefile#5 integrate
.. //depot/projects/vap/sys/modules/cxgb/iw_cxgb/Makefile#1 branch
.. //depot/projects/vap/sys/modules/esp/Makefile#5 integrate
.. //depot/projects/vap/sys/modules/hfa/Makefile#3 integrate
.. //depot/projects/vap/sys/modules/hme/Makefile#3 integrate
.. //depot/projects/vap/sys/modules/isp/Makefile#5 integrate
.. //depot/projects/vap/sys/modules/ispfw/Makefile#5 integrate
.. //depot/projects/vap/sys/modules/le/Makefile#3 integrate
.. //depot/projects/vap/sys/modules/mpt/Makefile#5 integrate
.. //depot/projects/vap/sys/modules/rdma/Makefile#1 branch
.. //depot/projects/vap/sys/modules/rdma/addr/Makefile#1 branch
.. //depot/projects/vap/sys/modules/rdma/cma/Makefile#1 branch
.. //depot/projects/vap/sys/modules/rdma/core/Makefile#1 branch
.. //depot/projects/vap/sys/modules/rdma/iwcm/Makefile#1 branch
.. //depot/projects/vap/sys/modules/rdma/krping/Makefile#1 branch
.. //depot/projects/vap/sys/modules/scc/Makefile#4 integrate
.. //depot/projects/vap/sys/modules/sound/driver/Makefile#5 integrate
.. //depot/projects/vap/sys/netinet/tcp.h#7 integrate
.. //depot/projects/vap/sys/netinet/tcp_usrreq.c#9 integrate
.. //depot/projects/vap/sys/pc98/cbus/sio.c#5 integrate
.. //depot/projects/vap/sys/security/audit/audit.h#5 integrate
.. //depot/projects/vap/sys/sun4v/sun4v/hvcons.c#4 integrate
.. //depot/projects/vap/sys/sys/blist.h#3 integrate
.. //depot/projects/vap/sys/sys/kdb.h#5 integrate
.. //depot/projects/vap/sys/sys/mpt_ioctl.h#1 branch
.. //depot/projects/vap/sys/vm/swap_pager.c#7 integrate
.. //depot/projects/vap/usr.bin/env/env.1#4 integrate
.. //depot/projects/vap/usr.sbin/pkg_install/Makefile.inc#3 integrate
.. //depot/projects/vap/usr.sbin/pkg_install/add/perform.c#5 integrate
.. //depot/projects/vap/usr.sbin/pkg_install/delete/perform.c#4 integrate
.. //depot/projects/vap/usr.sbin/pkg_install/lib/lib.h#4 integrate
.. //depot/projects/vap/usr.sbin/pkg_install/lib/match.c#4 integrate
.. //depot/projects/vap/usr.sbin/sade/disks.c#3 integrate
.. //depot/projects/vap/usr.sbin/sade/label.c#3 integrate

Differences ...

==== //depot/projects/vap/etc/rc.d/hostid#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/etc/rc.d/hostid,v 1.8 2008/01/24 07:04:12 ru Exp $
+# $FreeBSD: src/etc/rc.d/hostid,v 1.9 2008/05/06 10:40:20 mtm Exp $
 #
 
 # PROVIDE: hostid
@@ -45,7 +45,7 @@
 {
 	uuid=$1
 	# Generate hostid based on hostuuid - take first four bytes from md5(uuid).
-	id=`echo -n $uuid | md5`
+	id=`echo -n $uuid | /sbin/md5`
 	id="0x${id%????????????????????????}"
 	# Set both kern.hostuuid and kern.hostid.
 	echo "Setting hostuuid: ${uuid}."

==== //depot/projects/vap/etc/rc.subr#4 (text+ko) ====

@@ -1,5 +1,5 @@
 # $NetBSD: rc.subr,v 1.67 2006/10/07 11:25:15 elad Exp $
-# $FreeBSD: src/etc/rc.subr,v 1.80 2008/01/26 11:22:11 mtm Exp $
+# $FreeBSD: src/etc/rc.subr,v 1.83 2008/05/05 15:52:54 maxim Exp $
 #
 # Copyright (c) 1997-2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -171,11 +171,15 @@
 {
 	local always
 
-	if [ -n "$1" ] && checkyesno $1; then
+	case $1 in
+		#	"yes", "true", "on", or "1"
+        [Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1)
 		always=true
-	else
+		;;
+	*)
 		always=false
-	fi
+		;;
+	esac
 	if [ "$autoboot" = yes -o "$always" = true ]; then
 		echo "ERROR: ABORTING BOOT (sending SIGTERM to parent)!"
 		kill -TERM ${RC_PID}

==== //depot/projects/vap/gnu/lib/libstdc++/config.h#3 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD: src/gnu/lib/libstdc++/config.h,v 1.15 2007/05/19 04:25:56 kan Exp $ */
+/* $FreeBSD: src/gnu/lib/libstdc++/config.h,v 1.16 2008/05/03 21:24:28 gonzo Exp $ */
 #ifndef __ISO_C_VISIBLE
 #include 
 #endif
@@ -371,7 +371,7 @@
 /* #undef HAVE_TANL */
 
 /* Define to 1 if the target supports thread-local storage. */
-#if !defined(__sparc64__) && !defined(__arm__)
+#if !defined(__sparc64__) && !defined(__arm__) && !defined(__mips__)
 #define HAVE_TLS 1
 #endif
 

==== //depot/projects/vap/gnu/usr.bin/binutils/objdump/Makefile#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/usr.bin/binutils/objdump/Makefile,v 1.14 2004/06/16 07:09:42 obrien Exp $
+# $FreeBSD: src/gnu/usr.bin/binutils/objdump/Makefile,v 1.15 2008/05/04 04:13:35 marcel Exp $
 
 .include "../Makefile.inc0"
 
@@ -6,7 +6,7 @@
 
 PROG=	objdump
 SRCS=	objdump.c prdbg.c
-WARNS?=	2
+WARNS?=	1
 CFLAGS+= -D_GNU_SOURCE
 CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils
 CFLAGS+= -I${SRCDIR}/binutils

==== //depot/projects/vap/gnu/usr.bin/sort/config.h#3 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD: src/gnu/usr.bin/sort/config.h,v 1.8 2004/08/12 06:40:31 tjr Exp $ */
+/* $FreeBSD: src/gnu/usr.bin/sort/config.h,v 1.10 2008/05/05 16:12:28 jhb Exp $ */
 /* config.h.  Generated by configure.  */
 /* config.hin.  Generated from configure.ac by autoheader.  */
 
@@ -1240,7 +1240,7 @@
 #define PACKAGE_VERSION "5.3.0-20040812-FreeBSD"
 
 /* the number of pending output bytes on stream `fp' */
-#define PENDING_OUTPUT_N_BYTES fp->_p - fp->_bf._base
+#define PENDING_OUTPUT_N_BYTES __fgetpendout(fp)
 
 /* Define if  exists and defines unusable PRI* macros. */
 /* #undef PRI_MACROS_BROKEN */

==== //depot/projects/vap/include/stdio.h#6 (text+ko) ====

@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)stdio.h	8.5 (Berkeley) 4/29/95
- * $FreeBSD: src/include/stdio.h,v 1.68 2008/05/03 20:09:44 marcel Exp $
+ * $FreeBSD: src/include/stdio.h,v 1.72 2008/05/05 16:14:02 jhb Exp $
  */
 
 #ifndef	_STDIO_H_
@@ -60,8 +60,84 @@
 
 #define	_FSTDIO			/* Define for new stdio with functions. */
 
-struct __sFILE;
-typedef	struct __sFILE FILE;
+/*
+ * NB: to fit things in six character monocase externals, the stdio
+ * code uses the prefix `__s' for stdio objects, typically followed
+ * by a three-character attempt at a mnemonic.
+ */
+
+/* stdio buffers */
+struct __sbuf {
+	unsigned char *_base;
+	int	_size;
+};
+
+/*
+ * stdio state variables.
+ *
+ * The following always hold:
+ *
+ *	if (_flags&(__SLBF|__SWR)) == (__SLBF|__SWR),
+ *		_lbfsize is -_bf._size, else _lbfsize is 0
+ *	if _flags&__SRD, _w is 0
+ *	if _flags&__SWR, _r is 0
+ *
+ * This ensures that the getc and putc macros (or inline functions) never
+ * try to write or read from a file that is in `read' or `write' mode.
+ * (Moreover, they can, and do, automatically switch from read mode to
+ * write mode, and back, on "r+" and "w+" files.)
+ *
+ * _lbfsize is used only to make the inline line-buffered output stream
+ * code as compact as possible.
+ *
+ * _ub, _up, and _ur are used when ungetc() pushes back more characters
+ * than fit in the current _bf, or when ungetc() pushes back a character
+ * that does not match the previous one in _bf.  When this happens,
+ * _ub._base becomes non-nil (i.e., a stream has ungetc() data iff
+ * _ub._base!=NULL) and _up and _ur save the current values of _p and _r.
+ *
+ * Certain members of __sFILE are accessed directly via macros or
+ * inline functions.  To preserve ABI compat, these members must not
+ * be disturbed.  These members are marked below with (*).
+ */
+typedef	struct __sFILE {
+	unsigned char *_p;	/* (*) current position in (some) buffer */
+	int	_r;		/* (*) read space left for getc() */
+	int	_w;		/* (*) write space left for putc() */
+	short	_flags;		/* (*) flags, below; this FILE is free if 0 */
+	short	_file;		/* (*) fileno, if Unix descriptor, else -1 */
+	struct	__sbuf _bf;	/* the buffer (at least 1 byte, if !NULL) */
+	int	_lbfsize;	/* (*) 0 or -_bf._size, for inline putc */
+
+	/* operations */
+	void	*_cookie;	/* (*) cookie passed to io functions */
+	int	(*_close)(void *);
+	int	(*_read)(void *, char *, int);
+	fpos_t	(*_seek)(void *, fpos_t, int);
+	int	(*_write)(void *, const char *, int);
+
+	/* separate buffer for long sequences of ungetc() */
+	struct	__sbuf _ub;	/* ungetc buffer */
+	unsigned char	*_up;	/* saved _p when _p is doing ungetc data */
+	int	_ur;		/* saved _r when _r is counting ungetc data */
+
+	/* tricks to meet minimum requirements even when malloc() fails */
+	unsigned char _ubuf[3];	/* guarantee an ungetc() buffer */
+	unsigned char _nbuf[1];	/* guarantee a getc() buffer */
+
+	/* separate buffer for fgetln() when line crosses buffer boundary */
+	struct	__sbuf _lb;	/* buffer for fgetln() */
+
+	/* Unix stdio files get aligned to block boundaries on fseek() */
+	int	_blksize;	/* stat.st_blksize (may be != _bf._size) */
+	fpos_t	_offset;	/* current lseek offset */
+
+	struct pthread_mutex *_fl_mutex;	/* used for MT-safety */
+	struct pthread *_fl_owner;	/* current owner */
+	int	_fl_count;	/* recursive lock count */
+	int	_orientation;	/* orientation for fwide() */
+	__mbstate_t _mbstate;	/* multibyte conversion state */
+} FILE;
 
 #ifndef _STDSTREAM_DECLARED
 __BEGIN_DECLS
@@ -72,11 +148,32 @@
 #define	_STDSTREAM_DECLARED
 #endif
 
+#define	__SLBF	0x0001		/* line buffered */
+#define	__SNBF	0x0002		/* unbuffered */
+#define	__SRD	0x0004		/* OK to read */
+#define	__SWR	0x0008		/* OK to write */
+	/* RD and WR are never simultaneously asserted */
+#define	__SRW	0x0010		/* open for reading & writing */
+#define	__SEOF	0x0020		/* found EOF */
+#define	__SERR	0x0040		/* found error */
+#define	__SMBF	0x0080		/* _buf is from malloc */
+#define	__SAPP	0x0100		/* fdopen()ed in append mode */
+#define	__SSTR	0x0200		/* this is an sprintf/snprintf string */
+#define	__SOPT	0x0400		/* do fseek() optimization */
+#define	__SNPT	0x0800		/* do not do fseek() optimization */
+#define	__SOFF	0x1000		/* set iff _offset is in fact correct */
+#define	__SMOD	0x2000		/* true => fgetln modified _p text */
+#define	__SALC	0x4000		/* allocate string space dynamically */
+#define	__SIGN	0x8000		/* ignore this file in _fwalk */
+
 /*
  * The following three definitions are for ANSI C, which took them
  * from System V, which brilliantly took internal interface macros and
  * made them official arguments to setvbuf(), without renaming them.
  * Hence, these ugly _IOxxx names are *supposed* to appear in user code.
+ *
+ * Although numbered as their counterparts above, the implementation
+ * does not rely on this.
  */
 #define	_IOFBF	0		/* setvbuf should set fully buffered */
 #define	_IOLBF	1		/* setvbuf should set line buffered */
@@ -204,8 +301,8 @@
 void	 funlockfile(FILE *);
 
 /*
- * See ISO/IEC 9945-1 ANSI/IEEE Std 1003.1 Second Edition 1996-07-12
- * B.8.2.7 for the rationale behind the *_unlocked() functions.
+ * These are normally used through macros as defined below, but POSIX
+ * requires functions as well.
  */
 int	 getc_unlocked(FILE *);
 int	 getchar_unlocked(void);
@@ -249,9 +346,6 @@
 int	 vasprintf(char **, const char *, __va_list)
 	    __printflike(2, 0);
 
-void	*__fgetcookie(FILE *);
-void	__fsetfileno(FILE *, int);
-
 /*
  * The system error table contains messages for the first sys_nerr
  * positive errno values.  Use strerror() or strerror_r() from 
@@ -292,5 +386,76 @@
 #endif
 #endif /* __BSD_VISIBLE */
 
+/*
+ * Functions internal to the implementation.
+ */
+int	__srget(FILE *);
+int	__swbuf(int, FILE *);
+
+/*
+ * The __sfoo macros are here so that we can
+ * define function versions in the C library.
+ */
+#define	__sgetc(p) (--(p)->_r < 0 ? __srget(p) : (int)(*(p)->_p++))
+#if defined(__GNUC__) && defined(__STDC__)
+static __inline int __sputc(int _c, FILE *_p) {
+	if (--_p->_w >= 0 || (_p->_w >= _p->_lbfsize && (char)_c != '\n'))
+		return (*_p->_p++ = _c);
+	else
+		return (__swbuf(_c, _p));
+}
+#else
+/*
+ * This has been tuned to generate reasonable code on the vax using pcc.
+ */
+#define	__sputc(c, p) \
+	(--(p)->_w < 0 ? \
+		(p)->_w >= (p)->_lbfsize ? \
+			(*(p)->_p = (c)), *(p)->_p != '\n' ? \
+				(int)*(p)->_p++ : \
+				__swbuf('\n', p) : \
+			__swbuf((int)(c), p) : \
+		(*(p)->_p = (c), (int)*(p)->_p++))
+#endif
+
+#define	__sfeof(p)	(((p)->_flags & __SEOF) != 0)
+#define	__sferror(p)	(((p)->_flags & __SERR) != 0)
+#define	__sclearerr(p)	((void)((p)->_flags &= ~(__SERR|__SEOF)))
+#define	__sfileno(p)	((p)->_file)
+
+extern int __isthreaded;
+
+#define	feof(p)		(!__isthreaded ? __sfeof(p) : (feof)(p))
+#define	ferror(p)	(!__isthreaded ? __sferror(p) : (ferror)(p))
+#define	clearerr(p)	(!__isthreaded ? __sclearerr(p) : (clearerr)(p))
+
+#if __POSIX_VISIBLE
+#define	fileno(p)	(!__isthreaded ? __sfileno(p) : (fileno)(p))
+#endif
+
+#define	getc(fp)	(!__isthreaded ? __sgetc(fp) : (getc)(fp))
+#define	putc(x, fp)	(!__isthreaded ? __sputc(x, fp) : (putc)(x, fp))
+
+#define	getchar()	getc(stdin)
+#define	putchar(x)	putc(x, stdout)
+
+#if __BSD_VISIBLE
+/*
+ * See ISO/IEC 9945-1 ANSI/IEEE Std 1003.1 Second Edition 1996-07-12
+ * B.8.2.7 for the rationale behind the *_unlocked() macros.
+ */
+#define	feof_unlocked(p)	__sfeof(p)
+#define	ferror_unlocked(p)	__sferror(p)
+#define	clearerr_unlocked(p)	__sclearerr(p)
+#define	fileno_unlocked(p)	__sfileno(p)
+#endif
+#if __POSIX_VISIBLE >= 199506
+#define	getc_unlocked(fp)	__sgetc(fp)
+#define	putc_unlocked(x, fp)	__sputc(x, fp)
+
+#define	getchar_unlocked()	getc_unlocked(stdin)
+#define	putchar_unlocked(x)	putc_unlocked(x, stdout)
+#endif
+
 __END_DECLS
 #endif /* !_STDIO_H_ */

==== //depot/projects/vap/lib/libc/Versions.def#4 (text) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libc/Versions.def,v 1.4 2007/12/14 20:49:06 deischen Exp $
+# $FreeBSD: src/lib/libc/Versions.def,v 1.7 2008/05/06 01:41:55 deischen Exp $
 
 # This is our first version; it depends on no other.
 # This version was first added to 7.0-current.
@@ -13,5 +13,7 @@
 # strictly for use only by other FreeBSD applications and libraries
 # are listed here.  We use a separate namespace so we can write
 # simple ABI-checking tools.
+#
+# Please do NOT increment the version of this namespace.
 FBSDprivate_1.0 {
-} FBSD_1.0;
+};

==== //depot/projects/vap/lib/libc/gen/readdir.c#4 (text+ko) ====

@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)readdir.c	8.3 (Berkeley) 9/29/94";
 #endif /* LIBC_SCCS and not lint */
 #include 
-__FBSDID("$FreeBSD: src/lib/libc/gen/readdir.c,v 1.14 2007/12/03 14:33:50 des Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/readdir.c,v 1.15 2008/05/05 14:05:23 kib Exp $");
 
 #include "namespace.h"
 #include 
@@ -48,8 +48,9 @@
  * get next entry in a directory.
  */
 struct dirent *
-_readdir_unlocked(dirp)
+_readdir_unlocked(dirp, skip)
 	DIR *dirp;
+	int skip;
 {
 	struct dirent *dp;
 
@@ -72,7 +73,7 @@
 		    dp->d_reclen > dirp->dd_len + 1 - dirp->dd_loc)
 			return (NULL);
 		dirp->dd_loc += dp->d_reclen;
-		if (dp->d_ino == 0)
+		if (dp->d_ino == 0 && skip)
 			continue;
 		if (dp->d_type == DT_WHT && (dirp->dd_flags & DTF_HIDEW))
 			continue;
@@ -88,11 +89,11 @@
 
 	if (__isthreaded) {
 		_pthread_mutex_lock(&dirp->dd_lock);
-		dp = _readdir_unlocked(dirp);
+		dp = _readdir_unlocked(dirp, 1);
 		_pthread_mutex_unlock(&dirp->dd_lock);
 	}
 	else
-		dp = _readdir_unlocked(dirp);
+		dp = _readdir_unlocked(dirp, 1);
 	return (dp);
 }
 
@@ -109,11 +110,11 @@
 	errno = 0;
 	if (__isthreaded) {
 		_pthread_mutex_lock(&dirp->dd_lock);
-		if ((dp = _readdir_unlocked(dirp)) != NULL)
+		if ((dp = _readdir_unlocked(dirp, 1)) != NULL)
 			memcpy(entry, dp, _GENERIC_DIRSIZ(dp));
 		_pthread_mutex_unlock(&dirp->dd_lock);
 	}
-	else if ((dp = _readdir_unlocked(dirp)) != NULL)
+	else if ((dp = _readdir_unlocked(dirp, 1)) != NULL)
 		memcpy(entry, dp, _GENERIC_DIRSIZ(dp));
 
 	if (errno != 0) {

==== //depot/projects/vap/lib/libc/gen/telldir.c#4 (text+ko) ====

@@ -31,7 +31,7 @@
 static char sccsid[] = "@(#)telldir.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include 
-__FBSDID("$FreeBSD: src/lib/libc/gen/telldir.c,v 1.10 2007/12/03 14:33:51 des Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/telldir.c,v 1.11 2008/05/05 14:05:23 kib Exp $");
 
 #include "namespace.h"
 #include 
@@ -98,7 +98,7 @@
 	dirp->dd_seek = lp->loc_seek;
 	dirp->dd_loc = 0;
 	while (dirp->dd_loc < lp->loc_loc) {
-		dp = _readdir_unlocked(dirp);
+		dp = _readdir_unlocked(dirp, 0);
 		if (dp == NULL)
 			break;
 	}

==== //depot/projects/vap/lib/libc/gen/telldir.h#3 (text+ko) ====

@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/lib/libc/gen/telldir.h,v 1.2 2001/01/24 12:59:24 deischen Exp $
+ * $FreeBSD: src/lib/libc/gen/telldir.h,v 1.3 2008/05/05 14:05:23 kib Exp $
  */
 
 #ifndef _TELLDIR_H_
@@ -59,7 +59,7 @@
 	long	td_loccnt;	/* index of entry for sequential readdir's */
 };
 
-struct dirent	*_readdir_unlocked(DIR *);
+struct dirent	*_readdir_unlocked(DIR *, int);
 void 		_reclaim_telldir(DIR *);
 void 		_seekdir(DIR *, long);
 

==== //depot/projects/vap/lib/libc/stdio/Symbol.map#4 (text) ====

@@ -1,5 +1,5 @@
 /*
- * $FreeBSD: src/lib/libc/stdio/Symbol.map,v 1.6 2007/12/18 23:49:05 das Exp $
+ * $FreeBSD: src/lib/libc/stdio/Symbol.map,v 1.8 2008/05/05 16:14:02 jhb Exp $
  */
 
 FBSD_1.0 {
@@ -149,3 +149,9 @@
 	__printf_arginfo_vis;
 	__printf_render_vis;
 };
+
+FBSDprivate_1.1 {
+	__fgetcookie;
+	__fgetpendout;
+	__fsetfileno;
+};

==== //depot/projects/vap/lib/libc/stdio/clrerr.c#4 (text+ko) ====

@@ -34,15 +34,15 @@
 static char sccsid[] = "@(#)clrerr.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include 
-__FBSDID("$FreeBSD: src/lib/libc/stdio/clrerr.c,v 1.11 2008/05/02 15:25:07 jhb Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/clrerr.c,v 1.12 2008/05/05 16:03:52 jhb Exp $");
 
 #include "namespace.h"
 #include 
 #include "un-namespace.h"
-#include "local.h"
 #include "libc_private.h"
 
-#define	__sclearerr(p)	((void)((p)->_flags &= ~(__SERR|__SEOF)))
+#undef clearerr
+#undef clearerr_unlocked
 
 void
 clearerr(fp)

==== //depot/projects/vap/lib/libc/stdio/feof.c#4 (text+ko) ====

@@ -34,15 +34,15 @@
 static char sccsid[] = "@(#)feof.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include 
-__FBSDID("$FreeBSD: src/lib/libc/stdio/feof.c,v 1.11 2008/05/02 15:25:07 jhb Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/feof.c,v 1.12 2008/05/05 16:03:52 jhb Exp $");
 
 #include "namespace.h"
 #include 
 #include "un-namespace.h"
-#include "local.h"
 #include "libc_private.h"
 
-#define	__sfeof(p)	(((p)->_flags & __SEOF) != 0)
+#undef feof
+#undef feof_unlocked
 
 int
 feof(FILE *fp)

==== //depot/projects/vap/lib/libc/stdio/ferror.c#4 (text+ko) ====

@@ -34,14 +34,16 @@
 static char sccsid[] = "@(#)ferror.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include 
-__FBSDID("$FreeBSD: src/lib/libc/stdio/ferror.c,v 1.11 2008/05/02 15:25:07 jhb Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/ferror.c,v 1.12 2008/05/05 16:03:52 jhb Exp $");
 
 #include "namespace.h"
 #include 
 #include "un-namespace.h"
-#include "local.h"
 #include "libc_private.h"
 
+#undef ferror
+#undef ferror_unlocked
+
 int
 ferror(FILE *fp)
 {

==== //depot/projects/vap/lib/libc/stdio/fileno.c#4 (text+ko) ====

@@ -34,15 +34,15 @@
 static char sccsid[] = "@(#)fileno.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include 
-__FBSDID("$FreeBSD: src/lib/libc/stdio/fileno.c,v 1.12 2008/05/02 15:25:07 jhb Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/fileno.c,v 1.13 2008/05/05 16:03:52 jhb Exp $");
 
 #include "namespace.h"
 #include 
 #include "un-namespace.h"
-#include "local.h"
 #include "libc_private.h"
 
-#define	__sfileno(p)	((p)->_file)
+#undef fileno
+#undef fileno_unlocked
 
 int
 fileno(FILE *fp)

==== //depot/projects/vap/lib/libc/stdio/getc.c#4 (text+ko) ====

@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)getc.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include 
-__FBSDID("$FreeBSD: src/lib/libc/stdio/getc.c,v 1.15 2008/05/02 15:25:07 jhb Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/getc.c,v 1.16 2008/05/05 16:03:52 jhb Exp $");
 
 #include "namespace.h"
 #include 
@@ -42,6 +42,9 @@
 #include "libc_private.h"
 #include "local.h"
 
+#undef getc
+#undef getc_unlocked
+
 int
 getc(FILE *fp)
 {

==== //depot/projects/vap/lib/libc/stdio/getchar.c#4 (text+ko) ====

@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)getchar.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include 
-__FBSDID("$FreeBSD: src/lib/libc/stdio/getchar.c,v 1.14 2008/05/02 15:25:07 jhb Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/getchar.c,v 1.15 2008/05/05 16:03:52 jhb Exp $");
 
 /*
  * A subroutine version of the macro getchar.
@@ -45,6 +45,9 @@
 #include "local.h"
 #include "libc_private.h"
 
+#undef getchar
+#undef getchar_unlocked
+
 int
 getchar()
 {

==== //depot/projects/vap/lib/libc/stdio/local.h#5 (text+ko) ====

@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)local.h	8.3 (Berkeley) 7/3/94
- * $FreeBSD: src/lib/libc/stdio/local.h,v 1.32 2008/05/02 15:25:07 jhb Exp $
+ * $FreeBSD: src/lib/libc/stdio/local.h,v 1.33 2008/05/05 16:03:52 jhb Exp $
  */
 
 #include 	/* for off_t */
@@ -39,105 +39,9 @@
 #include 
 
 /*
- * Information local to this implementation of stdio, in particular,
- * macros, private functions, private variables, and the definition of
- * FILE.
- *
- * NB: to fit things in six character monocase externals, the stdio
- * code uses the prefix `__s' for stdio objects, typically followed
- * by a three-character attempt at a mnemonic.
- */
-
-/* stdio buffers */
-struct __sbuf {
-	unsigned char *_base;
-	int	_size;
-};
-
-/*
- * stdio state variables.
- *
- * The following always hold:
- *
- *	if (_flags&(__SLBF|__SWR)) == (__SLBF|__SWR),
- *		_lbfsize is -_bf._size, else _lbfsize is 0
- *	if _flags&__SRD, _w is 0
- *	if _flags&__SWR, _r is 0
- *
- * This ensures that the getc and putc macros (or inline functions) never
- * try to write or read from a file that is in `read' or `write' mode.
- * (Moreover, they can, and do, automatically switch from read mode to
- * write mode, and back, on "r+" and "w+" files.)
- *
- * _lbfsize is used only to make the inline line-buffered output stream
- * code as compact as possible.
- *
- * _ub, _up, and _ur are used when ungetc() pushes back more characters
- * than fit in the current _bf, or when ungetc() pushes back a character
- * that does not match the previous one in _bf.  When this happens,
- * _ub._base becomes non-nil (i.e., a stream has ungetc() data iff
- * _ub._base!=NULL) and _up and _ur save the current values of _p and _r.
- *
- * Certain members of __sFILE are accessed directly via macros or
- * inline functions.  To preserve ABI compat, these members must not
- * be disturbed.  These members are marked below with (*).
+ * Information local to this implementation of stdio,
+ * in particular, macros and private variables.
  */
-struct __sFILE {
-	unsigned char *_p;	/* (*) current position in (some) buffer */
-	int	_r;		/* (*) read space left for getc() */
-	int	_w;		/* (*) write space left for putc() */
-	short	_flags;		/* (*) flags, below; this FILE is free if 0 */
-	short	_file;		/* (*) fileno, if Unix descriptor, else -1 */
-	struct	__sbuf _bf;	/* the buffer (at least 1 byte, if !NULL) */
-	int	_lbfsize;	/* (*) 0 or -_bf._size, for inline putc */
-
-	/* operations */
-	void	*_cookie;	/* cookie passed to io functions */
-	int	(*_close)(void *);
-	int	(*_read)(void *, char *, int);
-	fpos_t	(*_seek)(void *, fpos_t, int);
-	int	(*_write)(void *, const char *, int);
-
-	/* separate buffer for long sequences of ungetc() */
-	struct	__sbuf _ub;	/* ungetc buffer */
-	unsigned char	*_up;	/* saved _p when _p is doing ungetc data */
-	int	_ur;		/* saved _r when _r is counting ungetc data */
-
-	/* tricks to meet minimum requirements even when malloc() fails */
-	unsigned char _ubuf[3];	/* guarantee an ungetc() buffer */
-	unsigned char _nbuf[1];	/* guarantee a getc() buffer */
-
-	/* separate buffer for fgetln() when line crosses buffer boundary */
-	struct	__sbuf _lb;	/* buffer for fgetln() */
-
-	/* Unix stdio files get aligned to block boundaries on fseek() */
-	int	_blksize;	/* stat.st_blksize (may be != _bf._size) */
-	fpos_t	_offset;	/* current lseek offset */
-
-	pthread_mutex_t _fl_mutex;	/* used for MT-safety */
-	pthread_t _fl_owner;	/* current owner */
-	int	_fl_count;	/* recursive lock count */
-	int	_orientation;	/* orientation for fwide() */
-	mbstate_t _mbstate;	/* multibyte conversion state */
-};
-
-#define	__SLBF	0x0001		/* line buffered */
-#define	__SNBF	0x0002		/* unbuffered */
-#define	__SRD	0x0004		/* OK to read */
-#define	__SWR	0x0008		/* OK to write */
-	/* RD and WR are never simultaneously asserted */
-#define	__SRW	0x0010		/* open for reading & writing */
-#define	__SEOF	0x0020		/* found EOF */
-#define	__SERR	0x0040		/* found error */
-#define	__SMBF	0x0080		/* _buf is from malloc */
-#define	__SAPP	0x0100		/* fdopen()ed in append mode */
-#define	__SSTR	0x0200		/* this is an sprintf/snprintf string */
-#define	__SOPT	0x0400		/* do fseek() optimization */
-#define	__SNPT	0x0800		/* do not do fseek() optimization */
-#define	__SOFF	0x1000		/* set iff _offset is in fact correct */
-#define	__SMOD	0x2000		/* true => fgetln modified _p text */
-#define	__SALC	0x4000		/* allocate string space dynamically */
-#define	__SIGN	0x8000		/* ignore this file in _fwalk */
 
 extern int	_sread(FILE *, char *, int);
 extern int	_swrite(FILE *, char const *, int);
@@ -153,8 +57,6 @@
 extern int	__slbexpand(FILE *, size_t);
 extern int	__srefill(FILE *);
 extern int	__sread(void *, char *, int);
-extern int	__srget(FILE *);
-extern int	__swbuf(int, FILE *);
 extern int	__swrite(void *, char const *, int);
 extern fpos_t	__sseek(void *, fpos_t, int);
 extern int	__sclose(void *);
@@ -179,38 +81,6 @@
 
 
 /*
- * Get and store individual characters from a file stream.
- */
-#define	__sgetc(p) (--(p)->_r < 0 ? __srget(p) : (int)(*(p)->_p++))
-#if defined(__GNUC__) && defined(__STDC__)
-static __inline int
-__sputc(int _c, FILE *_p)
-{
-	if (--_p->_w >= 0 || (_p->_w >= _p->_lbfsize && (char)_c != '\n'))
-		return (*_p->_p++ = _c);
-	else
-		return (__swbuf(_c, _p));
-}
-#else
-/*
- * This has been tuned to generate reasonable code on the vax using pcc.
- */
-#define	__sputc(c, p) \
-	(--(p)->_w < 0 ? \
-		(p)->_w >= (p)->_lbfsize ? \
-			(*(p)->_p = (c)), *(p)->_p != '\n' ? \
-				(int)*(p)->_p++ : \
-				__swbuf('\n', p) : \
-			__swbuf((int)(c), p) : \
-		(*(p)->_p = (c), (int)*(p)->_p++))
-#endif
-
-/*
- * Return true if the file stream has encountered an error.
- */
-#define	__sferror(p)	(((p)->_flags & __SERR) != 0)
-
-/*
  * Prepare the given FILE for writing, and return 0 iff it
  * can be written now.  Otherwise, return EOF and set errno.
  */

==== //depot/projects/vap/lib/libc/stdio/putc.c#4 (text+ko) ====

@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)putc.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include 
-__FBSDID("$FreeBSD: src/lib/libc/stdio/putc.c,v 1.15 2008/05/02 15:25:07 jhb Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/putc.c,v 1.16 2008/05/05 16:03:52 jhb Exp $");
 
 #include "namespace.h"
 #include 
@@ -42,6 +42,9 @@
 #include "local.h"
 #include "libc_private.h"
 
+#undef putc
+#undef putc_unlocked
+
 int
 putc(c, fp)
 	int c;

==== //depot/projects/vap/lib/libc/stdio/putchar.c#4 (text+ko) ====

@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)putchar.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include 
-__FBSDID("$FreeBSD: src/lib/libc/stdio/putchar.c,v 1.15 2008/05/02 15:25:07 jhb Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/putchar.c,v 1.16 2008/05/05 16:03:52 jhb Exp $");
 
 #include "namespace.h"
 #include 
@@ -42,6 +42,9 @@
 #include "local.h"
 #include "libc_private.h"
 
+#undef putchar
+#undef putchar_unlocked
+
 /*
  * A subroutine version of the macro putchar
  */

==== //depot/projects/vap/lib/libc/stdio/stdio.c#4 (text+ko) ====

@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)stdio.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include 
-__FBSDID("$FreeBSD: src/lib/libc/stdio/stdio.c,v 1.26 2008/05/03 20:09:44 marcel Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/stdio.c,v 1.28 2008/05/05 16:14:02 jhb Exp $");
 
 #include "namespace.h"
 #include 
@@ -46,20 +46,6 @@
 #include "un-namespace.h"
 #include "local.h"
 
-void *
-__fgetcookie(FILE *fp)
-{
-
-	return (fp->_cookie);
-}
-
-void
-__fsetfileno(FILE *fp, int fd)
-{
-
-	fp->_file = fd;
-}
-
 /*
  * Small standard I/O/seek/close functions.

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Wed May  7 02:55:26 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C477610656AD; Wed,  7 May 2008 02:55:26 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8516A10656A9
	for ; Wed,  7 May 2008 02:55:26 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 364178FC18
	for ; Wed,  7 May 2008 02:55:26 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m472tQxL061017
	for ; Wed, 7 May 2008 02:55:26 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m472tQEn061015
	for perforce@freebsd.org; Wed, 7 May 2008 02:55:26 GMT
	(envelope-from sam@freebsd.org)
Date: Wed, 7 May 2008 02:55:26 GMT
Message-Id: <200805070255.m472tQEn061015@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 141263 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 07 May 2008 02:55:27 -0000

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

Change 141263 by sam@sam_ebb on 2008/05/07 02:54:39

	fix merge botch

Affected files ...

.. //depot/projects/vap/lib/libc/stdio/Symbol.map#5 edit

Differences ...

==== //depot/projects/vap/lib/libc/stdio/Symbol.map#5 (text) ====

@@ -149,9 +149,3 @@
 	__printf_arginfo_vis;
 	__printf_render_vis;
 };
-
-FBSDprivate_1.1 {
-	__fgetcookie;
-	__fgetpendout;
-	__fsetfileno;
-};

From owner-p4-projects@FreeBSD.ORG  Wed May  7 05:05:41 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 228A31065670; Wed,  7 May 2008 05:05:41 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BFCB9106566B
	for ; Wed,  7 May 2008 05:05:40 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id A93248FC17
	for ; Wed,  7 May 2008 05:05:40 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m4755eaT077580
	for ; Wed, 7 May 2008 05:05:40 GMT
	(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m4755e6Y077578
	for perforce@freebsd.org; Wed, 7 May 2008 05:05:40 GMT
	(envelope-from pgj@FreeBSD.org)
Date: Wed, 7 May 2008 05:05:40 GMT
Message-Id: <200805070505.m4755e6Y077578@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	pgj@FreeBSD.org using -f
From: Gabor Pali 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 141266 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 07 May 2008 05:05:41 -0000

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

Change 141266 by pgj@disznohal on 2008/05/07 05:05:08

	Cleanup in Chapter 26.

Affected files ...

.. //depot/projects/docproj_hu/books/handbook/mail/chapter.sgml#4 edit

Differences ...

==== //depot/projects/docproj_hu/books/handbook/mail/chapter.sgml#4 (text+ko) ====

@@ -21,7 +21,7 @@
       
 	Jim
 	Mock
-	Újraírta: 
+	Átdolgozta: 
       
     
   
@@ -31,16 +31,17 @@
   
     Áttekintés
 
-    email
+    e-mail
 
-    Az elektronikus levelezés, avagy e-mail,
-      a kommunikáció egyik legjobban elterjedt
-      formája.  Ebben a fejezetben bemutatjuk, hogyan futtassunk
-      &os;-n levelezõ szervert, illetve hogyan küldjünk
-      és fogadjunk e-maileket a &os; használatával.
-      Ez azonban semmiképpen sem tekinthetõ egy teljes
-      referenciának és tulajdonképpen számos
-      fontos tényezõrõl szót sem ejtünk.  A
+    Az elektronikus levelezés, más
+      néven e-mail, a kommunikáció egyik legjobban
+      elterjedt formája.  Ebben a fejezetben bemutatjuk, hogyan
+      futtassunk &os;-n levelezõ szervert, illetve hogyan
+      küldjünk és fogadjunk e-maileket a &os;
+      használatával.  Ez azonban semmiképpen sem
+      tekinthetõ egy teljes referenciának és
+      tulajdonképpen számos fontos
+      tényezõrõl szót sem ejtünk.  A
       témára úgy kaphatunk egy sokkal
       átfogóbb rálátást, ha a ben felsorolt remek könyveket is
@@ -53,59 +54,61 @@
       
 	milyen szoftverkomponensek játszanak szerepet az
 	  elektronikus levelek küldésében és
-	  fogadásában
+	  fogadásában;
       
 
       
 	&os;-ben hol találhatóak a
-	  sendmail konfigurációs
-	  állományai
+	  sendmail
+	  konfigurációs állományai;
       
 
       
 	mi a különbség a helyi és
-	  távoli postaládák között
+	  távoli postaládák
+	  között;
       
 
       
-	hogyan védjük meg a levelezõ
-	  szerverünket a kéretlen levélszemét
-	  továbbítása ellen
+	hogyan akadályozzuk meg, hogy a levelezõ
+	  szerverünk a kéretlen levélszemetet
+	  továbbítson;
       
 
       
 	rendszerünkön hogyan telepítsünk
 	  és állítsunk be más levelezõ
 	  szervereket a sendmail
-	  helyett
+	  helyett;
       
 
       
 	hogyan oldjuk meg a levelezõ szerverekkel
 	  kapcsolatban felmerülõ általános
-	  problémákat
+	  problémákat;
       
 
       
-	hogyan használjuk az SMTP protokollt az
-	  UUCP-vel
+	hogyan használjuk az SMTP protokollt az UUCP
+	  protokollal;
       
 
       
 	hogyan kell rendszerüket csak
-	  levélküldésre beállítani
+	  levélküldésre
+	  beállítani;
       
 
       
 	hogyan levelezzünk betárcsázós
-	  kapcsolattal
+	  kapcsolattal;
       
 
       
 	hogyan növeljük rendszerünk
 	  védelmét az SMTP
 	  hitelesítésének
-	  engedélyezésével
+	  engedélyezésével;
       
 
       
@@ -113,18 +116,19 @@
 	  használjunk a levelek küldésére
 	  és fogadására például a
 	  mutthoz hasonló
-	  levelezõ klienseket
+	  levelezõ klienseket;
       
 
       
 	hogyan töltsük le leveleinket egy távoli
 	  POP vagy IMAP
-	  szerverrõl
+	  szerverrõl;
       
 
       
 	hogyan alkalmazzunk automatikusan adott szabályokat
-	  vagy szûrõket az érkezõ levelekre
+	  vagy szûrõket az érkezõ
+	  levelekre.
       
     
 
@@ -132,22 +136,24 @@
 
     
       
-	az internet csatlakozásunk megfelelõ
+	az internet-csatlakozásunk megfelelõ
 	  beállítása ()
+	  linkend="advanced-networking">);
       
 
       
 	a névfeloldás
 	  beállítása ()
+	  linkend="network-servers">);
       
 
       
 	a külsõ fejlesztésû
-	  alkalmazások telepítésének ismerete
-	  ()
+	  alkalmazások telepítésének
+	  ismerete ().
+	    
     
+
   
 
   
@@ -159,13 +165,13 @@
 
     Öt fontosabb részre bonthatjuk a
       levelezést.  Ezek: a
-      felhasználói program, a levélküldõ
-      démon, a
+      felhasználói program (mail user agent), a levélküldõ démon
+      (mail transfer agent), a
       névfeloldás, a
       helyi vagy távoli postaláda és
       természetesen maga a
-      levelezõ szerver.
+      levelezõ szerver (mail host).
 
     
       A felhasználói program
@@ -176,9 +182,9 @@
 	pine, elm
 	és mail, valamint a
 	különféle grafikus alkalmazásokat, mint
-	például balsa,
-	xfmail, csak hogy felsoroljuk
-	néhány újabb, egy
+	például a balsa
+	és az xfmail, csak hogy
+	felsoroljuk néhány újabb, egy
 	webböngészõhöz hasonlóan
 	kifinomult eszközt is.  Ezek a programok
 	egyszerûen átküldik az elektronikus levelekkel
@@ -186,8 +192,8 @@
 	linkend="mail-host">levelezõ
 	szervernek vagy meghívják
 	valamelyik levélküldõ
-	démont, esetleg közvetlenül
-	TCP-n keresztül
+	démont, esetleg közvetlenül a
+	TCP protokollon keresztül
 	kézbesítenek.
 
     
@@ -196,22 +202,22 @@
       A levélküldõ démon
 
       
-	levelezõ démon
+	levélküldõ démon
 	sendmail
       
 
       
-	levelezõ démon
+	levélküldõ démon
 	postfix
       
 
       
-	levelezõ démon
+	levélküldõ démon
 	qmail
       
 
       
-	levelezõ démon
+	levélküldõ démon
 	exim
       
 
@@ -224,31 +230,31 @@
 
       
 	
-	  exim;
+	  exim
 	
 
 	
-	  postfix;
+	  postfix
 	
 
 	
-	  qmail.
+	  qmail
 	
       
 
       Ez a démon általában két
-	feladatot lát el — egyaránt felelõs a
-	beérkezõ levelek fogadásáért
-	és a kimenõ levelek
-	elküldéséért.  Azonban
-	nem tartozik a feladatai közé,
-	hogy a POP vagy IMAP
-	protokollokhoz hasonlóan olvashatóvá tegye
-	a leveleinket illetve csatlakozni engedjen a helyi
-	mbox vagy Maildir formátumú
-	postaládáinkhoz.  Ezekhez a mûveletekhez egy
-	külön démon
-	fog kelleni.
+	feladatot lát el — a beérkezõ levelek
+	fogadásáért és a kimenõ levelek
+	elküldéséért felelõs.
+	Nem tartozik azonban a feladatai
+	közé, hogy a POP vagy
+	IMAP protokollokhoz hasonlóan
+	olvashatóvá tegye a leveleinket, illetve
+	csatlakozni engedjen a helyi mbox vagy
+	Maildir formátumú postaládáinkhoz.
+	Ezekhez a mûveletekhez egy külön démon
+	szükségeltetik.
 
       
 	A sendmail régebbi
@@ -278,21 +284,19 @@
 	levelek továbbításában.  A
 	démon a leveleket úgy küldi át az
 	egyik géprõl a másikra, hogy a
-	névfeloldáson keresztül megkeresi a leveleket
-	kapó távoli gépet.  Ez a folyamat
-	szintén végbemegy, amikor egy távoli
-	géprõl levelet küldenek a mi
-	szerverünkre.
+	névfeloldáson keresztül megkeresi azt a
+	távoli gépet, amelynek a leveleket
+	címezték.  Ez a folyamat szintén
+	végbemegy, amikor egy távoli géprõl
+	levelet küldenek a mi szerverünkre.
 
-      
-	MX rekord
-      
+      MX rekord
 
       A DNS valósítja meg a
 	hálózati nevek és az IP-címek
 	összerendelését valamint ez tárolja el
 	a levélküldésre vonatkozó
-	információkat is, amiket MX rekordoknak
+	információkat is, amelyeket MX rekordoknak
 	hívnak.  Az MX (Mail eXchanger,
 	levélváltó) rekord adja meg
 	azt a gépet vagy azokat a gépeket, amelyek az
@@ -301,7 +305,7 @@
 	tartományunkhoz nem tartozik MX rekord, akkor a
 	levél közvetlenül a gépünkre
 	vándorol feltéve, hogy rendelkezik olyan A
-	rekorddal, ami összerendeli a gépünk
+	rekorddal, amely összerendeli a gépünk
 	nevét az IP-címével.
 
       A &man.host.1; parancs használatával az
@@ -363,23 +367,23 @@
 	  segítségével egyaránt el tudjuk
 	  így érni a postaládákat, az
 	  IMAP használatának
-	  mégis több az elõnye, íme
+	  mégis több elõnye van, íme
 	  néhány közülük:
 
 	
 	  
-	    az IMAP a levelek leszedése
+	    Az IMAP a levelek leszedése
 	      mellett tárolni is képes a távoli
-	      szerveren
+	      szerveren.
 	  
 
 	  
-	    az IMAP támogat
-	      párhuzamos lekéréseket
+	    Az IMAP támogat
+	      párhuzamos lekéréseket.
 	  
 
 	  
-	    az IMAP hihetetlenül hasznos
+	    Az IMAP hihetetlenül hasznos
 	      tud lenni lassabb összeköttetések
 	      esetében, mivel lehetõvé teszi a
 	      felhasználók számára, hogy
@@ -388,7 +392,8 @@
 	      Továbbá a szerver és a kliens
 	      közti adatmozgás csökkentése
 	      érdekében képes bizonyos feladatokat
-	      a szerveren elvégezni, mondjuk keresni.
+	      a szerveren elvégezni, például
+	      keresni.
 	  
 	
 
@@ -408,19 +413,19 @@
 
 	      
 		
-		  qpopper;
+		  qpopper
 		
 
 		
-		  teapop;
+		  teapop
 		
 
 		
-		  imap-uw;
+		  imap-uw
 		
 
 		
-		  courier-imap;
+		  courier-imap
 		
 	      
 
@@ -435,9 +440,9 @@
 
 	  
 	    Ha szükséges, akkor a
-	      POP vagy IMAP szerver
-	      betöltéséhez írjuk át az
-	      /etc/inetd.conf
+	      POP vagy IMAP
+	      szerver betöltéséhez írjuk
+	      át az /etc/inetd.conf
 	      állományt.
 	  
 	
@@ -452,10 +457,11 @@
 	    protokollokat biztonságos módon
 	    szeretnénk elérni, akkor az &man.ssh.1;
 	    használatával hozzunk létre
-	    hozzá egy járatot és bújtassuk.
-	    Errõl részletesebben a ban olvashatunk.
 	
+
       
 
       
@@ -476,7 +482,7 @@
 
       levelezõ szerver
 
-      A levelezõ szerver az a szerver, ami a
+      A levelezõ szerver az a szerver, amely a
 	gépünk vagy akár az egész
 	hálózatunk irányába
 	érkezõ levelek fogadásáért
@@ -500,9 +506,7 @@
     A <application>sendmail</application>
       beállítása
 
-    
-      sendmail
-    
+    sendmail
 
     A &man.sendmail.8; a &os; alapértelmezett
       levéltovábbító ügynöke (Mail
@@ -521,33 +525,13 @@
       állományban tárolja
       beállításait:
 
-    
-      /etc/mail/access
-    
-
-    
-      /etc/mail/aliases
-    
-
-    
-      /etc/mail/local-host-names
-    
-
-    
-      /etc/mail/mailer.conf
-    
-
-    
-      /etc/mail/mailertable
-    
-
-    
-      /etc/mail/sendmail.cf
-    
-
-    
-      /etc/mail/virtusertable
-    
+    /etc/mail/access
+    /etc/mail/aliases
+    /etc/mail/local-host-names
+    /etc/mail/mailer.conf
+    /etc/mail/mailertable
+    /etc/mail/sendmail.cf
+    /etc/mail/virtusertable
 
     
       
@@ -562,36 +546,37 @@
 	    
 	      /etc/mail/access
 	    
-	    a sendmail
-	      engedélyezett hozzáféréseit
+	    A sendmail által
+	      engedélyezett hozzáféréseket
 	      tároló adatbázis
 	  
 	  
 	    
 	      /etc/mail/aliases
 	    
-	    a postaládák álnevei
+	    A postaládák álnevei
 	  
 	  
 	    
 	      /etc/mail/local-host-names
 	    
-	    azon nevek felsorolása, amik
-	      számára a sendmail
-	      leveleket fogad
+	    Azon nevek felsorolása, amelyek
+	      számára a
+	      sendmail leveleket
+	      fogad
 	  
 	  
 	    
 	      /etc/mail/mailer.conf
 	    
-	    a levelezõ programok
+	    A levelezõ programok
 	      beállításai
 	  
 	  
 	    
 	      /etc/mail/mailertable
 	    
-	    a levelezõ programok
+	    A levelezõ programok
 	      kézbesítési
 	      táblázata
 	  
@@ -607,7 +592,7 @@
 	    
 	      /etc/mail/virtusertable
 	    
-	    virtuális felhasználók és
+	    Virtuális felhasználók és
 	      tartományok táblázatai
 	  
 	
@@ -619,16 +604,16 @@
 
       Az engedélyezett hozzáféréseket
 	tároló adatbázis tartalmazza milyen
-	hálózati neve(ke)n vagy IP-címeken lehet
-	elérni a helyi levelezõ szervert és milyen
-	típusú hozzáférést kapnak.  A
-	gépeket  (rendben),
+	hálózati neveken vagy IP-címeken lehet
+	elérni a helyi levelezõ szervert és azok
+	milyen típusú hozzáférést
+	kapnak.  A gépek az  (rendben),
 	 (visszautasít),
 	 (továbbítás)
-	beállításokkal reagálhatjuk le, vagy
-	egyszerûen csak átadjuk a
+	beállításokat alkalmazhatjuk, vagy
+	egyszerûen meghívhatjuk hozzájuk a
 	sendmail hibakezelõ
-	rutinjának egy adott kézbesítési
+	rutinját egy adott kézbesítési
 	hibával.  Ha egy gépet az 
 	beállítással veszük fel a
 	listára, ami egyébként
@@ -648,8 +633,8 @@
 	  elérését szabályozó
 	  adatbázis beállítása
 
-	cyberspammer.com                550 We do not accept mail from spammers
-FREE.STEALTH.MAILER@            550 We do not accept mail from spammers
+	cyberspammer.com                550 Nem szeretjuk a spammereket
+FREE.STEALTH.MAILER@            550 Nem szeretjuk a spammereket
 another.source.of.spam          REJECT
 okay.cyberspammer.com           OK
 128.32                          RELAY
@@ -667,9 +652,9 @@
 	tõle érkezõ levél illeszkedik a bal
 	oldali szabályra.  Az ezeket követõ
 	bejegyzésben visszalökünk minden olyan levelet,
-	ami az internetrõl egy adott
+	amely az internetrõl egy adott
 	számítógéptõl érkezik,
-	mondjuk a another.source.of.spam
+	például az another.source.of.spam
 	címrõl.  A következõ bejegyzésben
 	az okay.cyberspammer.com
 	címrõl elfogadjuk a kapcsolódást, ami
@@ -681,14 +666,15 @@
 	pontosan megnevezetteket.  Végül az utolsó
 	bejegyzésben engedélyezzük a levelek
 	továbbküldését minden olyan gép
-	számára, aminek a címe
-	128.32-vel kezdõdik.  Ezek tehát
-	képesek ezen a levelezõ szerveren keresztül
-	bárhova leveleket küldeni.
+	számára, amelynek címe a
+	128.32 elõtaggal kezdõdik.  Ezek
+	tehát képesek ezen a levelezõ szerveren
+	keresztül bárhova leveleket küldeni.
 
       Az állomány módosítása
-	után az adatbázis frissítéséhez
-	mindig le kell futtatnunk egy make parancsot az
+	után az adatbázis
+	frissítéséhez mindig le kell futtatnunk egy
+	make parancsot az
 	/etc/mail/ könyvtárban.
 
     
@@ -697,8 +683,8 @@
       <filename>/etc/mail/aliases</filename>
 
       Az álneveket tartalmazó adatbázis
-	virtuális postaládákat sorol fel, amik
-	más felhasználó(k)ra,
+	virtuális postaládákat sorol fel, amelyek
+	más felhasználókra,
 	állományokra, programokra vagy további
 	álnevekre vonatkozhatnak.  Íme
 	néhány példa az
@@ -716,14 +702,14 @@
 
       A formai szabályok egyszerûek: a kettõspont
 	bal oldalára kell írni azt a
-	postaládát, ami a jobb oldalán levõ
-	cél(ok)ra bomlik ki.  A példa elsõ
-	sorában egyszerûen megfeleltetjük a
-	root postaládáját a
+	postaládát, amely a jobb oldalán levõ
+	célokra bomlik.  A példa elsõ sorában
+	egyszerûen megfeleltetjük a root
+	postaládáját a
 	localuser
 	postaládájának, majd ezt a nevet
-	keressük meg az álnevek adatbázisában.
-	Ha nem találunk már rá illeszkedést,
+	keressük az álnevek adatbázisában.  Ha
+	nem találunk már rá illeszkedést,
 	akkor az üzenetet a localuser
 	nevû helyi felhasználónak
 	továbbítjuk.  A következõ sorban
@@ -733,8 +719,9 @@
 	három további helyi postaládára
 	mennek tovább: ezek név szerint a
 	joe, eric és
-	paul.  Vegyük észre, hogy itt
-	távoli postaládák
+	paul felhasználók
+	postaládái.  Itt a távoli
+	postaládák
 	felhasználó@példa.hu alakban
 	adhatóak meg.  A következõ sor az
 	állományok használatát
@@ -760,15 +747,15 @@
       <filename>/etc/mail/local-host-names</filename>
 
       Ebben az állományban adhatjuk meg, hogy a
-	&man.sendmail.8; milyen hálózati neveket fogadjon el
-	helyi hálózati névként.  Ide kell
+	&man.sendmail.8; milyen hálózati neveket fogadjon
+	el helyi hálózati névként.  Ide kell
 	raknunk azokat a tartományokat vagy címeket,
-	amiktõl a sendmail leveleket
-	fogad el.  Például ha a levelezõ szerver az
+	amelyektõl a sendmail leveleket
+	fogad el.  Például, ha a levelezõ szerver az
 	minta.com
 	tartományból és a level.minta.com címrõl fogad
-	el leveleket, akkor a local-host-names
+	role="fqdn">level.minta.com címrõl fogad el
+	leveleket, akkor a local-host-names
 	valahogy így fog kinézni:
 
       minta.com
@@ -776,14 +763,15 @@
 
       Az állomány módosításakor
 	a &man.sendmail.8; programot újra kell indítani a
-	változások beolvasásához.
+	változások
+	érvényesítéséhez.
 
     
 
     
       <filename>/etc/mail/sendmail.cf</filename>
 
-      Mint a sendmail központi
+      Ahogy a sendmail központi
 	konfigurációs állománya, a
 	sendmail.cf irányítja a
 	sendmail átfogó
@@ -840,23 +828,23 @@
 
       A fenti példában megadtunk egy
 	leképezést a minta.com tartományhoz.  Ez
-	az állomány úgy dolgozódik fel, hogy
+	role="domainname">minta.com tartományhoz.  Ez az
+	állomány úgy dolgozódik fel, hogy
 	fentrõl lefelé illesztõdnek a címek,
 	egészen az elsõ egyezésig.  Az elsõ
-	bejegyzés szerint a root@minta.com a
-	helyi root felhasználó
+	bejegyzés szerint a root@minta.com a helyi
+	root felhasználó
 	postaládájára képzõdik le.  A
 	következõ bejegyzés szerint a
 	postmaster@minta.com a noc.example.net címen
+	role="fqdn">noc.minta.net címen
 	található postmaster
 	nevû felhasználó
 	postaládájára képzõdik le.
-	Végezetül, ha az minta.com címrõl eddig
 	még semmi sem illeszkedett volna, akkor az utolsó
-	leképezés veszi át, ami az minta.com tartományon
 	belül az összes többi címre
 	küldött levelet a helyi joe
@@ -903,13 +891,13 @@
       kimenõ és beérkezõ levelek
       kezeléséért.
 
-    Azonban számtalan okból eredõen egyes
-      rendszergazdák mégis szeretnék
+    Számtalan okból eredõen egyes
+      rendszergazdák azonban mégis szeretnék
       lecserélni a rendszerükhöz tartozó
       levéltovábbítót.  Ennek oka lehet
       egyszerûen csak annyi, hogy ki akarunk próbálni
       egy másik programot vagy éppen egy olyan
-      eszközre van szükségünk, ami
+      eszközre van szükségünk, amely
       kizárólag csak máshol található
       meg.  Szerencsére a &os; megkönnyíti ezt a
       váltást.
@@ -935,18 +923,20 @@
 	igényeinknek, sõt az új szoftvert még
 	az elõtt be tudjuk állítani, hogy
 	átvenné a sendmail
-	helyét.  Azonban vigyázzunk, hogy az új
+	helyét.  Vigyázzunk azonban, hogy az új
 	szoftver telepítésekor ne írjon felül
-	olyan rendszerszintû binárisokat, mint mondjuk a
-	/usr/bin/sendmail.  Másrészt
-	az új levelezõ szoftvert szolgálatba
-	helyezése elõtt mindenképpen fontos
-	megfelelõen beállítanunk.
+	olyan rendszerszintû binárisokat, mint
+	például a /usr/bin/sendmail.
+	Másrészt az új levelezõ szoftvert
+	szolgálatba helyezése elõtt
+	mindenképpen fontos megfelelõen
+	beállítanunk.
 
       A kiválasztott
 	levéltovábbító
-	beállításával kapcsolatban olvassuk el
-	a hozzátartozó dokumentációt.
+	beállításával kapcsolatban olvassuk
+	el a hozzátartozó
+	dokumentációt.
 
     
 
@@ -968,10 +958,11 @@
 	  levelezõ rendszerrel.  Ha nem így
 	  cselekszünk, akkor például a
 	  &man.periodic.8; és a hozzá hasonló
-	  programok nem lesznek képesek a szokásukhoz
-	  híven e-mailben elküldeni a futásuk
-	  eredményét.  A rendszer bizonyos részei
-	  ráadásul egy mûködõ,
+	  programok nem lesznek képesek a tõlük
+	  megszokott módon e-mailben elküldeni a
+	  futásuk eredményét.  A rendszer bizonyos
+	  részei ráadásul egy
+	  mûködõ,
 	  sendmail-kompatibilis rendszert
 	  feltételeznek.  Ha letiltása után az
 	  alkalmazások továbbra is a
@@ -985,8 +976,9 @@
 
       
 	A &os; 2002/4/4 elõtti 4.5-STABLE vagy annál
-	  korábbi változata (beleértve a 4.5-RELEASE
-	  és az azt megelõzõ verziókat)
+	  korábbi változata (beleértve a
+	  4.5-RELEASE és az azt megelõzõ
+	  verziókat)
 
 	Az /etc/rc.conf
 	  állományba írjuk be:
@@ -996,22 +988,22 @@
 	Ezzel kikapcsoljuk a sendmail
 	  számára a beérkezõ levelek
 	  feldolgozását, de ha a
-	  /etc/mail/mailer.conf (ld.  lentebb)
-	  nem változik, akkor a
+	  /etc/mail/mailer.conf (lásd
+	  lentebb) nem változik, akkor a
 	  sendmail továbbra is
 	  alkalmas lesz levelek küldésére.
 
       
 
       
-	A &os, 2002/4/4 utáni 4.5-STABLE vagy
+	<title>A &os; 2002/4/4 utáni 4.5-STABLE vagy
 	  késõbbi változata (beleértve a
 	  4.6-RELEASE és az azt következõ
 	  változatokat)
 
 	A sendmail teljes
-	  letiltását, beleértve a kimenõ levelek
-	  kézbesítését, az
+	  letiltását, beleértve a kimenõ
+	  levelek kézbesítését, az
 	  /etc/rc.conf állományban a
 	  következõ sor hozzáadásával
 	  kezdeményezhetjük:
@@ -1038,7 +1030,7 @@
       
 
       
-	A &os; 5.0-STABLE és a késõbbi
+	<title>A &os; 5.0-STABLE és a késõbbi
 	  változatok
 
 	A sendmail teljes
@@ -1064,8 +1056,8 @@
 
 	A sendmail
 	  indításával kapcsolatos további
-	  beállításokkal kapcsolatban
-	  látogassuk meg a &man.rc.sendmail.8; man oldalt.
+	  beállításokat az &man.rc.sendmail.8; man
+	  oldalon találjuk.
 
       
     
@@ -1075,11 +1067,11 @@
 	elindítása a rendszerrel együtt
 
       Attól függõen, hogy a &os; melyik
-	változatát használjuk, két
+	változatát használjuk, a
+	rendszerindítás folyamán két
 	módszer áll rendelkezésünkre az
 	új levélküldõ
-	elindítására a
-	rendszerindítás folyamán.
+	elindítására.
 
       
 	A &os; 2002/4/11 elõtti 4.5-STABLE változata
@@ -1107,7 +1099,7 @@
 
 	<programlisting>/usr/local/etc/rc.d/supermailer.sh stop</programlisting>
 
-	<para>parancsot hívják meg, amit
+	<para>parancsot hívják meg, amelyet
 	  egyébként manuálisan is kiadhatunk a
 	  szerver leállításához.</para>
 
@@ -1127,7 +1119,7 @@
 
 	<para>változót, ahol az
 	  <replaceable>állománynév</replaceable>
-	  annak a szkriptnek a neve, ami a rendszerrel együtt
+	  annak a szkriptnek a neve, amely a rendszerrel együtt
 	  elindítandó
 	  levéltovábbítót fogja
 	  beüzemelni.</para>
@@ -1146,7 +1138,7 @@
 	jelenlétét.  Emiatt sok
 	levéltovábbítóhoz tartozik egy
 	<application>sendmail</application> kompatibilis parancssoros
-	felület is, amivel igyekeznek megkönnyíteni a
+	felület is, amellyel igyekeznek megkönnyíteni a
 	<application>sendmail</application> <quote>gyors</quote>
 	lecserélését.</para>
 
@@ -1154,12 +1146,12 @@
 	másik levelezõ eszközt használunk, akkor
 	valamilyen módon meg kell bizonyosodnunk róla,
 	hogy a szabványos <application>sendmail</application>
-	binárisok, mint mondjuk a
+	binárisok, mint például a
 	<filename>/usr/bin/sendmail</filename>, valóban a
 	kiválasztott levéltovábbítot
 	fogják aktiválni.  Szerencsére a &os;
-	pontosan erre a feladatra tartalmaz egy &man.mailwrapper.8;
-	nevû rendszert.</para>
+	pontosan emiatt tartalmaz egy &man.mailwrapper.8; nevû
+	rendszert.</para>
 
       <para>Amikor a <application>sendmail</application>
 	telepítése szerint mûködik, valami
@@ -1179,10 +1171,9 @@
 	valamelyiket (például magát a
 	<filename>sendmail</filename> parancsot), akkor a rendszer
 	magától meghívja a
-	<filename>sendmail</filename> néven szereplõ
-	burkolóprogramot, ami pedig a
-	<filename>mailer.conf</filename> alapján kideríti,
-	hogy az adott esetben a
+	<filename>sendmail</filename> néven szereplõ wrapper
+	programot, amely pedig a <filename>mailer.conf</filename>
+	alapján kideríti, hogy az adott esetben a
 	<filename>/usr/libexec/sendmail/sendmail</filename>
 	hívására van szükség.  Ez a
 	rendszer megkönnyíti az alapértelmezett
@@ -1190,7 +1181,7 @@
 	lefuttatandó binárisok
 	átállítását.</para>
 
-      <para>Így tehát ha a
+      <para>Így tehát, ha a
 	<filename>/usr/local/supermailer/bin/sendmail-compat</filename>
 	állományt akarjuk futtatni a megszokott
 	<application>sendmail</application> helyében, akkor az
@@ -1198,29 +1189,29 @@
 	állományt a következõképpen kell
 	módosítanunk:</para>
 
-      <programlisting>sendmail	/usr/local/supermailer/bin/sendmail-compat
-send-mail	/usr/local/supermailer/bin/sendmail-compat
-mailq		/usr/local/supermailer/bin/mailq-compat
-newaliases	/usr/local/supermailer/bin/newaliases-compat
-hoststat	/usr/local/supermailer/bin/hoststat-compat
-purgestat	/usr/local/supermailer/bin/purgestat-compat</programlisting>
+      <programlisting>sendmail	/usr/local/<replaceable>kedvenclevelezõ</replaceable>/bin/sendmail-compat
+send-mail	/usr/local/<replaceable>kedvenclevelezõ</replaceable>/bin/sendmail-compat
+mailq		/usr/local/<replaceable>kedvenclevelezõ</replaceable>/bin/mailq-compat
+newaliases	/usr/local/<replaceable>kedvenclevelezõ</replaceable>/bin/newaliases-compat
+hoststat	/usr/local/<replaceable>kedvenclevelezõ</replaceable>/bin/hoststat-compat
+purgestat	/usr/local/<replaceable>kedvenclevelezõ</replaceable>/bin/purgestat-compat</programlisting>
 
     </sect2>
 
     <sect2>
       <title>A mûvelet befejezése
 
-      Amint mindent beállítottunk a céljaink
-	szerint, vagy egyszerûen kilõjük a
-	sendmail neve alatt futó
-	programokat és helyettük elindítjuk az
-	új szoftverhez tartozókat, vagy csak
-	újraindítjuk a gépet.  Az
+      Ahogy a céljainknak megfelelõen mindent
+	beállítottunk, akkor vagy egyszerûen
+	leállítjuk a sendmail
+	neve alatt futó programokat és helyettük
+	elindítjuk az új szoftverhez tartozókat,
+	vagy csak újraindítjuk a gépet.  Az
 	újraindítással mellesleg
 	ellenõrizhetjük azt is, hogy jól
 	állítottuk be a rendszerünket és az
 	új levélküldõ tényleg elindul a
-	rendszerindítás során.
+	rendszerünkkel együtt.
 
     
   
@@ -1241,67 +1232,67 @@
 	
 
 	
-	  Elõfordulhat, hogy a hivatkozni kívánt
-	    gép valójában egy másik
-	    tartományban szerepel.  Például ha a
-	    foo.bar.edu gépen vagyunk
-	    és a mumble nevû gépet
+	  Elõfordulhat, hogy a hivatkozni
+	    kívánt gép valójában egy
+	    másik tartományban szerepel.
+	    Például, ha az ize.mize.edu gépen vagyunk
+	    és a vagyis nevû gépet
 	    akarjunk innen elérni a bar.edu tartományban, akkor
-	    a teljes hálózati nevével, vagyis a
-	    mumble.bar.edu néven kell
-	    rá hivatkoznunk, nem pedig egyszerûen csak
-	    mumble néven.
+	    role="domainname">mize.edu tartományban,
+	    akkor a teljes hálózati nevével, vagyis
+	    a vagyis.mize.edu néven
+	    kell rá hivatkoznunk, nem pedig egyszerûen csak
+	    vagyis néven.
 
 	  BIND
 
 	  Régebben egyébként ezt a
 	    BSD-típusú BIND névfeloldók
-	    megengedték.  Azonban a &os; jelenlegi

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Wed May  7 05:21:59 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8251B1065678; Wed,  7 May 2008 05:21:59 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 44A7A1065674
	for ; Wed,  7 May 2008 05:21:59 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 2F12E8FC12
	for ; Wed,  7 May 2008 05:21:59 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m475Lxnd078335
	for ; Wed, 7 May 2008 05:21:59 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m475Lxqa078333
	for perforce@freebsd.org; Wed, 7 May 2008 05:21:59 GMT
	(envelope-from sam@freebsd.org)
Date: Wed, 7 May 2008 05:21:59 GMT
Message-Id: <200805070521.m475Lxqa078333@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 141267 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 07 May 2008 05:21:59 -0000

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

Change 141267 by sam@sam_ebb on 2008/05/07 05:21:09

	IFC @ 141265

Affected files ...

.. //depot/projects/vap/etc/mtree/BSD.include.dist#3 edit
.. //depot/projects/vap/include/Makefile#3 edit

Differences ...

==== //depot/projects/vap/etc/mtree/BSD.include.dist#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.120 2007/10/03 05:51:20 ru Exp $
+# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.121 2008/05/07 04:11:21 jhb Exp $
 #
 # Please see the file src/etc/mtree/README before making changes to this file.
 #
@@ -102,6 +102,10 @@
         ..
         lmc
         ..
+        mpt
+            mpilib
+            ..
+        ..
         ofw
         ..
         pbio

==== //depot/projects/vap/include/Makefile#3 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 1/4/94
-# $FreeBSD: src/include/Makefile,v 1.276 2007/10/01 18:07:29 ru Exp $
+# $FreeBSD: src/include/Makefile,v 1.277 2008/05/07 04:11:21 jhb Exp $
 #
 # Doing a "make install" builds /usr/include.
 
@@ -59,6 +59,8 @@
 	ufs/ffs ufs/ufs
 #LSUBDIRS+=	netatm/ipatm netatm/sigpvc netatm/spans netatm/uni
 
+LSUBSUBDIRS=	dev/mpt/mpilib
+
 .if ${MACHINE_ARCH} == "powerpc"
 _dev_powermac_nvram=	dev/powermac_nvram
 .endif
@@ -72,7 +74,7 @@
 .endif
 
 .if ${MK_BLUETOOTH} != "no"
-LSUBSUBDIRS=	netgraph/bluetooth/include
+LSUBSUBDIRS+=	netgraph/bluetooth/include
 .endif
 
 # XXX unconditionally needed by 

From owner-p4-projects@FreeBSD.ORG  Wed May  7 15:59:24 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 70FCA1065677; Wed,  7 May 2008 15:59:24 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 32207106564A
	for ; Wed,  7 May 2008 15:59:24 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 0A1EB8FC1C
	for ; Wed,  7 May 2008 15:59:24 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m47FxNfJ033757
	for ; Wed, 7 May 2008 15:59:23 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m47FxIMB033755
	for perforce@freebsd.org; Wed, 7 May 2008 15:59:18 GMT
	(envelope-from sam@freebsd.org)
Date: Wed, 7 May 2008 15:59:18 GMT
Message-Id: <200805071559.m47FxIMB033755@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 141283 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 07 May 2008 15:59:25 -0000

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

Change 141283 by sam@sam_ebb on 2008/05/07 15:58:57

	fix merge botch

Affected files ...

.. //depot/projects/vap/gnu/usr.bin/sort/config.h#4 edit

Differences ...

==== //depot/projects/vap/gnu/usr.bin/sort/config.h#4 (text+ko) ====

@@ -1240,7 +1240,7 @@
 #define PACKAGE_VERSION "5.3.0-20040812-FreeBSD"
 
 /* the number of pending output bytes on stream `fp' */
-#define PENDING_OUTPUT_N_BYTES __fgetpendout(fp)
+#define PENDING_OUTPUT_N_BYTES fp->_p - fp->_bf._base
 
 /* Define if  exists and defines unusable PRI* macros. */
 /* #undef PRI_MACROS_BROKEN */

From owner-p4-projects@FreeBSD.ORG  Wed May  7 16:18:48 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id CAE311065678; Wed,  7 May 2008 16:18:48 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8CCE61065672
	for ; Wed,  7 May 2008 16:18:48 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 7E39E8FC1B
	for ; Wed,  7 May 2008 16:18:48 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m47GImYm035402
	for ; Wed, 7 May 2008 16:18:48 GMT
	(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m47GImJ6035400
	for perforce@freebsd.org; Wed, 7 May 2008 16:18:48 GMT
	(envelope-from gabor@freebsd.org)
Date: Wed, 7 May 2008 16:18:48 GMT
Message-Id: <200805071618.m47GImJ6035400@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gabor@freebsd.org using -f
From: Gabor Kovesdan 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 141285 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 07 May 2008 16:18:49 -0000

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

Change 141285 by gabor@gabor_server on 2008/05/07 16:17:48

	- Implement --null

Affected files ...

.. //depot/projects/soc2008/gabor_textproc/grep/grep.c#4 edit
.. //depot/projects/soc2008/gabor_textproc/grep/grep.h#5 edit
.. //depot/projects/soc2008/gabor_textproc/grep/util.c#5 edit

Differences ...

==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#4 (text+ko) ====

@@ -89,6 +89,7 @@
 int	 wflag;		/* -w: pattern must start and end on word boundaries */
 int	 xflag;		/* -x: pattern must match entire line */
 int	 lbflag;	/* --line-buffered */
+int	 nullflag;	/* --null */
 
 int binbehave = BIN_FILE_BIN;
 
@@ -96,7 +97,8 @@
 	BIN_OPT = CHAR_MAX + 1,
 	HELP_OPT,
 	MMAP_OPT,
-	LINEBUF_OPT
+	LINEBUF_OPT,
+	NULL_OPT
 };
 
 /* Housekeeping */
@@ -131,9 +133,8 @@
 	{"line-buffered",	no_argument,		NULL, LINEBUF_OPT},
 /* XXX: UNIMPLEMENTED
 	{"label",		required_argument,	NULL, LABEL_OPT}, */
+	{"null",		no_argument,		NULL, NULL_OPT},
 /* XXX: UNIMPLEMENTED
-	{"null",		no_argument,		NULL, NULL_OPT}, */
-/* XXX: UNIMPLEMENTED
 	{"color",		optional_argument,	NULL, COLOR_OPT},
 	{"colour",		optional_argument,	NULL, COLOR_OPT}, */
 	{"after-context",	required_argument,	NULL, 'A'},
@@ -429,6 +430,9 @@
 		case LINEBUF_OPT:
 			lbflag = 1;
 			break;
+		case NULL_OPT:
+			nullflag = 1;
+			break;
 		case HELP_OPT:
 		default:
 			usage();

==== //depot/projects/soc2008/gabor_textproc/grep/grep.h#5 (text+ko) ====

@@ -63,7 +63,8 @@
 extern int	 Aflag, Bflag, Eflag, Fflag, Gflag, Hflag, Lflag, Pflag,
 		 Sflag, Rflag, Zflag,
 		 bflag, cflag, hflag, iflag, lflag, nflag, qflag, sflag,
-		 vflag, wflag, xflag;
+		 vflag, wflag, xflag,
+		 nullflag;
 extern int	 binbehave;
 
 extern int	 first, matchall, patterns, tail;

==== //depot/projects/soc2008/gabor_textproc/grep/util.c#5 (text+ko) ====

@@ -573,11 +573,13 @@
 void
 printline(struct str *line, int sep)
 {
-	int	 n;
+	int	 n = 0;
 
-	n = 0;
 	if (!hflag) {
-		fputs(line->file, stdout);
+		if (nullflag == 0)
+			fputs(line->file, stdout);
+		else
+			printf("%s", line->file);
 		++n;
 	}
 	if (nflag) {

From owner-p4-projects@FreeBSD.ORG  Wed May  7 16:25:56 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5A4F41065674; Wed,  7 May 2008 16:25:56 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1C80B106566B
	for ; Wed,  7 May 2008 16:25:56 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id E90F58FC23
	for ; Wed,  7 May 2008 16:25:55 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m47GPtXn035771
	for ; Wed, 7 May 2008 16:25:55 GMT
	(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m47GPt3w035769
	for perforce@freebsd.org; Wed, 7 May 2008 16:25:55 GMT
	(envelope-from gabor@freebsd.org)
Date: Wed, 7 May 2008 16:25:55 GMT
Message-Id: <200805071625.m47GPt3w035769@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gabor@freebsd.org using -f
From: Gabor Kovesdan 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 141286 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 07 May 2008 16:25:56 -0000

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

Change 141286 by gabor@gabor_server on 2008/05/07 16:25:28

	- Fix --null to match the GNU behaviour

Affected files ...

.. //depot/projects/soc2008/gabor_textproc/grep/util.c#6 edit

Differences ...

==== //depot/projects/soc2008/gabor_textproc/grep/util.c#6 (text+ko) ====

@@ -578,8 +578,10 @@
 	if (!hflag) {
 		if (nullflag == 0)
 			fputs(line->file, stdout);
-		else
+		else {
 			printf("%s", line->file);
+			putchar(0);
+		}
 		++n;
 	}
 	if (nflag) {

From owner-p4-projects@FreeBSD.ORG  Wed May  7 16:25:56 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 98BDB1065734; Wed,  7 May 2008 16:25:56 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2BE461065672
	for ; Wed,  7 May 2008 16:25:56 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 1DCBA8FC1C
	for ; Wed,  7 May 2008 16:25:56 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m47GPtQk035776
	for ; Wed, 7 May 2008 16:25:55 GMT
	(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m47GPtxG035774
	for perforce@freebsd.org; Wed, 7 May 2008 16:25:55 GMT
	(envelope-from gabor@freebsd.org)
Date: Wed, 7 May 2008 16:25:55 GMT
Message-Id: <200805071625.m47GPtxG035774@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gabor@freebsd.org using -f
From: Gabor Kovesdan 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 141287 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 07 May 2008 16:25:57 -0000

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

Change 141287 by gabor@gabor_server on 2008/05/07 16:25:50

	- Document --null
	- Bump .Dd

Affected files ...

.. //depot/projects/soc2008/gabor_textproc/grep/grep.1#2 edit

Differences ...

==== //depot/projects/soc2008/gabor_textproc/grep/grep.1#2 (text+ko) ====

@@ -29,7 +29,7 @@
 .\"
 .\"	@(#)grep.1	8.3 (Berkeley) 4/18/94
 .\"
-.Dd Apr 7, 2008
+.Dd May 7, 2008
 .Dt GREP 1
 .Os
 .Sh NAME
@@ -251,9 +251,11 @@
 .Fl q
 is
 specified.
+.It Fl Fl null
+Prints a zero-byte after the file name.
 .\" XXX: UNIMPLEMENTED / INCOMPATIBLE .It Fl o
 .\"Always print filename headers with output lines.
-.It Fl Fl line-buffered
+.\".It Fl Fl line-buffered
 .\" XXX: UNIMPLEMENTED / INCOMPATIBLE .It Fl P
 .\"If
 .\".Fl R

From owner-p4-projects@FreeBSD.ORG  Wed May  7 16:30:01 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C4A801065676; Wed,  7 May 2008 16:30:01 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 867FE1065671
	for ; Wed,  7 May 2008 16:30:01 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 782BA8FC0C
	for ; Wed,  7 May 2008 16:30:01 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m47GU1No035875
	for ; Wed, 7 May 2008 16:30:01 GMT
	(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m47GU1Qb035861
	for perforce@freebsd.org; Wed, 7 May 2008 16:30:01 GMT
	(envelope-from gabor@freebsd.org)
Date: Wed, 7 May 2008 16:30:01 GMT
Message-Id: <200805071630.m47GU1Qb035861@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gabor@freebsd.org using -f
From: Gabor Kovesdan 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 141288 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 07 May 2008 16:30:02 -0000

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

Change 141288 by gabor@gabor_server on 2008/05/07 16:29:49

	- Document -S / --buffer-size

Affected files ...

.. //depot/projects/soc2008/gabor_textproc/sort/sort.1#2 edit

Differences ...

==== //depot/projects/soc2008/gabor_textproc/sort/sort.1#2 (text+ko) ====

@@ -32,7 +32,7 @@
 .\"
 .\"     @(#)sort.1	8.1 (Berkeley) 6/6/93
 .\"
-.Dd Apr 7, 2008
+.Dd May 7, 2008
 .Dt SORT 1
 .Os
 .Sh NAME
@@ -40,7 +40,7 @@
 .Nd sort or merge text files
 .Sh SYNOPSIS
 .Nm sort
-.Op Fl bcdfHimnrsuz
+.Op Fl bcdfHimnrSsuz
 .Sm off
 .Op Fl k\ \& Ar field1 Op , Ar field2
 .Sm on
@@ -83,6 +83,10 @@
 .Ar output
 file to be used instead of the standard output.
 This file can be the same as one of the input files.
+.It Fl S Ar size, Fl Fl buffer-size Ns = Ns Ar size
+Use
+.Ar size
+for the size of the main buffer.
 .It Fl T Ar dir , Fl Fl temporary-directory Ns = Ns Ar dir
 Use
 .Ar dir

From owner-p4-projects@FreeBSD.ORG  Wed May  7 16:31:03 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 169321065672; Wed,  7 May 2008 16:31:03 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CB60B1065671
	for ; Wed,  7 May 2008 16:31:02 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id A45388FC1D
	for ; Wed,  7 May 2008 16:31:02 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m47GV2k1035917
	for ; Wed, 7 May 2008 16:31:02 GMT
	(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m47GV2MH035915
	for perforce@freebsd.org; Wed, 7 May 2008 16:31:02 GMT
	(envelope-from gabor@freebsd.org)
Date: Wed, 7 May 2008 16:31:02 GMT
Message-Id: <200805071631.m47GV2MH035915@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gabor@freebsd.org using -f
From: Gabor Kovesdan 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 141289 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 07 May 2008 16:31:03 -0000

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

Change 141289 by gabor@gabor_server on 2008/05/07 16:30:59

	- Also add -null to the usage list, which I forgot

Affected files ...

.. //depot/projects/soc2008/gabor_textproc/grep/grep.1#3 edit

Differences ...

==== //depot/projects/soc2008/gabor_textproc/grep/grep.1#3 (text+ko) ====

@@ -48,6 +48,7 @@
 .Op Fl Fl binary-files Ns = Ns Ar value
 .Op Fl Fl context Ns Op = Ns Ar num
 .Op Fl Fl line-buffered
+.Op Fl Fl null
 .Op Ar pattern
 .Op Ar
 .Ek

From owner-p4-projects@FreeBSD.ORG  Wed May  7 16:32:04 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 82CD51065672; Wed,  7 May 2008 16:32:04 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 44E34106566C
	for ; Wed,  7 May 2008 16:32:04 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 36A768FC1F
	for ; Wed,  7 May 2008 16:32:04 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m47GW3gc035949
	for ; Wed, 7 May 2008 16:32:03 GMT
	(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m47GW3xm035947
	for perforce@freebsd.org; Wed, 7 May 2008 16:32:03 GMT
	(envelope-from gabor@freebsd.org)
Date: Wed, 7 May 2008 16:32:03 GMT
Message-Id: <200805071632.m47GW3xm035947@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gabor@freebsd.org using -f
From: Gabor Kovesdan 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 141290 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 07 May 2008 16:32:04 -0000

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

Change 141290 by gabor@gabor_server on 2008/05/07 16:31:57

	- Add -null to usage(), ehich I forgot

Affected files ...

.. //depot/projects/soc2008/gabor_textproc/grep/grep.c#5 edit

Differences ...

==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#5 (text+ko) ====

@@ -119,7 +119,7 @@
 	fprintf(stderr,
 	    "usage: %s [-abcEFGHhIiLlnoPqRSsUVvwxZ] [-A num] [-B num] [-C[num]]\n"
 	    "\t[-e pattern] [-f file] [--binary-files=value] [--context[=num]]\n"
-	    "\t[--line-buffered] [pattern] [file ...]\n", __progname);
+	    "\t[--line-buffered] [--null] [pattern] [file ...]\n", __progname);
 	exit(2);
 }
 

From owner-p4-projects@FreeBSD.ORG  Wed May  7 19:16:03 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3749D1065678; Wed,  7 May 2008 19:16:03 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id ED6B01065675
	for ; Wed,  7 May 2008 19:16:02 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id E258E8FC0C
	for ; Wed,  7 May 2008 19:16:02 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m47JG22F057505
	for ; Wed, 7 May 2008 19:16:02 GMT
	(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m47JG2VE057503
	for perforce@freebsd.org; Wed, 7 May 2008 19:16:02 GMT
	(envelope-from gabor@freebsd.org)
Date: Wed, 7 May 2008 19:16:02 GMT
Message-Id: <200805071916.m47JG2VE057503@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gabor@freebsd.org using -f
From: Gabor Kovesdan 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 141294 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 07 May 2008 19:16:03 -0000

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

Change 141294 by gabor@gabor_server on 2008/05/07 19:15:22

	- Eliminate gotos

Affected files ...

.. //depot/projects/soc2008/gabor_textproc/grep/mmfile.c#4 edit
.. //depot/projects/soc2008/gabor_textproc/grep/util.c#7 edit

Differences ...

==== //depot/projects/soc2008/gabor_textproc/grep/mmfile.c#4 (text+ko) ====

@@ -57,28 +57,28 @@
 	mode = mode;
 
 	mmf = grep_malloc(sizeof *mmf);
-	if ((mmf->fd = open(fn, O_RDONLY)) == -1)
-		goto ouch1;
-	if (fstat(mmf->fd, &st) == -1)
-		goto ouch2;
-	if (st.st_size > SIZE_T_MAX) /* too big to mmap */
-		goto ouch2;
-	if (!S_ISREG(st.st_mode)) /* only mmap regular files */
-		goto ouch2;
+	if ((mmf->fd = open(fn, O_RDONLY)) == -1) {
+		free(mmf);
+		return (NULL);
+	}
+	if ((fstat(mmf->fd, &st) == -1) ||
+	    (st.st_size > SIZE_T_MAX) ||	/* too big to mmap */
+	    (!S_ISREG(st.st_mode))) {		/* only mmap regular files */
+		close(mmf->fd);
+		free(mmf);
+		return (NULL);
+	}
 	mmf->len = (size_t)st.st_size;
 	mmf->base = mmap(NULL, mmf->len, PROT_READ, MAP_PRIVATE, mmf->fd, (off_t)0);
-	if (mmf->base == MAP_FAILED)
-		goto ouch2;
+	if (mmf->base == MAP_FAILED) {
+		close(mmf->fd);
+		free(mmf);
+		return (NULL);
+	}
 	mmf->ptr = mmf->base;
 	mmf->end = mmf->base + mmf->len;
 	madvise(mmf->base, mmf->len, MADV_SEQUENTIAL);
 	return (mmf);
-
-ouch2:
-	close(mmf->fd);
-ouch1:
-	free(mmf);
-	return (NULL);
 }
 
 void

==== //depot/projects/soc2008/gabor_textproc/grep/util.c#7 (text+ko) ====

@@ -183,33 +183,31 @@
 	regmatch_t	 pmatch;
 	int		 c, i, r;
 
-	if (matchall) {
+	if (!matchall) {
+		for (c = i = 0; i < patterns; i++) {
+			if (fg_pattern[i].pattern) {
+				r = grep_search(&fg_pattern[i], (unsigned char *)l->dat,
+				    l->len, &pmatch);
+			} else {
+				pmatch.rm_so = 0;
+				pmatch.rm_eo = l->len;
+				r = regexec(&r_pattern[i], l->dat, 1, &pmatch, eflags);
+			}
+			if (r == 0 && xflag) {
+				if (pmatch.rm_so != 0 || pmatch.rm_eo != l->len)
+					r = REG_NOMATCH;
+			}
+			if (r == 0) {
+				c++;
+				break;
+			}
+		}
+	} else
 		c = !vflag;
-		goto print;
-	}
 
-	for (c = i = 0; i < patterns; i++) {
-		if (fg_pattern[i].pattern) {
-			r = grep_search(&fg_pattern[i], (unsigned char *)l->dat,
-			    l->len, &pmatch);
-		} else {
-			pmatch.rm_so = 0;
-			pmatch.rm_eo = l->len;
-			r = regexec(&r_pattern[i], l->dat, 1, &pmatch, eflags);
-		}
-		if (r == 0 && xflag) {
-			if (pmatch.rm_so != 0 || pmatch.rm_eo != l->len)
-				r = REG_NOMATCH;
-		}
-		if (r == 0) {
-			c++;
-			break;
-		}
-	}
 	if (vflag)
 		c = !c;
 
-print:
 	if (c && binbehave == BIN_FILE_BIN && nottext)
 		return (c); /* Binary file */
 

From owner-p4-projects@FreeBSD.ORG  Wed May  7 19:45:34 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3B853106566C; Wed,  7 May 2008 19:45:34 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EF5B6106564A
	for ; Wed,  7 May 2008 19:45:33 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id E4A918FC0C
	for ; Wed,  7 May 2008 19:45:33 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m47JjXhR058464
	for ; Wed, 7 May 2008 19:45:33 GMT
	(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m47JjXuV058462
	for perforce@freebsd.org; Wed, 7 May 2008 19:45:33 GMT
	(envelope-from gabor@freebsd.org)
Date: Wed, 7 May 2008 19:45:33 GMT
Message-Id: <200805071945.m47JjXuV058462@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gabor@freebsd.org using -f
From: Gabor Kovesdan 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 141295 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 07 May 2008 19:45:34 -0000

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

Change 141295 by gabor@gabor_server on 2008/05/07 19:44:43

	- Implement --label

Affected files ...

.. //depot/projects/soc2008/gabor_textproc/grep/grep.c#6 edit
.. //depot/projects/soc2008/gabor_textproc/grep/grep.h#6 edit
.. //depot/projects/soc2008/gabor_textproc/grep/util.c#8 edit

Differences ...

==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#6 (text+ko) ====

@@ -90,6 +90,7 @@
 int	 xflag;		/* -x: pattern must match entire line */
 int	 lbflag;	/* --line-buffered */
 int	 nullflag;	/* --null */
+char	*label;		/* --label */
 
 int binbehave = BIN_FILE_BIN;
 
@@ -98,6 +99,7 @@
 	HELP_OPT,
 	MMAP_OPT,
 	LINEBUF_OPT,
+	LABEL_OPT,
 	NULL_OPT
 };
 
@@ -131,8 +133,7 @@
 	{"help",		no_argument,		NULL, HELP_OPT},
 	{"mmap",		no_argument,		NULL, MMAP_OPT},
 	{"line-buffered",	no_argument,		NULL, LINEBUF_OPT},
-/* XXX: UNIMPLEMENTED
-	{"label",		required_argument,	NULL, LABEL_OPT}, */
+	{"label",		required_argument,	NULL, LABEL_OPT},
 	{"null",		no_argument,		NULL, NULL_OPT},
 /* XXX: UNIMPLEMENTED
 	{"color",		optional_argument,	NULL, COLOR_OPT},
@@ -427,6 +428,9 @@
 			else
 				errx(2, "Unknown binary-files option");
 			break;
+		case LABEL_OPT:
+			label = optarg;
+			break;
 		case LINEBUF_OPT:
 			lbflag = 1;
 			break;

==== //depot/projects/soc2008/gabor_textproc/grep/grep.h#6 (text+ko) ====

@@ -65,6 +65,7 @@
 		 bflag, cflag, hflag, iflag, lflag, nflag, qflag, sflag,
 		 vflag, wflag, xflag,
 		 nullflag;
+extern char	*label;
 extern int	 binbehave;
 
 extern int	 first, matchall, patterns, tail;

==== //depot/projects/soc2008/gabor_textproc/grep/util.c#8 (text+ko) ====

@@ -108,7 +108,10 @@
 	int		 c, t, z, nottext;
 
 	if (fn == NULL) {
-		fn = "(standard input)";
+		if (label != NULL)
+			fn = label;
+		else
+			fn = "(standard input)";
 		f = grep_fdopen(STDIN_FILENO, "r");
 	} else {
 		f = grep_open(fn, "r");

From owner-p4-projects@FreeBSD.ORG  Wed May  7 19:55:45 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 13CCA106568C; Wed,  7 May 2008 19:55:45 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C8BB4106567B
	for ; Wed,  7 May 2008 19:55:44 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id BDB978FC0A
	for ; Wed,  7 May 2008 19:55:44 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m47JtiGw058801
	for ; Wed, 7 May 2008 19:55:44 GMT
	(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m47JtiUo058799
	for perforce@freebsd.org; Wed, 7 May 2008 19:55:44 GMT
	(envelope-from gabor@freebsd.org)
Date: Wed, 7 May 2008 19:55:44 GMT
Message-Id: <200805071955.m47JtiUo058799@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gabor@freebsd.org using -f
From: Gabor Kovesdan 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 141296 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 07 May 2008 19:55:45 -0000

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

Change 141296 by gabor@gabor_server on 2008/05/07 19:55:39

	- Swap -o and -H so that -H  match GNU functionality. -o is a
	  plus functionality from OpenBSD, it will be renamed later
	  when I implement the GNU-compatible -o.

Affected files ...

.. //depot/projects/soc2008/gabor_textproc/grep/grep.c#7 edit
.. //depot/projects/soc2008/gabor_textproc/grep/grep.h#7 edit
.. //depot/projects/soc2008/gabor_textproc/grep/util.c#9 edit

Differences ...

==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#7 (text+ko) ====

@@ -70,7 +70,7 @@
 int	 Eflag;		/* -E: interpret pattern as extended regexp */
 int	 Fflag;		/* -F: interpret pattern as list of fixed strings */
 int	 Gflag;		/* -G: interpret pattern as basic regexp */
-int	 Hflag;		/* -H: if -R, follow explicitly listed symlinks */
+int	 Hflag;		/* -H: always print file name */
 int	 Lflag;		/* -L: only show names of files with no matches */
 int	 Pflag;		/* -P: if -R, no symlinks are followed */
 int	 Rflag;		/* -R: recursively search directory trees */
@@ -82,7 +82,7 @@
 int	 iflag;		/* -i: ignore case */
 int	 lflag;		/* -l: only show names of files with matches */
 int	 nflag;		/* -n: show line numbers in front of matching lines */
-int	 oflag;		/* -o: always print file name */
+int	 oflag;		/* -o: if -R, follow explicitly listed symlinks */
 int	 qflag;		/* -q: quiet mode (don't output anything) */
 int	 sflag;		/* -s: silent mode (ignore errors) */
 int	 vflag;		/* -v: only show non-matching lines */
@@ -153,8 +153,7 @@
 	{"file",		required_argument,	NULL, 'f'},
 	{"basic-regexp",	no_argument,		NULL, 'G'},
 	{"no-filename",		no_argument,		NULL, 'h'},
-/* XXX: UNIMPLEMENTED / INCOMPATIBLE
-	{"with-filename",	no_argument,		NULL, 'H'}, */
+	{"with-filename",	no_argument,		NULL, 'H'},
 	{"ignore-case",		no_argument,		NULL, 'i'},
 /* XXX: UNIMPLEMENTED
 	{"bz2decompress",	no_argument,		NULL, 'J'}, */
@@ -353,7 +352,7 @@
 			Hflag++;
 			break;
 		case 'h':
-			oflag = 0;
+			Hflag = 0;
 			hflag = 1;
 			break;
 		case 'I':
@@ -376,8 +375,7 @@
 			nflag = 1;
 			break;
 		case 'o':
-			hflag = 0;
-			oflag = 1;
+			oflag++;
 			break;
 		case 'P':
 			Pflag++;
@@ -391,7 +389,7 @@
 		case 'R':
 		case 'r':
 			Rflag++;
-			oflag++;
+			Hflag++;
 			break;
 		case 's':
 			sflag = 1;
@@ -488,7 +486,7 @@
 	if (lbflag)
 		setlinebuf(stdout);
 
-	if ((argc == 0 || argc == 1) && !oflag)
+	if ((argc == 0 || argc == 1) && !Hflag)
 		hflag = 1;
 
 	if (argc == 0)

==== //depot/projects/soc2008/gabor_textproc/grep/grep.h#7 (text+ko) ====

@@ -62,7 +62,7 @@
 /* Command line flags */
 extern int	 Aflag, Bflag, Eflag, Fflag, Gflag, Hflag, Lflag, Pflag,
 		 Sflag, Rflag, Zflag,
-		 bflag, cflag, hflag, iflag, lflag, nflag, qflag, sflag,
+		 bflag, cflag, hflag, iflag, lflag, nflag, oflag, qflag, sflag,
 		 vflag, wflag, xflag,
 		 nullflag;
 extern char	*label;

==== //depot/projects/soc2008/gabor_textproc/grep/util.c#9 (text+ko) ====

@@ -69,7 +69,7 @@
 
 	c = fts_flags = 0;
 
-	if (Hflag)
+	if (oflag)
 		fts_flags = FTS_COMFOLLOW;
 	if (Pflag)
 		fts_flags = FTS_PHYSICAL;

From owner-p4-projects@FreeBSD.ORG  Wed May  7 20:50:44 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9571E1065676; Wed,  7 May 2008 20:50:44 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 56E62106567B
	for ; Wed,  7 May 2008 20:50:44 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 47B978FC20
	for ; Wed,  7 May 2008 20:50:44 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m47KohYB070614
	for ; Wed, 7 May 2008 20:50:43 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m47KohOo070612
	for perforce@freebsd.org; Wed, 7 May 2008 20:50:43 GMT
	(envelope-from jhb@freebsd.org)
Date: Wed, 7 May 2008 20:50:43 GMT
Message-Id: <200805072050.m47KohOo070612@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 
Cc: 
Subject: PERFORCE change 141298 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 07 May 2008 20:50:45 -0000

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

Change 141298 by jhb@jhb_mutex on 2008/05/07 20:50:43

	Catch up to per-cpu callout wheels.

Affected files ...

.. //depot/projects/smpng/sys/kern/kern_timeout.c#39 edit

Differences ...

==== //depot/projects/smpng/sys/kern/kern_timeout.c#39 (text+ko) ====

@@ -884,29 +884,42 @@
 
 DB_SHOW_COMMAND(callouts, db_show_callouts)
 {
+	struct callout_cpu *cc;
 	struct callout *c;
 	int bucket, callouts, sticks;
 
+#ifdef SMP
+	if (have_addr) {
+		if (addr >= 0 && addr <= mp_maxid && !CPU_ABSENT(addr))
+			cc = CC_CPU(addr);
+		else {
+			db_printf("Invalid cpu %d\n", addr);
+			return;
+		}
+	} else
+#endif
+		cc = CC_SELF();
+
 	/* First, count the number of callouts. */
 	callouts = 0;
 	for (bucket = 0; bucket < callwheelsize; bucket++) {
-		TAILQ_FOREACH(c, &callwheel[bucket], c_links.tqe) {
+		TAILQ_FOREACH(c, &cc->cc_callwheel[bucket], c_links.tqe) {
 			callouts++;
 		}
 	}
 
-	sticks = softticks;
+	sticks = cc->cc_softticks;
 	do {
 		bucket = sticks & callwheelmask;
-		TAILQ_FOREACH(c, &callwheel[bucket], c_links.tqe) {
+		TAILQ_FOREACH(c, &cc->cc_callwheel[bucket], c_links.tqe) {
 			if (c->c_time < sticks)
 				continue;
 			if (c->c_time > sticks)
 				break;
 #if 1
-			db_printf("%9d ", c->c_time - softticks);
+			db_printf("%9d ", c->c_time - cc->cc_softticks);
 #else
-			db_print_ticks(c->c_time - softticks);
+			db_print_ticks(c->c_time - cc->cc_softticks);
 			db_printf(" ");
 #endif
 			db_printsym((db_expr_t)c->c_func, DB_STGY_PROC);

From owner-p4-projects@FreeBSD.ORG  Wed May  7 20:54:51 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1B8551065675; Wed,  7 May 2008 20:54:51 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CF0721065673
	for ; Wed,  7 May 2008 20:54:50 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id A67778FC18
	for ; Wed,  7 May 2008 20:54:50 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m47Ksoms070731
	for ; Wed, 7 May 2008 20:54:50 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m47Ksout070729
	for perforce@freebsd.org; Wed, 7 May 2008 20:54:50 GMT
	(envelope-from jhb@freebsd.org)
Date: Wed, 7 May 2008 20:54:50 GMT
Message-Id: <200805072054.m47Ksout070729@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 
Cc: 
Subject: PERFORCE change 141301 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 07 May 2008 20:54:51 -0000

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

Change 141301 by jhb@jhb_tool on 2008/05/07 20:54:21

	Compile.

Affected files ...

.. //depot/projects/smpng/sys/kern/kern_timeout.c#40 integrate

Differences ...

==== //depot/projects/smpng/sys/kern/kern_timeout.c#40 (text+ko) ====

@@ -893,7 +893,7 @@
 		if (addr >= 0 && addr <= mp_maxid && !CPU_ABSENT(addr))
 			cc = CC_CPU(addr);
 		else {
-			db_printf("Invalid cpu %d\n", addr);
+			db_printf("Invalid cpu %ld\n", (long)addr);
 			return;
 		}
 	} else

From owner-p4-projects@FreeBSD.ORG  Wed May  7 21:27:25 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 29654106567A; Wed,  7 May 2008 21:27:25 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B07811065673
	for ; Wed,  7 May 2008 21:27:24 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 9F3188FC1C
	for ; Wed,  7 May 2008 21:27:24 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m47LROPB073337
	for ; Wed, 7 May 2008 21:27:24 GMT
	(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m47LROoS073335
	for perforce@freebsd.org; Wed, 7 May 2008 21:27:24 GMT
	(envelope-from gabor@freebsd.org)
Date: Wed, 7 May 2008 21:27:24 GMT
Message-Id: <200805072127.m47LROoS073335@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gabor@freebsd.org using -f
From: Gabor Kovesdan 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 141303 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 07 May 2008 21:27:25 -0000

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

Change 141303 by gabor@gabor_server on 2008/05/07 21:27:21

	- Implement -D / --devices

Affected files ...

.. //depot/projects/soc2008/gabor_textproc/grep/grep.c#8 edit
.. //depot/projects/soc2008/gabor_textproc/grep/grep.h#8 edit
.. //depot/projects/soc2008/gabor_textproc/grep/util.c#10 edit

Differences ...

==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#8 (text+ko) ====

@@ -67,6 +67,7 @@
 /* Command-line flags */
 int	 Aflag;		/* -A x: print x lines trailing each match */
 int	 Bflag;		/* -B x: print x lines leading each match */
+int	 Dflag;		/* -D: do not process device files if optarg is passed */
 int	 Eflag;		/* -E: interpret pattern as extended regexp */
 int	 Fflag;		/* -F: interpret pattern as list of fixed strings */
 int	 Gflag;		/* -G: interpret pattern as basic regexp */
@@ -119,13 +120,13 @@
 usage(void)
 {
 	fprintf(stderr,
-	    "usage: %s [-abcEFGHhIiLlnoPqRSsUVvwxZ] [-A num] [-B num] [-C[num]]\n"
+	    "usage: %s [-abcDEFGHhIiLlnoPqRSsUVvwxZ] [-A num] [-B num] [-C[num]]\n"
 	    "\t[-e pattern] [-f file] [--binary-files=value] [--context[=num]]\n"
 	    "\t[--line-buffered] [--null] [pattern] [file ...]\n", __progname);
 	exit(2);
 }
 
-static char	*optstr = "0123456789A:B:CEFGHILPSRUVZabce:f:hilnoqrsuvwxy";
+static char	*optstr = "0123456789A:B:CD:EFGHILPSRUVZabce:f:hilnoqrsuvwxy";
 
 struct option long_options[] =
 {
@@ -144,8 +145,8 @@
 	{"byte-offset",		no_argument,		NULL, 'b'},
 	{"context",		optional_argument,	NULL, 'C'},
 	{"count",		no_argument,		NULL, 'c'},
-/* XXX: UNDOCUMENTED
 	{"devices",		required_argument,	NULL, 'D'},
+/* XXX: UNIMPLEMENTED
         {"directories",		required_argument,	NULL, 'd'}, */
 	{"extended-regexp",	no_argument,		NULL, 'E'},
 	{"regexp",		required_argument,	NULL, 'e'},
@@ -248,10 +249,11 @@
 int
 main(int argc, char *argv[])
 {
-	int	 c, lastc, prevoptind, newarg, i, needpattern;
-	struct patfile *patfile, *pf_next;
-	long	 l;
-	char	*ep;
+	int		 c, lastc, prevoptind, newarg, i, needpattern;
+	struct patfile	*patfile, *pf_next;
+	long		 l;
+	char		*ep;
+	struct stat	*finfo = 0;
 
 	SLIST_INIT(&patfilelh);
 	switch (__progname[0]) {
@@ -326,6 +328,10 @@
 		case 'c':
 			cflag = 1;
 			break;
+		case 'D':
+			if (strcmp(optarg, "skip") == 0)
+				Dflag = 1;
+			break;
 		case 'E':
 			Fflag = Gflag = 0;
 			Eflag++;
@@ -495,8 +501,22 @@
 	if (Rflag)
 		c = grep_tree(argv);
 	else
-		for (c = 0; argc--; ++argv)
-			c += procfile(*argv);
-
+		for (c = 0; argc--; ++argv) {
+			if (Dflag) {
+				if (!(finfo = malloc(sizeof(struct stat))))
+					err(2, NULL);
+				if (stat(*argv, finfo) == -1)
+					err(2, NULL);
+				if (S_ISBLK(finfo->st_mode) ||
+				    S_ISCHR(finfo->st_mode) ||
+				    S_ISFIFO(finfo->st_mode) ||
+				    S_ISSOCK(finfo->st_mode)) {
+					free(finfo);
+					continue;
+				} else
+					free(finfo);
+			}
+			c+= procfile(*argv);
+		}
 	exit(!c);
 }

==== //depot/projects/soc2008/gabor_textproc/grep/grep.h#8 (text+ko) ====

@@ -60,7 +60,7 @@
 extern int	 cflags, eflags;
 
 /* Command line flags */
-extern int	 Aflag, Bflag, Eflag, Fflag, Gflag, Hflag, Lflag, Pflag,
+extern int	 Aflag, Bflag, Dflag, Eflag, Fflag, Gflag, Hflag, Lflag, Pflag,
 		 Sflag, Rflag, Zflag,
 		 bflag, cflag, hflag, iflag, lflag, nflag, oflag, qflag, sflag,
 		 vflag, wflag, xflag,

==== //depot/projects/soc2008/gabor_textproc/grep/util.c#10 (text+ko) ====

@@ -63,9 +63,10 @@
 int
 grep_tree(char **argv)
 {
-	FTS	*fts;
-	FTSENT	*p;
-	int	 c, fts_flags;
+	FTS		*fts;
+	FTSENT		*p;
+	int		 c, fts_flags;
+	struct stat	*finfo = 0;
 
 	c = fts_flags = 0;
 
@@ -90,6 +91,20 @@
 		case FTS_DP:
 			break;
 		default:
+			if (Dflag) {
+				if (!(finfo = malloc(sizeof(struct stat))))
+					err(2, NULL);
+				if (stat(p->fts_path, finfo) == -1)
+					err(2, NULL);
+				if (S_ISBLK(finfo->st_mode) ||
+				    S_ISCHR(finfo->st_mode) ||
+				    S_ISFIFO(finfo->st_mode) ||
+				    S_ISSOCK(finfo->st_mode)) {
+					free(finfo);
+					break;
+				} else
+					free(finfo);
+			}
 			c += procfile(p->fts_path);
 			break;
 		}

From owner-p4-projects@FreeBSD.ORG  Wed May  7 21:38:36 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 447C01065670; Wed,  7 May 2008 21:38:36 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 06E99106564A
	for ; Wed,  7 May 2008 21:38:36 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id EA9498FC12
	for ; Wed,  7 May 2008 21:38:35 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m47LcZDX073829
	for ; Wed, 7 May 2008 21:38:35 GMT
	(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m47LcZRL073827
	for perforce@freebsd.org; Wed, 7 May 2008 21:38:35 GMT
	(envelope-from gabor@freebsd.org)
Date: Wed, 7 May 2008 21:38:35 GMT
Message-Id: <200805072138.m47LcZRL073827@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gabor@freebsd.org using -f
From: Gabor Kovesdan 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 141304 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 07 May 2008 21:38:36 -0000

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

Change 141304 by gabor@gabor_server on 2008/05/07 21:38:11

	- Sync usage() with todays changes

Affected files ...

.. //depot/projects/soc2008/gabor_textproc/grep/grep.c#9 edit

Differences ...

==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#9 (text+ko) ====

@@ -122,7 +122,8 @@
 	fprintf(stderr,
 	    "usage: %s [-abcDEFGHhIiLlnoPqRSsUVvwxZ] [-A num] [-B num] [-C[num]]\n"
 	    "\t[-e pattern] [-f file] [--binary-files=value] [--context[=num]]\n"
-	    "\t[--line-buffered] [--null] [pattern] [file ...]\n", __progname);
+	    "\t[--label] [--line-buffered] [--null] [pattern] [file ...]\n"
+	    , __progname);
 	exit(2);
 }
 

From owner-p4-projects@FreeBSD.ORG  Wed May  7 21:38:36 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8304A1065743; Wed,  7 May 2008 21:38:36 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 29F19106566B
	for ; Wed,  7 May 2008 21:38:36 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 195B18FC13
	for ; Wed,  7 May 2008 21:38:36 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m47LcZrg073834
	for ; Wed, 7 May 2008 21:38:35 GMT
	(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m47LcZSW073832
	for perforce@freebsd.org; Wed, 7 May 2008 21:38:35 GMT
	(envelope-from gabor@freebsd.org)
Date: Wed, 7 May 2008 21:38:35 GMT
Message-Id: <200805072138.m47LcZSW073832@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gabor@freebsd.org using -f
From: Gabor Kovesdan 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 141305 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 07 May 2008 21:38:36 -0000

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

Change 141305 by gabor@gabor_server on 2008/05/07 21:38:33

	- Sync man page with todays changes

Affected files ...

.. //depot/projects/soc2008/gabor_textproc/grep/grep.1#4 edit

Differences ...

==== //depot/projects/soc2008/gabor_textproc/grep/grep.1#4 (text+ko) ====

@@ -39,7 +39,7 @@
 .Sh SYNOPSIS
 .Nm grep
 .Bk -words
-.Op Fl abcEFGHhIiLlnoPqRSsUVvwxZ
+.Op Fl abcDEFGHhIiLlnoPqRSsUVvwxZ
 .Op Fl A Ar num
 .Op Fl B Ar num
 .Op Fl C Ns Op Ar num
@@ -47,6 +47,7 @@
 .Op Fl f Ar file
 .Op Fl Fl binary-files Ns = Ns Ar value
 .Op Fl Fl context Ns Op = Ns Ar num
+.Op Fl Fl label
 .Op Fl Fl line-buffered
 .Op Fl Fl null
 .Op Ar pattern
@@ -194,12 +195,8 @@
 .Nm grep
 to behave as traditional
 .Nm grep ) .
-.\"XXX: INCOMPATIBLE .It Fl H
-.\"If
-.\".Fl R
-.\"is specified, follow symbolic links only if they were explicitly listed
-.\"on the command line.
-.\"The default is not to follow symbolic links.
+.It Fl H
+Always print filename headers with output lines.
 .It Fl h , Fl Fl no-filename
 Never print filename headers
 .Pq i.e. filenames
@@ -254,9 +251,12 @@
 specified.
 .It Fl Fl null
 Prints a zero-byte after the file name.
-.\" XXX: UNIMPLEMENTED / INCOMPATIBLE .It Fl o
-.\"Always print filename headers with output lines.
-.\".It Fl Fl line-buffered
+.It Fl o
+If
+.Fl R
+is specified, follow symbolic links only if they were explicitly listed
+on the command line.
+The default is not to follow symbolic links.
 .\" XXX: UNIMPLEMENTED / INCOMPATIBLE .It Fl P
 .\"If
 .\".Fl R

From owner-p4-projects@FreeBSD.ORG  Wed May  7 22:40:46 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6E0741065671; Wed,  7 May 2008 22:40:46 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 30638106567D
	for ; Wed,  7 May 2008 22:40:46 +0000 (UTC)
	(envelope-from andre@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 1FC3D8FC0C
	for ; Wed,  7 May 2008 22:40:46 +0000 (UTC)
	(envelope-from andre@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m47MejxF077102
	for ; Wed, 7 May 2008 22:40:46 GMT
	(envelope-from andre@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m47MejN6077100
	for perforce@freebsd.org; Wed, 7 May 2008 22:40:45 GMT
	(envelope-from andre@freebsd.org)
Date: Wed, 7 May 2008 22:40:45 GMT
Message-Id: <200805072240.m47MejN6077100@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	andre@freebsd.org using -f
From: Andre Oppermann 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 141312 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 07 May 2008 22:40:46 -0000

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

Change 141312 by andre@andre_flirtbox on 2008/05/07 22:40:37

	Fix botched integration.

Affected files ...

.. //depot/projects/tcp_reass/netinet/tcp.h#6 edit

Differences ...

==== //depot/projects/tcp_reass/netinet/tcp.h#6 (text+ko) ====

@@ -78,12 +78,7 @@
 
 #define	TCPOPT_EOL		0
 #define	   TCPOLEN_EOL			1
->>>> ORIGINAL //depot/vendor/freebsd/src/sys/netinet/tcp.h#26
-==== THEIRS //depot/vendor/freebsd/src/sys/netinet/tcp.h#27
 #define	TCPOPT_PAD		0		/* padding after EOL */
-==== YOURS //andre_flirtbox/tcp_reass/netinet/tcp.h
-#define	TCPOPT_PAD		0
-<<<<
 #define	   TCPOLEN_PAD			1
 #define	TCPOPT_NOP		1
 #define	   TCPOLEN_NOP			1

From owner-p4-projects@FreeBSD.ORG  Wed May  7 22:50:58 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5C6231065674; Wed,  7 May 2008 22:50:58 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1E57F1065689
	for ; Wed,  7 May 2008 22:50:58 +0000 (UTC)
	(envelope-from andre@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 0D1858FC45
	for ; Wed,  7 May 2008 22:50:58 +0000 (UTC)
	(envelope-from andre@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m47Movpo077396
	for ; Wed, 7 May 2008 22:50:57 GMT
	(envelope-from andre@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m47MovX3077394
	for perforce@freebsd.org; Wed, 7 May 2008 22:50:57 GMT
	(envelope-from andre@freebsd.org)
Date: Wed, 7 May 2008 22:50:57 GMT
Message-Id: <200805072250.m47MovX3077394@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	andre@freebsd.org using -f
From: Andre Oppermann 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 141313 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 07 May 2008 22:50:58 -0000

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

Change 141313 by andre@andre_flirtbox on 2008/05/07 22:49:59

	Differentiate between mbuf allocation errors and ip_output()
	errors for logging.

Affected files ...

.. //depot/projects/tcp_reass/netinet/tcp_output.c#8 edit

Differences ...

==== //depot/projects/tcp_reass/netinet/tcp_output.c#8 (text+ko) ====

@@ -144,6 +144,7 @@
 	int tso = 0;
 	struct tcpopt to;
 	char *s;
+	int ipout = 0;
 #if 0
 	int maxburst = TCP_MAXBURST;
 #endif
@@ -1133,6 +1134,8 @@
 	if (path_mtu_discovery)
 		ip->ip_off |= IP_DF;
 
+	ipout = 1;
+
 	error = ip_output(m, tp->t_inpcb->inp_options, NULL,
 	    ((so->so_options & SO_DONTROUTE) ? IP_ROUTETOIF : 0), 0,
 	    tp->t_inpcb);
@@ -1168,8 +1171,8 @@
 		SOCKBUF_UNLOCK_ASSERT(&so->so_snd);	/* Check gotos. */
 
 		if ((s = tcp_log_addrs(&tp->t_inpcb->inp_inc, NULL, NULL, NULL))) {
-			log(LOG_DEBUG, "%s; %s: error %i while sending\n",
-			    s, __func__, error);
+			log(LOG_DEBUG, "%s; %s: error %i while sending (ip_output %i)\n",
+			    s, __func__, error, ipout);
 			free(s, M_TCPLOG);
 		}
 

From owner-p4-projects@FreeBSD.ORG  Wed May  7 22:59:06 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B29251065670; Wed,  7 May 2008 22:59:06 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 714E41065678
	for ; Wed,  7 May 2008 22:59:06 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 6137A8FC15
	for ; Wed,  7 May 2008 22:59:06 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m47Mx61V077737
	for ; Wed, 7 May 2008 22:59:06 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m47Mx63Y077735
	for perforce@freebsd.org; Wed, 7 May 2008 22:59:06 GMT
	(envelope-from sam@freebsd.org)
Date: Wed, 7 May 2008 22:59:06 GMT
Message-Id: <200805072259.m47Mx63Y077735@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 141314 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 07 May 2008 22:59:07 -0000

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

Change 141314 by sam@sam_ebb on 2008/05/07 22:58:32

	inline is supposed to go before return type

Affected files ...

.. //depot/projects/vap/sys/net80211/ieee80211_ht.h#13 edit

Differences ...

==== //depot/projects/vap/sys/net80211/ieee80211_ht.h#13 (text+ko) ====

@@ -80,7 +80,7 @@
  * available and more streams are requested than available.
  */
 
-static void __inline
+static __inline void
 ieee80211_txampdu_update_pps(struct ieee80211_tx_ampdu *tap)
 {
 	/* NB: scale factor of 2 was picked heuristically */
@@ -91,7 +91,7 @@
 /*
  * Count a packet towards the pps estimate.
  */
-static void __inline
+static __inline void
 ieee80211_txampdu_count_packet(struct ieee80211_tx_ampdu *tap)
 {
 	/* XXX bound loop/do more crude estimate? */
@@ -113,7 +113,7 @@
  * date due to lack of traffic then we decay the estimate
  * to account for the idle time.
  */
-static int __inline
+static __inline int
 ieee80211_txampdu_getpps(struct ieee80211_tx_ampdu *tap)
 {
 	/* XXX bound loop/do more crude estimate? */

From owner-p4-projects@FreeBSD.ORG  Thu May  8 15:56:11 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 16EFB1065675; Thu,  8 May 2008 15:56:11 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CD5D9106566C
	for ; Thu,  8 May 2008 15:56:10 +0000 (UTC)
	(envelope-from andre@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id BC56D8FC0C
	for ; Thu,  8 May 2008 15:56:10 +0000 (UTC)
	(envelope-from andre@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m48FuAll068384
	for ; Thu, 8 May 2008 15:56:10 GMT
	(envelope-from andre@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m48FuAJk068382
	for perforce@freebsd.org; Thu, 8 May 2008 15:56:10 GMT
	(envelope-from andre@freebsd.org)
Date: Thu, 8 May 2008 15:56:10 GMT
Message-Id: <200805081556.m48FuAJk068382@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	andre@freebsd.org using -f
From: Andre Oppermann 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 141327 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Thu, 08 May 2008 15:56:11 -0000

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

Change 141327 by andre@andre_flirtbox on 2008/05/08 15:55:14

	Apply locking changes to new function.

Affected files ...

.. //depot/projects/tcp_reass/netinet/tcp_timer.c#4 edit

Differences ...

==== //depot/projects/tcp_reass/netinet/tcp_timer.c#4 (text+ko) ====

@@ -585,11 +585,11 @@
 		INP_INFO_RUNLOCK(&tcbinfo);
 		return;
 	}
-	INP_LOCK(inp);
+	INP_WLOCK(inp);
 	INP_INFO_RUNLOCK(&tcbinfo);
 	if ((inp->inp_vflag & INP_DROPPED) || callout_pending(&tp->t_timers->tt_reass)
 	    || !callout_active(&tp->t_timers->tt_reass)) {
-		INP_UNLOCK(inp);
+		INP_WUNLOCK(inp);
 		return;
 	}
 	callout_deactivate(&tp->t_timers->tt_reass);
@@ -598,7 +598,7 @@
 	tcp_reass_qfree(tp);
 	tp->t_flags |= TF_ACKNOW;
 	(void) tcp_output(tp);
-	INP_UNLOCK(inp);
+	INP_WUNLOCK(inp);
 }
 
 void

From owner-p4-projects@FreeBSD.ORG  Thu May  8 16:26:43 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 13950106567B; Thu,  8 May 2008 16:26:43 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C8F8F1065679
	for ; Thu,  8 May 2008 16:26:42 +0000 (UTC)
	(envelope-from snagg@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id B57238FC22
	for ; Thu,  8 May 2008 16:26:42 +0000 (UTC)
	(envelope-from snagg@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m48GQgT3070292
	for ; Thu, 8 May 2008 16:26:42 GMT
	(envelope-from snagg@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m48GQgHI070290
	for perforce@freebsd.org; Thu, 8 May 2008 16:26:42 GMT
	(envelope-from snagg@FreeBSD.org)
Date: Thu, 8 May 2008 16:26:42 GMT
Message-Id: <200805081626.m48GQgHI070290@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	snagg@FreeBSD.org using -f
From: Vincenzo Iozzo 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 141328 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Thu, 08 May 2008 16:26:43 -0000

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

Change 141328 by snagg@snagg_macosx on 2008/05/08 16:26:17

	IFC

Affected files ...

.. //depot/projects/soc2008/snagg-audit/sys/amd64/conf/GENERIC#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/amd64/conf/NOTES#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/arm/at91/uart_dev_at91usart.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/conf/NOTES#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/conf/files#3 integrate
.. //depot/projects/soc2008/snagg-audit/sys/conf/files.powerpc#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/conf/files.sun4v#3 integrate
.. //depot/projects/soc2008/snagg-audit/sys/conf/kern.mk#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/conf/ldscript.mips#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/conf/ldscript.mips.cfe#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/conf/options#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/contrib/dev/iwn/LICENSE#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/contrib/dev/iwn/iwlwifi-4965-4.44.17.fw.uu#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/contrib/rdma/core_priv.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/contrib/rdma/ib_addr.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/contrib/rdma/ib_cache.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/contrib/rdma/ib_cm.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/contrib/rdma/ib_fmr_pool.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/contrib/rdma/ib_mad.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/contrib/rdma/ib_marshall.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/contrib/rdma/ib_pack.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/contrib/rdma/ib_sa.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/contrib/rdma/ib_smi.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/contrib/rdma/ib_umem.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/contrib/rdma/ib_user_cm.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/contrib/rdma/ib_user_mad.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/contrib/rdma/ib_user_sa.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/contrib/rdma/ib_user_verbs.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/contrib/rdma/ib_verbs.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/contrib/rdma/iw_cm.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/contrib/rdma/krping/getopt.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/contrib/rdma/krping/getopt.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/contrib/rdma/krping/krping.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/contrib/rdma/krping/krping.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/contrib/rdma/krping/krping_dev.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/contrib/rdma/rdma_addr.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/contrib/rdma/rdma_cache.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/contrib/rdma/rdma_cm.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/contrib/rdma/rdma_cm_ib.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/contrib/rdma/rdma_cma.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/contrib/rdma/rdma_device.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/contrib/rdma/rdma_iwcm.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/contrib/rdma/rdma_user_cm.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/contrib/rdma/rdma_verbs.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/contrib/rdma/types.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/dev/ath/if_ath.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/ath/if_athvar.h#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/bce/if_bce.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/bfe/if_bfe.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/bge/if_bge.c#3 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/bge/if_bgereg.h#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/cxgb/cxgb_config.h#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/cxgb/cxgb_main.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/cxgb/cxgb_offload.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/cxgb/cxgb_osdep.h#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/cxgb/t3cdev.h#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cq.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_dbg.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_ev.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_mem.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_qp.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_resource.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_resource.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_user.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_wr.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/cxgb/ulp/tom/cxgb_ddp.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/cxgb/ulp/tom/cxgb_tcp_offload.h#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/cxgb/ulp/tom/cxgb_toepcb.h#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/dcons/dcons_os.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/hme/if_hme_pci.c#3 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/hme/if_hme_sbus.c#3 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/if_ndis/if_ndis.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/ipw/if_ipw.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/iwi/if_iwi.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/iwn/if_iwn.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/dev/iwn/if_iwnreg.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/dev/iwn/if_iwnvar.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/dev/mii/brgphy.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/mii/brgphyreg.h#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/mii/ciphy.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/mii/miidevs#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/mpt/mpt.h#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/mpt/mpt_cam.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/mpt/mpt_raid.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/mpt/mpt_user.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/dev/ofw/ofw_console.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/pci/pcivar.h#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/ral/rt2560.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/ral/rt2661.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/scc/scc_bfe.h#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/scc/scc_bfe_ebus.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/scc/scc_bfe_macio.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/scc/scc_bfe_quicc.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/scc/scc_bfe_sbus.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/scc/scc_core.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/sio/sio.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/ti/if_ti.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/uart/uart_core.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/usb/if_rum.c#3 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/usb/if_zyd.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/usb/ums.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/usb/usbdevs#3 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/usb/uscanner.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/wi/if_wi.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/wpi/if_wpi.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/fs/devfs/devfs_vnops.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/fs/unionfs/union_subr.c#3 integrate
.. //depot/projects/soc2008/snagg-audit/sys/i386/conf/GENERIC#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/i386/conf/NOTES#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/i386/cpufreq/est.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/kern/kern_cpu.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/kern/kern_descrip.c#3 integrate
.. //depot/projects/soc2008/snagg-audit/sys/kern/kern_kthread.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/kern/kern_thr.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/kern/kern_umtx.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/kern/subr_blist.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/kern/subr_kdb.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/kern/subr_witness.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/kern/uipc_mbuf.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/kern/uipc_syscalls.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/kern/vfs_mount.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/kern/vfs_subr.c#3 integrate
.. //depot/projects/soc2008/snagg-audit/sys/mips/include/am29lv081b.h#2 delete
.. //depot/projects/soc2008/snagg-audit/sys/mips/include/cp0.h#2 delete
.. //depot/projects/soc2008/snagg-audit/sys/mips/include/float.h#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/mips/include/pmap.h#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/mips/mips/mips_subr.c#2 delete
.. //depot/projects/soc2008/snagg-audit/sys/mips/mips/pmap.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/modules/Makefile#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/modules/cxgb/Makefile#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/modules/cxgb/iw_cxgb/Makefile#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/modules/esp/Makefile#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/modules/hfa/Makefile#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/modules/hme/Makefile#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/modules/isp/Makefile#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/modules/ispfw/Makefile#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/modules/iwn/Makefile#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/modules/iwnfw/Makefile#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/modules/le/Makefile#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/modules/mpt/Makefile#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/modules/rdma/Makefile#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/modules/rdma/addr/Makefile#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/modules/rdma/cma/Makefile#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/modules/rdma/core/Makefile#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/modules/rdma/iwcm/Makefile#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/modules/rdma/krping/Makefile#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/modules/scc/Makefile#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/modules/sound/driver/Makefile#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/modules/wlan/Makefile#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/net/bpf.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/net/if_ethersubr.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/net80211/ieee80211.c#3 integrate
.. //depot/projects/soc2008/snagg-audit/sys/net80211/ieee80211_node.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/netinet/ip_fw.h#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/netinet/libalias/alias.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/netinet/tcp.h#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/netinet/tcp_usrreq.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/pc98/cbus/sio.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/pc98/conf/GENERIC#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/powerpc/aim/clock.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/powerpc/aim/locore.S#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/powerpc/aim/machdep.c#3 integrate
.. //depot/projects/soc2008/snagg-audit/sys/powerpc/aim/mmu_oea.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/powerpc/aim/mp_cpudep.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/powerpc/aim/swtch.S#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/powerpc/aim/trap_subr.S#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/powerpc/aim/vm_machdep.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/powerpc/booke/pmap.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/powerpc/booke/trap_subr.S#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/powerpc/booke/vm_machdep.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/powerpc/conf/MPC85XX#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/powerpc/conf/NOTES#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/powerpc/include/cpufunc.h#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/powerpc/include/pcpu.h#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/powerpc/include/smp.h#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/powerpc/include/spr.h#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/powerpc/mpc85xx/mpc85xx.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/powerpc/mpc85xx/ocpbus.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/powerpc/mpc85xx/ocpbus.h#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/powerpc/mpc85xx/pci_ocp.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/powerpc/powermac/macio.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/powerpc/powermac/maciovar.h#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/powerpc/powerpc/intr_machdep.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/powerpc/powerpc/mp_machdep.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/powerpc/powerpc/openpic.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/security/audit/audit.h#3 integrate
.. //depot/projects/soc2008/snagg-audit/sys/sparc64/conf/GENERIC#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/sparc64/include/bus_common.h#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/sparc64/include/iommuvar.h#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/sparc64/pci/ofw_pcibus.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/sparc64/pci/psycho.c#3 integrate
.. //depot/projects/soc2008/snagg-audit/sys/sparc64/sbus/sbus.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/sparc64/sparc64/counter.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/sparc64/sparc64/iommu.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/sun4v/include/bus_common.h#2 delete
.. //depot/projects/soc2008/snagg-audit/sys/sun4v/sun4v/hvcons.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/sun4v/sun4v/nexus.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/sun4v/sun4v/vnex.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/sys/blist.h#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/sys/kdb.h#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/sys/mbuf.h#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/sys/mount.h#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/sys/mpt_ioctl.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/sys/umtx.h#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/sys/user.h#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/vm/swap_pager.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/vm/vm_kern.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/vm/vm_map.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/vm/vm_map.h#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/vm/vm_mmap.c#2 integrate

Differences ...

==== //depot/projects/soc2008/snagg-audit/sys/amd64/conf/GENERIC#2 (text+ko) ====

@@ -16,7 +16,7 @@
 # If you are in doubt as to the purpose or necessity of a line, check first
 # in NOTES.
 #
-# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.497 2008/04/20 20:35:34 sam Exp $
+# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.498 2008/05/03 17:05:38 sam Exp $
 
 cpu		HAMMER
 ident		GENERIC
@@ -235,6 +235,8 @@
 
 # Wireless NIC cards
 device		wlan		# 802.11 support
+options		IEEE80211_DEBUG	# enable debug msgs
+options		IEEE80211_AMPDU_AGE	# age frames in AMPDU reorder q's
 device		wlan_wep	# 802.11 WEP support
 device		wlan_ccmp	# 802.11 CCMP support
 device		wlan_tkip	# 802.11 TKIP support

==== //depot/projects/soc2008/snagg-audit/sys/amd64/conf/NOTES#2 (text+ko) ====

@@ -4,7 +4,7 @@
 # This file contains machine dependent kernel configuration notes.  For
 # machine independent notes, look in /sys/conf/NOTES.
 #
-# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.78 2008/04/12 14:20:22 rpaulo Exp $
+# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.79 2008/04/29 21:36:15 sam Exp $
 #
 
 #
@@ -302,6 +302,7 @@
 #       (requires miibus)
 # ipw:	Intel PRO/Wireless 2100 IEEE 802.11 adapter
 # iwi:	Intel PRO/Wireless 2200BG/2225BG/2915ABG IEEE 802.11 adapters
+# iwn:	Intel Wireless WiFi Link 4965AGN 802.11 network adapters
 # nfe:	nVidia nForce MCP on-board Ethernet Networking (BSD open source)
 # nve:	nVidia nForce MCP on-board Ethernet Networking
 # ral:	Ralink Technology IEEE 802.11 wireless adapter
@@ -313,6 +314,7 @@
 options 	ED_HPP
 options 	ED_SIC
 device		iwi
+device		iwn
 device		ipw
 device		nfe		# nVidia nForce MCP on-board Ethernet Networking
 device		nve		# nVidia nForce MCP on-board Ethernet Networking

==== //depot/projects/soc2008/snagg-audit/sys/arm/at91/uart_dev_at91usart.c#2 (text) ====

@@ -26,7 +26,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/arm/at91/uart_dev_at91usart.c,v 1.13 2007/12/25 17:51:55 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/at91/uart_dev_at91usart.c,v 1.14 2008/05/04 23:29:37 peter Exp $");
 
 #include "opt_comconsole.h"
 
@@ -506,9 +506,20 @@
 at91_rx_put(struct uart_softc *sc, int key)
 {
 #if defined(KDB) && defined(ALT_BREAK_TO_DEBUGGER)
+	int kdb_brk;
+
 	if (sc->sc_sysdev != NULL && sc->sc_sysdev->type == UART_DEV_CONSOLE) {
-		if (kdb_alt_break(key, &sc->sc_altbrk))
-			kdb_enter(KDB_WHY_BREAK, "Break sequence to console");
+		if ((kdb_brk = kdb_alt_break(key, &sc->sc_altbrk)) != 0) {
+		case KDB_REQ_DEBUGGER:
+			kdb_enter(KDB_WHY_BREAK, "Break sequence on console");
+			break;
+		case KDB_REQ_PANIC:
+			kdb_panic("Panic sequence on console");
+			break;
+		case KDB_REQ_REBOOT:
+			kdb_reboot();
+			break;
+		}
 	}
 #endif
 	uart_rx_put(sc, key);	

==== //depot/projects/soc2008/snagg-audit/sys/conf/NOTES#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/NOTES,v 1.1481 2008/04/20 20:35:35 sam Exp $
+# $FreeBSD: src/sys/conf/NOTES,v 1.1484 2008/05/06 22:41:23 julian Exp $
 #
 # NOTES -- Lines that can be cut/pasted into kernel and hints configs.
 #
@@ -762,6 +762,8 @@
 device		ether			#Generic Ethernet
 device		vlan			#VLAN support (needs miibus)
 device		wlan			#802.11 support
+options		IEEE80211_DEBUG		#enable debugging msgs
+options		IEEE80211_AMPDU_AGE	#age frames in AMPDU reorder q's
 device		wlan_wep		#802.11 WEP support
 device		wlan_ccmp		#802.11 CCMP support
 device		wlan_tkip		#802.11 TKIP support
@@ -868,7 +870,12 @@
 # The MBUF_STRESS_TEST option enables options which create
 # various random failures / extreme cases related to mbuf
 # functions.  See mbuf(9) for a list of available test cases.
+# MBUF_PROFILING enables code to profile the mbuf chains
+# exiting the system (via participating interfaces) and
+# return a logarithmic histogram of monitored parameters
+# (e.g. packet size, wasted space, number of mbufs in chain).
 options 	MBUF_STRESS_TEST
+options		MBUF_PROFILING
 
 # Statically Link in accept filters
 options 	ACCEPT_FILTER_DATA

==== //depot/projects/soc2008/snagg-audit/sys/conf/files#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.1295 2008/04/25 20:42:48 sam Exp $
+# $FreeBSD: src/sys/conf/files,v 1.1297 2008/05/06 20:49:52 jhb Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -830,6 +830,21 @@
 	compile-with	"uudecode -o ${.TARGET} $S/contrib/dev/iwi/ipw2200-sniffer.fw.uu" \
 	no-obj no-implicit-rule						\
 	clean		"iwi_monitor.fw"
+dev/iwn/if_iwn.c		optional iwn
+iwnfw.c			optional iwnfw					\
+	compile-with	"${AWK} -f $S/tools/fw_stub.awk iwn.fw:iwnfw:44417 -lintel_iwn -miwn -c${.TARGET}" \
+	no-implicit-rule before-depend local				\
+	clean		"iwnfw.c"
+iwnfw.fwo			optional iwnfw				\
+	dependency	"iwn.fw"					\
+	compile-with	"${LD} -b binary -d -warn-common -r -d -o ${.TARGET} iwn.fw" \
+	no-implicit-rule						\
+	clean		"iwn.fwo"
+iwn.fw			optional iwnfw					\
+	dependency	".PHONY"					\
+	compile-with	"uudecode -o ${.TARGET} $S/contrib/dev/iwn/iwlwifi-4965-4.44.17.fw.uu"	\
+	no-obj no-implicit-rule						\
+	clean		"iwn.fw"
 dev/ixgb/if_ixgb.c		optional ixgb
 dev/ixgb/ixgb_ee.c		optional ixgb
 dev/ixgb/ixgb_hw.c		optional ixgb
@@ -916,6 +931,7 @@
 dev/mpt/mpt_debug.c		optional mpt
 dev/mpt/mpt_pci.c		optional mpt pci
 dev/mpt/mpt_raid.c		optional mpt
+dev/mpt/mpt_user.c		optional mpt
 dev/msk/if_msk.c		optional msk
 dev/mxge/if_mxge.c		optional mxge pci
 dev/mxge/mxge_lro.c		optional mxge pci

==== //depot/projects/soc2008/snagg-audit/sys/conf/files.powerpc#2 (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.powerpc,v 1.74 2008/03/03 20:40:19 raj Exp $
+# $FreeBSD: src/sys/conf/files.powerpc,v 1.77 2008/04/30 00:50:50 marcel Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -68,6 +68,7 @@
 powerpc/aim/locore.S		optional	aim no-obj
 powerpc/aim/machdep.c		optional	aim
 powerpc/aim/mmu_oea.c		optional	aim
+powerpc/aim/mp_cpudep.c		optional	aim smp
 powerpc/aim/nexus.c		optional	aim
 powerpc/aim/ofw_machdep.c	optional	aim
 powerpc/aim/ofwmagic.S		optional	aim
@@ -96,6 +97,7 @@
 powerpc/fpu/fpu_mul.c		optional	fpu_emu
 powerpc/fpu/fpu_sqrt.c		optional	fpu_emu
 powerpc/fpu/fpu_subr.c		optional	fpu_emu
+powerpc/mpc85xx/mpc85xx.c	optional	mpc85xx
 powerpc/mpc85xx/nexus.c		optional	mpc85xx
 powerpc/mpc85xx/ocpbus.c	optional	mpc85xx
 powerpc/mpc85xx/opic.c		optional	mpc85xx
@@ -130,7 +132,7 @@
 powerpc/powerpc/intr_machdep.c	standard
 powerpc/powerpc/mem.c		optional	mem
 powerpc/powerpc/mmu_if.m	standard
-powerpc/powerpc/mp_machdep.c	optional	smp aim
+powerpc/powerpc/mp_machdep.c	optional	smp
 powerpc/powerpc/openpic.c	standard
 powerpc/powerpc/pic_if.m	standard
 powerpc/powerpc/pmap_dispatch.c	standard

==== //depot/projects/soc2008/snagg-audit/sys/conf/files.sun4v#3 (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.sun4v,v 1.14 2008/04/26 11:01:37 marius Exp $
+# $FreeBSD: src/sys/conf/files.sun4v,v 1.15 2008/05/02 17:41:52 marius Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -35,7 +35,6 @@
 sparc64/sparc64/autoconf.c	standard
 sun4v/sun4v/bus_machdep.c	standard
 sparc64/sparc64/clock.c		standard
-sparc64/sparc64/counter.c	standard
 sparc64/sparc64/db_disasm.c	optional	ddb
 sun4v/sun4v/db_interface.c	optional	ddb
 sun4v/sun4v/db_trace.c		optional	ddb

==== //depot/projects/soc2008/snagg-audit/sys/conf/kern.mk#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/kern.mk,v 1.52 2007/05/24 21:53:42 obrien Exp $
+# $FreeBSD: src/sys/conf/kern.mk,v 1.53 2008/04/29 11:28:10 gonzo Exp $
 
 #
 # Warning flags for compiling the kernel and components of the kernel.
@@ -85,6 +85,15 @@
 .endif
 
 #
+# For MIPS we also tell gcc to use floating point emulation and 
+# disable MIPS DSP ASE Instruction set.
+#
+.if ${MACHINE_ARCH} == "mips"
+CFLAGS+=	-msoft-float -mno-dsp
+INLINE_LIMIT?=	15000
+.endif
+
+#
 # GCC 3.0 and above like to do certain optimizations based on the
 # assumption that the program is linked against libc.  Stop this.
 #

==== //depot/projects/soc2008/snagg-audit/sys/conf/ldscript.mips#2 (text+ko) ====

@@ -1,5 +1,5 @@
-/* $FreeBSD: src/sys/conf/ldscript.mips,v 1.1 2008/04/13 06:25:43 imp Exp $ */
-OUTPUT_FORMAT("elf32-bigmips", "elf32-bigmips", "elf32-littlemips")
+/* $FreeBSD: src/sys/conf/ldscript.mips,v 1.2 2008/04/30 12:44:58 gonzo Exp $ */
+OUTPUT_FORMAT("elf32-tradbigmips", "elf32-tradbigmips", "elf32-tradlittlemips")
 OUTPUT_ARCH(mips)
 ENTRY(_start)
 SEARCH_DIR(/usr/lib);

==== //depot/projects/soc2008/snagg-audit/sys/conf/ldscript.mips.cfe#2 (text+ko) ====

@@ -2,8 +2,8 @@
  * This linker script is needed to build a kernel for use by Broadcom CFE.
  */
 
-/* $FreeBSD: src/sys/conf/ldscript.mips.cfe,v 1.1 2008/04/13 06:25:43 imp Exp $ */
-OUTPUT_FORMAT("elf32-bigmips", "elf32-bigmips", "elf32-littlemips")
+/* $FreeBSD: src/sys/conf/ldscript.mips.cfe,v 1.2 2008/04/30 12:44:58 gonzo Exp $ */
+OUTPUT_FORMAT("elf32-tradbigmips", "elf32-tradbigmips", "elf32-tradlittlemips")
 OUTPUT_ARCH(mips)
 ENTRY(_start)
 SEARCH_DIR(/usr/lib);

==== //depot/projects/soc2008/snagg-audit/sys/conf/options#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options,v 1.626 2008/04/20 20:35:35 sam Exp $
+# $FreeBSD: src/sys/conf/options,v 1.627 2008/04/29 21:23:21 julian Exp $
 #
 #        On the handling of kernel options
 #
@@ -388,6 +388,7 @@
 LIBMCHAIN
 LIBALIAS
 MBUF_STRESS_TEST
+MBUF_PROFILING
 NCP
 NETATALK		opt_atalk.h
 PPP_BSDCOMP		opt_ppp.h

==== //depot/projects/soc2008/snagg-audit/sys/dev/ath/if_ath.c#2 (text+ko) ====

@@ -28,7 +28,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.180 2008/04/20 20:35:35 sam Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.185 2008/05/03 21:55:02 sam Exp $");
 
 /*
  * Driver for the Atheros Wireless LAN controller.
@@ -85,6 +85,11 @@
 #endif
 
 /*
+ * We require a HAL w/ the changes for split tx/rx MIC.
+ */
+CTASSERT(HAL_ABI_VERSION > 0x06052200);
+
+/*
  * ATH_BCBUF determines the number of vap's that can transmit
  * beacons and also (currently) the number of vap's that can
  * have unique mac addresses/bssid.  When staggering beacons
@@ -2067,13 +2072,11 @@
 		printf(" %s ", sc->sc_splitmic ? "mic" : "rxmic");
 		for (i = 0; i < sizeof(hk->kv_mic); i++)
 			printf("%02x", hk->kv_mic[i]);
-#if HAL_ABI_VERSION > 0x06052200
 		if (!sc->sc_splitmic) {
 			printf(" txmic ");
 			for (i = 0; i < sizeof(hk->kv_txmic); i++)
 				printf("%02x", hk->kv_txmic[i]);
 		}
-#endif
 	}
 	printf("\n");
 }
@@ -2116,18 +2119,19 @@
 			 * will handle the rest.
 			 */
 			memcpy(hk->kv_mic, k->wk_rxmic, sizeof(hk->kv_mic));
-#if HAL_ABI_VERSION > 0x06052200
 			memcpy(hk->kv_txmic, k->wk_txmic, sizeof(hk->kv_txmic));
-#endif
 			KEYPRINTF(sc, k->wk_keyix, hk, mac);
 			return ath_hal_keyset(ah, k->wk_keyix, hk, mac);
 		}
 	} else if (k->wk_flags & IEEE80211_KEY_XMIT) {
-#if HAL_ABI_VERSION > 0x06052200
-		memcpy(hk->kv_txmic, k->wk_txmic, sizeof(hk->kv_txmic));
-#else
-		memcpy(hk->kv_mic, k->wk_mic, sizeof(hk->kv_mic));
-#endif
+		if (sc->sc_splitmic) {
+			/*
+			 * NB: must pass MIC key in expected location when
+			 * the keycache only holds one MIC key per entry.
+			 */
+			memcpy(hk->kv_mic, k->wk_txmic, sizeof(hk->kv_txmic));
+		} else
+			memcpy(hk->kv_txmic, k->wk_txmic, sizeof(hk->kv_txmic));
 		KEYPRINTF(sc, k->wk_keyix, hk, mac);
 		return ath_hal_keyset(ah, k->wk_keyix, hk, mac);
 	} else if (k->wk_flags & IEEE80211_KEY_RECV) {
@@ -5920,7 +5924,12 @@
 	ath_hal_setregdomain(ah, 0);
 	/* XXX not quite right but close enough for now */
 	getchannels(sc, nchans, chans, CTRY_DEBUG, AH_TRUE, AH_FALSE);
+
+	/* NB: restore previous state */
 	ath_hal_setregdomain(ah, ord);
+	(void) getchannels(sc, NULL, NULL, ic->ic_regdomain.country,
+	     ic->ic_regdomain.ecm ? AH_TRUE : AH_FALSE,
+	     ic->ic_regdomain.location == 'O' ? AH_TRUE : AH_FALSE);
 }
 
 static int
@@ -5936,7 +5945,6 @@
 	struct ifnet *ifp = sc->sc_ifp;
 	struct ieee80211com *ic = ifp->if_l2com;
 	struct ath_hal *ah = sc->sc_ah;
-	u_int32_t rd, cc;
 	int error;
 
 	/*
@@ -5944,19 +5952,19 @@
 	 */
 	error = getchannels(sc, &ic->ic_nchans, ic->ic_channels,
 	    CTRY_DEFAULT, AH_TRUE, AH_FALSE);
-	(void) ath_hal_getregdomain(ah, &rd);
-	ath_hal_getcountrycode(ah, &cc);	/* NB: cannot fail */
+	(void) ath_hal_getregdomain(ah, &sc->sc_eerd);
+	ath_hal_getcountrycode(ah, &sc->sc_eecc);	/* NB: cannot fail */
 	if (error) {
 		if_printf(ifp, "%s: unable to collect channel list from hal, "
 		    "error %d\n", __func__, error);
 		if (error == EINVAL) {
 			if_printf(ifp, "%s: regdomain likely %u country code %u\n",
-			    __func__, rd, cc);
+			    __func__, sc->sc_eerd, sc->sc_eecc);
 		}
 		return error;
 	}
-	ic->ic_regdomain.regdomain = ath_mapregdomain(sc, rd);
-	ic->ic_regdomain.country = cc;
+	ic->ic_regdomain.regdomain = ath_mapregdomain(sc, sc->sc_eerd);
+	ic->ic_regdomain.country = sc->sc_eecc;
 	ic->ic_regdomain.ecm = 1;
 	ic->ic_regdomain.location = 'I';
 	ic->ic_regdomain.isocc[0] = ' ';	/* XXX don't know */
@@ -6272,9 +6280,9 @@
 	struct ifreq *ifr = (struct ifreq *)data;
 	int error = 0;
 
-	ATH_LOCK(sc);
 	switch (cmd) {
 	case SIOCSIFFLAGS:
+		ATH_LOCK(sc);
 		if (IS_RUNNING(ifp)) {
 			/*
 			 * To avoid rescanning another access point,
@@ -6296,17 +6304,8 @@
 				ath_init(sc);	/* XXX lose error */
 		} else
 			ath_stop_locked(ifp);
+		ATH_UNLOCK(sc);
 		break;
-	case SIOCADDMULTI:
-	case SIOCDELMULTI:
-		/*
-		 * The upper layer has already installed/removed
-		 * the multicast address(es), just recalculate the
-		 * multicast filter for the card.
-		 */
-		if (ifp->if_drv_flags & IFF_DRV_RUNNING)
-			ath_mode_init(sc);
-		break;
 	case SIOCGIFMEDIA:
 	case SIOCSIFMEDIA:
 		error = ifmedia_ioctl(ifp, ifr, &ic->ic_media, cmd);
@@ -6320,27 +6319,20 @@
 			&sc->sc_stats.ast_rx_noise);
 #endif
 		sc->sc_stats.ast_tx_rate = sc->sc_hwmap[sc->sc_txrate].ieeerate;
-		ATH_UNLOCK(sc);
-		/*
-		 * NB: Drop the softc lock in case of a page fault;
-		 * we'll accept any potential inconsisentcy in the
-		 * statistics.  The alternative is to copy the data
-		 * to a local structure.
-		 */
 		return copyout(&sc->sc_stats,
-				ifr->ifr_data, sizeof (sc->sc_stats));
+		    ifr->ifr_data, sizeof (sc->sc_stats));
 #ifdef ATH_DIAGAPI
 	case SIOCGATHDIAG:
-		ATH_UNLOCK(sc);
 		error = ath_ioctl_diag(sc, (struct ath_diag *) ifr);
-		ATH_LOCK(sc);
 		break;
 #endif
+	case SIOCGIFADDR:
+		error = ether_ioctl(ifp, cmd, data);
+		break;
 	default:
-		error = ether_ioctl(ifp, cmd, data);
+		error = EINVAL;
 		break;
 	}
-	ATH_UNLOCK(sc);
 	return error;
 #undef IS_RUNNING
 }
@@ -6596,6 +6588,12 @@
 	struct sysctl_oid *tree = device_get_sysctl_tree(sc->sc_dev);
 	struct ath_hal *ah = sc->sc_ah;
 
+	SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
+		"countrycode", CTLFLAG_RD, &sc->sc_eecc, 0,
+		"EEPROM country code");
+	SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
+		"regdomain", CTLFLAG_RD, &sc->sc_eerd, 0,
+		"EEPROM regdomain code");
 #ifdef	ATH_DEBUG
 	sc->sc_debug = ath_debug;
 	SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,

==== //depot/projects/soc2008/snagg-audit/sys/dev/ath/if_athvar.h#2 (text+ko) ====

@@ -26,7 +26,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  *
- * $FreeBSD: src/sys/dev/ath/if_athvar.h,v 1.63 2008/04/20 20:35:35 sam Exp $
+ * $FreeBSD: src/sys/dev/ath/if_athvar.h,v 1.64 2008/05/03 21:52:05 sam Exp $
  */
 
 /*
@@ -246,6 +246,8 @@
 				sc_swbmiss  : 1,/* sta mode using sw bmiss */
 				sc_stagbeacons:1,/* use staggered beacons */
 				sc_wmetkipmic:1;/* can do WME+TKIP MIC */
+	uint32_t		sc_eerd;	/* regdomain from EEPROM */
+	uint32_t		sc_eecc;	/* country code from EEPROM */
 						/* rate tables */
 #define	IEEE80211_MODE_HALF	(IEEE80211_MODE_MAX+0)
 #define	IEEE80211_MODE_QUARTER	(IEEE80211_MODE_MAX+1)

==== //depot/projects/soc2008/snagg-audit/sys/dev/bce/if_bce.c#2 (text) ====

@@ -29,7 +29,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.37 2008/04/11 23:10:40 davidch Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.39 2008/05/08 15:05:38 scottl Exp $");
 
 /*
  * The following controllers are supported by this driver:
@@ -502,7 +502,7 @@
 	/* Allocate PCI memory resources. */
 	rid = PCIR_BAR(0);
 	sc->bce_res_mem = bus_alloc_resource_any(dev, SYS_RES_MEMORY,
-		&rid, RF_ACTIVE | PCI_RF_DENSE);
+		&rid, RF_ACTIVE);
 
 	if (sc->bce_res_mem == NULL) {
 		BCE_PRINTF("%s(%d): PCI memory allocation failed\n", 
@@ -776,7 +776,11 @@
 	ifp->if_capenable    = ifp->if_capabilities;
 
 	/* Use standard mbuf sizes for buffer allocation. */
+#ifdef BCE_USE_SPLIT_HEADER
 	sc->rx_bd_mbuf_alloc_size = MHLEN;
+#else
+	sc->rx_bd_mbuf_alloc_size = MCLBYTES;;
+#endif
 	sc->pg_bd_mbuf_alloc_size = MCLBYTES;
 
 	ifp->if_snd.ifq_drv_maxlen = USABLE_TX_BD;
@@ -3804,7 +3808,11 @@
 			goto bce_get_rx_buf_exit);
 
 		/* This is a new mbuf allocation. */
+#ifdef BCE_USE_SPLIT_HEADER
 		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
+#else
+		m_new = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
+#endif
 		if (m_new == NULL) {
 			sc->mbuf_alloc_failed++;
 			rc = ENOBUFS;

==== //depot/projects/soc2008/snagg-audit/sys/dev/bfe/if_bfe.c#2 (text+ko) ====

@@ -26,7 +26,7 @@
 
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/bfe/if_bfe.c,v 1.44 2008/01/29 02:15:11 yongari Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/bfe/if_bfe.c,v 1.45 2008/04/30 02:49:24 yongari Exp $");
 
 #include 
 #include 
@@ -646,16 +646,18 @@
 	struct bfe_desc *d;
 	struct bfe_data *r;
 	u_int32_t ctrl;
-	int error;
+	int allocated, error;
 
 	if ((c < 0) || (c >= BFE_RX_LIST_CNT))
 		return (EINVAL);
 
+	allocated = 0;
 	if(m == NULL) {
 		m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
 		if(m == NULL)
 			return (ENOBUFS);
 		m->m_len = m->m_pkthdr.len = MCLBYTES;
+		allocated++;
 	}
 	else
 		m->m_data = m->m_ext.ext_buf;
@@ -670,8 +672,14 @@
 	r = &sc->bfe_rx_ring[c];
 	error = bus_dmamap_load(sc->bfe_tag, r->bfe_map, mtod(m, void *),
 			MCLBYTES, bfe_dma_map_desc, d, BUS_DMA_NOWAIT);
-	if (error)
-		printf("Serious error: bfe failed to map RX buffer\n");
+	if (error != 0) {
+		if (allocated != 0)
+			m_free(m);
+		if (error != ENOMEM)
+			printf("bfe%d: failed to map RX buffer, error %d\n",
+			    sc->bfe_unit, error);
+		return (ENOBUFS);
+	}
 	bus_dmamap_sync(sc->bfe_tag, r->bfe_map, BUS_DMASYNC_PREWRITE);
 
 	ctrl = ETHER_MAX_LEN + 32;

==== //depot/projects/soc2008/snagg-audit/sys/dev/bge/if_bge.c#3 (text+ko) ====

@@ -32,7 +32,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.206 2008/04/26 10:54:17 marius Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.210 2008/05/05 18:42:17 bz Exp $");
 
 /*
  * Broadcom BCM570x family gigabit ethernet driver for FreeBSD.
@@ -196,6 +196,8 @@
 	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5901 },
 	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5901A2 },
 	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5903M },
+	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5906 },
+	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5906M },
 
 	{ SK_VENDORID,		SK_DEVICEID_ALTIMA },
 
@@ -273,6 +275,8 @@
 	{ BGE_CHIPID_BCM5787_A0,	"BCM5754/5787 A0" }, 
 	{ BGE_CHIPID_BCM5787_A1,	"BCM5754/5787 A1" },
 	{ BGE_CHIPID_BCM5787_A2,	"BCM5754/5787 A2" },
+	{ BGE_CHIPID_BCM5906_A1,	"BCM5906 A1" },
+	{ BGE_CHIPID_BCM5906_A2,	"BCM5906 A2" },
 
 	{ 0, NULL }
 };
@@ -295,6 +299,7 @@
 	{ BGE_ASICREV_BCM5755,		"unknown BCM5755" },
 	/* 5754 and 5787 share the same ASIC ID */
 	{ BGE_ASICREV_BCM5787,		"unknown BCM5754/5787" },
+	{ BGE_ASICREV_BCM5906,		"unknown BCM5906" },
 
 	{ 0, NULL }
 };
@@ -307,6 +312,9 @@
 
 const struct bge_revision * bge_lookup_rev(uint32_t);
 const struct bge_vendor * bge_lookup_vendor(uint16_t);
+
+typedef int	(*bge_eaddr_fcn_t)(struct bge_softc *, uint8_t[]);
+
 static int bge_probe(device_t);
 static int bge_attach(device_t);
 static int bge_detach(device_t);
@@ -317,6 +325,11 @@
 static int bge_dma_alloc(device_t);
 static void bge_dma_free(struct bge_softc *);
 
+static int bge_get_eaddr_mem(struct bge_softc *, uint8_t[]);
+static int bge_get_eaddr_nvram(struct bge_softc *, uint8_t[]);
+static int bge_get_eaddr_eeprom(struct bge_softc *, uint8_t[]);
+static int bge_get_eaddr(struct bge_softc *, uint8_t[]);
+
 static void bge_txeof(struct bge_softc *);
 static void bge_rxeof(struct bge_softc *);
 
@@ -339,6 +352,9 @@
 static int bge_ifmedia_upd(struct ifnet *);
 static void bge_ifmedia_sts(struct ifnet *, struct ifmediareq *);
 
+static uint8_t bge_nvram_getbyte(struct bge_softc *, int, uint8_t *);
+static int bge_read_nvram(struct bge_softc *, caddr_t, int, int);
+
 static uint8_t bge_eeprom_getbyte(struct bge_softc *, int, uint8_t *);
 static int bge_read_eeprom(struct bge_softc *, caddr_t, int, int);
 
@@ -361,6 +377,7 @@
 static int bge_has_eeprom(struct bge_softc *);
 static uint32_t bge_readmem_ind(struct bge_softc *, int);
 static void bge_writemem_ind(struct bge_softc *, int, int);
+static void bge_writembx(struct bge_softc *, int, int);
 #ifdef notdef
 static uint32_t bge_readreg_ind(struct bge_softc *, int);
 #endif
@@ -476,6 +493,10 @@
 			return (0);
 	}
 #endif
+
+	if (sc->bge_asicrev == BGE_ASICREV_BCM5906)
+		return (0);
+
 	return (1);
 }
 
@@ -535,6 +556,15 @@
 	CSR_WRITE_4(sc, off, val);
 }
 
+static void
+bge_writembx(struct bge_softc *sc, int off, int val)
+{
+	if (sc->bge_asicrev == BGE_ASICREV_BCM5906)
+		off += BGE_LPMBX_IRQ0_HI - BGE_MBX_IRQ0_HI;
+
+	CSR_WRITE_4(sc, off, val);
+}
+
 /*
  * Map a single buffer address.
  */
@@ -557,7 +587,79 @@
 	ctx->bge_busaddr = segs->ds_addr;
 }
 
+static uint8_t
+bge_nvram_getbyte(struct bge_softc *sc, int addr, uint8_t *dest)
+{
+	uint32_t access, byte = 0;
+	int i;
+
+	/* Lock. */
+	CSR_WRITE_4(sc, BGE_NVRAM_SWARB, BGE_NVRAMSWARB_SET1);
+	for (i = 0; i < 8000; i++) {
+		if (CSR_READ_4(sc, BGE_NVRAM_SWARB) & BGE_NVRAMSWARB_GNT1)
+			break;
+		DELAY(20);
+	}
+	if (i == 8000)
+		return (1);
+
+	/* Enable access. */
+	access = CSR_READ_4(sc, BGE_NVRAM_ACCESS);
+	CSR_WRITE_4(sc, BGE_NVRAM_ACCESS, access | BGE_NVRAMACC_ENABLE);
+
+	CSR_WRITE_4(sc, BGE_NVRAM_ADDR, addr & 0xfffffffc);
+	CSR_WRITE_4(sc, BGE_NVRAM_CMD, BGE_NVRAM_READCMD);
+	for (i = 0; i < BGE_TIMEOUT * 10; i++) {
+		DELAY(10);
+		if (CSR_READ_4(sc, BGE_NVRAM_CMD) & BGE_NVRAMCMD_DONE) {
+			DELAY(10);
+			break;
+		}
+	}
+
+	if (i == BGE_TIMEOUT * 10) {
+		if_printf(sc->bge_ifp, "nvram read timed out\n");
+		return (1);
+	}
+
+	/* Get result. */
+	byte = CSR_READ_4(sc, BGE_NVRAM_RDDATA);
+
+	*dest = (bswap32(byte) >> ((addr % 4) * 8)) & 0xFF;
+
+	/* Disable access. */
+	CSR_WRITE_4(sc, BGE_NVRAM_ACCESS, access);
+
+	/* Unlock. */
+	CSR_WRITE_4(sc, BGE_NVRAM_SWARB, BGE_NVRAMSWARB_CLR1);
+	CSR_READ_4(sc, BGE_NVRAM_SWARB);
+
+	return (0);
+}
+
 /*
+ * Read a sequence of bytes from NVRAM.
+ */
+static int
+bge_read_nvram(struct bge_softc *sc, caddr_t dest, int off, int cnt)
+{
+	int err = 0, i;
+	uint8_t byte = 0;
+
+	if (sc->bge_asicrev != BGE_ASICREV_BCM5906)
+		return (1);
+
+	for (i = 0; i < cnt; i++) {
+		err = bge_nvram_getbyte(sc, off + i, &byte);
+		if (err)
+			break;
+		*(dest + i) = byte;
+	}
+
+	return (err ? 1 : 0);
+}
+
+/*
  * Read a byte of data stored in the EEPROM at address 'addr.' The
  * BCM570x supports both the traditional bitbang interface and an
  * auto access interface for reading the EEPROM. We use the auto
@@ -661,11 +763,13 @@
 	}
 
 	if (i == BGE_TIMEOUT) {
-		device_printf(sc->bge_dev, "PHY read timed out\n");
+		device_printf(sc->bge_dev, "PHY read timed out "
+			  "(phy %d, reg %d, val 0x%08x)\n", phy, reg, val);

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Thu May  8 17:42:07 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A81311065671; Thu,  8 May 2008 17:42:07 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6577D1065672
	for ; Thu,  8 May 2008 17:42:07 +0000 (UTC)
	(envelope-from snagg@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 3B6128FC13
	for ; Thu,  8 May 2008 17:42:07 +0000 (UTC)
	(envelope-from snagg@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m48Hg7dk082778
	for ; Thu, 8 May 2008 17:42:07 GMT
	(envelope-from snagg@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m48Hg7Rt082776
	for perforce@freebsd.org; Thu, 8 May 2008 17:42:07 GMT
	(envelope-from snagg@FreeBSD.org)
Date: Thu, 8 May 2008 17:42:07 GMT
Message-Id: <200805081742.m48Hg7Rt082776@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	snagg@FreeBSD.org using -f
From: Vincenzo Iozzo 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 141329 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Thu, 08 May 2008 17:42:08 -0000

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

Change 141329 by snagg@snagg_macosx on 2008/05/08 17:41:48

	integrated auditwatch

Affected files ...

.. //depot/projects/soc2008/snagg-audit/rwatson/auditwatch/Makefile#1 branch
.. //depot/projects/soc2008/snagg-audit/rwatson/auditwatch/auditinput.c#1 branch
.. //depot/projects/soc2008/snagg-audit/rwatson/auditwatch/auditoutput.c#1 branch
.. //depot/projects/soc2008/snagg-audit/rwatson/auditwatch/auditwatch.c#1 branch
.. //depot/projects/soc2008/snagg-audit/rwatson/auditwatch/auditwatch.h#1 branch

Differences ...

From owner-p4-projects@FreeBSD.ORG  Thu May  8 20:34:19 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id CAB261065672; Thu,  8 May 2008 20:34:18 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 73A87106564A
	for ; Thu,  8 May 2008 20:34:18 +0000 (UTC)
	(envelope-from marius@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 6060B8FC1D
	for ; Thu,  8 May 2008 20:34:18 +0000 (UTC)
	(envelope-from marius@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m48KYIlE091278
	for ; Thu, 8 May 2008 20:34:18 GMT
	(envelope-from marius@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m48KYIUi091276
	for perforce@freebsd.org; Thu, 8 May 2008 20:34:18 GMT
	(envelope-from marius@freebsd.org)
Date: Thu, 8 May 2008 20:34:18 GMT
Message-Id: <200805082034.m48KYIUi091276@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	marius@freebsd.org using -f
From: Marius Strobl 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 141332 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Thu, 08 May 2008 20:34:19 -0000

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

Change 141332 by marius@flak on 2008/05/08 20:34:15

	o IFC @141331.
	o Changes to schizo(4):
	  - Catch up with using the result of device_get_nameunit(9) for
	    naming the IOMMU.
	  - Account for `jbusppm' devices sharing a subregion of a register
	    bank with the Tomatillo controller configuration registers.
	  - Setup the performance counter 0 in bus cycle counting mode as
	    timecounter. This was intended to fully solve the problems of
	    using the (s)tick counters which are not (fully) synchronized
	    between CPUs as timecounter but unfortunately counting bus
	    cycles seems to be broken in Tomatillos (not running full power
	    electro isn't the cause.)
	  - Use a macro for determining the DVMA size instead of hardcoding
	    values. Inspired by the NetBSD psycho(4) but this version is
	    in turn based on macros of iommureg.h.
	  - Use a macro for the VIS block size in schizo_dmasync().

Affected files ...

.. //depot/projects/usiii/amd64/conf/GENERIC#9 integrate
.. //depot/projects/usiii/amd64/conf/NOTES#6 integrate
.. //depot/projects/usiii/arm/at91/uart_dev_at91usart.c#3 integrate
.. //depot/projects/usiii/conf/NOTES#10 integrate
.. //depot/projects/usiii/conf/files#11 integrate
.. //depot/projects/usiii/conf/files.powerpc#6 integrate
.. //depot/projects/usiii/conf/files.sun4v#4 integrate
.. //depot/projects/usiii/conf/kern.mk#2 integrate
.. //depot/projects/usiii/conf/ldscript.mips#2 integrate
.. //depot/projects/usiii/conf/ldscript.mips.cfe#2 integrate
.. //depot/projects/usiii/conf/options#10 integrate
.. //depot/projects/usiii/contrib/dev/iwn/LICENSE#1 branch
.. //depot/projects/usiii/contrib/dev/iwn/iwlwifi-4965-4.44.17.fw.uu#1 branch
.. //depot/projects/usiii/contrib/rdma/core_priv.h#1 branch
.. //depot/projects/usiii/contrib/rdma/ib_addr.h#1 branch
.. //depot/projects/usiii/contrib/rdma/ib_cache.h#1 branch
.. //depot/projects/usiii/contrib/rdma/ib_cm.h#1 branch
.. //depot/projects/usiii/contrib/rdma/ib_fmr_pool.h#1 branch
.. //depot/projects/usiii/contrib/rdma/ib_mad.h#1 branch
.. //depot/projects/usiii/contrib/rdma/ib_marshall.h#1 branch
.. //depot/projects/usiii/contrib/rdma/ib_pack.h#1 branch
.. //depot/projects/usiii/contrib/rdma/ib_sa.h#1 branch
.. //depot/projects/usiii/contrib/rdma/ib_smi.h#1 branch
.. //depot/projects/usiii/contrib/rdma/ib_umem.h#1 branch
.. //depot/projects/usiii/contrib/rdma/ib_user_cm.h#1 branch
.. //depot/projects/usiii/contrib/rdma/ib_user_mad.h#1 branch
.. //depot/projects/usiii/contrib/rdma/ib_user_sa.h#1 branch
.. //depot/projects/usiii/contrib/rdma/ib_user_verbs.h#1 branch
.. //depot/projects/usiii/contrib/rdma/ib_verbs.h#1 branch
.. //depot/projects/usiii/contrib/rdma/iw_cm.h#1 branch
.. //depot/projects/usiii/contrib/rdma/krping/getopt.c#1 branch
.. //depot/projects/usiii/contrib/rdma/krping/getopt.h#1 branch
.. //depot/projects/usiii/contrib/rdma/krping/krping.c#1 branch
.. //depot/projects/usiii/contrib/rdma/krping/krping.h#1 branch
.. //depot/projects/usiii/contrib/rdma/krping/krping_dev.c#1 branch
.. //depot/projects/usiii/contrib/rdma/rdma_addr.c#1 branch
.. //depot/projects/usiii/contrib/rdma/rdma_cache.c#1 branch
.. //depot/projects/usiii/contrib/rdma/rdma_cm.h#1 branch
.. //depot/projects/usiii/contrib/rdma/rdma_cm_ib.h#1 branch
.. //depot/projects/usiii/contrib/rdma/rdma_cma.c#1 branch
.. //depot/projects/usiii/contrib/rdma/rdma_device.c#1 branch
.. //depot/projects/usiii/contrib/rdma/rdma_iwcm.c#1 branch
.. //depot/projects/usiii/contrib/rdma/rdma_user_cm.h#1 branch
.. //depot/projects/usiii/contrib/rdma/rdma_verbs.c#1 branch
.. //depot/projects/usiii/contrib/rdma/types.h#1 branch
.. //depot/projects/usiii/dev/ata/ata-disk.c#5 integrate
.. //depot/projects/usiii/dev/ata/ata-lowlevel.c#4 integrate
.. //depot/projects/usiii/dev/ata/atapi-cd.c#4 integrate
.. //depot/projects/usiii/dev/ata/atapi-fd.c#4 integrate
.. //depot/projects/usiii/dev/ata/atapi-tape.c#4 integrate
.. //depot/projects/usiii/dev/ath/if_ath.c#7 integrate
.. //depot/projects/usiii/dev/ath/if_athvar.h#3 integrate
.. //depot/projects/usiii/dev/bce/if_bce.c#5 integrate
.. //depot/projects/usiii/dev/bfe/if_bfe.c#4 integrate
.. //depot/projects/usiii/dev/bge/if_bge.c#10 integrate
.. //depot/projects/usiii/dev/bge/if_bgereg.h#4 integrate
.. //depot/projects/usiii/dev/cxgb/cxgb_config.h#3 integrate
.. //depot/projects/usiii/dev/cxgb/cxgb_main.c#7 integrate
.. //depot/projects/usiii/dev/cxgb/cxgb_offload.c#5 integrate
.. //depot/projects/usiii/dev/cxgb/cxgb_osdep.h#5 integrate
.. //depot/projects/usiii/dev/cxgb/t3cdev.h#3 integrate
.. //depot/projects/usiii/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#1 branch
.. //depot/projects/usiii/dev/cxgb/ulp/iw_cxgb/iw_cxgb.h#1 branch
.. //depot/projects/usiii/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#1 branch
.. //depot/projects/usiii/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.h#1 branch
.. //depot/projects/usiii/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cq.c#1 branch
.. //depot/projects/usiii/dev/cxgb/ulp/iw_cxgb/iw_cxgb_dbg.c#1 branch
.. //depot/projects/usiii/dev/cxgb/ulp/iw_cxgb/iw_cxgb_ev.c#1 branch
.. //depot/projects/usiii/dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.c#1 branch
.. //depot/projects/usiii/dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.h#1 branch
.. //depot/projects/usiii/dev/cxgb/ulp/iw_cxgb/iw_cxgb_mem.c#1 branch
.. //depot/projects/usiii/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.c#1 branch
.. //depot/projects/usiii/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.h#1 branch
.. //depot/projects/usiii/dev/cxgb/ulp/iw_cxgb/iw_cxgb_qp.c#1 branch
.. //depot/projects/usiii/dev/cxgb/ulp/iw_cxgb/iw_cxgb_resource.c#1 branch
.. //depot/projects/usiii/dev/cxgb/ulp/iw_cxgb/iw_cxgb_resource.h#1 branch
.. //depot/projects/usiii/dev/cxgb/ulp/iw_cxgb/iw_cxgb_user.h#1 branch
.. //depot/projects/usiii/dev/cxgb/ulp/iw_cxgb/iw_cxgb_wr.h#1 branch
.. //depot/projects/usiii/dev/cxgb/ulp/tom/cxgb_cpl_io.c#5 integrate
.. //depot/projects/usiii/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#5 integrate
.. //depot/projects/usiii/dev/cxgb/ulp/tom/cxgb_ddp.c#4 integrate
.. //depot/projects/usiii/dev/cxgb/ulp/tom/cxgb_tcp_offload.h#2 integrate
.. //depot/projects/usiii/dev/cxgb/ulp/tom/cxgb_toepcb.h#3 integrate
.. //depot/projects/usiii/dev/dcons/dcons_os.c#3 integrate
.. //depot/projects/usiii/dev/hme/if_hme_pci.c#3 integrate
.. //depot/projects/usiii/dev/hme/if_hme_sbus.c#3 integrate
.. //depot/projects/usiii/dev/if_ndis/if_ndis.c#5 integrate
.. //depot/projects/usiii/dev/ipw/if_ipw.c#5 integrate
.. //depot/projects/usiii/dev/iwi/if_iwi.c#5 integrate
.. //depot/projects/usiii/dev/iwn/if_iwn.c#1 branch
.. //depot/projects/usiii/dev/iwn/if_iwnreg.h#1 branch
.. //depot/projects/usiii/dev/iwn/if_iwnvar.h#1 branch
.. //depot/projects/usiii/dev/mii/brgphy.c#4 integrate
.. //depot/projects/usiii/dev/mii/brgphyreg.h#2 integrate
.. //depot/projects/usiii/dev/mii/ciphy.c#3 integrate
.. //depot/projects/usiii/dev/mii/miidevs#6 integrate
.. //depot/projects/usiii/dev/mpt/mpt.h#3 integrate
.. //depot/projects/usiii/dev/mpt/mpt_cam.c#3 integrate
.. //depot/projects/usiii/dev/mpt/mpt_raid.c#3 integrate
.. //depot/projects/usiii/dev/mpt/mpt_user.c#1 branch
.. //depot/projects/usiii/dev/ofw/ofw_console.c#4 integrate
.. //depot/projects/usiii/dev/pci/pcivar.h#5 integrate
.. //depot/projects/usiii/dev/ral/rt2560.c#7 integrate
.. //depot/projects/usiii/dev/ral/rt2661.c#7 integrate
.. //depot/projects/usiii/dev/scc/scc_bfe.h#3 integrate
.. //depot/projects/usiii/dev/scc/scc_bfe_ebus.c#2 integrate
.. //depot/projects/usiii/dev/scc/scc_bfe_macio.c#2 integrate
.. //depot/projects/usiii/dev/scc/scc_bfe_quicc.c#2 integrate
.. //depot/projects/usiii/dev/scc/scc_bfe_sbus.c#2 integrate
.. //depot/projects/usiii/dev/scc/scc_core.c#2 integrate
.. //depot/projects/usiii/dev/sio/sio.c#4 integrate
.. //depot/projects/usiii/dev/ti/if_ti.c#6 integrate
.. //depot/projects/usiii/dev/uart/uart_core.c#3 integrate
.. //depot/projects/usiii/dev/usb/if_rum.c#9 integrate
.. //depot/projects/usiii/dev/usb/if_zyd.c#8 integrate
.. //depot/projects/usiii/dev/usb/ums.c#4 integrate
.. //depot/projects/usiii/dev/usb/usbdevs#10 integrate
.. //depot/projects/usiii/dev/usb/uscanner.c#4 integrate
.. //depot/projects/usiii/dev/wi/if_wi.c#5 integrate
.. //depot/projects/usiii/dev/wpi/if_wpi.c#5 integrate
.. //depot/projects/usiii/fs/devfs/devfs_vnops.c#5 integrate
.. //depot/projects/usiii/fs/unionfs/union_subr.c#6 integrate
.. //depot/projects/usiii/i386/conf/GENERIC#9 integrate
.. //depot/projects/usiii/i386/conf/NOTES#6 integrate
.. //depot/projects/usiii/i386/cpufreq/est.c#6 integrate
.. //depot/projects/usiii/kern/kern_cpu.c#4 integrate
.. //depot/projects/usiii/kern/kern_descrip.c#8 integrate
.. //depot/projects/usiii/kern/kern_kthread.c#4 integrate
.. //depot/projects/usiii/kern/kern_thr.c#4 integrate
.. //depot/projects/usiii/kern/kern_umtx.c#5 integrate
.. //depot/projects/usiii/kern/subr_blist.c#2 integrate
.. //depot/projects/usiii/kern/subr_kdb.c#4 integrate
.. //depot/projects/usiii/kern/subr_witness.c#9 integrate
.. //depot/projects/usiii/kern/uipc_mbuf.c#5 integrate
.. //depot/projects/usiii/kern/uipc_syscalls.c#6 integrate
.. //depot/projects/usiii/kern/vfs_mount.c#8 integrate
.. //depot/projects/usiii/kern/vfs_subr.c#9 integrate
.. //depot/projects/usiii/mips/include/am29lv081b.h#2 delete
.. //depot/projects/usiii/mips/include/cp0.h#2 delete
.. //depot/projects/usiii/mips/include/float.h#2 integrate
.. //depot/projects/usiii/mips/include/pmap.h#2 integrate
.. //depot/projects/usiii/mips/mips/mips_subr.c#2 delete
.. //depot/projects/usiii/mips/mips/pmap.c#2 integrate
.. //depot/projects/usiii/modules/Makefile#10 integrate
.. //depot/projects/usiii/modules/cxgb/Makefile#5 integrate
.. //depot/projects/usiii/modules/cxgb/iw_cxgb/Makefile#1 branch
.. //depot/projects/usiii/modules/esp/Makefile#2 integrate
.. //depot/projects/usiii/modules/hfa/Makefile#2 integrate
.. //depot/projects/usiii/modules/hme/Makefile#2 integrate
.. //depot/projects/usiii/modules/isp/Makefile#2 integrate
.. //depot/projects/usiii/modules/ispfw/Makefile#2 integrate
.. //depot/projects/usiii/modules/iwn/Makefile#1 branch
.. //depot/projects/usiii/modules/iwnfw/Makefile#1 branch
.. //depot/projects/usiii/modules/le/Makefile#2 integrate
.. //depot/projects/usiii/modules/mpt/Makefile#2 integrate
.. //depot/projects/usiii/modules/rdma/Makefile#1 branch
.. //depot/projects/usiii/modules/rdma/addr/Makefile#1 branch
.. //depot/projects/usiii/modules/rdma/cma/Makefile#1 branch
.. //depot/projects/usiii/modules/rdma/core/Makefile#1 branch
.. //depot/projects/usiii/modules/rdma/iwcm/Makefile#1 branch
.. //depot/projects/usiii/modules/rdma/krping/Makefile#1 branch
.. //depot/projects/usiii/modules/scc/Makefile#2 integrate
.. //depot/projects/usiii/modules/sound/driver/Makefile#2 integrate
.. //depot/projects/usiii/modules/wlan/Makefile#3 integrate
.. //depot/projects/usiii/net/bpf.c#6 integrate
.. //depot/projects/usiii/net/if_ethersubr.c#6 integrate
.. //depot/projects/usiii/net80211/ieee80211.c#6 integrate
.. //depot/projects/usiii/net80211/ieee80211_node.c#6 integrate
.. //depot/projects/usiii/netinet/ip_fw.h#4 integrate
.. //depot/projects/usiii/netinet/libalias/alias.c#4 integrate
.. //depot/projects/usiii/netinet/tcp.h#4 integrate
.. //depot/projects/usiii/netinet/tcp_usrreq.c#7 integrate
.. //depot/projects/usiii/pc98/cbus/sio.c#5 integrate
.. //depot/projects/usiii/pc98/conf/GENERIC#8 integrate
.. //depot/projects/usiii/powerpc/aim/clock.c#4 integrate
.. //depot/projects/usiii/powerpc/aim/locore.S#5 integrate
.. //depot/projects/usiii/powerpc/aim/machdep.c#7 integrate
.. //depot/projects/usiii/powerpc/aim/mmu_oea.c#3 integrate
.. //depot/projects/usiii/powerpc/aim/mp_cpudep.c#1 branch
.. //depot/projects/usiii/powerpc/aim/swtch.S#3 integrate
.. //depot/projects/usiii/powerpc/aim/trap_subr.S#3 integrate
.. //depot/projects/usiii/powerpc/aim/vm_machdep.c#4 integrate
.. //depot/projects/usiii/powerpc/booke/pmap.c#2 integrate
.. //depot/projects/usiii/powerpc/booke/trap_subr.S#2 integrate
.. //depot/projects/usiii/powerpc/booke/vm_machdep.c#4 integrate
.. //depot/projects/usiii/powerpc/conf/MPC85XX#4 integrate
.. //depot/projects/usiii/powerpc/conf/NOTES#7 integrate
.. //depot/projects/usiii/powerpc/include/cpufunc.h#2 integrate
.. //depot/projects/usiii/powerpc/include/pcpu.h#3 integrate
.. //depot/projects/usiii/powerpc/include/smp.h#2 integrate
.. //depot/projects/usiii/powerpc/include/spr.h#4 integrate
.. //depot/projects/usiii/powerpc/mpc85xx/mpc85xx.c#1 branch
.. //depot/projects/usiii/powerpc/mpc85xx/ocpbus.c#3 integrate
.. //depot/projects/usiii/powerpc/mpc85xx/ocpbus.h#2 integrate
.. //depot/projects/usiii/powerpc/mpc85xx/pci_ocp.c#2 integrate
.. //depot/projects/usiii/powerpc/powermac/macio.c#3 integrate
.. //depot/projects/usiii/powerpc/powermac/maciovar.h#2 integrate
.. //depot/projects/usiii/powerpc/powerpc/intr_machdep.c#7 integrate
.. //depot/projects/usiii/powerpc/powerpc/mp_machdep.c#3 integrate
.. //depot/projects/usiii/powerpc/powerpc/openpic.c#4 integrate
.. //depot/projects/usiii/security/audit/audit.h#4 integrate
.. //depot/projects/usiii/sparc64/conf/GENERIC#8 integrate
.. //depot/projects/usiii/sparc64/include/bus_common.h#4 integrate
.. //depot/projects/usiii/sparc64/include/iommuvar.h#2 integrate
.. //depot/projects/usiii/sparc64/pci/ofw_pcibus.c#7 integrate
.. //depot/projects/usiii/sparc64/pci/psycho.c#10 integrate
.. //depot/projects/usiii/sparc64/pci/schizo.c#8 edit
.. //depot/projects/usiii/sparc64/pci/schizoreg.h#2 edit
.. //depot/projects/usiii/sparc64/sbus/sbus.c#5 integrate
.. //depot/projects/usiii/sparc64/sparc64/counter.c#2 integrate
.. //depot/projects/usiii/sparc64/sparc64/iommu.c#3 integrate
.. //depot/projects/usiii/sun4v/include/bus_common.h#2 delete
.. //depot/projects/usiii/sun4v/sun4v/hvcons.c#3 integrate
.. //depot/projects/usiii/sun4v/sun4v/nexus.c#2 integrate
.. //depot/projects/usiii/sun4v/sun4v/vnex.c#2 integrate
.. //depot/projects/usiii/sys/blist.h#2 integrate
.. //depot/projects/usiii/sys/kdb.h#3 integrate
.. //depot/projects/usiii/sys/mbuf.h#5 integrate
.. //depot/projects/usiii/sys/mount.h#4 integrate
.. //depot/projects/usiii/sys/mpt_ioctl.h#1 branch
.. //depot/projects/usiii/sys/umtx.h#4 integrate
.. //depot/projects/usiii/sys/user.h#6 integrate
.. //depot/projects/usiii/vm/swap_pager.c#4 integrate
.. //depot/projects/usiii/vm/vm_kern.c#5 integrate
.. //depot/projects/usiii/vm/vm_map.c#7 integrate
.. //depot/projects/usiii/vm/vm_map.h#4 integrate
.. //depot/projects/usiii/vm/vm_mmap.c#5 integrate

Differences ...

==== //depot/projects/usiii/amd64/conf/GENERIC#9 (text+ko) ====

@@ -16,7 +16,7 @@
 # If you are in doubt as to the purpose or necessity of a line, check first
 # in NOTES.
 #
-# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.497 2008/04/20 20:35:34 sam Exp $
+# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.498 2008/05/03 17:05:38 sam Exp $
 
 cpu		HAMMER
 ident		GENERIC
@@ -235,6 +235,8 @@
 
 # Wireless NIC cards
 device		wlan		# 802.11 support
+options		IEEE80211_DEBUG	# enable debug msgs
+options		IEEE80211_AMPDU_AGE	# age frames in AMPDU reorder q's
 device		wlan_wep	# 802.11 WEP support
 device		wlan_ccmp	# 802.11 CCMP support
 device		wlan_tkip	# 802.11 TKIP support

==== //depot/projects/usiii/amd64/conf/NOTES#6 (text+ko) ====

@@ -4,7 +4,7 @@
 # This file contains machine dependent kernel configuration notes.  For
 # machine independent notes, look in /sys/conf/NOTES.
 #
-# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.78 2008/04/12 14:20:22 rpaulo Exp $
+# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.79 2008/04/29 21:36:15 sam Exp $
 #
 
 #
@@ -302,6 +302,7 @@
 #       (requires miibus)
 # ipw:	Intel PRO/Wireless 2100 IEEE 802.11 adapter
 # iwi:	Intel PRO/Wireless 2200BG/2225BG/2915ABG IEEE 802.11 adapters
+# iwn:	Intel Wireless WiFi Link 4965AGN 802.11 network adapters
 # nfe:	nVidia nForce MCP on-board Ethernet Networking (BSD open source)
 # nve:	nVidia nForce MCP on-board Ethernet Networking
 # ral:	Ralink Technology IEEE 802.11 wireless adapter
@@ -313,6 +314,7 @@
 options 	ED_HPP
 options 	ED_SIC
 device		iwi
+device		iwn
 device		ipw
 device		nfe		# nVidia nForce MCP on-board Ethernet Networking
 device		nve		# nVidia nForce MCP on-board Ethernet Networking

==== //depot/projects/usiii/arm/at91/uart_dev_at91usart.c#3 (text) ====

@@ -26,7 +26,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/arm/at91/uart_dev_at91usart.c,v 1.13 2007/12/25 17:51:55 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/at91/uart_dev_at91usart.c,v 1.14 2008/05/04 23:29:37 peter Exp $");
 
 #include "opt_comconsole.h"
 
@@ -506,9 +506,20 @@
 at91_rx_put(struct uart_softc *sc, int key)
 {
 #if defined(KDB) && defined(ALT_BREAK_TO_DEBUGGER)
+	int kdb_brk;
+
 	if (sc->sc_sysdev != NULL && sc->sc_sysdev->type == UART_DEV_CONSOLE) {
-		if (kdb_alt_break(key, &sc->sc_altbrk))
-			kdb_enter(KDB_WHY_BREAK, "Break sequence to console");
+		if ((kdb_brk = kdb_alt_break(key, &sc->sc_altbrk)) != 0) {
+		case KDB_REQ_DEBUGGER:
+			kdb_enter(KDB_WHY_BREAK, "Break sequence on console");
+			break;
+		case KDB_REQ_PANIC:
+			kdb_panic("Panic sequence on console");
+			break;
+		case KDB_REQ_REBOOT:
+			kdb_reboot();
+			break;
+		}
 	}
 #endif
 	uart_rx_put(sc, key);	

==== //depot/projects/usiii/conf/NOTES#10 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/NOTES,v 1.1481 2008/04/20 20:35:35 sam Exp $
+# $FreeBSD: src/sys/conf/NOTES,v 1.1484 2008/05/06 22:41:23 julian Exp $
 #
 # NOTES -- Lines that can be cut/pasted into kernel and hints configs.
 #
@@ -762,6 +762,8 @@
 device		ether			#Generic Ethernet
 device		vlan			#VLAN support (needs miibus)
 device		wlan			#802.11 support
+options		IEEE80211_DEBUG		#enable debugging msgs
+options		IEEE80211_AMPDU_AGE	#age frames in AMPDU reorder q's
 device		wlan_wep		#802.11 WEP support
 device		wlan_ccmp		#802.11 CCMP support
 device		wlan_tkip		#802.11 TKIP support
@@ -868,7 +870,12 @@
 # The MBUF_STRESS_TEST option enables options which create
 # various random failures / extreme cases related to mbuf
 # functions.  See mbuf(9) for a list of available test cases.
+# MBUF_PROFILING enables code to profile the mbuf chains
+# exiting the system (via participating interfaces) and
+# return a logarithmic histogram of monitored parameters
+# (e.g. packet size, wasted space, number of mbufs in chain).
 options 	MBUF_STRESS_TEST
+options		MBUF_PROFILING
 
 # Statically Link in accept filters
 options 	ACCEPT_FILTER_DATA

==== //depot/projects/usiii/conf/files#11 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.1295 2008/04/25 20:42:48 sam Exp $
+# $FreeBSD: src/sys/conf/files,v 1.1297 2008/05/06 20:49:52 jhb Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -830,6 +830,21 @@
 	compile-with	"uudecode -o ${.TARGET} $S/contrib/dev/iwi/ipw2200-sniffer.fw.uu" \
 	no-obj no-implicit-rule						\
 	clean		"iwi_monitor.fw"
+dev/iwn/if_iwn.c		optional iwn
+iwnfw.c			optional iwnfw					\
+	compile-with	"${AWK} -f $S/tools/fw_stub.awk iwn.fw:iwnfw:44417 -lintel_iwn -miwn -c${.TARGET}" \
+	no-implicit-rule before-depend local				\
+	clean		"iwnfw.c"
+iwnfw.fwo			optional iwnfw				\
+	dependency	"iwn.fw"					\
+	compile-with	"${LD} -b binary -d -warn-common -r -d -o ${.TARGET} iwn.fw" \
+	no-implicit-rule						\
+	clean		"iwn.fwo"
+iwn.fw			optional iwnfw					\
+	dependency	".PHONY"					\
+	compile-with	"uudecode -o ${.TARGET} $S/contrib/dev/iwn/iwlwifi-4965-4.44.17.fw.uu"	\
+	no-obj no-implicit-rule						\
+	clean		"iwn.fw"
 dev/ixgb/if_ixgb.c		optional ixgb
 dev/ixgb/ixgb_ee.c		optional ixgb
 dev/ixgb/ixgb_hw.c		optional ixgb
@@ -916,6 +931,7 @@
 dev/mpt/mpt_debug.c		optional mpt
 dev/mpt/mpt_pci.c		optional mpt pci
 dev/mpt/mpt_raid.c		optional mpt
+dev/mpt/mpt_user.c		optional mpt
 dev/msk/if_msk.c		optional msk
 dev/mxge/if_mxge.c		optional mxge pci
 dev/mxge/mxge_lro.c		optional mxge pci

==== //depot/projects/usiii/conf/files.powerpc#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.powerpc,v 1.74 2008/03/03 20:40:19 raj Exp $
+# $FreeBSD: src/sys/conf/files.powerpc,v 1.77 2008/04/30 00:50:50 marcel Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -68,6 +68,7 @@
 powerpc/aim/locore.S		optional	aim no-obj
 powerpc/aim/machdep.c		optional	aim
 powerpc/aim/mmu_oea.c		optional	aim
+powerpc/aim/mp_cpudep.c		optional	aim smp
 powerpc/aim/nexus.c		optional	aim
 powerpc/aim/ofw_machdep.c	optional	aim
 powerpc/aim/ofwmagic.S		optional	aim
@@ -96,6 +97,7 @@
 powerpc/fpu/fpu_mul.c		optional	fpu_emu
 powerpc/fpu/fpu_sqrt.c		optional	fpu_emu
 powerpc/fpu/fpu_subr.c		optional	fpu_emu
+powerpc/mpc85xx/mpc85xx.c	optional	mpc85xx
 powerpc/mpc85xx/nexus.c		optional	mpc85xx
 powerpc/mpc85xx/ocpbus.c	optional	mpc85xx
 powerpc/mpc85xx/opic.c		optional	mpc85xx
@@ -130,7 +132,7 @@
 powerpc/powerpc/intr_machdep.c	standard
 powerpc/powerpc/mem.c		optional	mem
 powerpc/powerpc/mmu_if.m	standard
-powerpc/powerpc/mp_machdep.c	optional	smp aim
+powerpc/powerpc/mp_machdep.c	optional	smp
 powerpc/powerpc/openpic.c	standard
 powerpc/powerpc/pic_if.m	standard
 powerpc/powerpc/pmap_dispatch.c	standard

==== //depot/projects/usiii/conf/files.sun4v#4 (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.sun4v,v 1.14 2008/04/26 11:01:37 marius Exp $
+# $FreeBSD: src/sys/conf/files.sun4v,v 1.15 2008/05/02 17:41:52 marius Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -35,7 +35,6 @@
 sparc64/sparc64/autoconf.c	standard
 sun4v/sun4v/bus_machdep.c	standard
 sparc64/sparc64/clock.c		standard
-sparc64/sparc64/counter.c	standard
 sparc64/sparc64/db_disasm.c	optional	ddb
 sun4v/sun4v/db_interface.c	optional	ddb
 sun4v/sun4v/db_trace.c		optional	ddb

==== //depot/projects/usiii/conf/kern.mk#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/kern.mk,v 1.52 2007/05/24 21:53:42 obrien Exp $
+# $FreeBSD: src/sys/conf/kern.mk,v 1.53 2008/04/29 11:28:10 gonzo Exp $
 
 #
 # Warning flags for compiling the kernel and components of the kernel.
@@ -85,6 +85,15 @@
 .endif
 
 #
+# For MIPS we also tell gcc to use floating point emulation and 
+# disable MIPS DSP ASE Instruction set.
+#
+.if ${MACHINE_ARCH} == "mips"
+CFLAGS+=	-msoft-float -mno-dsp
+INLINE_LIMIT?=	15000
+.endif
+
+#
 # GCC 3.0 and above like to do certain optimizations based on the
 # assumption that the program is linked against libc.  Stop this.
 #

==== //depot/projects/usiii/conf/ldscript.mips#2 (text+ko) ====

@@ -1,5 +1,5 @@
-/* $FreeBSD: src/sys/conf/ldscript.mips,v 1.1 2008/04/13 06:25:43 imp Exp $ */
-OUTPUT_FORMAT("elf32-bigmips", "elf32-bigmips", "elf32-littlemips")
+/* $FreeBSD: src/sys/conf/ldscript.mips,v 1.2 2008/04/30 12:44:58 gonzo Exp $ */
+OUTPUT_FORMAT("elf32-tradbigmips", "elf32-tradbigmips", "elf32-tradlittlemips")
 OUTPUT_ARCH(mips)
 ENTRY(_start)
 SEARCH_DIR(/usr/lib);

==== //depot/projects/usiii/conf/ldscript.mips.cfe#2 (text+ko) ====

@@ -2,8 +2,8 @@
  * This linker script is needed to build a kernel for use by Broadcom CFE.
  */
 
-/* $FreeBSD: src/sys/conf/ldscript.mips.cfe,v 1.1 2008/04/13 06:25:43 imp Exp $ */
-OUTPUT_FORMAT("elf32-bigmips", "elf32-bigmips", "elf32-littlemips")
+/* $FreeBSD: src/sys/conf/ldscript.mips.cfe,v 1.2 2008/04/30 12:44:58 gonzo Exp $ */
+OUTPUT_FORMAT("elf32-tradbigmips", "elf32-tradbigmips", "elf32-tradlittlemips")
 OUTPUT_ARCH(mips)
 ENTRY(_start)
 SEARCH_DIR(/usr/lib);

==== //depot/projects/usiii/conf/options#10 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options,v 1.626 2008/04/20 20:35:35 sam Exp $
+# $FreeBSD: src/sys/conf/options,v 1.627 2008/04/29 21:23:21 julian Exp $
 #
 #        On the handling of kernel options
 #
@@ -388,6 +388,7 @@
 LIBMCHAIN
 LIBALIAS
 MBUF_STRESS_TEST
+MBUF_PROFILING
 NCP
 NETATALK		opt_atalk.h
 PPP_BSDCOMP		opt_ppp.h

==== //depot/projects/usiii/dev/ata/ata-disk.c#5 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/ata/ata-disk.c,v 1.210 2008/04/17 12:29:35 sos Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-disk.c,v 1.211 2008/05/08 17:55:44 grehan Exp $");
 
 #include "opt_ata.h"
 #include 
@@ -125,7 +125,7 @@
     adp->disk->d_dump = ad_dump;
     adp->disk->d_name = "ad";
     adp->disk->d_drv1 = dev;
-    adp->disk->d_maxsize = ch->dma.max_iosize;
+    adp->disk->d_maxsize = ch->dma.max_iosize ? ch->dma.max_iosize : DFLTPHYS;
     adp->disk->d_sectorsize = DEV_BSIZE;
     adp->disk->d_mediasize = DEV_BSIZE * (off_t)adp->total_secs;
     adp->disk->d_fwsectors = adp->sectors;

==== //depot/projects/usiii/dev/ata/ata-lowlevel.c#4 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/ata/ata-lowlevel.c,v 1.83 2008/04/17 12:29:35 sos Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-lowlevel.c,v 1.84 2008/05/08 17:55:44 grehan Exp $");
 
 #include "opt_ata.h"
 #include 
@@ -213,7 +213,9 @@
     printf("ata_begin_transaction OOPS!!!\n");
 
 begin_finished:
-    ch->dma.unload(request);
+    if (ch->dma.unload) {
+        ch->dma.unload(request);
+    }
     return ATA_OP_FINISHED;
 
 begin_continue:

==== //depot/projects/usiii/dev/ata/atapi-cd.c#4 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.199 2008/04/17 12:29:35 sos Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.200 2008/05/08 17:55:44 grehan Exp $");
 
 #include "opt_ata.h"
 #include 
@@ -906,8 +906,11 @@
 {
     struct ata_channel *ch = device_get_softc(device_get_parent(dev));
     struct acd_softc *cdp = device_get_ivars(dev);
+    uint32_t max_iosize;
 
-    cdp->iomax = min(ch->dma.max_iosize, 65534);
+    max_iosize = ch->dma.max_iosize ? ch->dma.max_iosize : DFLTPHYS;
+
+    cdp->iomax = min(max_iosize, 65534);
 }
 
 static void 

==== //depot/projects/usiii/dev/ata/atapi-fd.c#4 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-fd.c,v 1.114 2008/04/17 12:29:35 sos Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-fd.c,v 1.115 2008/05/08 17:55:44 grehan Exp $");
 
 #include 
 #include 
@@ -105,7 +105,7 @@
     fdp->disk->d_ioctl = afd_ioctl;
     fdp->disk->d_name = "afd";
     fdp->disk->d_drv1 = dev;
-    fdp->disk->d_maxsize = ch->dma.max_iosize;
+    fdp->disk->d_maxsize = ch->dma.max_iosize ? ch->dma.max_iosize : DFLTPHYS;
     fdp->disk->d_unit = device_get_unit(dev);
     disk_create(fdp->disk, DISK_VERSION);
     return 0;

==== //depot/projects/usiii/dev/ata/atapi-tape.c#4 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-tape.c,v 1.107 2008/04/17 12:29:35 sos Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-tape.c,v 1.108 2008/05/08 17:55:44 grehan Exp $");
 
 #include "opt_ata.h"
 #include 
@@ -142,7 +142,7 @@
 		      UID_ROOT, GID_OPERATOR, 0640, "ast%d",
 		      device_get_unit(dev));
     device->si_drv1 = dev;
-    device->si_iosize_max = ch->dma.max_iosize;
+    device->si_iosize_max = ch->dma.max_iosize ? ch->dma.max_iosize : DFLTPHYS;
     stp->dev1 = device;
     device = make_dev(&ast_cdevsw, 2 * device_get_unit(dev) + 1,
 		      UID_ROOT, GID_OPERATOR, 0640, "nast%d",

==== //depot/projects/usiii/dev/ath/if_ath.c#7 (text+ko) ====

@@ -28,7 +28,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.180 2008/04/20 20:35:35 sam Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.185 2008/05/03 21:55:02 sam Exp $");
 
 /*
  * Driver for the Atheros Wireless LAN controller.
@@ -85,6 +85,11 @@
 #endif
 
 /*
+ * We require a HAL w/ the changes for split tx/rx MIC.
+ */
+CTASSERT(HAL_ABI_VERSION > 0x06052200);
+
+/*
  * ATH_BCBUF determines the number of vap's that can transmit
  * beacons and also (currently) the number of vap's that can
  * have unique mac addresses/bssid.  When staggering beacons
@@ -2067,13 +2072,11 @@
 		printf(" %s ", sc->sc_splitmic ? "mic" : "rxmic");
 		for (i = 0; i < sizeof(hk->kv_mic); i++)
 			printf("%02x", hk->kv_mic[i]);
-#if HAL_ABI_VERSION > 0x06052200
 		if (!sc->sc_splitmic) {
 			printf(" txmic ");
 			for (i = 0; i < sizeof(hk->kv_txmic); i++)
 				printf("%02x", hk->kv_txmic[i]);
 		}
-#endif
 	}
 	printf("\n");
 }
@@ -2116,18 +2119,19 @@
 			 * will handle the rest.
 			 */
 			memcpy(hk->kv_mic, k->wk_rxmic, sizeof(hk->kv_mic));
-#if HAL_ABI_VERSION > 0x06052200
 			memcpy(hk->kv_txmic, k->wk_txmic, sizeof(hk->kv_txmic));
-#endif
 			KEYPRINTF(sc, k->wk_keyix, hk, mac);
 			return ath_hal_keyset(ah, k->wk_keyix, hk, mac);
 		}
 	} else if (k->wk_flags & IEEE80211_KEY_XMIT) {
-#if HAL_ABI_VERSION > 0x06052200
-		memcpy(hk->kv_txmic, k->wk_txmic, sizeof(hk->kv_txmic));
-#else
-		memcpy(hk->kv_mic, k->wk_mic, sizeof(hk->kv_mic));
-#endif
+		if (sc->sc_splitmic) {
+			/*
+			 * NB: must pass MIC key in expected location when
+			 * the keycache only holds one MIC key per entry.
+			 */
+			memcpy(hk->kv_mic, k->wk_txmic, sizeof(hk->kv_txmic));
+		} else
+			memcpy(hk->kv_txmic, k->wk_txmic, sizeof(hk->kv_txmic));
 		KEYPRINTF(sc, k->wk_keyix, hk, mac);
 		return ath_hal_keyset(ah, k->wk_keyix, hk, mac);
 	} else if (k->wk_flags & IEEE80211_KEY_RECV) {
@@ -5920,7 +5924,12 @@
 	ath_hal_setregdomain(ah, 0);
 	/* XXX not quite right but close enough for now */
 	getchannels(sc, nchans, chans, CTRY_DEBUG, AH_TRUE, AH_FALSE);
+
+	/* NB: restore previous state */
 	ath_hal_setregdomain(ah, ord);
+	(void) getchannels(sc, NULL, NULL, ic->ic_regdomain.country,
+	     ic->ic_regdomain.ecm ? AH_TRUE : AH_FALSE,
+	     ic->ic_regdomain.location == 'O' ? AH_TRUE : AH_FALSE);
 }
 
 static int
@@ -5936,7 +5945,6 @@
 	struct ifnet *ifp = sc->sc_ifp;
 	struct ieee80211com *ic = ifp->if_l2com;
 	struct ath_hal *ah = sc->sc_ah;
-	u_int32_t rd, cc;
 	int error;
 
 	/*
@@ -5944,19 +5952,19 @@
 	 */
 	error = getchannels(sc, &ic->ic_nchans, ic->ic_channels,
 	    CTRY_DEFAULT, AH_TRUE, AH_FALSE);
-	(void) ath_hal_getregdomain(ah, &rd);
-	ath_hal_getcountrycode(ah, &cc);	/* NB: cannot fail */
+	(void) ath_hal_getregdomain(ah, &sc->sc_eerd);
+	ath_hal_getcountrycode(ah, &sc->sc_eecc);	/* NB: cannot fail */
 	if (error) {
 		if_printf(ifp, "%s: unable to collect channel list from hal, "
 		    "error %d\n", __func__, error);
 		if (error == EINVAL) {
 			if_printf(ifp, "%s: regdomain likely %u country code %u\n",
-			    __func__, rd, cc);
+			    __func__, sc->sc_eerd, sc->sc_eecc);
 		}
 		return error;
 	}
-	ic->ic_regdomain.regdomain = ath_mapregdomain(sc, rd);
-	ic->ic_regdomain.country = cc;
+	ic->ic_regdomain.regdomain = ath_mapregdomain(sc, sc->sc_eerd);
+	ic->ic_regdomain.country = sc->sc_eecc;
 	ic->ic_regdomain.ecm = 1;
 	ic->ic_regdomain.location = 'I';
 	ic->ic_regdomain.isocc[0] = ' ';	/* XXX don't know */
@@ -6272,9 +6280,9 @@
 	struct ifreq *ifr = (struct ifreq *)data;
 	int error = 0;
 
-	ATH_LOCK(sc);
 	switch (cmd) {
 	case SIOCSIFFLAGS:
+		ATH_LOCK(sc);
 		if (IS_RUNNING(ifp)) {
 			/*
 			 * To avoid rescanning another access point,
@@ -6296,17 +6304,8 @@
 				ath_init(sc);	/* XXX lose error */
 		} else
 			ath_stop_locked(ifp);
+		ATH_UNLOCK(sc);
 		break;
-	case SIOCADDMULTI:
-	case SIOCDELMULTI:
-		/*
-		 * The upper layer has already installed/removed
-		 * the multicast address(es), just recalculate the
-		 * multicast filter for the card.
-		 */
-		if (ifp->if_drv_flags & IFF_DRV_RUNNING)
-			ath_mode_init(sc);
-		break;
 	case SIOCGIFMEDIA:
 	case SIOCSIFMEDIA:
 		error = ifmedia_ioctl(ifp, ifr, &ic->ic_media, cmd);
@@ -6320,27 +6319,20 @@
 			&sc->sc_stats.ast_rx_noise);
 #endif
 		sc->sc_stats.ast_tx_rate = sc->sc_hwmap[sc->sc_txrate].ieeerate;
-		ATH_UNLOCK(sc);
-		/*
-		 * NB: Drop the softc lock in case of a page fault;
-		 * we'll accept any potential inconsisentcy in the
-		 * statistics.  The alternative is to copy the data
-		 * to a local structure.
-		 */
 		return copyout(&sc->sc_stats,
-				ifr->ifr_data, sizeof (sc->sc_stats));
+		    ifr->ifr_data, sizeof (sc->sc_stats));
 #ifdef ATH_DIAGAPI
 	case SIOCGATHDIAG:
-		ATH_UNLOCK(sc);
 		error = ath_ioctl_diag(sc, (struct ath_diag *) ifr);
-		ATH_LOCK(sc);
 		break;
 #endif
+	case SIOCGIFADDR:
+		error = ether_ioctl(ifp, cmd, data);
+		break;
 	default:
-		error = ether_ioctl(ifp, cmd, data);
+		error = EINVAL;
 		break;
 	}
-	ATH_UNLOCK(sc);
 	return error;
 #undef IS_RUNNING
 }
@@ -6596,6 +6588,12 @@
 	struct sysctl_oid *tree = device_get_sysctl_tree(sc->sc_dev);
 	struct ath_hal *ah = sc->sc_ah;
 
+	SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
+		"countrycode", CTLFLAG_RD, &sc->sc_eecc, 0,
+		"EEPROM country code");
+	SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
+		"regdomain", CTLFLAG_RD, &sc->sc_eerd, 0,
+		"EEPROM regdomain code");
 #ifdef	ATH_DEBUG
 	sc->sc_debug = ath_debug;
 	SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,

==== //depot/projects/usiii/dev/ath/if_athvar.h#3 (text+ko) ====

@@ -26,7 +26,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  *
- * $FreeBSD: src/sys/dev/ath/if_athvar.h,v 1.63 2008/04/20 20:35:35 sam Exp $
+ * $FreeBSD: src/sys/dev/ath/if_athvar.h,v 1.64 2008/05/03 21:52:05 sam Exp $
  */
 
 /*
@@ -246,6 +246,8 @@
 				sc_swbmiss  : 1,/* sta mode using sw bmiss */
 				sc_stagbeacons:1,/* use staggered beacons */
 				sc_wmetkipmic:1;/* can do WME+TKIP MIC */
+	uint32_t		sc_eerd;	/* regdomain from EEPROM */
+	uint32_t		sc_eecc;	/* country code from EEPROM */
 						/* rate tables */
 #define	IEEE80211_MODE_HALF	(IEEE80211_MODE_MAX+0)
 #define	IEEE80211_MODE_QUARTER	(IEEE80211_MODE_MAX+1)

==== //depot/projects/usiii/dev/bce/if_bce.c#5 (text) ====

@@ -29,7 +29,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.37 2008/04/11 23:10:40 davidch Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.39 2008/05/08 15:05:38 scottl Exp $");
 
 /*
  * The following controllers are supported by this driver:
@@ -502,7 +502,7 @@
 	/* Allocate PCI memory resources. */
 	rid = PCIR_BAR(0);
 	sc->bce_res_mem = bus_alloc_resource_any(dev, SYS_RES_MEMORY,
-		&rid, RF_ACTIVE | PCI_RF_DENSE);
+		&rid, RF_ACTIVE);
 
 	if (sc->bce_res_mem == NULL) {
 		BCE_PRINTF("%s(%d): PCI memory allocation failed\n", 
@@ -776,7 +776,11 @@
 	ifp->if_capenable    = ifp->if_capabilities;
 
 	/* Use standard mbuf sizes for buffer allocation. */
+#ifdef BCE_USE_SPLIT_HEADER
 	sc->rx_bd_mbuf_alloc_size = MHLEN;
+#else
+	sc->rx_bd_mbuf_alloc_size = MCLBYTES;;
+#endif
 	sc->pg_bd_mbuf_alloc_size = MCLBYTES;
 
 	ifp->if_snd.ifq_drv_maxlen = USABLE_TX_BD;
@@ -3804,7 +3808,11 @@
 			goto bce_get_rx_buf_exit);
 
 		/* This is a new mbuf allocation. */
+#ifdef BCE_USE_SPLIT_HEADER
 		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
+#else
+		m_new = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
+#endif
 		if (m_new == NULL) {
 			sc->mbuf_alloc_failed++;
 			rc = ENOBUFS;

==== //depot/projects/usiii/dev/bfe/if_bfe.c#4 (text+ko) ====

@@ -26,7 +26,7 @@
 
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/bfe/if_bfe.c,v 1.44 2008/01/29 02:15:11 yongari Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/bfe/if_bfe.c,v 1.45 2008/04/30 02:49:24 yongari Exp $");
 
 #include 
 #include 
@@ -646,16 +646,18 @@
 	struct bfe_desc *d;
 	struct bfe_data *r;
 	u_int32_t ctrl;
-	int error;
+	int allocated, error;
 
 	if ((c < 0) || (c >= BFE_RX_LIST_CNT))
 		return (EINVAL);
 
+	allocated = 0;
 	if(m == NULL) {
 		m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
 		if(m == NULL)
 			return (ENOBUFS);
 		m->m_len = m->m_pkthdr.len = MCLBYTES;
+		allocated++;
 	}
 	else
 		m->m_data = m->m_ext.ext_buf;
@@ -670,8 +672,14 @@
 	r = &sc->bfe_rx_ring[c];
 	error = bus_dmamap_load(sc->bfe_tag, r->bfe_map, mtod(m, void *),
 			MCLBYTES, bfe_dma_map_desc, d, BUS_DMA_NOWAIT);
-	if (error)
-		printf("Serious error: bfe failed to map RX buffer\n");
+	if (error != 0) {
+		if (allocated != 0)
+			m_free(m);
+		if (error != ENOMEM)
+			printf("bfe%d: failed to map RX buffer, error %d\n",
+			    sc->bfe_unit, error);
+		return (ENOBUFS);
+	}
 	bus_dmamap_sync(sc->bfe_tag, r->bfe_map, BUS_DMASYNC_PREWRITE);
 
 	ctrl = ETHER_MAX_LEN + 32;

==== //depot/projects/usiii/dev/bge/if_bge.c#10 (text+ko) ====

@@ -32,7 +32,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.206 2008/04/26 10:54:17 marius Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.210 2008/05/05 18:42:17 bz Exp $");
 
 /*
  * Broadcom BCM570x family gigabit ethernet driver for FreeBSD.
@@ -196,6 +196,8 @@
 	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5901 },
 	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5901A2 },
 	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5903M },
+	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5906 },
+	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM5906M },
 
 	{ SK_VENDORID,		SK_DEVICEID_ALTIMA },
 
@@ -273,6 +275,8 @@
 	{ BGE_CHIPID_BCM5787_A0,	"BCM5754/5787 A0" }, 
 	{ BGE_CHIPID_BCM5787_A1,	"BCM5754/5787 A1" },
 	{ BGE_CHIPID_BCM5787_A2,	"BCM5754/5787 A2" },
+	{ BGE_CHIPID_BCM5906_A1,	"BCM5906 A1" },
+	{ BGE_CHIPID_BCM5906_A2,	"BCM5906 A2" },
 
 	{ 0, NULL }
 };
@@ -295,6 +299,7 @@
 	{ BGE_ASICREV_BCM5755,		"unknown BCM5755" },
 	/* 5754 and 5787 share the same ASIC ID */
 	{ BGE_ASICREV_BCM5787,		"unknown BCM5754/5787" },
+	{ BGE_ASICREV_BCM5906,		"unknown BCM5906" },
 
 	{ 0, NULL }
 };
@@ -307,6 +312,9 @@
 
 const struct bge_revision * bge_lookup_rev(uint32_t);
 const struct bge_vendor * bge_lookup_vendor(uint16_t);
+
+typedef int	(*bge_eaddr_fcn_t)(struct bge_softc *, uint8_t[]);
+
 static int bge_probe(device_t);
 static int bge_attach(device_t);
 static int bge_detach(device_t);
@@ -317,6 +325,11 @@
 static int bge_dma_alloc(device_t);
 static void bge_dma_free(struct bge_softc *);
 
+static int bge_get_eaddr_mem(struct bge_softc *, uint8_t[]);
+static int bge_get_eaddr_nvram(struct bge_softc *, uint8_t[]);
+static int bge_get_eaddr_eeprom(struct bge_softc *, uint8_t[]);
+static int bge_get_eaddr(struct bge_softc *, uint8_t[]);
+
 static void bge_txeof(struct bge_softc *);
 static void bge_rxeof(struct bge_softc *);

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Thu May  8 20:43:35 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1D5BC1065671; Thu,  8 May 2008 20:43:35 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9D697106566B
	for ; Thu,  8 May 2008 20:43:34 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 8A28F8FC0A
	for ; Thu,  8 May 2008 20:43:34 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m48KhYAP091640
	for ; Thu, 8 May 2008 20:43:34 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m48KhSdS091630
	for perforce@freebsd.org; Thu, 8 May 2008 20:43:28 GMT
	(envelope-from jb@freebsd.org)
Date: Thu, 8 May 2008 20:43:28 GMT
Message-Id: <200805082043.m48KhSdS091630@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 141335 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Thu, 08 May 2008 20:43:35 -0000

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

Change 141335 by jb@freebsd3 on 2008/05/08 20:43:03

	IFC

Affected files ...

.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#73 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#17 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#12 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#7 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/printing/chapter.sgml#15 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml#22 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/serialcomms/chapter.sgml#9 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#73 integrate
.. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/linux-users/article.sgml#2 integrate
.. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/disks/chapter.sgml#5 integrate
.. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/kernelconfig/chapter.sgml#5 integrate
.. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/ppp-and-slip/chapter.sgml#3 integrate
.. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/printing/chapter.sgml#9 integrate
.. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/security/chapter.sgml#6 integrate
.. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/serialcomms/chapter.sgml#3 integrate
.. //depot/projects/dtrace/doc/share/pgpkeys/itetcu.key#3 integrate
.. //depot/projects/dtrace/doc/share/pgpkeys/trhodes.key#3 integrate
.. //depot/projects/dtrace/doc/share/sgml/mirrors.xml#13 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/disks/chapter.sgml#15 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/printing/chapter.sgml#11 integrate
.. //depot/projects/dtrace/ports/MOVED#83 integrate
.. //depot/projects/dtrace/ports/Mk/bsd.gcc.mk#8 integrate
.. //depot/projects/dtrace/ports/Mk/bsd.gnustep.mk#14 integrate
.. //depot/projects/dtrace/ports/Tools/scripts/README#5 integrate
.. //depot/projects/dtrace/ports/Tools/scripts/ardiff#1 branch
.. //depot/projects/dtrace/ports/UPDATING#70 integrate
.. //depot/projects/dtrace/src/Makefile.inc1#45 integrate
.. //depot/projects/dtrace/src/contrib/com_err/ChangeLog#4 integrate
.. //depot/projects/dtrace/src/contrib/com_err/Makefile.am#4 integrate
.. //depot/projects/dtrace/src/contrib/com_err/Makefile.in#4 integrate
.. //depot/projects/dtrace/src/contrib/com_err/com_err.c#4 integrate
.. //depot/projects/dtrace/src/contrib/com_err/com_err.h#4 integrate
.. //depot/projects/dtrace/src/contrib/com_err/com_right.h#4 integrate
.. //depot/projects/dtrace/src/contrib/com_err/compile_et.c#4 integrate
.. //depot/projects/dtrace/src/contrib/com_err/compile_et.h#4 integrate
.. //depot/projects/dtrace/src/contrib/com_err/error.c#4 integrate
.. //depot/projects/dtrace/src/contrib/com_err/lex.c#1 branch
.. //depot/projects/dtrace/src/contrib/com_err/lex.h#4 integrate
.. //depot/projects/dtrace/src/contrib/com_err/lex.l#4 integrate
.. //depot/projects/dtrace/src/contrib/com_err/parse.c#1 branch
.. //depot/projects/dtrace/src/contrib/com_err/parse.h#1 branch
.. //depot/projects/dtrace/src/contrib/com_err/parse.y#4 integrate
.. //depot/projects/dtrace/src/contrib/com_err/roken_rename.h#4 integrate
.. //depot/projects/dtrace/src/contrib/com_err/version-script.map#1 branch
.. //depot/projects/dtrace/src/contrib/expat/COPYING#4 integrate
.. //depot/projects/dtrace/src/contrib/expat/Changes#4 integrate
.. //depot/projects/dtrace/src/contrib/expat/FREEBSD-upgrade#4 integrate
.. //depot/projects/dtrace/src/contrib/expat/MANIFEST#4 integrate
.. //depot/projects/dtrace/src/contrib/expat/Makefile.in#4 integrate
.. //depot/projects/dtrace/src/contrib/expat/README#4 integrate
.. //depot/projects/dtrace/src/contrib/expat/configure#4 integrate
.. //depot/projects/dtrace/src/contrib/expat/configure.in#4 integrate
.. //depot/projects/dtrace/src/contrib/expat/doc/expat.png#1 branch
.. //depot/projects/dtrace/src/contrib/expat/doc/reference.html#4 integrate
.. //depot/projects/dtrace/src/contrib/expat/doc/style.css#4 integrate
.. //depot/projects/dtrace/src/contrib/expat/doc/valid-xhtml10.png#1 branch
.. //depot/projects/dtrace/src/contrib/expat/doc/xmlwf.1#4 integrate
.. //depot/projects/dtrace/src/contrib/expat/doc/xmlwf.sgml#4 integrate
.. //depot/projects/dtrace/src/contrib/expat/examples/elements.c#4 integrate
.. //depot/projects/dtrace/src/contrib/expat/examples/outline.c#4 integrate
.. //depot/projects/dtrace/src/contrib/expat/expat_config.h.in#4 integrate
.. //depot/projects/dtrace/src/contrib/expat/lib/ascii.h#4 integrate
.. //depot/projects/dtrace/src/contrib/expat/lib/expat.h#4 integrate
.. //depot/projects/dtrace/src/contrib/expat/lib/expat_external.h#1 branch
.. //depot/projects/dtrace/src/contrib/expat/lib/internal.h#4 integrate
.. //depot/projects/dtrace/src/contrib/expat/lib/winconfig.h#4 integrate
.. //depot/projects/dtrace/src/contrib/expat/lib/xmlparse.c#4 integrate
.. //depot/projects/dtrace/src/contrib/expat/lib/xmlrole.c#4 integrate
.. //depot/projects/dtrace/src/contrib/expat/lib/xmlrole.h#4 integrate
.. //depot/projects/dtrace/src/contrib/expat/lib/xmltok.c#4 integrate
.. //depot/projects/dtrace/src/contrib/expat/lib/xmltok.h#4 integrate
.. //depot/projects/dtrace/src/contrib/expat/lib/xmltok_impl.c#4 integrate
.. //depot/projects/dtrace/src/contrib/expat/lib/xmltok_ns.c#4 integrate
.. //depot/projects/dtrace/src/contrib/expat/tests/README.txt#4 integrate
.. //depot/projects/dtrace/src/contrib/expat/tests/benchmark/README.txt#1 branch
.. //depot/projects/dtrace/src/contrib/expat/tests/benchmark/benchmark.c#1 branch
.. //depot/projects/dtrace/src/contrib/expat/tests/benchmark/benchmark.dsp#1 branch
.. //depot/projects/dtrace/src/contrib/expat/tests/benchmark/benchmark.dsw#1 branch
.. //depot/projects/dtrace/src/contrib/expat/tests/chardata.c#4 integrate
.. //depot/projects/dtrace/src/contrib/expat/tests/chardata.h#4 integrate
.. //depot/projects/dtrace/src/contrib/expat/tests/minicheck.c#1 branch
.. //depot/projects/dtrace/src/contrib/expat/tests/minicheck.h#1 branch
.. //depot/projects/dtrace/src/contrib/expat/tests/runtests.c#4 integrate
.. //depot/projects/dtrace/src/contrib/expat/tests/runtestspp.cpp#1 branch
.. //depot/projects/dtrace/src/contrib/expat/tests/xmltest.sh#4 integrate
.. //depot/projects/dtrace/src/contrib/expat/xmlwf/codepage.c#4 integrate
.. //depot/projects/dtrace/src/contrib/expat/xmlwf/readfilemap.c#4 integrate
.. //depot/projects/dtrace/src/contrib/expat/xmlwf/unixfilemap.c#4 integrate
.. //depot/projects/dtrace/src/contrib/expat/xmlwf/xmlfile.c#4 integrate
.. //depot/projects/dtrace/src/contrib/expat/xmlwf/xmlfile.h#4 integrate
.. //depot/projects/dtrace/src/contrib/expat/xmlwf/xmlwf.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/ChangeLog#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/ChangeLog.2003#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/ChangeLog.2004#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/ChangeLog.2005#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/ChangeLog.2006#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/FREEBSD-Xlist#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/LICENSE#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/Makefile.am#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/Makefile.am.common#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/Makefile.in#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/NEWS#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/README#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/acinclude.m4#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/aclocal.m4#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/admin/ChangeLog#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/admin/Makefile.am#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/admin/Makefile.in#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/admin/add.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/admin/change.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/admin/copy.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/admin/get.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/admin/ktutil-commands.in#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/admin/ktutil.8#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/admin/ktutil.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/admin/ktutil_locl.h#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/admin/list.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/admin/purge.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/admin/remove.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/admin/rename.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/Makefile.am#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/Makefile.in#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/afsutil/ChangeLog#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/afsutil/Makefile.am#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/afsutil/Makefile.in#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/afsutil/afslog.1#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/afsutil/afslog.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/afsutil/pagsh.1#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/appl/afsutil/pagsh.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/ftp/ChangeLog#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/ftp/Makefile.am#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/ftp/Makefile.in#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/ftp/common/Makefile.am#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/ftp/common/Makefile.in#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/ftp/common/buffer.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/ftp/common/common.h#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/ftp/common/sockbuf.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/ftp/ftp/Makefile.am#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/ftp/ftp/Makefile.in#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/ftp/ftp/cmds.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/ftp/ftp/cmdtab.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/ftp/ftp/domacro.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/ftp/ftp/extern.h#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/ftp/ftp/ftp.1#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/ftp/ftp/ftp.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/ftp/ftp/ftp_locl.h#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/ftp/ftp/ftp_var.h#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/ftp/ftp/globals.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/ftp/ftp/gssapi.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/ftp/ftp/kauth.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/ftp/ftp/krb4.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/ftp/ftp/main.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/ftp/ftp/ruserpass.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/ftp/ftp/security.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/ftp/ftp/security.h#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/ftp/ftpd/Makefile.am#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/ftp/ftpd/Makefile.in#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/ftp/ftpd/extern.h#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/ftp/ftpd/ftpcmd.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/appl/ftp/ftpd/ftpcmd.y#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/ftp/ftpd/ftpd.8#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/ftp/ftpd/ftpd.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/ftp/ftpd/ftpd_locl.h#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/ftp/ftpd/ftpusers.5#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/ftp/ftpd/gss_userok.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/ftp/ftpd/gssapi.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/appl/ftp/ftpd/kauth.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/ftp/ftpd/klist.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/appl/ftp/ftpd/krb4.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/appl/ftp/ftpd/logwtmp.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/ftp/ftpd/ls.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/ftp/ftpd/pathnames.h#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/ftp/ftpd/popen.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/ftp/ftpd/security.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/appl/gssmask/Makefile.am#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/appl/gssmask/Makefile.in#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/appl/gssmask/common.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/appl/gssmask/common.h#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/appl/gssmask/gssmaestro.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/appl/gssmask/gssmask.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/appl/gssmask/protocol.h#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/appl/kf/Makefile.am#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/kf/Makefile.in#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/kf/kf.1#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/kf/kf.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/kf/kf_locl.h#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/kf/kfd.8#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/kf/kfd.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/login/ChangeLog#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/login/Makefile.am#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/login/Makefile.in#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/login/conf.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/login/env.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/login/limits_conf.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/appl/login/login.1#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/login/login.access.5#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/login/login.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/login/login_access.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/login/login_locl.h#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/login/login_protos.h#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/login/loginpaths.h#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/appl/login/osfc2.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/login/read_string.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/login/shadow.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/login/stty_default.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/login/tty.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/login/utmp_login.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/login/utmpx_login.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/push/ChangeLog#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/push/Makefile.am#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/push/Makefile.in#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/push/pfrom.1#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/push/pfrom.in#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/push/push.8#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/push/push.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/push/push_locl.h#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/rcp/ChangeLog#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/rcp/Makefile.am#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/rcp/Makefile.in#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/rcp/rcp.1#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/rcp/rcp.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/rcp/rcp_locl.h#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/rcp/util.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/rsh/ChangeLog#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/rsh/Makefile.am#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/rsh/Makefile.in#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/rsh/common.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/rsh/limits_conf.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/appl/rsh/login_access.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/appl/rsh/rsh.1#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/rsh/rsh.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/rsh/rsh_locl.h#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/rsh/rshd.8#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/rsh/rshd.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/su/ChangeLog#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/su/Makefile.am#5 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/su/Makefile.in#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/su/su.1#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/appl/su/su.c#5 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/su/supaths.h#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/appl/telnet/ChangeLog#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/telnet/Makefile.am#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/telnet/Makefile.in#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/telnet/libtelnet/Makefile.am#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/telnet/libtelnet/Makefile.in#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/telnet/libtelnet/auth-proto.h#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/telnet/libtelnet/auth.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/telnet/libtelnet/auth.h#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/telnet/libtelnet/enc-proto.h#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/telnet/libtelnet/enc_des.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/telnet/libtelnet/encrypt.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/telnet/libtelnet/encrypt.h#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/telnet/libtelnet/genget.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/telnet/libtelnet/kerberos.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/telnet/libtelnet/kerberos5.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/telnet/libtelnet/krb4encpwd.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/telnet/libtelnet/misc-proto.h#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/telnet/libtelnet/misc.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/telnet/libtelnet/rsaencpwd.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/telnet/libtelnet/spx.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/telnet/telnet/Makefile.am#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/telnet/telnet/Makefile.in#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/telnet/telnet/authenc.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/telnet/telnet/commands.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/telnet/telnet/externs.h#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/telnet/telnet/main.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/telnet/telnet/network.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/telnet/telnet/ring.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/telnet/telnet/ring.h#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/telnet/telnet/sys_bsd.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/telnet/telnet/telnet.1#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/telnet/telnet/telnet.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/telnet/telnet/telnet_locl.h#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/telnet/telnet/terminal.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/telnet/telnet/utilities.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/telnet/telnetd/Makefile.am#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/telnet/telnetd/Makefile.in#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/telnet/telnetd/authenc.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/telnet/telnetd/ext.h#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/telnet/telnetd/global.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/telnet/telnetd/slc.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/telnet/telnetd/state.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/telnet/telnetd/sys_term.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/telnet/telnetd/telnetd.8#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/telnet/telnetd/telnetd.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/telnet/telnetd/telnetd.h#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/telnet/telnetd/termstat.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/telnet/telnetd/utility.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/test/Makefile.am#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/test/Makefile.in#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/test/common.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/test/gss_common.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/test/gss_common.h#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/test/gssapi_client.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/test/gssapi_server.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/test/http_client.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/appl/test/nt_gss_client.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/test/nt_gss_common.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/test/nt_gss_common.h#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/test/nt_gss_server.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/test/tcp_client.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/test/tcp_server.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/test/test_locl.h#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/test/uu_client.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/appl/test/uu_server.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/autogen.sh#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/cf/ChangeLog#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/cf/Makefile.am.common#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/cf/aix.m4#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/cf/auth-modules.m4#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/cf/autobuild.m4#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/cf/broken-getaddrinfo.m4#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/cf/broken-getnameinfo.m4#4 delete
.. //depot/projects/dtrace/src/crypto/heimdal/cf/broken-glob.m4#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/cf/broken-realloc.m4#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/cf/broken-snprintf.m4#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/cf/broken.m4#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/cf/broken2.m4#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/cf/c-attribute.m4#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/cf/c-function.m4#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/cf/capabilities.m4#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/cf/check-compile-et.m4#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/cf/check-declaration.m4#4 delete
.. //depot/projects/dtrace/src/crypto/heimdal/cf/check-getpwnam_r-posix.m4#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/cf/check-man.m4#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/cf/check-netinet-ip-and-tcp.m4#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/cf/check-type-extra.m4#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/cf/check-var.m4#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/cf/check-x.m4#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/cf/check-xau.m4#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/cf/crypto.m4#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/cf/db.m4#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/cf/destdirs.m4#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/cf/dlopen.m4#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/cf/find-func-no-libs.m4#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/cf/find-func-no-libs2.m4#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/cf/find-func.m4#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/cf/find-if-not-broken.m4#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/cf/framework-security.m4#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/cf/have-pragma-weak.m4#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/cf/have-struct-field.m4#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/cf/have-type.m4#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/cf/have-types.m4#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/cf/install-catman.sh#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/cf/irix.m4#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/cf/krb-bigendian.m4#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/cf/krb-func-getcwd-broken.m4#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/cf/krb-func-getlogin.m4#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/cf/krb-ipv6.m4#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/cf/krb-prog-ln-s.m4#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/cf/krb-prog-ranlib.m4#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/cf/krb-prog-yacc.m4#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/cf/krb-readline.m4#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/cf/krb-struct-spwd.m4#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/cf/krb-struct-winsize.m4#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/cf/krb-sys-aix.m4#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/cf/krb-sys-nextstep.m4#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/cf/krb-version.m4#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/cf/largefile.m4#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/cf/make-proto.pl#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/cf/mips-abi.m4#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/cf/misc.m4#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/cf/need-proto.m4#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/cf/osfc2.m4#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/cf/otp.m4#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/cf/proto-compat.m4#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/cf/pthreads.m4#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/cf/resolv.m4#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/cf/retsigtype.m4#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/cf/roken-frag.m4#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/cf/roken.m4#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/cf/socket-wrapper.m4#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/cf/sunos.m4#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/cf/telnet.m4#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/cf/test-package.m4#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/cf/valgrind-suppressions#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/cf/vararray.m4#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/cf/version-script.m4#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/cf/wflags.m4#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/cf/win32.m4#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/cf/with-all.m4#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/compile#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/config.guess#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/config.sub#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/configure#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/configure.in#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/doc/Makefile.am#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/doc/Makefile.in#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/doc/ack.texi#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/doc/apps.texi#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/doc/doxytmpl.dxy#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/doc/hcrypto.din#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/doc/heimdal.css#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/doc/heimdal.texi#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/doc/hx509.din#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/doc/hx509.texi#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/doc/init-creds#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/doc/install.texi#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/doc/intro.texi#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/doc/kerberos4.texi#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/doc/krb5.din#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/doc/migration.texi#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/doc/misc.texi#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/doc/ntlm.din#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/doc/programming.texi#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/doc/setup.texi#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/doc/vars.texi#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/doc/vars.tin#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/doc/whatis.texi#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/doc/win2k.texi#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/etc/Makefile.am#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/etc/Makefile.in#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/etc/services.append#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/include/Makefile.am#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/include/Makefile.in#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/include/bits.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/include/config.h.in#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/include/gssapi/Makefile.am#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/include/gssapi/Makefile.in#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/include/hcrypto/Makefile.am#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/include/hcrypto/Makefile.in#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/include/kadm5/Makefile.am#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/include/kadm5/Makefile.in#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/include/make_crypto.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/install-sh#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/kadmin/ChangeLog#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/kadmin/Makefile.am#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/kadmin/Makefile.in#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/kadmin/add-random-users.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/kadmin/add_enctype.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/kadmin/ank.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/kadmin/check.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/kadmin/cpw.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/kadmin/del.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/kadmin/del_enctype.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/kadmin/dump.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/kadmin/ext.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/kadmin/get.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/kadmin/init.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/kadmin/kadm_conn.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/kadmin/kadmin-commands.in#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/kadmin/kadmin.8#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/kadmin/kadmin.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/kadmin/kadmin_locl.h#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/kadmin/kadmind.8#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/kadmin/kadmind.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/kadmin/load.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/kadmin/mod.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/kadmin/pw_quality.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/kadmin/random_password.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/kadmin/rename.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/kadmin/server.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/kadmin/stash.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/kadmin/test_util.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/kadmin/util.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/kadmin/version4.c#4 delete
.. //depot/projects/dtrace/src/crypto/heimdal/kcm/Makefile.am#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/kcm/Makefile.in#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/kcm/acl.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/kcm/acquire.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/kcm/cache.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/kcm/client.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/kcm/config.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/kcm/connect.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/kcm/cursor.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/kcm/events.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/kcm/glue.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/kcm/headers.h#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/kcm/kcm.8#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/kcm/kcm_locl.h#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/kcm/kcm_protos.h#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/kcm/log.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/kcm/main.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/kcm/protocol.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/kcm/renew.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/kdc/524.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/kdc/Makefile.am#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/kdc/Makefile.in#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/kdc/config.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/kdc/connect.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/kdc/default_config.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/kdc/digest.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/kdc/headers.h#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/kdc/hprop.8#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/kdc/hprop.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/kdc/hprop.h#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/kdc/hpropd.8#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/kdc/hpropd.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/kdc/kadb.h#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/kdc/kaserver.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/kdc/kdc-private.h#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/kdc/kdc-protos.h#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/kdc/kdc-replay.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/kdc/kdc.8#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/kdc/kdc.h#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/kdc/kdc_locl.h#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/kdc/kerberos4.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/kdc/kerberos5.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/kdc/krb5tgs.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/kdc/kstash.8#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/kdc/kstash.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/kdc/kx509.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/kdc/log.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/kdc/main.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/kdc/misc.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/kdc/mit_dump.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/kdc/pkinit.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/kdc/process.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/kdc/rx.h#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/kdc/set_dbinfo.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/kdc/string2key.8#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/kdc/string2key.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/kdc/v4_dump.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/kdc/version-script.map#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/kdc/windc.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/kdc/windc_plugin.h#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/kpasswd/Makefile.am#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/kpasswd/Makefile.in#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/kpasswd/kpasswd-generator.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/kpasswd/kpasswd.1#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/kpasswd/kpasswd.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/kpasswd/kpasswd_locl.h#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/kpasswd/kpasswdd.8#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/kpasswd/kpasswdd.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/kuser/Makefile.am#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/kuser/Makefile.in#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/kuser/copy_cred_cache.1#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/kuser/copy_cred_cache.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/kuser/generate-requests.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/kuser/kauth_options.c#4 delete
.. //depot/projects/dtrace/src/crypto/heimdal/kuser/kdecode_ticket.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/kuser/kdestroy.1#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/kuser/kdestroy.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/kuser/kdigest-commands.in#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/kuser/kdigest.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/kuser/kgetcred.1#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/kuser/kgetcred.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/kuser/kimpersonate.1#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/kuser/kimpersonate.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/kuser/kinit.1#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/kuser/kinit.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/kuser/kinit_options.c#4 delete
.. //depot/projects/dtrace/src/crypto/heimdal/kuser/klist.1#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/kuser/klist.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/kuser/kuser_locl.h#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/kuser/kverify.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/45/Makefile.am#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/45/Makefile.in#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/45/get_ad_tkt.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/45/mk_req.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/Makefile.am#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/Makefile.in#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/asn1/CMS.asn1#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/asn1/ChangeLog#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/asn1/Makefile.am#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/asn1/Makefile.in#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/asn1/asn1-common.h#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/asn1/asn1_err.et#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/asn1/asn1_gen.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/asn1/asn1_print.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/asn1/asn1_queue.h#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/asn1/canthandle.asn1#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/asn1/check-common.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/asn1/check-common.h#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/asn1/check-der.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/asn1/check-gen.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/asn1/check-timegm.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/asn1/der-protos.h#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/asn1/der.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/asn1/der.h#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/asn1/der_cmp.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/asn1/der_copy.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/asn1/der_format.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/asn1/der_free.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/asn1/der_get.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/asn1/der_length.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/asn1/der_locl.h#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/asn1/der_put.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/asn1/digest.asn1#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/asn1/extra.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/asn1/gen.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/asn1/gen.h#4 delete
.. //depot/projects/dtrace/src/crypto/heimdal/lib/asn1/gen_copy.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/asn1/gen_decode.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/asn1/gen_encode.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/asn1/gen_free.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/asn1/gen_glue.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/asn1/gen_length.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/asn1/gen_locl.h#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/asn1/gen_seq.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/asn1/hash.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/asn1/hash.h#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/asn1/heim_asn1.h#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/asn1/k5.asn1#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/asn1/kx509.asn1#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/asn1/lex.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/asn1/lex.h#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/asn1/lex.l#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/asn1/main.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/asn1/parse.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/asn1/parse.h#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/asn1/parse.y#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/asn1/pkcs12.asn1#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/asn1/pkcs8.asn1#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/asn1/pkcs9.asn1#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/asn1/pkinit.asn1#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/asn1/rfc2459.asn1#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/asn1/setchgpw2.asn1#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/asn1/symbol.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/asn1/symbol.h#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/asn1/test.asn1#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/asn1/test.gen#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/asn1/timegm.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/asn1/x509.asn1#4 delete
.. //depot/projects/dtrace/src/crypto/heimdal/lib/auth/ChangeLog#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/auth/Makefile.am#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/auth/Makefile.in#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/auth/afskauthlib/Makefile.am#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/auth/afskauthlib/Makefile.in#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/auth/afskauthlib/verify.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/auth/pam/Makefile.am#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/auth/pam/Makefile.in#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/auth/pam/pam.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/auth/sia/Makefile.am#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/auth/sia/Makefile.in#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/auth/sia/krb4+c2_matrix.conf#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/auth/sia/krb4_matrix.conf#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/auth/sia/krb5+c2_matrix.conf#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/auth/sia/krb5_matrix.conf#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/auth/sia/make-rpath#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/auth/sia/posix_getpw.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/auth/sia/sia.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/auth/sia/sia_locl.h#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/com_err/ChangeLog#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/com_err/Makefile.am#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/com_err/Makefile.in#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/com_err/com_err.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/com_err/com_err.h#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/com_err/com_right.h#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/com_err/compile_et.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/com_err/compile_et.h#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/com_err/error.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/com_err/lex.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/com_err/lex.h#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/com_err/lex.l#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/com_err/parse.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/com_err/parse.h#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/com_err/parse.y#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/com_err/roken_rename.h#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/com_err/version-script.map#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/8003.c#4 delete
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/ChangeLog#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/Makefile.am#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/Makefile.in#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/accept_sec_context.c#4 delete
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/acquire_cred.c#4 delete
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/add_cred.c#4 delete
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/add_oid_set_member.c#4 delete
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/address_to_krb5addr.c#4 delete
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/arcfour.c#4 delete
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/arcfour.h#4 delete
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/canonicalize_name.c#4 delete
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/compare_name.c#4 delete
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/compat.c#4 delete
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/context_time.c#4 delete
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/copy_ccache.c#4 delete
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/create_emtpy_oid_set.c#4 delete
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/decapsulate.c#4 delete
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/delete_sec_context.c#4 delete
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/display_name.c#4 delete
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/display_status.c#4 delete
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/duplicate_name.c#4 delete
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/encapsulate.c#4 delete
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/export_name.c#4 delete
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/export_sec_context.c#4 delete
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/external.c#4 delete
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/get_mic.c#4 delete
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/gss-commands.in#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/gss.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/gss_acquire_cred.3#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/gssapi.3#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/gssapi.h#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/gssapi/gssapi.h#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/gssapi/gssapi_krb5.h#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/gssapi/gssapi_spnego.h#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/gssapi_locl.h#4 delete
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/gssapi_mech.h#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/import_name.c#4 delete
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/import_sec_context.c#4 delete
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/indicate_mechs.c#4 delete
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/init.c#4 delete
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/init_sec_context.c#4 delete
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/inquire_context.c#4 delete
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/inquire_cred.c#4 delete
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/inquire_cred_by_mech.c#4 delete
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/inquire_mechs_for_name.c#4 delete
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/inquire_names_for_mech.c#4 delete
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/krb5/8003.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/krb5/accept_sec_context.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/krb5/acquire_cred.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/krb5/add_cred.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/krb5/address_to_krb5addr.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/krb5/arcfour.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/krb5/canonicalize_name.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/krb5/ccache_name.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/krb5/cfx.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/krb5/cfx.h#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/krb5/compare_name.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/krb5/compat.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/krb5/context_time.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/krb5/copy_ccache.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/krb5/decapsulate.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/krb5/delete_sec_context.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/krb5/display_name.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/krb5/display_status.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/krb5/duplicate_name.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/krb5/encapsulate.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/krb5/export_name.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/krb5/export_sec_context.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/krb5/external.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/krb5/get_mic.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/krb5/gkrb5_err.et#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/krb5/gsskrb5-private.h#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/krb5/gsskrb5_locl.h#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/krb5/import_name.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/krb5/import_sec_context.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/krb5/indicate_mechs.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/krb5/init.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/krb5/init_sec_context.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/krb5/inquire_context.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/krb5/inquire_cred.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/krb5/inquire_cred_by_mech.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/krb5/inquire_cred_by_oid.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/krb5/inquire_mechs_for_name.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/krb5/inquire_names_for_mech.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/krb5/inquire_sec_context_by_oid.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/krb5/prf.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/krb5/process_context_token.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/krb5/release_buffer.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/krb5/release_cred.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/krb5/release_name.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/krb5/sequence.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/krb5/set_cred_option.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/krb5/set_sec_context_option.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/krb5/test_cfx.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/krb5/ticket_flags.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/krb5/unwrap.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/krb5/v1.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/krb5/verify_mic.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/krb5/wrap.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/ntlm/accept_sec_context.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/ntlm/acquire_cred.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/ntlm/add_cred.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/ntlm/canonicalize_name.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/ntlm/compare_name.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/ntlm/context_time.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/ntlm/crypto.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/ntlm/delete_sec_context.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/ntlm/digest.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/ntlm/display_name.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/ntlm/display_status.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/ntlm/duplicate_name.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/ntlm/export_name.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/ntlm/export_sec_context.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/ntlm/external.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/ntlm/import_name.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/ntlm/import_sec_context.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/ntlm/indicate_mechs.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/ntlm/init_sec_context.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/ntlm/inquire_context.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/ntlm/inquire_cred.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/ntlm/inquire_cred_by_mech.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/ntlm/inquire_mechs_for_name.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/ntlm/inquire_names_for_mech.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/ntlm/ntlm-private.h#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/ntlm/ntlm.h#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/ntlm/process_context_token.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/ntlm/release_cred.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/ntlm/release_name.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/process_context_token.c#4 delete
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/release_buffer.c#4 delete
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/release_cred.c#4 delete
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/release_name.c#4 delete
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/release_oid_set.c#4 delete
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/spnego/accept_sec_context.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/spnego/compat.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/spnego/context_stubs.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/spnego/cred_stubs.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/spnego/external.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/spnego/init_sec_context.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/spnego/spnego-private.h#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/spnego/spnego.asn1#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/spnego/spnego_locl.h#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/test_acquire_cred.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/test_common.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/test_common.h#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/test_context.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/test_cred.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/test_kcred.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/test_names.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/test_ntlm.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/test_oid.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/test_oid_set_member.c#4 delete
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/unwrap.c#4 delete
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/v1.c#4 delete
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/verify_mic.c#4 delete
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/version-script.map#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/gssapi/wrap.c#4 delete
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hdb/Makefile.am#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hdb/Makefile.in#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hdb/common.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hdb/convert_db.c#4 delete
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hdb/db.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hdb/db3.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hdb/dbinfo.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hdb/ext.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hdb/hdb-ldap.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hdb/hdb-private.h#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hdb/hdb-protos.h#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hdb/hdb.asn1#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hdb/hdb.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hdb/hdb.h#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hdb/hdb.schema#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hdb/hdb_err.et#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hdb/hdb_locl.h#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hdb/keys.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hdb/keytab.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hdb/mkey.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hdb/ndbm.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hdb/print.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hdb/test_dbinfo.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/ChangeLog#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/Makefile.am#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/Makefile.in#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/ca.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/cert.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/cms.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/collector.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/crmf.asn1#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/crypto.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/data/bleichenbacher-bad.pem#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/data/bleichenbacher-good.pem#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/data/bleichenbacher-sf-pad-correct.pem#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/data/ca.crt#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/data/ca.key#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/data/crl1.crl#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/data/crl1.der#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/data/gen-req.sh#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/data/j.pem#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/data/kdc.crt#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/data/kdc.key#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/data/key.der#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/data/key2.der#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/data/nist-data#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/data/nist-data2#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/data/no-proxy-test.crt#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/data/no-proxy-test.key#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/data/ocsp-req1.der#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/data/ocsp-req2.der#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/data/ocsp-resp1-2.der#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/data/ocsp-resp1-3.der#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/data/ocsp-resp1-ca.der#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/data/ocsp-resp1-keyhash.der#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/data/ocsp-resp1-ocsp-no-cert.der#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/data/ocsp-resp1-ocsp.der#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/data/ocsp-resp1.der#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/data/ocsp-resp2.der#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/data/ocsp-responder.crt#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/data/ocsp-responder.key#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/data/openssl.cnf#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/data/pkinit-proxy-chain.crt#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/data/pkinit-proxy.crt#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/data/pkinit-proxy.key#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/data/pkinit-pw.key#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/data/pkinit.crt#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/data/pkinit.key#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/data/proxy-level-test.crt#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/data/proxy-level-test.key#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/data/proxy-test.crt#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/data/proxy-test.key#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/data/proxy10-child-child-test.crt#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/data/proxy10-child-child-test.key#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/data/proxy10-child-test.crt#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/data/proxy10-child-test.key#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/data/proxy10-test.crt#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/data/proxy10-test.key#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/data/revoke.crt#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/data/revoke.key#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/data/sf-class2-root.pem#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/data/static-file#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/data/sub-ca.crt#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/data/sub-ca.key#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/data/sub-cert.crt#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/data/sub-cert.key#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/data/sub-cert.p12#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/data/test-ds-only.crt#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/data/test-ds-only.key#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/data/test-enveloped-aes-128#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/data/test-enveloped-aes-256#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/data/test-enveloped-des#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/data/test-enveloped-des-ede3#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/data/test-enveloped-rc2-128#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/data/test-enveloped-rc2-40#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/data/test-enveloped-rc2-64#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/data/test-ke-only.crt#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/data/test-ke-only.key#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/data/test-nopw.p12#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/data/test-pw.key#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/data/test-signed-data#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/data/test-signed-data-noattr#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/data/test-signed-data-noattr-nocerts#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/data/test.combined.crt#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/data/test.crt#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/data/test.key#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/data/test.p12#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/data/yutaka-pad-broken-ca.pem#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/data/yutaka-pad-broken-cert.pem#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/data/yutaka-pad-ok-ca.pem#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/data/yutaka-pad-ok-cert.pem#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/data/yutaka-pad.key#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/doxygen.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/env.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/error.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/file.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/hx509-private.h#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/hx509-protos.h#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/hx509.h#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/hx509_err.et#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/hx_locl.h#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/hxtool-commands.in#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/hxtool.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/keyset.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/ks_dir.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/ks_file.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/ks_keychain.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/ks_mem.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/ks_null.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/ks_p11.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/ks_p12.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/lock.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/name.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/ocsp.asn1#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/peer.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/pkcs10.asn1#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/print.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/ref/pkcs11.h#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/req.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/revoke.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/softp11.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/test_ca.in#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/test_cert.in#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/test_chain.in#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/test_cms.in#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/test_crypto.in#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/test_java_pkcs11.in#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/test_name.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/test_nist.in#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/test_nist2.in#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/test_nist_cert.in#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/test_nist_pkcs12.in#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/test_pkcs11.in#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/test_query.in#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/test_req.in#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/test_soft_pkcs11.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/test_windows.in#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/tst-crypto-available1#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/tst-crypto-available2#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/tst-crypto-available3#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/tst-crypto-select#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/tst-crypto-select1#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/tst-crypto-select2#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/tst-crypto-select3#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/tst-crypto-select4#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/tst-crypto-select5#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/tst-crypto-select6#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/tst-crypto-select7#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/hx509/version-script.map#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/kadm5/ChangeLog#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/kadm5/Makefile.am#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/kadm5/Makefile.in#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/kadm5/acl.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/kadm5/ad.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/kadm5/admin.h#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/kadm5/bump_pw_expire.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/kadm5/check-cracklib.pl#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/kadm5/chpass_c.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/kadm5/chpass_s.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/kadm5/client_glue.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/kadm5/common_glue.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/kadm5/context_s.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/kadm5/create_c.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/kadm5/create_s.c#4 integrate
.. //depot/projects/dtrace/src/crypto/heimdal/lib/kadm5/default_keys.c#1 branch
.. //depot/projects/dtrace/src/crypto/heimdal/lib/kadm5/delete_c.c#4 integrate

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Thu May  8 21:48:45 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5DED81065675; Thu,  8 May 2008 21:48:45 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1F142106564A
	for ; Thu,  8 May 2008 21:48:45 +0000 (UTC)
	(envelope-from thompsa@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 03CD08FC19
	for ; Thu,  8 May 2008 21:48:45 +0000 (UTC)
	(envelope-from thompsa@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m48LmiMe004412
	for ; Thu, 8 May 2008 21:48:44 GMT
	(envelope-from thompsa@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m48LmiAG004410
	for perforce@freebsd.org; Thu, 8 May 2008 21:48:44 GMT
	(envelope-from thompsa@freebsd.org)
Date: Thu, 8 May 2008 21:48:44 GMT
Message-Id: <200805082148.m48LmiAG004410@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	thompsa@freebsd.org using -f
From: Andrew Thompson 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 141342 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Thu, 08 May 2008 21:48:45 -0000

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

Change 141342 by thompsa@thompsa_burger on 2008/05/08 21:48:00

	Allow wlandebug to set the default debug level.

Affected files ...

.. //depot/projects/vap/usr.sbin/wlandebug/wlandebug.8#3 edit
.. //depot/projects/vap/usr.sbin/wlandebug/wlandebug.c#6 edit

Differences ...

==== //depot/projects/vap/usr.sbin/wlandebug/wlandebug.8#3 (text+ko) ====

@@ -32,7 +32,7 @@
 .Nd "set/query 802.11 wireless debugging messages"
 .Sh SYNOPSIS
 .Nm
-.Op Fl i Ar ifnet
+.Op Fl d | Fl i Ar ifnet
 .Op Fl flag|+flag Ar ...
 .Sh DESCRIPTION
 The
@@ -46,6 +46,10 @@
 without any options will display the current messages
 enabled for the specified network interface
 (by default, ``ath0').
+The default debugging level for new interfaces can be set
+by specifying the
+.Ar -d
+option.
 When run as the super-user
 .Nm
 can be used to enable and/or disable debugging messages.

==== //depot/projects/vap/usr.sbin/wlandebug/wlandebug.c#6 (text+ko) ====

@@ -149,7 +149,7 @@
 {
 	int i;
 
-	fprintf(stderr, "usage: %s [-i device] [flags]\n", progname);
+	fprintf(stderr, "usage: %s [-d | -i device] [flags]\n", progname);
 	fprintf(stderr, "where flags are:\n");
 	for (i = 0; i < N(flags); i++)
 		printf("%s\n", flags[i].name);
@@ -160,11 +160,18 @@
 setoid(char oid[], size_t oidlen, const char *wlan)
 {
 #ifdef __linux__
-	snprintf(oid, oidlen, "net.%s.debug", wlan);
+	if (wlan)
+		snprintf(oid, oidlen, "net.%s.debug", wlan);
 #elif __FreeBSD__
-	snprintf(oid, oidlen, "net.wlan.%s.debug", wlan+4);
+	if (wlan)
+		snprintf(oid, oidlen, "net.wlan.%s.debug", wlan+4);
+	else
+		snprintf(oid, oidlen, "net.wlan.debug");
 #elif __NetBSD__
-	snprintf(oid, oidlen, "net.link.ieee80211.%s.debug", wlan+4);
+	if (wlan)
+		snprintf(oid, oidlen, "net.link.ieee80211.%s.debug", wlan+4);
+	else
+		snprintf(oid, oidlen, "net.link.ieee80211.debug");
 #else
 #error "No support for this system"
 #endif
@@ -183,7 +190,10 @@
 	progname = argv[0];
 	setoid(oid, sizeof(oid), "wlan0");
 	if (argc > 1) {
-		if (strcmp(argv[1], "-i") == 0) {
+		if (strcmp(argv[1], "-d") == 0) {
+			setoid(oid, sizeof(oid), NULL);
+			argc -= 1, argv += 1;
+		} else if (strcmp(argv[1], "-i") == 0) {
 			if (argc < 2)
 				errx(1, "missing interface name for -i option");
 			if (strncmp(argv[2], "wlan", 4) != 0)

From owner-p4-projects@FreeBSD.ORG  Thu May  8 22:52:52 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E32EF106567F; Thu,  8 May 2008 22:52:51 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5B5431065678
	for ; Thu,  8 May 2008 22:52:51 +0000 (UTC)
	(envelope-from wsalamon@computer.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 49D258FC16
	for ; Thu,  8 May 2008 22:52:51 +0000 (UTC)
	(envelope-from wsalamon@computer.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m48MqpwK007569
	for ; Thu, 8 May 2008 22:52:51 GMT
	(envelope-from wsalamon@computer.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m48Mqpku007567
	for perforce@freebsd.org; Thu, 8 May 2008 22:52:51 GMT
	(envelope-from wsalamon@computer.org)
Date: Thu, 8 May 2008 22:52:51 GMT
Message-Id: <200805082252.m48Mqpku007567@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	wsalamon@computer.org using -f
From: Wayne Salamon 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 141344 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Thu, 08 May 2008 22:52:52 -0000

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

Change 141344 by wsalamon@vh2 on 2008/05/08 22:52:25

	Add definitions and stubs for MAC polict audit pre/post selection
	of events.
	Drop a comment in Audit to remove the setting of a flag to force an
	audit event to be committed.

Affected files ...

.. //depot/projects/trustedbsd/audit_mac/src/sys/security/audit/audit.c#6 edit
.. //depot/projects/trustedbsd/audit_mac/src/sys/security/mac/mac_audit.c#3 edit
.. //depot/projects/trustedbsd/audit_mac/src/sys/security/mac/mac_framework.h#3 edit
.. //depot/projects/trustedbsd/audit_mac/src/sys/security/mac/mac_policy.h#4 edit

Differences ...

==== //depot/projects/trustedbsd/audit_mac/src/sys/security/audit/audit.c#6 (text) ====

@@ -408,6 +408,7 @@
 	event = ar->k_ar.ar_event;
 	class = au_event_class(event);
 
+//WWW Take this out...
 	ar->k_ar_commit |= AR_COMMIT_KERNEL;
 	if (au_preselect(event, class, aumask, sorf) != 0)
 		ar->k_ar_commit |= AR_PRESELECT_TRAIL;

==== //depot/projects/trustedbsd/audit_mac/src/sys/security/mac/mac_audit.c#3 (text+ko) ====

@@ -146,3 +146,22 @@
 
 	return (audit_mac_data(MAC_AUDIT_TEXT_TYPE, size, sanitized));
 }
+
+int                     
+mac_audit_check_preselect(struct ucred *cred, au_event_t event)
+{
+	int ret;
+
+	ret = MAC_AUDIT_DEFAULT;
+	return (ret);
+}
+
+int
+mac_audit_check_postselect(struct ucred *cred, au_event_t event, int error,
+    int retval)
+{
+	int ret;
+
+	ret = MAC_AUDIT_DEFAULT;
+	return (ret);
+}

==== //depot/projects/trustedbsd/audit_mac/src/sys/security/mac/mac_framework.h#3 (text+ko) ====

@@ -88,6 +88,12 @@
 
 #include 			/* XXX acl_type_t */
 
+#include 			/* au_event_t */
+
+int	mac_audit_check_preselect(struct ucred *cred, au_event_t event);
+int	mac_audit_check_postselect(struct ucred *cred, au_event_t event,
+    int error, int retval);
+
 /*
  * Entry points to the TrustedBSD MAC Framework from the remainder of the
  * kernel: entry points are named based on a principle object type and an

==== //depot/projects/trustedbsd/audit_mac/src/sys/security/mac/mac_policy.h#4 (text+ko) ====

@@ -115,6 +115,10 @@
 /*
  * Operations sorted alphabetically by primary object type and then method.
  */
+typedef int	(*mpo_audit_check_preselect_t)(struct ucred *cred,
+		    au_event_t event);
+typedef int	(*mpo_audit_check_postselect_t)(struct ucred *cred,
+		    au_event_t event, int error, int retval);
 typedef	int	(*mpo_bpfdesc_check_receive_t)(struct bpf_d *d,
 		    struct label *dlabel, struct ifnet *ifp,
 		    struct label *ifplabel);

From owner-p4-projects@FreeBSD.ORG  Thu May  8 23:41:45 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 75C531065672; Thu,  8 May 2008 23:41:45 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1E8551065670
	for ; Thu,  8 May 2008 23:41:45 +0000 (UTC)
	(envelope-from wsalamon@computer.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 0B08E8FC24
	for ; Thu,  8 May 2008 23:41:45 +0000 (UTC)
	(envelope-from wsalamon@computer.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m48Nfitg010276
	for ; Thu, 8 May 2008 23:41:44 GMT
	(envelope-from wsalamon@computer.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m48NfgnX010274
	for perforce@freebsd.org; Thu, 8 May 2008 23:41:42 GMT
	(envelope-from wsalamon@computer.org)
Date: Thu, 8 May 2008 23:41:42 GMT
Message-Id: <200805082341.m48NfgnX010274@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	wsalamon@computer.org using -f
From: Wayne Salamon 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 141345 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Thu, 08 May 2008 23:41:45 -0000

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

Change 141345 by wsalamon@vh2 on 2008/05/08 23:41:13

	Integ development branch from parent.

Affected files ...

.. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/machdep.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/pmap.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/conf/GENERIC#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/conf/NOTES#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/pcpu.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/machdep.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/arm/at91/uart_dev_at91usart.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/conf/NOTES#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/conf/files#7 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/conf/files.powerpc#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/conf/files.sparc64#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/conf/files.sun4v#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/conf/kern.mk#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/conf/ldscript.mips#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/conf/ldscript.mips.cfe#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/conf/options#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/iwn/LICENSE#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/iwn/iwlwifi-4965-4.44.17.fw.uu#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/rdma/core_priv.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/rdma/ib_addr.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/rdma/ib_cache.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/rdma/ib_cm.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/rdma/ib_fmr_pool.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/rdma/ib_mad.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/rdma/ib_marshall.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/rdma/ib_pack.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/rdma/ib_sa.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/rdma/ib_smi.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/rdma/ib_umem.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/rdma/ib_user_cm.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/rdma/ib_user_mad.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/rdma/ib_user_sa.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/rdma/ib_user_verbs.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/rdma/ib_verbs.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/rdma/iw_cm.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/rdma/krping/getopt.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/rdma/krping/getopt.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/rdma/krping/krping.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/rdma/krping/krping.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/rdma/krping/krping_dev.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/rdma/rdma_addr.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/rdma/rdma_cache.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/rdma/rdma_cm.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/rdma/rdma_cm_ib.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/rdma/rdma_cma.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/rdma/rdma_device.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/rdma/rdma_iwcm.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/rdma/rdma_user_cm.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/rdma/rdma_verbs.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/rdma/types.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/ddb/db_capture.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/acpica/acpi_thermal.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ata/ata-disk.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ata/ata-lowlevel.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ata/atapi-cd.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ata/atapi-fd.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ata/atapi-tape.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ath/if_ath.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ath/if_athvar.h#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/bce/if_bce.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/bfe/if_bfe.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/bge/if_bge.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/bge/if_bgereg.h#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/cxgb_config.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/cxgb_main.c#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/cxgb_offload.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/cxgb_osdep.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/t3cdev.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cq.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_dbg.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_ev.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_mem.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_qp.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_resource.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_resource.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_user.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_wr.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/tom/cxgb_ddp.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/tom/cxgb_tcp_offload.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/tom/cxgb_toepcb.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/dcons/dcons_os.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/em/e1000_82571.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/em/e1000_82571.h#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/em/e1000_api.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/em/e1000_api.h#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/em/e1000_defines.h#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/em/e1000_hw.h#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/em/e1000_ich8lan.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/em/e1000_ich8lan.h#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/em/e1000_osdep.h#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/em/e1000_phy.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/em/e1000_phy.h#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/em/if_em.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/em/if_em.h#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/hme/if_hme.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/hme/if_hme_pci.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/hme/if_hme_sbus.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/hme/if_hmereg.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/hme/if_hmevar.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/if_ndis/if_ndis.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/igb/e1000_82575.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/igb/e1000_api.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/igb/e1000_api.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/igb/e1000_defines.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/igb/e1000_hw.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/igb/e1000_mac.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/igb/e1000_manage.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/igb/e1000_osdep.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/igb/e1000_osdep.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/igb/e1000_phy.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/igb/if_igb.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/igb/if_igb.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ipw/if_ipw.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/iwi/if_iwi.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/iwn/if_iwn.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/iwn/if_iwnreg.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/iwn/if_iwnvar.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/mii/brgphy.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/mii/brgphyreg.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/mii/ciphy.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/mii/miidevs#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/mpt/mpt.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/mpt/mpt_cam.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/mpt/mpt_raid.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/mpt/mpt_user.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ofw/ofw_console.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/pci/pcivar.h#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ral/rt2560.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ral/rt2661.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/scc/scc_bfe.h#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/scc/scc_bfe_ebus.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/scc/scc_bfe_macio.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/scc/scc_bfe_quicc.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/scc/scc_bfe_sbus.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/scc/scc_core.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/sio/sio.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/sym/sym_hipd.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ti/if_ti.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/uart/uart_core.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/if_rum.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/if_udav.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/if_zyd.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/uipaq.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/ums.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/usbdevs#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/uscanner.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/vx/if_vx.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/wi/if_wi.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/wpi/if_wpi.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/fs/devfs/devfs_vnops.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/fs/unionfs/union.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/fs/unionfs/union_subr.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/fs/unionfs/union_vnops.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/i386/conf/GENERIC#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/i386/conf/NOTES#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/i386/cpufreq/est.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/i386/i386/machdep.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/i386/i386/pmap.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/i386/include/pcpu.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/ia64/ia64/machdep.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_cpu.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_descrip.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_kthread.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_thr.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_umtx.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/sched_4bsd.c#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/sched_ule.c#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/subr_blist.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/subr_kdb.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/subr_witness.c#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/uipc_mbuf.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/uipc_syscalls.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/vfs_mount.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/vfs_subr.c#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/am29lv081b.h#2 delete
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/cp0.h#2 delete
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/float.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/pmap.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips/machdep.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips/mips_subr.c#2 delete
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips/pmap.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/Makefile#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/cxgb/Makefile#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/cxgb/iw_cxgb/Makefile#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/em/Makefile#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/esp/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/hfa/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/hme/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/isp/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/ispfw/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/iwn/Makefile#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/iwnfw/Makefile#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/le/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/mpt/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/rdma/Makefile#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/rdma/addr/Makefile#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/rdma/cma/Makefile#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/rdma/core/Makefile#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/rdma/iwcm/Makefile#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/rdma/krping/Makefile#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/scc/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/sound/driver/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/wlan/Makefile#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net/bpf.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net/if_ethersubr.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_node.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/ip_fw.h#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/libalias/alias.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/tcp.h#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/tcp_syncache.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/tcp_usrreq.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/pc98/cbus/sio.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/pc98/conf/GENERIC#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/pc98/pc98/machdep.c#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/aim/clock.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/aim/locore.S#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/aim/machdep.c#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/aim/mmu_oea.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/aim/mp_cpudep.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/aim/swtch.S#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/aim/trap_subr.S#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/aim/vm_machdep.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/booke/machdep.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/booke/pmap.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/booke/trap_subr.S#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/booke/vm_machdep.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/conf/MPC85XX#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/conf/NOTES#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/include/cpufunc.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/include/pcpu.h#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/include/smp.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/include/spr.h#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/mpc85xx/mpc85xx.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/mpc85xx/ocpbus.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/mpc85xx/ocpbus.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/mpc85xx/pci_ocp.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/powermac/macio.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/powermac/maciovar.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/powerpc/intr_machdep.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/powerpc/mp_machdep.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/powerpc/openpic.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/security/audit/audit.h#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/conf/GENERIC#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/include/bus.h#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/include/bus_common.h#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/include/iommuvar.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/isa/isa.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/pci/ofw_pci.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/pci/ofw_pci_if.m#3 delete
.. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/pci/ofw_pcibus.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/pci/psycho.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/sbus/sbus.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/sparc64/bus_machdep.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/sparc64/counter.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/sparc64/iommu.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/sparc64/machdep.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/sparc64/upa.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sun4v/include/bus_common.h#2 delete
.. //depot/projects/trustedbsd/audit_mac/src/sys/sun4v/sun4v/hv_pci.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sun4v/sun4v/hvcons.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sun4v/sun4v/machdep.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sun4v/sun4v/nexus.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sun4v/sun4v/vnex.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sys/blist.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sys/kdb.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sys/mbuf.h#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sys/mount.h#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sys/mpt_ioctl.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/sys/proc.h#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sys/umtx.h#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sys/user.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/vm/swap_pager.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/vm/vm_kern.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/vm/vm_map.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/vm/vm_map.h#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/vm/vm_mmap.c#3 integrate

Differences ...

==== //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/machdep.c#4 (text+ko) ====

@@ -39,7 +39,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.685 2008/04/22 19:38:26 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.686 2008/04/25 05:18:47 jeff Exp $");
 
 #include "opt_atalk.h"
 #include "opt_atpic.h"
@@ -53,6 +53,7 @@
 #include "opt_maxmem.h"
 #include "opt_msgbuf.h"
 #include "opt_perfmon.h"
+#include "opt_sched.h"
 
 #include 
 #include 
@@ -527,62 +528,192 @@
 		__asm__ ("hlt");
 }
 
+void (*cpu_idle_hook)(void) = NULL;	/* ACPI idle hook. */
+
+static void
+cpu_idle_hlt(int busy)
+{
+	/*
+	 * we must absolutely guarentee that hlt is the next instruction
+	 * after sti or we introduce a timing window.
+	 */
+	disable_intr();
+  	if (sched_runnable())
+		enable_intr();
+	else
+		__asm __volatile("sti; hlt");
+}
+
+static void
+cpu_idle_acpi(int busy)
+{
+	disable_intr();
+  	if (sched_runnable())
+		enable_intr();
+	else if (cpu_idle_hook)
+		cpu_idle_hook();
+	else
+		__asm __volatile("sti; hlt");
+}
+
+static void
+cpu_idle_spin(int busy)
+{
+	return;
+}
+
+void (*cpu_idle_fn)(int) = cpu_idle_acpi;
+
+void
+cpu_idle(int busy)
+{
+#ifdef SMP
+	if (mp_grab_cpu_hlt())
+		return;
+#endif
+	cpu_idle_fn(busy);
+}
+
 /*
- * Hook to idle the CPU when possible.  In the SMP case we default to
- * off because a halted cpu will not currently pick up a new thread in the
- * run queue until the next timer tick.  If turned on this will result in
- * approximately a 4.2% loss in real time performance in buildworld tests
- * (but improves user and sys times oddly enough), and saves approximately
- * 5% in power consumption on an idle machine (tests w/2xCPU 1.1GHz P3).
- *
- * XXX we need to have a cpu mask of idle cpus and generate an IPI or
- * otherwise generate some sort of interrupt to wake up cpus sitting in HLT.
- * Then we can have our cake and eat it too.
- *
- * XXX I'm turning it on for SMP as well by default for now.  It seems to
- * help lock contention somewhat, and this is critical for HTT. -Peter
+ * mwait cpu power states.  Lower 4 bits are sub-states.
  */
-static int	cpu_idle_hlt = 1;
-TUNABLE_INT("machdep.cpu_idle_hlt", &cpu_idle_hlt);
-SYSCTL_INT(_machdep, OID_AUTO, cpu_idle_hlt, CTLFLAG_RW,
-    &cpu_idle_hlt, 0, "Idle loop HLT enable");
+#define	MWAIT_C0	0xf0
+#define	MWAIT_C1	0x00
+#define	MWAIT_C2	0x10
+#define	MWAIT_C3	0x20
+#define	MWAIT_C4	0x30
+
+#define	MWAIT_DISABLED	0x0
+#define	MWAIT_WOKEN	0x1
+#define	MWAIT_WAITING	0x2
+
+static void
+cpu_idle_mwait(int busy)
+{
+	int *mwait;
+
+	mwait = (int *)PCPU_PTR(monitorbuf);
+	*mwait = MWAIT_WAITING;
+	if (sched_runnable())
+		return;
+	cpu_monitor(mwait, 0, 0);
+	if (*mwait == MWAIT_WAITING)
+		cpu_mwait(0, MWAIT_C1);
+}
 
 static void
-cpu_idle_default(void)
+cpu_idle_mwait_hlt(int busy)
+{
+	int *mwait;
+
+	mwait = (int *)PCPU_PTR(monitorbuf);
+	if (busy == 0) {
+		*mwait = MWAIT_DISABLED;
+		cpu_idle_hlt(busy);
+		return;
+	}
+	*mwait = MWAIT_WAITING;
+	if (sched_runnable())
+		return;
+	cpu_monitor(mwait, 0, 0);
+	if (*mwait == MWAIT_WAITING)
+		cpu_mwait(0, MWAIT_C1);
+}
+
+int
+cpu_idle_wakeup(int cpu)
 {
+	struct pcpu *pcpu;
+	int *mwait;
+
+	if (cpu_idle_fn == cpu_idle_spin)
+		return (1);
+	if (cpu_idle_fn != cpu_idle_mwait && cpu_idle_fn != cpu_idle_mwait_hlt)
+		return (0);
+	pcpu = pcpu_find(cpu);
+	mwait = (int *)pcpu->pc_monitorbuf;
 	/*
-	 * we must absolutely guarentee that hlt is the
-	 * absolute next instruction after sti or we
-	 * introduce a timing window.
+	 * This doesn't need to be atomic since missing the race will
+	 * simply result in unnecessary IPIs.
 	 */
-	__asm __volatile("sti; hlt");
+	if (cpu_idle_fn == cpu_idle_mwait_hlt && *mwait == MWAIT_DISABLED)
+		return (0);
+	*mwait = MWAIT_WOKEN;
+
+	return (1);
 }
 
 /*
- * Note that we have to be careful here to avoid a race between checking
- * sched_runnable() and actually halting.  If we don't do this, we may waste
- * the time between calling hlt and the next interrupt even though there
- * is a runnable process.
+ * Ordered by speed/power consumption.
  */
-void
-cpu_idle(void)
+struct {
+	void	*id_fn;
+	char	*id_name;
+} idle_tbl[] = {
+	{ cpu_idle_spin, "spin" },
+	{ cpu_idle_mwait, "mwait" },
+	{ cpu_idle_mwait_hlt, "mwait_hlt" },
+	{ cpu_idle_hlt, "hlt" },
+	{ cpu_idle_acpi, "acpi" },
+	{ NULL, NULL }
+};
+
+static int
+idle_sysctl_available(SYSCTL_HANDLER_ARGS)
+{
+	char *avail, *p;
+	int error;
+	int i;
+
+	avail = malloc(256, M_TEMP, M_WAITOK);
+	p = avail;
+	for (i = 0; idle_tbl[i].id_name != NULL; i++) {
+		if (strstr(idle_tbl[i].id_name, "mwait") &&
+		    (cpu_feature2 & CPUID2_MON) == 0)
+			continue;
+		p += sprintf(p, "%s, ", idle_tbl[i].id_name);
+	}
+	error = sysctl_handle_string(oidp, avail, 0, req);
+	free(avail, M_TEMP);
+	return (error);
+}
+
+static int
+idle_sysctl(SYSCTL_HANDLER_ARGS)
 {
+	char buf[16];
+	int error;
+	char *p;
+	int i;
 
-#ifdef SMP
-	if (mp_grab_cpu_hlt())
-		return;
-#endif
-	if (cpu_idle_hlt) {
-		disable_intr();
-  		if (sched_runnable())
-			enable_intr();
-		else
-			(*cpu_idle_hook)();
+	p = "unknown";
+	for (i = 0; idle_tbl[i].id_name != NULL; i++) {
+		if (idle_tbl[i].id_fn == cpu_idle_fn) {
+			p = idle_tbl[i].id_name;
+			break;
+		}
+	}
+	strncpy(buf, p, sizeof(buf));
+	error = sysctl_handle_string(oidp, buf, sizeof(buf), req);
+	if (error != 0 || req->newptr == NULL)
+		return (error);
+	for (i = 0; idle_tbl[i].id_name != NULL; i++) {
+		if (strstr(idle_tbl[i].id_name, "mwait") &&
+		    (cpu_feature2 & CPUID2_MON) == 0)
+			continue;
+		if (strcmp(idle_tbl[i].id_name, buf))
+			continue;
+		cpu_idle_fn = idle_tbl[i].id_fn;
+		return (0);
 	}
+	return (EINVAL);
 }
 
-/* Other subsystems (e.g., ACPI) can hook this later. */
-void (*cpu_idle_hook)(void) = cpu_idle_default;
+SYSCTL_PROC(_machdep, OID_AUTO, idle_available, CTLTYPE_STRING | CTLFLAG_RD,
+    0, 0, idle_sysctl_available, "A", "list of available idle functions");
+
+SYSCTL_PROC(_machdep, OID_AUTO, idle, CTLTYPE_STRING | CTLFLAG_RW, 0, 0,
+    idle_sysctl, "A", "currently selected idle function");
 
 /*
  * Clear registers on exec

==== //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/pmap.c#4 (text+ko) ====

@@ -77,7 +77,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.614 2008/04/10 16:04:50 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.615 2008/04/25 16:00:39 alc Exp $");
 
 /*
  *	Manages physical address maps.
@@ -2266,7 +2266,7 @@
 	 * the 2mpage to referencing the page table page.
 	 */
 	if ((oldpde & PG_MANAGED) != 0)
-		pmap_pv_demote_pde(pmap, va, oldpde & PG_FRAME);
+		pmap_pv_demote_pde(pmap, va, oldpde & PG_PS_FRAME);
 
 	pmap_pde_demotions++;
 	CTR2(KTR_PMAP, "pmap_demote_pde: success for va %#lx"
@@ -2301,10 +2301,10 @@
 		pmap_invalidate_page(kernel_pmap, sva);
 	pmap->pm_stats.resident_count -= NBPDR / PAGE_SIZE;
 	if (oldpde & PG_MANAGED) {
-		pvh = pa_to_pvh(oldpde & PG_FRAME);
+		pvh = pa_to_pvh(oldpde & PG_PS_FRAME);
 		pmap_pvh_free(pvh, pmap, sva);
 		eva = sva + NBPDR;
-		for (va = sva, m = PHYS_TO_VM_PAGE(oldpde & PG_FRAME);
+		for (va = sva, m = PHYS_TO_VM_PAGE(oldpde & PG_PS_FRAME);
 		    va < eva; va += PAGE_SIZE, m++) {
 			if ((oldpde & (PG_M | PG_RW)) == (PG_M | PG_RW))
 				vm_page_dirty(m);
@@ -2600,7 +2600,7 @@
 	oldpde = newpde = *pde;
 	if (oldpde & PG_MANAGED) {
 		eva = sva + NBPDR;
-		for (va = sva, m = PHYS_TO_VM_PAGE(oldpde & PG_FRAME);
+		for (va = sva, m = PHYS_TO_VM_PAGE(oldpde & PG_PS_FRAME);
 		    va < eva; va += PAGE_SIZE, m++) {
 			/*
 			 * In contrast to the analogous operation on a 4KB page
@@ -2839,7 +2839,7 @@
 	 * Promote the pv entries.
 	 */
 	if ((newpde & PG_MANAGED) != 0)
-		pmap_pv_promote_pde(pmap, va, newpde & PG_FRAME);
+		pmap_pv_promote_pde(pmap, va, newpde & PG_PS_FRAME);
 
 	/*
 	 * Propagate the PAT index to its proper position.
@@ -3820,7 +3820,7 @@
 				pc->pc_map[field] |= bitmask;
 				if ((tpte & PG_PS) != 0) {
 					pmap->pm_stats.resident_count -= NBPDR / PAGE_SIZE;
-					pvh = pa_to_pvh(tpte & PG_FRAME);
+					pvh = pa_to_pvh(tpte & PG_PS_FRAME);
 					TAILQ_REMOVE(&pvh->pv_list, pv, pv_list);
 					if (TAILQ_EMPTY(&pvh->pv_list)) {
 						for (mt = m; mt < &m[NBPDR / PAGE_SIZE]; mt++)
@@ -4029,7 +4029,7 @@
 					 * table page.
 					 */
 					va += VM_PAGE_TO_PHYS(m) - (oldpde &
-					    PG_FRAME);
+					    PG_PS_FRAME);
 					pmap_remove_page(pmap, va, pde, NULL);
 					rtval++;
 					if (rtval > 4) {
@@ -4098,7 +4098,7 @@
 					 * write access may repromote.
 					 */
 					va += VM_PAGE_TO_PHYS(m) - (oldpde &
-					    PG_FRAME);
+					    PG_PS_FRAME);
 					pte = pmap_pde_to_pte(pde, va);
 					oldpte = *pte;
 					if ((oldpte & PG_V) != 0) {
@@ -4163,7 +4163,8 @@
 				 * fully populated, this removal never frees
 				 * a page table page.
 				 */
-				va += VM_PAGE_TO_PHYS(m) - (oldpde & PG_FRAME);
+				va += VM_PAGE_TO_PHYS(m) - (oldpde &
+				    PG_PS_FRAME);
 				pmap_remove_page(pmap, va, pde, NULL);
 			}
 		}

==== //depot/projects/trustedbsd/audit_mac/src/sys/amd64/conf/GENERIC#4 (text+ko) ====

@@ -16,7 +16,7 @@
 # If you are in doubt as to the purpose or necessity of a line, check first
 # in NOTES.
 #
-# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.497 2008/04/20 20:35:34 sam Exp $
+# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.498 2008/05/03 17:05:38 sam Exp $
 
 cpu		HAMMER
 ident		GENERIC
@@ -235,6 +235,8 @@
 
 # Wireless NIC cards
 device		wlan		# 802.11 support
+options		IEEE80211_DEBUG	# enable debug msgs
+options		IEEE80211_AMPDU_AGE	# age frames in AMPDU reorder q's
 device		wlan_wep	# 802.11 WEP support
 device		wlan_ccmp	# 802.11 CCMP support
 device		wlan_tkip	# 802.11 TKIP support

==== //depot/projects/trustedbsd/audit_mac/src/sys/amd64/conf/NOTES#4 (text+ko) ====

@@ -4,7 +4,7 @@
 # This file contains machine dependent kernel configuration notes.  For
 # machine independent notes, look in /sys/conf/NOTES.
 #
-# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.78 2008/04/12 14:20:22 rpaulo Exp $
+# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.79 2008/04/29 21:36:15 sam Exp $
 #
 
 #
@@ -302,6 +302,7 @@
 #       (requires miibus)
 # ipw:	Intel PRO/Wireless 2100 IEEE 802.11 adapter
 # iwi:	Intel PRO/Wireless 2200BG/2225BG/2915ABG IEEE 802.11 adapters
+# iwn:	Intel Wireless WiFi Link 4965AGN 802.11 network adapters
 # nfe:	nVidia nForce MCP on-board Ethernet Networking (BSD open source)
 # nve:	nVidia nForce MCP on-board Ethernet Networking
 # ral:	Ralink Technology IEEE 802.11 wireless adapter
@@ -313,6 +314,7 @@
 options 	ED_HPP
 options 	ED_SIC
 device		iwi
+device		iwn
 device		ipw
 device		nfe		# nVidia nForce MCP on-board Ethernet Networking
 device		nve		# nVidia nForce MCP on-board Ethernet Networking

==== //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/pcpu.h#2 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/amd64/include/pcpu.h,v 1.48 2007/06/04 21:38:45 attilio Exp $
+ * $FreeBSD: src/sys/amd64/include/pcpu.h,v 1.49 2008/04/25 05:18:48 jeff Exp $
  */
 
 #ifndef _MACHINE_PCPU_H_
@@ -43,6 +43,7 @@
  * other processors"
  */
 #define	PCPU_MD_FIELDS							\
+	char	pc_monitorbuf[128] __aligned(128); /* cache line */	\
 	struct	pcpu *pc_prvspace;	/* Self-reference */		\
 	struct	pmap *pc_curpmap;					\
 	struct	amd64tss *pc_tssp;					\

==== //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/machdep.c#4 (text+ko) ====

@@ -46,7 +46,7 @@
 #include "opt_ddb.h"
 
 #include 
-__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.30 2008/04/03 16:44:49 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.31 2008/04/25 05:18:48 jeff Exp $");
 
 #include 
 #include 
@@ -326,12 +326,19 @@
 }
 
 void
-cpu_idle(void)
+cpu_idle(int busy)
 {
 	cpu_sleep(0);
 }
 
 int
+cpu_idle_wakeup(int cpu)
+{
+
+	return (0);
+}
+
+int
 fill_regs(struct thread *td, struct reg *regs)
 {
 	struct trapframe *tf = td->td_frame;

==== //depot/projects/trustedbsd/audit_mac/src/sys/arm/at91/uart_dev_at91usart.c#2 (text) ====

@@ -26,7 +26,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/arm/at91/uart_dev_at91usart.c,v 1.13 2007/12/25 17:51:55 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/at91/uart_dev_at91usart.c,v 1.14 2008/05/04 23:29:37 peter Exp $");
 
 #include "opt_comconsole.h"
 
@@ -506,9 +506,20 @@
 at91_rx_put(struct uart_softc *sc, int key)
 {
 #if defined(KDB) && defined(ALT_BREAK_TO_DEBUGGER)
+	int kdb_brk;
+
 	if (sc->sc_sysdev != NULL && sc->sc_sysdev->type == UART_DEV_CONSOLE) {
-		if (kdb_alt_break(key, &sc->sc_altbrk))
-			kdb_enter(KDB_WHY_BREAK, "Break sequence to console");
+		if ((kdb_brk = kdb_alt_break(key, &sc->sc_altbrk)) != 0) {
+		case KDB_REQ_DEBUGGER:
+			kdb_enter(KDB_WHY_BREAK, "Break sequence on console");
+			break;
+		case KDB_REQ_PANIC:
+			kdb_panic("Panic sequence on console");
+			break;
+		case KDB_REQ_REBOOT:
+			kdb_reboot();
+			break;
+		}
 	}
 #endif
 	uart_rx_put(sc, key);	

==== //depot/projects/trustedbsd/audit_mac/src/sys/conf/NOTES#5 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/NOTES,v 1.1481 2008/04/20 20:35:35 sam Exp $
+# $FreeBSD: src/sys/conf/NOTES,v 1.1484 2008/05/06 22:41:23 julian Exp $
 #
 # NOTES -- Lines that can be cut/pasted into kernel and hints configs.
 #
@@ -762,6 +762,8 @@
 device		ether			#Generic Ethernet
 device		vlan			#VLAN support (needs miibus)
 device		wlan			#802.11 support
+options		IEEE80211_DEBUG		#enable debugging msgs
+options		IEEE80211_AMPDU_AGE	#age frames in AMPDU reorder q's
 device		wlan_wep		#802.11 WEP support
 device		wlan_ccmp		#802.11 CCMP support
 device		wlan_tkip		#802.11 TKIP support
@@ -868,7 +870,12 @@
 # The MBUF_STRESS_TEST option enables options which create
 # various random failures / extreme cases related to mbuf
 # functions.  See mbuf(9) for a list of available test cases.
+# MBUF_PROFILING enables code to profile the mbuf chains
+# exiting the system (via participating interfaces) and
+# return a logarithmic histogram of monitored parameters
+# (e.g. packet size, wasted space, number of mbufs in chain).
 options 	MBUF_STRESS_TEST
+options		MBUF_PROFILING
 
 # Statically Link in accept filters
 options 	ACCEPT_FILTER_DATA

==== //depot/projects/trustedbsd/audit_mac/src/sys/conf/files#7 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.1294 2008/04/21 10:09:53 phk Exp $
+# $FreeBSD: src/sys/conf/files,v 1.1297 2008/05/06 20:49:52 jhb Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -732,6 +732,48 @@
 dev/ips/ips_ioctl.c		optional ips
 dev/ips/ips_pci.c		optional ips pci
 dev/ipw/if_ipw.c		optional ipw
+ipwbssfw.c			optional ipwbssfw | ipwfw		\
+	compile-with	"${AWK} -f $S/tools/fw_stub.awk ipw_bss.fw:ipw_bss:130 -lintel_ipw -mipw_bss -c${.TARGET}" \
+	no-implicit-rule before-depend local				\
+	clean		"ipwbssfw.c"
+ipw_bss.fwo			optional ipwbssfw | ipwfw		\
+	dependency	"ipw_bss.fw"					\
+	compile-with	"${LD} -b binary -d -warn-common -r -d -o ${.TARGET} ipw_bss.fw" \
+	no-implicit-rule						\
+	clean		"ipw_bss.fwo"
+ipw_bss.fw			optional ipwbssfw | ipwfw		\
+	dependency	".PHONY"					\
+	compile-with	"uudecode -o ${.TARGET} $S/contrib/dev/ipw/ipw2100-1.3.fw.uu" \
+	no-obj no-implicit-rule						\
+	clean		"ipw_bss.fw"
+ipwibssfw.c			optional ipwibssfw | ipwfw		\
+	compile-with	"${AWK} -f $S/tools/fw_stub.awk ipw_ibss.fw:ipw_ibss:130 -lintel_ipw -mipw_ibss -c${.TARGET}" \
+	no-implicit-rule before-depend local				\
+	clean		"ipwibssfw.c"
+ipw_ibss.fwo			optional ipwibssfw | ipwfw		\
+	dependency	"ipw_ibss.fw"					\
+	compile-with	"${LD} -b binary -d -warn-common -r -d -o ${.TARGET} ipw_ibss.fw" \
+	no-implicit-rule						\
+	clean		"ipw_ibss.fwo"
+ipw_ibss.fw			optional ipwibssfw | ipwfw		\
+	dependency	".PHONY"					\
+	compile-with	"uudecode -o ${.TARGET} $S/contrib/dev/ipw/ipw2100-1.3-i.fw.uu" \
+	no-obj no-implicit-rule						\
+	clean		"ipw_ibss.fw"
+ipwmonitorfw.c			optional ipwmonitorfw | ipwfw		\
+	compile-with	"${AWK} -f $S/tools/fw_stub.awk ipw_monitor.fw:ipw_monitor:130 -lintel_ipw -mipw_monitor -c${.TARGET}" \
+	no-implicit-rule before-depend local				\
+	clean		"ipwmonitorfw.c"
+ipw_monitor.fwo			optional ipwmonitorfw | ipwfw		\
+	dependency	"ipw_monitor.fw"				\
+	compile-with	"${LD} -b binary -d -warn-common -r -d -o ${.TARGET} ipw_monitor.fw" \
+	no-implicit-rule						\
+	clean		"ipw_monitor.fwo"
+ipw_monitor.fw			optional ipwmonitorfw | ipwfw		\
+	dependency	".PHONY"					\
+	compile-with	"uudecode -o ${.TARGET} $S/contrib/dev/ipw/ipw2100-1.3-p.fw.uu" \
+	no-obj no-implicit-rule						\
+	clean		"ipw_monitor.fw"
 dev/iscsi/initiator/iscsi.c	optional iscsi_initiator scbus
 dev/iscsi/initiator/iscsi_subr.c	optional iscsi_initiator scbus
 dev/iscsi/initiator/isc_cam.c	optional iscsi_initiator scbus
@@ -746,6 +788,63 @@
 dev/isp/isp_target.c		optional isp
 dev/ispfw/ispfw.c		optional ispfw
 dev/iwi/if_iwi.c		optional iwi
+iwibssfw.c			optional iwibssfw | iwifw		\
+	compile-with	"${AWK} -f $S/tools/fw_stub.awk iwi_bss.fw:iwi_bss:300 -lintel_iwi -miwi_bss -c${.TARGET}" \
+	no-implicit-rule before-depend local				\
+	clean		"iwibssfw.c"
+iwi_bss.fwo			optional iwibssfw | iwifw		\
+	dependency	"iwi_bss.fw"					\
+	compile-with	"${LD} -b binary -d -warn-common -r -d -o ${.TARGET} iwi_bss.fw" \
+	no-implicit-rule						\
+	clean		"iwi_bss.fwo"
+iwi_bss.fw			optional iwibssfw | iwifw		\
+	dependency	".PHONY"					\
+	compile-with	"uudecode -o ${.TARGET} $S/contrib/dev/iwi/ipw2200-bss.fw.uu" \
+	no-obj no-implicit-rule						\
+	clean		"iwi_bss.fw"
+iwiibssfw.c			optional iwiibssfw | iwifw		\
+	compile-with	"${AWK} -f $S/tools/fw_stub.awk iwi_ibss.fw:iwi_ibss:300 -lintel_iwi -miwi_ibss -c${.TARGET}" \
+	no-implicit-rule before-depend local				\
+	clean		"iwiibssfw.c"
+iwi_ibss.fwo			optional iwiibssfw | iwifw		\
+	dependency	"iwi_ibss.fw"					\
+	compile-with	"${LD} -b binary -d -warn-common -r -d -o ${.TARGET} iwi_ibss.fw" \
+	no-implicit-rule						\
+	clean		"iwi_ibss.fwo"
+iwi_ibss.fw			optional iwiibssfw | iwifw		\
+	dependency	".PHONY"					\
+	compile-with	"uudecode -o ${.TARGET} $S/contrib/dev/iwi/ipw2200-ibss.fw.uu" \
+	no-obj no-implicit-rule						\
+	clean		"iwi_ibss.fw"
+iwimonitorfw.c			optional iwimonitorfw | iwifw		\
+	compile-with	"${AWK} -f $S/tools/fw_stub.awk iwi_monitor.fw:iwi_monitor:300 -lintel_iwi -miwi_monitor -c${.TARGET}" \
+	no-implicit-rule before-depend local				\
+	clean		"iwimonitorfw.c"
+iwi_monitor.fwo			optional iwimonitorfw | iwifw		\
+	dependency	"iwi_monitor.fw"				\
+	compile-with	"${LD} -b binary -d -warn-common -r -d -o ${.TARGET} iwi_monitor.fw" \
+	no-implicit-rule						\
+	clean		"iwi_monitor.fwo"
+iwi_monitor.fw			optional iwimonitorfw | iwifw		\
+	dependency	".PHONY"					\
+	compile-with	"uudecode -o ${.TARGET} $S/contrib/dev/iwi/ipw2200-sniffer.fw.uu" \
+	no-obj no-implicit-rule						\
+	clean		"iwi_monitor.fw"
+dev/iwn/if_iwn.c		optional iwn
+iwnfw.c			optional iwnfw					\
+	compile-with	"${AWK} -f $S/tools/fw_stub.awk iwn.fw:iwnfw:44417 -lintel_iwn -miwn -c${.TARGET}" \
+	no-implicit-rule before-depend local				\
+	clean		"iwnfw.c"
+iwnfw.fwo			optional iwnfw				\
+	dependency	"iwn.fw"					\
+	compile-with	"${LD} -b binary -d -warn-common -r -d -o ${.TARGET} iwn.fw" \
+	no-implicit-rule						\
+	clean		"iwn.fwo"
+iwn.fw			optional iwnfw					\
+	dependency	".PHONY"					\
+	compile-with	"uudecode -o ${.TARGET} $S/contrib/dev/iwn/iwlwifi-4965-4.44.17.fw.uu"	\
+	no-obj no-implicit-rule						\
+	clean		"iwn.fw"
 dev/ixgb/if_ixgb.c		optional ixgb
 dev/ixgb/ixgb_ee.c		optional ixgb
 dev/ixgb/ixgb_hw.c		optional ixgb
@@ -832,6 +931,7 @@
 dev/mpt/mpt_debug.c		optional mpt
 dev/mpt/mpt_pci.c		optional mpt pci
 dev/mpt/mpt_raid.c		optional mpt
+dev/mpt/mpt_user.c		optional mpt
 dev/msk/if_msk.c		optional msk
 dev/mxge/if_mxge.c		optional mxge pci
 dev/mxge/mxge_lro.c		optional mxge pci
@@ -922,6 +1022,62 @@
 dev/ral/rt2560.c		optional ral
 dev/ral/rt2661.c		optional ral
 dev/ral/if_ral_pci.c		optional ral pci
+rt2561fw.c			optional rt2561fw | ralfw		\
+	compile-with	"${AWK} -f $S/tools/fw_stub.awk rt2561.fw:rt2561fw -mrt2561 -c${.TARGET}" \
+	no-implicit-rule before-depend local				\
+	clean		"rt2561fw.c"
+rt2561fw.fwo			optional rt2561fw | ralfw		\
+	dependency	"rt2561.fw"					\
+	compile-with	"${LD} -b binary -d -warn-common -r -d -o ${.TARGET} rt2561.fw" \
+	no-implicit-rule						\
+	clean		"rt2561.fwo"
+rt2561.fw			optional rt2561fw | ralfw		\
+	dependency	".PHONY"					\
+	compile-with	"uudecode -o ${.TARGET} $S/contrib/dev/ral/rt2561.fw.uu" \
+	no-obj no-implicit-rule						\
+	clean		"rt2561.fw"
+rt2561sfw.c			optional rt2561sfw | ralfw		\
+	compile-with	"${AWK} -f $S/tools/fw_stub.awk rt2561s.fw:rt2561sfw -mrt2561s -c${.TARGET}" \
+	no-implicit-rule before-depend local				\
+	clean		"rt2561sfw.c"
+rt2561sfw.fwo			optional rt2561sfw | ralfw		\
+	dependency	"rt2561s.fw"					\
+	compile-with	"${LD} -b binary -d -warn-common -r -d -o ${.TARGET} rt2561s.fw" \
+	no-implicit-rule						\
+	clean		"rt2561s.fwo"
+rt2561s.fw			optional rt2561sfw | ralfw		\
+	dependency	".PHONY"					\
+	compile-with	"uudecode -o ${.TARGET} $S/contrib/dev/ral/rt2561s.fw.uu"	\
+	no-obj no-implicit-rule						\
+	clean		"rt2561s.fw"
+rt2661fw.c			optional rt2661fw | ralfw		\
+	compile-with	"${AWK} -f $S/tools/fw_stub.awk rt2661.fw:rt2661fw -mrt2661 -c${.TARGET}" \
+	no-implicit-rule before-depend local				\
+	clean		"rt2661fw.c"
+rt2661fw.fwo			optional rt2661fw | ralfw		\
+	dependency	"rt2661.fw"					\
+	compile-with	"${LD} -b binary -d -warn-common -r -d -o ${.TARGET} rt2661.fw" \
+	no-implicit-rule						\
+	clean		"rt2661.fwo"
+rt2661.fw			optional rt2661fw | ralfw		\
+	dependency	".PHONY"					\
+	compile-with	"uudecode -o ${.TARGET} $S/contrib/dev/ral/rt2661.fw.uu"	\
+	no-obj no-implicit-rule						\
+	clean		"rt2661.fw"
+rt2860fw.c			optional rt2860fw | ralfw		\
+	compile-with	"${AWK} -f $S/tools/fw_stub.awk rt2860.fw:rt2860fw -mrt2860 -c${.TARGET}" \
+	no-implicit-rule before-depend local				\
+	clean		"rt2860fw.c"
+rt2860fw.fwo			optional rt2860fw | ralfw		\
+	dependency	"rt2860.fw"					\
+	compile-with	"${LD} -b binary -d -warn-common -r -d -o ${.TARGET} rt2860.fw" \
+	no-implicit-rule						\
+	clean		"rt2860.fwo"
+rt2860.fw			optional rt2860fw | ralfw		\
+	dependency	".PHONY"					\
+	compile-with	"uudecode -o ${.TARGET} $S/contrib/dev/ral/rt2860.fw.uu"	\
+	no-obj no-implicit-rule						\
+	clean		"rt2860.fw"
 dev/random/harvest.c		standard
 dev/random/hash.c		optional random
 dev/random/probe.c		optional random
@@ -1183,6 +1339,20 @@
 dev/wi/if_wi_pccard.c		optional wi pccard

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Fri May  9 00:52:02 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E578D106566C; Fri,  9 May 2008 00:52:01 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A7C6D106564A
	for ; Fri,  9 May 2008 00:52:01 +0000 (UTC)
	(envelope-from wsalamon@computer.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 964D38FC17
	for ; Fri,  9 May 2008 00:52:01 +0000 (UTC)
	(envelope-from wsalamon@computer.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m490q1IB024914
	for ; Fri, 9 May 2008 00:52:01 GMT
	(envelope-from wsalamon@computer.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m490q16u024912
	for perforce@freebsd.org; Fri, 9 May 2008 00:52:01 GMT
	(envelope-from wsalamon@computer.org)
Date: Fri, 9 May 2008 00:52:01 GMT
Message-Id: <200805090052.m490q16u024912@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	wsalamon@computer.org using -f
From: Wayne Salamon 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 141347 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Fri, 09 May 2008 00:52:02 -0000

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

Change 141347 by wsalamon@vh2 on 2008/05/09 00:52:00

	Add/move some defines needed for MAC/Audit interplay.

Affected files ...

.. //depot/projects/trustedbsd/audit_mac/src/sys/security/audit/audit.h#5 edit
.. //depot/projects/trustedbsd/audit_mac/src/sys/security/mac/mac_policy.h#5 edit

Differences ...

==== //depot/projects/trustedbsd/audit_mac/src/sys/security/audit/audit.h#5 (text) ====

@@ -184,10 +184,6 @@
 void	 audit_thread_free(struct thread *td);
 
 #ifdef MAC
-/* 
- * Arbitrary limit on how much data will be logged by the audit entry points.
- */
-#define MAC_AUDIT_DATA_LIMIT	1024
 
 /*
  * audit_mac_data() is the MAC Framework's entry point to the audit subsystem.

==== //depot/projects/trustedbsd/audit_mac/src/sys/security/mac/mac_policy.h#5 (text+ko) ====

@@ -60,6 +60,7 @@
  * alphabetically.
  */
 #include 	/* XXX acl_type_t */
+#include 	/* au_event_t */
 
 struct acl;
 struct auditinfo;
@@ -113,6 +114,20 @@
 typedef void	(*mpo_placeholder_t)(void);
 
 /*
+ * Arbitrary limit on how much data can be logged by the audit entry points.
+ */
+#define	MAC_AUDIT_DATA_LIMIT	1024
+
+/*
+ * Values returned by mac_audit_{pre,post}select. To combine the responses
+ * of the security policies into a single decision,
+ * mac_audit_{pre,post}select() choose the greatest value returned.
+ */
+#define	MAC_AUDIT_DEFAULT	0	/* use system behavior */
+#define	MAC_AUDIT_NO		1	/* force not auditing this event */
+#define	MAC_AUDIT_YES		2	/* force auditing this event */
+
+/*
  * Operations sorted alphabetically by primary object type and then method.
  */
 typedef int	(*mpo_audit_check_preselect_t)(struct ucred *cred,

From owner-p4-projects@FreeBSD.ORG  Fri May  9 03:54:03 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id EEA121065766; Fri,  9 May 2008 03:53:12 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6ECB51065709
	for ; Fri,  9 May 2008 03:52:40 +0000 (UTC)
	(envelope-from thompsa@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 600038FC13
	for ; Fri,  9 May 2008 03:52:39 +0000 (UTC)
	(envelope-from thompsa@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m493qdCe034028
	for ; Fri, 9 May 2008 03:52:39 GMT
	(envelope-from thompsa@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m493qTIA034026
	for perforce@freebsd.org; Fri, 9 May 2008 03:52:29 GMT
	(envelope-from thompsa@freebsd.org)
Date: Fri, 9 May 2008 03:52:29 GMT
Message-Id: <200805090352.m493qTIA034026@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	thompsa@freebsd.org using -f
From: Andrew Thompson 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 141357 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Fri, 09 May 2008 03:54:11 -0000

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

Change 141357 by thompsa@thompsa_burger on 2008/05/09 03:52:02

	Fix some vap handling.
	 - Only start the vaps if the init routine passed.
	 - Remove double vap init in NDIS.

Affected files ...

.. //depot/projects/vap/sys/compat/ndis/kern_ndis.c#7 edit
.. //depot/projects/vap/sys/compat/ndis/ntoskrnl_var.h#7 edit
.. //depot/projects/vap/sys/compat/ndis/subr_ndis.c#7 edit
.. //depot/projects/vap/sys/compat/ndis/subr_ntoskrnl.c#7 edit
.. //depot/projects/vap/sys/dev/bwi/if_bwi.c#21 edit
.. //depot/projects/vap/sys/dev/if_ndis/if_ndis.c#22 edit
.. //depot/projects/vap/sys/dev/ipw/if_ipw.c#19 edit
.. //depot/projects/vap/sys/dev/ral/rt2560.c#35 edit
.. //depot/projects/vap/sys/dev/ral/rt2661.c#33 edit
.. //depot/projects/vap/sys/dev/wi/if_wi.c#32 edit

Differences ...

==== //depot/projects/vap/sys/compat/ndis/kern_ndis.c#7 (text+ko) ====

@@ -101,6 +101,11 @@
 
 static struct nd_head ndis_devhead;
 
+#ifdef NDIS_DEBUG
+int ndis_debug = 0;
+SYSCTL_INT(_debug, OID_AUTO, ndis, CTLFLAG_RW, &ndis_debug, 0,
+    "ndis debug level");
+#endif
 /*
  * This allows us to export our symbols to other modules.
  * Note that we call ourselves 'ndisapi' to avoid a namespace

==== //depot/projects/vap/sys/compat/ndis/ntoskrnl_var.h#7 (text+ko) ====

@@ -35,6 +35,22 @@
 #ifndef _NTOSKRNL_VAR_H_
 #define _NTOSKRNL_VAR_H_
 
+#define NDIS_DEBUG
+#ifdef NDIS_DEBUG
+#define DPRINTF(fmt, args...)	\
+	do { if (ndis_debug > 0) printf("NDIS: " fmt, ##args); } while (0)
+#define DPRINTFN(n, fmt, args...)	\
+	do { if (ndis_debug >= (n)) printf("NDIS: " fmt, ##args); } while (0)
+#define NDISTRACE(fmt, args...)		\
+	if (ndis_debug >= 10)		\
+		printf("NDIS: %s(" fmt ")\n", __func__, ##args);
+extern int ndis_debug;
+#else
+#define DPRINTF(x)
+#define DPRINTFN(x)
+#define NDISTRACE(x)
+#endif
+
 #define MTX_NTOSKRNL_SPIN_LOCK "NDIS thread lock"
 
 /*

==== //depot/projects/vap/sys/compat/ndis/subr_ndis.c#7 (text+ko) ====

@@ -362,6 +362,8 @@
 	void			*path;
 	void			*unused;
 {
+	NDISTRACE("%p, %p, %p, %p", wrapper, drv, path, unused);
+
 	/*
 	 * As of yet, I haven't come up with a compelling
 	 * reason to define a private NDIS wrapper structure,
@@ -392,6 +394,8 @@
 	ndis_handle		handle;
 	void			*syspec;
 {
+	NDISTRACE("%p, %p", handle, syspec);
+
 	/* Nothing to see here, move along. */
 	return;
 }
@@ -402,6 +406,8 @@
 	ndis_miniport_characteristics *characteristics;
 	int			len;
 {
+	NDISTRACE("%p, %p, %u", handle, characteristics, len);
+
 	ndis_miniport_characteristics	*ch = NULL;
 	driver_object		*drv;
 
@@ -513,6 +519,8 @@
 	ndis_handle		*cfg;
 	ndis_handle		wrapctx;
 {
+	NDISTRACE("%p, %p, %p", status, cfg, wrapctx);
+
 	*cfg = wrapctx;
 	*status = NDIS_STATUS_SUCCESS;
 
@@ -810,6 +818,8 @@
 NdisAllocateSpinLock(lock)
 	ndis_spin_lock		*lock;
 {
+	NDISTRACE("%p", lock);
+
 	KeInitializeSpinLock(&lock->nsl_spinlock);
 	lock->nsl_kirql = 0;
 
@@ -828,6 +838,8 @@
 NdisFreeSpinLock(lock)
 	ndis_spin_lock		*lock;
 {
+	NDISTRACE("%p", lock);
+
 #ifdef notdef
 	KeInitializeSpinLock(&lock->nsl_spinlock);
 	lock->nsl_kirql = 0;
@@ -932,6 +944,8 @@
 	char			*dest;
 	device_t		dev;
 
+	NDISTRACE("%p, %u, %u, %p, %u", adapter, slot, offset, buf, len);
+
 	block = (ndis_miniport_block *)adapter;
 	dest = buf;
 	if (block == NULL)
@@ -970,6 +984,8 @@
 	void			*buf;
 	uint32_t		len;
 {
+	NDISTRACE("%p, %u, %u, %p, %u", adapter, slot, offset, buf, len);
+
 	ndis_miniport_block	*block;
 	int			i;
 	char			*dest;

==== //depot/projects/vap/sys/compat/ndis/subr_ntoskrnl.c#7 (text+ko) ====

@@ -657,6 +657,8 @@
 {
 	void			*buf;
 
+	NDISTRACE("%u, %zu, %u", pooltype, len, tag);
+
 	buf = malloc(len, M_DEVBUF, M_NOWAIT|M_ZERO);
 	if (buf == NULL)
 		return(NULL);
@@ -668,6 +670,8 @@
 ExFreePool(buf)
 	void			*buf;
 {
+	NDISTRACE("%p", buf);
+
 	free(buf, M_DEVBUF);
 	return;
 }
@@ -681,6 +685,8 @@
 {
 	custom_extension	*ce;
 
+	NDISTRACE("%p, %p, %u, %p", drv, clid, extlen, ext);
+
 	ce = ExAllocatePoolWithTag(NonPagedPool, sizeof(custom_extension)
 	    + extlen, 0);
 
@@ -703,6 +709,8 @@
 	list_entry		*e;
 	custom_extension	*ce;
 
+	NDISTRACE("%p, %p", drv, clid);
+
 	/*
 	 * Sanity check. Our dummy bus drivers don't have
 	 * any driver extentions.
@@ -735,6 +743,9 @@
 {
 	device_object		*dev;
 
+	NDISTRACE("%p, %u, str, %u, %u, %u, %p", drv, devextlen, devtype,
+	    devchars, exclusive, newdev);
+
 	dev = ExAllocatePoolWithTag(NonPagedPool, sizeof(device_object), 0);
 	if (dev == NULL)
 		return(STATUS_INSUFFICIENT_RESOURCES);
@@ -815,6 +826,8 @@
 {
 	device_object		*prev;
 
+	NDISTRACE("%p", dev);
+
 	if (dev == NULL)
 		return;
 
@@ -846,6 +859,8 @@
 {
 	device_object		*d;
 
+	NDISTRACE("%p", dev);
+
 	if (dev == NULL)
 		return (NULL);
 
@@ -869,6 +884,9 @@
 {
 	irp			*ip;
 
+	NDISTRACE("%u, %p, %p, %u, %p, %p, %p", func, dobj, buf, len, off,
+	    event, status);
+
 	ip = IoBuildAsynchronousFsdRequest(func, dobj, buf, len, off, status);
 	if (ip == NULL)
 		return(NULL);
@@ -889,6 +907,8 @@
 	irp			*ip;
 	io_stack_location	*sl;
 
+	NDISTRACE("%u, %p, %p, %u, %p, %p", func, dobj, buf, len, off, status);
+
 	ip = IoAllocateIrp(dobj->do_stacksize, TRUE);
 	if (ip == NULL)
 		return(NULL);
@@ -965,6 +985,9 @@
 	io_stack_location	*sl;
 	uint32_t		buflen;
 
+	NDISTRACE("%u, %p, %p, %u, %p, %u, %u, %p, %p", iocode, dobj, ibuf,
+	    ilen, obuf, olen, isinternal, event, status);
+
 	ip = IoAllocateIrp(dobj->do_stacksize, TRUE);
 	if (ip == NULL)
 		return(NULL);
@@ -1051,6 +1074,8 @@
 {
 	irp			*i;
 
+	NDISTRACE("%u, %u", stsize, chargequota);
+
 	i = ExAllocatePoolWithTag(NonPagedPool, IoSizeOfIrp(stsize), 0);
 	if (i == NULL)
 		return (NULL);
@@ -1067,6 +1092,8 @@
 {
 	irp			*associrp;
 
+	NDISTRACE("%p, %u", ip, stsize);
+
 	associrp = IoAllocateIrp(stsize, FALSE);
 	if (associrp == NULL)
 		return(NULL);
@@ -1085,6 +1112,8 @@
 IoFreeIrp(ip)
 	irp			*ip;
 {
+	NDISTRACE("%p", ip);
+
 	ExFreePool(ip);
 	return;
 }
@@ -1095,6 +1124,8 @@
 	uint16_t		psize;
 	uint8_t			ssize;
 {
+	NDISTRACE("%p, %u, %u", io, psize, ssize);
+
 	bzero((char *)io, IoSizeOfIrp(ssize));
 	io->irp_size = psize;
 	io->irp_stackcnt = ssize;
@@ -1113,6 +1144,8 @@
 {
 	uint8_t			allocflags;
 
+	NDISTRACE("%p, %u", ip, status);
+
 	allocflags = ip->irp_allocflags;
 	IoInitializeIrp(ip, ip->irp_size, ip->irp_stackcnt);
 	ip->irp_iostat.isb_status = status;
@@ -1142,6 +1175,8 @@
 {
 	cancel_func		cfunc;
 
+	NDISTRACE("%p", ip);
+
 	IoAcquireCancelSpinLock(&ip->irp_cancelirql);
 	cfunc = IoSetCancelRoutine(ip, NULL);
 	ip->irp_cancel = TRUE;
@@ -1163,6 +1198,8 @@
 	uint32_t		status;
 	driver_dispatch		disp;
 
+	NDISTRACE("%p, %p", dobj, ip);
+
 	drvobj = dobj->do_drvobj;
 
 	if (ip->irp_currentstackloc <= 0)
@@ -1190,6 +1227,8 @@
 	io_stack_location	*sl;
 	completion_func		cf;
 
+	NDISTRACE("%p, %u", ip, prioboost);
+
 	ip->irp_pendingreturned =
 	    IoGetCurrentIrpStackLocation(ip)->isl_ctl & SL_PENDING_RETURNED;
 	sl = (io_stack_location *)(ip + 1);
@@ -1346,6 +1385,10 @@
 {
 	uint8_t			curirql;
 
+	NDISTRACE("%p, %p, %p, %p, %u, %u, %u, %u, %u, %u, %u", iobj, svcfunc,
+	    svcctx, lock, vector, irql, syncirql, imode, shared, affinity,
+	    savefloat);
+
 	*iobj = ExAllocatePoolWithTag(NonPagedPool, sizeof(kinterrupt), 0);
 	if (*iobj == NULL)
 		return(STATUS_INSUFFICIENT_RESOURCES);
@@ -1372,6 +1415,8 @@
 {
 	uint8_t			irql;
 
+	NDISTRACE("%p", iobj);
+
 	if (iobj == NULL)
 		return;
 
@@ -1391,6 +1436,8 @@
 {
 	device_object		*attached;
 
+	NDISTRACE("%p, %p", src, dst);
+
 	mtx_lock(&ntoskrnl_dispatchlock);
 	attached = IoGetAttachedDevice(dst);
 	attached->do_attacheddev = src;
@@ -1407,6 +1454,8 @@
 {
 	device_object		*tail;
 
+	NDISTRACE("%p", topdev);
+
 	mtx_lock(&ntoskrnl_dispatchlock);
 
 	/* First, break the chain. */
@@ -2205,6 +2254,9 @@
 	uint32_t		tag;
 	uint16_t		depth;
 {
+	NDISTRACE("%p, %p, %p, %u, %zu, %u, %u", lookaside, allocfunc,
+	    freefunc, flags, size, tag, depth);
+
 	bzero((char *)lookaside, sizeof(paged_lookaside_list));
 
 	if (size < sizeof(slist_entry))
@@ -2242,6 +2294,8 @@
 	void			*buf;
 	void		(*freefunc)(void *);
 
+	NDISTRACE("%p", lookaside);
+
 	freefunc = lookaside->nll_l.gl_freefunc;
 	while((buf = ntoskrnl_popsl(&lookaside->nll_l.gl_listhead)) != NULL)
 		MSCALL1(freefunc, buf);
@@ -2260,6 +2314,9 @@
 	uint32_t		tag;
 	uint16_t		depth;
 {
+	NDISTRACE("%p, %p, %p, %u, %zu, %u, %u", lookaside, allocfunc,
+	    freefunc, flags, size, tag, depth);
+
 	bzero((char *)lookaside, sizeof(npaged_lookaside_list));
 
 	if (size < sizeof(slist_entry))
@@ -2297,6 +2354,8 @@
 	void			*buf;
 	void		(*freefunc)(void *);
 
+	NDISTRACE("%p", lookaside);
+
 	freefunc = lookaside->nll_l.gl_freefunc;
 	while((buf = ntoskrnl_popsl(&lookaside->nll_l.gl_listhead)) != NULL)
 		MSCALL1(freefunc, buf);
@@ -2486,6 +2545,9 @@
 	mdl			*m;
 	int			zone = 0;
 
+	NDISTRACE("%p, %u, %u, %u, %p", vaddr, len, secondarybuf, chargequota,
+	    iopkt);
+
 	if (MmSizeOfMdl(vaddr, len) > MDL_ZONE_SIZE)
 		m = ExAllocatePoolWithTag(NonPagedPool,
 		    MmSizeOfMdl(vaddr, len), 0);
@@ -2529,6 +2591,8 @@
 IoFreeMdl(m)
 	mdl			*m;
 {
+	NDISTRACE("%p", m);
+
 	if (m == NULL)
 		return;
 
@@ -2548,6 +2612,8 @@
 	void *addr;
 	size_t pagelength = roundup(size, PAGE_SIZE);
 
+	NDISTRACE("%u, %ju", size, highest);
+
 	addr = ExAllocatePoolWithTag(NonPagedPool, pagelength, 0);
 
 	return(addr);
@@ -2565,6 +2631,9 @@
 	void *addr;
 	size_t pagelength = roundup(size, PAGE_SIZE);
 
+	NDISTRACE("%u, %ju, %ju, %ju, %u", size, lowest, highest, boundary,
+	    cachetype);
+
 	addr = ExAllocatePoolWithTag(NonPagedPool, pagelength, 0);
 
 	return(addr);
@@ -2574,6 +2643,8 @@
 MmFreeContiguousMemory(base)
 	void			*base;
 {
+	NDISTRACE("%p", base);
+
 	ExFreePool(base);
 }
 
@@ -2583,6 +2654,8 @@
 	uint32_t		size;
 	uint32_t		cachetype;
 {
+	NDISTRACE("%p", base);
+
 	ExFreePool(base);
 }
 
@@ -2613,6 +2686,8 @@
 	vm_offset_t		*mdl_pages;
 	int			pagecnt, i;
 
+	NDISTRACE("%p", m);
+
 	pagecnt = SPAN_PAGES(m->mdl_byteoffset, m->mdl_bytecount);
 
 	if (pagecnt > (m->mdl_size - sizeof(mdl)) / sizeof(vm_offset_t *))
@@ -2874,6 +2949,8 @@
 {
 	io_workitem		*iw;
 
+	NDISTRACE("%p", dobj);
+
 	iw = uma_zalloc(iw_zone, M_NOWAIT);
 	if (iw == NULL)
 		return(NULL);
@@ -2893,6 +2970,8 @@
 IoFreeWorkItem(iw)
 	io_workitem		*iw;
 {
+	NDISTRACE("%p", iw);
+
 	uma_zfree(iw_zone, iw);
 	return;
 }
@@ -2909,6 +2988,8 @@
 	io_workitem		*cur;
 	uint8_t			irql;
 
+	NDISTRACE("%p, %p, %u, %p", iw, iw_func, qtype, ctx);
+
 	kq = wq_queues + iw->iw_idx;
 
 	KeAcquireSpinLock(&kq->kq_lock, &irql);
@@ -2996,6 +3077,7 @@
 	io_workitem		*cur;
 	uint8_t			irql;
 
+	NDISTRACE("%p, %u", w, qtype);
 
 	/*
 	 * We need to do a special sanity test to make sure
@@ -3244,6 +3326,8 @@
 	driver_object		*drv;
 	uint16_t		**name;
 
+	NDISTRACE("%p, %u, %u, %p, %p", devobj, regprop, buflen, prop, reslen);
+
 	drv = devobj->do_drvobj;
 
 	switch (regprop) {
@@ -3265,6 +3349,8 @@
 	kmutant			*kmutex;
 	uint32_t		level;
 {
+	NDISTRACE("%p, %u", kmutex, level);
+
 	InitializeListHead((&kmutex->km_header.dh_waitlisthead));
 	kmutex->km_abandoned = FALSE;
 	kmutex->km_apcdisable = 1;
@@ -3315,6 +3401,8 @@
 	uint32_t		type;
 	uint8_t			state;
 {
+	NDISTRACE("%p, %u, %u", kevent, type, state);
+
 	InitializeListHead((&kevent->k_header.dh_waitlisthead));
 	kevent->k_header.dh_sigstate = state;
 	if (type == EVENT_TYPE_NOTIFY)
@@ -3331,6 +3419,8 @@
 {
 	uint32_t		prevstate;
 
+	NDISTRACE("%p", kevent);
+
 	mtx_lock(&ntoskrnl_dispatchlock);
 	prevstate = kevent->k_header.dh_sigstate;
 	kevent->k_header.dh_sigstate = FALSE;
@@ -3351,6 +3441,8 @@
 	struct thread		*td;
 	wb_ext			*we;
 
+	NDISTRACE("%p, %u, %u", kevent, increment, kwait);
+
 	mtx_lock(&ntoskrnl_dispatchlock);
 	prevstate = kevent->k_header.dh_sigstate;
 	dh = &kevent->k_header;
@@ -3398,6 +3490,8 @@
 KeClearEvent(kevent)
 	nt_kevent		*kevent;
 {
+	NDISTRACE("%p", kevent);
+
 	kevent->k_header.dh_sigstate = FALSE;
 	return;
 }
@@ -3455,6 +3549,9 @@
 {
 	nt_objref		*nr;
 
+	NDISTRACE("%p, %u, %p, %u, %p, %p", handle, reqaccess, otype,
+	    accessmode, object, handleinfo);
+
 	nr = malloc(sizeof(nt_objref), M_DEVBUF, M_NOWAIT|M_ZERO);
 	if (nr == NULL)
 		return(STATUS_INSUFFICIENT_RESOURCES);
@@ -3477,6 +3574,8 @@
 {
 	nt_objref		*nr;
 
+	NDISTRACE("%p", object);
+
 	nr = object;
 	TAILQ_REMOVE(&ntoskrnl_reflist, nr, link);
 	free(nr, M_DEVBUF);
@@ -3557,6 +3656,9 @@
 	thread_context		*tc;
 	struct proc		*p;
 
+	NDISTRACE("%p, %u, %p, %p, %p, %p, %p", handle, reqaccess, objattrs,
+	    phandle, clientid, thrfunc, thrctx);
+
 	tc = malloc(sizeof(thread_context), M_TEMP, M_NOWAIT);
 	if (tc == NULL)
 		return(STATUS_INSUFFICIENT_RESOURCES);
@@ -3593,6 +3695,8 @@
 {
 	struct nt_objref	*nr;
 
+	NDISTRACE("");
+
 	mtx_lock(&ntoskrnl_dispatchlock);
 	TAILQ_FOREACH(nr, &ntoskrnl_reflist, link) {
 		if (nr->no_obj != curthread->td_proc)
@@ -3617,7 +3721,7 @@
 {
 	va_list			ap;
 
-	if (bootverbose) {
+	if (bootverbose || ndis_debug) {
 		va_start(ap, fmt);
 		vprintf(fmt, ap);
 	}
@@ -3824,6 +3928,8 @@
 	ktimer			*timer;
 	uint32_t		type;
 {
+	NDISTRACE("%p, %u", timer, type);
+
 	if (timer == NULL)
 		return;
 
@@ -3988,6 +4094,7 @@
 	void			*dpcfunc;
 	void			*dpcctx;
 {
+	NDISTRACE("%p, %p, %p", dpc, dpcfunc, dpcctx);
 
 	if (dpc == NULL)
 		return;
@@ -4011,6 +4118,8 @@
 	uint8_t			r;
 	uint8_t			irql;
 
+	NDISTRACE("%p, %p, %p", dpc, sysarg1, sysarg2);
+
 	if (dpc == NULL)
 		return(FALSE);
 
@@ -4055,6 +4164,8 @@
 	kdpc_queue		*kq;
 	uint8_t			irql;
 
+	NDISTRACE("%p", dpc);
+
 	if (dpc == NULL)
 		return(FALSE);
 
@@ -4088,6 +4199,8 @@
 	kdpc			*dpc;
 	uint32_t		imp;
 {
+	NDISTRACE("%p, %u", dpc, imp);
+
 	if (imp != KDPC_IMPORTANCE_LOW &&
 	    imp != KDPC_IMPORTANCE_MEDIUM &&
 	    imp != KDPC_IMPORTANCE_HIGH)
@@ -4102,6 +4215,8 @@
 	kdpc			*dpc;
 	uint8_t			cpu;
 {
+	NDISTRACE("%p, %u", dpc, cpu);
+
 	if (cpu > mp_ncpus)
 		return;
 
@@ -4115,6 +4230,8 @@
 	kdpc_queue		*kq;
 	int			i;
 
+	NDISTRACE("");
+
 	/*
 	 * Poke each DPC queue and wait
 	 * for them to drain.
@@ -4150,6 +4267,8 @@
 	uint64_t		curtime;
 	uint8_t			pending;
 
+	NDISTRACE("%p, %ju, %u, %p", timer, duetime, period, dpc);
+
 	if (timer == NULL)
 		return(FALSE);
 
@@ -4217,9 +4336,14 @@
 {
 	uint8_t			pending;
 
+	NDISTRACE("%p", timer);
+
 	if (timer == NULL)
 		return(FALSE);
 
+	if (timer->k_dpc)
+		printf("NDIS: KeCancelTimer with pending DPC\n");
+
 	mtx_lock(&ntoskrnl_dispatchlock);
 
 	pending = timer->k_header.dh_inserted;
@@ -4241,6 +4365,8 @@
 KeReadStateTimer(timer)
 	ktimer			*timer;
 {
+	NDISTRACE("%p", timer);
+
 	return(timer->k_header.dh_sigstate);
 }
 

==== //depot/projects/vap/sys/dev/bwi/if_bwi.c#21 (text+ko) ====

@@ -1222,10 +1222,15 @@
 bwi_init(void *xsc)
 {
 	struct bwi_softc *sc = xsc;
+	struct ifnet *ifp = sc->sc_ifp;
+	struct ieee80211com *ic = ifp->if_l2com;
 
 	BWI_LOCK(sc);
 	bwi_init_statechg(sc, 1);
 	BWI_UNLOCK(sc);
+
+	if (ifp->if_drv_flags & IFF_DRV_RUNNING)
+		ieee80211_start_all(ic);		/* start all vap's */
 }
 
 static void

==== //depot/projects/vap/sys/dev/if_ndis/if_ndis.c#22 (text+ko) ====

@@ -1979,8 +1979,6 @@
 	ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
 
 	NDIS_UNLOCK(sc);
-
-	/* XXX force handling */
 	ieee80211_start_all(ic);		/* start all vap's */
 
 	/*
@@ -2813,10 +2811,8 @@
 	case SIOCSIFFLAGS:
 		/*NDIS_LOCK(sc);*/
 		if (ifp->if_flags & IFF_UP) {
-			if (!(ifp->if_drv_flags & IFF_DRV_RUNNING)) {
+			if (!(ifp->if_drv_flags & IFF_DRV_RUNNING))
 				ndis_init(sc);
-				ieee80211_start_all(ic);
-			}
 		} else {
 			if (ifp->if_drv_flags & IFF_DRV_RUNNING)
 				ndis_stop(sc);

==== //depot/projects/vap/sys/dev/ipw/if_ipw.c#19 (text+ko) ====

@@ -2406,7 +2406,8 @@
 	ipw_init_locked(sc);
 	IPW_UNLOCK(sc);
 
-	ieee80211_start_all(ic);
+	if (ifp->if_drv_flags & IFF_DRV_RUNNING)
+		ieee80211_start_all(ic);
 }
 
 static void

==== //depot/projects/vap/sys/dev/ral/rt2560.c#35 (text) ====

@@ -2751,7 +2751,8 @@
 	rt2560_init_locked(sc);
 	RAL_UNLOCK(sc);
 
-	ieee80211_start_all(ic);
+	if (ifp->if_drv_flags & IFF_DRV_RUNNING)
+		ieee80211_start_all(ic);		/* start all vap's */
 }
 
 static void

==== //depot/projects/vap/sys/dev/ral/rt2661.c#33 (text) ====

@@ -2496,7 +2496,8 @@
 	rt2661_init_locked(sc);
 	RAL_UNLOCK(sc);
 
-	ieee80211_start_all(ic);
+	if (ifp->if_drv_flags & IFF_DRV_RUNNING)
+		ieee80211_start_all(ic);		/* start all vap's */
 }
 
 void

==== //depot/projects/vap/sys/dev/wi/if_wi.c#32 (text+ko) ====

@@ -704,7 +704,8 @@
 	wi_init_locked(sc);
 	WI_UNLOCK(sc);
 
-	ieee80211_start_all(ic);
+	if (ifp->if_drv_flags & IFF_DRV_RUNNING)
+		ieee80211_start_all(ic);		/* start all vap's */
 }
 
 static void

From owner-p4-projects@FreeBSD.ORG  Fri May  9 04:04:00 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id F14C4106568C; Fri,  9 May 2008 04:03:57 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 21CD110656E3
	for ; Fri,  9 May 2008 04:03:51 +0000 (UTC)
	(envelope-from thompsa@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id D9A778FC26
	for ; Fri,  9 May 2008 04:03:50 +0000 (UTC)
	(envelope-from thompsa@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m4943oZK035558
	for ; Fri, 9 May 2008 04:03:50 GMT
	(envelope-from thompsa@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m4943omq035556
	for perforce@freebsd.org; Fri, 9 May 2008 04:03:50 GMT
	(envelope-from thompsa@freebsd.org)
Date: Fri, 9 May 2008 04:03:50 GMT
Message-Id: <200805090403.m4943omq035556@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	thompsa@freebsd.org using -f
From: Andrew Thompson 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 141358 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Fri, 09 May 2008 04:04:04 -0000

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

Change 141358 by thompsa@thompsa_burger on 2008/05/09 04:03:10

	Commit the rest of the DPRINTF changes since I accidentally included
	the compat/ndis files in the last p4 submit.

Affected files ...

.. //depot/projects/vap/sys/dev/if_ndis/if_ndis.c#23 edit

Differences ...

==== //depot/projects/vap/sys/dev/if_ndis/if_ndis.c#23 (text+ko) ====

@@ -83,16 +83,6 @@
 #include 
 #include 
 
-#define NDIS_DEBUG
-#ifdef NDIS_DEBUG
-#define DPRINTF(x)	do { if (ndis_debug > 0) printf x; } while (0)
-int ndis_debug = 0;
-SYSCTL_INT(_debug, OID_AUTO, ndis, CTLFLAG_RW, &ndis_debug, 0,
-    "if_ndis debug level");
-#else
-#define DPRINTF(x)
-#endif
-
 MODULE_DEPEND(ndis, ether, 1, 1, 1);
 MODULE_DEPEND(ndis, wlan, 1, 1, 1);
 MODULE_DEPEND(ndis, ndisapi, 1, 1, 1);
@@ -497,7 +487,7 @@
 	case NDIS_80211_NETTYPE_11OFDM5:	return (IEEE80211_CHAN_A);
 	case NDIS_80211_NETTYPE_11OFDM24:	return (IEEE80211_CHAN_G);
 	}
-	DPRINTF(("unknown channel nettype %d\n", type));
+	DPRINTF("unknown channel nettype %d\n", type);
 	return (IEEE80211_CHAN_B);	/* Default to 11B chan */
 }
 
@@ -510,7 +500,7 @@
 	case NDIS_80211_NETTYPE_11OFDM5:	return (IEEE80211_MODE_11A);
 	case NDIS_80211_NETTYPE_11OFDM24:	return (IEEE80211_MODE_11G);
 	}
-	DPRINTF(("unknown mode nettype %d\n", type));
+	DPRINTF("unknown mode nettype %d\n", type);
 	return (IEEE80211_MODE_AUTO);
 }
 
@@ -1687,6 +1677,7 @@
 	NDIS_LOCK(sc);
 	if (sc->ndis_link == 0 &&
 	    sc->ndis_sts == NDIS_STATUS_MEDIA_CONNECT) {
+		DPRINTF("NDIS link up\n");
 		sc->ndis_link = 1;
 		NDIS_UNLOCK(sc);
 		if (sc->ndis_80211) {
@@ -1699,6 +1690,7 @@
 
 	if (sc->ndis_link == 1 &&
 	    sc->ndis_sts == NDIS_STATUS_MEDIA_DISCONNECT) {
+		DPRINTF("NDIS link down\n");
 		sc->ndis_link = 0;
 		if (sc->ndis_80211)
 			ieee80211_new_state(vap, IEEE80211_S_SCAN, 0);
@@ -2095,7 +2087,7 @@
 		arg = NDIS_80211_WEPSTAT_ENC3ENABLED;
 	}
 
-	DPRINTF(("Setting cipher to %d\n", arg));
+	DPRINTF("Setting cipher to %d\n", arg);
 	save = arg;
 	rval = ndis_set_info(sc, OID_802_11_ENCRYPTION_STATUS, &arg, &len);
 
@@ -2146,7 +2138,7 @@
 
 	/* Check for the right kind of IE. */
 	if (w->wpa_id != IEEE80211_ELEMID_VENDOR) {
-		DPRINTF(("Incorrect IE type %d\n", w->wpa_id));
+		DPRINTF("Incorrect IE type %d\n", w->wpa_id);
 		return(EINVAL);
 	}
 
@@ -2172,7 +2164,7 @@
 	if (n->ni_val == WPA_ASE_8021X_PSK)
 		arg = NDIS_80211_AUTHMODE_WPAPSK;
 
-	DPRINTF(("Setting WPA auth mode to %d\n", arg));
+	DPRINTF("Setting WPA auth mode to %d\n", arg);
 	i = sizeof(arg);
 	if (ndis_set_info(sc, OID_802_11_AUTHENTICATION_MODE, &arg, &i))
 		return(ENOTSUP);
@@ -2244,7 +2236,7 @@
 	ni = vap->iv_bss;
 
 	if (!NDIS_INITIALIZED(sc)) {
-		DPRINTF(("%s: NDIS not initialized\n", __func__));
+		DPRINTF("%s: NDIS not initialized\n", __func__);
 		return;
 	}
 
@@ -2261,7 +2253,7 @@
 		arg = NDIS_80211_NET_INFRA_IBSS;
 	else
 		arg = NDIS_80211_NET_INFRA_BSS;
-
+	DPRINTF("setting INFRA mode to %d\n", arg);
 	rval = ndis_set_info(sc, OID_802_11_INFRASTRUCTURE_MODE, &arg, &len);
 
 	if (rval)
@@ -2271,12 +2263,14 @@
 
 	len = sizeof(arg);
 	arg = vap->iv_rtsthreshold;
+	DPRINTF("setting RTS threshold to %d\n", arg);
 	ndis_set_info(sc, OID_802_11_RTS_THRESHOLD, &arg, &len);
 
 	/* Set fragmentation threshold */
 
 	len = sizeof(arg);
 	arg = vap->iv_fragthreshold;
+	DPRINTF("setting FRAG threshold to %d\n", arg);
 	ndis_set_info(sc, OID_802_11_FRAGMENTATION_THRESHOLD, &arg, &len);
 
 	/* Set power management */
@@ -2318,7 +2312,7 @@
 		if (ni->ni_authmode == IEEE80211_AUTH_SHARED) {
 			len = sizeof(arg);
 			arg = NDIS_80211_AUTHMODE_SHARED;
-			DPRINTF(("Setting shared auth\n"));
+			DPRINTF("Setting shared auth\n");
 			ndis_set_info(sc, OID_802_11_AUTHENTICATION_MODE,
 			    &arg, &len);
 		}
@@ -2353,7 +2347,7 @@
 				bcopy(vap->iv_nw_keys[i].wk_key,
 				    wep.nw_keydata, wep.nw_length);
 				len = sizeof(wep);
-				DPRINTF(("Setting WEP key %d\n", i));
+				DPRINTF("Setting WEP key %d\n", i);
 				rval = ndis_set_info(sc,
 				    OID_802_11_ADD_WEP, &wep, &len);
 				if (rval)
@@ -2363,7 +2357,7 @@
 			}
 		}
 		if (keys_set) {
-			DPRINTF(("Setting WEP on\n"));
+			DPRINTF("Setting WEP on\n");
 			arg = NDIS_80211_WEPSTAT_ENABLED;
 			len = sizeof(arg);
 			rval = ndis_set_info(sc,
@@ -2412,7 +2406,7 @@
 	}
 
 	if (arg) {
-		DPRINTF(("Setting network type to %d\n", arg));
+		DPRINTF("Setting network type to %d\n", arg);
 		len = sizeof(arg);
 		rval = ndis_set_info(sc, OID_802_11_NETWORK_TYPE_IN_USE,
 		    &arg, &len);
@@ -2453,7 +2447,7 @@
 			config.nc_length = len;
 			config.nc_fhconfig.ncf_length =
 			    sizeof(ndis_80211_config_fh);
-			DPRINTF(("Setting channel to %ukHz\n", config.nc_dsconfig));
+			DPRINTF("Setting channel to %ukHz\n", config.nc_dsconfig);
 			rval = ndis_set_info(sc, OID_802_11_CONFIGURATION,
 			    &config, &len);
 			if (rval)
@@ -2486,7 +2480,7 @@
 	else
 		bcopy(ifp->if_broadcastaddr, bssid, len);
 
-	DPRINTF(("Setting BSSID to %6D\n", (uint8_t *)&bssid, ":"));
+	DPRINTF("Setting BSSID to %6D\n", (uint8_t *)&bssid, ":");
 	rval = ndis_set_info(sc, OID_802_11_BSSID, &bssid, &len);
 	if (rval)
 		device_printf(sc->ndis_dev,
@@ -3145,9 +3139,9 @@
 	struct ndis_softc *sc = ifp->if_softc;
 	enum ieee80211_state ostate;
 
-	DPRINTF(("%s: %s -> %s\n", __func__,
+	DPRINTF("%s: %s -> %s\n", __func__,
 		ieee80211_state_name[vap->iv_state],
-		ieee80211_state_name[nstate]));
+		ieee80211_state_name[nstate]);
 
 	ostate = vap->iv_state;
 	vap->iv_state = nstate;
@@ -3187,7 +3181,7 @@
 	vap = TAILQ_FIRST(&ic->ic_vaps);
 
 	if (!NDIS_INITIALIZED(sc)) {
-		DPRINTF(("%s: scan aborted\n", __func__));
+		DPRINTF("%s: scan aborted\n", __func__);
 		ieee80211_cancel_scan(vap);
 		return;
 	}
@@ -3201,16 +3195,23 @@
 		ssid.ns_ssidlen = ss->ss_ssid[0].len;
 		bcopy(ss->ss_ssid[0].ssid, ssid.ns_ssid, ssid.ns_ssidlen);
 	}
+#ifdef NDIS_DEBUG
+	if (ndis_debug > 0) {
+		printf("Setting scan ESSID to ");
+		ieee80211_print_essid(ssid.ns_ssid, ssid.ns_ssidlen);
+		printf("\n");
+	}
+#endif
 
 	error = ndis_set_info(sc, OID_802_11_SSID, &ssid, &len);
 	if (error)
-		DPRINTF(("%s: set ESSID failed\n", __func__));
+		DPRINTF("%s: set ESSID failed\n", __func__);
 
 	len = 0;
 	error = ndis_set_info(sc, OID_802_11_BSSID_LIST_SCAN,
 	    NULL, &len);
 	if (error) {
-		DPRINTF(("%s: scan command failed\n", __func__));
+		DPRINTF("%s: scan command failed\n", __func__);
 		ieee80211_cancel_scan(vap);
 		return;
 	}
@@ -3261,12 +3262,12 @@
 		error = ndis_get_info(sc, OID_802_11_BSSID_LIST, bl, &len);
 	}
 	if (error) {
-		DPRINTF(("%s: failed to read\n", __func__));
+		DPRINTF("%s: failed to read\n", __func__);
 		free(bl, M_DEVBUF);
 		return;;
 	}
 
-	DPRINTF(("%s: %d results\n", __func__, bl->nblx_items));
+	DPRINTF("%s: %d results\n", __func__, bl->nblx_items);
 	rstamp++;
 	wb = &bl->nblx_bssid[0];
 	for (i = 0; i < bl->nblx_items; i++) {
@@ -3336,9 +3337,9 @@
 			}
 		}
 done:
-		DPRINTF(("scan: bssid %s chan %dMHz (%d/%d) rssi %d\n",
+		DPRINTF("scan: bssid %s chan %dMHz (%d/%d) rssi %d\n",
 		    ether_sprintf(wb->nwbx_macaddr), freq, sp.bchan, chanflag,
-		    rssi));
+		    rssi);
 		ieee80211_add_scan(vap, &sp, &wh, 0, rssi, noise, rstamp);
 		wb = (ndis_wlan_bssid_ex *)((char *)wb + wb->nwbx_len);
 	}

From owner-p4-projects@FreeBSD.ORG  Fri May  9 15:37:32 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7981C1065673; Fri,  9 May 2008 15:37:32 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3B841106564A
	for ; Fri,  9 May 2008 15:37:32 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 10B498FC18
	for ; Fri,  9 May 2008 15:37:32 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m49FbVAm006797
	for ; Fri, 9 May 2008 15:37:31 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m49FbVQ7006795
	for perforce@freebsd.org; Fri, 9 May 2008 15:37:31 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Fri, 9 May 2008 15:37:31 GMT
Message-Id: <200805091537.m49FbVQ7006795@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 141374 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Fri, 09 May 2008 15:37:32 -0000

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

Change 141374 by hselasky@hselasky_laptop001 on 2008/05/09 15:37:24

	
	Small bugfix in ugen.c .

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/ugen.c#42 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/ugen.c#42 (text+ko) ====

@@ -1663,11 +1663,11 @@
 			sce->io_buffer_size = *(int *)addr;
 		else
 			sce->io_buffer_size = 256 * 1024;
-		break;
+		goto done;
 
 	case USB_GET_BUFFER_SIZE:
 		*(int *)addr = sce->io_buffer_size;
-		break;
+		goto done;
 
 	default:
 		break;

From owner-p4-projects@FreeBSD.ORG  Fri May  9 18:26:36 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1E62A106567E; Fri,  9 May 2008 18:26:36 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D4842106567A
	for ; Fri,  9 May 2008 18:26:35 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id C26268FC13
	for ; Fri,  9 May 2008 18:26:35 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m49IQZTO025188
	for ; Fri, 9 May 2008 18:26:35 GMT
	(envelope-from rpaulo@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m49IQZsN025186
	for perforce@freebsd.org; Fri, 9 May 2008 18:26:35 GMT
	(envelope-from rpaulo@FreeBSD.org)
Date: Fri, 9 May 2008 18:26:35 GMT
Message-Id: <200805091826.m49IQZsN025186@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	rpaulo@FreeBSD.org using -f
From: Rui Paulo 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 141377 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Fri, 09 May 2008 18:26:36 -0000

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

Change 141377 by rpaulo@rpaulo_epsilon on 2008/05/09 18:25:44

	Groundwork checkpoint.
	* Add P4 ids.
	* Enable WARNS=5.
	* Setup pcap initialization. We are now capturing packets.
	* Add some debugging output.
	* Add more command line options.

Affected files ...

.. //depot/projects/soc2008/rpaulo-tcpad/Makefile#2 edit
.. //depot/projects/soc2008/rpaulo-tcpad/device.c#2 edit
.. //depot/projects/soc2008/rpaulo-tcpad/device.h#1 add
.. //depot/projects/soc2008/rpaulo-tcpad/handler.c#1 add
.. //depot/projects/soc2008/rpaulo-tcpad/handler.h#1 add
.. //depot/projects/soc2008/rpaulo-tcpad/linkhdr.c#2 edit
.. //depot/projects/soc2008/rpaulo-tcpad/linkhdr.h#1 add
.. //depot/projects/soc2008/rpaulo-tcpad/main.c#2 edit

Differences ...

==== //depot/projects/soc2008/rpaulo-tcpad/Makefile#2 (text+ko) ====

@@ -1,5 +1,9 @@
+# $P4: //depot/projects/soc2008/rpaulo-tcpad/Makefile#2 $
+
 PROG=tcpad
-SRCS=main.c device.c linkhdr.c
+SRCS=main.c device.c linkhdr.c handler.c
+WARNS=5
+CFLAGS+=-DDEBUG
 LDADD=-lpcap
 
 .include 

==== //depot/projects/soc2008/rpaulo-tcpad/device.c#2 (text+ko) ====

@@ -22,20 +22,19 @@
  * 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.
+ *
+ * $P4: //depot/projects/soc2008/rpaulo-tcpad/device.c#2 $
  */
 
+#include 
+#include 
 #include 
 #include 
 #include 
 #include 
 #include 
 
-int
-device_lookup(const char *dev)
-{
-	
-}
-
+#include "device.h"
 /**
  * @brief
  * List all devices found by pcap.
@@ -43,19 +42,21 @@
  * @param verbose	Verbose toggle
  */
 void
-device_listall(int verbose)
+device_listall(void)
 {
 	pcap_if_t *iface, *ifaceFirst;
 	pcap_addr_t *ifaddr;
 	struct sockaddr *addr;
 	struct sockaddr_in *sin;
 	struct sockaddr_in6 *sin6;
-	struct bpf_program fp;
 	char addrbuf[MAX(INET_ADDRSTRLEN, INET6_ADDRSTRLEN)];
 	char errbuf[PCAP_ERRBUF_SIZE];
 
 	if (pcap_findalldevs(&iface, errbuf) == -1)
 		errx(1, "pcap_findalldevs: %s", errbuf);
+
+	if (!iface)
+		errx(1, "no suitable interfaces found");
 	
 	ifaceFirst = iface;
 	for (; iface; iface = iface->next) {
@@ -63,28 +64,23 @@
 		if (iface->description)
 			printf(", description %s", iface->description);
 		printf("\n");
-		if (verbose) {
-			for (ifaddr = iface->addresses; ifaddr; 
-			    ifaddr = ifaddr->next) {
-				addr = iface->addresses->addr;
-				switch (addr->sa_family) {
-				case AF_INET:
-					sin = (struct sockaddr_in *)addr;
-					inet_ntop(AF_INET, &sin->sin_addr,
+		for (ifaddr = iface->addresses; ifaddr; ifaddr = ifaddr->next) {
+			addr = ifaddr->addr;
+			switch (addr->sa_family) {
+			case AF_INET:
+				sin = (struct sockaddr_in *)addr;
+				inet_ntop(AF_INET, &sin->sin_addr,
+				    addrbuf, sizeof(addrbuf));
+				printf("\tIPv4 address: %s\n", addrbuf);
+				break;
+			case AF_INET6:
+				sin6 = (struct sockaddr_in6 *)addr;
+				inet_ntop(AF_INET6, &sin6->sin6_addr,
 					    addrbuf, sizeof(addrbuf));
-					printf("\tIPv4 address: %s\n",
-					    addrbuf);
-					break;
-				case AF_INET6:
-					sin6 = (struct sockaddr_in6 *)addr;
-					inet_ntop(AF_INET6, &sin6->sin6_addr,
-					    addrbuf, sizeof(addrbuf));
-					printf("\tIPv6 address: %s\n", 
-						addrbuf);
-					break;
-				default:
-					break;
-				}
+				printf("\tIPv6 address: %s\n", addrbuf);
+				break;
+			default:
+				break;
 			}
 		}
 	}

==== //depot/projects/soc2008/rpaulo-tcpad/linkhdr.c#2 (text+ko) ====

@@ -22,11 +22,15 @@
  * 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.
+ *
+ * $P4: //depot/projects/soc2008/rpaulo-tcpad/linkhdr.c#2 $
  */
 
 #include 
 #include 
 
+#include "linkhdr.h"
+
 struct linktypes {
 	int type;
 	unsigned int skip;
@@ -35,6 +39,7 @@
 static struct linktypes linktypes[] = {
     { DLT_NULL,		0 },
     { DLT_EN10MB,	ETHER_HDR_LEN },	/* from ethernet.h */
+    { DLT_PPP,		4 },			/* XXX */
 
     { -1, 0 }
 };
@@ -42,7 +47,7 @@
 
 /**
  * @brief
- * Find the number link layer header length.
+ * Find the link layer header length.
  *
  * @param dlt	Data-link level type code
  *
@@ -50,7 +55,7 @@
  *
  * @return 	Bytes to skip
  */
-static int
+int
 linkhdr_headerlen(int dlt)
 {
 	int i;
@@ -64,15 +69,11 @@
 }
 
 
-unsigned char *
-linkhdr_remove(unsigned char *bytes, int dlt)
+const unsigned char *
+linkhdr_remove(const unsigned char *bytes, unsigned int skip)
 {
-	int skip;
-	
-	skip = linkhdr_headerlen(dlt);
-	
 	/* XXX: more computation needed for some interfaces, e.g.: SLIP, 
 	  PPP, etc. */
 	
 	return (bytes + skip);
-}+}

==== //depot/projects/soc2008/rpaulo-tcpad/main.c#2 (text+ko) ====

@@ -22,28 +22,59 @@
  * 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.
+ *
+ * $P4: //depot/projects/soc2008/rpaulo-tcpad/main.c#2 $
  */
 
+#include 
 #include 
 #include 
 #include 
 #include 
 
+#include "device.h"
+#include "linkhdr.h"
+#include "handler.h"
+
 static void
 usage(void)
 {
 	fprintf(stderr, "%s\n", pcap_lib_version());
-	fprintf(stderr, "%s: [-pD] [-i interface]", getprogname());
+	fprintf(stderr, "%s: [-pD] [-i interface] [-s snaplen]\n",
+	    getprogname());
+	exit(1);
 }
 
 int
-main(int argc, char *argv[], char *envp[])
+main(int argc, char *argv[])
 {
+	int promisc;
+	int snaplen;
 	int ch;
+	char *interface;
+	char errbuf[PCAP_ERRBUF_SIZE];
+	pcap_t *p;
+	struct bpf_program fp;
+	char filter[] = "ip proto \\tcp";
 	
-	while ((ch = getopt(argc, argv, "pDi:")) != -1) {
+	promisc = 1;
+	snaplen = 100;
+	interface = NULL;
+	while ((ch = getopt(argc, argv, "pDi:s:l")) != -1) {
 		switch (ch) {
-			/* TODO: option processing */
+		case 'p':
+			promisc = 0;
+			break;
+		case 'i':
+			interface = optarg;
+			break;
+		case 's':
+			snaplen = atoi(optarg);
+			break;
+		case 'l':
+			device_listall();
+			exit(0);
+			break;
 		case '?':
 		default:
 			usage();
@@ -52,4 +83,21 @@
 	}
 	argc -= optind;
 	argv += optind;
-}+
+	if (interface == NULL)
+		errx(1, "interface not specified");
+	
+	p = pcap_open_live(interface, snaplen, promisc, 100, errbuf);
+	if (p == NULL)
+		err(1, "pcap_open_live");
+
+	/* XXX: check for ICMP too */
+	if (pcap_compile(p, &fp, filter, 1, 0) == -1)
+		errx(1, "pcap_compile: %s", pcap_geterr(p));
+
+	pcap_setfilter(p, &fp);
+
+	for (;;) {
+		pcap_dispatch(p, -1, tcpad_pcaphandler, NULL);
+	}
+}

From owner-p4-projects@FreeBSD.ORG  Fri May  9 23:40:19 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id F05FF1065671; Fri,  9 May 2008 23:40:18 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B2803106567A
	for ; Fri,  9 May 2008 23:40:18 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id A183B8FC0C
	for ; Fri,  9 May 2008 23:40:18 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m49NeIKO052569
	for ; Fri, 9 May 2008 23:40:18 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m49NeIoR052567
	for perforce@freebsd.org; Fri, 9 May 2008 23:40:18 GMT
	(envelope-from sam@freebsd.org)
Date: Fri, 9 May 2008 23:40:18 GMT
Message-Id: <200805092340.m49NeIoR052567@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 141394 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Fri, 09 May 2008 23:40:19 -0000

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

Change 141394 by sam@sam_ebb on 2008/05/09 23:39:29

	IFC

Affected files ...

.. //depot/projects/vap/sys/modules/Makefile#26 edit

Differences ...

==== //depot/projects/vap/sys/modules/Makefile#26 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/modules/Makefile,v 1.565 2008/04/29 21:36:16 sam Exp $
+# $FreeBSD: src/sys/modules/Makefile,v 1.566 2008/05/05 20:41:54 kmacy Exp $
 
 .include 
 
@@ -231,6 +231,7 @@
 	${_ray} \
 	rc \
 	rc4 \
+	${_rdma} \
 	re \
 	reiserfs \
 	rl \
@@ -430,6 +431,7 @@
 _pecoff=	pecoff
 _pst=		pst
 _ray=		ray
+_rdma=		rdma
 _safe=		safe
 _sbni=		sbni
 _scsi_low=	scsi_low
@@ -557,6 +559,7 @@
 _nvram=		nvram
 _nxge=		nxge
 _pccard=	pccard
+_rdma=		rdma	
 _safe=		safe
 _scsi_low=	scsi_low
 _smbfs=		smbfs

From owner-p4-projects@FreeBSD.ORG  Sat May 10 00:07:52 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 955141065672; Sat, 10 May 2008 00:07:52 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 57DE71065670
	for ; Sat, 10 May 2008 00:07:52 +0000 (UTC)
	(envelope-from thompsa@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 468768FC16
	for ; Sat, 10 May 2008 00:07:52 +0000 (UTC)
	(envelope-from thompsa@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m4A07q4P054513
	for ; Sat, 10 May 2008 00:07:52 GMT
	(envelope-from thompsa@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m4A07qRU054511
	for perforce@freebsd.org; Sat, 10 May 2008 00:07:52 GMT
	(envelope-from thompsa@freebsd.org)
Date: Sat, 10 May 2008 00:07:52 GMT
Message-Id: <200805100007.m4A07qRU054511@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	thompsa@freebsd.org using -f
From: Andrew Thompson 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 141400 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Sat, 10 May 2008 00:07:53 -0000

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

Change 141400 by thompsa@thompsa_burger on 2008/05/10 00:07:23

	Add a pause if the interface has been upped by our vap but the taskq
	hasnt completed yet. The NDIS OID commands will fail otherwise.

Affected files ...

.. //depot/projects/vap/sys/dev/if_ndis/if_ndis.c#24 edit

Differences ...

==== //depot/projects/vap/sys/dev/if_ndis/if_ndis.c#24 (text+ko) ====

@@ -2799,7 +2799,23 @@
 	struct ndis_oid_data	oid;
 	struct ndis_evt		evt;
 	void			*oidbuf;
-	int			error = 0;
+	int			n, error = 0;
+
+	switch(command) {
+	case SIOCGDRVSPEC:
+	case SIOCSDRVSPEC:
+		/*
+		 * The ndis commands get passed directly to us from
+		 * the vap, check if the vap has started us yet.
+		 */
+		n = 50;
+		while (n-- && (ifp->if_flags & IFF_UP) &&
+		    !(ifp->if_drv_flags & IFF_DRV_RUNNING))
+			pause("ndisioctl", hz/10);
+		/* Interface is not ready */
+		if (!NDIS_INITIALIZED(sc))
+			return (ENXIO);
+	}
 
 	switch(command) {
 	case SIOCSIFFLAGS:

From owner-p4-projects@FreeBSD.ORG  Sat May 10 00:33:21 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id F27C21065676; Sat, 10 May 2008 00:33:20 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B3771106564A
	for ; Sat, 10 May 2008 00:33:20 +0000 (UTC)
	(envelope-from snagg@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id A008B8FC19
	for ; Sat, 10 May 2008 00:33:20 +0000 (UTC)
	(envelope-from snagg@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m4A0XKGD055320
	for ; Sat, 10 May 2008 00:33:20 GMT
	(envelope-from snagg@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m4A0XKdR055318
	for perforce@freebsd.org; Sat, 10 May 2008 00:33:20 GMT
	(envelope-from snagg@FreeBSD.org)
Date: Sat, 10 May 2008 00:33:20 GMT
Message-Id: <200805100033.m4A0XKdR055318@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	snagg@FreeBSD.org using -f
From: Vincenzo Iozzo 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 141402 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Sat, 10 May 2008 00:33:21 -0000

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

Change 141402 by snagg@snagg_macosx on 2008/05/10 00:32:27

	IFC

Affected files ...

.. //depot/projects/soc2008/snagg-audit/sys/amd64/amd64/pmap.c#3 integrate
.. //depot/projects/soc2008/snagg-audit/sys/arm/arm/pmap.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/conf/NOTES#3 integrate
.. //depot/projects/soc2008/snagg-audit/sys/conf/options#3 integrate
.. //depot/projects/soc2008/snagg-audit/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/contrib/pf/net/pf.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/contrib/pf/net/pf_ioctl.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/ata/ata-disk.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/ata/ata-lowlevel.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/ata/atapi-cd.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/ata/atapi-fd.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/ata/atapi-tape.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/usb/uipaq.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/usb/usbdevs#4 integrate
.. //depot/projects/soc2008/snagg-audit/sys/i386/i386/pmap.c#3 integrate
.. //depot/projects/soc2008/snagg-audit/sys/ia64/ia64/pmap.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/kern/init_sysent.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/kern/kern_lockf.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/kern/subr_param.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/kern/sys_socket.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/kern/syscalls.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/kern/syscalls.master#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/kern/systrace_args.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/kern/uipc_socket.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/kern/vfs_export.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/mips/mips/pmap.c#3 integrate
.. //depot/projects/soc2008/snagg-audit/sys/net/bpf.c#3 integrate
.. //depot/projects/soc2008/snagg-audit/sys/net/if.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/net/if_atmsubr.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/net/if_fwsubr.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/net/if_gif.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/net/if_gif.h#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/net/if_gre.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/net/if_gre.h#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/net/if_iso88025subr.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/net/if_loop.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/net/if_stf.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/net/if_var.h#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/net/radix_mpath.c#3 integrate
.. //depot/projects/soc2008/snagg-audit/sys/net/radix_mpath.h#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/net/route.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/net/route.h#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/net/rtsock.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/netatalk/at_extern.h#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/netatalk/at_proto.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/netgraph/netflow/netflow.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/netinet/if_atm.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/netinet/if_ether.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/netinet/in_gif.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/netinet/in_mcast.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/netinet/in_pcb.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/netinet/in_pcb.h#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/netinet/in_rmx.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/netinet/in_var.h#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/netinet/ip_fastfwd.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/netinet/ip_fw.h#3 integrate
.. //depot/projects/soc2008/snagg-audit/sys/netinet/ip_fw2.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/netinet/ip_icmp.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/netinet/ip_input.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/netinet/ip_mroute.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/netinet/ip_mroute.h#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/netinet/ip_options.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/netinet/ip_output.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/netinet/ip_var.h#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/netinet/raw_ip.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/netinet/sctp_os_bsd.h#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/netinet/tcp_input.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/netinet/tcp_subr.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/netinet/tcp_syncache.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/netinet6/in6.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/netinet6/in6_ifattach.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/netinet6/in6_rmx.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/netinet6/nd6_rtr.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/netipx/ipx_proto.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/nfs4client/nfs4_vfsops.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/nfsclient/bootp_subr.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/nfsclient/nfs_vfsops.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/powerpc/powerpc/pmap_dispatch.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/sparc64/include/bus.h#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/sparc64/sparc64/bus_machdep.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/sparc64/sparc64/pmap.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/sparc64/sparc64/upa.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/sun4v/sun4v/pmap.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/sys/domain.h#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/sys/mbuf.h#3 integrate
.. //depot/projects/soc2008/snagg-audit/sys/sys/param.h#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/sys/proc.h#3 integrate
.. //depot/projects/soc2008/snagg-audit/sys/sys/socket.h#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/sys/socketvar.h#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/sys/syscall.h#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/sys/syscall.mk#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/sys/sysproto.h#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/vm/pmap.h#2 integrate

Differences ...

==== //depot/projects/soc2008/snagg-audit/sys/amd64/amd64/pmap.c#3 (text+ko) ====

@@ -77,7 +77,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.615 2008/04/25 16:00:39 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.616 2008/05/09 16:48:06 alc Exp $");
 
 /*
  *	Manages physical address maps.
@@ -4469,3 +4469,26 @@
 	addr = (addr + (NBPDR - 1)) & ~(NBPDR - 1);
 	return addr;
 }
+
+/*
+ *	Increase the starting virtual address of the given mapping if a
+ *	different alignment might result in more superpage mappings.
+ */
+void
+pmap_align_superpage(vm_object_t object, vm_ooffset_t offset,
+    vm_offset_t *addr, vm_size_t size)
+{
+	vm_offset_t superpage_offset;
+
+	if (object != NULL && (object->flags & OBJ_COLORED) != 0)
+		offset += ptoa(object->pg_color);
+	superpage_offset = offset & PDRMASK;
+	if (size < superpage_offset ||
+	    size - superpage_offset < NBPDR ||
+	    (*addr & PDRMASK) == superpage_offset)
+		return;
+	if ((*addr & PDRMASK) < superpage_offset)
+		*addr = (*addr & ~PDRMASK) + superpage_offset;
+	else
+		*addr = ((*addr + PDRMASK) & ~PDRMASK) + superpage_offset;
+}

==== //depot/projects/soc2008/snagg-audit/sys/arm/arm/pmap.c#2 (text+ko) ====

@@ -147,7 +147,7 @@
 #include "opt_vm.h"
 
 #include 
-__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.99 2008/03/06 21:59:47 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.100 2008/05/09 23:31:41 alc Exp $");
 #include 
 #include 
 #include 
@@ -4355,6 +4355,16 @@
 	return(addr);
 }
 
+/*
+ *	Increase the starting virtual address of the given mapping if a
+ *	different alignment might result in more superpage mappings.
+ */
+void
+pmap_align_superpage(vm_object_t object, vm_ooffset_t offset,
+    vm_offset_t *addr, vm_size_t size)
+{
+}
+
 
 /*
  * Map a set of physical memory pages into the kernel virtual

==== //depot/projects/soc2008/snagg-audit/sys/conf/NOTES#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/NOTES,v 1.1484 2008/05/06 22:41:23 julian Exp $
+# $FreeBSD: src/sys/conf/NOTES,v 1.1485 2008/05/09 23:02:55 julian Exp $
 #
 # NOTES -- Lines that can be cut/pasted into kernel and hints configs.
 #
@@ -509,6 +509,8 @@
 options 	INET			#Internet communications protocols
 options 	INET6			#IPv6 communications protocols
 
+options		ROUTETABLES=2		# max 16. 1 is back compatible.
+
 # In order to enable IPSEC you MUST also add device crypto to 
 # your kernel configuration
 options 	IPSEC			#IP security (requires device crypto)

==== //depot/projects/soc2008/snagg-audit/sys/conf/options#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options,v 1.627 2008/04/29 21:23:21 julian Exp $
+# $FreeBSD: src/sys/conf/options,v 1.628 2008/05/09 23:02:55 julian Exp $
 #
 #        On the handling of kernel options
 #
@@ -364,6 +364,7 @@
 ETHER_8023		opt_ef.h
 ETHER_8022		opt_ef.h
 ETHER_SNAP		opt_ef.h
+ROUTETABLES		opt_route.h
 MROUTING		opt_mrouting.h
 INET			opt_inet.h
 INET6			opt_inet6.h

==== //depot/projects/soc2008/snagg-audit/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#2 (text+ko) ====

@@ -1,4 +1,4 @@
-/*	$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c,v 1.9 2007/11/26 08:18:19 darrenr Exp $	*/
+/*	$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c,v 1.10 2008/05/09 23:02:55 julian Exp $	*/
 
 /*
  * Copyright (C) 1993-2003 by Darren Reed.
@@ -970,7 +970,7 @@
 		dst->sin_addr = fdp->fd_ip;
 
 	dst->sin_len = sizeof(*dst);
-	rtalloc(ro);
+	in_rtalloc(ro, 0);
 
 	if ((ifp == NULL) && (ro->ro_rt != NULL))
 		ifp = ro->ro_rt->rt_ifp;
@@ -1158,7 +1158,7 @@
 	dst->sin_len = sizeof(*dst);
 	dst->sin_family = AF_INET;
 	dst->sin_addr = fin->fin_src;
-	rtalloc(&iproute);
+	in_rtalloc(&iproute, 0);
 	if (iproute.ro_rt == NULL)
 		return 0;
 	return (fin->fin_ifp == iproute.ro_rt->rt_ifp);

==== //depot/projects/soc2008/snagg-audit/sys/contrib/pf/net/pf.c#2 (text+ko) ====

@@ -40,7 +40,7 @@
 #include "opt_inet6.h"
 
 #include 
-__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.53 2008/04/20 00:21:54 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.54 2008/05/09 23:02:55 julian Exp $");
 #endif
 
 #ifdef __FreeBSD__
@@ -1839,7 +1839,14 @@
 	pf_mtag->tag = rtag;
 
 	if (r != NULL && r->rtableid >= 0)
+#ifdef __FreeBSD__
+	{
+		M_SETFIB(m, r->rtableid);
+#endif
 		pf_mtag->rtableid = r->rtableid;
+#ifdef __FreeBSD__
+	}
+#endif
 #ifdef ALTQ
 	if (r != NULL && r->qid) {
 		pf_mtag->qid = r->qid;
@@ -2004,7 +2011,14 @@
 #endif
 
 	if (r->rtableid >= 0)
+#ifdef __FreeBSD__
+	{
+		M_SETFIB(m0, r->rtableid);
+#endif
 		pf_mtag->rtableid = r->rtableid;
+#ifdef __FreeBSD__
+	}
+#endif
 
 #ifdef ALTQ
 	if (r->qid) {
@@ -2195,7 +2209,14 @@
 	if (tag > 0)
 		pf_mtag->tag = tag;
 	if (rtableid >= 0)
+#ifdef __FreeBSD__
+	{
+		M_SETFIB(m, rtableid);
+#endif
 		pf_mtag->rtableid = rtableid;
+#ifdef __FreeBSD__
+	}
+#endif
 
 	return (0);
 }
@@ -3141,7 +3162,7 @@
 #ifdef RTF_PRCLONING
 		rtalloc_ign(&ro, (RTF_CLONING | RTF_PRCLONING));
 #else /* !RTF_PRCLONING */
-		rtalloc_ign(&ro, RTF_CLONING);
+		in_rtalloc_ign(&ro, RTF_CLONING, 0);
 #endif
 #else /* ! __FreeBSD__ */
 		rtalloc_noclone(&ro, NO_CLONING);
@@ -5946,7 +5967,11 @@
 		goto out;
 
 #ifdef __FreeBSD__
-	rtalloc_ign((struct route *)&ro, RTF_CLONING);
+/* XXX MRT not always INET */ /* stick with table 0 though */
+	if (af == AF_INET)
+		in_rtalloc_ign((struct route *)&ro, RTF_CLONING, 0);
+	else
+		rtalloc_ign((struct route *)&ro, RTF_CLONING);
 #else /* ! __FreeBSD__ */
 	rtalloc_noclone((struct route *)&ro, NO_CLONING);
 #endif
@@ -6025,7 +6050,10 @@
 # ifdef RTF_PRCLONING
 	rtalloc_ign((struct route *)&ro, (RTF_CLONING|RTF_PRCLONING));
 # else /* !RTF_PRCLONING */
-	rtalloc_ign((struct route *)&ro, RTF_CLONING);
+	if (af == AF_INET)
+		in_rtalloc_ign((struct route *)&ro, RTF_CLONING, 0);
+	else
+		rtalloc_ign((struct route *)&ro, RTF_CLONING);
 # endif
 #else /* ! __FreeBSD__ */
 	rtalloc_noclone((struct route *)&ro, NO_CLONING);
@@ -6105,7 +6133,7 @@
 	dst->sin_addr = ip->ip_dst;
 
 	if (r->rt == PF_FASTROUTE) {
-		rtalloc(ro);
+		in_rtalloc(ro, 0);
 		if (ro->ro_rt == 0) {
 			ipstat.ips_noroute++;
 			goto bad;

==== //depot/projects/soc2008/snagg-audit/sys/contrib/pf/net/pf_ioctl.c#2 (text+ko) ====

@@ -40,7 +40,7 @@
 #include "opt_inet6.h"
 
 #include 
-__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_ioctl.c,v 1.31 2008/03/29 00:24:36 mlaier Exp $");
+__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_ioctl.c,v 1.32 2008/05/09 23:02:55 julian Exp $");
 #endif
 
 #ifdef __FreeBSD__
@@ -1532,7 +1532,7 @@
 		}
 
 #ifdef __FreeBSD__ /* ROUTEING */
-		if (rule->rtableid > 0)
+		if (rule->rtableid > 0 && rule->rtableid < rt_numfibs)
 #else
 		if (rule->rtableid > 0 && !rtable_exists(rule->rtableid))
 #endif
@@ -1795,7 +1795,7 @@
 
 			if (newrule->rtableid > 0 &&
 #ifdef __FreeBSD__ /* ROUTING */
-			    1)
+			    newrule->rtableid < rt_numfibs)
 #else
 			    !rtable_exists(newrule->rtableid))
 #endif

==== //depot/projects/soc2008/snagg-audit/sys/dev/ata/ata-disk.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/ata/ata-disk.c,v 1.210 2008/04/17 12:29:35 sos Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-disk.c,v 1.211 2008/05/08 17:55:44 grehan Exp $");
 
 #include "opt_ata.h"
 #include 
@@ -125,7 +125,7 @@
     adp->disk->d_dump = ad_dump;
     adp->disk->d_name = "ad";
     adp->disk->d_drv1 = dev;
-    adp->disk->d_maxsize = ch->dma.max_iosize;
+    adp->disk->d_maxsize = ch->dma.max_iosize ? ch->dma.max_iosize : DFLTPHYS;
     adp->disk->d_sectorsize = DEV_BSIZE;
     adp->disk->d_mediasize = DEV_BSIZE * (off_t)adp->total_secs;
     adp->disk->d_fwsectors = adp->sectors;

==== //depot/projects/soc2008/snagg-audit/sys/dev/ata/ata-lowlevel.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/ata/ata-lowlevel.c,v 1.83 2008/04/17 12:29:35 sos Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-lowlevel.c,v 1.84 2008/05/08 17:55:44 grehan Exp $");
 
 #include "opt_ata.h"
 #include 
@@ -213,7 +213,9 @@
     printf("ata_begin_transaction OOPS!!!\n");
 
 begin_finished:
-    ch->dma.unload(request);
+    if (ch->dma.unload) {
+        ch->dma.unload(request);
+    }
     return ATA_OP_FINISHED;
 
 begin_continue:

==== //depot/projects/soc2008/snagg-audit/sys/dev/ata/atapi-cd.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.199 2008/04/17 12:29:35 sos Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.200 2008/05/08 17:55:44 grehan Exp $");
 
 #include "opt_ata.h"
 #include 
@@ -906,8 +906,11 @@
 {
     struct ata_channel *ch = device_get_softc(device_get_parent(dev));
     struct acd_softc *cdp = device_get_ivars(dev);
+    uint32_t max_iosize;
 
-    cdp->iomax = min(ch->dma.max_iosize, 65534);
+    max_iosize = ch->dma.max_iosize ? ch->dma.max_iosize : DFLTPHYS;
+
+    cdp->iomax = min(max_iosize, 65534);
 }
 
 static void 

==== //depot/projects/soc2008/snagg-audit/sys/dev/ata/atapi-fd.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-fd.c,v 1.114 2008/04/17 12:29:35 sos Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-fd.c,v 1.115 2008/05/08 17:55:44 grehan Exp $");
 
 #include 
 #include 
@@ -105,7 +105,7 @@
     fdp->disk->d_ioctl = afd_ioctl;
     fdp->disk->d_name = "afd";
     fdp->disk->d_drv1 = dev;
-    fdp->disk->d_maxsize = ch->dma.max_iosize;
+    fdp->disk->d_maxsize = ch->dma.max_iosize ? ch->dma.max_iosize : DFLTPHYS;
     fdp->disk->d_unit = device_get_unit(dev);
     disk_create(fdp->disk, DISK_VERSION);
     return 0;

==== //depot/projects/soc2008/snagg-audit/sys/dev/ata/atapi-tape.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-tape.c,v 1.107 2008/04/17 12:29:35 sos Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-tape.c,v 1.108 2008/05/08 17:55:44 grehan Exp $");
 
 #include "opt_ata.h"
 #include 
@@ -142,7 +142,7 @@
 		      UID_ROOT, GID_OPERATOR, 0640, "ast%d",
 		      device_get_unit(dev));
     device->si_drv1 = dev;
-    device->si_iosize_max = ch->dma.max_iosize;
+    device->si_iosize_max = ch->dma.max_iosize ? ch->dma.max_iosize : DFLTPHYS;
     stp->dev1 = device;
     device = make_dev(&ast_cdevsw, 2 * device_get_unit(dev) + 1,
 		      UID_ROOT, GID_OPERATOR, 0640, "nast%d",

==== //depot/projects/soc2008/snagg-audit/sys/dev/usb/uipaq.c#2 (text+ko) ====

@@ -49,7 +49,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/usb/uipaq.c,v 1.10 2008/04/20 17:12:11 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/uipaq.c,v 1.11 2008/05/08 21:22:27 delphij Exp $");
 
 #include 
 #include 
@@ -123,6 +123,7 @@
 	{{ USB_VENDOR_HP, USB_PRODUCT_HP_2215 }, 0 },
 	{{ USB_VENDOR_HP, USB_PRODUCT_HP_568J }, 0},
 	{{ USB_VENDOR_HTC, USB_PRODUCT_HTC_WINMOBILE }, 0},
+	{{ USB_VENDOR_HTC, USB_PRODUCT_HTC_PPC6700MODEM }, 0},
 	{{ USB_VENDOR_HTC, USB_PRODUCT_HTC_SMARTPHONE }, 0},
 	{{ USB_VENDOR_COMPAQ, USB_PRODUCT_COMPAQ_IPAQPOCKETPC } , 0},
 	{{ USB_VENDOR_CASIO, USB_PRODUCT_CASIO_BE300 } , 0},

==== //depot/projects/soc2008/snagg-audit/sys/dev/usb/usbdevs#4 (text+ko) ====

@@ -1,4 +1,4 @@
-$FreeBSD: src/sys/dev/usb/usbdevs,v 1.351 2008/05/03 20:06:15 imp Exp $
+$FreeBSD: src/sys/dev/usb/usbdevs,v 1.352 2008/05/08 21:22:27 delphij Exp $
 /* $NetBSD: usbdevs,v 1.392 2004/12/29 08:38:44 imp Exp $ */
 
 /*-
@@ -1400,6 +1400,7 @@
 
 /* HTC products */
 product HTC WINMOBILE		0x00ce	HTC USB Sync
+product HTC PPC6700MODEM	0x00cf	PPC6700 Modem
 product HTC SMARTPHONE		0x0a51	SmartPhone USB Sync
 
 /* HUAWEI products */

==== //depot/projects/soc2008/snagg-audit/sys/i386/i386/pmap.c#3 (text+ko) ====

@@ -75,7 +75,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.617 2008/04/25 16:00:39 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.618 2008/05/09 16:48:06 alc Exp $");
 
 /*
  *	Manages physical address maps.
@@ -4598,6 +4598,29 @@
 	return addr;
 }
 
+/*
+ *	Increase the starting virtual address of the given mapping if a
+ *	different alignment might result in more superpage mappings.
+ */
+void
+pmap_align_superpage(vm_object_t object, vm_ooffset_t offset,
+    vm_offset_t *addr, vm_size_t size)
+{
+	vm_offset_t superpage_offset;
+
+	if (object != NULL && (object->flags & OBJ_COLORED) != 0)
+		offset += ptoa(object->pg_color);
+	superpage_offset = offset & PDRMASK;
+	if (size < superpage_offset ||
+	    size - superpage_offset < NBPDR ||
+	    (*addr & PDRMASK) == superpage_offset)
+		return;
+	if ((*addr & PDRMASK) < superpage_offset)
+		*addr = (*addr & ~PDRMASK) + superpage_offset;
+	else
+		*addr = ((*addr + PDRMASK) & ~PDRMASK) + superpage_offset;
+}
+
 
 #if defined(PMAP_DEBUG)
 pmap_pid_dump(int pid)

==== //depot/projects/soc2008/snagg-audit/sys/ia64/ia64/pmap.c#2 (text+ko) ====

@@ -46,7 +46,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/ia64/ia64/pmap.c,v 1.199 2008/04/19 04:56:16 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/ia64/ia64/pmap.c,v 1.200 2008/05/09 23:31:41 alc Exp $");
 
 #include 
 #include 
@@ -2266,6 +2266,16 @@
 	return addr;
 }
 
+/*
+ *	Increase the starting virtual address of the given mapping if a
+ *	different alignment might result in more superpage mappings.
+ */
+void
+pmap_align_superpage(vm_object_t object, vm_ooffset_t offset,
+    vm_offset_t *addr, vm_size_t size)
+{
+}
+
 #include "opt_ddb.h"
 
 #ifdef DDB

==== //depot/projects/soc2008/snagg-audit/sys/kern/init_sysent.c#2 (text+ko) ====

@@ -2,7 +2,7 @@
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/kern/init_sysent.c,v 1.239 2008/03/31 12:11:00 kib Exp $
+ * $FreeBSD: src/sys/kern/init_sysent.c,v 1.240 2008/05/09 23:02:55 julian Exp $
  * created from FreeBSD: src/sys/kern/syscalls.master,v 1.242 2008/03/31 12:06:55 kib Exp 
  */
 
@@ -203,7 +203,7 @@
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 172 = nosys */
 	{ AS(freebsd6_pread_args), (sy_call_t *)freebsd6_pread, AUE_PREAD, NULL, 0, 0 },	/* 173 = freebsd6_pread */
 	{ AS(freebsd6_pwrite_args), (sy_call_t *)freebsd6_pwrite, AUE_PWRITE, NULL, 0, 0 },	/* 174 = freebsd6_pwrite */
-	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 175 = nosys */
+	{ AS(setfib_args), (sy_call_t *)setfib, AUE_NULL, NULL, 0, 0 },	/* 175 = setfib */
 	{ AS(ntp_adjtime_args), (sy_call_t *)ntp_adjtime, AUE_NTP_ADJTIME, NULL, 0, 0 },	/* 176 = ntp_adjtime */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 177 = sfork */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 178 = getdescriptor */

==== //depot/projects/soc2008/snagg-audit/sys/kern/kern_lockf.c#2 (text+ko) ====

@@ -59,7 +59,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/kern/kern_lockf.c,v 1.63 2008/04/16 14:08:12 dfr Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_lockf.c,v 1.64 2008/05/09 10:34:23 dfr Exp $");
 
 #include "opt_debug_lockf.h"
 
@@ -1370,6 +1370,18 @@
 		}
 
 		/*
+		 * For flock type locks, we must first remove
+		 * any shared locks that we hold before we sleep
+		 * waiting for an exclusive lock.
+		 */
+		if ((lock->lf_flags & F_FLOCK) &&
+		    lock->lf_type == F_WRLCK) {
+			lock->lf_type = F_UNLCK;
+			lf_activate_lock(state, lock);
+			lock->lf_type = F_WRLCK;
+		}
+
+		/*
 		 * We are blocked. Create edges to each blocking lock,
 		 * checking for deadlock using the owner graph. For
 		 * simplicity, we run deadlock detection for all
@@ -1389,17 +1401,6 @@
 		}
 
 		/*
-		 * For flock type locks, we must first remove
-		 * any shared locks that we hold before we sleep
-		 * waiting for an exclusive lock.
-		 */
-		if ((lock->lf_flags & F_FLOCK) &&
-		    lock->lf_type == F_WRLCK) {
-			lock->lf_type = F_UNLCK;
-			lf_activate_lock(state, lock);
-			lock->lf_type = F_WRLCK;
-		}
-		/*
 		 * We have added edges to everything that blocks
 		 * us. Sleep until they all go away.
 		 */

==== //depot/projects/soc2008/snagg-audit/sys/kern/subr_param.c#2 (text+ko) ====

@@ -35,7 +35,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/kern/subr_param.c,v 1.74 2007/10/16 10:40:53 alfred Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/subr_param.c,v 1.75 2008/05/09 07:42:02 pjd Exp $");
 
 #include "opt_param.h"
 #include "opt_maxusers.h"
@@ -86,14 +86,23 @@
 u_long	maxssiz;			/* max stack size */
 u_long	sgrowsiz;			/* amount to grow stack */
 
-SYSCTL_INT(_kern, OID_AUTO, maxswzone, CTLFLAG_RD, &maxswzone, 0, "");
-SYSCTL_INT(_kern, OID_AUTO, maxbcache, CTLFLAG_RD, &maxbcache, 0, "");
-SYSCTL_ULONG(_kern, OID_AUTO, maxtsiz, CTLFLAG_RD, &maxtsiz, 0, "");
-SYSCTL_ULONG(_kern, OID_AUTO, dfldsiz, CTLFLAG_RD, &dfldsiz, 0, "");
-SYSCTL_ULONG(_kern, OID_AUTO, maxdsiz, CTLFLAG_RD, &maxdsiz, 0, "");
-SYSCTL_ULONG(_kern, OID_AUTO, dflssiz, CTLFLAG_RD, &dflssiz, 0, "");
-SYSCTL_ULONG(_kern, OID_AUTO, maxssiz, CTLFLAG_RD, &maxssiz, 0, "");
-SYSCTL_ULONG(_kern, OID_AUTO, sgrowsiz, CTLFLAG_RD, &sgrowsiz, 0, "");
+SYSCTL_INT(_kern, OID_AUTO, hz, CTLFLAG_RDTUN, &hz, 0, "ticks/second");
+SYSCTL_INT(_kern, OID_AUTO, maxswzone, CTLFLAG_RDTUN, &maxswzone, 0,
+    "max swmeta KVA storage");
+SYSCTL_INT(_kern, OID_AUTO, maxbcache, CTLFLAG_RDTUN, &maxbcache, 0,
+    "max buffer cache KVA storage");
+SYSCTL_ULONG(_kern, OID_AUTO, maxtsiz, CTLFLAG_RDTUN, &maxtsiz, 0,
+    "max text size");
+SYSCTL_ULONG(_kern, OID_AUTO, dfldsiz, CTLFLAG_RDTUN, &dfldsiz, 0,
+    "initial data size limit");
+SYSCTL_ULONG(_kern, OID_AUTO, maxdsiz, CTLFLAG_RDTUN, &maxdsiz, 0,
+    "max data size");
+SYSCTL_ULONG(_kern, OID_AUTO, dflssiz, CTLFLAG_RDTUN, &dflssiz, 0,
+    "initial stack size limit");
+SYSCTL_ULONG(_kern, OID_AUTO, maxssiz, CTLFLAG_RDTUN, &maxssiz, 0,
+    "max stack size");
+SYSCTL_ULONG(_kern, OID_AUTO, sgrowsiz, CTLFLAG_RDTUN, &sgrowsiz, 0,
+    "amount to grow stack");
 
 /*
  * These have to be allocated somewhere; allocating

==== //depot/projects/soc2008/snagg-audit/sys/kern/sys_socket.c#2 (text+ko) ====

@@ -30,7 +30,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/kern/sys_socket.c,v 1.75 2008/01/07 20:05:18 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/sys_socket.c,v 1.76 2008/05/09 23:02:55 julian Exp $");
 
 #include "opt_mac.h"
 
@@ -199,7 +199,7 @@
 		if (IOCGROUP(cmd) == 'i')
 			error = ifioctl(so, cmd, data, td);
 		else if (IOCGROUP(cmd) == 'r')
-			error = rtioctl(cmd, data);
+			error = rtioctl_fib(cmd, data, so->so_fibnum);
 		else
 			error = ((*so->so_proto->pr_usrreqs->pru_control)
 			    (so, cmd, data, 0, td));

==== //depot/projects/soc2008/snagg-audit/sys/kern/syscalls.c#2 (text+ko) ====

@@ -2,7 +2,7 @@
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/kern/syscalls.c,v 1.223 2008/03/31 12:11:00 kib Exp $
+ * $FreeBSD: src/sys/kern/syscalls.c,v 1.224 2008/05/09 23:02:55 julian Exp $
  * created from FreeBSD: src/sys/kern/syscalls.master,v 1.242 2008/03/31 12:06:55 kib Exp 
  */
 
@@ -182,7 +182,7 @@
 	"#172",			/* 172 = nosys */
 	"freebsd6_pread",			/* 173 = freebsd6_pread */
 	"freebsd6_pwrite",			/* 174 = freebsd6_pwrite */
-	"#175",			/* 175 = nosys */
+	"setfib",			/* 175 = setfib */
 	"ntp_adjtime",			/* 176 = ntp_adjtime */
 	"#177",			/* 177 = sfork */
 	"#178",			/* 178 = getdescriptor */

==== //depot/projects/soc2008/snagg-audit/sys/kern/syscalls.master#2 (text+ko) ====

@@ -1,4 +1,4 @@
- $FreeBSD: src/sys/kern/syscalls.master,v 1.242 2008/03/31 12:06:55 kib Exp $
+ $FreeBSD: src/sys/kern/syscalls.master,v 1.243 2008/05/09 23:02:55 julian Exp $
 ;	from: @(#)syscalls.master	8.2 (Berkeley) 1/13/94
 ;
 ; System call name/number master file.
@@ -340,7 +340,7 @@
 174	AUE_PWRITE	STD	{ ssize_t freebsd6_pwrite(int fd, \
 				    const void *buf, \
 				    size_t nbyte, int pad, off_t offset); }
-175	AUE_NULL	UNIMPL	nosys
+175	AUE_NULL	STD	{ int setfib(int fibnum); }
 176	AUE_NTP_ADJTIME	STD	{ int ntp_adjtime(struct timex *tp); }
 177	AUE_NULL	UNIMPL	sfork (BSD/OS 2.x)
 178	AUE_NULL	UNIMPL	getdescriptor (BSD/OS 2.x)

==== //depot/projects/soc2008/snagg-audit/sys/kern/systrace_args.c#2 (text+ko) ====

@@ -2,7 +2,7 @@
  * System call argument to DTrace register array converstion.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/kern/systrace_args.c,v 1.23 2008/03/31 12:11:00 kib Exp $
+ * $FreeBSD: src/sys/kern/systrace_args.c,v 1.24 2008/05/09 23:02:55 julian Exp $
  * This file is part of the DTrace syscall provider.
  */
 
@@ -959,6 +959,13 @@
 		*n_args = 5;
 		break;
 	}
+	/* setfib */
+	case 175: {
+		struct setfib_args *p = params;
+		iarg[0] = p->fibnum; /* int */
+		*n_args = 1;
+		break;
+	}
 	/* ntp_adjtime */
 	case 176: {
 		struct ntp_adjtime_args *p = params;

==== //depot/projects/soc2008/snagg-audit/sys/kern/uipc_socket.c#2 (text+ko) ====

@@ -95,7 +95,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/kern/uipc_socket.c,v 1.309 2008/04/14 18:06:04 rrs Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/uipc_socket.c,v 1.310 2008/05/09 23:02:55 julian Exp $");
 
 #include "opt_inet.h"
 #include "opt_mac.h"
@@ -122,6 +122,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -360,6 +361,11 @@
 	TAILQ_INIT(&so->so_comp);
 	so->so_type = type;
 	so->so_cred = crhold(cred);
+	if ((prp->pr_domain->dom_family == PF_INET) ||
+	    (prp->pr_domain->dom_family == PF_ROUTE))
+		so->so_fibnum = td->td_proc->p_fibnum;
+	else
+		so->so_fibnum = 0;
 	so->so_proto = prp;
 #ifdef MAC
 	mac_socket_create(cred, so);
@@ -2027,6 +2033,20 @@
 			SOCK_UNLOCK(so);
 			break;
 
+		case SO_SETFIB:
+			error = sooptcopyin(sopt, &optval, sizeof optval,
+					    sizeof optval);
+			if (optval < 1 || optval > rt_numfibs) {
+				error = EINVAL;
+				goto bad;
+			}
+			if ((so->so_proto->pr_domain->dom_family == PF_INET) ||
+			    (so->so_proto->pr_domain->dom_family == PF_ROUTE)) {
+				so->so_fibnum = optval;
+			} else {
+				so->so_fibnum = 0;
+			}
+			break;
 		case SO_SNDBUF:
 		case SO_RCVBUF:
 		case SO_SNDLOWAT:

==== //depot/projects/soc2008/snagg-audit/sys/kern/vfs_export.c#2 (text+ko) ====

@@ -35,7 +35,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/kern/vfs_export.c,v 1.341 2007/02/15 22:08:35 pjd Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/vfs_export.c,v 1.342 2008/05/09 23:02:55 julian Exp $");
 
 #include 
 #include 
@@ -161,12 +161,25 @@
 		 * Seems silly to initialize every AF when most are not used,
 		 * do so on demand here
 		 */
-		for (dom = domains; dom; dom = dom->dom_next)
+		for (dom = domains; dom; dom = dom->dom_next) {
+			KASSERT(((i == AF_INET) || (i == AF_INET6)), 
+			    ("unexpected protocol in vfs_hang_addrlist"));
 			if (dom->dom_family == i && dom->dom_rtattach) {
-				dom->dom_rtattach((void **) &nep->ne_rtable[i],
-				    dom->dom_rtoffset);
+				/*
+				 * XXX MRT 
+				 * The INET and INET6 domains know the
+				 * offset already. We don't need to send it
+				 * So we just use it as a flag to say that
+				 * we are or are not setting up a real routing
+				 * table. Only IP and IPV6 need have this
+				 * be 0 so all other protocols can stay the 
+				 * same (ABI compatible).
+				 */ 
+				dom->dom_rtattach(
+				    (void **) &nep->ne_rtable[i], 0);
 				break;
 			}
+		}
 		if ((rnh = nep->ne_rtable[i]) == NULL) {
 			error = ENOBUFS;
 			vfs_mount_error(mp, "%s %s %d",

==== //depot/projects/soc2008/snagg-audit/sys/mips/mips/pmap.c#3 (text+ko) ====

@@ -66,7 +66,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/mips/mips/pmap.c,v 1.3 2008/04/27 00:06:01 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/mips/mips/pmap.c,v 1.4 2008/05/09 23:31:41 alc Exp $");
 
 #include "opt_ddb.h"
 #include 
@@ -2851,6 +2851,16 @@
 	return addr;
 }
 
+/*
+ *	Increase the starting virtual address of the given mapping if a
+ *	different alignment might result in more superpage mappings.
+ */
+void
+pmap_align_superpage(vm_object_t object, vm_ooffset_t offset,
+    vm_offset_t *addr, vm_size_t size)
+{
+}
+
 int pmap_pid_dump(int pid);
 
 int

==== //depot/projects/soc2008/snagg-audit/sys/net/bpf.c#3 (text+ko) ====

@@ -35,7 +35,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/net/bpf.c,v 1.194 2008/04/28 19:42:11 jkim Exp $");
+__FBSDID("$FreeBSD: src/sys/net/bpf.c,v 1.195 2008/05/09 19:29:08 jhb Exp $");
 
 #include "opt_bpf.h"
 #include "opt_mac.h"
@@ -140,6 +140,7 @@
 
 static struct cdevsw bpf_cdevsw = {
 	.d_version =	D_VERSION,
+	.d_flags =	D_TRACKCLOSE,
 	.d_open =	bpfopen,
 	.d_close =	bpfclose,
 	.d_read =	bpfread,

==== //depot/projects/soc2008/snagg-audit/sys/net/if.c#2 (text+ko) ====

@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if.c	8.5 (Berkeley) 1/9/95
- * $FreeBSD: src/sys/net/if.c,v 1.278 2008/04/19 22:04:51 brooks Exp $
+ * $FreeBSD: src/sys/net/if.c,v 1.279 2008/05/09 23:02:56 julian Exp $
  */
 
 #include "opt_compat.h"
@@ -740,11 +740,14 @@
 	 * to this interface...oh well...
 	 */
 	for (i = 1; i <= AF_MAX; i++) {
-		if ((rnh = rt_tables[i]) == NULL)
+	    int j;
+	    for (j = 0; j < rt_numfibs; j++) {
+		if ((rnh = rt_tables[j][i]) == NULL)
 			continue;
 		RADIX_NODE_HEAD_LOCK(rnh);
 		(void) rnh->rnh_walktree(rnh, if_rtdel, ifp);
 		RADIX_NODE_HEAD_UNLOCK(rnh);
+	    }
 	}
 
 	/* Announce that the interface is gone. */
@@ -1010,9 +1013,9 @@
 		if ((rt->rt_flags & RTF_UP) == 0)
 			return (0);
 
-		err = rtrequest(RTM_DELETE, rt_key(rt), rt->rt_gateway,
+		err = rtrequest_fib(RTM_DELETE, rt_key(rt), rt->rt_gateway,
 				rt_mask(rt), rt->rt_flags,
-				(struct rtentry **) NULL);
+				(struct rtentry **) NULL, rt->rt_fibnum);
 		if (err) {
 			log(LOG_WARNING, "if_rtdel: error %d\n", err);
 		}

==== //depot/projects/soc2008/snagg-audit/sys/net/if_atmsubr.c#2 (text+ko) ====

@@ -35,7 +35,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/net/if_atmsubr.c,v 1.46 2007/10/24 19:03:57 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/net/if_atmsubr.c,v 1.47 2008/05/09 23:02:56 julian Exp $");
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
@@ -158,7 +158,8 @@
 			 * check route
 			 */
 			if (rt0 != NULL) {
-				error = rt_check(&rt, &rt0, dst);
+				error = rt_check_fib(&rt, &rt0,
+				    dst, rt0->rt_fibnum);
 				if (error)
 					goto bad;
 				RT_UNLOCK(rt);

==== //depot/projects/soc2008/snagg-audit/sys/net/if_fwsubr.c#2 (text+ko) ====

@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/net/if_fwsubr.c,v 1.25 2007/10/24 19:03:57 rwatson Exp $
+ * $FreeBSD: src/sys/net/if_fwsubr.c,v 1.26 2008/05/09 23:02:56 julian Exp $
  */
 
 #include "opt_inet.h"
@@ -103,7 +103,7 @@
 	}
 

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Sat May 10 12:22:24 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D90FD1065679; Sat, 10 May 2008 12:22:23 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9A579106566B
	for ; Sat, 10 May 2008 12:22:23 +0000 (UTC)
	(envelope-from diego@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 867BE8FC15
	for ; Sat, 10 May 2008 12:22:23 +0000 (UTC)
	(envelope-from diego@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m4ACMNuu023946
	for ; Sat, 10 May 2008 12:22:23 GMT
	(envelope-from diego@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m4ACMMuu023944
	for perforce@freebsd.org; Sat, 10 May 2008 12:22:22 GMT
	(envelope-from diego@FreeBSD.org)
Date: Sat, 10 May 2008 12:22:22 GMT
Message-Id: <200805101222.m4ACMMuu023944@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	diego@FreeBSD.org using -f
From: Diego Giagio 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 141416 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Sat, 10 May 2008 12:22:24 -0000

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

Change 141416 by diego@diego_black on 2008/05/10 12:22:11

	IFC

Affected files ...

.. //depot/projects/soc2008/diego-audit/src/sys/amd64/amd64/pmap.c#3 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/amd64/conf/GENERIC#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/arm/arm/pmap.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/arm/at91/uart_dev_at91usart.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/conf/NOTES#3 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/conf/files#4 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/conf/options#3 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/contrib/pf/net/pf.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/contrib/pf/net/pf_ioctl.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/contrib/rdma/core_priv.h#1 branch
.. //depot/projects/soc2008/diego-audit/src/sys/contrib/rdma/ib_addr.h#1 branch
.. //depot/projects/soc2008/diego-audit/src/sys/contrib/rdma/ib_cache.h#1 branch
.. //depot/projects/soc2008/diego-audit/src/sys/contrib/rdma/ib_cm.h#1 branch
.. //depot/projects/soc2008/diego-audit/src/sys/contrib/rdma/ib_fmr_pool.h#1 branch
.. //depot/projects/soc2008/diego-audit/src/sys/contrib/rdma/ib_mad.h#1 branch
.. //depot/projects/soc2008/diego-audit/src/sys/contrib/rdma/ib_marshall.h#1 branch
.. //depot/projects/soc2008/diego-audit/src/sys/contrib/rdma/ib_pack.h#1 branch
.. //depot/projects/soc2008/diego-audit/src/sys/contrib/rdma/ib_sa.h#1 branch
.. //depot/projects/soc2008/diego-audit/src/sys/contrib/rdma/ib_smi.h#1 branch
.. //depot/projects/soc2008/diego-audit/src/sys/contrib/rdma/ib_umem.h#1 branch
.. //depot/projects/soc2008/diego-audit/src/sys/contrib/rdma/ib_user_cm.h#1 branch
.. //depot/projects/soc2008/diego-audit/src/sys/contrib/rdma/ib_user_mad.h#1 branch
.. //depot/projects/soc2008/diego-audit/src/sys/contrib/rdma/ib_user_sa.h#1 branch
.. //depot/projects/soc2008/diego-audit/src/sys/contrib/rdma/ib_user_verbs.h#1 branch
.. //depot/projects/soc2008/diego-audit/src/sys/contrib/rdma/ib_verbs.h#1 branch
.. //depot/projects/soc2008/diego-audit/src/sys/contrib/rdma/iw_cm.h#1 branch
.. //depot/projects/soc2008/diego-audit/src/sys/contrib/rdma/krping/getopt.c#1 branch
.. //depot/projects/soc2008/diego-audit/src/sys/contrib/rdma/krping/getopt.h#1 branch
.. //depot/projects/soc2008/diego-audit/src/sys/contrib/rdma/krping/krping.c#1 branch
.. //depot/projects/soc2008/diego-audit/src/sys/contrib/rdma/krping/krping.h#1 branch
.. //depot/projects/soc2008/diego-audit/src/sys/contrib/rdma/krping/krping_dev.c#1 branch
.. //depot/projects/soc2008/diego-audit/src/sys/contrib/rdma/rdma_addr.c#1 branch
.. //depot/projects/soc2008/diego-audit/src/sys/contrib/rdma/rdma_cache.c#1 branch
.. //depot/projects/soc2008/diego-audit/src/sys/contrib/rdma/rdma_cm.h#1 branch
.. //depot/projects/soc2008/diego-audit/src/sys/contrib/rdma/rdma_cm_ib.h#1 branch
.. //depot/projects/soc2008/diego-audit/src/sys/contrib/rdma/rdma_cma.c#1 branch
.. //depot/projects/soc2008/diego-audit/src/sys/contrib/rdma/rdma_device.c#1 branch
.. //depot/projects/soc2008/diego-audit/src/sys/contrib/rdma/rdma_iwcm.c#1 branch
.. //depot/projects/soc2008/diego-audit/src/sys/contrib/rdma/rdma_user_cm.h#1 branch
.. //depot/projects/soc2008/diego-audit/src/sys/contrib/rdma/rdma_verbs.c#1 branch
.. //depot/projects/soc2008/diego-audit/src/sys/contrib/rdma/types.h#1 branch
.. //depot/projects/soc2008/diego-audit/src/sys/dev/ata/ata-disk.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/ata/ata-lowlevel.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/ata/atapi-cd.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/ata/atapi-fd.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/ata/atapi-tape.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/ath/if_ath.c#3 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/ath/if_athvar.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/bce/if_bce.c#3 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/bge/if_bge.c#4 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/bge/if_bgereg.h#3 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/cxgb/cxgb_config.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/cxgb/cxgb_main.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/cxgb/cxgb_offload.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/cxgb/cxgb_osdep.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/cxgb/t3cdev.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#1 branch
.. //depot/projects/soc2008/diego-audit/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.h#1 branch
.. //depot/projects/soc2008/diego-audit/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#1 branch
.. //depot/projects/soc2008/diego-audit/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.h#1 branch
.. //depot/projects/soc2008/diego-audit/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cq.c#1 branch
.. //depot/projects/soc2008/diego-audit/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_dbg.c#1 branch
.. //depot/projects/soc2008/diego-audit/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_ev.c#1 branch
.. //depot/projects/soc2008/diego-audit/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.c#1 branch
.. //depot/projects/soc2008/diego-audit/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.h#1 branch
.. //depot/projects/soc2008/diego-audit/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_mem.c#1 branch
.. //depot/projects/soc2008/diego-audit/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.c#1 branch
.. //depot/projects/soc2008/diego-audit/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.h#1 branch
.. //depot/projects/soc2008/diego-audit/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_qp.c#1 branch
.. //depot/projects/soc2008/diego-audit/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_resource.c#1 branch
.. //depot/projects/soc2008/diego-audit/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_resource.h#1 branch
.. //depot/projects/soc2008/diego-audit/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_user.h#1 branch
.. //depot/projects/soc2008/diego-audit/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_wr.h#1 branch
.. //depot/projects/soc2008/diego-audit/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/cxgb/ulp/tom/cxgb_ddp.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/cxgb/ulp/tom/cxgb_tcp_offload.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/cxgb/ulp/tom/cxgb_toepcb.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/dcons/dcons_os.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/firewire/fwohci.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/mpt/mpt.h#3 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/mpt/mpt_pci.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/mpt/mpt_user.c#1 branch
.. //depot/projects/soc2008/diego-audit/src/sys/dev/ofw/ofw_console.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/sio/sio.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/uart/uart_core.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/usb/uipaq.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/usb/usbdevs#4 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/fs/devfs/devfs_vnops.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/fs/unionfs/union_subr.c#3 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/i386/conf/GENERIC#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/i386/i386/pmap.c#3 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/ia64/ia64/pmap.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/kern/init_sysent.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/kern/kern_cpu.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/kern/kern_event.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/kern/kern_lockf.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/kern/subr_blist.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/kern/subr_kdb.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/kern/subr_param.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/kern/subr_witness.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/kern/sys_socket.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/kern/syscalls.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/kern/syscalls.master#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/kern/systrace_args.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/kern/uipc_socket.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/kern/vfs_export.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/kern/vfs_subr.c#3 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/mips/include/cp0.h#2 delete
.. //depot/projects/soc2008/diego-audit/src/sys/mips/include/float.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/mips/mips/mips_subr.c#2 delete
.. //depot/projects/soc2008/diego-audit/src/sys/mips/mips/pmap.c#3 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/modules/Makefile#3 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/modules/cxgb/Makefile#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/modules/cxgb/iw_cxgb/Makefile#1 branch
.. //depot/projects/soc2008/diego-audit/src/sys/modules/esp/Makefile#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/modules/hfa/Makefile#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/modules/hme/Makefile#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/modules/isp/Makefile#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/modules/ispfw/Makefile#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/modules/le/Makefile#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/modules/mpt/Makefile#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/modules/rdma/Makefile#1 branch
.. //depot/projects/soc2008/diego-audit/src/sys/modules/rdma/addr/Makefile#1 branch
.. //depot/projects/soc2008/diego-audit/src/sys/modules/rdma/cma/Makefile#1 branch
.. //depot/projects/soc2008/diego-audit/src/sys/modules/rdma/core/Makefile#1 branch
.. //depot/projects/soc2008/diego-audit/src/sys/modules/rdma/iwcm/Makefile#1 branch
.. //depot/projects/soc2008/diego-audit/src/sys/modules/rdma/krping/Makefile#1 branch
.. //depot/projects/soc2008/diego-audit/src/sys/modules/scc/Makefile#3 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/modules/sound/driver/Makefile#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/modules/wlan/Makefile#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/net/bpf.c#3 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/net/if.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/net/if_atmsubr.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/net/if_fwsubr.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/net/if_gif.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/net/if_gif.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/net/if_gre.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/net/if_gre.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/net/if_iso88025subr.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/net/if_loop.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/net/if_stf.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/net/if_var.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/net/radix_mpath.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/net/radix_mpath.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/net/route.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/net/route.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/net/rtsock.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/netatalk/at_extern.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/netatalk/at_proto.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/netgraph/netflow/netflow.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/netinet/if_atm.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/netinet/if_ether.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/netinet/in_gif.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/netinet/in_mcast.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/netinet/in_pcb.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/netinet/in_pcb.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/netinet/in_rmx.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/netinet/in_var.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/netinet/ip_fastfwd.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/netinet/ip_fw.h#3 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/netinet/ip_fw2.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/netinet/ip_icmp.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/netinet/ip_input.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/netinet/ip_mroute.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/netinet/ip_mroute.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/netinet/ip_options.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/netinet/ip_output.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/netinet/ip_var.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/netinet/raw_ip.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/netinet/sctp_os_bsd.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/netinet/tcp.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/netinet/tcp_input.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/netinet/tcp_subr.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/netinet/tcp_syncache.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/netinet/tcp_usrreq.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/netinet6/in6.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/netinet6/in6_ifattach.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/netinet6/in6_rmx.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/netinet6/nd6_rtr.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/netipx/ipx_proto.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/nfs4client/nfs4_vfsops.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/nfsclient/bootp_subr.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/nfsclient/nfs_vfsops.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/pc98/cbus/sio.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/pc98/conf/GENERIC#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/powerpc/powerpc/pmap_dispatch.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/security/audit/audit.h#4 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/sparc64/conf/GENERIC#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/sparc64/include/bus.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/sparc64/include/bus_common.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/sparc64/include/iommuvar.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/sparc64/pci/psycho.c#3 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/sparc64/sbus/sbus.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/sparc64/sparc64/bus_machdep.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/sparc64/sparc64/counter.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/sparc64/sparc64/iommu.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/sparc64/sparc64/pmap.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/sparc64/sparc64/upa.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/sun4v/sun4v/hvcons.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/sun4v/sun4v/pmap.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/sys/blist.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/sys/domain.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/sys/kdb.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/sys/mbuf.h#3 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/sys/mpt_ioctl.h#1 branch
.. //depot/projects/soc2008/diego-audit/src/sys/sys/param.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/sys/proc.h#3 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/sys/socket.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/sys/socketvar.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/sys/syscall.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/sys/syscall.mk#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/sys/sysproto.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/vm/pmap.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/vm/swap_pager.c#2 integrate

Differences ...

==== //depot/projects/soc2008/diego-audit/src/sys/amd64/amd64/pmap.c#3 (text+ko) ====

@@ -77,7 +77,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.615 2008/04/25 16:00:39 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.616 2008/05/09 16:48:06 alc Exp $");
 
 /*
  *	Manages physical address maps.
@@ -4469,3 +4469,26 @@
 	addr = (addr + (NBPDR - 1)) & ~(NBPDR - 1);
 	return addr;
 }
+
+/*
+ *	Increase the starting virtual address of the given mapping if a
+ *	different alignment might result in more superpage mappings.
+ */
+void
+pmap_align_superpage(vm_object_t object, vm_ooffset_t offset,
+    vm_offset_t *addr, vm_size_t size)
+{
+	vm_offset_t superpage_offset;
+
+	if (object != NULL && (object->flags & OBJ_COLORED) != 0)
+		offset += ptoa(object->pg_color);
+	superpage_offset = offset & PDRMASK;
+	if (size < superpage_offset ||
+	    size - superpage_offset < NBPDR ||
+	    (*addr & PDRMASK) == superpage_offset)
+		return;
+	if ((*addr & PDRMASK) < superpage_offset)
+		*addr = (*addr & ~PDRMASK) + superpage_offset;
+	else
+		*addr = ((*addr + PDRMASK) & ~PDRMASK) + superpage_offset;
+}

==== //depot/projects/soc2008/diego-audit/src/sys/amd64/conf/GENERIC#2 (text+ko) ====

@@ -16,7 +16,7 @@
 # If you are in doubt as to the purpose or necessity of a line, check first
 # in NOTES.
 #
-# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.497 2008/04/20 20:35:34 sam Exp $
+# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.498 2008/05/03 17:05:38 sam Exp $
 
 cpu		HAMMER
 ident		GENERIC
@@ -235,6 +235,8 @@
 
 # Wireless NIC cards
 device		wlan		# 802.11 support
+options		IEEE80211_DEBUG	# enable debug msgs
+options		IEEE80211_AMPDU_AGE	# age frames in AMPDU reorder q's
 device		wlan_wep	# 802.11 WEP support
 device		wlan_ccmp	# 802.11 CCMP support
 device		wlan_tkip	# 802.11 TKIP support

==== //depot/projects/soc2008/diego-audit/src/sys/arm/arm/pmap.c#2 (text+ko) ====

@@ -147,7 +147,7 @@
 #include "opt_vm.h"
 
 #include 
-__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.99 2008/03/06 21:59:47 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.100 2008/05/09 23:31:41 alc Exp $");
 #include 
 #include 
 #include 
@@ -4355,6 +4355,16 @@
 	return(addr);
 }
 
+/*
+ *	Increase the starting virtual address of the given mapping if a
+ *	different alignment might result in more superpage mappings.
+ */
+void
+pmap_align_superpage(vm_object_t object, vm_ooffset_t offset,
+    vm_offset_t *addr, vm_size_t size)
+{
+}
+
 
 /*
  * Map a set of physical memory pages into the kernel virtual

==== //depot/projects/soc2008/diego-audit/src/sys/arm/at91/uart_dev_at91usart.c#2 (text) ====

@@ -26,7 +26,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/arm/at91/uart_dev_at91usart.c,v 1.13 2007/12/25 17:51:55 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/at91/uart_dev_at91usart.c,v 1.14 2008/05/04 23:29:37 peter Exp $");
 
 #include "opt_comconsole.h"
 
@@ -506,9 +506,20 @@
 at91_rx_put(struct uart_softc *sc, int key)
 {
 #if defined(KDB) && defined(ALT_BREAK_TO_DEBUGGER)
+	int kdb_brk;
+
 	if (sc->sc_sysdev != NULL && sc->sc_sysdev->type == UART_DEV_CONSOLE) {
-		if (kdb_alt_break(key, &sc->sc_altbrk))
-			kdb_enter(KDB_WHY_BREAK, "Break sequence to console");
+		if ((kdb_brk = kdb_alt_break(key, &sc->sc_altbrk)) != 0) {
+		case KDB_REQ_DEBUGGER:
+			kdb_enter(KDB_WHY_BREAK, "Break sequence on console");
+			break;
+		case KDB_REQ_PANIC:
+			kdb_panic("Panic sequence on console");
+			break;
+		case KDB_REQ_REBOOT:
+			kdb_reboot();
+			break;
+		}
 	}
 #endif
 	uart_rx_put(sc, key);	

==== //depot/projects/soc2008/diego-audit/src/sys/conf/NOTES#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/NOTES,v 1.1482 2008/04/29 21:23:21 julian Exp $
+# $FreeBSD: src/sys/conf/NOTES,v 1.1485 2008/05/09 23:02:55 julian Exp $
 #
 # NOTES -- Lines that can be cut/pasted into kernel and hints configs.
 #
@@ -509,6 +509,8 @@
 options 	INET			#Internet communications protocols
 options 	INET6			#IPv6 communications protocols
 
+options		ROUTETABLES=2		# max 16. 1 is back compatible.
+
 # In order to enable IPSEC you MUST also add device crypto to 
 # your kernel configuration
 options 	IPSEC			#IP security (requires device crypto)
@@ -762,6 +764,8 @@
 device		ether			#Generic Ethernet
 device		vlan			#VLAN support (needs miibus)
 device		wlan			#802.11 support
+options		IEEE80211_DEBUG		#enable debugging msgs
+options		IEEE80211_AMPDU_AGE	#age frames in AMPDU reorder q's
 device		wlan_wep		#802.11 WEP support
 device		wlan_ccmp		#802.11 CCMP support
 device		wlan_tkip		#802.11 TKIP support
@@ -868,7 +872,7 @@
 # The MBUF_STRESS_TEST option enables options which create
 # various random failures / extreme cases related to mbuf
 # functions.  See mbuf(9) for a list of available test cases.
-# MBUF_PROFILING enables code to profile teh mbif chains
+# MBUF_PROFILING enables code to profile the mbuf chains
 # exiting the system (via participating interfaces) and
 # return a logarithmic histogram of monitored parameters
 # (e.g. packet size, wasted space, number of mbufs in chain).

==== //depot/projects/soc2008/diego-audit/src/sys/conf/files#4 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.1296 2008/04/29 21:36:16 sam Exp $
+# $FreeBSD: src/sys/conf/files,v 1.1297 2008/05/06 20:49:52 jhb Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -931,6 +931,7 @@
 dev/mpt/mpt_debug.c		optional mpt
 dev/mpt/mpt_pci.c		optional mpt pci
 dev/mpt/mpt_raid.c		optional mpt
+dev/mpt/mpt_user.c		optional mpt
 dev/msk/if_msk.c		optional msk
 dev/mxge/if_mxge.c		optional mxge pci
 dev/mxge/mxge_lro.c		optional mxge pci

==== //depot/projects/soc2008/diego-audit/src/sys/conf/options#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options,v 1.627 2008/04/29 21:23:21 julian Exp $
+# $FreeBSD: src/sys/conf/options,v 1.628 2008/05/09 23:02:55 julian Exp $
 #
 #        On the handling of kernel options
 #
@@ -364,6 +364,7 @@
 ETHER_8023		opt_ef.h
 ETHER_8022		opt_ef.h
 ETHER_SNAP		opt_ef.h
+ROUTETABLES		opt_route.h
 MROUTING		opt_mrouting.h
 INET			opt_inet.h
 INET6			opt_inet6.h

==== //depot/projects/soc2008/diego-audit/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#2 (text+ko) ====

@@ -1,4 +1,4 @@
-/*	$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c,v 1.9 2007/11/26 08:18:19 darrenr Exp $	*/
+/*	$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c,v 1.10 2008/05/09 23:02:55 julian Exp $	*/
 
 /*
  * Copyright (C) 1993-2003 by Darren Reed.
@@ -970,7 +970,7 @@
 		dst->sin_addr = fdp->fd_ip;
 
 	dst->sin_len = sizeof(*dst);
-	rtalloc(ro);
+	in_rtalloc(ro, 0);
 
 	if ((ifp == NULL) && (ro->ro_rt != NULL))
 		ifp = ro->ro_rt->rt_ifp;
@@ -1158,7 +1158,7 @@
 	dst->sin_len = sizeof(*dst);
 	dst->sin_family = AF_INET;
 	dst->sin_addr = fin->fin_src;
-	rtalloc(&iproute);
+	in_rtalloc(&iproute, 0);
 	if (iproute.ro_rt == NULL)
 		return 0;
 	return (fin->fin_ifp == iproute.ro_rt->rt_ifp);

==== //depot/projects/soc2008/diego-audit/src/sys/contrib/pf/net/pf.c#2 (text+ko) ====

@@ -40,7 +40,7 @@
 #include "opt_inet6.h"
 
 #include 
-__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.53 2008/04/20 00:21:54 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.54 2008/05/09 23:02:55 julian Exp $");
 #endif
 
 #ifdef __FreeBSD__
@@ -1839,7 +1839,14 @@
 	pf_mtag->tag = rtag;
 
 	if (r != NULL && r->rtableid >= 0)
+#ifdef __FreeBSD__
+	{
+		M_SETFIB(m, r->rtableid);
+#endif
 		pf_mtag->rtableid = r->rtableid;
+#ifdef __FreeBSD__
+	}
+#endif
 #ifdef ALTQ
 	if (r != NULL && r->qid) {
 		pf_mtag->qid = r->qid;
@@ -2004,7 +2011,14 @@
 #endif
 
 	if (r->rtableid >= 0)
+#ifdef __FreeBSD__
+	{
+		M_SETFIB(m0, r->rtableid);
+#endif
 		pf_mtag->rtableid = r->rtableid;
+#ifdef __FreeBSD__
+	}
+#endif
 
 #ifdef ALTQ
 	if (r->qid) {
@@ -2195,7 +2209,14 @@
 	if (tag > 0)
 		pf_mtag->tag = tag;
 	if (rtableid >= 0)
+#ifdef __FreeBSD__
+	{
+		M_SETFIB(m, rtableid);
+#endif
 		pf_mtag->rtableid = rtableid;
+#ifdef __FreeBSD__
+	}
+#endif
 
 	return (0);
 }
@@ -3141,7 +3162,7 @@
 #ifdef RTF_PRCLONING
 		rtalloc_ign(&ro, (RTF_CLONING | RTF_PRCLONING));
 #else /* !RTF_PRCLONING */
-		rtalloc_ign(&ro, RTF_CLONING);
+		in_rtalloc_ign(&ro, RTF_CLONING, 0);
 #endif
 #else /* ! __FreeBSD__ */
 		rtalloc_noclone(&ro, NO_CLONING);
@@ -5946,7 +5967,11 @@
 		goto out;
 
 #ifdef __FreeBSD__
-	rtalloc_ign((struct route *)&ro, RTF_CLONING);
+/* XXX MRT not always INET */ /* stick with table 0 though */
+	if (af == AF_INET)
+		in_rtalloc_ign((struct route *)&ro, RTF_CLONING, 0);
+	else
+		rtalloc_ign((struct route *)&ro, RTF_CLONING);
 #else /* ! __FreeBSD__ */
 	rtalloc_noclone((struct route *)&ro, NO_CLONING);
 #endif
@@ -6025,7 +6050,10 @@
 # ifdef RTF_PRCLONING
 	rtalloc_ign((struct route *)&ro, (RTF_CLONING|RTF_PRCLONING));
 # else /* !RTF_PRCLONING */
-	rtalloc_ign((struct route *)&ro, RTF_CLONING);
+	if (af == AF_INET)
+		in_rtalloc_ign((struct route *)&ro, RTF_CLONING, 0);
+	else
+		rtalloc_ign((struct route *)&ro, RTF_CLONING);
 # endif
 #else /* ! __FreeBSD__ */
 	rtalloc_noclone((struct route *)&ro, NO_CLONING);
@@ -6105,7 +6133,7 @@
 	dst->sin_addr = ip->ip_dst;
 
 	if (r->rt == PF_FASTROUTE) {
-		rtalloc(ro);
+		in_rtalloc(ro, 0);
 		if (ro->ro_rt == 0) {
 			ipstat.ips_noroute++;
 			goto bad;

==== //depot/projects/soc2008/diego-audit/src/sys/contrib/pf/net/pf_ioctl.c#2 (text+ko) ====

@@ -40,7 +40,7 @@
 #include "opt_inet6.h"
 
 #include 
-__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_ioctl.c,v 1.31 2008/03/29 00:24:36 mlaier Exp $");
+__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_ioctl.c,v 1.32 2008/05/09 23:02:55 julian Exp $");
 #endif
 
 #ifdef __FreeBSD__
@@ -1532,7 +1532,7 @@
 		}
 
 #ifdef __FreeBSD__ /* ROUTEING */
-		if (rule->rtableid > 0)
+		if (rule->rtableid > 0 && rule->rtableid < rt_numfibs)
 #else
 		if (rule->rtableid > 0 && !rtable_exists(rule->rtableid))
 #endif
@@ -1795,7 +1795,7 @@
 
 			if (newrule->rtableid > 0 &&
 #ifdef __FreeBSD__ /* ROUTING */
-			    1)
+			    newrule->rtableid < rt_numfibs)
 #else
 			    !rtable_exists(newrule->rtableid))
 #endif

==== //depot/projects/soc2008/diego-audit/src/sys/dev/ata/ata-disk.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/ata/ata-disk.c,v 1.210 2008/04/17 12:29:35 sos Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-disk.c,v 1.211 2008/05/08 17:55:44 grehan Exp $");
 
 #include "opt_ata.h"
 #include 
@@ -125,7 +125,7 @@
     adp->disk->d_dump = ad_dump;
     adp->disk->d_name = "ad";
     adp->disk->d_drv1 = dev;
-    adp->disk->d_maxsize = ch->dma.max_iosize;
+    adp->disk->d_maxsize = ch->dma.max_iosize ? ch->dma.max_iosize : DFLTPHYS;
     adp->disk->d_sectorsize = DEV_BSIZE;
     adp->disk->d_mediasize = DEV_BSIZE * (off_t)adp->total_secs;
     adp->disk->d_fwsectors = adp->sectors;

==== //depot/projects/soc2008/diego-audit/src/sys/dev/ata/ata-lowlevel.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/ata/ata-lowlevel.c,v 1.83 2008/04/17 12:29:35 sos Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-lowlevel.c,v 1.84 2008/05/08 17:55:44 grehan Exp $");
 
 #include "opt_ata.h"
 #include 
@@ -213,7 +213,9 @@
     printf("ata_begin_transaction OOPS!!!\n");
 
 begin_finished:
-    ch->dma.unload(request);
+    if (ch->dma.unload) {
+        ch->dma.unload(request);
+    }
     return ATA_OP_FINISHED;
 
 begin_continue:

==== //depot/projects/soc2008/diego-audit/src/sys/dev/ata/atapi-cd.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.199 2008/04/17 12:29:35 sos Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.200 2008/05/08 17:55:44 grehan Exp $");
 
 #include "opt_ata.h"
 #include 
@@ -906,8 +906,11 @@
 {
     struct ata_channel *ch = device_get_softc(device_get_parent(dev));
     struct acd_softc *cdp = device_get_ivars(dev);
+    uint32_t max_iosize;
 
-    cdp->iomax = min(ch->dma.max_iosize, 65534);
+    max_iosize = ch->dma.max_iosize ? ch->dma.max_iosize : DFLTPHYS;
+
+    cdp->iomax = min(max_iosize, 65534);
 }
 
 static void 

==== //depot/projects/soc2008/diego-audit/src/sys/dev/ata/atapi-fd.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-fd.c,v 1.114 2008/04/17 12:29:35 sos Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-fd.c,v 1.115 2008/05/08 17:55:44 grehan Exp $");
 
 #include 
 #include 
@@ -105,7 +105,7 @@
     fdp->disk->d_ioctl = afd_ioctl;
     fdp->disk->d_name = "afd";
     fdp->disk->d_drv1 = dev;
-    fdp->disk->d_maxsize = ch->dma.max_iosize;
+    fdp->disk->d_maxsize = ch->dma.max_iosize ? ch->dma.max_iosize : DFLTPHYS;
     fdp->disk->d_unit = device_get_unit(dev);
     disk_create(fdp->disk, DISK_VERSION);
     return 0;

==== //depot/projects/soc2008/diego-audit/src/sys/dev/ata/atapi-tape.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-tape.c,v 1.107 2008/04/17 12:29:35 sos Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-tape.c,v 1.108 2008/05/08 17:55:44 grehan Exp $");
 
 #include "opt_ata.h"
 #include 
@@ -142,7 +142,7 @@
 		      UID_ROOT, GID_OPERATOR, 0640, "ast%d",
 		      device_get_unit(dev));
     device->si_drv1 = dev;
-    device->si_iosize_max = ch->dma.max_iosize;
+    device->si_iosize_max = ch->dma.max_iosize ? ch->dma.max_iosize : DFLTPHYS;
     stp->dev1 = device;
     device = make_dev(&ast_cdevsw, 2 * device_get_unit(dev) + 1,
 		      UID_ROOT, GID_OPERATOR, 0640, "nast%d",

==== //depot/projects/soc2008/diego-audit/src/sys/dev/ath/if_ath.c#3 (text+ko) ====

@@ -28,7 +28,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.183 2008/05/01 04:54:58 thompsa Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.185 2008/05/03 21:55:02 sam Exp $");
 
 /*
  * Driver for the Atheros Wireless LAN controller.
@@ -85,6 +85,11 @@
 #endif
 
 /*
+ * We require a HAL w/ the changes for split tx/rx MIC.
+ */
+CTASSERT(HAL_ABI_VERSION > 0x06052200);
+
+/*
  * ATH_BCBUF determines the number of vap's that can transmit
  * beacons and also (currently) the number of vap's that can
  * have unique mac addresses/bssid.  When staggering beacons
@@ -2067,13 +2072,11 @@
 		printf(" %s ", sc->sc_splitmic ? "mic" : "rxmic");
 		for (i = 0; i < sizeof(hk->kv_mic); i++)
 			printf("%02x", hk->kv_mic[i]);
-#if HAL_ABI_VERSION > 0x06052200
 		if (!sc->sc_splitmic) {
 			printf(" txmic ");
 			for (i = 0; i < sizeof(hk->kv_txmic); i++)
 				printf("%02x", hk->kv_txmic[i]);
 		}
-#endif
 	}
 	printf("\n");
 }
@@ -2116,18 +2119,19 @@
 			 * will handle the rest.
 			 */
 			memcpy(hk->kv_mic, k->wk_rxmic, sizeof(hk->kv_mic));
-#if HAL_ABI_VERSION > 0x06052200
 			memcpy(hk->kv_txmic, k->wk_txmic, sizeof(hk->kv_txmic));
-#endif
 			KEYPRINTF(sc, k->wk_keyix, hk, mac);
 			return ath_hal_keyset(ah, k->wk_keyix, hk, mac);
 		}
 	} else if (k->wk_flags & IEEE80211_KEY_XMIT) {
-#if HAL_ABI_VERSION > 0x06052200
-		memcpy(hk->kv_txmic, k->wk_txmic, sizeof(hk->kv_txmic));
-#else
-		memcpy(hk->kv_mic, k->wk_mic, sizeof(hk->kv_mic));
-#endif
+		if (sc->sc_splitmic) {
+			/*
+			 * NB: must pass MIC key in expected location when
+			 * the keycache only holds one MIC key per entry.
+			 */
+			memcpy(hk->kv_mic, k->wk_txmic, sizeof(hk->kv_txmic));
+		} else
+			memcpy(hk->kv_txmic, k->wk_txmic, sizeof(hk->kv_txmic));
 		KEYPRINTF(sc, k->wk_keyix, hk, mac);
 		return ath_hal_keyset(ah, k->wk_keyix, hk, mac);
 	} else if (k->wk_flags & IEEE80211_KEY_RECV) {
@@ -5941,7 +5945,6 @@
 	struct ifnet *ifp = sc->sc_ifp;
 	struct ieee80211com *ic = ifp->if_l2com;
 	struct ath_hal *ah = sc->sc_ah;
-	u_int32_t rd, cc;
 	int error;
 
 	/*
@@ -5949,19 +5952,19 @@
 	 */
 	error = getchannels(sc, &ic->ic_nchans, ic->ic_channels,
 	    CTRY_DEFAULT, AH_TRUE, AH_FALSE);
-	(void) ath_hal_getregdomain(ah, &rd);
-	ath_hal_getcountrycode(ah, &cc);	/* NB: cannot fail */
+	(void) ath_hal_getregdomain(ah, &sc->sc_eerd);
+	ath_hal_getcountrycode(ah, &sc->sc_eecc);	/* NB: cannot fail */
 	if (error) {
 		if_printf(ifp, "%s: unable to collect channel list from hal, "
 		    "error %d\n", __func__, error);
 		if (error == EINVAL) {
 			if_printf(ifp, "%s: regdomain likely %u country code %u\n",
-			    __func__, rd, cc);
+			    __func__, sc->sc_eerd, sc->sc_eecc);
 		}
 		return error;
 	}
-	ic->ic_regdomain.regdomain = ath_mapregdomain(sc, rd);
-	ic->ic_regdomain.country = cc;
+	ic->ic_regdomain.regdomain = ath_mapregdomain(sc, sc->sc_eerd);
+	ic->ic_regdomain.country = sc->sc_eecc;
 	ic->ic_regdomain.ecm = 1;
 	ic->ic_regdomain.location = 'I';
 	ic->ic_regdomain.isocc[0] = ' ';	/* XXX don't know */
@@ -6585,6 +6588,12 @@
 	struct sysctl_oid *tree = device_get_sysctl_tree(sc->sc_dev);
 	struct ath_hal *ah = sc->sc_ah;
 
+	SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
+		"countrycode", CTLFLAG_RD, &sc->sc_eecc, 0,
+		"EEPROM country code");
+	SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
+		"regdomain", CTLFLAG_RD, &sc->sc_eerd, 0,
+		"EEPROM regdomain code");
 #ifdef	ATH_DEBUG
 	sc->sc_debug = ath_debug;
 	SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,

==== //depot/projects/soc2008/diego-audit/src/sys/dev/ath/if_athvar.h#2 (text+ko) ====

@@ -26,7 +26,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  *
- * $FreeBSD: src/sys/dev/ath/if_athvar.h,v 1.63 2008/04/20 20:35:35 sam Exp $
+ * $FreeBSD: src/sys/dev/ath/if_athvar.h,v 1.64 2008/05/03 21:52:05 sam Exp $
  */
 
 /*
@@ -246,6 +246,8 @@
 				sc_swbmiss  : 1,/* sta mode using sw bmiss */
 				sc_stagbeacons:1,/* use staggered beacons */
 				sc_wmetkipmic:1;/* can do WME+TKIP MIC */
+	uint32_t		sc_eerd;	/* regdomain from EEPROM */
+	uint32_t		sc_eecc;	/* country code from EEPROM */
 						/* rate tables */
 #define	IEEE80211_MODE_HALF	(IEEE80211_MODE_MAX+0)
 #define	IEEE80211_MODE_QUARTER	(IEEE80211_MODE_MAX+1)

==== //depot/projects/soc2008/diego-audit/src/sys/dev/bce/if_bce.c#3 (text) ====

@@ -29,7 +29,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.38 2008/04/26 14:13:48 marius Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.39 2008/05/08 15:05:38 scottl Exp $");
 
 /*
  * The following controllers are supported by this driver:
@@ -776,7 +776,11 @@
 	ifp->if_capenable    = ifp->if_capabilities;
 
 	/* Use standard mbuf sizes for buffer allocation. */
+#ifdef BCE_USE_SPLIT_HEADER
 	sc->rx_bd_mbuf_alloc_size = MHLEN;
+#else
+	sc->rx_bd_mbuf_alloc_size = MCLBYTES;;
+#endif
 	sc->pg_bd_mbuf_alloc_size = MCLBYTES;
 
 	ifp->if_snd.ifq_drv_maxlen = USABLE_TX_BD;
@@ -3804,7 +3808,11 @@
 			goto bce_get_rx_buf_exit);
 
 		/* This is a new mbuf allocation. */
+#ifdef BCE_USE_SPLIT_HEADER
 		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
+#else
+		m_new = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
+#endif
 		if (m_new == NULL) {
 			sc->mbuf_alloc_failed++;
 			rc = ENOBUFS;

==== //depot/projects/soc2008/diego-audit/src/sys/dev/bge/if_bge.c#4 (text+ko) ====

@@ -32,7 +32,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.209 2008/05/01 13:10:03 bz Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.210 2008/05/05 18:42:17 bz Exp $");
 
 /*
  * Broadcom BCM570x family gigabit ethernet driver for FreeBSD.
@@ -2356,7 +2356,7 @@
 {
 	struct ifnet *ifp;
 	struct bge_softc *sc;
-	uint32_t hwcfg = 0;
+	uint32_t hwcfg = 0, misccfg;
 	u_char eaddr[ETHER_ADDR_LEN];
 	int error, reg, rid, trys;
 
@@ -2446,6 +2446,16 @@
 			sc->bge_flags |= BGE_FLAG_BER_BUG;
 	}
 
+
+	/*
+	 * We could possibly check for BCOM_DEVICEID_BCM5788 in bge_probe()
+	 * but I do not know the DEVICEID for the 5788M.
+	 */
+	misccfg = CSR_READ_4(sc, BGE_MISC_CFG) & BGE_MISCCFG_BOARD_ID;
+	if (misccfg == BGE_MISCCFG_BOARD_ID_5788 ||
+	    misccfg == BGE_MISCCFG_BOARD_ID_5788M)
+		sc->bge_flags |= BGE_FLAG_5788;
+
   	/*
 	 * Check if this is a PCI-X or PCI Express device.
   	 */
@@ -3410,7 +3420,11 @@
 #endif
 		{
 		sc->bge_link_evt++;
-		BGE_SETBIT(sc, BGE_MISC_LOCAL_CTL, BGE_MLC_INTR_SET);
+		if (sc->bge_asicrev == BGE_ASICREV_BCM5700 ||
+		    sc->bge_flags & BGE_FLAG_5788)
+			BGE_SETBIT(sc, BGE_MISC_LOCAL_CTL, BGE_MLC_INTR_SET);
+		else
+			BGE_SETBIT(sc, BGE_HCC_MODE, BGE_HCCMODE_COAL_NOW);
 		}
 	}
 
@@ -3950,10 +3964,11 @@
 	 * need to do this here if BGE_FLAG_TBI is set but as
 	 * we poll for fiber anyway it should not harm.
 	 */
-	BGE_SETBIT(sc, BGE_MISC_LOCAL_CTL, BGE_MLC_INTR_SET);
-#ifdef	notyet
-	BGE_SETBIT(sc, BGE_HCC_MODE, BGE_HCCMODE_COAL_NOW);
-#endif
+	if (sc->bge_asicrev == BGE_ASICREV_BCM5700 ||
+	    sc->bge_flags & BGE_FLAG_5788)
+		BGE_SETBIT(sc, BGE_MISC_LOCAL_CTL, BGE_MLC_INTR_SET);
+	else
+		BGE_SETBIT(sc, BGE_HCC_MODE, BGE_HCCMODE_COAL_NOW);
 
 	return (0);
 }

==== //depot/projects/soc2008/diego-audit/src/sys/dev/bge/if_bgereg.h#3 (text+ko) ====

@@ -30,7 +30,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/dev/bge/if_bgereg.h,v 1.78 2008/04/29 19:47:12 jhb Exp $
+ * $FreeBSD: src/sys/dev/bge/if_bgereg.h,v 1.79 2008/05/05 18:42:17 bz Exp $
  */
 
 /*
@@ -1776,6 +1776,9 @@
 /* Misc. config register */
 #define	BGE_MISCCFG_RESET_CORE_CLOCKS	0x00000001
 #define	BGE_MISCCFG_TIMER_PRESCALER	0x000000FE
+#define	BGE_MISCCFG_BOARD_ID		0x0001E000
+#define	BGE_MISCCFG_BOARD_ID_5788	0x00010000
+#define	BGE_MISCCFG_BOARD_ID_5788M	0x00018000
 #define	BGE_MISCCFG_EPHY_IDDQ		0x00200000
 
 #define	BGE_32BITTIME_66MHZ		(0x41 << 1)
@@ -2546,6 +2549,7 @@
 #define	BGE_FLAG_ADJUST_TRIM	0x04000000
 #define	BGE_FLAG_CRC_BUG	0x08000000
 #define	BGE_FLAG_NO_EEPROM	0x10000000
+#define	BGE_FLAG_5788		0x20000000
 	uint32_t		bge_chipid;
 	uint8_t			bge_asicrev;
 	uint8_t			bge_chiprev;

==== //depot/projects/soc2008/diego-audit/src/sys/dev/cxgb/cxgb_config.h#2 (text+ko) ====

@@ -1,6 +1,6 @@
 /**************************************************************************
 
-Copyright (c) 2007, Chelsio Inc.
+Copyright (c) 2007-2008, Chelsio Inc.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -26,7 +26,7 @@
 POSSIBILITY OF SUCH DAMAGE.
 
 
-$FreeBSD: src/sys/dev/cxgb/cxgb_config.h,v 1.6 2007/12/17 08:17:49 kmacy Exp $
+$FreeBSD: src/sys/dev/cxgb/cxgb_config.h,v 1.7 2008/05/05 01:41:53 kmacy Exp $
 
 ***************************************************************************/
 #ifndef _CXGB_CONFIG_H_

==== //depot/projects/soc2008/diego-audit/src/sys/dev/cxgb/cxgb_main.c#2 (text+ko) ====

@@ -28,7 +28,7 @@
 ***************************************************************************/
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_main.c,v 1.54 2008/04/19 03:22:41 kmacy Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_main.c,v 1.55 2008/05/05 01:41:53 kmacy Exp $");
 
 #include 
 #include 
@@ -1741,6 +1741,10 @@
 		       adapter->port[0].ifp->if_mtu : 0xffff);
 	init_smt(adapter);
 
+	/* Call back all registered clients */
+	cxgb_add_clients(tdev);
+
+	
 	/* restore them in case the offload module has changed them */
 	if (err) {
 		t3_tp_set_offload_mode(adapter, 0);
@@ -1757,7 +1761,10 @@
 
 	if (!isset(&adapter->open_device_map, OFFLOAD_DEVMAP_BIT))
 		return (0);
-	
+

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Sat May 10 13:06:15 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E7D6C1065676; Sat, 10 May 2008 13:06:14 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AA6A9106564A
	for ; Sat, 10 May 2008 13:06:14 +0000 (UTC)
	(envelope-from mayur@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 7F2D18FC12
	for ; Sat, 10 May 2008 13:06:14 +0000 (UTC)
	(envelope-from mayur@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m4AD6Eku036101
	for ; Sat, 10 May 2008 13:06:14 GMT
	(envelope-from mayur@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m4AD6Eic036086
	for perforce@freebsd.org; Sat, 10 May 2008 13:06:14 GMT
	(envelope-from mayur@FreeBSD.org)
Date: Sat, 10 May 2008 13:06:14 GMT
Message-Id: <200805101306.m4AD6Eic036086@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	mayur@FreeBSD.org using -f
From: Mayur Shardul 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 141418 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Sat, 10 May 2008 13:06:15 -0000

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

Change 141418 by mayur@mayur_iitk on 2008/05/10 13:05:53

	PR: NA
	Submitted by: Mayur

Affected files ...

.. //depot/projects/soc2008/mayur_vmalgo/README#1 add
.. //depot/projects/soc2008/mayur_vmalgo/TODO#1 add

Differences ...

From owner-p4-projects@FreeBSD.ORG  Sat May 10 18:49:23 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B7C47106566B; Sat, 10 May 2008 18:49:23 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 78AEE106567A
	for ; Sat, 10 May 2008 18:49:23 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 648E18FC17
	for ; Sat, 10 May 2008 18:49:23 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m4AInNT7063520
	for ; Sat, 10 May 2008 18:49:23 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m4AInMGH063518
	for perforce@freebsd.org; Sat, 10 May 2008 18:49:22 GMT
	(envelope-from jb@freebsd.org)
Date: Sat, 10 May 2008 18:49:22 GMT
Message-Id: <200805101849.m4AInMGH063518@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 141426 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Sat, 10 May 2008 18:49:24 -0000

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

Change 141426 by jb@freebsd3 on 2008/05/10 18:48:32

	IFC

Affected files ...

.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/compiz-fusion/article.sgml#2 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#74 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/disks/chapter.sgml#16 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/kernelconfig/chapter.sgml#13 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/ppp-and-slip/chapter.sgml#9 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/printing/chapter.sgml#12 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/security/chapter.sgml#19 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/serialcomms/chapter.sgml#10 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/porters-handbook/book.sgml#29 integrate
.. //depot/projects/dtrace/ports/Tools/portbuild/scripts/build#1 branch
.. //depot/projects/dtrace/ports/UPDATING#71 integrate
.. //depot/projects/dtrace/src/UPDATING#31 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/FREEBSD-upgrade#4 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/FREEBSD-vendor#2 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/INSTALL#6 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/NEWS#7 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/aclocal.m4#6 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/config.guess#6 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/config.sub#6 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/configure#6 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/configure.in#6 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/dist.mk#7 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/include/curses.h.in#7 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/man/curs_threads.3x#2 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/man/form.3x#5 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/man/terminfo.tail#6 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/misc/terminfo.src#7 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_addch.c#6 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_bkgd.c#5 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_delwin.c#5 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_freeall.c#6 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_getch.c#7 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_initscr.c#6 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_newterm.c#7 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_newwin.c#7 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_overlay.c#6 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_restart.c#6 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_set_term.c#7 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_ungetch.c#6 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_window.c#6 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/resizeterm.c#7 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/use_window.c#3 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/wresize.c#6 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/ncurses/curses.priv.h#7 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/ncurses/fifo_defs.h#4 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/init_keytry.c#6 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/lib_data.c#7 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/lib_napms.c#5 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/lib_options.c#6 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/lib_setup.c#7 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/lib_ttyflags.c#6 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/use_screen.c#2 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/ncurses/trace/lib_trace.c#6 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tty/lib_tstp.c#6 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tty/lib_twait.c#6 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tty/tty_update.c#6 integrate
.. //depot/projects/dtrace/src/contrib/ncurses/progs/dump_entry.c#6 integrate
.. //depot/projects/dtrace/src/contrib/pf/pfctl/parse.y#5 integrate
.. //depot/projects/dtrace/src/gnu/usr.bin/gdb/kgdb/trgt_i386.c#9 integrate
.. //depot/projects/dtrace/src/include/readpassphrase.h#4 integrate
.. //depot/projects/dtrace/src/kerberos5/usr.bin/krb5-config/Makefile#4 integrate
.. //depot/projects/dtrace/src/lib/libc/sys/Makefile.inc#11 integrate
.. //depot/projects/dtrace/src/lib/libc/sys/Symbol.map#11 integrate
.. //depot/projects/dtrace/src/lib/libc/sys/getsockopt.2#8 integrate
.. //depot/projects/dtrace/src/lib/libc/sys/setfib.2#1 branch
.. //depot/projects/dtrace/src/lib/libftpio/ftpio.c#6 integrate
.. //depot/projects/dtrace/src/lib/ncurses/ncurses/ncurses_cfg.h#5 integrate
.. //depot/projects/dtrace/src/sbin/ipfw/ipfw.8#20 integrate
.. //depot/projects/dtrace/src/sbin/ipfw/ipfw2.c#19 integrate
.. //depot/projects/dtrace/src/share/man/man4/malo.4#3 integrate
.. //depot/projects/dtrace/src/sys/amd64/amd64/pmap.c#42 integrate
.. //depot/projects/dtrace/src/sys/arm/arm/pmap.c#30 integrate
.. //depot/projects/dtrace/src/sys/conf/NOTES#50 integrate
.. //depot/projects/dtrace/src/sys/conf/options#50 integrate
.. //depot/projects/dtrace/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#10 integrate
.. //depot/projects/dtrace/src/sys/contrib/pf/net/pf.c#15 integrate
.. //depot/projects/dtrace/src/sys/contrib/pf/net/pf_ioctl.c#12 integrate
.. //depot/projects/dtrace/src/sys/dev/firewire/firewire.c#6 integrate
.. //depot/projects/dtrace/src/sys/dev/firewire/fwohci.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/mpt/mpt_pci.c#19 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/uipaq.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/usbdevs#34 integrate
.. //depot/projects/dtrace/src/sys/i386/i386/pmap.c#38 integrate
.. //depot/projects/dtrace/src/sys/ia64/ia64/pmap.c#16 integrate
.. //depot/projects/dtrace/src/sys/kern/init_sysent.c#33 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_event.c#14 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_lockf.c#9 integrate
.. //depot/projects/dtrace/src/sys/kern/subr_param.c#5 integrate
.. //depot/projects/dtrace/src/sys/kern/sys_socket.c#9 integrate
.. //depot/projects/dtrace/src/sys/kern/syscalls.c#32 integrate
.. //depot/projects/dtrace/src/sys/kern/syscalls.master#24 integrate
.. //depot/projects/dtrace/src/sys/kern/systrace_args.c#28 integrate
.. //depot/projects/dtrace/src/sys/kern/uipc_socket.c#25 integrate
.. //depot/projects/dtrace/src/sys/kern/vfs_export.c#8 integrate
.. //depot/projects/dtrace/src/sys/mips/mips/pmap.c#3 integrate
.. //depot/projects/dtrace/src/sys/net/bpf.c#22 integrate
.. //depot/projects/dtrace/src/sys/net/if.c#16 integrate
.. //depot/projects/dtrace/src/sys/net/if_atmsubr.c#7 integrate
.. //depot/projects/dtrace/src/sys/net/if_ethersubr.c#17 integrate
.. //depot/projects/dtrace/src/sys/net/if_fwsubr.c#7 integrate
.. //depot/projects/dtrace/src/sys/net/if_gif.c#11 integrate
.. //depot/projects/dtrace/src/sys/net/if_gif.h#4 integrate
.. //depot/projects/dtrace/src/sys/net/if_gre.c#12 integrate
.. //depot/projects/dtrace/src/sys/net/if_gre.h#5 integrate
.. //depot/projects/dtrace/src/sys/net/if_iso88025subr.c#7 integrate
.. //depot/projects/dtrace/src/sys/net/if_loop.c#11 integrate
.. //depot/projects/dtrace/src/sys/net/if_stf.c#10 integrate
.. //depot/projects/dtrace/src/sys/net/if_var.h#9 integrate
.. //depot/projects/dtrace/src/sys/net/radix_mpath.c#3 integrate
.. //depot/projects/dtrace/src/sys/net/radix_mpath.h#2 integrate
.. //depot/projects/dtrace/src/sys/net/route.c#15 integrate
.. //depot/projects/dtrace/src/sys/net/route.h#8 integrate
.. //depot/projects/dtrace/src/sys/net/rtsock.c#11 integrate
.. //depot/projects/dtrace/src/sys/netatalk/at_extern.h#5 integrate
.. //depot/projects/dtrace/src/sys/netatalk/at_proto.c#5 integrate
.. //depot/projects/dtrace/src/sys/netgraph/netflow/netflow.c#9 integrate
.. //depot/projects/dtrace/src/sys/netinet/if_atm.c#4 integrate
.. //depot/projects/dtrace/src/sys/netinet/if_ether.c#16 integrate
.. //depot/projects/dtrace/src/sys/netinet/in_gif.c#7 integrate
.. //depot/projects/dtrace/src/sys/netinet/in_mcast.c#3 integrate
.. //depot/projects/dtrace/src/sys/netinet/in_pcb.c#22 integrate
.. //depot/projects/dtrace/src/sys/netinet/in_pcb.h#10 integrate
.. //depot/projects/dtrace/src/sys/netinet/in_rmx.c#8 integrate
.. //depot/projects/dtrace/src/sys/netinet/in_var.h#6 integrate
.. //depot/projects/dtrace/src/sys/netinet/ip_fastfwd.c#8 integrate
.. //depot/projects/dtrace/src/sys/netinet/ip_fw.h#11 integrate
.. //depot/projects/dtrace/src/sys/netinet/ip_fw2.c#30 integrate
.. //depot/projects/dtrace/src/sys/netinet/ip_icmp.c#10 integrate
.. //depot/projects/dtrace/src/sys/netinet/ip_input.c#13 integrate
.. //depot/projects/dtrace/src/sys/netinet/ip_mroute.c#10 integrate
.. //depot/projects/dtrace/src/sys/netinet/ip_mroute.h#6 integrate
.. //depot/projects/dtrace/src/sys/netinet/ip_options.c#10 integrate
.. //depot/projects/dtrace/src/sys/netinet/ip_output.c#18 integrate
.. //depot/projects/dtrace/src/sys/netinet/ip_var.h#7 integrate
.. //depot/projects/dtrace/src/sys/netinet/raw_ip.c#16 integrate
.. //depot/projects/dtrace/src/sys/netinet/sctp_os_bsd.h#4 integrate
.. //depot/projects/dtrace/src/sys/netinet/tcp_input.c#16 integrate
.. //depot/projects/dtrace/src/sys/netinet/tcp_subr.c#21 integrate
.. //depot/projects/dtrace/src/sys/netinet/tcp_syncache.c#19 integrate
.. //depot/projects/dtrace/src/sys/netinet6/in6.c#15 integrate
.. //depot/projects/dtrace/src/sys/netinet6/in6_ifattach.c#11 integrate
.. //depot/projects/dtrace/src/sys/netinet6/in6_rmx.c#8 integrate
.. //depot/projects/dtrace/src/sys/netinet6/nd6_rtr.c#9 integrate
.. //depot/projects/dtrace/src/sys/netipx/ipx_proto.c#5 integrate
.. //depot/projects/dtrace/src/sys/nfs4client/nfs4_vfsops.c#13 integrate
.. //depot/projects/dtrace/src/sys/nfsclient/bootp_subr.c#7 integrate
.. //depot/projects/dtrace/src/sys/nfsclient/nfs_vfsops.c#20 integrate
.. //depot/projects/dtrace/src/sys/powerpc/powerpc/pmap_dispatch.c#11 integrate
.. //depot/projects/dtrace/src/sys/sparc64/include/bus.h#6 integrate
.. //depot/projects/dtrace/src/sys/sparc64/sparc64/bus_machdep.c#7 integrate
.. //depot/projects/dtrace/src/sys/sparc64/sparc64/pmap.c#17 integrate
.. //depot/projects/dtrace/src/sys/sparc64/sparc64/upa.c#4 integrate
.. //depot/projects/dtrace/src/sys/sun4v/sun4v/pmap.c#27 integrate
.. //depot/projects/dtrace/src/sys/sys/domain.h#5 integrate
.. //depot/projects/dtrace/src/sys/sys/mbuf.h#17 integrate
.. //depot/projects/dtrace/src/sys/sys/param.h#52 integrate
.. //depot/projects/dtrace/src/sys/sys/proc.h#43 integrate
.. //depot/projects/dtrace/src/sys/sys/socket.h#12 integrate
.. //depot/projects/dtrace/src/sys/sys/socketvar.h#10 integrate
.. //depot/projects/dtrace/src/sys/sys/syscall.h#30 integrate
.. //depot/projects/dtrace/src/sys/sys/syscall.mk#30 integrate
.. //depot/projects/dtrace/src/sys/sys/sysproto.h#30 integrate
.. //depot/projects/dtrace/src/sys/vm/pmap.h#11 integrate
.. //depot/projects/dtrace/src/usr.bin/netstat/route.c#13 integrate
.. //depot/projects/dtrace/src/usr.sbin/Makefile#25 integrate
.. //depot/projects/dtrace/src/usr.sbin/setfib/Makefile#1 branch
.. //depot/projects/dtrace/src/usr.sbin/setfib/setfib.1#1 branch
.. //depot/projects/dtrace/src/usr.sbin/setfib/setfib.c#1 branch

Differences ...

==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/compiz-fusion/article.sgml#2 (text+ko) ====

@@ -28,7 +28,7 @@
       Manolis Kiagias
     
 
-    $FreeBSD: doc/en_US.ISO8859-1/articles/compiz-fusion/article.sgml,v 1.2 2008/02/12 07:40:35 ale Exp $
+    $FreeBSD: doc/en_US.ISO8859-1/articles/compiz-fusion/article.sgml,v 1.3 2008/05/10 13:32:28 blackend Exp $
 
     
       &tm-attrib.freebsd;
@@ -153,7 +153,7 @@
 
       The driver will create a kernel module, which should be loaded
 	at system startup.  You will need to add the following line to the
-	/boot/loader.conf file:
+	/boot/loader.conf file:
 
       nvidia_load="YES"
 
@@ -263,9 +263,9 @@
 	  you should be able to perform most of the above settings by
           entering the following commands (as root):
 	
-	&prompt.root; nvidia-xconfig --add-argb-glx-visuals
-&prompt.root; nvidia-xconfig --composite
-&prompt.root; nvidia-xconfig --depth=24
+	&prompt.root; nvidia-xconfig --add-argb-glx-visuals
+&prompt.root; nvidia-xconfig --composite
+&prompt.root; nvidia-xconfig --depth=24
 
         You may wish to run nvidia-xonfig -A |more
           to see a list of all the options offered by the above
@@ -278,12 +278,12 @@
     Installing Compiz Fusion
       is as simple as any other port:
 
-    &prompt.root; cd /usr/ports/x11-wm/compiz-fusion
-&prompt.root; make install clean
+    &prompt.root; cd /usr/ports/x11-wm/compiz-fusion
+&prompt.root; make install clean
 
     Make sure to select the EXTRA plugins and the
       EMERALD window decorator from the options dialog that
-      appears.  If you are using Gnome, or
+      appears.  If you are using GNOME, or
       already have support for gconf in your system, you
       may also wish to select gconf support.  In this way,
       your effect settings will be integrated with the other desktop settings,
@@ -297,8 +297,8 @@
     When the installation is finished, start your graphic desktop and
       at a terminal, enter the following commands (as a normal user):
 
-    compiz --replace --sm-disable --ignore-desktop-hints ccp &
-emerald --replace &
+    &prompt.user; compiz --replace --sm-disable --ignore-desktop-hints ccp &
+&prompt.user; emerald --replace &
 
     Your screen will flicker for a few seconds, as your window manager
       (e.g. Metacity if you are using
@@ -319,7 +319,7 @@
     Save this in your home directory as, for example,
       start-compiz and make it executable:
 
-    chmod +x ~/start-compiz
+    &prompt.user; chmod +x ~/start-compiz
 
     Then use the GUI to add it to
       Startup Programs
@@ -332,7 +332,7 @@
       execute (again as a normal user) the
       Compiz Config Settings Manager:
 
-    ccsm
+    &prompt.user; ccsm
 
     
       In GNOME, this can also be found in
@@ -365,8 +365,8 @@
 	  
 	    You are probably missing a setting in
 	      /etc/X11/xorg.conf.  Review this file
-	      carefully and check especially the DefaultDepth and
-	      AddARGBGLXVisuals directives.
+	      carefully and check especially the DefaultDepth and
+	      AddARGBGLXVisuals directives.
 	  
 	
 

==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#74 (text+ko) ====

@@ -1,7 +1,7 @@
 
 
 
 		    800036
 		  
+		  
+		    8.0-CURRENT after addition of multi routing 
+			table support (a.k.a. setfib(1), setfib(2)) 
+		    800037
+		  
 		
 	      
 	    

==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/disks/chapter.sgml#16 (text+ko) ====

@@ -2,8 +2,8 @@
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project
 
-     Original Revision: 1.283
-     $FreeBSD: doc/zh_CN.GB2312/books/handbook/disks/chapter.sgml,v 1.21 2008/05/05 11:29:38 loader Exp $
+     Original Revision: 1.285
+     $FreeBSD: doc/zh_CN.GB2312/books/handbook/disks/chapter.sgml,v 1.22 2008/05/09 14:04:32 loader Exp $
 -->
 
 
@@ -214,7 +214,7 @@
 	  A £¬FreeBSD ½«Ê¹ÓÃÈ«²¿µÄ´ÅÅÌ¡£µ±±»¸æÖª
 	  remain cooperative with any future possible operating
 	     systemsʱ£¬»Ø´ð YES¡£Ê¹ÓÃ
-	     W ±£´æ¸Õ²ÅµÄÐ޸ġ£ÏÖÔÚʹÓà q
+	     W ±£´æ¸Õ²ÅµÄÐ޸ġ£ÏÖÔÚʹÓà Q
 	     Í˳ö FDISK ±à¼­Æ÷¡£ÏÂÃæ»á¿´µ½ÓÐ¹Ø Ö÷Òýµ¼Çø
 	     µÄÐÅÏ¢¡£ ÏÖÔÚÄúÒѾ­ÔÚÔËÐеÄϵͳÉÏÌí¼ÓÁËÒ»¸ö´ÅÅÌ£¬
 	     Òò´ËÓ¦¸ÃÑ¡Ôñ None¡£
@@ -236,7 +236,7 @@
 	    ģʽÏ´ú±íÕû¸ö slice¡£ÆäËü·ÖÇø×÷Ϊһ°ã·ÖÇøÀ´Ê¹Óá£
 
 	  sysinstall µÄ±êÇ©±à¼­Æ÷Óà e
-	    ±íʾ·Ç root ºÍ·Ç swap ·ÖÇø¡£ÔÚ±êÇ©±à¼­Æ÷ÖУ¬¿ÉÒÔʹÓüüÈëC
+	    ±íʾ·Ç root ºÍ·Ç swap ·ÖÇø¡£ÔÚ±êÇ©±à¼­Æ÷ÖУ¬¿ÉÒÔʹÓüüÈë C
 	    ´´½¨Ò»¸öÎļþϵͳ¡£µ±ÌáʾÕâÊÇ·ñÊÇÒ»¸ö FS£¨Îļþϵͳ£©»ò swap ʱ£¬Ñ¡Ôñ
 	    FS£¬È»ºó¸ø³öÒ»¸ö¼ÓÔص㣨È磺 /mnt£©¡£
 	    µ±ÔÚ post-install ģʽʱÌí¼ÓÒ»¸ö´ÅÅÌ£¬ sysinstall
@@ -244,7 +244,7 @@
 	    
 
 	  ÏÖÔÚÒѾ­×¼±¸°Ñбêǩдµ½´ÅÅÌÉÏ£¬È»ºó´´½¨Ò»¸öÎļþϵͳ£¬¿ÉÒÔ°´ÏÂ
-	    W¡£³öÏÖÈκδíÎ󶼻᲻ÄÜ´´½¨ÐµķÖÇø¡£¿ÉÒÔÍ˳ö±êÇ©±à¼­
+	    W¡£³öÏÖÈκδíÎ󶼻᲻ÄÜ´´½¨ÐµķÖÇø¡£¿ÉÒÔÍ˳ö±êÇ©±à¼­
 	    Æ÷È»ºóÖØÐÂÖ´ÐÐ sysinstall ¡£
 	
 
@@ -756,17 +756,17 @@
       ×îºóÒ»²½ÊÇ´´½¨½«Òª¹Ò½ÓÎļþϵͳµÄĿ¼¡£
 	Õâ¸öĿ¼±ØÐëÊÇÊôÓÚ½«Òª¹Ò½ÓÎļþϵͳµÄÓû§µÄ¡£
 	ÒÔ root Éí·ÝΪÓû§½¨Á¢ÊôÓÚ¸ÃÓû§µÄ
-	/mnt/$USER
-	(´Ë´¦ $USER Ó¦Ìæ»»³ÉÓû§µÄµÇ¼Ãû)£º
+	/mnt/username
+	(´Ë´¦ username Ó¦Ìæ»»³ÉÓû§µÄµÇ¼Ãû)£º
 
-      &prompt.root; mkdir /mnt/$USER
-&prompt.root; chown $USER:$USER /mnt/$USER
+      &prompt.root; mkdir /mnt/username
+&prompt.root; chown user:user /mnt/user
 
       ¼ÙÉèÒѾ­²åÈëÁËÒ»¸ö USB ¶Á¿¨É豸£¬ ²¢ÇÒϵͳ½«Æäʶ±ðΪ
 	/dev/da0s1£¬ ÓÉÓÚÕâЩÉ豸ͨ³£ÊÇ FAT
 	Îļþϵͳ£¬ Óû§¿ÉÒÔÕâÑù¹Ò½ÓËüÃÇ£º
 
-      &prompt.user; mount -t msdosfs -m 644 -M 755 /dev/da0s1 /mnt/$USER
+      &prompt.user; mount -t msdosfs -m 644 -M 755 /dev/da0s1 /mnt/username
 
       Èç¹û°Î³öÉ豸 (±ØÐëÊ×ÏȽ«Æä¶ÔÓ¦µÄ´ÅÅ̾íжÏÂ)£¬
 	ÔòÄú»áÔÚϵͳÏûÏ¢»º³åÇøÖп´µ½ÀàËÆÏÂÃæµÄÐÅÏ¢£º

==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/kernelconfig/chapter.sgml#13 (text+ko) ====

@@ -2,8 +2,8 @@
      The FreeBSD Documentation Project
      The FreeBSD Chinese Documentation Project
 
-     Original Revision: 1.181
-     $FreeBSD: doc/zh_CN.GB2312/books/handbook/kernelconfig/chapter.sgml,v 1.17 2008/04/21 06:46:26 loader Exp $
+     Original Revision: 1.183
+     $FreeBSD: doc/zh_CN.GB2312/books/handbook/kernelconfig/chapter.sgml,v 1.18 2008/05/09 14:04:32 loader Exp $
 -->
 
 
@@ -241,10 +241,11 @@
 	Ŀ¼ÏÂÃ棬 ¸´ÖÆ GENERIC ÅäÖÃÎļþ£¬
 	²¢¸øÕâ¸öÎļþÆðÒ»¸öÈÝÒ×±æÈϵÄÃû³Æ£¬ Ëü¾ÍÊÇÄúµÄÄÚºËÃû³Æ¡£ÀýÈ磺
     &prompt.root; cd /usr/src/sys/i386/conf
-&prompt.root; cp GENERIC MYKERNEL
+&prompt.root; cp GENERIC MYKERNEL
 
     ͨ³££¬Õâ¸öÃû³ÆÊÇ´óдµÄ£¬Èç¹ûÄúÕýά»¤×Ŷą̀²»Í¬Ó²¼þµÄ&os;»úÆ÷£¬
-    ÒÔÄú»úÆ÷µÄÓòÃûÀ´ÃüÃûÊǷdz£ºÃµÄÖ÷Òâ¡£ÎÒÃÇ°ÑËüÃüÃûΪMYKERNEL¾ÍÊÇÕâ¸öÔ­Òò¡£
+    ÒÔÄú»úÆ÷µÄÓòÃûÀ´ÃüÃûÊǷdz£ºÃµÄÖ÷Òâ¡£ÎÒÃÇ°ÑËüÃüÃûΪ
+      MYKERNEL¾ÍÊÇÕâ¸öÔ­Òò¡£
     
 
     
@@ -277,7 +278,8 @@
       
     
 
-    ÏÖÔھͿÉÒÔÓÃÄúϲ»¶µÄÎı¾±à¼­Æ÷À´±à¼­ MYKERNEL ÁË¡£
+    ÏÖÔھͿÉÒÔÓÃÄúϲ»¶µÄÎı¾±à¼­Æ÷À´±à¼­
+      MYKERNEL ÁË¡£
       Èç¹ûÄú¸Õ¸Õ¿ªÊ¼Ê¹Óà FreeBSD£¬ Ψһ¿ÉÓõı༭Æ÷ºÜ¿ÉÄÜÊÇ
       vi£¬ ËüµÄʹÓñȽϸ´ÔÓ£¬ ÏÞÓÚƪ·ù£¬
       ÕâÀï²»Óè½éÉÜ£¬ Äú¿ÉÒÔÔÚ ident          GENERIC
 
     ÕâÊÇÄں˵ÄÃû×Ö¡£ ÄúÓ¦¸ÃÈ¡Ò»¸ö×Ô¼ºµÄÃû×Ö£¬
-      ÀýÈçÈ¡Ãû½Ð MYKERNEL£¬
+      ÀýÈçÈ¡Ãû½Ð MYKERNEL£¬
       Èç¹ûÄúÒ»Ö±ÔÚ°´ÕÕÇ°ÃæµÄ˵Ã÷×öµÄ»°¡£
       Äú·ÅÔÚ
       ident ºóÃæµÄ×Ö·û´®ÔÚÆô¶¯ÄÚºËʱ»áÏÔʾ³öÀ´£¬
@@ -1282,7 +1284,7 @@
 	      ·ñÔòÀàËÆ &man.ps.1; ÕâÑùµÄÃüÁî¿ÉÄÜÎÞ·¨Õý³£¹¤×÷¡£
 	      ΪÁËÍê³ÉÕâÒ»µã£¬ ÐèÒªÐÞ¸ÄĿ¼µÄÃû×Ö£º
 
-	    &prompt.root; mv /boot/kernel /boot/kernel.bad
+	    &prompt.root; mv /boot/kernel /boot/kernel.bad
 &prompt.root; mv /boot/kernel.good /boot/kernel
 
 	  

==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/ppp-and-slip/chapter.sgml#9 (text+ko) ====

@@ -2,8 +2,8 @@
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project
 
-     Original Revision: 1.177
-     $FreeBSD: doc/zh_CN.GB2312/books/handbook/ppp-and-slip/chapter.sgml,v 1.11 2008/02/09 13:33:15 loader Exp $
+     Original Revision: 1.179
+     $FreeBSD: doc/zh_CN.GB2312/books/handbook/ppp-and-slip/chapter.sgml,v 1.12 2008/05/09 14:04:32 loader Exp $
 -->
 
 
@@ -233,7 +233,11 @@
       
         <application>PPP</application>×Ô¶¯»¯ÅäÖÃ
 
-	PPPconfiguration
+	
+          PPP
+          configuration
+        
+
 	 pppºÍpppd(PPPµÄÄں˼¶ÊµÏÖ)
 	  ¶¼Ê¹ÓÃ/etc/pppĿ¼ÖеÄÅäÖÃÎļþ¡£ Óû§¼¶ PPP
 	  µÄÀý×Ó¿ÉÒÔÔÚ /usr/share/examples/ppp/ ÖÐÕÒµ½¡£
@@ -245,7 +249,11 @@
 	
 	  PPPºÍ¾²Ì¬IPµØÖ·
 
-	  PPPwith static IP addresses
+	  
+            PPP
+            with static IP addresses
+          
+
 	  ÄúÐèÒª±à¼­ÅäÖÃÎļþ/etc/ppp/ppp.conf£¬ ÈçÏÂËùʾ¡£
 
 	  
@@ -256,7 +264,7 @@
 	  1     default:
 2       set log Phase Chat LCP IPCP CCP tun command
 3       ident user-ppp VERSION (built COMPILATIONDATE)
-4       set device /dev/cuaa0
+4       set device /dev/cuad0
 5       set speed 115200
 6       set dial "ABORT BUSY ABORT NO\\sCARRIER TIMEOUT 5 \
 7                 \"\" AT OK-AT-OK ATE1Q0 OK \\dATDT\\T TIMEOUT 40 CONNECT"
@@ -305,8 +313,11 @@
 
 	      
 		±êÃ÷modemÒªÁ¬½ÓµÄ¶Ë¿ÚºÅ¡£ COM1 ¶ÔÓ¦µÄÉ豸ÊÇ
-		  /dev/cuaa0£¬ ¶ø COM2
-		  ¶ÔÓ¦µÄÔòÊÇ /dev/cuaa1¡£
+		  /dev/cuad0£¨»òÕß &os; 5.X ÏÂ
+                  /dev/cuaa0£©
+                  ¶ø COM2
+		  ¶ÔÓ¦µÄÔòÊÇ /dev/cuad1£¨»òÕß
+                  /dev/cuaa1£©¡£
 	      
 	    
 
@@ -322,7 +333,11 @@
 	    
 	      ÐÐ 6 & 7£º
 
-	      PPPuser PPP
+	      
+		PPP
+		user PPP
+	      
+
 	      
 		²¦ºÅ×Ö·û´®¡£ Óû§¼¶ PPP ʹÓÃÒ»ÖÖÓë &man.chat.8;³ÌÐòÏàËƵÄÓï·¨¡£
 		   Çë²Î¿¼Áª»úÊÖ²áÁ˽âÕâÖÖÓïÑÔµÄÏà¹ØÐÅÏ¢¡£
@@ -472,8 +487,16 @@
 
 	
 	  PPPºÍ¶¯Ì¬IPµØÖ·
-	  PPPwith dynamic IP addresses
-	  IPCP
+
+	  
+            PPP
+            with dynamic IP addresses
+          
+
+	  
+            IPCP
+          
+
 	  Èç¹ûISPû¸øÄúÖ¸¶¨¾²Ì¬µÄIPµØÖ·£¬ pppÒª±»ÅäÖóÉÄܹ»Óë¶Ô·½Ð­ÉÌÈ·¶¨±¾µØºÍÔ¶³ÌµØÖ·¡£
 	    ÒªÍê³ÉÕâÏ×÷£¬ ÏÈÒª²ÂÒ»¸öIPµØÖ·£¬ È»ºóÔÊÐí
 	    pppÔÚÁ¬½ÓºóʹÓÃIPÅäÖÃЭÒé(IPCP)½øÐÐÕýÈ·ÅäÖá£
@@ -542,8 +565,12 @@
 
 	
 	  ½ÓÊÕ²¦Èë
-	  PPPreceiving
-	  incoming calls
+
+	  
+            PPP
+            receiving incoming calls
+          
+
 	  µ±ÒªÅäÖà ppp½ÓÊÜÀ´×ÔLANÉϵÄ
 	    ²¦Èëʱ£¬ ÄúÐèÒª¾ö¶¨ÊÇ·ñ½«°üת¸øLAN¡£ Èç¹ûÊǵĻ°£¬ Äú¾Í±ØÐë´Ó LAN
 	    ×ÓÍøÖиø¶Ô·½·ÖÅäÒ»¸öIP£¬ ÐèÒªÔÚÎļþ /etc/ppp/ppp.conf
@@ -582,7 +609,7 @@
 	    ppp ÃüÁîͨ³£±ØÐëÒÔ root
 	      Óû§µÄÉí·ÝÔËÐС£ Èç¹ûÏ£ÍûÒÔÆÕͨÓû§µÄÉí·ÝÆô¶¯ ppp
 	      ·þÎñ (¾ÍÏñÏÂÃæÃèÊöµÄÄÇÑù)£¬ ¾Í±ØÐë°Ñ´ËÓû§¼ÓÈë
-	      network ×飬 ʹÆä»ñµÃÔËÐÐ ppp
+	      network ×飬 ʹÆä»ñµÃÔËÐÐ ppp
 	      µÄȨÏÞ¡£
 
 	    Äú»¹ÐèҪʹÓÃallowÃüÁîʹÓû§ÄÜ·ÃÎÊÅäÖÃÎÄ
@@ -595,7 +622,10 @@
 
 	  
 	    ¶¯Ì¬IPÓû§µÄPPP Shell
-	    PPP shells
+
+	    
+              PPP shells
+            
 
 	    ´´½¨Ò»¸öÃûΪ/etc/ppp/ppp-shellÎļþ£¬ ¼ÓÈëÒÔÏÂÄÚÈÝ£º
 	    #!/bin/sh
@@ -637,7 +667,10 @@
 
 	  
 	    ¾²Ì¬IPÓû§µÄShell 
-	    PPP shells
+
+	    
+              PPP shells
+            
 
 	    ÏñÉÏÃæÄÇÑù´´½¨ppp-shellÎļþ£¬
 	      Ϊÿ¸ö¾²Ì¬·ÖÅäIPÓû§´´½¨Ò»¸öµ½ ppp-shellµÄ
@@ -717,11 +750,18 @@
 
 	  
 	    <command>mgetty</command>ºÍAutoPPP
+
+	    
+	      mgetty
+	    
+
 	    
-        mgetty
-      
-	    AutoPPP
-	    LCP
+	      AutoPPP
+	    
+
+	    
+	      LCP
+	    
 
 	    ÔÚÅäÖúͱàÒëmgetty
 	      ʱÆôÓà AUTO_PPPÑ¡Ïî
@@ -768,9 +808,19 @@
 
 	  
 	    MS Extensions
-	    DNS
-	    NetBIOS
-	    PPPMicrosoft extensions
+
+	    
+              DNS
+            
+
+	    
+              NetBIOS
+            
+
+	    
+              PPPMicrosoft extensions
+            
+
 	    ¿ÉÒÔÅäÖÃPPPÒÔÌṩDNSºÍNetBIOSÓòÃû·þÎñÆ÷µØÖ·¡£
 
 	    ÒªÔÚ PPP 1.x °æ±¾ÖÐÆôÓÃÕâЩÀ©Õ¹£¬ ÐèÒªÔÚ
@@ -873,12 +923,16 @@
 
       
        ʹÓÃPPPÍøÂçµØÖ··­Òë
-       PPPNAT
+
+       
+         PPP
+         NAT
+       
 
        PPP ¿ÉÒÔʹÓÃÄÚ½¨µÄ NAT£¬ ¶øÎÞÐèÄÚºËÖ§³Ö¡£
 	 Äú¿ÉÒÔÔÚ /etc/ppp/ppp.conf ÖмÓÈëÈçÏÂÅäÖÃÀ´ÆôÓÃËü£º
 
-       nat enable yes
+	nat enable yes
 
         PPP NATÒ²¿ÉÒÔʹÓÃÃüÁîÐÐÑ¡Ïî
 	 -natÆô¶¯¡£ ÔÚ
@@ -886,20 +940,23 @@
          ppp_nat Ï ²¢Ä¬ÈÏÆôÓá£
 
        Èç¹ûÄúʹÓÃÁËÕâ¸öÌØÐÔ£¬ Äú»¹»á·¢ÏÖÔÚ
-/etc/ppp/ppp.confÖÐÒÔÏÂ
-       Ñ¡Ïî¶ÔÓÚÆôÓÃincoming connections forwardingÊÇÓÐÓõģº
+         /etc/ppp/ppp.confÖÐÒÔÏÂ
+         Ñ¡Ïî¶ÔÓÚÆôÓÃincoming connections forwardingÊÇÓÐÓõģº
 
-       nat port tcp 10.0.0.2:ftp ftp
+	nat port tcp 10.0.0.2:ftp ftp
 nat port tcp 10.0.0.2:http http
 
        »òÕßÍêÈ«²»ÐÅÈÎÍâÀ´µÄÇëÇó
 
-       nat deny_incoming yes
+	nat deny_incoming yes
       
 
       
 	×îºóµÄϵͳÅäÖÃ
-	PPPconfiguration
+
+	
+          PPPconfiguration
+        
 
 	ÏÖÔÚÄúÒÑÅäÖÃÁËppp£¬ µ«ÔÚÕæÕý¹¤×÷֮ǰ»¹ÓÐһЩÊÂÇéÒª×ö¡£
 	  ¼´ÐÞ¸Ä /etc/rc.conf¡£
@@ -931,13 +988,15 @@
 	
 
 	Îñ±ØÔÚ
-	  /etc/rc.conf ÖУ¬ °Ñ·ÓɳÌÐòÉèÖÃΪ NO£º
+	  /etc/rc.conf ÖУ¬
+          °Ñ·ÓɳÌÐòÉèÖÃΪ NO£º
 
 	router_enable="NO"
 
 	
-    routed
-  
+          routed
+        
+
 	²»Æô¶¯ routed ·þÎñ³ÌÐò·Ç³£ÖØÒª£¬ ÒòΪ
 	  routed ×Ü»áɾµôÓÉ ppp
 	  Ëù½¨Á¢µÄĬÈÏ·ÓÉ¡£
@@ -965,7 +1024,10 @@
 3       add 0 0 HISADDR
 4       !bg sendmail -bd -q30m
 
-        SMTP
+        
+          SMTP
+        
+
 	Èç¹ûÄú²»Ï²»¶ÕâÑù×ö£¬ ¿ÉÒÔÉèÁ¢Ò»¸ö
 	  dfilter ÒÔ×èÖ¹ SMTP ´«Êä¡£
 	  ²Î¿¼Ïà¹ØÎļþÁ˽â¸ü¶àϸ½Ú¡£
@@ -1080,7 +1142,11 @@
 
     
       ÉèÁ¢Äں˼¶PPP
-      PPPkernel PPP
+
+      
+        PPP
+        kernel PPP
+      
 
       ÔÚ¿ªÊ¼ÉèÖÃÄں˼¶PPPʱ£¬ ÐèҪȷÐÅpppdÒѾ­±»¶¨Î»ÔÚ/usr/sbin ÖÐ
 	ÇÒ´æÔÚ/etc/pppĿ¼¡£
@@ -1093,7 +1159,11 @@
 	    ÄúҪͨ¹ýPPP´®ÐÐÏß»òmodemÏß°ÑÄúµÄ»úÆ÷Á¬½Óµ½»¥ÁªÍøÉÏ¡£
 	
 
-        PPPserver
+        
+	  PPP
+	  server
+	
+
 	
 	  ×÷Ϊ·þÎñÆ÷ —¼ÆËã»úÒѾ­Î»ÓÚÍøÂçÉÏ£¬ ÇÒ±»ÓÃÓÚͨ¹ýPPPÓëÆäËü¼ÆËã»úÁ¬½Ó¡£
 	
@@ -1120,8 +1190,16 @@
       
 
       ʹÓÃ<command>pppd</command>×÷Ϊ¿Í»§¶Ë
-      PPPclient
-      Cisco
+
+      
+        PPP
+        client
+      
+
+      
+        Cisco
+      
+
       ÏÂÃæÕâ¸ö /etc/ppp/optionsÑ¡ÏîÎļþÄܹ»±»ÓÃÀ´ÓëCISCOÖն˷þÎñÆ÷µÄ
       PPPÏßÁ¬½Ó¡£
 
@@ -1133,10 +1211,10 @@
 passive         # wait for LCP packets
 domain ppp.foo.com      # put your domain name here
 
-:<remote_ip>    # put the IP of remote PPP host here
+:remote_ip    # put the IP of remote PPP host here
                 # it will be used to route packets via PPP link
                 # if you didn't specified the noipdefault option
-                # change this line to <local_ip>:<remote_ip>
+                # change this line to local_ip:remote_ip
 
 defaultroute    # put this if you want that PPP server will be your
                 # default router
@@ -1191,7 +1269,10 @@
 kermit -y /etc/ppp/kermit.dial
 pppd /dev/tty01 19200
 
-      Kermit
+      
+        Kermit
+      
+
       /etc/ppp/kermit.dial ÊÇÒ»¸ö Kermit
       ½Å±¾£¬ Ëü»áÍê³É²¦ºÅ£¬ ²¢ÔÚÔ¶³ÌÖ÷»úÉÏÍê³ÉËùÓÐÐèÒªµÄÉí·ÝÑéÖ¤¹ý³Ì
       (Õâ·ÝÎĵµµÄ×îºóÓÐÒ»¸ö½Å±¾ÊµÀý)¡£
@@ -1217,7 +1298,8 @@
 kermit -y /etc/ppp/kermit.hup
 /etc/ppp/ppptest
 
-      ͨ¹ýÖ´ÐÐ/usr/etc/ppp/ppptest£¬ ¿´¿´pppd ÊÇ·ñÈÔÔÚÔËÐУº
+      ͨ¹ýÖ´ÐÐ/usr/etc/ppp/ppptest£¬
+        ¿´¿´pppd ÊÇ·ñÈÔÔÚÔËÐУº
 
       #!/bin/sh
 pid=`pgrep pppd`
@@ -1259,7 +1341,7 @@
 
       /etc/ppp/options£º
 
-      /dev/cuaa1 115200
+      /dev/cuad1 115200
 
 crtscts		# enable hardware flow control
 modem		# modem control line
@@ -1268,12 +1350,12 @@
 	        # if the remote host doesn't send your IP during
                 # IPCP negotiation, remove this option
 passive         # wait for LCP packets
-domain <your.domain>	# put your domain name here
+domain your.domain	# put your domain name here
 
 :		# put the IP of remote PPP host here
 	        # it will be used to route packets via PPP link
                 # if you didn't specified the noipdefault option
-                # change this line to <local_ip>:<remote_ip>
+                # change this line to local_ip:remote_ip
 
 defaultroute	# put this if you want that PPP server will be
 	        # your default router
@@ -1284,9 +1366,9 @@
 	ÒÔϵÄÄÚÈÝÓ¦¸Ã·ÅÔÚÒ»ÐÐÄÚ¡£
       
 
-      ABORT BUSY ABORT 'NO CARRIER' "" AT OK ATDT<phone.number>
-  CONNECT "" TIMEOUT 10 ogin:-\\r-ogin: <login-id>
-  TIMEOUT 5 sword: <password>
+      ABORT BUSY ABORT 'NO CARRIER' "" AT OK ATDTphone.number
+  CONNECT "" TIMEOUT 10 ogin:-\\r-ogin: login-id
+  TIMEOUT 5 sword: password
 
       Ò»µ©ÕâЩ±»°²×°ÇÒÐÞ¸ÄÕýÈ·£¬ ÄúËùÒª×öµÄ¾ÍÊÇÔËÐÐpppd£¬ ¾ÍÏñÕâÑù£º
 
@@ -1519,7 +1601,10 @@
     
     <acronym>PPP</acronym> Á¬½Ó¹ÊÕÏÅųý
 
-    PPPtroubleshooting
+    
+      PPP
+      troubleshooting
+    
 
       ±¾½Ú½«½²Êöͨ¹ýmodemÁ¬½ÓʹÓÃPPPʱ¿ÉÄܳöÏÖµÄÎÊÌâ¡£
 	ÀýÈ磬 Äú¿ÉÄÜÐèҪȷÇеØÖªµÀÄú²¦ÈëµÄϵͳ»á³öÏÖÒ»¸öÔõÑùµÄÃüÁîÐÐÌáʾ·û¡£
@@ -1543,7 +1628,9 @@
 	  Äú¾Í»áÔÚ sio1 »ò COM2
 	  ÉÏÕÒµ½Ëü¡£ Èç¹û modem É豸Á¬½ÓÔÚ sio1
 	  ½Ó¿Ú (ÔÚ DOS ÖгÆΪCOM2)£¬
-	  ÄÇôÄúµÄ modem ½«»áÊÇ /dev/cuaa1¡£
+	  ÄÇôÄúµÄ modem ½«»áÊÇ /dev/cuad1
+          £¨»òÕß &os;nbsp;5.X ϵÄ
+          /dev/cuaa1£©¡£
     
 
     
@@ -1560,10 +1647,11 @@
 
       ÏÖÔÚÎÒÃÇÒѾ­´ò¿ªÁËppp¡£
 
-      ppp ON example> set device /dev/cuaa1
+      ppp ON example> set device /dev/cuad1
 
       ÉèÖÃmodemÉ豸£¬ ÔÚ±¾Àý×ÓÖÐÊÇ
-	cuaa1¡£
+	cuad1 £¨»òÕß &os; 5.X ϵÄ
+        /dev/cuaa1£©¡£
 
       ppp ON example> set speed 115200
 
@@ -1579,7 +1667,7 @@
 
       Çл»µ½ ÖÕ¶ËÑùÎÒÃǾÍÄÜÊÖ¶¯µØ¿ØÖÆÕą̂ modem µÄģʽ¡£
 
-      deflink: Entering terminal mode on /dev/cuaa1
+      deflink: Entering terminal mode on /dev/cuad1
 type '~h' for help
 
       at
@@ -1733,7 +1821,12 @@
     
 
     ʹÓûùÓÚÒÔÌ«ÍøµÄPPP(PPPoE)
-    PPPover Ethernet
+
+    
+      PPP
+      over Ethernet
+    
+
     
       PPPoE
       PPP, over Ethernet (ÒÔÌ«ÍøÉ쵀 PPP)
@@ -1840,10 +1933,12 @@
 
     
 
-      ´øÓÐÒ»¸ö&tm.3com; <trademark class="registered">HomeConnect</trademark>ADSL ModemµÄPPPOEË«ÖØÁ¬½Ó
+      ´øÓÐÒ»¸ö&tm.3com;
+        <trademark class="registered">HomeConnect</trademark>
+        ADSL ModemµÄPPPOEË«ÖØÁ¬½Ó
 
       Õâ¸ö modem ²»×ñÑ­ RFC 2516
+  	  url="http://www.faqs.org/rfcs/rfc2516.html">RFC 2516
 	(A Method for transmitting PPP over Ethernet
 	(PPPoE)£¬ Æä×÷ÕßΪ L. Mamakos¡¢ K. Lidl¡¢ J. Evarts¡¢
 	D. Carrel¡¢ D. Simone ÒÔ¼° R. Wheeler)¡£
@@ -1870,7 +1965,12 @@
 
   
     ʹÓà ATM É쵀 <application>PPP</application> (PPPoA)
-    PPPover ATM
+
+    
+      PPP
+      over ATM
+    
+
     
       PPPoA
       »ùÓÚATMµÄPPP
@@ -2123,17 +2223,17 @@
       Ê×ÏÈ£¬ ÄúÐèҪȷÈϵ÷Öƽâµ÷Æ÷ËùÁ¬½ÓµÄ´®¿Ú¡£
 	Ðí¶àÈË»áÉèÖÃÒ»¸ö·ûºÅÁ¬½Ó£¬ ÀýÈç
 	/dev/modem£¬ ÓÃÒÔÖ¸Ïòʵ¼ÊµÄÉ豸Ãû£¬
-	/dev/cuaaN (»òÔÚ &os; 6.X ÏÂÊÇ
-	/dev/cuadN)¡£ ÕâÑùÄú¾Í¿ÉÒÔ¶Ôʵ¼ÊµÄÉ豸Ãû½øÐгéÏó£¬
+	/dev/cuadN (»òÔÚ &os; 5.X ÏÂÊÇ
+	/dev/cuaaN)¡£ ÕâÑùÄú¾Í¿ÉÒÔ¶Ôʵ¼ÊµÄÉ豸Ãû½øÐгéÏó£¬
 	ÒÔ±¸µ÷Öƽâµ÷Æ÷»»µ½ÆäËû´®¿Úʱ·½±ãµ÷ÕûÖ®Óá£
 	²»È»£¬ ÔÚϵͳÖÐÐÞ¸ÄÒ»´ó¶Ñ /etc ϵÄÎļþÒÔ¼°
 	.kermrc ½«ÊǷdz£Âé·³µÄÊÂÇ飡
 
       
-	/dev/cuaa0 (»ò &os; 6.X
-	  ÖÐµÄ /dev/cuad0) ¶ÔÓ¦
-	  COM1£¬ ¶ø cuaa1
-	  (»ò /dev/cuad1) Ôò¶ÔÓ¦
+	/dev/cuad0 (»ò &os; 5.X
+	  Ï嵀 /dev/cuaa0) ¶ÔÓ¦
+	  COM1£¬ ¶ø cuad1
+	  (»ò /dev/cuaa1) Ôò¶ÔÓ¦
 	  COM2£¬ µÈµÈ¡£
       
 
@@ -2223,7 +2323,12 @@
 
       
 	´´½¨Ò»¸öSLIPÁ¬½Ó
-	SLIPconnecting with
+
+	
+          SLIP
+          connecting with
+        
+
 	
 	  
 	    ÔÚÃüÁîÌáʾ·ûÖ®ºóÊäÈë slip ½øÐв¦ºÅ£¬
@@ -2247,8 +2352,8 @@
 output ***\x0d, echo \x0aCONNECTED\x0a
 
 	    µ±È»£¬ Äú»¹ÐèÒªÐÞ¸ÄÓû§ÃûºÍ¿ÚÁîÀ´Âú×ãʵ¼ÊÐèÒª¡£
-	      Íê³ÉÕâЩ²Ù×÷Ö®ºó£¬ Ö»ÐèÔÚ Kermit Ìáʾ·ûÖ®ºóÊäÈë
-	      slip ¾Í¿ÉÒÔÁ¬½ÓÁË¡£
+	      Íê³ÉÕâЩ²Ù×÷Ö®ºó£¬ Ö»ÐèÔÚ Kermit
+              Ìáʾ·ûÖ®ºóÊäÈë slip ¾Í¿ÉÒÔÁ¬½ÓÁË¡£
 
 	    
 	      ½«ÃÜÂëÒÔ´¿Îı¾µÄÐÎʽ´æ·ÅÔÚÎļþϵͳÎÞÂÛÈçºÎ¶¼ÊǸö »µ Ö÷Òâ¡£
@@ -2352,7 +2457,11 @@
 
     
       ÉèÖÃSLIP·þÎñÆ÷
-      SLIPserver
+
+      
+        SLIP
+        server
+      
 
       ±¾ÎÄÌṩÁËÔÚ FreeBSD ÉÏÉèÖà SLIP ·þÎñ£¬
 	Ò²¾ÍÊÇÈçºÎÅäÖÃÄúµÄϵͳ£¬ ʹÆäÄÜÔÚÔ¶³Ì SLIP
@@ -2423,8 +2532,8 @@
 	  /etc/sliphome/slip.login 0 19200 Shelmerg dc-slip sl-helmer 0xfffffc00 autocomp
 
 	  Èç¹ûÒ»ÇÐ˳Àû
-	    /etc/sliphome/slip.login ½«ÔÚ sliplogin
-	    °ó¶¨µÄ SLIP ½Ó¿ÚÉÏ·¢³ö
+	    /etc/sliphome/slip.login ½«ÔÚ
+            sliplogin °ó¶¨µÄ SLIP ½Ó¿ÚÉÏ·¢³ö
 	    ifconfig (Ç°ÊöµÄÀý×ÓÖÐÊÇ SLIP ½Ó¿Ú
 	    0£¬ ÕâÊÇ slip.login µÄµÚÒ»¸ö²ÎÊý)£¬
 	    ÒÔÉèÖñ¾µØ IP µØÖ· (dc-slip)¡¢ Ô¶³Ì IP µØÖ·
@@ -2433,7 +2542,8 @@
 	    ÒÔ¼°ÈκÎÆäËû±êÖ¾ (autocomp)¡£
 	    Èç¹û·¢Éú´íÎó£¬ sliplogin ͨ³£»áͨ¹ý
 	    syslogd µÄ daemon facility
-	    ¼ÇÏÂÓÐÓõÄÐÅÏ¢£¬ Ç°Õß»á°ÑÕâЩÐÅÏ¢±£´æµ½ /var/log/messages
+	    ¼ÇÏÂÓÐÓõÄÐÅÏ¢£¬ Ç°Õß»á°ÑÕâЩÐÅÏ¢±£´æµ½
+            /var/log/messages
 	    (²Î¼û &man.syslogd.8; ºÍ &man.syslog.conf.5; ÒÔ¼°
 	    /etc/syslog.conf µÄÁª»úÊֲᣬ ÒÔÁ˽â
 	    syslogd ÔڼǼʲô£¬
@@ -2443,8 +2553,15 @@
 
       
 	ÄÚºËÅäÖÃ
-	kernelconfiguration
-	SLIP
+
+	
+          kernel
+          configuration
+        
+
+	
+          SLIP
+        
 
 	&os; µÄĬÈÏÄÚºË (GENERIC)
 	  ÌṩÁË SLIP (&man.sl.4;) Ö§³Ö£» ʹÓö¨ÖƵÄÄÚºËʱ£¬
@@ -2597,11 +2714,16 @@
 	   IP ½Úµã¶Ô SLIP ¿Í»§¶Ë IP µØÖ·½øÐÐ ARP ÇëÇóʱ£¬
 	   SLIP ·þÎñÆ÷»áÒÔ×ÔÒѵÄÒÔÌ«ÍøMACµØÖ·×÷Ϊ»ØÓ¦¡£
 
-  	  Ethernet (ÒÔÌ«Íø)MAC address (MAC µØÖ·)
+  	  
+            Ethernet (ÒÔÌ«Íø)
+            MAC address (MAC µØÖ·)
+          
+
 	  µ±Ê¹ÓÃÒÔÉϵÄÀý×Óʱ£¬ Ò»¶¨Òª½«
-	  ÒÔÌ«ÍøMACµØÖ·(00:11:22:33:44:55)Ìæ»»³ÉÄúϵͳÍø¿¨µÄMACµØÖ·£¬ ·ñÔòARP´úÀí½«
-	  ÍêÈ«ÎÞ·¨¹¤×÷!Äú¿ÉÒԲ鿴netstat -iÊä³ö½á¹ûÒÔÈ¡µÃÒÔÌ«ÍøMACµØÖ·;
-	   Êä³öµÄµÚ¶þÐÐÓ¦¸ÃÊÇÕâÑù£º
+	  ÒÔÌ«ÍøMACµØÖ· £¨00:11:22:33:44:55£©

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Sat May 10 18:59:35 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id EB0F3106566C; Sat, 10 May 2008 18:59:34 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id ABF761065672
	for ; Sat, 10 May 2008 18:59:34 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 97F7A8FC19
	for ; Sat, 10 May 2008 18:59:34 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m4AIxYr0064013
	for ; Sat, 10 May 2008 18:59:34 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m4AIxY64064011
	for perforce@freebsd.org; Sat, 10 May 2008 18:59:34 GMT
	(envelope-from jb@freebsd.org)
Date: Sat, 10 May 2008 18:59:34 GMT
Message-Id: <200805101859.m4AIxY64064011@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 141427 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Sat, 10 May 2008 18:59:35 -0000

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

Change 141427 by jb@freebsd3 on 2008/05/10 18:58:49

	IF7

Affected files ...

.. //depot/projects/dtrace7/src/etc/defaults/rc.conf#7 integrate
.. //depot/projects/dtrace7/src/etc/network.subr#2 integrate
.. //depot/projects/dtrace7/src/etc/rc.d/ipfw#2 integrate
.. //depot/projects/dtrace7/src/gnu/usr.bin/gdb/kgdb/kgdb.h#4 integrate
.. //depot/projects/dtrace7/src/gnu/usr.bin/gdb/kgdb/kld.c#3 integrate
.. //depot/projects/dtrace7/src/gnu/usr.bin/gdb/kgdb/kthr.c#4 integrate
.. //depot/projects/dtrace7/src/gnu/usr.bin/gdb/kgdb/main.c#4 integrate
.. //depot/projects/dtrace7/src/gnu/usr.bin/gdb/kgdb/trgt.c#3 integrate
.. //depot/projects/dtrace7/src/gnu/usr.bin/gdb/kgdb/trgt_amd64.c#2 integrate
.. //depot/projects/dtrace7/src/gnu/usr.bin/gdb/kgdb/trgt_arm.c#2 integrate
.. //depot/projects/dtrace7/src/gnu/usr.bin/gdb/kgdb/trgt_i386.c#4 integrate
.. //depot/projects/dtrace7/src/gnu/usr.bin/gdb/kgdb/trgt_ia64.c#2 integrate
.. //depot/projects/dtrace7/src/gnu/usr.bin/gdb/kgdb/trgt_powerpc.c#2 integrate
.. //depot/projects/dtrace7/src/gnu/usr.bin/gdb/kgdb/trgt_sparc64.c#2 integrate
.. //depot/projects/dtrace7/src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/archive_entry_private.h#3 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/archive_entry_strmode.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/archive_read.c#3 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/archive_read_private.h#3 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/archive_read_support_format_iso9660.c#3 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/archive_string.h#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/archive_string_sprintf.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/archive_write.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/archive_write_set_format_ar.c#3 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/archive_write_set_format_cpio.c#3 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/archive_write_set_format_cpio_newc.c#3 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/archive_write_set_format_shar.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/archive_write_set_format_ustar.c#3 integrate
.. //depot/projects/dtrace7/src/lib/libc/gen/scandir.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libc/locale/wctype.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libc/net/nsdispatch.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libc/stdio/fopen.c#3 integrate
.. //depot/projects/dtrace7/src/lib/libc/sys/mkdir.2#2 integrate
.. //depot/projects/dtrace7/src/lib/libc/sys/sctp_generic_recvmsg.2#2 integrate
.. //depot/projects/dtrace7/src/lib/libc/sys/sctp_peeloff.2#2 integrate
.. //depot/projects/dtrace7/src/lib/libdisk/open_ia64_disk.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libstand/Makefile#3 integrate
.. //depot/projects/dtrace7/src/sbin/dhclient/bpf.c#2 integrate
.. //depot/projects/dtrace7/src/share/man/man4/Makefile#7 integrate
.. //depot/projects/dtrace7/src/share/man/man4/geom_linux_lvm.4#1 branch
.. //depot/projects/dtrace7/src/share/man/man4/malo.4#1 branch
.. //depot/projects/dtrace7/src/share/man/man5/rc.conf.5#5 integrate
.. //depot/projects/dtrace7/src/share/man/man9/lock.9#2 integrate
.. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#3 integrate
.. //depot/projects/dtrace7/src/sys/conf/NOTES#5 integrate
.. //depot/projects/dtrace7/src/sys/conf/files#10 integrate
.. //depot/projects/dtrace7/src/sys/conf/files.sun4v#3 integrate
.. //depot/projects/dtrace7/src/sys/conf/options#5 integrate
.. //depot/projects/dtrace7/src/sys/dev/bfe/if_bfe.c#3 integrate
.. //depot/projects/dtrace7/src/sys/dev/em/LICENSE#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/em/e1000_80003es2lan.c#3 integrate
.. //depot/projects/dtrace7/src/sys/dev/em/e1000_80003es2lan.h#3 integrate
.. //depot/projects/dtrace7/src/sys/dev/em/e1000_82540.c#3 integrate
.. //depot/projects/dtrace7/src/sys/dev/em/e1000_82541.c#3 integrate
.. //depot/projects/dtrace7/src/sys/dev/em/e1000_82541.h#3 integrate
.. //depot/projects/dtrace7/src/sys/dev/em/e1000_82542.c#3 integrate
.. //depot/projects/dtrace7/src/sys/dev/em/e1000_82543.c#3 integrate
.. //depot/projects/dtrace7/src/sys/dev/em/e1000_82543.h#3 integrate
.. //depot/projects/dtrace7/src/sys/dev/em/e1000_82571.c#3 integrate
.. //depot/projects/dtrace7/src/sys/dev/em/e1000_82571.h#3 integrate
.. //depot/projects/dtrace7/src/sys/dev/em/e1000_82575.c#3 delete
.. //depot/projects/dtrace7/src/sys/dev/em/e1000_82575.h#3 delete
.. //depot/projects/dtrace7/src/sys/dev/em/e1000_api.c#3 integrate
.. //depot/projects/dtrace7/src/sys/dev/em/e1000_api.h#3 integrate
.. //depot/projects/dtrace7/src/sys/dev/em/e1000_defines.h#3 integrate
.. //depot/projects/dtrace7/src/sys/dev/em/e1000_hw.h#3 integrate
.. //depot/projects/dtrace7/src/sys/dev/em/e1000_ich8lan.c#3 integrate
.. //depot/projects/dtrace7/src/sys/dev/em/e1000_ich8lan.h#3 integrate
.. //depot/projects/dtrace7/src/sys/dev/em/e1000_mac.c#3 integrate
.. //depot/projects/dtrace7/src/sys/dev/em/e1000_mac.h#3 integrate
.. //depot/projects/dtrace7/src/sys/dev/em/e1000_manage.c#3 integrate
.. //depot/projects/dtrace7/src/sys/dev/em/e1000_manage.h#3 integrate
.. //depot/projects/dtrace7/src/sys/dev/em/e1000_nvm.c#3 integrate
.. //depot/projects/dtrace7/src/sys/dev/em/e1000_nvm.h#3 integrate
.. //depot/projects/dtrace7/src/sys/dev/em/e1000_osdep.c#1 branch
.. //depot/projects/dtrace7/src/sys/dev/em/e1000_osdep.h#3 integrate
.. //depot/projects/dtrace7/src/sys/dev/em/e1000_phy.c#3 integrate
.. //depot/projects/dtrace7/src/sys/dev/em/e1000_phy.h#3 integrate
.. //depot/projects/dtrace7/src/sys/dev/em/e1000_regs.h#3 integrate
.. //depot/projects/dtrace7/src/sys/dev/em/if_em.c#3 integrate
.. //depot/projects/dtrace7/src/sys/dev/em/if_em.h#3 integrate
.. //depot/projects/dtrace7/src/sys/dev/igb/e1000_82575.c#1 branch
.. //depot/projects/dtrace7/src/sys/dev/igb/e1000_82575.h#1 branch
.. //depot/projects/dtrace7/src/sys/dev/igb/e1000_api.c#1 branch
.. //depot/projects/dtrace7/src/sys/dev/igb/e1000_api.h#1 branch
.. //depot/projects/dtrace7/src/sys/dev/igb/e1000_defines.h#1 branch
.. //depot/projects/dtrace7/src/sys/dev/igb/e1000_hw.h#1 branch
.. //depot/projects/dtrace7/src/sys/dev/igb/e1000_mac.c#1 branch
.. //depot/projects/dtrace7/src/sys/dev/igb/e1000_mac.h#1 branch
.. //depot/projects/dtrace7/src/sys/dev/igb/e1000_manage.c#1 branch
.. //depot/projects/dtrace7/src/sys/dev/igb/e1000_manage.h#1 branch
.. //depot/projects/dtrace7/src/sys/dev/igb/e1000_nvm.c#1 branch
.. //depot/projects/dtrace7/src/sys/dev/igb/e1000_nvm.h#1 branch
.. //depot/projects/dtrace7/src/sys/dev/igb/e1000_osdep.c#1 branch
.. //depot/projects/dtrace7/src/sys/dev/igb/e1000_osdep.h#1 branch
.. //depot/projects/dtrace7/src/sys/dev/igb/e1000_phy.c#1 branch
.. //depot/projects/dtrace7/src/sys/dev/igb/e1000_phy.h#1 branch
.. //depot/projects/dtrace7/src/sys/dev/igb/e1000_regs.h#1 branch
.. //depot/projects/dtrace7/src/sys/dev/igb/if_igb.c#1 branch
.. //depot/projects/dtrace7/src/sys/dev/igb/if_igb.h#1 branch
.. //depot/projects/dtrace7/src/sys/dev/malo/if_malo.c#1 branch
.. //depot/projects/dtrace7/src/sys/dev/malo/if_malo.h#1 branch
.. //depot/projects/dtrace7/src/sys/dev/malo/if_malo_pci.c#1 branch
.. //depot/projects/dtrace7/src/sys/dev/malo/if_malohal.c#1 branch
.. //depot/projects/dtrace7/src/sys/dev/malo/if_malohal.h#1 branch
.. //depot/projects/dtrace7/src/sys/dev/malo/if_maloioctl.h#1 branch
.. //depot/projects/dtrace7/src/sys/dev/usb/ehci.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/vx/if_vx.c#2 integrate
.. //depot/projects/dtrace7/src/sys/fs/fifofs/fifo_vnops.c#2 integrate
.. //depot/projects/dtrace7/src/sys/fs/nwfs/nwfs_subr.c#2 integrate
.. //depot/projects/dtrace7/src/sys/fs/unionfs/union.h#2 integrate
.. //depot/projects/dtrace7/src/sys/fs/unionfs/union_subr.c#3 integrate
.. //depot/projects/dtrace7/src/sys/fs/unionfs/union_vnops.c#2 integrate
.. //depot/projects/dtrace7/src/sys/gdb/gdb_main.c#2 integrate
.. //depot/projects/dtrace7/src/sys/geom/linux_lvm/g_linux_lvm.c#1 branch
.. //depot/projects/dtrace7/src/sys/geom/linux_lvm/g_linux_lvm.h#1 branch
.. //depot/projects/dtrace7/src/sys/ia64/ia64/elf_machdep.c#2 integrate
.. //depot/projects/dtrace7/src/sys/ia64/ia64/machdep.c#6 integrate
.. //depot/projects/dtrace7/src/sys/ia64/ia64/pmap.c#4 integrate
.. //depot/projects/dtrace7/src/sys/ia64/include/md_var.h#2 integrate
.. //depot/projects/dtrace7/src/sys/kern/kern_cpu.c#3 integrate
.. //depot/projects/dtrace7/src/sys/kern/kern_kse.c#3 integrate
.. //depot/projects/dtrace7/src/sys/kern/uipc_socket.c#3 integrate
.. //depot/projects/dtrace7/src/sys/kern/uipc_syscalls.c#3 integrate
.. //depot/projects/dtrace7/src/sys/kern/vfs_subr.c#4 integrate
.. //depot/projects/dtrace7/src/sys/modules/Makefile#10 integrate
.. //depot/projects/dtrace7/src/sys/modules/em/Makefile#2 integrate
.. //depot/projects/dtrace7/src/sys/modules/esp/Makefile#2 integrate
.. //depot/projects/dtrace7/src/sys/modules/geom/Makefile#3 integrate
.. //depot/projects/dtrace7/src/sys/modules/geom/geom_linux_lvm/Makefile#1 branch
.. //depot/projects/dtrace7/src/sys/modules/hfa/Makefile#2 integrate
.. //depot/projects/dtrace7/src/sys/modules/hme/Makefile#2 integrate
.. //depot/projects/dtrace7/src/sys/modules/igb/Makefile#1 branch
.. //depot/projects/dtrace7/src/sys/modules/isp/Makefile#2 integrate
.. //depot/projects/dtrace7/src/sys/modules/ispfw/Makefile#2 integrate
.. //depot/projects/dtrace7/src/sys/modules/le/Makefile#2 integrate
.. //depot/projects/dtrace7/src/sys/modules/malo/Makefile#1 branch
.. //depot/projects/dtrace7/src/sys/modules/scc/Makefile#2 integrate
.. //depot/projects/dtrace7/src/sys/modules/sound/driver/Makefile#2 integrate
.. //depot/projects/dtrace7/src/sys/net/bpf.c#3 integrate
.. //depot/projects/dtrace7/src/sys/net/if.c#2 integrate
.. //depot/projects/dtrace7/src/sys/net/if_loop.c#2 integrate
.. //depot/projects/dtrace7/src/sys/netinet/in_pcb.c#4 integrate
.. //depot/projects/dtrace7/src/sys/netinet/sctp_constants.h#2 integrate
.. //depot/projects/dtrace7/src/sys/netinet/sctp_indata.c#4 integrate
.. //depot/projects/dtrace7/src/sys/netinet/sctp_input.c#3 integrate
.. //depot/projects/dtrace7/src/sys/netinet/sctp_output.c#4 integrate
.. //depot/projects/dtrace7/src/sys/netinet/sctp_usrreq.c#4 integrate
.. //depot/projects/dtrace7/src/sys/netinet/sctp_var.h#2 integrate
.. //depot/projects/dtrace7/src/sys/netinet/tcp.h#2 integrate
.. //depot/projects/dtrace7/src/sys/netinet/tcp_input.c#3 integrate
.. //depot/projects/dtrace7/src/sys/netinet/tcp_output.c#5 integrate
.. //depot/projects/dtrace7/src/sys/netinet6/in6_pcb.c#3 integrate
.. //depot/projects/dtrace7/src/sys/netinet6/sctp6_usrreq.c#2 integrate
.. //depot/projects/dtrace7/src/sys/netncp/ncp_conn.h#2 integrate
.. //depot/projects/dtrace7/src/sys/netsmb/smb_conn.h#3 integrate
.. //depot/projects/dtrace7/src/sys/nfs4client/nfs4_idmap.c#2 integrate
.. //depot/projects/dtrace7/src/sys/security/audit/audit.h#2 integrate
.. //depot/projects/dtrace7/src/sys/sparc64/include/sysarch.h#2 integrate
.. //depot/projects/dtrace7/src/sys/sparc64/pci/ofw_pcibus.c#3 integrate
.. //depot/projects/dtrace7/src/sys/sun4v/include/bus_common.h#2 delete
.. //depot/projects/dtrace7/src/sys/sun4v/include/pcpu.h#2 integrate
.. //depot/projects/dtrace7/src/sys/sun4v/sun4v/nexus.c#2 integrate
.. //depot/projects/dtrace7/src/sys/sun4v/sun4v/vnex.c#2 integrate
.. //depot/projects/dtrace7/src/sys/sys/bufobj.h#2 integrate
.. //depot/projects/dtrace7/src/sys/sys/lockmgr.h#2 integrate
.. //depot/projects/dtrace7/src/sys/sys/mount.h#2 integrate
.. //depot/projects/dtrace7/src/sys/sys/param.h#8 integrate
.. //depot/projects/dtrace7/src/sys/sys/protosw.h#2 integrate
.. //depot/projects/dtrace7/src/sys/sys/socket.h#2 integrate
.. //depot/projects/dtrace7/src/sys/sys/vnode.h#3 integrate
.. //depot/projects/dtrace7/src/sys/ufs/ffs/ffs_softdep.c#4 integrate
.. //depot/projects/dtrace7/src/usr.bin/calendar/calendars/calendar.christian#2 integrate
.. //depot/projects/dtrace7/src/usr.bin/procstat/procstat.1#3 integrate
.. //depot/projects/dtrace7/src/usr.bin/ruptime/ruptime.c#2 integrate
.. //depot/projects/dtrace7/src/usr.bin/unifdef/unifdef.1#2 integrate
.. //depot/projects/dtrace7/src/usr.sbin/fwcontrol/fwcontrol.8#2 integrate
.. //depot/projects/dtrace7/src/usr.sbin/fwcontrol/fwcontrol.c#2 integrate

Differences ...

==== //depot/projects/dtrace7/src/etc/defaults/rc.conf#7 (text+ko) ====

@@ -15,7 +15,7 @@
 # For a more detailed explanation of all the rc.conf variables, please
 # refer to the rc.conf(5) manual page.
 #
-# $FreeBSD: src/etc/defaults/rc.conf,v 1.318.2.7 2008/04/15 20:23:58 emax Exp $
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.318.2.9 2008/05/06 10:50:51 mtm Exp $
 
 ##############################################################
 ###  Important initial Boot-time options  ####################
@@ -124,6 +124,7 @@
 firewall_nat_enable="NO"	# Enable kernel NAT (if firewall_enable == YES)
 firewall_nat_interface=""	# Public interface or IPaddress to use
 firewall_nat_flags=""		# Additional configuration parameters
+dummynet_enable="NO"		# Load the dummynet(4) module
 ip_portrange_first="NO"		# Set first dynamically allocated port
 ip_portrange_last="NO"		# Set last dynamically allocated port
 ike_enable="NO"			# Enable IKE daemon (usually racoon or isakmpd)
@@ -250,7 +251,7 @@
 rwhod_enable="NO"		# Run the rwho daemon (or NO).
 rwhod_flags=""			# Flags for rwhod
 rarpd_enable="NO"		# Run rarpd (or NO).
-rarpd_flags=""			# Flags to rarpd.
+rarpd_flags="-a"		# Flags to rarpd.
 bootparamd_enable="NO"		# Run bootparamd (or NO).
 bootparamd_flags=""		# Flags to bootparamd
 pppoed_enable="NO"		# Run the PPP over Ethernet daemon.

==== //depot/projects/dtrace7/src/etc/network.subr#2 (text+ko) ====

@@ -22,7 +22,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD: src/etc/network.subr,v 1.180.2.1 2007/11/08 05:52:23 thompsa Exp $
+# $FreeBSD: src/etc/network.subr,v 1.180.2.2 2008/05/04 16:14:24 brooks Exp $
 #
 
 #
@@ -638,6 +638,10 @@
 		_tmplist="${_lo}${_tmplist}"
 		;;
 	*)
+		if [ -z "$type"]; then
+			warn "Values of network_interfaces other than" \
+			    "AUTO are deprecated"
+		fi
 		_tmplist="${network_interfaces} ${cloned_interfaces}"
 		;;
 	esac

==== //depot/projects/dtrace7/src/etc/rc.d/ipfw#2 (text+ko) ====

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: src/etc/rc.d/ipfw,v 1.15 2007/04/02 15:38:53 mtm Exp $
+# $FreeBSD: src/etc/rc.d/ipfw,v 1.15.2.1 2008/05/06 10:50:51 mtm Exp $
 #
 
 # PROVIDE: ipfw
@@ -14,9 +14,17 @@
 name="ipfw"
 rcvar="firewall_enable"
 start_cmd="ipfw_start"
+start_precmd="ipfw_prestart"
 stop_cmd="ipfw_stop"
 required_modules="ipfw"
 
+ipfw_prestart()
+{
+	if checkyesno dummynet_enable; then
+		required_modules="$required_modules dummynet"
+	fi
+}
+
 ipfw_start()
 {
 	# set the firewall rules script if none was specified

==== //depot/projects/dtrace7/src/gnu/usr.bin/gdb/kgdb/kgdb.h#4 (text+ko) ====

@@ -23,7 +23,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/gnu/usr.bin/gdb/kgdb/kgdb.h,v 1.5.2.2 2008/02/25 22:19:56 jhb Exp $
+ * $FreeBSD: src/gnu/usr.bin/gdb/kgdb/kgdb.h,v 1.5.2.3 2008/05/09 18:41:36 jhb Exp $
  */
 
 #ifndef _KGDB_H_
@@ -32,8 +32,6 @@
 struct thread_info;
 
 extern kvm_t *kvm;
-extern char *kernel;
-extern bfd *kern_bfd;
 
 struct kthr {
 	struct kthr	*next;
@@ -48,11 +46,14 @@
 
 extern struct kthr *curkthr;
 
-void kgdb_add_kld_cmd(char *, int);
-void kgdb_kld_init(void);
-void kgdb_target(void);
+void initialize_kld_target(void);
+void initialize_kgdb_target(void);
+void kgdb_dmesg(void);
+void kgdb_trgt_new_objfile(struct objfile *);
 void kgdb_trgt_fetch_registers(int);
 void kgdb_trgt_store_registers(int);
+void kld_init(void);
+void kld_new_objfile(struct objfile *);
 
 frame_unwind_sniffer_ftype kgdb_trgt_trapframe_sniffer;
 
@@ -67,6 +68,9 @@
 char        *kgdb_thr_extra_thread_info(int);
 
 uintptr_t kgdb_lookup(const char *sym);
-CORE_ADDR kgdb_parse(const char *exp);
+CORE_ADDR kgdb_parse_1(const char *, int);
+
+#define	kgdb_parse(exp)		kgdb_parse_1((exp), 0)
+#define	kgdb_parse_quiet(exp)	kgdb_parse_1((exp), 1)
 
 #endif /* _KGDB_H_ */

==== //depot/projects/dtrace7/src/gnu/usr.bin/gdb/kgdb/kld.c#3 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/kld.c,v 1.6.2.2 2008/04/03 18:46:51 jhb Exp $");
+__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/kld.c,v 1.6.2.4 2008/05/09 18:41:36 jhb Exp $");
 
 #include 
 #include 
@@ -55,6 +55,8 @@
 
 /* KVA of 'linker_path' which corresponds to the kern.module_path sysctl .*/
 static CORE_ADDR module_path_addr;
+static CORE_ADDR linker_files_addr;
+static CORE_ADDR kernel_file_addr;
 
 static struct target_so_ops kld_so_ops;
 
@@ -70,7 +72,6 @@
 
 /*
  * Look for a matching file checking for debug suffixes before the raw file:
- * - filename + ".symbols" (e.g. foo.ko.symbols)
  * - filename + ".debug" (e.g. foo.ko.debug)
  * - filename (e.g. foo.ko)
  */
@@ -112,11 +113,14 @@
 	char *kernel_dir, *module_dir, *cp;
 	int error;
 
-	kernel_dir = dirname(kernel);
-	if (kernel_dir != NULL) {
-		snprintf(path, path_size, "%s/%s", kernel_dir, filename);
-		if (check_kld_path(path, path_size))
-			return (1);
+	if (exec_bfd) {
+		kernel_dir = dirname(bfd_get_filename(exec_bfd));
+		if (kernel_dir != NULL) {
+			snprintf(path, path_size, "%s/%s", kernel_dir,
+			    filename);
+			if (check_kld_path(path, path_size))
+				return (1);
+		}
 	}
 	if (module_path_addr != 0) {
 		target_read_string(module_path_addr, &module_path, PATH_MAX,
@@ -160,11 +164,12 @@
 	char *filename;
 	int error;
 
-	if (off_address == 0 || off_filename == 0 || off_next == 0)
+	if (linker_files_addr == 0 || off_address == 0 || off_filename == 0 ||
+	    off_next == 0)
 		return (0);
 
 	filename = basename(arg);
-	for (kld = kgdb_parse("linker_files.tqh_first"); kld != 0;
+	for (kld = read_pointer(linker_files_addr); kld != 0;
 	     kld = read_pointer(kld + off_next)) {
 		/* Try to read this linker file's filename. */
 		target_read_string(read_pointer(kld + off_filename),
@@ -195,7 +200,6 @@
 	struct section_addr_info *section_addrs;
 	int sect_index;
 	CORE_ADDR base_addr;
-	int add_kld_command;
 };
 
 static void
@@ -215,14 +219,12 @@
 	asi->section_addrs->other[asi->sect_index].name = name;
 	asi->section_addrs->other[asi->sect_index].addr = address;
 	asi->section_addrs->other[asi->sect_index].sectindex = sect->index;
-	if (asi->add_kld_command)
-		printf_unfiltered("\t%s_addr = %s\n", name,
-		    local_hex_string(address));
+	printf_unfiltered("\t%s_addr = %s\n", name, local_hex_string(address));
 	asi->sect_index++;
 }
 
 static void
-load_kld (char *path, CORE_ADDR base_addr, int from_tty, int add_kld_command)
+load_kld (char *path, CORE_ADDR base_addr, int from_tty)
 {
 	struct add_section_info asi;
 	struct cleanup *cleanup;
@@ -242,33 +244,32 @@
 	if (bfd_get_section_by_name (bfd, ".text") == NULL)
 		error("\"%s\": can't find text section", path);
 
-	if (add_kld_command)
-		printf_unfiltered("add symbol table from file \"%s\" at\n",
-		    path);
+	printf_unfiltered("add symbol table from file \"%s\" at\n", path);
 
 	/* Build a section table for symbol_file_add() from the bfd sections. */
 	asi.section_addrs = alloc_section_addr_info(bfd_count_sections(bfd));
 	cleanup = make_cleanup(xfree, asi.section_addrs);
 	asi.sect_index = 0;
 	asi.base_addr = base_addr;
-	asi.add_kld_command = add_kld_command;
 	bfd_map_over_sections(bfd, add_section, &asi);
 
 	if (from_tty && (!query("%s", "")))
 		error("Not confirmed.");
 
-	symbol_file_add(path, from_tty, asi.section_addrs, 0,
-	    add_kld_command ? OBJF_USERLOADED : 0);
+	symbol_file_add(path, from_tty, asi.section_addrs, 0, OBJF_USERLOADED);
 
 	do_cleanups(cleanup);
 }
 
-void
+static void
 kgdb_add_kld_cmd (char *arg, int from_tty)
 {
 	char path[PATH_MAX];
 	CORE_ADDR base_addr;
 
+	if (!exec_bfd)
+		error("No kernel symbol file");
+
 	/* Try to open the raw path to handle absolute paths first. */
 	snprintf(path, sizeof(path), "%s", arg);
 	if (!check_kld_path(path, sizeof(path))) {
@@ -288,7 +289,7 @@
 		return;
 	}
 
-	load_kld(path, base_addr, from_tty, 1);
+	load_kld(path, base_addr, from_tty);
 
 	reinit_frame_cache();
 }
@@ -331,6 +332,10 @@
 	char *path;
 	int error;
 
+	if (linker_files_addr == 0 || kernel_file_addr == 0 ||
+	    off_address == 0 || off_filename == 0 || off_next == 0)
+		return (NULL);
+
 	head = NULL;
 	prev = &head;
 
@@ -338,8 +343,8 @@
 	 * Walk the list of linker files creating so_list entries for
 	 * each non-kernel file.
 	 */
-	kernel = kgdb_parse("linker_kernel_file");
-	for (kld = kgdb_parse("linker_files.tqh_first"); kld != 0;
+	kernel = read_pointer(kernel_file_addr);
+	for (kld = read_pointer(linker_files_addr); kld != 0;
 	     kld = read_pointer(kld + off_next)) {
 		/* Skip the main kernel file. */
 		if (kld == kernel)
@@ -436,6 +441,28 @@
 	return (fd);
 }
 
+void
+kld_new_objfile (struct objfile *objfile)
+{
+
+	if (!have_partial_symbols())
+		return;
+
+	/*
+	 * Compute offsets of relevant members in struct linker_file
+	 * and the addresses of global variables.  Don't warn about
+	 * kernels that don't have 'pathname' in the linker_file
+	 * struct since 6.x kernels don't have it.
+	 */
+	off_address = kgdb_parse("&((struct linker_file *)0)->address");
+	off_filename = kgdb_parse("&((struct linker_file *)0)->filename");
+	off_pathname = kgdb_parse_quiet("&((struct linker_file *)0)->pathname");
+	off_next = kgdb_parse("&((struct linker_file *)0)->link.tqe_next");
+	module_path_addr = kgdb_parse("linker_path");
+	linker_files_addr = kgdb_parse("&linker_files.tqh_first");
+	kernel_file_addr = kgdb_parse("&linker_kernel_file");
+}
+
 static int
 load_klds_stub (void *arg)
 {
@@ -445,19 +472,16 @@
 }
 
 void
-kgdb_kld_init (void)
+kld_init (void)
 {
-	struct cmd_list_element *c;
 
-	/* Compute offsets of relevant members in struct linker_file. */
-	off_address = kgdb_parse("&((struct linker_file *)0)->address");
-	off_filename = kgdb_parse("&((struct linker_file *)0)->filename");
-	off_pathname = kgdb_parse("&((struct linker_file *)0)->pathname");
-	off_next = kgdb_parse("&((struct linker_file *)0)->link.tqe_next");
-	if (off_address == 0 || off_filename == 0 || off_next == 0)
-		return;
+	catch_errors(load_klds_stub, NULL, NULL, RETURN_MASK_ALL);
+}
 
-	module_path_addr = kgdb_parse("linker_path");
+void
+initialize_kld_target(void)
+{
+	struct cmd_list_element *c;
 
 	kld_so_ops.relocate_section_addresses = kld_relocate_section_addresses;
 	kld_so_ops.free_so = kld_free_so;
@@ -471,8 +495,6 @@
 
 	current_target_so_ops = &kld_so_ops;
 
-	catch_errors(load_klds_stub, NULL, NULL, RETURN_MASK_ALL);
-
 	c = add_com("add-kld", class_files, kgdb_add_kld_cmd,
 	   "Usage: add-kld FILE\n\
 Load the symbols from the kernel loadable module FILE.");

==== //depot/projects/dtrace7/src/gnu/usr.bin/gdb/kgdb/kthr.c#4 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/kthr.c,v 1.7.2.2 2008/02/25 22:19:56 jhb Exp $");
+__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/kthr.c,v 1.7.2.4 2008/05/09 18:57:06 jhb Exp $");
 
 #include 
 #include 
@@ -36,6 +36,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -77,6 +78,12 @@
 	struct thread td;
 	struct kthr *kt;
 	uintptr_t addr, paddr;
+	
+	while (first != NULL) {
+		kt = first;
+		first = kt->next;
+		free(kt);
+	}
 
 	addr = kgdb_lookup("_allproc");
 	if (addr == 0) {
@@ -206,17 +213,20 @@
 char *
 kgdb_thr_extra_thread_info(int tid)
 {
+	char comm[MAXCOMLEN + 1];
 	struct kthr *kt;
 	struct proc *p;
-	static char comm[MAXCOMLEN + 1];
+	static char buf[64];
 
 	kt = kgdb_thr_lookup_tid(tid);
 	if (kt == NULL)
-		return (NULL);
+		return (NULL);	
+	snprintf(buf, sizeof(buf), "PID=%d", kt->pid);
 	p = (struct proc *)kt->paddr;
 	if (kvm_read(kvm, (uintptr_t)&p->p_comm[0], &comm, sizeof(comm)) !=
 	    sizeof(comm))
-		return (NULL);
-
-	return (comm);
+		return (buf);
+	strlcat(buf, ": ", sizeof(buf));
+	strlcat(buf, comm, sizeof(buf));
+	return (buf);
 }

==== //depot/projects/dtrace7/src/gnu/usr.bin/gdb/kgdb/main.c#4 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/main.c,v 1.11.2.2 2008/04/03 18:46:51 jhb Exp $");
+__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/main.c,v 1.11.2.3 2008/05/09 18:41:36 jhb Exp $");
 
 #include 
 #include 
@@ -37,7 +37,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -55,42 +54,31 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
 
-extern void (*init_ui_hook)(char *);
-
 extern frame_unwind_sniffer_ftype *kgdb_sniffer_kluge;
 
-extern void symbol_file_add_main (char *args, int from_tty);
-
 #include "kgdb.h"
 
-kvm_t *kvm;
-static char kvm_err[_POSIX2_LINE_MAX];
-
 static int dumpnr;
 static int quiet;
 static int verbose;
 
 static char crashdir[PATH_MAX];
-char *kernel;
+static char *kernel;
 static char *remote;
 static char *vmcore;
+static struct ui_file *parse_gdberr;
 
 static void (*kgdb_new_objfile_chain)(struct objfile * objfile);
 
 static void
-kgdb_atexit(void)
-{
-	if (kvm != NULL)
-		kvm_close(kvm);
-}
-
-static void
 usage(void)
 {
 
@@ -168,27 +156,42 @@
 static void
 kgdb_new_objfile(struct objfile *objfile)
 {
-#if 0
-	printf("XXX: %s(%p)\n", __func__, objfile);
-	if (objfile != NULL) {
-		goto out;
-	}
+	static int once = 1;
+
+	kld_new_objfile(objfile);
+	kgdb_trgt_new_objfile(objfile);
 
-out:
-#endif
 	if (kgdb_new_objfile_chain != NULL)
 		kgdb_new_objfile_chain(objfile);
+
+	if (once && objfile != NULL && objfile == symfile_objfile) {
+		/*
+		 * The initial kernel has just been loaded.  Start the
+		 * remote target if we have one.
+		 */
+		once = 0;
+		if (remote != NULL)
+			push_remote_target (remote, 0);
+	}
 }
 
+/*
+ * Parse an expression and return its value.  If 'quiet' is true, then
+ * any error messages from the parser are masked.
+ */
 CORE_ADDR
-kgdb_parse(const char *exp)
+kgdb_parse_1(const char *exp, int quiet)
 {
+	struct ui_file *old_stderr;
 	struct cleanup *old_chain;
 	struct expression *expr;
 	struct value *val;
 	char *s;
 	CORE_ADDR n;
 
+	old_stderr = gdb_stderr;
+	if (quiet)
+		gdb_stderr = parse_gdberr;
 	n = 0;
 	s = xstrdup(exp);
 	old_chain = make_cleanup(xfree, s);
@@ -198,45 +201,19 @@
 		    n = value_as_address(val);
 	}
 	do_cleanups(old_chain);
+	gdb_stderr = old_stderr;
 	return (n);
 }
 
 #define	MSGBUF_SEQ_TO_POS(size, seq)	((seq) % (size))
 
-static void
-kgdb_init_target(void)
+void
+kgdb_dmesg(void)
 {
 	CORE_ADDR bufp;
 	int size, rseq, wseq;
-	int kern_desc;
 	char c;
 
-	kern_desc = open(kernel, O_RDONLY);
-	if (kern_desc == -1)
-		errx(1, "couldn't open a kernel image");
-
-	kern_bfd = bfd_fdopenr(kernel, gnutarget, kern_desc);
-	if (kern_bfd == NULL) {
-		close(kern_desc);
-		errx(1, "\"%s\": can't open to probe ABI: %s.", kernel,
-			bfd_errmsg (bfd_get_error ()));
-	}
-	bfd_set_cacheable(kern_bfd, 1);
-
-	if (!bfd_check_format (kern_bfd, bfd_object)) {
-		bfd_close(kern_bfd);
-		errx(1, "\"%s\": not in executable format: %s", kernel,
-			bfd_errmsg(bfd_get_error()));
-        }
-
-	set_gdbarch_from_file (kern_bfd);
-
-	symbol_file_add_main (kernel, 0);
-	if (remote)
-		push_remote_target (remote, 0);
-	else
-		kgdb_target();
-
 	/*
 	 * Display the unread portion of the message buffer. This gives the
 	 * user a some initial data to work from.
@@ -266,37 +243,54 @@
 }
 
 static void
-kgdb_interp_command_loop(void *data)
+kgdb_init(char *argv0 __unused)
+{
+
+	parse_gdberr = mem_fileopen();
+	set_prompt("(kgdb) ");
+	initialize_kgdb_target();
+	initialize_kld_target();
+	kgdb_new_objfile_chain = target_new_objfile_hook;
+	target_new_objfile_hook = kgdb_new_objfile;
+}
+
+/*
+ * Remote targets can support any number of syntaxes and we want to
+ * support them all with one addition: we support specifying a device
+ * node for a serial device without the "/dev/" prefix.
+ *
+ * What we do is to stat(2) the existing remote target first.  If that
+ * fails, we try it with "/dev/" prepended.  If that succeeds we use
+ * the resulting path, otherwise we use the original target.  If
+ * either stat(2) succeeds make sure the file is either a character
+ * device or a FIFO.
+ */
+static void
+verify_remote(void)
 {
-	static int once = 0;
+	char path[PATH_MAX];
+	struct stat st;
 
-	if (!once) {
-		once = 1;
-		kgdb_init_target();
-		print_stack_frame(get_selected_frame(),
-		    frame_relative_level(get_selected_frame()), 1);
+	if (stat(remote, &st) != 0) {
+		snprintf(path, sizeof(path), "/dev/%s", remote);
+		if (stat(path, &st) != 0)
+			return;
+		free(remote);
+		remote = strdup(path);
 	}
-	command_loop();
+	if (!S_ISCHR(st.st_mode) && !S_ISFIFO(st.st_mode))
+		errx(1, "%s: not a special file, FIFO or socket", remote);
 }
 
 static void
-kgdb_init(char *argv0 __unused)
+add_arg(struct captured_main_args *args, char *arg)
 {
-	static struct interp_procs procs = {
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		kgdb_interp_command_loop
-	};
-	struct interp *kgdb;
-	kgdb = interp_new("kgdb", NULL, cli_out_new(gdb_stdout), &procs);
-	interp_add(kgdb);
 
-	set_prompt("(kgdb) ");
-	kgdb_new_objfile_chain = target_new_objfile_hook;
-	target_new_objfile_hook = kgdb_new_objfile;
+	args->argc++;
+	args->argv = reallocf(args->argv, (args->argc + 1) * sizeof(char *));
+	if (args->argv == NULL)
+		err(1, "Out of memory building argument list");
+	args->argv[args->argc] = arg;
 }
 
 int
@@ -306,7 +300,7 @@
 	struct stat st;
 	struct captured_main_args args;
 	char *s;
-	int a, ch, writecore;
+	int a, ch;
 
 	dumpnr = -1;
 
@@ -331,7 +325,11 @@
 	}
 
 	quiet = 0;
-	writecore = 0;
+	memset (&args, 0, sizeof args);
+	args.use_windows = 0;
+	args.interpreter_p = INTERP_CONSOLE;
+	args.argv = malloc(sizeof(char *));
+	args.argv[0] = argv[0];
 
 	while ((ch = getopt(argc, argv, "ac:d:fn:qr:vw")) != -1) {
 		switch (ch) {
@@ -364,6 +362,7 @@
 			break;
 		case 'q':
 			quiet = 1;
+			add_arg(&args, "-q");
 			break;
 		case 'r':	/* use given device for remote session. */
 			if (remote != NULL) {
@@ -378,7 +377,7 @@
 			verbose++;
 			break;
 		case 'w':	/* core file is writeable. */
-			writecore = 1;
+			add_arg(&args, "--write");
 			break;
 		case '?':
 		default:
@@ -411,21 +410,8 @@
 		if (!S_ISREG(st.st_mode))
 			errx(1, "%s: not a regular file", path);
 		vmcore = strdup(path);
-	} else if (remote != NULL && remote[0] != ':' && remote[0] != '|') {
-		if (stat(remote, &st) != 0) {
-			snprintf(path, sizeof(path), "/dev/%s", remote);
-			if (stat(path, &st) != 0) {
-				err(1, "%s", remote);
-				/* NOTREACHED */
-			}
-			free(remote);
-			remote = strdup(path);
-		}
-		if (!S_ISCHR(st.st_mode) && !S_ISFIFO(st.st_mode)) {
-			errx(1, "%s: not a special file, FIFO or socket",
-			    remote);
-			/* NOTREACHED */
-		}
+	} else if (remote != NULL) {
+		verify_remote();
 	} else if (argc > optind) {
 		if (vmcore == NULL)
 			vmcore = strdup(argv[optind++]);
@@ -445,20 +431,12 @@
 			warnx("kernel image: %s", kernel);
 	}
 
-	/*
-	 * At this point we must either have a core file or have a kernel
-	 * with a remote target.
-	 */
+	/* A remote target requires an explicit kernel argument. */
 	if (remote != NULL && kernel == NULL) {
 		warnx("remote debugging requires a kernel");
 		usage();
 		/* NOTREACHED */
 	}
-	if (vmcore == NULL && remote == NULL) {
-		warnx("need a core file or a device for remote debugging");
-		usage();
-		/* NOTREACHED */
-	}
 
 	/* If we don't have a kernel image yet, try to find one. */
 	if (kernel == NULL) {
@@ -470,27 +448,16 @@
 		if (verbose)
 			warnx("kernel image: %s", kernel);
 	}
+	add_arg(&args, kernel);
 
-	if (remote == NULL) {
-		kvm = kvm_openfiles(kernel, vmcore, NULL,
-		    writecore ? O_RDWR : O_RDONLY, kvm_err);
-		if (kvm == NULL)
-			errx(1, kvm_err);
-		atexit(kgdb_atexit);
-		kgdb_thr_init();
-	}
+	if (vmcore != NULL)
+		add_arg(&args, vmcore);
 
 	/* The libgdb code uses optind too. Reset it... */
 	optind = 0;
 
-	memset (&args, 0, sizeof args);
-	args.argv = argv;
-	args.argc = 1 + quiet;
-	if (quiet)
-		argv[1] = "-q";
-	argv[args.argc] = NULL;
-	args.use_windows = 0;
-	args.interpreter_p = "kgdb";
+	/* Terminate argv list. */
+	add_arg(&args, NULL);
 
 	init_ui_hook = kgdb_init;
 

==== //depot/projects/dtrace7/src/gnu/usr.bin/gdb/kgdb/trgt.c#3 (text+ko) ====

@@ -25,29 +25,41 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/trgt.c,v 1.5.2.1 2008/02/25 22:19:56 jhb Exp $");
+__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/trgt.c,v 1.5.2.3 2008/05/09 18:57:06 jhb Exp $");
 
 #include 
 #include 
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 
+#include 
+#include 
 #include 
 #include 
+#include 
 #include 
+#include 
 #include 
+#include 
 
 #include "kgdb.h"
 

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Sat May 10 19:01:37 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8D6761065678; Sat, 10 May 2008 19:01:37 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1DA9E1065671
	for ; Sat, 10 May 2008 19:01:37 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 0A24A8FC0A
	for ; Sat, 10 May 2008 19:01:37 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m4AJ1aVa064172
	for ; Sat, 10 May 2008 19:01:36 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m4AJ1aU5064170
	for perforce@freebsd.org; Sat, 10 May 2008 19:01:36 GMT
	(envelope-from jb@freebsd.org)
Date: Sat, 10 May 2008 19:01:36 GMT
Message-Id: <200805101901.m4AJ1aU5064170@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 141428 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Sat, 10 May 2008 19:01:37 -0000

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

Change 141428 by jb@freebsd3 on 2008/05/10 19:00:53

	IF6

Affected files ...

.. //depot/projects/dtrace6/src/bin/sh/arith.h#2 integrate
.. //depot/projects/dtrace6/src/bin/sh/arith.y#2 integrate
.. //depot/projects/dtrace6/src/bin/sh/expand.c#2 integrate
.. //depot/projects/dtrace6/src/bin/sh/shell.h#2 integrate
.. //depot/projects/dtrace6/src/etc/defaults/rc.conf#6 integrate
.. //depot/projects/dtrace6/src/etc/network.subr#3 integrate
.. //depot/projects/dtrace6/src/etc/rc.d/ipfw#2 integrate
.. //depot/projects/dtrace6/src/gnu/usr.bin/gdb/kgdb/kgdb.h#6 integrate
.. //depot/projects/dtrace6/src/gnu/usr.bin/gdb/kgdb/kld.c#3 integrate
.. //depot/projects/dtrace6/src/gnu/usr.bin/gdb/kgdb/kthr.c#5 integrate
.. //depot/projects/dtrace6/src/gnu/usr.bin/gdb/kgdb/main.c#4 integrate
.. //depot/projects/dtrace6/src/gnu/usr.bin/gdb/kgdb/trgt.c#5 integrate
.. //depot/projects/dtrace6/src/gnu/usr.bin/gdb/kgdb/trgt_alpha.c#2 integrate
.. //depot/projects/dtrace6/src/gnu/usr.bin/gdb/kgdb/trgt_amd64.c#2 integrate
.. //depot/projects/dtrace6/src/gnu/usr.bin/gdb/kgdb/trgt_arm.c#3 integrate
.. //depot/projects/dtrace6/src/gnu/usr.bin/gdb/kgdb/trgt_i386.c#4 integrate
.. //depot/projects/dtrace6/src/gnu/usr.bin/gdb/kgdb/trgt_ia64.c#2 integrate
.. //depot/projects/dtrace6/src/gnu/usr.bin/gdb/kgdb/trgt_sparc64.c#2 integrate
.. //depot/projects/dtrace6/src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#2 integrate
.. //depot/projects/dtrace6/src/lib/libc/amd64/SYS.h#2 integrate
.. //depot/projects/dtrace6/src/lib/libc/arm/SYS.h#2 integrate
.. //depot/projects/dtrace6/src/lib/libc/i386/SYS.h#2 integrate
.. //depot/projects/dtrace6/src/lib/libc/locale/wctype.c#2 integrate
.. //depot/projects/dtrace6/src/lib/libc/sparc64/SYS.h#2 integrate
.. //depot/projects/dtrace6/src/lib/libc/stdio/fopen.c#3 integrate
.. //depot/projects/dtrace6/src/lib/libc/sys/mkdir.2#2 integrate
.. //depot/projects/dtrace6/src/share/man/man5/rc.conf.5#5 integrate
.. //depot/projects/dtrace6/src/sys/dev/bfe/if_bfe.c#3 integrate
.. //depot/projects/dtrace6/src/sys/dev/vx/if_vx.c#2 integrate
.. //depot/projects/dtrace6/src/sys/gdb/gdb_main.c#2 integrate
.. //depot/projects/dtrace6/src/sys/i386/cpufreq/est.c#3 integrate
.. //depot/projects/dtrace6/src/sys/kern/kern_cpu.c#2 integrate
.. //depot/projects/dtrace6/src/sys/net/bridge.c#2 integrate
.. //depot/projects/dtrace6/src/sys/net/if.c#2 integrate
.. //depot/projects/dtrace6/src/sys/netipsec/key.c#3 integrate
.. //depot/projects/dtrace6/src/sys/netkey/key.c#2 integrate
.. //depot/projects/dtrace6/src/sys/nfsserver/nfs_srvsock.c#3 integrate
.. //depot/projects/dtrace6/src/sys/sparc64/include/sysarch.h#2 integrate
.. //depot/projects/dtrace6/src/usr.bin/calendar/calendars/calendar.christian#2 integrate
.. //depot/projects/dtrace6/src/usr.bin/unifdef/unifdef.1#2 integrate
.. //depot/projects/dtrace6/src/usr.sbin/fwcontrol/fwcontrol.8#3 integrate
.. //depot/projects/dtrace6/src/usr.sbin/fwcontrol/fwcontrol.c#2 integrate

Differences ...

==== //depot/projects/dtrace6/src/bin/sh/arith.h#2 (text+ko) ====

@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)arith.h	1.1 (Berkeley) 5/4/95
- * $FreeBSD: src/bin/sh/arith.h,v 1.9.8.1 2005/11/06 20:39:47 stefanf Exp $
+ * $FreeBSD: src/bin/sh/arith.h,v 1.9.8.3 2008/04/27 20:43:26 stefanf Exp $
  */
 
 extern char *arith_buf, *arith_startbuf;

==== //depot/projects/dtrace6/src/bin/sh/arith.y#2 (text+ko) ====

@@ -38,7 +38,7 @@
 #endif /* not lint */
 
 #include 
-__FBSDID("$FreeBSD: src/bin/sh/arith.y,v 1.19.8.1 2005/11/06 20:39:47 stefanf Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/arith.y,v 1.19.8.3 2008/04/27 20:43:26 stefanf Exp $");
 
 #include 
 #include 

==== //depot/projects/dtrace6/src/bin/sh/expand.c#2 (text+ko) ====

@@ -36,7 +36,7 @@
 #endif
 #endif /* not lint */
 #include 
-__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.47.2.3 2006/11/22 00:28:04 stefanf Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.47.2.5 2008/04/27 20:43:26 stefanf Exp $");
 
 #include 
 #include 

==== //depot/projects/dtrace6/src/bin/sh/shell.h#2 (text+ko) ====

@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)shell.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD: src/bin/sh/shell.h,v 1.17 2004/04/06 20:06:51 markm Exp $
+ * $FreeBSD: src/bin/sh/shell.h,v 1.17.8.2 2008/04/27 20:43:26 stefanf Exp $
  */
 
 /*

==== //depot/projects/dtrace6/src/etc/defaults/rc.conf#6 (text+ko) ====

@@ -15,7 +15,7 @@
 # For a more detailed explanation of all the rc.conf variables, please
 # refer to the rc.conf(5) manual page.
 #
-# $FreeBSD: src/etc/defaults/rc.conf,v 1.252.2.44 2008/04/15 20:31:14 emax Exp $
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.252.2.46 2008/05/06 10:48:25 mtm Exp $
 
 ##############################################################
 ###  Important initial Boot-time options  ####################
@@ -111,6 +111,7 @@
 firewall_quiet="NO"		# Set to YES to suppress rule display
 firewall_logging="NO"		# Set to YES to enable events logging
 firewall_flags=""		# Flags passed to ipfw when type is a file
+dummynet_enable="NO"		# Load the dummynet(4) module
 ip_portrange_first="NO"		# Set first dynamically allocated port
 ip_portrange_last="NO"		# Set last dynamically allocated port
 ike_enable="NO"			# Enable IKE daemon (usually racoon or isakmpd)
@@ -233,7 +234,7 @@
 rwhod_enable="NO"		# Run the rwho daemon (or NO).
 rwhod_flags=""			# Flags for rwhod
 rarpd_enable="NO"		# Run rarpd (or NO).
-rarpd_flags=""			# Flags to rarpd.
+rarpd_flags="-a"		# Flags to rarpd.
 bootparamd_enable="NO"		# Run bootparamd (or NO).
 bootparamd_flags=""		# Flags to bootparamd
 pppoed_enable="NO"		# Run the PPP over Ethernet daemon.

==== //depot/projects/dtrace6/src/etc/network.subr#3 (text+ko) ====

@@ -22,7 +22,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD: src/etc/network.subr,v 1.164.2.8 2007/10/31 01:36:06 thompsa Exp $
+# $FreeBSD: src/etc/network.subr,v 1.164.2.9 2008/05/04 16:15:04 brooks Exp $
 #
 
 #
@@ -578,6 +578,10 @@
 		_tmplist="${_lo}${_tmplist}"
 		;;
 	*)
+		if [ -z "$type"]; then
+			warn "Values of network_interfaces other than" \
+			    "AUTO are deprecated"
+		fi
 		_tmplist="${network_interfaces} ${cloned_interfaces}"
 		;;
 	esac

==== //depot/projects/dtrace6/src/etc/rc.d/ipfw#2 (text+ko) ====

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: src/etc/rc.d/ipfw,v 1.10.2.4 2007/05/15 09:18:25 mtm Exp $
+# $FreeBSD: src/etc/rc.d/ipfw,v 1.10.2.5 2008/05/06 10:48:25 mtm Exp $
 #
 
 # PROVIDE: ipfw
@@ -26,6 +26,10 @@
 		fi
 	fi
 
+	if checkyesno dummynet_enable; then
+		required_modules="$required_modules dummynet"
+	fi
+
 	return 0
 }
 

==== //depot/projects/dtrace6/src/gnu/usr.bin/gdb/kgdb/kgdb.h#6 (text+ko) ====

@@ -23,7 +23,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/gnu/usr.bin/gdb/kgdb/kgdb.h,v 1.2.2.5 2008/02/25 22:20:13 jhb Exp $
+ * $FreeBSD: src/gnu/usr.bin/gdb/kgdb/kgdb.h,v 1.2.2.6 2008/05/09 18:47:10 jhb Exp $
  */
 
 #ifndef _KGDB_H_
@@ -32,8 +32,6 @@
 struct thread_info;
 
 extern kvm_t *kvm;
-extern char *kernel;
-extern bfd *kern_bfd;
 
 struct kthr {
 	struct kthr	*next;
@@ -48,11 +46,14 @@
 
 extern struct kthr *curkthr;
 
-void kgdb_add_kld_cmd(char *, int);
-void kgdb_kld_init(void);
-void kgdb_target(void);
+void initialize_kld_target(void);
+void initialize_kgdb_target(void);
+void kgdb_dmesg(void);
+void kgdb_trgt_new_objfile(struct objfile *);
 void kgdb_trgt_fetch_registers(int);
 void kgdb_trgt_store_registers(int);
+void kld_init(void);
+void kld_new_objfile(struct objfile *);
 
 frame_unwind_sniffer_ftype kgdb_trgt_trapframe_sniffer;
 
@@ -67,6 +68,9 @@
 char        *kgdb_thr_extra_thread_info(int);
 
 uintptr_t kgdb_lookup(const char *sym);
-CORE_ADDR kgdb_parse(const char *exp);
+CORE_ADDR kgdb_parse_1(const char *, int);
+
+#define	kgdb_parse(exp)		kgdb_parse_1((exp), 0)
+#define	kgdb_parse_quiet(exp)	kgdb_parse_1((exp), 1)
 
 #endif /* _KGDB_H_ */

==== //depot/projects/dtrace6/src/gnu/usr.bin/gdb/kgdb/kld.c#3 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/kld.c,v 1.6.4.2 2008/04/03 18:47:05 jhb Exp $");
+__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/kld.c,v 1.6.4.4 2008/05/09 18:47:10 jhb Exp $");
 
 #include 
 #include 
@@ -55,6 +55,8 @@
 
 /* KVA of 'linker_path' which corresponds to the kern.module_path sysctl .*/
 static CORE_ADDR module_path_addr;
+static CORE_ADDR linker_files_addr;
+static CORE_ADDR kernel_file_addr;
 
 static struct target_so_ops kld_so_ops;
 
@@ -70,7 +72,6 @@
 
 /*
  * Look for a matching file checking for debug suffixes before the raw file:
- * - filename + ".symbols" (e.g. foo.ko.symbols)
  * - filename + ".debug" (e.g. foo.ko.debug)
  * - filename (e.g. foo.ko)
  */
@@ -112,11 +113,14 @@
 	char *kernel_dir, *module_dir, *cp;
 	int error;
 
-	kernel_dir = dirname(kernel);
-	if (kernel_dir != NULL) {
-		snprintf(path, path_size, "%s/%s", kernel_dir, filename);
-		if (check_kld_path(path, path_size))
-			return (1);
+	if (exec_bfd) {
+		kernel_dir = dirname(bfd_get_filename(exec_bfd));
+		if (kernel_dir != NULL) {
+			snprintf(path, path_size, "%s/%s", kernel_dir,
+			    filename);
+			if (check_kld_path(path, path_size))
+				return (1);
+		}
 	}
 	if (module_path_addr != 0) {
 		target_read_string(module_path_addr, &module_path, PATH_MAX,
@@ -160,11 +164,12 @@
 	char *filename;
 	int error;
 
-	if (off_address == 0 || off_filename == 0 || off_next == 0)
+	if (linker_files_addr == 0 || off_address == 0 || off_filename == 0 ||
+	    off_next == 0)
 		return (0);
 
 	filename = basename(arg);
-	for (kld = kgdb_parse("linker_files.tqh_first"); kld != 0;
+	for (kld = read_pointer(linker_files_addr); kld != 0;
 	     kld = read_pointer(kld + off_next)) {
 		/* Try to read this linker file's filename. */
 		target_read_string(read_pointer(kld + off_filename),
@@ -195,7 +200,6 @@
 	struct section_addr_info *section_addrs;
 	int sect_index;
 	CORE_ADDR base_addr;
-	int add_kld_command;
 };
 
 static void
@@ -215,14 +219,12 @@
 	asi->section_addrs->other[asi->sect_index].name = name;
 	asi->section_addrs->other[asi->sect_index].addr = address;
 	asi->section_addrs->other[asi->sect_index].sectindex = sect->index;
-	if (asi->add_kld_command)
-		printf_unfiltered("\t%s_addr = %s\n", name,
-		    local_hex_string(address));
+	printf_unfiltered("\t%s_addr = %s\n", name, local_hex_string(address));
 	asi->sect_index++;
 }
 
 static void
-load_kld (char *path, CORE_ADDR base_addr, int from_tty, int add_kld_command)
+load_kld (char *path, CORE_ADDR base_addr, int from_tty)
 {
 	struct add_section_info asi;
 	struct cleanup *cleanup;
@@ -242,33 +244,32 @@
 	if (bfd_get_section_by_name (bfd, ".text") == NULL)
 		error("\"%s\": can't find text section", path);
 
-	if (add_kld_command)
-		printf_unfiltered("add symbol table from file \"%s\" at\n",
-		    path);
+	printf_unfiltered("add symbol table from file \"%s\" at\n", path);
 
 	/* Build a section table for symbol_file_add() from the bfd sections. */
 	asi.section_addrs = alloc_section_addr_info(bfd_count_sections(bfd));
 	cleanup = make_cleanup(xfree, asi.section_addrs);
 	asi.sect_index = 0;
 	asi.base_addr = base_addr;
-	asi.add_kld_command = add_kld_command;
 	bfd_map_over_sections(bfd, add_section, &asi);
 
 	if (from_tty && (!query("%s", "")))
 		error("Not confirmed.");
 
-	symbol_file_add(path, from_tty, asi.section_addrs, 0,
-	    add_kld_command ? OBJF_USERLOADED : 0);
+	symbol_file_add(path, from_tty, asi.section_addrs, 0, OBJF_USERLOADED);
 
 	do_cleanups(cleanup);
 }
 
-void
+static void
 kgdb_add_kld_cmd (char *arg, int from_tty)
 {
 	char path[PATH_MAX];
 	CORE_ADDR base_addr;
 
+	if (!exec_bfd)
+		error("No kernel symbol file");
+
 	/* Try to open the raw path to handle absolute paths first. */
 	snprintf(path, sizeof(path), "%s", arg);
 	if (!check_kld_path(path, sizeof(path))) {
@@ -288,7 +289,7 @@
 		return;
 	}
 
-	load_kld(path, base_addr, from_tty, 1);
+	load_kld(path, base_addr, from_tty);
 
 	reinit_frame_cache();
 }
@@ -331,6 +332,10 @@
 	char *path;
 	int error;
 
+	if (linker_files_addr == 0 || kernel_file_addr == 0 ||
+	    off_address == 0 || off_filename == 0 || off_next == 0)
+		return (NULL);
+
 	head = NULL;
 	prev = &head;
 
@@ -338,8 +343,8 @@
 	 * Walk the list of linker files creating so_list entries for
 	 * each non-kernel file.
 	 */
-	kernel = kgdb_parse("linker_kernel_file");
-	for (kld = kgdb_parse("linker_files.tqh_first"); kld != 0;
+	kernel = read_pointer(kernel_file_addr);
+	for (kld = read_pointer(linker_files_addr); kld != 0;
 	     kld = read_pointer(kld + off_next)) {
 		/* Skip the main kernel file. */
 		if (kld == kernel)
@@ -436,6 +441,28 @@
 	return (fd);
 }
 
+void
+kld_new_objfile (struct objfile *objfile)
+{
+
+	if (!have_partial_symbols())
+		return;
+
+	/*
+	 * Compute offsets of relevant members in struct linker_file
+	 * and the addresses of global variables.  Don't warn about
+	 * kernels that don't have 'pathname' in the linker_file
+	 * struct since 6.x kernels don't have it.
+	 */
+	off_address = kgdb_parse("&((struct linker_file *)0)->address");
+	off_filename = kgdb_parse("&((struct linker_file *)0)->filename");
+	off_pathname = kgdb_parse_quiet("&((struct linker_file *)0)->pathname");
+	off_next = kgdb_parse("&((struct linker_file *)0)->link.tqe_next");
+	module_path_addr = kgdb_parse("linker_path");
+	linker_files_addr = kgdb_parse("&linker_files.tqh_first");
+	kernel_file_addr = kgdb_parse("&linker_kernel_file");
+}
+
 static int
 load_klds_stub (void *arg)
 {
@@ -445,19 +472,16 @@
 }
 
 void
-kgdb_kld_init (void)
+kld_init (void)
 {
-	struct cmd_list_element *c;
 
-	/* Compute offsets of relevant members in struct linker_file. */
-	off_address = kgdb_parse("&((struct linker_file *)0)->address");
-	off_filename = kgdb_parse("&((struct linker_file *)0)->filename");
-	off_pathname = kgdb_parse("&((struct linker_file *)0)->pathname");
-	off_next = kgdb_parse("&((struct linker_file *)0)->link.tqe_next");
-	if (off_address == 0 || off_filename == 0 || off_next == 0)
-		return;
+	catch_errors(load_klds_stub, NULL, NULL, RETURN_MASK_ALL);
+}
 
-	module_path_addr = kgdb_parse("linker_path");
+void
+initialize_kld_target(void)
+{
+	struct cmd_list_element *c;
 
 	kld_so_ops.relocate_section_addresses = kld_relocate_section_addresses;
 	kld_so_ops.free_so = kld_free_so;
@@ -471,8 +495,6 @@
 
 	current_target_so_ops = &kld_so_ops;
 
-	catch_errors(load_klds_stub, NULL, NULL, RETURN_MASK_ALL);
-
 	c = add_com("add-kld", class_files, kgdb_add_kld_cmd,
 	   "Usage: add-kld FILE\n\
 Load the symbols from the kernel loadable module FILE.");

==== //depot/projects/dtrace6/src/gnu/usr.bin/gdb/kgdb/kthr.c#5 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/kthr.c,v 1.2.2.7 2008/02/25 22:20:13 jhb Exp $");
+__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/kthr.c,v 1.2.2.9 2008/05/09 18:59:50 jhb Exp $");
 
 #include 
 #include 
@@ -36,6 +36,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -77,6 +78,12 @@
 	struct thread td;
 	struct kthr *kt;
 	uintptr_t addr, paddr;
+	
+	while (first != NULL) {
+		kt = first;
+		first = kt->next;
+		free(kt);
+	}
 
 	addr = kgdb_lookup("_allproc");
 	if (addr == 0) {
@@ -206,17 +213,20 @@
 char *
 kgdb_thr_extra_thread_info(int tid)
 {
+	char comm[MAXCOMLEN + 1];
 	struct kthr *kt;
 	struct proc *p;
-	static char comm[MAXCOMLEN + 1];
+	static char buf[64];
 
 	kt = kgdb_thr_lookup_tid(tid);
 	if (kt == NULL)
-		return (NULL);
+		return (NULL);	
+	snprintf(buf, sizeof(buf), "PID=%d", kt->pid);
 	p = (struct proc *)kt->paddr;
 	if (kvm_read(kvm, (uintptr_t)&p->p_comm[0], &comm, sizeof(comm)) !=
 	    sizeof(comm))
-		return (NULL);
-
-	return (comm);
+		return (buf);
+	strlcat(buf, ": ", sizeof(buf));
+	strlcat(buf, comm, sizeof(buf));
+	return (buf);
 }

==== //depot/projects/dtrace6/src/gnu/usr.bin/gdb/kgdb/main.c#4 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/main.c,v 1.7.2.6 2008/04/03 18:47:05 jhb Exp $");
+__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/main.c,v 1.7.2.7 2008/05/09 18:47:10 jhb Exp $");
 
 #include 
 #include 
@@ -37,7 +37,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -55,42 +54,31 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
 
-extern void (*init_ui_hook)(char *);
-
 extern frame_unwind_sniffer_ftype *kgdb_sniffer_kluge;
 
-extern void symbol_file_add_main (char *args, int from_tty);
-
 #include "kgdb.h"
 
-kvm_t *kvm;
-static char kvm_err[_POSIX2_LINE_MAX];
-
 static int dumpnr;
 static int quiet;
 static int verbose;
 
 static char crashdir[PATH_MAX];
-char *kernel;
+static char *kernel;
 static char *remote;
 static char *vmcore;
+static struct ui_file *parse_gdberr;
 
 static void (*kgdb_new_objfile_chain)(struct objfile * objfile);
 
 static void
-kgdb_atexit(void)
-{
-	if (kvm != NULL)
-		kvm_close(kvm);
-}
-
-static void
 usage(void)
 {
 
@@ -168,27 +156,42 @@
 static void
 kgdb_new_objfile(struct objfile *objfile)
 {
-#if 0
-	printf("XXX: %s(%p)\n", __func__, objfile);
-	if (objfile != NULL) {
-		goto out;
-	}
+	static int once = 1;
+
+	kld_new_objfile(objfile);
+	kgdb_trgt_new_objfile(objfile);
 
-out:
-#endif
 	if (kgdb_new_objfile_chain != NULL)
 		kgdb_new_objfile_chain(objfile);
+
+	if (once && objfile != NULL && objfile == symfile_objfile) {
+		/*
+		 * The initial kernel has just been loaded.  Start the
+		 * remote target if we have one.
+		 */
+		once = 0;
+		if (remote != NULL)
+			push_remote_target (remote, 0);
+	}
 }
 
+/*
+ * Parse an expression and return its value.  If 'quiet' is true, then
+ * any error messages from the parser are masked.
+ */
 CORE_ADDR
-kgdb_parse(const char *exp)
+kgdb_parse_1(const char *exp, int quiet)
 {
+	struct ui_file *old_stderr;
 	struct cleanup *old_chain;
 	struct expression *expr;
 	struct value *val;
 	char *s;
 	CORE_ADDR n;
 
+	old_stderr = gdb_stderr;
+	if (quiet)
+		gdb_stderr = parse_gdberr;
 	n = 0;
 	s = xstrdup(exp);
 	old_chain = make_cleanup(xfree, s);
@@ -198,45 +201,19 @@
 		    n = value_as_address(val);
 	}
 	do_cleanups(old_chain);
+	gdb_stderr = old_stderr;
 	return (n);
 }
 
 #define	MSGBUF_SEQ_TO_POS(size, seq)	((seq) % (size))
 
-static void
-kgdb_init_target(void)
+void
+kgdb_dmesg(void)
 {
 	CORE_ADDR bufp;
 	int size, rseq, wseq;
-	int kern_desc;
 	char c;
 
-	kern_desc = open(kernel, O_RDONLY);
-	if (kern_desc == -1)
-		errx(1, "couldn't open a kernel image");
-
-	kern_bfd = bfd_fdopenr(kernel, gnutarget, kern_desc);
-	if (kern_bfd == NULL) {
-		close(kern_desc);
-		errx(1, "\"%s\": can't open to probe ABI: %s.", kernel,
-			bfd_errmsg (bfd_get_error ()));
-	}
-	bfd_set_cacheable(kern_bfd, 1);
-
-	if (!bfd_check_format (kern_bfd, bfd_object)) {
-		bfd_close(kern_bfd);
-		errx(1, "\"%s\": not in executable format: %s", kernel,
-			bfd_errmsg(bfd_get_error()));
-        }
-
-	set_gdbarch_from_file (kern_bfd);
-
-	symbol_file_add_main (kernel, 0);
-	if (remote)
-		push_remote_target (remote, 0);
-	else
-		kgdb_target();
-
 	/*
 	 * Display the unread portion of the message buffer. This gives the
 	 * user a some initial data to work from.
@@ -266,37 +243,54 @@
 }
 
 static void
-kgdb_interp_command_loop(void *data)
+kgdb_init(char *argv0 __unused)
+{
+
+	parse_gdberr = mem_fileopen();
+	set_prompt("(kgdb) ");
+	initialize_kgdb_target();
+	initialize_kld_target();
+	kgdb_new_objfile_chain = target_new_objfile_hook;
+	target_new_objfile_hook = kgdb_new_objfile;
+}
+
+/*
+ * Remote targets can support any number of syntaxes and we want to
+ * support them all with one addition: we support specifying a device
+ * node for a serial device without the "/dev/" prefix.
+ *
+ * What we do is to stat(2) the existing remote target first.  If that
+ * fails, we try it with "/dev/" prepended.  If that succeeds we use
+ * the resulting path, otherwise we use the original target.  If
+ * either stat(2) succeeds make sure the file is either a character
+ * device or a FIFO.
+ */
+static void
+verify_remote(void)
 {
-	static int once = 0;
+	char path[PATH_MAX];
+	struct stat st;
 
-	if (!once) {
-		once = 1;
-		kgdb_init_target();
-		print_stack_frame(get_selected_frame(),
-		    frame_relative_level(get_selected_frame()), 1);
+	if (stat(remote, &st) != 0) {
+		snprintf(path, sizeof(path), "/dev/%s", remote);
+		if (stat(path, &st) != 0)
+			return;
+		free(remote);
+		remote = strdup(path);
 	}
-	command_loop();
+	if (!S_ISCHR(st.st_mode) && !S_ISFIFO(st.st_mode))
+		errx(1, "%s: not a special file, FIFO or socket", remote);
 }
 
 static void
-kgdb_init(char *argv0 __unused)
+add_arg(struct captured_main_args *args, char *arg)
 {
-	static struct interp_procs procs = {
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		kgdb_interp_command_loop
-	};
-	struct interp *kgdb;
-	kgdb = interp_new("kgdb", NULL, cli_out_new(gdb_stdout), &procs);
-	interp_add(kgdb);
 
-	set_prompt("(kgdb) ");
-	kgdb_new_objfile_chain = target_new_objfile_hook;
-	target_new_objfile_hook = kgdb_new_objfile;
+	args->argc++;
+	args->argv = reallocf(args->argv, (args->argc + 1) * sizeof(char *));
+	if (args->argv == NULL)
+		err(1, "Out of memory building argument list");
+	args->argv[args->argc] = arg;
 }
 
 int
@@ -306,7 +300,7 @@
 	struct stat st;
 	struct captured_main_args args;
 	char *s;
-	int a, ch, writecore;
+	int a, ch;
 
 	dumpnr = -1;
 
@@ -331,7 +325,11 @@
 	}
 
 	quiet = 0;
-	writecore = 0;
+	memset (&args, 0, sizeof args);
+	args.use_windows = 0;
+	args.interpreter_p = INTERP_CONSOLE;
+	args.argv = malloc(sizeof(char *));
+	args.argv[0] = argv[0];
 
 	while ((ch = getopt(argc, argv, "ac:d:fn:qr:vw")) != -1) {
 		switch (ch) {
@@ -364,6 +362,7 @@
 			break;
 		case 'q':
 			quiet = 1;
+			add_arg(&args, "-q");
 			break;
 		case 'r':	/* use given device for remote session. */
 			if (remote != NULL) {
@@ -378,7 +377,7 @@
 			verbose++;
 			break;
 		case 'w':	/* core file is writeable. */
-			writecore = 1;
+			add_arg(&args, "--write");
 			break;
 		case '?':
 		default:
@@ -411,21 +410,8 @@
 		if (!S_ISREG(st.st_mode))
 			errx(1, "%s: not a regular file", path);
 		vmcore = strdup(path);
-	} else if (remote != NULL && remote[0] != ':' && remote[0] != '|') {
-		if (stat(remote, &st) != 0) {
-			snprintf(path, sizeof(path), "/dev/%s", remote);
-			if (stat(path, &st) != 0) {
-				err(1, "%s", remote);
-				/* NOTREACHED */
-			}
-			free(remote);
-			remote = strdup(path);
-		}
-		if (!S_ISCHR(st.st_mode) && !S_ISFIFO(st.st_mode)) {
-			errx(1, "%s: not a special file, FIFO or socket",
-			    remote);
-			/* NOTREACHED */
-		}
+	} else if (remote != NULL) {
+		verify_remote();
 	} else if (argc > optind) {
 		if (vmcore == NULL)
 			vmcore = strdup(argv[optind++]);
@@ -445,20 +431,12 @@
 			warnx("kernel image: %s", kernel);
 	}
 
-	/*
-	 * At this point we must either have a core file or have a kernel
-	 * with a remote target.
-	 */
+	/* A remote target requires an explicit kernel argument. */
 	if (remote != NULL && kernel == NULL) {
 		warnx("remote debugging requires a kernel");
 		usage();
 		/* NOTREACHED */
 	}
-	if (vmcore == NULL && remote == NULL) {
-		warnx("need a core file or a device for remote debugging");
-		usage();
-		/* NOTREACHED */
-	}
 
 	/* If we don't have a kernel image yet, try to find one. */
 	if (kernel == NULL) {
@@ -470,27 +448,16 @@
 		if (verbose)
 			warnx("kernel image: %s", kernel);
 	}
+	add_arg(&args, kernel);
 
-	if (remote == NULL) {
-		kvm = kvm_openfiles(kernel, vmcore, NULL,
-		    writecore ? O_RDWR : O_RDONLY, kvm_err);
-		if (kvm == NULL)
-			errx(1, kvm_err);
-		atexit(kgdb_atexit);
-		kgdb_thr_init();
-	}
+	if (vmcore != NULL)
+		add_arg(&args, vmcore);
 
 	/* The libgdb code uses optind too. Reset it... */
 	optind = 0;
 
-	memset (&args, 0, sizeof args);
-	args.argv = argv;
-	args.argc = 1 + quiet;
-	if (quiet)
-		argv[1] = "-q";
-	argv[args.argc] = NULL;
-	args.use_windows = 0;
-	args.interpreter_p = "kgdb";
+	/* Terminate argv list. */
+	add_arg(&args, NULL);
 
 	init_ui_hook = kgdb_init;
 

==== //depot/projects/dtrace6/src/gnu/usr.bin/gdb/kgdb/trgt.c#5 (text+ko) ====

@@ -25,29 +25,41 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/trgt.c,v 1.2.2.5 2008/04/03 18:49:05 jhb Exp $");
+__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/trgt.c,v 1.2.2.7 2008/05/09 18:59:50 jhb Exp $");
 
 #include 
 #include 
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 
+#include 
+#include 
 #include 
 #include 
+#include 
 #include 
+#include 
 #include 
+#include 
 
 #include "kgdb.h"
 
+static void	kgdb_core_cleanup(void *);
+
+static char *vmcore;
 static struct target_ops kgdb_trgt_ops;
 
-bfd *kern_bfd;
+kvm_t *kvm;
+static char kvm_err[_POSIX2_LINE_MAX];
 
 #define	KERNOFF		(kgdb_kernbase ())
 #define	INKERNEL(x)	((x) >= KERNOFF)
@@ -69,24 +81,125 @@
 	return kernbase;
 }
 
+static void
+kgdb_trgt_open(char *filename, int from_tty)
+{
+	struct cleanup *old_chain;
+	struct thread_info *ti;
+	struct kthr *kt;
+	kvm_t *nkvm;
+	char *temp;
+	int ontop;
+
+	target_preopen (from_tty);
+	if (!filename)
+		error ("No vmcore file specified.");
+	if (!exec_bfd)
+		error ("Can't open a vmcore without a kernel");
+
+	filename = tilde_expand (filename);
+	if (filename[0] != '/') {
+		temp = concat (current_directory, "/", filename, NULL);
+		xfree(filename);
+		filename = temp;
+	}
+
+	old_chain = make_cleanup (xfree, filename);
+
+	nkvm = kvm_openfiles(bfd_get_filename(exec_bfd), filename, NULL,
+	    write_files ? O_RDWR : O_RDONLY, kvm_err);
+	if (nkvm == NULL)
+		error ("Failed to open vmcore: %s", kvm_err);
+
+	/* Don't free the filename now and close any previous vmcore. */
+	discard_cleanups(old_chain);
+	unpush_target(&kgdb_trgt_ops);
+
+	kvm = nkvm;
+	vmcore = filename;
+	old_chain = make_cleanup(kgdb_core_cleanup, NULL);
+
+	ontop = !push_target (&kgdb_trgt_ops);
+	discard_cleanups (old_chain);
+
+	kgdb_dmesg();
+
+	init_thread_list();
+	kt = kgdb_thr_init();
+	while (kt != NULL) {
+		ti = add_thread(pid_to_ptid(kt->tid));
+		kt = kgdb_thr_next(kt);
+	}
+	if (curkthr != 0)
+		inferior_ptid = pid_to_ptid(curkthr->tid);
+
+	if (ontop) {
+		/* XXX: fetch registers? */
+		kld_init();
+		flush_cached_frames();
+		select_frame (get_current_frame());
+		print_stack_frame(get_selected_frame(),
+		    frame_relative_level(get_selected_frame()), 1);
+	} else
+		warning(
+	"you won't be able to access this vmcore until you terminate\n\
+your %s; do ``info files''", target_longname);
+}
+
+static void
+kgdb_trgt_close(int quitting)
+{
+
+	if (kvm != NULL) {		
+		inferior_ptid = null_ptid;
+		CLEAR_SOLIB();
+		if (kvm_close(kvm) != 0)
+			warning("cannot close \"%s\": %s", vmcore,
+			    kvm_geterr(kvm));
+		kvm = NULL;
+		xfree(vmcore);
+		vmcore = NULL;
+		if (kgdb_trgt_ops.to_sections) {
+			xfree(kgdb_trgt_ops.to_sections);

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Sat May 10 23:42:44 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 33E4E1065676; Sat, 10 May 2008 23:42:44 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E71801065677
	for ; Sat, 10 May 2008 23:42:43 +0000 (UTC)
	(envelope-from thompsa@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id D36F48FC18
	for ; Sat, 10 May 2008 23:42:43 +0000 (UTC)
	(envelope-from thompsa@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m4ANghiM094358
	for ; Sat, 10 May 2008 23:42:43 GMT
	(envelope-from thompsa@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m4ANgeFr094356
	for perforce@freebsd.org; Sat, 10 May 2008 23:42:40 GMT
	(envelope-from thompsa@freebsd.org)
Date: Sat, 10 May 2008 23:42:40 GMT
Message-Id: <200805102342.m4ANgeFr094356@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	thompsa@freebsd.org using -f
From: Andrew Thompson 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 141441 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Sat, 10 May 2008 23:42:44 -0000

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

Change 141441 by thompsa@thompsa_burger on 2008/05/10 23:41:59

	IFC @141438

Affected files ...

.. //depot/projects/vap/Makefile.inc1#10 integrate
.. //depot/projects/vap/ObsoleteFiles.inc#10 integrate
.. //depot/projects/vap/UPDATING#11 integrate
.. //depot/projects/vap/contrib/com_err/ChangeLog#3 integrate
.. //depot/projects/vap/contrib/com_err/Makefile.am#3 integrate
.. //depot/projects/vap/contrib/com_err/Makefile.in#3 integrate
.. //depot/projects/vap/contrib/com_err/com_err.c#3 integrate
.. //depot/projects/vap/contrib/com_err/com_err.h#3 integrate
.. //depot/projects/vap/contrib/com_err/com_right.h#3 integrate
.. //depot/projects/vap/contrib/com_err/compile_et.c#3 integrate
.. //depot/projects/vap/contrib/com_err/compile_et.h#3 integrate
.. //depot/projects/vap/contrib/com_err/error.c#3 integrate
.. //depot/projects/vap/contrib/com_err/lex.c#1 branch
.. //depot/projects/vap/contrib/com_err/lex.h#3 integrate
.. //depot/projects/vap/contrib/com_err/lex.l#3 integrate
.. //depot/projects/vap/contrib/com_err/parse.c#1 branch
.. //depot/projects/vap/contrib/com_err/parse.h#1 branch
.. //depot/projects/vap/contrib/com_err/parse.y#3 integrate
.. //depot/projects/vap/contrib/com_err/roken_rename.h#3 integrate
.. //depot/projects/vap/contrib/com_err/version-script.map#1 branch
.. //depot/projects/vap/contrib/expat/COPYING#4 integrate
.. //depot/projects/vap/contrib/expat/Changes#4 integrate
.. //depot/projects/vap/contrib/expat/FREEBSD-upgrade#3 integrate
.. //depot/projects/vap/contrib/expat/MANIFEST#4 integrate
.. //depot/projects/vap/contrib/expat/Makefile.in#4 integrate
.. //depot/projects/vap/contrib/expat/README#4 integrate
.. //depot/projects/vap/contrib/expat/configure#4 integrate
.. //depot/projects/vap/contrib/expat/configure.in#4 integrate
.. //depot/projects/vap/contrib/expat/doc/expat.png#1 branch
.. //depot/projects/vap/contrib/expat/doc/reference.html#4 integrate
.. //depot/projects/vap/contrib/expat/doc/style.css#4 integrate
.. //depot/projects/vap/contrib/expat/doc/valid-xhtml10.png#1 branch
.. //depot/projects/vap/contrib/expat/doc/xmlwf.1#4 integrate
.. //depot/projects/vap/contrib/expat/doc/xmlwf.sgml#4 integrate
.. //depot/projects/vap/contrib/expat/examples/elements.c#4 integrate
.. //depot/projects/vap/contrib/expat/examples/outline.c#4 integrate
.. //depot/projects/vap/contrib/expat/expat_config.h.in#4 integrate
.. //depot/projects/vap/contrib/expat/lib/ascii.h#4 integrate
.. //depot/projects/vap/contrib/expat/lib/expat.h#4 integrate
.. //depot/projects/vap/contrib/expat/lib/internal.h#4 integrate
.. //depot/projects/vap/contrib/expat/lib/winconfig.h#4 integrate
.. //depot/projects/vap/contrib/expat/lib/xmlparse.c#4 integrate
.. //depot/projects/vap/contrib/expat/lib/xmlrole.c#4 integrate
.. //depot/projects/vap/contrib/expat/lib/xmlrole.h#4 integrate
.. //depot/projects/vap/contrib/expat/lib/xmltok.c#4 integrate
.. //depot/projects/vap/contrib/expat/lib/xmltok.h#4 integrate
.. //depot/projects/vap/contrib/expat/lib/xmltok_impl.c#4 integrate
.. //depot/projects/vap/contrib/expat/lib/xmltok_ns.c#4 integrate
.. //depot/projects/vap/contrib/expat/tests/README.txt#4 integrate
.. //depot/projects/vap/contrib/expat/tests/chardata.c#4 integrate
.. //depot/projects/vap/contrib/expat/tests/chardata.h#4 integrate
.. //depot/projects/vap/contrib/expat/tests/runtests.c#4 integrate
.. //depot/projects/vap/contrib/expat/tests/xmltest.sh#4 integrate
.. //depot/projects/vap/contrib/expat/xmlwf/codepage.c#4 integrate
.. //depot/projects/vap/contrib/expat/xmlwf/readfilemap.c#4 integrate
.. //depot/projects/vap/contrib/expat/xmlwf/unixfilemap.c#4 integrate
.. //depot/projects/vap/contrib/expat/xmlwf/xmlfile.c#4 integrate
.. //depot/projects/vap/contrib/expat/xmlwf/xmlfile.h#4 integrate
.. //depot/projects/vap/contrib/expat/xmlwf/xmlwf.c#4 integrate
.. //depot/projects/vap/contrib/ncurses/FREEBSD-upgrade#5 integrate
.. //depot/projects/vap/contrib/ncurses/FREEBSD-vendor#2 integrate
.. //depot/projects/vap/contrib/ncurses/INSTALL#4 integrate
.. //depot/projects/vap/contrib/ncurses/NEWS#5 integrate
.. //depot/projects/vap/contrib/ncurses/aclocal.m4#4 integrate
.. //depot/projects/vap/contrib/ncurses/config.guess#4 integrate
.. //depot/projects/vap/contrib/ncurses/config.sub#4 integrate
.. //depot/projects/vap/contrib/ncurses/configure#4 integrate
.. //depot/projects/vap/contrib/ncurses/configure.in#4 integrate
.. //depot/projects/vap/contrib/ncurses/dist.mk#5 integrate
.. //depot/projects/vap/contrib/ncurses/include/curses.h.in#5 integrate
.. //depot/projects/vap/contrib/ncurses/man/curs_threads.3x#2 integrate
.. //depot/projects/vap/contrib/ncurses/man/form.3x#3 integrate
.. //depot/projects/vap/contrib/ncurses/man/terminfo.tail#4 integrate
.. //depot/projects/vap/contrib/ncurses/misc/terminfo.src#5 integrate
.. //depot/projects/vap/contrib/ncurses/ncurses/base/lib_addch.c#4 integrate
.. //depot/projects/vap/contrib/ncurses/ncurses/base/lib_bkgd.c#3 integrate
.. //depot/projects/vap/contrib/ncurses/ncurses/base/lib_delwin.c#4 integrate
.. //depot/projects/vap/contrib/ncurses/ncurses/base/lib_freeall.c#4 integrate
.. //depot/projects/vap/contrib/ncurses/ncurses/base/lib_getch.c#5 integrate
.. //depot/projects/vap/contrib/ncurses/ncurses/base/lib_initscr.c#4 integrate
.. //depot/projects/vap/contrib/ncurses/ncurses/base/lib_newterm.c#5 integrate
.. //depot/projects/vap/contrib/ncurses/ncurses/base/lib_newwin.c#5 integrate
.. //depot/projects/vap/contrib/ncurses/ncurses/base/lib_overlay.c#4 integrate
.. //depot/projects/vap/contrib/ncurses/ncurses/base/lib_restart.c#4 integrate
.. //depot/projects/vap/contrib/ncurses/ncurses/base/lib_set_term.c#5 integrate
.. //depot/projects/vap/contrib/ncurses/ncurses/base/lib_ungetch.c#4 integrate
.. //depot/projects/vap/contrib/ncurses/ncurses/base/lib_window.c#4 integrate
.. //depot/projects/vap/contrib/ncurses/ncurses/base/resizeterm.c#5 integrate
.. //depot/projects/vap/contrib/ncurses/ncurses/base/use_window.c#3 integrate
.. //depot/projects/vap/contrib/ncurses/ncurses/base/wresize.c#4 integrate
.. //depot/projects/vap/contrib/ncurses/ncurses/curses.priv.h#5 integrate
.. //depot/projects/vap/contrib/ncurses/ncurses/fifo_defs.h#3 integrate
.. //depot/projects/vap/contrib/ncurses/ncurses/tinfo/init_keytry.c#4 integrate
.. //depot/projects/vap/contrib/ncurses/ncurses/tinfo/lib_data.c#5 integrate
.. //depot/projects/vap/contrib/ncurses/ncurses/tinfo/lib_napms.c#3 integrate
.. //depot/projects/vap/contrib/ncurses/ncurses/tinfo/lib_options.c#4 integrate
.. //depot/projects/vap/contrib/ncurses/ncurses/tinfo/lib_setup.c#5 integrate
.. //depot/projects/vap/contrib/ncurses/ncurses/tinfo/lib_ttyflags.c#4 integrate
.. //depot/projects/vap/contrib/ncurses/ncurses/tinfo/use_screen.c#2 integrate
.. //depot/projects/vap/contrib/ncurses/ncurses/trace/lib_trace.c#4 integrate
.. //depot/projects/vap/contrib/ncurses/ncurses/tty/lib_tstp.c#4 integrate
.. //depot/projects/vap/contrib/ncurses/ncurses/tty/lib_twait.c#4 integrate
.. //depot/projects/vap/contrib/ncurses/ncurses/tty/tty_update.c#4 integrate
.. //depot/projects/vap/contrib/ncurses/progs/dump_entry.c#4 integrate
.. //depot/projects/vap/contrib/netcat/nc.1#5 integrate
.. //depot/projects/vap/contrib/netcat/netcat.c#4 integrate
.. //depot/projects/vap/contrib/pf/pfctl/parse.y#3 integrate
.. //depot/projects/vap/crypto/heimdal/ChangeLog#3 integrate
.. //depot/projects/vap/crypto/heimdal/ChangeLog.2003#1 branch
.. //depot/projects/vap/crypto/heimdal/ChangeLog.2004#1 branch
.. //depot/projects/vap/crypto/heimdal/ChangeLog.2005#1 branch
.. //depot/projects/vap/crypto/heimdal/ChangeLog.2006#1 branch
.. //depot/projects/vap/crypto/heimdal/FREEBSD-Xlist#3 integrate
.. //depot/projects/vap/crypto/heimdal/LICENSE#1 branch
.. //depot/projects/vap/crypto/heimdal/Makefile.am#3 integrate
.. //depot/projects/vap/crypto/heimdal/Makefile.am.common#3 integrate
.. //depot/projects/vap/crypto/heimdal/Makefile.in#3 integrate
.. //depot/projects/vap/crypto/heimdal/NEWS#3 integrate
.. //depot/projects/vap/crypto/heimdal/README#3 integrate
.. //depot/projects/vap/crypto/heimdal/acinclude.m4#1 branch
.. //depot/projects/vap/crypto/heimdal/aclocal.m4#3 integrate
.. //depot/projects/vap/crypto/heimdal/admin/ChangeLog#1 branch
.. //depot/projects/vap/crypto/heimdal/admin/Makefile.am#3 integrate
.. //depot/projects/vap/crypto/heimdal/admin/Makefile.in#3 integrate
.. //depot/projects/vap/crypto/heimdal/admin/add.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/admin/change.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/admin/copy.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/admin/get.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/admin/ktutil-commands.in#1 branch
.. //depot/projects/vap/crypto/heimdal/admin/ktutil.8#3 integrate
.. //depot/projects/vap/crypto/heimdal/admin/ktutil.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/admin/ktutil_locl.h#3 integrate
.. //depot/projects/vap/crypto/heimdal/admin/list.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/admin/purge.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/admin/remove.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/admin/rename.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/Makefile.am#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/Makefile.in#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/afsutil/ChangeLog#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/afsutil/Makefile.am#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/afsutil/Makefile.in#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/afsutil/afslog.1#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/afsutil/afslog.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/afsutil/pagsh.1#1 branch
.. //depot/projects/vap/crypto/heimdal/appl/afsutil/pagsh.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/ftp/ChangeLog#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/ftp/Makefile.am#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/ftp/Makefile.in#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/ftp/common/Makefile.am#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/ftp/common/Makefile.in#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/ftp/common/buffer.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/ftp/common/common.h#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/ftp/common/sockbuf.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/ftp/ftp/Makefile.am#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/ftp/ftp/Makefile.in#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/ftp/ftp/cmds.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/ftp/ftp/cmdtab.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/ftp/ftp/domacro.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/ftp/ftp/extern.h#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/ftp/ftp/ftp.1#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/ftp/ftp/ftp.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/ftp/ftp/ftp_locl.h#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/ftp/ftp/ftp_var.h#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/ftp/ftp/globals.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/ftp/ftp/gssapi.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/ftp/ftp/kauth.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/ftp/ftp/krb4.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/ftp/ftp/main.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/ftp/ftp/ruserpass.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/ftp/ftp/security.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/ftp/ftp/security.h#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/ftp/ftpd/Makefile.am#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/ftp/ftpd/Makefile.in#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/ftp/ftpd/extern.h#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/ftp/ftpd/ftpcmd.c#1 branch
.. //depot/projects/vap/crypto/heimdal/appl/ftp/ftpd/ftpcmd.y#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/ftp/ftpd/ftpd.8#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/ftp/ftpd/ftpd.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/ftp/ftpd/ftpd_locl.h#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/ftp/ftpd/ftpusers.5#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/ftp/ftpd/gss_userok.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/ftp/ftpd/gssapi.c#1 branch
.. //depot/projects/vap/crypto/heimdal/appl/ftp/ftpd/kauth.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/ftp/ftpd/klist.c#1 branch
.. //depot/projects/vap/crypto/heimdal/appl/ftp/ftpd/krb4.c#1 branch
.. //depot/projects/vap/crypto/heimdal/appl/ftp/ftpd/logwtmp.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/ftp/ftpd/ls.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/ftp/ftpd/pathnames.h#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/ftp/ftpd/popen.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/ftp/ftpd/security.c#1 branch
.. //depot/projects/vap/crypto/heimdal/appl/gssmask/Makefile.am#1 branch
.. //depot/projects/vap/crypto/heimdal/appl/gssmask/Makefile.in#1 branch
.. //depot/projects/vap/crypto/heimdal/appl/gssmask/common.c#1 branch
.. //depot/projects/vap/crypto/heimdal/appl/gssmask/common.h#1 branch
.. //depot/projects/vap/crypto/heimdal/appl/gssmask/gssmaestro.c#1 branch
.. //depot/projects/vap/crypto/heimdal/appl/gssmask/gssmask.c#1 branch
.. //depot/projects/vap/crypto/heimdal/appl/gssmask/protocol.h#1 branch
.. //depot/projects/vap/crypto/heimdal/appl/kf/Makefile.am#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/kf/Makefile.in#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/kf/kf.1#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/kf/kf.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/kf/kf_locl.h#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/kf/kfd.8#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/kf/kfd.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/login/ChangeLog#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/login/Makefile.am#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/login/Makefile.in#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/login/conf.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/login/env.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/login/limits_conf.c#1 branch
.. //depot/projects/vap/crypto/heimdal/appl/login/login.1#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/login/login.access.5#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/login/login.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/login/login_access.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/login/login_locl.h#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/login/login_protos.h#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/login/loginpaths.h#1 branch
.. //depot/projects/vap/crypto/heimdal/appl/login/osfc2.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/login/read_string.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/login/shadow.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/login/stty_default.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/login/tty.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/login/utmp_login.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/login/utmpx_login.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/push/ChangeLog#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/push/Makefile.am#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/push/Makefile.in#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/push/pfrom.1#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/push/pfrom.in#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/push/push.8#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/push/push.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/push/push_locl.h#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/rcp/ChangeLog#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/rcp/Makefile.am#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/rcp/Makefile.in#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/rcp/rcp.1#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/rcp/rcp.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/rcp/rcp_locl.h#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/rcp/util.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/rsh/ChangeLog#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/rsh/Makefile.am#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/rsh/Makefile.in#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/rsh/common.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/rsh/limits_conf.c#1 branch
.. //depot/projects/vap/crypto/heimdal/appl/rsh/login_access.c#1 branch
.. //depot/projects/vap/crypto/heimdal/appl/rsh/rsh.1#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/rsh/rsh.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/rsh/rsh_locl.h#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/rsh/rshd.8#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/rsh/rshd.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/su/ChangeLog#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/su/Makefile.am#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/su/Makefile.in#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/su/su.1#1 branch
.. //depot/projects/vap/crypto/heimdal/appl/su/su.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/su/supaths.h#1 branch
.. //depot/projects/vap/crypto/heimdal/appl/telnet/ChangeLog#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/telnet/Makefile.am#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/telnet/Makefile.in#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/telnet/libtelnet/Makefile.am#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/telnet/libtelnet/Makefile.in#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/telnet/libtelnet/auth-proto.h#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/telnet/libtelnet/auth.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/telnet/libtelnet/auth.h#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/telnet/libtelnet/enc-proto.h#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/telnet/libtelnet/enc_des.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/telnet/libtelnet/encrypt.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/telnet/libtelnet/encrypt.h#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/telnet/libtelnet/genget.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/telnet/libtelnet/kerberos.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/telnet/libtelnet/kerberos5.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/telnet/libtelnet/krb4encpwd.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/telnet/libtelnet/misc-proto.h#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/telnet/libtelnet/misc.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/telnet/libtelnet/rsaencpwd.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/telnet/libtelnet/spx.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/telnet/telnet/Makefile.am#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/telnet/telnet/Makefile.in#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/telnet/telnet/authenc.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/telnet/telnet/commands.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/telnet/telnet/externs.h#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/telnet/telnet/main.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/telnet/telnet/network.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/telnet/telnet/ring.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/telnet/telnet/ring.h#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/telnet/telnet/sys_bsd.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/telnet/telnet/telnet.1#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/telnet/telnet/telnet.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/telnet/telnet/telnet_locl.h#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/telnet/telnet/terminal.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/telnet/telnet/utilities.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/telnet/telnetd/Makefile.am#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/telnet/telnetd/Makefile.in#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/telnet/telnetd/authenc.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/telnet/telnetd/ext.h#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/telnet/telnetd/global.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/telnet/telnetd/slc.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/telnet/telnetd/state.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/telnet/telnetd/sys_term.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/telnet/telnetd/telnetd.8#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/telnet/telnetd/telnetd.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/telnet/telnetd/telnetd.h#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/telnet/telnetd/termstat.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/telnet/telnetd/utility.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/test/Makefile.am#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/test/Makefile.in#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/test/common.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/test/gss_common.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/test/gss_common.h#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/test/gssapi_client.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/test/gssapi_server.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/test/http_client.c#1 branch
.. //depot/projects/vap/crypto/heimdal/appl/test/nt_gss_client.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/test/nt_gss_common.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/test/nt_gss_common.h#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/test/nt_gss_server.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/test/tcp_client.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/test/tcp_server.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/test/test_locl.h#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/test/uu_client.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/appl/test/uu_server.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/autogen.sh#1 branch
.. //depot/projects/vap/crypto/heimdal/cf/ChangeLog#3 integrate
.. //depot/projects/vap/crypto/heimdal/cf/Makefile.am.common#3 integrate
.. //depot/projects/vap/crypto/heimdal/cf/aix.m4#3 integrate
.. //depot/projects/vap/crypto/heimdal/cf/auth-modules.m4#3 integrate
.. //depot/projects/vap/crypto/heimdal/cf/autobuild.m4#1 branch
.. //depot/projects/vap/crypto/heimdal/cf/broken-getaddrinfo.m4#3 integrate
.. //depot/projects/vap/crypto/heimdal/cf/broken-getnameinfo.m4#3 delete
.. //depot/projects/vap/crypto/heimdal/cf/broken-glob.m4#3 integrate
.. //depot/projects/vap/crypto/heimdal/cf/broken-realloc.m4#3 integrate
.. //depot/projects/vap/crypto/heimdal/cf/broken-snprintf.m4#3 integrate
.. //depot/projects/vap/crypto/heimdal/cf/broken.m4#3 integrate
.. //depot/projects/vap/crypto/heimdal/cf/broken2.m4#3 integrate
.. //depot/projects/vap/crypto/heimdal/cf/c-attribute.m4#3 integrate
.. //depot/projects/vap/crypto/heimdal/cf/c-function.m4#3 integrate
.. //depot/projects/vap/crypto/heimdal/cf/capabilities.m4#3 integrate
.. //depot/projects/vap/crypto/heimdal/cf/check-compile-et.m4#3 integrate
.. //depot/projects/vap/crypto/heimdal/cf/check-declaration.m4#3 delete
.. //depot/projects/vap/crypto/heimdal/cf/check-getpwnam_r-posix.m4#3 integrate
.. //depot/projects/vap/crypto/heimdal/cf/check-man.m4#3 integrate
.. //depot/projects/vap/crypto/heimdal/cf/check-netinet-ip-and-tcp.m4#3 integrate
.. //depot/projects/vap/crypto/heimdal/cf/check-type-extra.m4#3 integrate
.. //depot/projects/vap/crypto/heimdal/cf/check-var.m4#3 integrate
.. //depot/projects/vap/crypto/heimdal/cf/check-x.m4#3 integrate
.. //depot/projects/vap/crypto/heimdal/cf/check-xau.m4#3 integrate
.. //depot/projects/vap/crypto/heimdal/cf/crypto.m4#3 integrate
.. //depot/projects/vap/crypto/heimdal/cf/db.m4#3 integrate
.. //depot/projects/vap/crypto/heimdal/cf/destdirs.m4#3 integrate
.. //depot/projects/vap/crypto/heimdal/cf/dlopen.m4#3 integrate
.. //depot/projects/vap/crypto/heimdal/cf/find-func-no-libs.m4#3 integrate
.. //depot/projects/vap/crypto/heimdal/cf/find-func-no-libs2.m4#3 integrate
.. //depot/projects/vap/crypto/heimdal/cf/find-func.m4#3 integrate
.. //depot/projects/vap/crypto/heimdal/cf/find-if-not-broken.m4#3 integrate
.. //depot/projects/vap/crypto/heimdal/cf/framework-security.m4#1 branch
.. //depot/projects/vap/crypto/heimdal/cf/have-pragma-weak.m4#3 integrate
.. //depot/projects/vap/crypto/heimdal/cf/have-struct-field.m4#3 integrate
.. //depot/projects/vap/crypto/heimdal/cf/have-type.m4#3 integrate
.. //depot/projects/vap/crypto/heimdal/cf/have-types.m4#3 integrate
.. //depot/projects/vap/crypto/heimdal/cf/install-catman.sh#3 integrate
.. //depot/projects/vap/crypto/heimdal/cf/irix.m4#3 integrate
.. //depot/projects/vap/crypto/heimdal/cf/krb-bigendian.m4#3 integrate
.. //depot/projects/vap/crypto/heimdal/cf/krb-func-getcwd-broken.m4#3 integrate
.. //depot/projects/vap/crypto/heimdal/cf/krb-func-getlogin.m4#3 integrate
.. //depot/projects/vap/crypto/heimdal/cf/krb-ipv6.m4#3 integrate
.. //depot/projects/vap/crypto/heimdal/cf/krb-prog-ln-s.m4#3 integrate
.. //depot/projects/vap/crypto/heimdal/cf/krb-prog-ranlib.m4#3 integrate
.. //depot/projects/vap/crypto/heimdal/cf/krb-prog-yacc.m4#3 integrate
.. //depot/projects/vap/crypto/heimdal/cf/krb-readline.m4#3 integrate
.. //depot/projects/vap/crypto/heimdal/cf/krb-struct-spwd.m4#3 integrate
.. //depot/projects/vap/crypto/heimdal/cf/krb-struct-winsize.m4#3 integrate
.. //depot/projects/vap/crypto/heimdal/cf/krb-sys-aix.m4#3 integrate
.. //depot/projects/vap/crypto/heimdal/cf/krb-sys-nextstep.m4#3 integrate
.. //depot/projects/vap/crypto/heimdal/cf/krb-version.m4#3 integrate
.. //depot/projects/vap/crypto/heimdal/cf/largefile.m4#1 branch
.. //depot/projects/vap/crypto/heimdal/cf/make-proto.pl#3 integrate
.. //depot/projects/vap/crypto/heimdal/cf/mips-abi.m4#3 integrate
.. //depot/projects/vap/crypto/heimdal/cf/misc.m4#3 integrate
.. //depot/projects/vap/crypto/heimdal/cf/need-proto.m4#3 integrate
.. //depot/projects/vap/crypto/heimdal/cf/osfc2.m4#3 integrate
.. //depot/projects/vap/crypto/heimdal/cf/otp.m4#3 integrate
.. //depot/projects/vap/crypto/heimdal/cf/proto-compat.m4#3 integrate
.. //depot/projects/vap/crypto/heimdal/cf/pthreads.m4#1 branch
.. //depot/projects/vap/crypto/heimdal/cf/resolv.m4#1 branch
.. //depot/projects/vap/crypto/heimdal/cf/retsigtype.m4#3 integrate
.. //depot/projects/vap/crypto/heimdal/cf/roken-frag.m4#3 integrate
.. //depot/projects/vap/crypto/heimdal/cf/roken.m4#3 integrate
.. //depot/projects/vap/crypto/heimdal/cf/socket-wrapper.m4#1 branch
.. //depot/projects/vap/crypto/heimdal/cf/sunos.m4#3 integrate
.. //depot/projects/vap/crypto/heimdal/cf/telnet.m4#3 integrate
.. //depot/projects/vap/crypto/heimdal/cf/test-package.m4#3 integrate
.. //depot/projects/vap/crypto/heimdal/cf/valgrind-suppressions#1 branch
.. //depot/projects/vap/crypto/heimdal/cf/vararray.m4#1 branch
.. //depot/projects/vap/crypto/heimdal/cf/version-script.m4#1 branch
.. //depot/projects/vap/crypto/heimdal/cf/wflags.m4#3 integrate
.. //depot/projects/vap/crypto/heimdal/cf/win32.m4#1 branch
.. //depot/projects/vap/crypto/heimdal/cf/with-all.m4#3 integrate
.. //depot/projects/vap/crypto/heimdal/compile#3 integrate
.. //depot/projects/vap/crypto/heimdal/config.guess#3 integrate
.. //depot/projects/vap/crypto/heimdal/config.sub#3 integrate
.. //depot/projects/vap/crypto/heimdal/configure#3 integrate
.. //depot/projects/vap/crypto/heimdal/configure.in#3 integrate
.. //depot/projects/vap/crypto/heimdal/doc/Makefile.am#3 integrate
.. //depot/projects/vap/crypto/heimdal/doc/Makefile.in#3 integrate
.. //depot/projects/vap/crypto/heimdal/doc/ack.texi#3 integrate
.. //depot/projects/vap/crypto/heimdal/doc/apps.texi#1 branch
.. //depot/projects/vap/crypto/heimdal/doc/doxytmpl.dxy#1 branch
.. //depot/projects/vap/crypto/heimdal/doc/hcrypto.din#1 branch
.. //depot/projects/vap/crypto/heimdal/doc/heimdal.css#1 branch
.. //depot/projects/vap/crypto/heimdal/doc/heimdal.texi#3 integrate
.. //depot/projects/vap/crypto/heimdal/doc/hx509.din#1 branch
.. //depot/projects/vap/crypto/heimdal/doc/hx509.texi#1 branch
.. //depot/projects/vap/crypto/heimdal/doc/init-creds#3 integrate
.. //depot/projects/vap/crypto/heimdal/doc/install.texi#3 integrate
.. //depot/projects/vap/crypto/heimdal/doc/intro.texi#3 integrate
.. //depot/projects/vap/crypto/heimdal/doc/kerberos4.texi#3 integrate
.. //depot/projects/vap/crypto/heimdal/doc/krb5.din#1 branch
.. //depot/projects/vap/crypto/heimdal/doc/migration.texi#3 integrate
.. //depot/projects/vap/crypto/heimdal/doc/misc.texi#3 integrate
.. //depot/projects/vap/crypto/heimdal/doc/ntlm.din#1 branch
.. //depot/projects/vap/crypto/heimdal/doc/programming.texi#3 integrate
.. //depot/projects/vap/crypto/heimdal/doc/setup.texi#3 integrate
.. //depot/projects/vap/crypto/heimdal/doc/vars.texi#1 branch
.. //depot/projects/vap/crypto/heimdal/doc/vars.tin#1 branch
.. //depot/projects/vap/crypto/heimdal/doc/whatis.texi#3 integrate
.. //depot/projects/vap/crypto/heimdal/doc/win2k.texi#3 integrate
.. //depot/projects/vap/crypto/heimdal/etc/Makefile.am#1 branch
.. //depot/projects/vap/crypto/heimdal/etc/Makefile.in#1 branch
.. //depot/projects/vap/crypto/heimdal/etc/services.append#3 integrate
.. //depot/projects/vap/crypto/heimdal/include/Makefile.am#3 integrate
.. //depot/projects/vap/crypto/heimdal/include/Makefile.in#3 integrate
.. //depot/projects/vap/crypto/heimdal/include/bits.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/include/config.h.in#3 integrate
.. //depot/projects/vap/crypto/heimdal/include/gssapi/Makefile.am#1 branch
.. //depot/projects/vap/crypto/heimdal/include/gssapi/Makefile.in#1 branch
.. //depot/projects/vap/crypto/heimdal/include/hcrypto/Makefile.am#1 branch
.. //depot/projects/vap/crypto/heimdal/include/hcrypto/Makefile.in#1 branch
.. //depot/projects/vap/crypto/heimdal/include/kadm5/Makefile.am#3 integrate
.. //depot/projects/vap/crypto/heimdal/include/kadm5/Makefile.in#3 integrate
.. //depot/projects/vap/crypto/heimdal/include/make_crypto.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/install-sh#3 integrate
.. //depot/projects/vap/crypto/heimdal/kadmin/ChangeLog#3 integrate
.. //depot/projects/vap/crypto/heimdal/kadmin/Makefile.am#3 integrate
.. //depot/projects/vap/crypto/heimdal/kadmin/Makefile.in#3 integrate
.. //depot/projects/vap/crypto/heimdal/kadmin/add-random-users.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/kadmin/add_enctype.c#1 branch
.. //depot/projects/vap/crypto/heimdal/kadmin/ank.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/kadmin/check.c#1 branch
.. //depot/projects/vap/crypto/heimdal/kadmin/cpw.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/kadmin/del.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/kadmin/del_enctype.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/kadmin/dump.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/kadmin/ext.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/kadmin/get.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/kadmin/init.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/kadmin/kadm_conn.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/kadmin/kadmin-commands.in#1 branch
.. //depot/projects/vap/crypto/heimdal/kadmin/kadmin.8#3 integrate
.. //depot/projects/vap/crypto/heimdal/kadmin/kadmin.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/kadmin/kadmin_locl.h#3 integrate
.. //depot/projects/vap/crypto/heimdal/kadmin/kadmind.8#3 integrate
.. //depot/projects/vap/crypto/heimdal/kadmin/kadmind.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/kadmin/load.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/kadmin/mod.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/kadmin/pw_quality.c#1 branch
.. //depot/projects/vap/crypto/heimdal/kadmin/random_password.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/kadmin/rename.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/kadmin/server.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/kadmin/stash.c#1 branch
.. //depot/projects/vap/crypto/heimdal/kadmin/test_util.c#1 branch
.. //depot/projects/vap/crypto/heimdal/kadmin/util.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/kadmin/version4.c#3 delete
.. //depot/projects/vap/crypto/heimdal/kcm/Makefile.am#1 branch
.. //depot/projects/vap/crypto/heimdal/kcm/Makefile.in#1 branch
.. //depot/projects/vap/crypto/heimdal/kcm/acl.c#1 branch
.. //depot/projects/vap/crypto/heimdal/kcm/acquire.c#1 branch
.. //depot/projects/vap/crypto/heimdal/kcm/cache.c#1 branch
.. //depot/projects/vap/crypto/heimdal/kcm/client.c#1 branch
.. //depot/projects/vap/crypto/heimdal/kcm/config.c#1 branch
.. //depot/projects/vap/crypto/heimdal/kcm/connect.c#1 branch
.. //depot/projects/vap/crypto/heimdal/kcm/cursor.c#1 branch
.. //depot/projects/vap/crypto/heimdal/kcm/events.c#1 branch
.. //depot/projects/vap/crypto/heimdal/kcm/glue.c#1 branch
.. //depot/projects/vap/crypto/heimdal/kcm/headers.h#1 branch
.. //depot/projects/vap/crypto/heimdal/kcm/kcm.8#1 branch
.. //depot/projects/vap/crypto/heimdal/kcm/kcm_locl.h#1 branch
.. //depot/projects/vap/crypto/heimdal/kcm/kcm_protos.h#1 branch
.. //depot/projects/vap/crypto/heimdal/kcm/log.c#1 branch
.. //depot/projects/vap/crypto/heimdal/kcm/main.c#1 branch
.. //depot/projects/vap/crypto/heimdal/kcm/protocol.c#1 branch
.. //depot/projects/vap/crypto/heimdal/kcm/renew.c#1 branch
.. //depot/projects/vap/crypto/heimdal/kdc/524.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/kdc/Makefile.am#3 integrate
.. //depot/projects/vap/crypto/heimdal/kdc/Makefile.in#3 integrate
.. //depot/projects/vap/crypto/heimdal/kdc/config.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/kdc/connect.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/kdc/default_config.c#1 branch
.. //depot/projects/vap/crypto/heimdal/kdc/digest.c#1 branch
.. //depot/projects/vap/crypto/heimdal/kdc/headers.h#3 integrate
.. //depot/projects/vap/crypto/heimdal/kdc/hprop.8#3 integrate
.. //depot/projects/vap/crypto/heimdal/kdc/hprop.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/kdc/hprop.h#3 integrate
.. //depot/projects/vap/crypto/heimdal/kdc/hpropd.8#3 integrate
.. //depot/projects/vap/crypto/heimdal/kdc/hpropd.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/kdc/kadb.h#3 integrate
.. //depot/projects/vap/crypto/heimdal/kdc/kaserver.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/kdc/kdc-private.h#1 branch
.. //depot/projects/vap/crypto/heimdal/kdc/kdc-protos.h#1 branch
.. //depot/projects/vap/crypto/heimdal/kdc/kdc-replay.c#1 branch
.. //depot/projects/vap/crypto/heimdal/kdc/kdc.8#3 integrate
.. //depot/projects/vap/crypto/heimdal/kdc/kdc.h#1 branch
.. //depot/projects/vap/crypto/heimdal/kdc/kdc_locl.h#3 integrate
.. //depot/projects/vap/crypto/heimdal/kdc/kerberos4.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/kdc/kerberos5.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/kdc/krb5tgs.c#1 branch
.. //depot/projects/vap/crypto/heimdal/kdc/kstash.8#3 integrate
.. //depot/projects/vap/crypto/heimdal/kdc/kstash.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/kdc/kx509.c#1 branch
.. //depot/projects/vap/crypto/heimdal/kdc/log.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/kdc/main.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/kdc/misc.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/kdc/mit_dump.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/kdc/pkinit.c#1 branch
.. //depot/projects/vap/crypto/heimdal/kdc/process.c#1 branch
.. //depot/projects/vap/crypto/heimdal/kdc/rx.h#3 integrate
.. //depot/projects/vap/crypto/heimdal/kdc/set_dbinfo.c#1 branch
.. //depot/projects/vap/crypto/heimdal/kdc/string2key.8#3 integrate
.. //depot/projects/vap/crypto/heimdal/kdc/string2key.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/kdc/v4_dump.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/kdc/version-script.map#1 branch
.. //depot/projects/vap/crypto/heimdal/kdc/windc.c#1 branch
.. //depot/projects/vap/crypto/heimdal/kdc/windc_plugin.h#1 branch
.. //depot/projects/vap/crypto/heimdal/kpasswd/Makefile.am#3 integrate
.. //depot/projects/vap/crypto/heimdal/kpasswd/Makefile.in#3 integrate
.. //depot/projects/vap/crypto/heimdal/kpasswd/kpasswd-generator.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/kpasswd/kpasswd.1#3 integrate
.. //depot/projects/vap/crypto/heimdal/kpasswd/kpasswd.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/kpasswd/kpasswd_locl.h#3 integrate
.. //depot/projects/vap/crypto/heimdal/kpasswd/kpasswdd.8#3 integrate
.. //depot/projects/vap/crypto/heimdal/kpasswd/kpasswdd.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/kuser/Makefile.am#3 integrate
.. //depot/projects/vap/crypto/heimdal/kuser/Makefile.in#3 integrate
.. //depot/projects/vap/crypto/heimdal/kuser/copy_cred_cache.1#1 branch
.. //depot/projects/vap/crypto/heimdal/kuser/copy_cred_cache.c#1 branch
.. //depot/projects/vap/crypto/heimdal/kuser/generate-requests.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/kuser/kauth_options.c#3 delete
.. //depot/projects/vap/crypto/heimdal/kuser/kdecode_ticket.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/kuser/kdestroy.1#3 integrate
.. //depot/projects/vap/crypto/heimdal/kuser/kdestroy.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/kuser/kdigest-commands.in#1 branch
.. //depot/projects/vap/crypto/heimdal/kuser/kdigest.c#1 branch
.. //depot/projects/vap/crypto/heimdal/kuser/kgetcred.1#3 integrate
.. //depot/projects/vap/crypto/heimdal/kuser/kgetcred.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/kuser/kimpersonate.1#1 branch
.. //depot/projects/vap/crypto/heimdal/kuser/kimpersonate.c#1 branch
.. //depot/projects/vap/crypto/heimdal/kuser/kinit.1#3 integrate
.. //depot/projects/vap/crypto/heimdal/kuser/kinit.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/kuser/kinit_options.c#3 delete
.. //depot/projects/vap/crypto/heimdal/kuser/klist.1#3 integrate
.. //depot/projects/vap/crypto/heimdal/kuser/klist.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/kuser/kuser_locl.h#3 integrate
.. //depot/projects/vap/crypto/heimdal/kuser/kverify.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/45/Makefile.am#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/45/Makefile.in#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/45/get_ad_tkt.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/45/mk_req.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/Makefile.am#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/Makefile.in#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/asn1/CMS.asn1#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/asn1/ChangeLog#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/asn1/Makefile.am#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/asn1/Makefile.in#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/asn1/asn1-common.h#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/asn1/asn1_err.et#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/asn1/asn1_gen.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/asn1/asn1_print.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/asn1/asn1_queue.h#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/asn1/canthandle.asn1#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/asn1/check-common.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/asn1/check-common.h#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/asn1/check-der.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/asn1/check-gen.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/asn1/check-timegm.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/asn1/der-protos.h#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/asn1/der.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/asn1/der.h#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/asn1/der_cmp.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/asn1/der_copy.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/asn1/der_format.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/asn1/der_free.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/asn1/der_get.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/asn1/der_length.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/asn1/der_locl.h#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/asn1/der_put.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/asn1/digest.asn1#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/asn1/extra.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/asn1/gen.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/asn1/gen.h#3 delete
.. //depot/projects/vap/crypto/heimdal/lib/asn1/gen_copy.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/asn1/gen_decode.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/asn1/gen_encode.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/asn1/gen_free.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/asn1/gen_glue.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/asn1/gen_length.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/asn1/gen_locl.h#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/asn1/gen_seq.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/asn1/hash.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/asn1/hash.h#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/asn1/heim_asn1.h#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/asn1/k5.asn1#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/asn1/kx509.asn1#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/asn1/lex.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/asn1/lex.h#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/asn1/lex.l#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/asn1/main.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/asn1/parse.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/asn1/parse.h#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/asn1/parse.y#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/asn1/pkcs12.asn1#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/asn1/pkcs8.asn1#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/asn1/pkcs9.asn1#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/asn1/pkinit.asn1#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/asn1/rfc2459.asn1#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/asn1/setchgpw2.asn1#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/asn1/symbol.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/asn1/symbol.h#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/asn1/test.asn1#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/asn1/test.gen#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/asn1/timegm.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/asn1/x509.asn1#3 delete
.. //depot/projects/vap/crypto/heimdal/lib/auth/ChangeLog#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/auth/Makefile.am#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/auth/Makefile.in#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/auth/afskauthlib/Makefile.am#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/auth/afskauthlib/Makefile.in#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/auth/afskauthlib/verify.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/auth/pam/Makefile.am#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/auth/pam/Makefile.in#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/auth/pam/pam.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/auth/sia/Makefile.am#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/auth/sia/Makefile.in#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/auth/sia/krb4+c2_matrix.conf#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/auth/sia/krb4_matrix.conf#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/auth/sia/krb5+c2_matrix.conf#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/auth/sia/krb5_matrix.conf#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/auth/sia/make-rpath#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/auth/sia/posix_getpw.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/auth/sia/sia.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/auth/sia/sia_locl.h#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/com_err/ChangeLog#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/com_err/Makefile.am#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/com_err/Makefile.in#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/com_err/com_err.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/com_err/com_err.h#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/com_err/com_right.h#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/com_err/compile_et.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/com_err/compile_et.h#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/com_err/error.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/com_err/lex.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/com_err/lex.h#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/com_err/lex.l#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/com_err/parse.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/com_err/parse.h#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/com_err/parse.y#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/com_err/roken_rename.h#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/com_err/version-script.map#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/8003.c#3 delete
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/ChangeLog#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/Makefile.am#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/Makefile.in#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/accept_sec_context.c#3 delete
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/acquire_cred.c#3 delete
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/add_cred.c#3 delete
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/add_oid_set_member.c#3 delete
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/address_to_krb5addr.c#3 delete
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/arcfour.c#3 delete
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/arcfour.h#3 delete
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/canonicalize_name.c#3 delete
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/compare_name.c#3 delete
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/compat.c#3 delete
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/context_time.c#3 delete
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/copy_ccache.c#3 delete
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/create_emtpy_oid_set.c#3 delete
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/decapsulate.c#3 delete
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/delete_sec_context.c#3 delete
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/display_name.c#3 delete
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/display_status.c#3 delete
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/duplicate_name.c#3 delete
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/encapsulate.c#3 delete
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/export_name.c#3 delete
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/export_sec_context.c#3 delete
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/external.c#3 delete
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/get_mic.c#3 delete
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/gss-commands.in#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/gss.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/gss_acquire_cred.3#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/gssapi.3#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/gssapi.h#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/gssapi/gssapi.h#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/gssapi/gssapi_krb5.h#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/gssapi/gssapi_spnego.h#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/gssapi_locl.h#3 delete
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/gssapi_mech.h#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/import_name.c#3 delete
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/import_sec_context.c#3 delete
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/indicate_mechs.c#3 delete
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/init.c#3 delete
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/init_sec_context.c#3 delete
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/inquire_context.c#3 delete
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/inquire_cred.c#3 delete
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/inquire_cred_by_mech.c#3 delete
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/inquire_mechs_for_name.c#3 delete
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/inquire_names_for_mech.c#3 delete
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/krb5/8003.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/krb5/accept_sec_context.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/krb5/acquire_cred.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/krb5/add_cred.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/krb5/address_to_krb5addr.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/krb5/arcfour.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/krb5/canonicalize_name.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/krb5/ccache_name.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/krb5/cfx.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/krb5/cfx.h#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/krb5/compare_name.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/krb5/compat.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/krb5/context_time.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/krb5/copy_ccache.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/krb5/decapsulate.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/krb5/delete_sec_context.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/krb5/display_name.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/krb5/display_status.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/krb5/duplicate_name.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/krb5/encapsulate.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/krb5/export_name.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/krb5/export_sec_context.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/krb5/external.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/krb5/get_mic.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/krb5/gkrb5_err.et#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/krb5/gsskrb5-private.h#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/krb5/gsskrb5_locl.h#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/krb5/import_name.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/krb5/import_sec_context.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/krb5/indicate_mechs.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/krb5/init.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/krb5/init_sec_context.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/krb5/inquire_context.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/krb5/inquire_cred.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/krb5/inquire_cred_by_mech.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/krb5/inquire_cred_by_oid.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/krb5/inquire_mechs_for_name.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/krb5/inquire_names_for_mech.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/krb5/inquire_sec_context_by_oid.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/krb5/prf.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/krb5/process_context_token.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/krb5/release_buffer.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/krb5/release_cred.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/krb5/release_name.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/krb5/sequence.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/krb5/set_cred_option.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/krb5/set_sec_context_option.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/krb5/test_cfx.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/krb5/ticket_flags.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/krb5/unwrap.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/krb5/v1.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/krb5/verify_mic.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/krb5/wrap.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/ntlm/accept_sec_context.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/ntlm/acquire_cred.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/ntlm/add_cred.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/ntlm/canonicalize_name.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/ntlm/compare_name.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/ntlm/context_time.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/ntlm/crypto.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/ntlm/delete_sec_context.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/ntlm/digest.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/ntlm/display_name.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/ntlm/display_status.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/ntlm/duplicate_name.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/ntlm/export_name.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/ntlm/export_sec_context.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/ntlm/external.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/ntlm/import_name.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/ntlm/import_sec_context.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/ntlm/indicate_mechs.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/ntlm/init_sec_context.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/ntlm/inquire_context.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/ntlm/inquire_cred.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/ntlm/inquire_cred_by_mech.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/ntlm/inquire_mechs_for_name.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/ntlm/inquire_names_for_mech.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/ntlm/ntlm-private.h#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/ntlm/ntlm.h#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/ntlm/process_context_token.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/ntlm/release_cred.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/ntlm/release_name.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/process_context_token.c#3 delete
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/release_buffer.c#3 delete
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/release_cred.c#3 delete
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/release_name.c#3 delete
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/release_oid_set.c#3 delete
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/spnego/accept_sec_context.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/spnego/compat.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/spnego/context_stubs.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/spnego/cred_stubs.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/spnego/external.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/spnego/init_sec_context.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/spnego/spnego-private.h#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/spnego/spnego.asn1#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/spnego/spnego_locl.h#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/test_acquire_cred.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/test_common.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/test_common.h#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/test_context.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/test_cred.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/test_kcred.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/test_names.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/test_ntlm.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/test_oid.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/test_oid_set_member.c#3 delete
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/unwrap.c#3 delete
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/v1.c#3 delete
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/verify_mic.c#3 delete
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/version-script.map#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/gssapi/wrap.c#3 delete
.. //depot/projects/vap/crypto/heimdal/lib/hdb/Makefile.am#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/hdb/Makefile.in#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/hdb/common.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/hdb/convert_db.c#3 delete
.. //depot/projects/vap/crypto/heimdal/lib/hdb/db.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/hdb/db3.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/hdb/dbinfo.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hdb/ext.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hdb/hdb-ldap.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/hdb/hdb-private.h#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/hdb/hdb-protos.h#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/hdb/hdb.asn1#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/hdb/hdb.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/hdb/hdb.h#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/hdb/hdb.schema#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hdb/hdb_err.et#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/hdb/hdb_locl.h#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/hdb/keys.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hdb/keytab.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/hdb/mkey.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/hdb/ndbm.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/hdb/print.c#3 integrate
.. //depot/projects/vap/crypto/heimdal/lib/hdb/test_dbinfo.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/ChangeLog#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/Makefile.am#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/Makefile.in#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/ca.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/cert.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/cms.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/collector.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/crmf.asn1#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/crypto.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/data/bleichenbacher-bad.pem#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/data/bleichenbacher-good.pem#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/data/bleichenbacher-sf-pad-correct.pem#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/data/ca.crt#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/data/ca.key#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/data/crl1.crl#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/data/crl1.der#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/data/gen-req.sh#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/data/j.pem#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/data/kdc.crt#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/data/kdc.key#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/data/key.der#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/data/key2.der#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/data/nist-data#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/data/nist-data2#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/data/no-proxy-test.crt#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/data/no-proxy-test.key#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/data/ocsp-req1.der#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/data/ocsp-req2.der#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/data/ocsp-resp1-2.der#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/data/ocsp-resp1-3.der#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/data/ocsp-resp1-ca.der#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/data/ocsp-resp1-keyhash.der#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/data/ocsp-resp1-ocsp-no-cert.der#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/data/ocsp-resp1-ocsp.der#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/data/ocsp-resp1.der#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/data/ocsp-resp2.der#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/data/ocsp-responder.crt#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/data/ocsp-responder.key#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/data/openssl.cnf#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/data/pkinit-proxy-chain.crt#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/data/pkinit-proxy.crt#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/data/pkinit-proxy.key#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/data/pkinit-pw.key#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/data/pkinit.crt#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/data/pkinit.key#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/data/proxy-level-test.crt#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/data/proxy-level-test.key#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/data/proxy-test.crt#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/data/proxy-test.key#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/data/proxy10-child-child-test.crt#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/data/proxy10-child-child-test.key#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/data/proxy10-child-test.crt#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/data/proxy10-child-test.key#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/data/proxy10-test.crt#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/data/proxy10-test.key#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/data/revoke.crt#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/data/revoke.key#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/data/sf-class2-root.pem#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/data/static-file#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/data/sub-ca.crt#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/data/sub-ca.key#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/data/sub-cert.crt#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/data/sub-cert.key#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/data/sub-cert.p12#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/data/test-ds-only.crt#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/data/test-ds-only.key#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/data/test-enveloped-aes-128#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/data/test-enveloped-aes-256#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/data/test-enveloped-des#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/data/test-enveloped-des-ede3#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/data/test-enveloped-rc2-128#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/data/test-enveloped-rc2-40#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/data/test-enveloped-rc2-64#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/data/test-ke-only.crt#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/data/test-ke-only.key#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/data/test-nopw.p12#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/data/test-pw.key#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/data/test-signed-data#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/data/test-signed-data-noattr#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/data/test-signed-data-noattr-nocerts#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/data/test.combined.crt#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/data/test.crt#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/data/test.key#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/data/test.p12#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/data/yutaka-pad-broken-ca.pem#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/data/yutaka-pad-broken-cert.pem#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/data/yutaka-pad-ok-ca.pem#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/data/yutaka-pad-ok-cert.pem#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/data/yutaka-pad.key#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/doxygen.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/env.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/error.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/file.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/hx509-private.h#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/hx509-protos.h#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/hx509.h#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/hx509_err.et#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/hx_locl.h#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/hxtool-commands.in#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/hxtool.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/keyset.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/ks_dir.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/ks_file.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/ks_keychain.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/ks_mem.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/ks_null.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/ks_p11.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/ks_p12.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/lock.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/name.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/ocsp.asn1#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/peer.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/pkcs10.asn1#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/print.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/ref/pkcs11.h#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/req.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/revoke.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/softp11.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/test_ca.in#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/test_cert.in#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/test_chain.in#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/test_cms.in#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/test_crypto.in#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/test_java_pkcs11.in#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/test_name.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/test_nist.in#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/test_nist2.in#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/test_nist_cert.in#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/test_nist_pkcs12.in#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/test_pkcs11.in#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/test_query.in#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/test_req.in#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/test_soft_pkcs11.c#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/test_windows.in#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/tst-crypto-available1#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/tst-crypto-available2#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/tst-crypto-available3#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/tst-crypto-select#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/tst-crypto-select1#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/tst-crypto-select2#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/tst-crypto-select3#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/tst-crypto-select4#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/tst-crypto-select5#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/tst-crypto-select6#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/tst-crypto-select7#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/hx509/version-script.map#1 branch
.. //depot/projects/vap/crypto/heimdal/lib/kadm5/ChangeLog#3 integrate

>>> TRUNCATED FOR MAIL (1000 lines) <<<