From owner-svn-src-user@FreeBSD.ORG Sun Jun 6 02:36:51 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B8CD31065762; Sun, 6 Jun 2010 02:36:51 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 8E4A68FC0A; Sun, 6 Jun 2010 02:36:51 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o562aplE011034; Sun, 6 Jun 2010 02:36:51 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o562apE3011032; Sun, 6 Jun 2010 02:36:51 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201006060236.o562apE3011032@svn.freebsd.org> From: Juli Mallett Date: Sun, 6 Jun 2010 02:36:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r208865 - user/jmallett/octeon/sys/mips/conf X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Jun 2010 02:36:51 -0000 Author: jmallett Date: Sun Jun 6 02:36:51 2010 New Revision: 208865 URL: http://svn.freebsd.org/changeset/base/208865 Log: Bring in more PCI NIC drivers. Modified: user/jmallett/octeon/sys/mips/conf/OCTEON1-32 Modified: user/jmallett/octeon/sys/mips/conf/OCTEON1-32 ============================================================================== --- user/jmallett/octeon/sys/mips/conf/OCTEON1-32 Sun Jun 6 02:33:46 2010 (r208864) +++ user/jmallett/octeon/sys/mips/conf/OCTEON1-32 Sun Jun 6 02:36:51 2010 (r208865) @@ -66,7 +66,6 @@ options INVARIANT_SUPPORT #Extra sanity #options WITNESS #Enable checks to detect deadlocks and cycles #options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed -device miibus # MII bus support #XXXimp device genclock device loop device ether @@ -106,8 +105,37 @@ device ataraid # ATA RAID drives device atapicd # ATAPI CDROM drives options ATA_STATIC_ID # Static device numbering -# PCI Ethernet -device re +# PCI Ethernet NICs that use the common MII bus controller code. +# NOTE: Be sure to keep the 'device miibus' line in order to use these NICs! +device miibus # MII bus support +device ae # Attansic/Atheros L2 FastEthernet +device age # Attansic/Atheros L1 Gigabit Ethernet +device alc # Atheros AR8131/AR8132 Ethernet +device ale # Atheros AR8121/AR8113/AR8114 Ethernet +device bce # Broadcom BCM5706/BCM5708 Gigabit Ethernet +device bfe # Broadcom BCM440x 10/100 Ethernet +device bge # Broadcom BCM570xx Gigabit Ethernet +device dc # DEC/Intel 21143 and various workalikes +device et # Agere ET1310 10/100/Gigabit Ethernet +device fxp # Intel EtherExpress PRO/100B (82557, 82558) +device jme # JMicron JMC250 Gigabit/JMC260 Fast Ethernet +device lge # Level 1 LXT1001 gigabit Ethernet +device msk # Marvell/SysKonnect Yukon II Gigabit Ethernet +device nge # NatSemi DP83820 gigabit Ethernet +device re # RealTek 8139C+/8169/8169S/8110S +device rl # RealTek 8129/8139 +device sf # Adaptec AIC-6915 (``Starfire'') +device sge # Silicon Integrated Systems SiS190/191 +device sis # Silicon Integrated Systems SiS 900/SiS 7016 +device sk # SysKonnect SK-984x & SK-982x gigabit Ethernet +device ste # Sundance ST201 (D-Link DFE-550TX) +device stge # Sundance/Tamarack TC9021 gigabit Ethernet +device tl # Texas Instruments ThunderLAN +device tx # SMC EtherPower II (83c170 ``EPIC'') +device vge # VIA VT612x gigabit Ethernet +device vr # VIA Rhine, Rhine II +device wb # Winbond W89C840F +device xl # 3Com 3c90x (``Boomerang'', ``Cyclone'') # # Use the following for Compact Flash file-system From owner-svn-src-user@FreeBSD.ORG Wed Jun 9 01:02:08 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A006F1065679; Wed, 9 Jun 2010 01:02:08 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 902D18FC1A; Wed, 9 Jun 2010 01:02:08 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o59128OA066148; Wed, 9 Jun 2010 01:02:08 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o591285B066146; Wed, 9 Jun 2010 01:02:08 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201006090102.o591285B066146@svn.freebsd.org> From: Juli Mallett Date: Wed, 9 Jun 2010 01:02:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r208929 - user/jmallett/octeon/sys/contrib/octeon-sdk X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Jun 2010 01:02:08 -0000 Author: jmallett Date: Wed Jun 9 01:02:08 2010 New Revision: 208929 URL: http://svn.freebsd.org/changeset/base/208929 Log: ANSIfy. Modified: user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-rtc.h Modified: user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-rtc.h ============================================================================== --- user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-rtc.h Tue Jun 8 22:46:44 2010 (r208928) +++ user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-rtc.h Wed Jun 9 01:02:08 2010 (r208929) @@ -74,7 +74,7 @@ typedef enum * * @return Supported options, or 0 if RTC is not supported */ -static inline cvmx_rtc_options_t cvmx_rtc_supported() +static inline cvmx_rtc_options_t cvmx_rtc_supported(void) { static int supported = -1; From owner-svn-src-user@FreeBSD.ORG Wed Jun 9 02:03:27 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0F0F61065672; Wed, 9 Jun 2010 02:03:27 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id F32CD8FC08; Wed, 9 Jun 2010 02:03:26 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o5923QkJ079512; Wed, 9 Jun 2010 02:03:26 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o5923QxD079509; Wed, 9 Jun 2010 02:03:26 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201006090203.o5923QxD079509@svn.freebsd.org> From: Juli Mallett Date: Wed, 9 Jun 2010 02:03:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r208930 - user/jmallett/octeon/sys/contrib/octeon-sdk X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Jun 2010 02:03:27 -0000 Author: jmallett Date: Wed Jun 9 02:03:26 2010 New Revision: 208930 URL: http://svn.freebsd.org/changeset/base/208930 Log: o) Actually spell __typeof in the normal kernel way, rather than the GCC extension way. [1] o) Fix cvmx-thunder.c build on FreeBSD. Submitted by: [1] bde Modified: user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-asm.h user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-thunder.c Modified: user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-asm.h ============================================================================== --- user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-asm.h Wed Jun 9 01:02:08 2010 (r208929) +++ user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-asm.h Wed Jun 9 02:03:26 2010 (r208930) @@ -225,12 +225,12 @@ extern "C" { unsigned long _v; \ ASM_STMT ("rdhwr\t%0,$31\n" \ "\tsll\t%0,%0,0" : "=d"(_v)); \ - result = (__typeof__(result))_v; \ + result = (__typeof(result))_v; \ } \ } else { \ unsigned long _v; \ ASM_STMT ("rdhwr\t%0,$" CVMX_TMP_STR(regstr) : "=d"(_v)); \ - result = (__typeof__(result))_v; \ + result = (__typeof(result))_v; \ }}) Modified: user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-thunder.c ============================================================================== --- user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-thunder.c Wed Jun 9 01:02:08 2010 (r208929) +++ user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-thunder.c Wed Jun 9 02:03:26 2010 (r208930) @@ -50,7 +50,6 @@ * */ -#include "cvmx-config.h" #include "cvmx.h" #include "cvmx-sysinfo.h" #include "cvmx-thunder.h" @@ -121,7 +120,7 @@ int cvmx_rtc_ds1374_write(uint32_t time) return (rc ? -1 : 0); } -int cvmx_rtc_ds1374_alarm_config(int WD, int WDSTR, int AIE) +static int cvmx_rtc_ds1374_alarm_config(int WD, int WDSTR, int AIE) { int val; @@ -134,7 +133,7 @@ int cvmx_rtc_ds1374_alarm_config(int WD, return 0; } -int cvmx_rtc_ds1374_alarm_set(int alarm_on) +static int cvmx_rtc_ds1374_alarm_set(int alarm_on) { uint8_t val; @@ -152,7 +151,7 @@ int cvmx_rtc_ds1374_alarm_set(int alarm_ } -int cvmx_rtc_ds1374_alarm_counter_set(uint32_t interval) +static int cvmx_rtc_ds1374_alarm_counter_set(uint32_t interval) { int i; int rc = 0; @@ -165,7 +164,8 @@ int cvmx_rtc_ds1374_alarm_counter_set(ui return rc; } -uint32_t cvmx_rtc_ds1374_alarm_counter_get(void) +#if 0 /* XXX unused */ +static uint32_t cvmx_rtc_ds1374_alarm_counter_get(void) { int i; uint32_t interval = 0; @@ -176,6 +176,7 @@ uint32_t cvmx_rtc_ds1374_alarm_counter_g } return interval; } +#endif #ifdef CVMX_RTC_DEBUG From owner-svn-src-user@FreeBSD.ORG Wed Jun 9 02:04:42 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3D2871065688; Wed, 9 Jun 2010 02:04:42 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id EAAE58FC14; Wed, 9 Jun 2010 02:04:41 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o5924fX0079838; Wed, 9 Jun 2010 02:04:41 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o5924ftd079836; Wed, 9 Jun 2010 02:04:41 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201006090204.o5924ftd079836@svn.freebsd.org> From: Juli Mallett Date: Wed, 9 Jun 2010 02:04:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r208931 - user/jmallett/octeon/sys/mips/cavium X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Jun 2010 02:04:42 -0000 Author: jmallett Date: Wed Jun 9 02:04:41 2010 New Revision: 208931 URL: http://svn.freebsd.org/changeset/base/208931 Log: Copy cvmx-cn3010-evb-hs5.c from the Simple Executive to octeon_ds1337.c, which will implement those functions in a way appropriate for the FreeBSD kernel. Added: user/jmallett/octeon/sys/mips/cavium/octeon_ds1337.c Added: user/jmallett/octeon/sys/mips/cavium/octeon_ds1337.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/jmallett/octeon/sys/mips/cavium/octeon_ds1337.c Wed Jun 9 02:04:41 2010 (r208931) @@ -0,0 +1,214 @@ +/***********************license start*************** + * Copyright (c) 2003-2008 Cavium Networks (support@cavium.com). All rights + * reserved. + * + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials provided + * with the distribution. + * + * * Neither the name of Cavium Networks nor the names of + * its contributors may be used to endorse or promote products + * derived from this software without specific prior written + * permission. + * + * TO THE MAXIMUM EXTENT PERMITTED BY LAW, THE SOFTWARE IS PROVIDED "AS IS" + * AND WITH ALL FAULTS AND CAVIUM NETWORKS MAKES NO PROMISES, REPRESENTATIONS + * OR WARRANTIES, EITHER EXPRESS, IMPLIED, STATUTORY, OR OTHERWISE, WITH + * RESPECT TO THE SOFTWARE, INCLUDING ITS CONDITION, ITS CONFORMITY TO ANY + * REPRESENTATION OR DESCRIPTION, OR THE EXISTENCE OF ANY LATENT OR PATENT + * DEFECTS, AND CAVIUM SPECIFICALLY DISCLAIMS ALL IMPLIED (IF ANY) WARRANTIES + * OF TITLE, MERCHANTABILITY, NONINFRINGEMENT, FITNESS FOR A PARTICULAR + * PURPOSE, LACK OF VIRUSES, ACCURACY OR COMPLETENESS, QUIET ENJOYMENT, QUIET + * POSSESSION OR CORRESPONDENCE TO DESCRIPTION. THE ENTIRE RISK ARISING OUT + * OF USE OR PERFORMANCE OF THE SOFTWARE LIES WITH YOU. + * + * + * For any questions regarding licensing please contact marketing@caviumnetworks.com + * + ***********************license end**************************************/ + + + + + + +/** + * @file + * + * Interface to the EBH-30xx specific devices + * + *
$Revision: 41586 $
+ * + */ + +#include +#include "cvmx-config.h" +#include "cvmx.h" +#include "cvmx-sysinfo.h" +#include "cvmx-cn3010-evb-hs5.h" +#include "cvmx-twsi.h" + + +static inline uint8_t bin2bcd(uint8_t bin) +{ + return (bin / 10) << 4 | (bin % 10); +} + +static inline uint8_t bcd2bin(uint8_t bcd) +{ + return (bcd >> 4) * 10 + (bcd & 0xf); +} + +#define TM_CHECK(_expr, _msg) \ + do { \ + if (_expr) { \ + cvmx_dprintf("Warning: RTC has invalid %s field\n", (_msg)); \ + rc = -1; \ + } \ + } while(0); + +static int validate_tm_struct(struct tm * tms) +{ + int rc = 0; + + if (!tms) + return -1; + + TM_CHECK(tms->tm_sec < 0 || tms->tm_sec > 60, "second"); /* + Leap sec */ + TM_CHECK(tms->tm_min < 0 || tms->tm_min > 59, "minute"); + TM_CHECK(tms->tm_hour < 0 || tms->tm_hour > 23, "hour"); + TM_CHECK(tms->tm_mday < 1 || tms->tm_mday > 31, "day"); + TM_CHECK(tms->tm_wday < 0 || tms->tm_wday > 6, "day of week"); + TM_CHECK(tms->tm_mon < 0 || tms->tm_mon > 11, "month"); + TM_CHECK(tms->tm_year < 0 || tms->tm_year > 200,"year"); + + return rc; +} + +/* + * Board-specifc RTC read + * Time is expressed in seconds from epoch (Jan 1 1970 at 00:00:00 UTC) + * and converted internally to calendar format. + */ +uint32_t cvmx_rtc_ds1337_read(void) +{ + int i, retry; + uint32_t time; + uint8_t reg[8]; + uint8_t sec; + struct tm tms; + + + memset(®, 0, sizeof(reg)); + memset(&tms, 0, sizeof(struct tm)); + + for(retry=0; retry<2; retry++) + { + /* Lockless read: detects the infrequent roll-over and retries */ + reg[0] = cvmx_twsi_read8(CVMX_RTC_DS1337_ADDR, 0x0); + for(i=1; i<7; i++) + reg[i] = cvmx_twsi_read8_cur_addr(CVMX_RTC_DS1337_ADDR); + + sec = cvmx_twsi_read8(CVMX_RTC_DS1337_ADDR, 0x0); + if ((sec & 0xf) == (reg[0] & 0xf)) + break; /* Time did not roll-over, value is correct */ + } + + tms.tm_sec = bcd2bin(reg[0] & 0x7f); + tms.tm_min = bcd2bin(reg[1] & 0x7f); + tms.tm_hour = bcd2bin(reg[2] & 0x3f); + if ((reg[2] & 0x40) && (reg[2] & 0x20)) /* AM/PM format and is PM time */ + { + tms.tm_hour = (tms.tm_hour + 12) % 24; + } + tms.tm_wday = (reg[3] & 0x7) - 1; /* Day of week field is 0..6 */ + tms.tm_mday = bcd2bin(reg[4] & 0x3f); + tms.tm_mon = bcd2bin(reg[5] & 0x1f) - 1; /* Month field is 0..11 */ + tms.tm_year = ((reg[5] & 0x80) ? 100 : 0) + bcd2bin(reg[6]); + + + if (validate_tm_struct(&tms)) + cvmx_dprintf("Warning: RTC calendar is not configured properly\n"); + + time = mktime(&tms); + + return time; +} + +/* + * Board-specific RTC write + * Time returned is in seconds from epoch (Jan 1 1970 at 00:00:00 UTC) + */ +int cvmx_rtc_ds1337_write(uint32_t time) +{ + int i, rc, retry; + struct tm tms; + uint8_t reg[8]; + uint8_t sec; + time_t time_from_epoch = time; + + + localtime_r(&time_from_epoch, &tms); + + if (validate_tm_struct(&tms)) + { + cvmx_dprintf("Error: RTC was passed wrong calendar values, write failed\n"); + goto tm_invalid; + } + + reg[0] = bin2bcd(tms.tm_sec); + reg[1] = bin2bcd(tms.tm_min); + reg[2] = bin2bcd(tms.tm_hour); /* Force 0..23 format even if using AM/PM */ + reg[3] = bin2bcd(tms.tm_wday + 1); + reg[4] = bin2bcd(tms.tm_mday); + reg[5] = bin2bcd(tms.tm_mon + 1); + if (tms.tm_year >= 100) /* Set century bit*/ + { + reg[5] |= 0x80; + } + reg[6] = bin2bcd(tms.tm_year % 100); + + /* Lockless write: detects the infrequent roll-over and retries */ + for(retry=0; retry<2; retry++) + { + rc = 0; + for(i=0; i<7; i++) + { + rc |= cvmx_twsi_write8(CVMX_RTC_DS1337_ADDR, i, reg[i]); + } + + sec = cvmx_twsi_read8(CVMX_RTC_DS1337_ADDR, 0x0); + if ((sec & 0xf) == (reg[0] & 0xf)) + break; /* Time did not roll-over, value is correct */ + } + + return (rc ? -1 : 0); + + tm_invalid: + return -1; +} + +#ifdef CVMX_RTC_DEBUG + +void cvmx_rtc_ds1337_dump_state(void) +{ + int i = 0; + + printf("RTC:\n"); + printf("%d : %02X ", i, cvmx_twsi_read8(CVMX_RTC_DS1337_ADDR, 0x0)); + for(i=1; i<16; i++) { + printf("%02X ", cvmx_twsi_read8_cur_addr(CVMX_RTC_DS1337_ADDR)); + } + printf("\n"); +} + +#endif /* CVMX_RTC_DEBUG */ From owner-svn-src-user@FreeBSD.ORG Wed Jun 9 02:07:52 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 78530106566C; Wed, 9 Jun 2010 02:07:52 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 66D9A8FC15; Wed, 9 Jun 2010 02:07:52 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o5927qdm080561; Wed, 9 Jun 2010 02:07:52 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o5927qoA080556; Wed, 9 Jun 2010 02:07:52 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201006090207.o5927qoA080556@svn.freebsd.org> From: Juli Mallett Date: Wed, 9 Jun 2010 02:07:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r208932 - in user/jmallett/octeon/sys/mips: cavium conf X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Jun 2010 02:07:52 -0000 Author: jmallett Date: Wed Jun 9 02:07:51 2010 New Revision: 208932 URL: http://svn.freebsd.org/changeset/base/208932 Log: Add support for a simple realtime clock implemented via the Simple Executive's RTC functions. Added: user/jmallett/octeon/sys/mips/cavium/octeon_rtc.c Modified: user/jmallett/octeon/sys/mips/cavium/files.octeon1 user/jmallett/octeon/sys/mips/cavium/octeon_ds1337.c user/jmallett/octeon/sys/mips/conf/OCTEON1.hints Modified: user/jmallett/octeon/sys/mips/cavium/files.octeon1 ============================================================================== --- user/jmallett/octeon/sys/mips/cavium/files.octeon1 Wed Jun 9 02:04:41 2010 (r208931) +++ user/jmallett/octeon/sys/mips/cavium/files.octeon1 Wed Jun 9 02:07:51 2010 (r208932) @@ -4,9 +4,11 @@ mips/cavium/asm_octeon.S optional smp mips/cavium/ciu.c standard mips/cavium/obio.c optional uart +mips/cavium/octeon_ds1337.c standard mips/cavium/octeon_ebt3000_cf.c optional cf mips/cavium/octeon_machdep.c standard mips/cavium/octeon_mp.c optional smp +mips/cavium/octeon_rtc.c standard mips/cavium/uart_bus_octeonusart.c optional uart mips/cavium/uart_cpu_octeonusart.c optional uart mips/cavium/uart_dev_oct16550.c optional uart @@ -47,7 +49,10 @@ contrib/octeon-sdk/cvmx-spi.c optional contrib/octeon-sdk/cvmx-spi4000.c optional octe contrib/octeon-sdk/cvmx-twsi.c optional octe +# XXX Some files could be excluded in some configurations. Making them +# optional but on in the default config would seem reasonable. contrib/octeon-sdk/cvmx-bootmem.c standard contrib/octeon-sdk/cvmx-sysinfo.c standard +contrib/octeon-sdk/cvmx-thunder.c standard contrib/octeon-sdk/cvmx-warn.c standard contrib/octeon-sdk/octeon-model.c standard Modified: user/jmallett/octeon/sys/mips/cavium/octeon_ds1337.c ============================================================================== --- user/jmallett/octeon/sys/mips/cavium/octeon_ds1337.c Wed Jun 9 02:04:41 2010 (r208931) +++ user/jmallett/octeon/sys/mips/cavium/octeon_ds1337.c Wed Jun 9 02:07:51 2010 (r208932) @@ -50,25 +50,16 @@ * */ -#include -#include "cvmx-config.h" -#include "cvmx.h" -#include "cvmx-sysinfo.h" -#include "cvmx-cn3010-evb-hs5.h" -#include "cvmx-twsi.h" +#include +#include +#include +#include + +#include +#include +#include - -static inline uint8_t bin2bcd(uint8_t bin) -{ - return (bin / 10) << 4 | (bin % 10); -} - -static inline uint8_t bcd2bin(uint8_t bcd) -{ - return (bcd >> 4) * 10 + (bcd & 0xf); -} - -#define TM_CHECK(_expr, _msg) \ +#define CT_CHECK(_expr, _msg) \ do { \ if (_expr) { \ cvmx_dprintf("Warning: RTC has invalid %s field\n", (_msg)); \ @@ -76,20 +67,20 @@ static inline uint8_t bcd2bin(uint8_t bc } \ } while(0); -static int validate_tm_struct(struct tm * tms) +static int validate_ct_struct(struct clocktime *ct) { int rc = 0; - if (!tms) + if (!ct) return -1; - TM_CHECK(tms->tm_sec < 0 || tms->tm_sec > 60, "second"); /* + Leap sec */ - TM_CHECK(tms->tm_min < 0 || tms->tm_min > 59, "minute"); - TM_CHECK(tms->tm_hour < 0 || tms->tm_hour > 23, "hour"); - TM_CHECK(tms->tm_mday < 1 || tms->tm_mday > 31, "day"); - TM_CHECK(tms->tm_wday < 0 || tms->tm_wday > 6, "day of week"); - TM_CHECK(tms->tm_mon < 0 || tms->tm_mon > 11, "month"); - TM_CHECK(tms->tm_year < 0 || tms->tm_year > 200,"year"); + CT_CHECK(ct->sec < 0 || ct->sec > 60, "second"); /* + Leap sec */ + CT_CHECK(ct->min < 0 || ct->min > 59, "minute"); + CT_CHECK(ct->hour < 0 || ct->hour > 23, "hour"); + CT_CHECK(ct->day < 1 || ct->day > 31, "day"); + CT_CHECK(ct->dow < 0 || ct->dow > 6, "day of week"); + CT_CHECK(ct->mon < 0 || ct->mon > 11, "month"); + CT_CHECK(ct->year < 0 || ct->year > 200,"year"); return rc; } @@ -102,14 +93,14 @@ static int validate_tm_struct(struct tm uint32_t cvmx_rtc_ds1337_read(void) { int i, retry; - uint32_t time; uint8_t reg[8]; uint8_t sec; - struct tm tms; + struct clocktime ct; + struct timespec ts; memset(®, 0, sizeof(reg)); - memset(&tms, 0, sizeof(struct tm)); + memset(&ct, 0, sizeof(ct)); for(retry=0; retry<2; retry++) { @@ -123,25 +114,28 @@ uint32_t cvmx_rtc_ds1337_read(void) break; /* Time did not roll-over, value is correct */ } - tms.tm_sec = bcd2bin(reg[0] & 0x7f); - tms.tm_min = bcd2bin(reg[1] & 0x7f); - tms.tm_hour = bcd2bin(reg[2] & 0x3f); + ct.sec = bcd2bin(reg[0] & 0x7f); + ct.min = bcd2bin(reg[1] & 0x7f); + ct.hour = bcd2bin(reg[2] & 0x3f); if ((reg[2] & 0x40) && (reg[2] & 0x20)) /* AM/PM format and is PM time */ { - tms.tm_hour = (tms.tm_hour + 12) % 24; + ct.hour = (ct.hour + 12) % 24; } - tms.tm_wday = (reg[3] & 0x7) - 1; /* Day of week field is 0..6 */ - tms.tm_mday = bcd2bin(reg[4] & 0x3f); - tms.tm_mon = bcd2bin(reg[5] & 0x1f) - 1; /* Month field is 0..11 */ - tms.tm_year = ((reg[5] & 0x80) ? 100 : 0) + bcd2bin(reg[6]); + ct.dow = (reg[3] & 0x7) - 1; /* Day of week field is 0..6 */ + ct.day = bcd2bin(reg[4] & 0x3f); + ct.mon = bcd2bin(reg[5] & 0x1f) - 1; /* Month field is 0..11 */ + ct.year = ((reg[5] & 0x80) ? 100 : 0) + bcd2bin(reg[6]); - if (validate_tm_struct(&tms)) + if (validate_ct_struct(&ct)) cvmx_dprintf("Warning: RTC calendar is not configured properly\n"); - time = mktime(&tms); + if (clock_ct_to_ts(&ct, &ts) != 0) { + cvmx_dprintf("Warning: RTC calendar is not configured properly\n"); + return 0; + } - return time; + return ts.tv_sec; } /* @@ -150,32 +144,34 @@ uint32_t cvmx_rtc_ds1337_read(void) */ int cvmx_rtc_ds1337_write(uint32_t time) { + struct clocktime ct; + struct timespec ts; int i, rc, retry; - struct tm tms; uint8_t reg[8]; uint8_t sec; - time_t time_from_epoch = time; + ts.tv_sec = time; + ts.tv_nsec = 0; - localtime_r(&time_from_epoch, &tms); + clock_ts_to_ct(&ts, &ct); - if (validate_tm_struct(&tms)) + if (validate_ct_struct(&ct)) { cvmx_dprintf("Error: RTC was passed wrong calendar values, write failed\n"); - goto tm_invalid; + goto ct_invalid; } - reg[0] = bin2bcd(tms.tm_sec); - reg[1] = bin2bcd(tms.tm_min); - reg[2] = bin2bcd(tms.tm_hour); /* Force 0..23 format even if using AM/PM */ - reg[3] = bin2bcd(tms.tm_wday + 1); - reg[4] = bin2bcd(tms.tm_mday); - reg[5] = bin2bcd(tms.tm_mon + 1); - if (tms.tm_year >= 100) /* Set century bit*/ + reg[0] = bin2bcd(ct.sec); + reg[1] = bin2bcd(ct.min); + reg[2] = bin2bcd(ct.hour); /* Force 0..23 format even if using AM/PM */ + reg[3] = bin2bcd(ct.dow + 1); + reg[4] = bin2bcd(ct.day); + reg[5] = bin2bcd(ct.mon + 1); + if (ct.year >= 100) /* Set century bit*/ { reg[5] |= 0x80; } - reg[6] = bin2bcd(tms.tm_year % 100); + reg[6] = bin2bcd(ct.year % 100); /* Lockless write: detects the infrequent roll-over and retries */ for(retry=0; retry<2; retry++) @@ -193,7 +189,7 @@ int cvmx_rtc_ds1337_write(uint32_t time) return (rc ? -1 : 0); - tm_invalid: + ct_invalid: return -1; } Added: user/jmallett/octeon/sys/mips/cavium/octeon_rtc.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/jmallett/octeon/sys/mips/cavium/octeon_rtc.c Wed Jun 9 02:07:51 2010 (r208932) @@ -0,0 +1,130 @@ +/*- + * Copyright (c) 2010 Juli Mallett + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + */ + +#include +__FBSDID("$FreeBSD$"); + +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +#include "clock_if.h" + +static int octeon_rtc_attach(device_t dev); +static int octeon_rtc_probe(device_t dev); + +static int octeon_rtc_settime(device_t dev, struct timespec *ts); +static int octeon_rtc_gettime(device_t dev, struct timespec *ts); + +static device_method_t octeon_rtc_methods[] = { + /* Device interface */ + DEVMETHOD(device_probe, octeon_rtc_probe), + DEVMETHOD(device_attach, octeon_rtc_attach), + + /* clock interface */ + DEVMETHOD(clock_gettime, octeon_rtc_gettime), + DEVMETHOD(clock_settime, octeon_rtc_settime), + + { 0, 0 } +}; + +static driver_t octeon_rtc_driver = { + "rtc", + octeon_rtc_methods, + 0 +}; +static devclass_t octeon_rtc_devclass; +DRIVER_MODULE(rtc, nexus, octeon_rtc_driver, octeon_rtc_devclass, 0, 0); + +static int +octeon_rtc_probe(device_t dev) +{ + cvmx_rtc_options_t supported; + + if (device_get_unit(dev) != 0) + return (ENXIO); + + supported = cvmx_rtc_supported(); + if (supported == 0) + return (ENXIO); + + device_set_desc(dev, "Cavium Octeon Realtime Clock"); + return (0); +} + +static int +octeon_rtc_attach(device_t dev) +{ + cvmx_rtc_options_t supported; + + supported = cvmx_rtc_supported(); + if ((supported & CVMX_RTC_READ) == 0) + return (ENXIO); + + clock_register(dev, 1000000); + return (0); +} + +static int +octeon_rtc_settime(device_t dev, struct timespec *ts) +{ + cvmx_rtc_options_t supported; + uint32_t status; + + supported = cvmx_rtc_supported(); + if ((supported & CVMX_RTC_WRITE) == 0) + return (ENOTSUP); + + status = cvmx_rtc_write(ts->tv_sec); + if (status != 0) + return (EINVAL); + + return (0); +} + +static int +octeon_rtc_gettime(device_t dev, struct timespec *ts) +{ + uint32_t secs; + + secs = cvmx_rtc_read(); + if (secs == 0) + return (ENOTSUP); + + ts->tv_sec = secs; + ts->tv_nsec = 0; + + return (0); +} Modified: user/jmallett/octeon/sys/mips/conf/OCTEON1.hints ============================================================================== --- user/jmallett/octeon/sys/mips/conf/OCTEON1.hints Wed Jun 9 02:04:41 2010 (r208931) +++ user/jmallett/octeon/sys/mips/conf/OCTEON1.hints Wed Jun 9 02:07:51 2010 (r208932) @@ -3,6 +3,7 @@ # All these values are complete nonsense... hw.uart.console="io:0x1" hint.ciu.0.at="nexus" +hint.rtc.0.at="nexus" hint.obio.0.at="ciu" hint.obio.0.maddr="0x1" hint.obio.0.msize="0x1" From owner-svn-src-user@FreeBSD.ORG Wed Jun 9 05:06:43 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3F6931065678; Wed, 9 Jun 2010 05:06:43 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 2DB6A8FC1D; Wed, 9 Jun 2010 05:06:43 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o5956hq3019982; Wed, 9 Jun 2010 05:06:43 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o5956h2h019979; Wed, 9 Jun 2010 05:06:43 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201006090506.o5956h2h019979@svn.freebsd.org> From: Juli Mallett Date: Wed, 9 Jun 2010 05:06:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r208933 - user/jmallett/octeon/sys/mips/cavium X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Jun 2010 05:06:43 -0000 Author: jmallett Date: Wed Jun 9 05:06:42 2010 New Revision: 208933 URL: http://svn.freebsd.org/changeset/base/208933 Log: Add a trivial driver for the Octeon RNG. Added: user/jmallett/octeon/sys/mips/cavium/octeon_rnd.c Modified: user/jmallett/octeon/sys/mips/cavium/files.octeon1 Modified: user/jmallett/octeon/sys/mips/cavium/files.octeon1 ============================================================================== --- user/jmallett/octeon/sys/mips/cavium/files.octeon1 Wed Jun 9 02:07:51 2010 (r208932) +++ user/jmallett/octeon/sys/mips/cavium/files.octeon1 Wed Jun 9 05:06:42 2010 (r208933) @@ -15,6 +15,8 @@ mips/cavium/uart_dev_oct16550.c option mips/mips/intr_machdep.c standard mips/mips/tick.c standard +mips/cavium/octeon_rnd.c optional random + mips/cavium/octe/ethernet.c optional octe mips/cavium/octe/ethernet-common.c optional octe mips/cavium/octe/ethernet-mdio.c optional octe Added: user/jmallett/octeon/sys/mips/cavium/octeon_rnd.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/jmallett/octeon/sys/mips/cavium/octeon_rnd.c Wed Jun 9 05:06:42 2010 (r208933) @@ -0,0 +1,137 @@ +/*- + * Copyright (c) 2010 Juli Mallett + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + */ + +#include +__FBSDID("$FreeBSD$"); + +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +/* + * XXX + * random_harvest(9) says to call it with no more than 16 bytes, but at least + * safe(4) seems to violate that rule. + */ +#define OCTEON_RND_WORDS 2 + +struct octeon_rnd_softc { + uint64_t sc_entropy[OCTEON_RND_WORDS]; + struct callout sc_callout; +}; + +static void octeon_rnd_identify(driver_t *drv, device_t parent); +static int octeon_rnd_attach(device_t dev); +static int octeon_rnd_probe(device_t dev); +static int octeon_rnd_detach(device_t dev); + +static void octeon_rnd_harvest(void *); + +static device_method_t octeon_rnd_methods[] = { + /* Device interface */ + DEVMETHOD(device_identify, octeon_rnd_identify), + DEVMETHOD(device_probe, octeon_rnd_probe), + DEVMETHOD(device_attach, octeon_rnd_attach), + DEVMETHOD(device_detach, octeon_rnd_detach), + + { 0, 0 } +}; + +static driver_t octeon_rnd_driver = { + "rnd", + octeon_rnd_methods, + sizeof (struct octeon_rnd_softc) +}; +static devclass_t octeon_rnd_devclass; +DRIVER_MODULE(rnd, nexus, octeon_rnd_driver, octeon_rnd_devclass, 0, 0); + +static void +octeon_rnd_identify(driver_t *drv, device_t parent) +{ + BUS_ADD_CHILD(parent, 0, "rnd", 0); +} + +static int +octeon_rnd_probe(device_t dev) +{ + if (device_get_unit(dev) != 0) + return (ENXIO); + + device_set_desc(dev, "Cavium Octeon Random Number Generator"); + return (0); +} + +static int +octeon_rnd_attach(device_t dev) +{ + struct octeon_rnd_softc *sc; + + sc = device_get_softc(dev); + callout_init(&sc->sc_callout, CALLOUT_MPSAFE); + callout_reset(&sc->sc_callout, hz * 5, octeon_rnd_harvest, sc); + + cvmx_rng_enable(); + + return (0); +} + +static int +octeon_rnd_detach(device_t dev) +{ + struct octeon_rnd_softc *sc; + + sc = device_get_softc(dev); + + callout_stop(&sc->sc_callout); + + return (0); +} + +static void +octeon_rnd_harvest(void *arg) +{ + struct octeon_rnd_softc *sc; + unsigned i; + + sc = arg; + + for (i = 0; i < OCTEON_RND_WORDS; i++) + sc->sc_entropy[i] = cvmx_rng_get_random64(); + random_harvest(sc->sc_entropy, sizeof sc->sc_entropy, + sizeof sc->sc_entropy * 8, 0, RANDOM_PURE); + + callout_reset(&sc->sc_callout, hz * 5, octeon_rnd_harvest, sc); +} From owner-svn-src-user@FreeBSD.ORG Wed Jun 9 11:54:46 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A9AA81065677; Wed, 9 Jun 2010 11:54:46 +0000 (UTC) (envelope-from ae@FreeBSD.org) Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 811C68FC1C; Wed, 9 Jun 2010 11:54:46 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o59Bsk3Q013799; Wed, 9 Jun 2010 11:54:46 GMT (envelope-from ae@svn.freebsd.org) Received: (from ae@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o59BskpK013798; Wed, 9 Jun 2010 11:54:46 GMT (envelope-from ae@svn.freebsd.org) Message-Id: <201006091154.o59BskpK013798@svn.freebsd.org> From: "Andrey V. Elsukov" Date: Wed, 9 Jun 2010 11:54:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r208944 - user/ae X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Jun 2010 11:54:46 -0000 Author: ae Date: Wed Jun 9 11:54:46 2010 New Revision: 208944 URL: http://svn.freebsd.org/changeset/base/208944 Log: Add my playground. Added: user/ae/ From owner-svn-src-user@FreeBSD.ORG Wed Jun 9 12:06:08 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 93BB3106568F; Wed, 9 Jun 2010 12:06:08 +0000 (UTC) (envelope-from ae@FreeBSD.org) Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 823BA8FC1C; Wed, 9 Jun 2010 12:06:08 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o59C68AK016403; Wed, 9 Jun 2010 12:06:08 GMT (envelope-from ae@svn.freebsd.org) Received: (from ae@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o59C68Dv016398; Wed, 9 Jun 2010 12:06:08 GMT (envelope-from ae@svn.freebsd.org) Message-Id: <201006091206.o59C68Dv016398@svn.freebsd.org> From: "Andrey V. Elsukov" Date: Wed, 9 Jun 2010 12:06:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r208945 - in user/ae/usr.sbin: . sade X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Jun 2010 12:06:08 -0000 Author: ae Date: Wed Jun 9 12:06:08 2010 New Revision: 208945 URL: http://svn.freebsd.org/changeset/base/208945 Log: Import code of new sade in my directory: 1. Partition related code seems done, you can create/add/delete/change partitions and partition schemes. It works with libgeom(3) and uses geom PART class to manage partitions. I think there are needed some #ifdef's for other that i386/amd64 hw platforms, but this will be later. 2. File systems related code are in design state. And i am open for suggestions. At this time sade can get file systems list (only UFS and swap), browse it and it's properties. It does not do any changes on disk. Approved by: kib (mentor, blanket approval) Added: user/ae/usr.sbin/ user/ae/usr.sbin/sade/ user/ae/usr.sbin/sade/Makefile (contents, props changed) user/ae/usr.sbin/sade/customdlg.c (contents, props changed) user/ae/usr.sbin/sade/customdlg.h (contents, props changed) user/ae/usr.sbin/sade/devices.c (contents, props changed) user/ae/usr.sbin/sade/fs.c (contents, props changed) user/ae/usr.sbin/sade/fsed.c (contents, props changed) user/ae/usr.sbin/sade/history.c (contents, props changed) user/ae/usr.sbin/sade/libsade.h (contents, props changed) user/ae/usr.sbin/sade/main.c (contents, props changed) user/ae/usr.sbin/sade/menus.c (contents, props changed) user/ae/usr.sbin/sade/parted.c (contents, props changed) user/ae/usr.sbin/sade/parts.c (contents, props changed) user/ae/usr.sbin/sade/sade.h (contents, props changed) user/ae/usr.sbin/sade/util.c (contents, props changed) Added: user/ae/usr.sbin/sade/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/ae/usr.sbin/sade/Makefile Wed Jun 9 12:06:08 2010 (r208945) @@ -0,0 +1,19 @@ +# $FreeBSD$ + +PROG= sade +NO_MAN= + +LIBSADE=devices.c parts.c util.c fs.c + +SRCS= main.c parted.c menus.c customdlg.c history.c fsed.c +SRCS+= ${LIBSADE} + +WARNS?= 1 + +DPADD= ${LIBUTIL} ${LIBGEOM} ${LIBDIALOG} ${LIBNCURSES} ${LIBUFS} +LDADD= -lutil -lgeom -ldialog -lncurses -lufs + +#DEBUG_FLAGS= -g +CFLAGS+= -I${.CURDIR} -I${.CURDIR}/libdialog + +.include Added: user/ae/usr.sbin/sade/customdlg.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/ae/usr.sbin/sade/customdlg.c Wed Jun 9 12:06:08 2010 (r208945) @@ -0,0 +1,935 @@ +/*- + * Copyright (c) 2010 Andrey V. Elsukov + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +__FBSDID("$FreeBSD$"); + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "dialog.priv.h" +#include "customdlg.h" + + +static void dlg_item_draw(struct custom_dlg *dlg, struct dlg_item *item, + int focused); +static void dlg_edit_draw(struct custom_dlg *dlg, DLG_EDIT *item, int focused); +static void dlg_list_draw(struct custom_dlg *dlg, DLG_LIST *item, int focused); +static void dlg_checkbox_draw(struct custom_dlg *dlg, DLG_CHECKBOX *item, + int focused); +static void dlg_draw(struct custom_dlg *dlg); +void dlg_draw_arrows(WINDOW *win, int scroll, int height, int choice, int x, + int y, int tag_x, int cur_x, int cur_y, chtype box, chtype border); + +void +dlg_init(struct custom_dlg *dlg) +{ + bzero(dlg, sizeof(struct custom_dlg)); + TAILQ_INIT(&dlg->items); +} + +void +dlg_free(struct custom_dlg *dlg) +{ + struct dlg_item *item; + + while (!TAILQ_EMPTY(&dlg->items)) { + item = TAILQ_FIRST(&dlg->items); + free(item->priv); + free(item->title); + TAILQ_REMOVE(&dlg->items, item, item); + free(item); + } + free(dlg->title); + TAILQ_INIT(&dlg->items); +} + +struct dlg_item * +dlg_focus_get(struct custom_dlg *dlg) +{ + if (dlg == NULL) + return (NULL); + return (dlg->focus); +} + +struct dlg_item * +dlg_focus_next(struct custom_dlg *dlg) +{ + struct dlg_item *item, *f = NULL; + + if (dlg == NULL) + return (NULL); + if (TAILQ_EMPTY(&dlg->items)) + return (NULL); + /* Do we have any focusable items? */ + TAILQ_FOREACH(item, &dlg->items, item) { + if (item->type != LABEL) { + f = item; + break; + } + } + if (f == NULL) + return (NULL); + + if (dlg->focus == NULL) { + dlg->focus = f; + return (f); + } else + item = TAILQ_NEXT(dlg->focus, item); + do { + if (item == NULL) + item = TAILQ_FIRST(&dlg->items); + else if (item->type != LABEL) { + dlg->focus = item; + return (item); + } else + item = TAILQ_NEXT(item, item); + } while (1); + /* NOTREACHED */ + return (item); +} + +struct dlg_item * +dlg_focus_prev(struct custom_dlg *dlg) +{ + struct dlg_item *item, *f = NULL; + + if (dlg == NULL) + return (NULL); + if (TAILQ_EMPTY(&dlg->items)) + return (NULL); + /* Do we have any focusable items? */ + TAILQ_FOREACH(item, &dlg->items, item) { + if (item->type != LABEL) { + f = item; + break; + } + } + if (f == NULL) + return (NULL); + + if (dlg->focus == NULL) { + dlg->focus = f; + return (f); + } else + item = TAILQ_PREV(dlg->focus, dlg_items, item); + do { + if (item == NULL) + item = TAILQ_LAST(&dlg->items, dlg_items); + else if (item->type != LABEL) { + dlg->focus = item; + return (item); + } else + item = TAILQ_PREV(item, dlg_items, item); + } while (1); + /* NOTREACHED */ + return (item); +} + +DLG_LABEL * +dlg_add_label(struct custom_dlg *dlg, int y, int x, int w, int h, const char *title) +{ + DLG_LABEL *item; + + item = malloc(sizeof(DLG_LABEL)); + if (item == NULL) + return (NULL); + bzero(item, sizeof(DLG_LABEL)); + item->type = LABEL; + item->x = x; + item->y = y; + item->h = h; + item->w = w; + if (title) + item->title = strdup(title); + TAILQ_INSERT_TAIL(&dlg->items, item, item); + return (item); +} + +static void +dlg_label_draw(struct custom_dlg *dlg, DLG_LABEL *item, int focused __unused) +{ + if (item->title != NULL) { + wattrset(dlg->win, dialog_attr); + wmove(dlg->win, item->y, item->x); + print_autowrap(dlg->win, item->title, dlg->h - 1, dlg->w - 2, + item->w, item->y, item->x, FALSE, FALSE); + } +} + +int +dlg_item_set_title(struct custom_dlg *dlg, DLG_LABEL *item, + const char *title) +{ + char *t; + int len; + + if (title == NULL) { + free(item->title); + item->title = NULL; + } else { + len = strlen(title); + t = realloc(item->title, len + 1); + if (t == NULL) + return (ENOMEM); + item->title = t; + strcpy(item->title, title); + wattrset(dlg->win, dialog_attr); + mvwprintw(dlg->win, item->y, item->x, "%*s", + -item->w, item->title); + } + return (0); +} + +DLG_EDIT * +dlg_add_edit(struct custom_dlg *dlg, int y, int x, int w, const char *title, + int maxlen, const char *value) +{ + DLG_EDIT *item; + struct dlg_edit *e; + + if (maxlen < 1) + return (NULL); + item = malloc(sizeof(DLG_EDIT)); + if (item == NULL) + return (NULL); + e = malloc(sizeof(*e)); + if (e == NULL) { + free(item); + return (NULL); + } + bzero(item, sizeof(DLG_EDIT)); + bzero(e, sizeof(*e)); + e->value = malloc(maxlen + 1); + if (e->value == NULL) { + free(item); + free(e); + return (NULL); + } + if (value) + strncpy(e->value, value, maxlen); + else + bzero(e->value, maxlen + 1); + e->len = maxlen; + item->type = EDIT; + item->priv = (void *)e; + item->x = x; + item->y = y; + item->w = w; + item->h = 3; + if (title) + item->title = strdup(title); + if (item->title) + item->h += 1; + TAILQ_INSERT_TAIL(&dlg->items, item, item); + return (item); +} + +static void +dlg_edit_draw(struct custom_dlg *dlg, DLG_EDIT *item, int focused) +{ + struct dlg_edit *e = (struct dlg_edit *)item->priv; + int y, len, scroll = 0; + + y = item->title ? item->y + 2: item->y + 1; + len = strlen(e->value); + wattrset(dlg->win, inputbox_attr); + if (len > item->w - 2) { + if (len > item->w - 2) + scroll = len - item->w + 2; + mvwprintw(dlg->win, y, item->x + 1, "%s", + e->value + scroll); + } else + mvwprintw(dlg->win, y, item->x + 1, "%*s", + -item->w + 2, e->value); +} + +char * +dlg_edit_get_value(struct custom_dlg *dlg __unused, DLG_EDIT *item) +{ + struct dlg_edit *e; + if (item->type != EDIT) + return (NULL); + e = (struct dlg_edit *)item->priv; + return (e->value); +} + +int +dlg_edit_set_value(struct custom_dlg *dlg, DLG_EDIT *item, + const char *value) +{ + struct dlg_edit *e; + assert(item != NULL); + if (item->type != EDIT) + return (-1); + e = (struct dlg_edit *)item->priv; + if (value == NULL) + *e->value = '\0'; + else + strncpy(e->value, value, e->len); + dlg_edit_draw(dlg, item, dlg->focus == item); + wrefresh(dlg->win); + return (0); +} + +static int +dlg_edit_proc(struct custom_dlg *dlg, DLG_EDIT *item, int (*key_handler)(int )) +{ + int key, y, ret = 0; + struct dlg_edit *e = (struct dlg_edit *)item->priv; + char tmp[e->len + 1]; + + y = item->title ? item->y + 2: item->y + 1; + do { + strncpy(tmp, e->value, e->len); + key = line_edit(dlg->win, y, item->x + 1, e->len, item->w - 2, + inputbox_attr, 1, tmp, 0); + if (key == '\r' || key == '\n' ||key == KEY_ENTER || + key == KEY_TAB || key == KEY_BTAB) + strncpy(e->value, tmp, e->len); + dlg_edit_draw(dlg, item, 1); + wrefresh(dlg->win); + switch(key) { + case KEY_ESC: + return (DE_ESC); + case '\r': + case '\n': + case KEY_ENTER: + return (DE_CR); + case KEY_BTAB: + return (DE_BTAB); + case KEY_TAB: + return (DE_TAB); + default: + if (key_handler){ + ret = key_handler(key); + if (ret != 0) + return (ret); + } + beep(); + } + } while (1); + /* NOTREACHED */ + return (ret); +} + + +DLG_BUTTON * +dlg_add_button(struct custom_dlg *dlg, int y, int x, const char *title) +{ + DLG_BUTTON *item; + + item = malloc(sizeof(DLG_BUTTON)); + if (item == NULL) + return (NULL); + bzero(item, sizeof(DLG_BUTTON)); + item->type = BUTTON; + item->x = x; + item->y = y; + item->h = 1; + item->w = strlen(title) + 2; + if (title) + item->title = strdup(title); + TAILQ_INSERT_TAIL(&dlg->items, item, item); + return (item); +} + +static int +dlg_button_proc(struct custom_dlg *dlg, DLG_BUTTON *item, int (*key_handler)(int )) +{ + int key, ret = 0; + + do { + dlg_item_draw(dlg, item, 1); + wrefresh(dlg->win); + key = wgetch(dlg->win); + switch (key) { + case KEY_F(1): + display_helpfile(); + break; + case KEY_ESC: + return (DE_ESC); + case '\n': + case '\r': + case ' ': + case KEY_ENTER: + return (DE_CR); + case KEY_BTAB: + return (DE_BTAB); + case KEY_TAB: + return (DE_TAB); + default: + if (key_handler) { + ret = key_handler(key); + if (ret != 0) + return (ret); + } + beep(); + } + } while(1); + /* NOTREACHED */ + return (ret); +} + + +DLG_LIST * +dlg_add_list(struct custom_dlg *dlg, int y, int x, int w, int h, + const char *title, int cnt, const char **items) +{ + DLG_LIST *item; + struct dlg_list *l; + + item = malloc(sizeof(DLG_LIST)); + if (item == NULL) + return (NULL); + l = malloc(sizeof(*l)); + if (l == NULL) { + free(item); + return (NULL); + } + bzero(item, sizeof(DLG_LIST)); + bzero(l, sizeof(*l)); + l->items = items; + l->cnt = cnt; + if (l->items) + l->selected = (char *)l->items[0]; + item->type = LIST; + item->priv = (void *)l; + item->x = x; + item->y = y; + item->w = w; + item->h = h; + if (title) + item->title = strdup(title); + TAILQ_INSERT_TAIL(&dlg->items, item, item); + return (item); +} + +static void +dlg_list_draw(struct custom_dlg *dlg, DLG_LIST *item, int focused) +{ + int i, row, h, y; + struct dlg_list *l = (struct dlg_list *)item->priv; + + h = item->title ? item->h - 3: item->h - 2; + y = item->title ? item->y + 2: item->y + 1; + + wattrset(dlg->win, item_attr); + for (i = 0, row = 0; row < h && i < l->cnt; i++) { + if (i < l->scroll) + continue; + if (row == l->choice) { + l->selected = (char *)l->items[i]; + wattrset(dlg->win, focused ? item_selected_attr: + item_attr); + } + mvwprintw(dlg->win, y + row, item->x + 1, "%*s", + 2 - item->w, l->items[i]); + if (row == l->choice) + wattrset(dlg->win, item_attr); + row++; + } + for (; row < h; row++) + mvwprintw(dlg->win, y + row, item->x + 1, "%*s", + 2 - item->w, " "); + dlg_draw_arrows(dlg->win, l->scroll, h, l->cnt, item->x, + y - 1, 2, item->x + 1, y + l->choice, dialog_attr, border_attr); +} + +char * +dlg_list_get_choice(struct custom_dlg *dlg __unused, DLG_LIST *item) +{ + struct dlg_list *l; + if (item->type != LIST) + return (NULL); + l = (struct dlg_list *)item->priv; + return (l->selected); +} + +void +dlg_list_handle_move(int key, int *choice, int *scroll, int count, int height) +{ + switch (key) { + case KEY_UP: + if (*choice > 0) + *choice -= 1; + else if (*scroll > 0) + *scroll -= 1; + break; + case KEY_DOWN: + if (*choice < count - 1) { + if (*choice < height - 1) + *choice += 1; + else if (*scroll + height < count) + *scroll += 1; + } + break; + case KEY_PPAGE: + if (*scroll > height) { + *choice = 0; + *scroll -= height - 1; + if (*scroll < 0) + *scroll = 0; + break; + } + case KEY_HOME: + *choice = *scroll = 0; + break; + case KEY_NPAGE: + if (count > height) { + *choice = height - 1; + *scroll += height - 1; + if (*scroll + height > count) + *scroll = count - height; + break; + } + case KEY_END: + if (count < height) + *choice = count - 1; + else { + *choice = height - 1; + *scroll = count - height; + } + break; + } +} + +static int +dlg_list_proc(struct custom_dlg *dlg, DLG_LIST *item, int (*key_handler)(int )) +{ + int key, h, ret = 0; + struct dlg_list *l = (struct dlg_list *)item->priv; + + h = item->title ? item->h - 3: item->h - 2; + do { + dlg_list_draw(dlg, item, 1); + wrefresh(dlg->win); + key = wgetch(dlg->win); + switch(key) { + case KEY_UP: + case KEY_DOWN: + case KEY_PPAGE: + case KEY_HOME: + case KEY_NPAGE: + case KEY_END: + dlg_list_handle_move(key, &l->choice, &l->scroll, + l->cnt, h); + break; + case KEY_F(1): + display_helpfile(); + break; + case KEY_ESC: + return (DE_ESC); + case '\r': + case '\n': + case KEY_ENTER: + return (DE_CR); + case KEY_BTAB: + return (DE_BTAB); + case KEY_TAB: + return (DE_TAB); + default: + if (key_handler){ + ret = key_handler(key); + if (ret != 0) + return (ret); + } + beep(); + } + } while (1); + /* NOTREACHED */ + return (ret); +} + +DLG_CHECKBOX * +dlg_add_checkbox(struct custom_dlg *dlg, int y, int x, int w, int h, + int checked, const char *title) +{ + DLG_CHECKBOX *item; + + item = malloc(sizeof(DLG_CHECKBOX)); + if (item == NULL) + return (NULL); + bzero(item, sizeof(DLG_CHECKBOX)); + item->type = CHECKBOX; + item->x = x; + item->y = y; + item->h = h; + item->w = w; + if (title) + item->title = strdup(title); + item->data = (void *)(intptr_t)checked; + TAILQ_INSERT_TAIL(&dlg->items, item, item); + return (item); +} + +static void +dlg_checkbox_draw(struct custom_dlg *dlg, DLG_CHECKBOX *item, int focused) +{ + wattrset(dlg->win, focused ? button_active_attr: + button_inactive_attr); + mvwprintw(dlg->win, item->y, item->x, "[%s] ", + (int)(intptr_t)item->data ? "X": " "); + if (item->title != NULL) { + print_autowrap(dlg->win, item->title, dlg->h - 1, dlg->w - 6, + item->w, item->y, item->x, FALSE, FALSE); + } +} + + +int +dlg_checkbox_check(struct custom_dlg *dlg, DLG_CHECKBOX *item, int checked) +{ + assert(item != NULL); + if (item->type != CHECKBOX) + return (-1); + item->data = (void *)(intptr_t)checked; + dlg_edit_draw(dlg, item, dlg->focus == item); + wrefresh(dlg->win); + return (0); +} + +int +dlg_checkbox_checked(struct custom_dlg *dlg __unused, DLG_CHECKBOX *item) +{ + assert(item != NULL); + if (item->type != CHECKBOX) + return (-1); + return ((int)(intptr_t)item->data); +} + +int +dlg_checkbox_toggle(struct custom_dlg *dlg __unused, DLG_CHECKBOX *item) +{ + assert(item != NULL); + if (item->type != CHECKBOX) + return (-1); + item->data = (void *)(intptr_t)((int)(intptr_t)item->data ? 0: 1); + return (0); +} + +static int +dlg_checkbox_proc(struct custom_dlg *dlg, DLG_CHECKBOX *item, int (*key_handler)(int )) +{ + int key, ret = 0; + + do { + dlg_checkbox_draw(dlg, item, 1); + wrefresh(dlg->win); + key = wgetch(dlg->win); + switch(key) { + case KEY_ESC: + return (DE_ESC); + case '\r': + case '\n': + case KEY_ENTER: + return (DE_CR); + case KEY_BTAB: + return (DE_BTAB); + case KEY_TAB: + return (DE_TAB); + default: + if (key_handler){ + ret = key_handler(key); + if (ret != 0) + return (ret); + } + beep(); + } + } while (1); + /* NOTREACHED */ + return (ret); +} + +void +dlg_autosize(struct custom_dlg *dlg, int *width, int *height) +{ + struct dlg_item *item; + int w, h, max_w, max_h; + + max_w = 5; max_h = 3; + TAILQ_FOREACH(item, &dlg->items, item) { + w = item->w + item->x; + h = item->h + item->y; + if (w > max_w) + max_w = w; + if (h > max_h) + max_h = h; + } + if (width) + *width = max_w + 1; + if (height) + *height = max_h + 1; +} + +static void +dlg_item_draw(struct custom_dlg *dlg, struct dlg_item *item, int focused) +{ + int h = item->h, y = item->y; + + switch (item->type) { + case LABEL: + dlg_label_draw(dlg, (DLG_LABEL *)item, focused); + break; + case EDIT: + case LIST: + if (item->title) { + wattrset(dlg->win, dialog_attr); + mvwprintw(dlg->win, item->y, item->x, "%s", + item->title); + h -= 1; y += 1; + } + draw_box(dlg->win, y, item->x, h, item->w, border_attr, + dialog_attr); + if (item->type == LIST) + dlg_list_draw(dlg, (DLG_LIST *)item, focused); + else + dlg_edit_draw(dlg, (DLG_EDIT *)item, focused); + break; + case BUTTON: + wattrset(dlg->win, focused ? button_active_attr: + button_inactive_attr); + mvwprintw(dlg->win, item->y, item->x, "[%s]", + item->title ? item->title: " "); + break; + case CHECKBOX: + dlg_checkbox_draw(dlg, (DLG_CHECKBOX *)item, focused); + break; + } +} + +int +dlg_proc(struct custom_dlg *dlg, int (*key_handler)(int )) +{ + int ret = 0; + struct dlg_item *item; + + if (dlg == NULL) + return (-1); + item = dlg_focus_get(dlg); + if (item == NULL) + item = dlg_focus_next(dlg); + do { + dlg_update(dlg); + if (item == NULL) + ret = wgetch(dlg->win); + else { + switch(item->type) { + case EDIT: + ret = dlg_edit_proc(dlg, (DLG_EDIT *)item, + key_handler); + break; + case LIST: + ret = dlg_list_proc(dlg, (DLG_LIST *)item, + key_handler); + break; + case BUTTON: + ret = dlg_button_proc(dlg, (DLG_BUTTON *)item, + key_handler); + break; + case CHECKBOX: + ret = dlg_checkbox_proc(dlg, (DLG_CHECKBOX *)item, + key_handler); + break; + default: + err(EX_SOFTWARE, "unknown dlg_item type"); + } + } + switch (ret) { + default: + case DE_CR: + case DE_ESC: + return (ret); + case DE_TAB: + item = dlg_focus_next(dlg); + break; + case DE_BTAB: + item = dlg_focus_prev(dlg); + break; + } + } while (item); + return (ret); +} + +void +dlg_update(struct custom_dlg *dlg) +{ + if (dlg == NULL) + return; + dlg_draw(dlg); + wrefresh(dlg->win); +} + +static void +dlg_draw(struct custom_dlg *dlg) +{ + struct dlg_item *item; + draw_box(dlg->win, 0, 0, dlg->h, dlg->w, dialog_attr, border_attr); + if (dlg->title) { + wattrset(dlg->win, title_attr); + mvwprintw(dlg->win, 0, (dlg->w - strlen(dlg->title)) / 2 - 1, + " %s ", dlg->title); + } + TAILQ_FOREACH(item, &dlg->items, item) { + dlg_item_draw(dlg, item, item == dlg->focus); + } + display_helpline(dlg->win, dlg->h - 1, dlg->w); +} + +int +dlg_open_dialog(struct custom_dlg *dlg, int width, int height, + const char *title) +{ + WINDOW *win; + int x, y; + + assert(dlg != NULL); + if (width < 5 || height < 3) { + dlg_autosize(dlg, width < 5 ? &width: NULL, + height < 3 ? &height: NULL); + } + + x = DialogX ? DialogX : (COLS - width) / 2; + y = DialogY ? DialogY : (LINES - height) / 2; + + if (use_shadow) + draw_shadow(stdscr, y, x, height, width); + win = newwin(height, width, y, x); + if (win == NULL) + return (-1); + if (title) { + dlg->title = strndup(title, width - 2); + if (dlg->title == NULL) { + delwin(win); + return (-1); + } + } + dlg->win = win; + dlg->x = x; + dlg->y = y; + dlg->w = width; + dlg->h = height; + keypad(win, TRUE); + return (0); +} + +void +dlg_close_dialog(struct custom_dlg *dlg) +{ + if (dlg == NULL) + return; + if (dlg->win != NULL) { + delwin(dlg->win); + dlg->win = NULL; + } +} + +int +dlg_open_popupmenu(struct custom_dlg *dlg, int y, int x, int width, int height, + int cnt, const char **items) +{ + WINDOW *win; + DLG_LIST *item; + + assert(dlg != NULL); + if (use_shadow) + draw_shadow(stdscr, y, x, height, width); + win = newwin(height, width, y, x); + if (win == NULL) + return (-1); + dlg->win = win; + dlg->x = x; + dlg->y = y; + dlg->w = width; + dlg->h = height; + keypad(win, TRUE); + if (dlg_add_list(dlg, 0, 0, width, height, NULL, cnt, items) == NULL) + return (-1); + return (0); +} + +int +dlg_popupmenu_proc(struct custom_dlg *dlg, int (*key_handler)(int )) +{ + int ret = 0; + struct dlg_item *item; + + if (dlg == NULL) + return (-1); + + item = dlg_focus_get(dlg); + if (item == NULL) + item = dlg_focus_next(dlg); + assert(item != NULL); + assert(item->type == LIST); + + draw_box(dlg->win, 0, 0, dlg->h, dlg->w, dialog_attr, + border_attr); + ret = dlg_list_proc(dlg, (DLG_LIST *)item, key_handler); + return (ret); +} + +char * +dlg_popupmenu_get_choice(struct custom_dlg *dlg) +{ + DLG_LIST *item; + if (dlg == NULL) + return (NULL); + item = TAILQ_FIRST(&dlg->items); + assert(item != NULL); + + return (dlg_list_get_choice(dlg, item)); +} + +void +dlg_draw_arrows(WINDOW *win, int scroll, int height, int choice, int x, int y, + int tag_x, int cur_x, int cur_y, chtype box, chtype border) +{ + wmove(win, y, x + tag_x + 1); + wattrset(win, scroll ? uarrow_attr : box); + waddch(win, scroll ? ACS_UARROW : ACS_HLINE); + waddch(win, scroll ? '(' : ACS_HLINE); + waddch(win, scroll ? '-' : ACS_HLINE); + waddch(win, scroll ? ')' : ACS_HLINE); + wmove(win, y + height + 1, x + tag_x + 1); + + wattrset(win, scroll + height < choice ? darrow_attr : border); + waddch(win, scroll + height < choice ? ACS_DARROW : ACS_HLINE); + waddch(win, scroll + height < choice ? '(' : ACS_HLINE); + waddch(win, scroll + height < choice ? '+' : ACS_HLINE); + waddch(win, scroll + height < choice ? ')' : ACS_HLINE); + wmove(win, cur_y, cur_x); /* Restore cursor position */ +} + Added: user/ae/usr.sbin/sade/customdlg.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/ae/usr.sbin/sade/customdlg.h Wed Jun 9 12:06:08 2010 (r208945) @@ -0,0 +1,135 @@ +/*- + * Copyright (c) 2010 Andrey V. Elsukov + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#ifndef _CUSTOMDLG_H_ +#define _CUSTOMDLG_H_ +#include +__FBSDID("$FreeBSD$"); + +#include +#include + +enum dlg_item_type { + LABEL, EDIT, BUTTON, LIST, CHECKBOX +}; *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-user@FreeBSD.ORG Thu Jun 10 20:15:47 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EC8D91065670; Thu, 10 Jun 2010 20:15:47 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D62678FC19; Thu, 10 Jun 2010 20:15:47 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o5AKFl7c053740; Thu, 10 Jun 2010 20:15:47 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o5AKFlPJ053716; Thu, 10 Jun 2010 20:15:47 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <201006102015.o5AKFlPJ053716@svn.freebsd.org> From: Warner Losh Date: Thu, 10 Jun 2010 20:15:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r209006 - in user/imp/tbemd: . bin/chio bin/cp bin/date bin/ln bin/pax bin/setfacl bin/sh cddl/contrib/opensolaris/cmd/zdb cddl/contrib/opensolaris/cmd/zfs cddl/contrib/opensolaris/cmd/... X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Jun 2010 20:15:48 -0000 Author: imp Date: Thu Jun 10 20:15:45 2010 New Revision: 209006 URL: http://svn.freebsd.org/changeset/base/209006 Log: svn merge svn+ssh://svn.freebsd.org/base/head@208996 Added: user/imp/tbemd/contrib/gcc/config/fixdfdi.c - copied unchanged from r208996, head/contrib/gcc/config/fixdfdi.c user/imp/tbemd/contrib/gcc/config/fixsfdi.c - copied unchanged from r208996, head/contrib/gcc/config/fixsfdi.c user/imp/tbemd/contrib/gcc/config/fixunsdfsi.c - copied unchanged from r208996, head/contrib/gcc/config/fixunsdfsi.c user/imp/tbemd/contrib/gcc/config/fixunssfsi.c - copied unchanged from r208996, head/contrib/gcc/config/fixunssfsi.c user/imp/tbemd/contrib/gcc/config/floatdidf.c - copied unchanged from r208996, head/contrib/gcc/config/floatdidf.c user/imp/tbemd/contrib/gcc/config/floatdisf.c - copied unchanged from r208996, head/contrib/gcc/config/floatdisf.c user/imp/tbemd/contrib/gcc/config/floatundidf.c - copied unchanged from r208996, head/contrib/gcc/config/floatundidf.c user/imp/tbemd/contrib/gcc/config/floatundisf.c - copied unchanged from r208996, head/contrib/gcc/config/floatundisf.c user/imp/tbemd/contrib/llvm/ - copied from r208996, head/contrib/llvm/ user/imp/tbemd/contrib/xz/ - copied from r208996, head/contrib/xz/ user/imp/tbemd/lib/clang/ - copied from r208996, head/lib/clang/ user/imp/tbemd/lib/liblzma/ - copied from r208996, head/lib/liblzma/ user/imp/tbemd/lib/libpkg/ - copied from r208996, head/lib/libpkg/ user/imp/tbemd/lib/libutil/quotafile.3 - copied unchanged from r208996, head/lib/libutil/quotafile.3 user/imp/tbemd/lib/libutil/quotafile.c - copied unchanged from r208996, head/lib/libutil/quotafile.c user/imp/tbemd/libexec/tftpd/tftp-file.c - copied unchanged from r208996, head/libexec/tftpd/tftp-file.c user/imp/tbemd/libexec/tftpd/tftp-file.h - copied unchanged from r208996, head/libexec/tftpd/tftp-file.h user/imp/tbemd/libexec/tftpd/tftp-io.c - copied unchanged from r208996, head/libexec/tftpd/tftp-io.c user/imp/tbemd/libexec/tftpd/tftp-io.h - copied unchanged from r208996, head/libexec/tftpd/tftp-io.h user/imp/tbemd/libexec/tftpd/tftp-options.c - copied unchanged from r208996, head/libexec/tftpd/tftp-options.c user/imp/tbemd/libexec/tftpd/tftp-options.h - copied unchanged from r208996, head/libexec/tftpd/tftp-options.h user/imp/tbemd/libexec/tftpd/tftp-transfer.c - copied unchanged from r208996, head/libexec/tftpd/tftp-transfer.c user/imp/tbemd/libexec/tftpd/tftp-transfer.h - copied unchanged from r208996, head/libexec/tftpd/tftp-transfer.h user/imp/tbemd/libexec/tftpd/tftp-utils.c - copied unchanged from r208996, head/libexec/tftpd/tftp-utils.c user/imp/tbemd/libexec/tftpd/tftp-utils.h - copied unchanged from r208996, head/libexec/tftpd/tftp-utils.h user/imp/tbemd/sbin/fsck_ffs/suj.c - copied unchanged from r208996, head/sbin/fsck_ffs/suj.c user/imp/tbemd/share/doc/legal/intel_iwn/ - copied from r208996, head/share/doc/legal/intel_iwn/ user/imp/tbemd/share/man/man4/mvs.4 - copied unchanged from r208996, head/share/man/man4/mvs.4 user/imp/tbemd/share/man/man4/ng_patch.4 - copied unchanged from r208996, head/share/man/man4/ng_patch.4 user/imp/tbemd/share/man/man4/uep.4 - copied unchanged from r208996, head/share/man/man4/uep.4 user/imp/tbemd/sys/boot/fdt/ - copied from r208996, head/sys/boot/fdt/ user/imp/tbemd/sys/cddl/compat/opensolaris/sys/taskq.h - copied unchanged from r208996, head/sys/cddl/compat/opensolaris/sys/taskq.h user/imp/tbemd/sys/contrib/dev/acpica/compiler/aslrestype1i.c - copied unchanged from r208996, head/sys/contrib/dev/acpica/compiler/aslrestype1i.c user/imp/tbemd/sys/contrib/dev/acpica/compiler/aslrestype2d.c - copied unchanged from r208996, head/sys/contrib/dev/acpica/compiler/aslrestype2d.c user/imp/tbemd/sys/contrib/dev/acpica/compiler/aslrestype2e.c - copied unchanged from r208996, head/sys/contrib/dev/acpica/compiler/aslrestype2e.c user/imp/tbemd/sys/contrib/dev/acpica/compiler/aslrestype2q.c - copied unchanged from r208996, head/sys/contrib/dev/acpica/compiler/aslrestype2q.c user/imp/tbemd/sys/contrib/dev/acpica/compiler/aslrestype2w.c - copied unchanged from r208996, head/sys/contrib/dev/acpica/compiler/aslrestype2w.c user/imp/tbemd/sys/contrib/dev/acpica/events/evgpeinit.c - copied unchanged from r208996, head/sys/contrib/dev/acpica/events/evgpeinit.c user/imp/tbemd/sys/contrib/dev/acpica/events/evgpeutil.c - copied unchanged from r208996, head/sys/contrib/dev/acpica/events/evgpeutil.c user/imp/tbemd/sys/dev/fdt/ - copied from r208996, head/sys/dev/fdt/ user/imp/tbemd/sys/dev/io/iodev.h - copied unchanged from r208996, head/sys/dev/io/iodev.h user/imp/tbemd/sys/dev/mvs/ - copied from r208996, head/sys/dev/mvs/ user/imp/tbemd/sys/dev/ofw/ofw_fdt.c - copied unchanged from r208996, head/sys/dev/ofw/ofw_fdt.c user/imp/tbemd/sys/dev/uart/uart_bus_fdt.c - copied unchanged from r208996, head/sys/dev/uart/uart_bus_fdt.c user/imp/tbemd/sys/dev/usb/input/uep.c - copied unchanged from r208996, head/sys/dev/usb/input/uep.c user/imp/tbemd/sys/libkern/memchr.c - copied unchanged from r208996, head/sys/libkern/memchr.c user/imp/tbemd/sys/mips/cavium/octeon_mp.c - copied unchanged from r208996, head/sys/mips/cavium/octeon_mp.c user/imp/tbemd/sys/mips/rmi/mpwait.S - copied unchanged from r208996, head/sys/mips/rmi/mpwait.S user/imp/tbemd/sys/modules/mvs/ - copied from r208996, head/sys/modules/mvs/ user/imp/tbemd/sys/modules/netgraph/patch/ - copied from r208996, head/sys/modules/netgraph/patch/ user/imp/tbemd/sys/modules/usb/uep/ - copied from r208996, head/sys/modules/usb/uep/ user/imp/tbemd/sys/netgraph/ng_patch.c - copied unchanged from r208996, head/sys/netgraph/ng_patch.c user/imp/tbemd/sys/netgraph/ng_patch.h - copied unchanged from r208996, head/sys/netgraph/ng_patch.h user/imp/tbemd/sys/powerpc/powermac/smusat.c - copied unchanged from r208996, head/sys/powerpc/powermac/smusat.c user/imp/tbemd/sys/powerpc/powermac/uninorthpci.c - copied unchanged from r208996, head/sys/powerpc/powermac/uninorthpci.c user/imp/tbemd/sys/sparc64/include/mcntl.h - copied unchanged from r208996, head/sys/sparc64/include/mcntl.h user/imp/tbemd/sys/sparc64/sparc64/zeus.c - copied unchanged from r208996, head/sys/sparc64/sparc64/zeus.c user/imp/tbemd/sys/tools/fdt/ - copied from r208996, head/sys/tools/fdt/ user/imp/tbemd/sys/x86/x86/ - copied from r208996, head/sys/x86/x86/ user/imp/tbemd/tools/build/options/WITHOUT_CLANG - copied unchanged from r208996, head/tools/build/options/WITHOUT_CLANG user/imp/tbemd/tools/build/options/WITHOUT_MAN_UTILS - copied unchanged from r208996, head/tools/build/options/WITHOUT_MAN_UTILS user/imp/tbemd/tools/build/options/WITH_FDT - copied unchanged from r208996, head/tools/build/options/WITH_FDT user/imp/tbemd/tools/regression/bin/sh/builtins/case2.0 - copied unchanged from r208996, head/tools/regression/bin/sh/builtins/case2.0 user/imp/tbemd/tools/regression/bin/sh/builtins/case3.0 - copied unchanged from r208996, head/tools/regression/bin/sh/builtins/case3.0 user/imp/tbemd/tools/regression/bin/sh/builtins/dot1.0 - copied unchanged from r208996, head/tools/regression/bin/sh/builtins/dot1.0 user/imp/tbemd/tools/regression/bin/sh/builtins/dot2.0 - copied unchanged from r208996, head/tools/regression/bin/sh/builtins/dot2.0 user/imp/tbemd/tools/regression/bin/sh/builtins/exec1.0 - copied unchanged from r208996, head/tools/regression/bin/sh/builtins/exec1.0 user/imp/tbemd/tools/regression/bin/sh/builtins/exec2.0 - copied unchanged from r208996, head/tools/regression/bin/sh/builtins/exec2.0 user/imp/tbemd/tools/regression/bin/sh/builtins/locale1.0 - copied unchanged from r208996, head/tools/regression/bin/sh/builtins/locale1.0 user/imp/tbemd/tools/regression/bin/sh/builtins/return4.0 - copied unchanged from r208996, head/tools/regression/bin/sh/builtins/return4.0 user/imp/tbemd/tools/regression/bin/sh/builtins/wait1.0 - copied unchanged from r208996, head/tools/regression/bin/sh/builtins/wait1.0 user/imp/tbemd/tools/regression/bin/sh/builtins/wait2.0 - copied unchanged from r208996, head/tools/regression/bin/sh/builtins/wait2.0 user/imp/tbemd/tools/regression/bin/sh/expansion/pathname1.0 - copied unchanged from r208996, head/tools/regression/bin/sh/expansion/pathname1.0 user/imp/tbemd/tools/regression/bin/sh/expansion/pathname2.0 - copied unchanged from r208996, head/tools/regression/bin/sh/expansion/pathname2.0 user/imp/tbemd/tools/regression/bin/sh/expansion/plus-minus3.0 - copied unchanged from r208996, head/tools/regression/bin/sh/expansion/plus-minus3.0 user/imp/tbemd/tools/regression/bin/sh/expansion/trim3.0 - copied unchanged from r208996, head/tools/regression/bin/sh/expansion/trim3.0 user/imp/tbemd/tools/regression/bin/sh/parameters/pwd2.0 - copied unchanged from r208996, head/tools/regression/bin/sh/parameters/pwd2.0 user/imp/tbemd/tools/regression/bin/sh/parser/case1.0 - copied unchanged from r208996, head/tools/regression/bin/sh/parser/case1.0 user/imp/tbemd/tools/regression/bin/sh/parser/case2.0 - copied unchanged from r208996, head/tools/regression/bin/sh/parser/case2.0 user/imp/tbemd/tools/regression/bin/sh/parser/heredoc3.0 - copied unchanged from r208996, head/tools/regression/bin/sh/parser/heredoc3.0 user/imp/tbemd/tools/regression/bin/sh/parser/heredoc4.0 - copied unchanged from r208996, head/tools/regression/bin/sh/parser/heredoc4.0 user/imp/tbemd/tools/regression/bin/sh/parser/heredoc5.0 - copied unchanged from r208996, head/tools/regression/bin/sh/parser/heredoc5.0 user/imp/tbemd/tools/regression/bin/sh/parser/heredoc6.0 - copied unchanged from r208996, head/tools/regression/bin/sh/parser/heredoc6.0 user/imp/tbemd/tools/regression/lib/libc/gen/test-fnmatch.c - copied unchanged from r208996, head/tools/regression/lib/libc/gen/test-fnmatch.c user/imp/tbemd/tools/regression/sockets/unix_close_race/ - copied from r208996, head/tools/regression/sockets/unix_close_race/ user/imp/tbemd/tools/regression/usr.bin/jot/regress.rand1.out - copied unchanged from r208996, head/tools/regression/usr.bin/jot/regress.rand1.out user/imp/tbemd/tools/regression/usr.bin/jot/regress.rand2.out - copied unchanged from r208996, head/tools/regression/usr.bin/jot/regress.rand2.out user/imp/tbemd/tools/regression/usr.bin/jot/regress.stutter2.out - copied unchanged from r208996, head/tools/regression/usr.bin/jot/regress.stutter2.out user/imp/tbemd/tools/test/testfloat/ - copied from r208996, head/tools/test/testfloat/ user/imp/tbemd/tools/tools/vhba/ - copied from r208996, head/tools/tools/vhba/ user/imp/tbemd/usr.bin/clang/ - copied from r208996, head/usr.bin/clang/ user/imp/tbemd/usr.bin/cpio/err.h - copied unchanged from r208996, head/usr.bin/cpio/err.h user/imp/tbemd/usr.bin/cpio/line_reader.c - copied unchanged from r208996, head/usr.bin/cpio/line_reader.c user/imp/tbemd/usr.bin/cpio/line_reader.h - copied unchanged from r208996, head/usr.bin/cpio/line_reader.h user/imp/tbemd/usr.bin/lzmainfo/ - copied from r208996, head/usr.bin/lzmainfo/ user/imp/tbemd/usr.bin/tftp/tftp.h - copied unchanged from r208996, head/usr.bin/tftp/tftp.h user/imp/tbemd/usr.bin/xz/ - copied from r208996, head/usr.bin/xz/ user/imp/tbemd/usr.bin/xzdec/ - copied from r208996, head/usr.bin/xzdec/ Deleted: user/imp/tbemd/sys/amd64/amd64/io_apic.c user/imp/tbemd/sys/amd64/amd64/local_apic.c user/imp/tbemd/sys/amd64/amd64/mca.c user/imp/tbemd/sys/amd64/amd64/msi.c user/imp/tbemd/sys/cddl/dev/cyclic/amd64/ user/imp/tbemd/sys/i386/i386/io_apic.c user/imp/tbemd/sys/i386/i386/local_apic.c user/imp/tbemd/sys/i386/i386/mca.c user/imp/tbemd/sys/i386/i386/msi.c user/imp/tbemd/sys/mips/cavium/dev/rgmii/octeon_fau.c user/imp/tbemd/sys/mips/include/archtype.h user/imp/tbemd/sys/mips/include/defs.h user/imp/tbemd/sys/mips/include/psl.h user/imp/tbemd/sys/mips/include/queue.h user/imp/tbemd/sys/mips/include/rm7000.h user/imp/tbemd/sys/mips/include/segments.h user/imp/tbemd/sys/mips/mips/copystr.S user/imp/tbemd/sys/mips/rmi/ehcireg.h user/imp/tbemd/sys/mips/rmi/ehcivar.h user/imp/tbemd/sys/mips/rmi/pcibus.c user/imp/tbemd/sys/mips/rmi/perfmon.h user/imp/tbemd/sys/mips/rmi/perfmon_kern.c user/imp/tbemd/sys/mips/rmi/perfmon_percpu.c user/imp/tbemd/sys/mips/rmi/perfmon_utils.h user/imp/tbemd/sys/mips/rmi/perfmon_xlrconfig.h user/imp/tbemd/sys/mips/rmi/xlr_boot1_console.c user/imp/tbemd/sys/powerpc/powermac/cpchtvar.h user/imp/tbemd/usr.sbin/pkg_install/lib/ Modified: user/imp/tbemd/Makefile.inc1 user/imp/tbemd/ObsoleteFiles.inc user/imp/tbemd/UPDATING user/imp/tbemd/bin/chio/chio.c user/imp/tbemd/bin/cp/cp.c user/imp/tbemd/bin/date/date.1 user/imp/tbemd/bin/ln/ln.c user/imp/tbemd/bin/ln/symlink.7 user/imp/tbemd/bin/pax/pat_rep.c user/imp/tbemd/bin/setfacl/setfacl.1 user/imp/tbemd/bin/sh/arith.y user/imp/tbemd/bin/sh/arith_lex.l user/imp/tbemd/bin/sh/cd.c user/imp/tbemd/bin/sh/cd.h user/imp/tbemd/bin/sh/eval.c user/imp/tbemd/bin/sh/expand.c user/imp/tbemd/bin/sh/histedit.c user/imp/tbemd/bin/sh/jobs.c user/imp/tbemd/bin/sh/main.c user/imp/tbemd/bin/sh/myhistedit.h user/imp/tbemd/bin/sh/parser.c user/imp/tbemd/bin/sh/sh.1 user/imp/tbemd/bin/sh/var.c user/imp/tbemd/bin/sh/var.h user/imp/tbemd/cddl/contrib/opensolaris/cmd/zdb/zdb.c user/imp/tbemd/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c user/imp/tbemd/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c user/imp/tbemd/cddl/contrib/opensolaris/cmd/ztest/ztest.c user/imp/tbemd/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h user/imp/tbemd/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c user/imp/tbemd/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c user/imp/tbemd/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c user/imp/tbemd/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c user/imp/tbemd/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h user/imp/tbemd/cddl/contrib/opensolaris/lib/libzpool/common/taskq.c user/imp/tbemd/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c user/imp/tbemd/contrib/bind9/CHANGES user/imp/tbemd/contrib/bind9/lib/dns/api user/imp/tbemd/contrib/bind9/lib/dns/validator.c user/imp/tbemd/contrib/bind9/version user/imp/tbemd/contrib/binutils/bfd/archures.c user/imp/tbemd/contrib/binutils/bfd/bfd-in2.h user/imp/tbemd/contrib/binutils/bfd/cpu-mips.c user/imp/tbemd/contrib/binutils/bfd/elfxx-mips.c user/imp/tbemd/contrib/binutils/gas/config/tc-mips.c user/imp/tbemd/contrib/binutils/gas/config/tc-mips.h user/imp/tbemd/contrib/binutils/include/elf/mips.h user/imp/tbemd/contrib/binutils/include/opcode/mips.h user/imp/tbemd/contrib/binutils/opcodes/mips-dis.c user/imp/tbemd/contrib/binutils/opcodes/mips-opc.c user/imp/tbemd/contrib/binutils/opcodes/mips16-opc.c user/imp/tbemd/contrib/bsnmp/gensnmpdef/gensnmpdef.1 user/imp/tbemd/contrib/bsnmp/gensnmptree/gensnmptree.1 user/imp/tbemd/contrib/bsnmp/lib/asn1.3 user/imp/tbemd/contrib/bsnmp/lib/bsnmpagent.3 user/imp/tbemd/contrib/bsnmp/lib/bsnmpclient.3 user/imp/tbemd/contrib/bsnmp/lib/bsnmplib.3 user/imp/tbemd/contrib/bsnmp/snmp_mibII/snmp_mibII.3 user/imp/tbemd/contrib/bsnmp/snmpd/bsnmpd.1 user/imp/tbemd/contrib/bsnmp/snmpd/snmpmod.3 user/imp/tbemd/contrib/gcc/config/mips/freebsd.h user/imp/tbemd/contrib/gcc/config/mips/mips.c user/imp/tbemd/contrib/gcc/config/mips/mips.h user/imp/tbemd/contrib/gcc/config/mips/mips.md user/imp/tbemd/contrib/gdtoa/hexnan.c user/imp/tbemd/contrib/ipfilter/man/ipmon.8 user/imp/tbemd/contrib/netcat/netcat.c user/imp/tbemd/contrib/ngatm/man/libngatm.3 user/imp/tbemd/contrib/ngatm/man/uniaddr.3 user/imp/tbemd/contrib/ngatm/man/unifunc.3 user/imp/tbemd/contrib/ngatm/man/unimsg.3 user/imp/tbemd/contrib/ngatm/man/unisap.3 user/imp/tbemd/contrib/ngatm/man/unistruct.3 user/imp/tbemd/contrib/ngatm/snmp_atm/snmp_atm.3 user/imp/tbemd/contrib/ngatm/sscop/sscop.1 user/imp/tbemd/contrib/nvi/docs/help user/imp/tbemd/contrib/nvi/ex/ex_cmd.c user/imp/tbemd/contrib/nvi/vi/v_ex.c user/imp/tbemd/contrib/nvi/vi/v_txt.c user/imp/tbemd/contrib/opie/libopie/readrec.c user/imp/tbemd/contrib/sendmail/mail.local/mail.local.8 user/imp/tbemd/contrib/telnet/telnet/commands.c user/imp/tbemd/contrib/telnet/telnet/externs.h user/imp/tbemd/contrib/telnet/telnet/network.c user/imp/tbemd/contrib/telnet/telnet/sys_bsd.c user/imp/tbemd/contrib/telnet/telnet/telnet.c user/imp/tbemd/contrib/telnet/telnet/terminal.c user/imp/tbemd/contrib/top/utils.c user/imp/tbemd/contrib/tzcode/zic/private.h user/imp/tbemd/contrib/tzdata/africa user/imp/tbemd/contrib/tzdata/asia user/imp/tbemd/contrib/tzdata/northamerica user/imp/tbemd/contrib/tzdata/southamerica user/imp/tbemd/contrib/tzdata/zone.tab user/imp/tbemd/crypto/openssh/ChangeLog user/imp/tbemd/crypto/openssh/README user/imp/tbemd/crypto/openssh/auth-options.c user/imp/tbemd/crypto/openssh/auth2-pubkey.c user/imp/tbemd/crypto/openssh/channels.c user/imp/tbemd/crypto/openssh/clientloop.c user/imp/tbemd/crypto/openssh/config.h user/imp/tbemd/crypto/openssh/config.h.in user/imp/tbemd/crypto/openssh/defines.h user/imp/tbemd/crypto/openssh/key.c user/imp/tbemd/crypto/openssh/key.h user/imp/tbemd/crypto/openssh/loginrec.c user/imp/tbemd/crypto/openssh/logintest.c user/imp/tbemd/crypto/openssh/moduli.5 user/imp/tbemd/crypto/openssh/openbsd-compat/bsd-arc4random.c user/imp/tbemd/crypto/openssh/scp.1 user/imp/tbemd/crypto/openssh/servconf.c user/imp/tbemd/crypto/openssh/session.c user/imp/tbemd/crypto/openssh/sftp-server.8 user/imp/tbemd/crypto/openssh/sftp.1 user/imp/tbemd/crypto/openssh/ssh-add.1 user/imp/tbemd/crypto/openssh/ssh-agent.1 user/imp/tbemd/crypto/openssh/ssh-keygen.1 user/imp/tbemd/crypto/openssh/ssh-keygen.c user/imp/tbemd/crypto/openssh/ssh-keyscan.1 user/imp/tbemd/crypto/openssh/ssh-keysign.8 user/imp/tbemd/crypto/openssh/ssh-pkcs11-helper.8 user/imp/tbemd/crypto/openssh/ssh-pkcs11-helper.c user/imp/tbemd/crypto/openssh/ssh.1 user/imp/tbemd/crypto/openssh/ssh_config user/imp/tbemd/crypto/openssh/ssh_config.5 user/imp/tbemd/crypto/openssh/sshd.8 user/imp/tbemd/crypto/openssh/sshd_config user/imp/tbemd/crypto/openssh/sshd_config.5 user/imp/tbemd/crypto/openssh/version.h user/imp/tbemd/etc/Makefile user/imp/tbemd/etc/csh.login user/imp/tbemd/etc/defaults/rc.conf user/imp/tbemd/etc/devd.conf user/imp/tbemd/etc/devd/uath.conf user/imp/tbemd/etc/mtree/BSD.include.dist user/imp/tbemd/etc/mtree/BSD.usr.dist user/imp/tbemd/etc/network.subr user/imp/tbemd/etc/periodic/daily/310.accounting user/imp/tbemd/etc/periodic/daily/440.status-mailq user/imp/tbemd/etc/periodic/weekly/330.catman user/imp/tbemd/etc/periodic/weekly/Makefile user/imp/tbemd/etc/profile user/imp/tbemd/etc/rc.d/Makefile user/imp/tbemd/etc/rc.d/SERVERS user/imp/tbemd/etc/rc.d/bluetooth user/imp/tbemd/etc/rc.d/bridge user/imp/tbemd/etc/rc.d/cleanvar user/imp/tbemd/etc/rc.d/ddb user/imp/tbemd/etc/rc.d/defaultroute user/imp/tbemd/etc/rc.d/dumpon user/imp/tbemd/etc/rc.d/geli user/imp/tbemd/etc/rc.d/geli2 user/imp/tbemd/etc/rc.d/hostid user/imp/tbemd/etc/rc.d/hostid_save user/imp/tbemd/etc/rc.d/initrandom user/imp/tbemd/etc/rc.d/ipfw user/imp/tbemd/etc/rc.d/mdconfig user/imp/tbemd/etc/rc.d/mdconfig2 user/imp/tbemd/etc/rc.d/mountcritlocal user/imp/tbemd/etc/rc.d/named user/imp/tbemd/etc/rc.d/nscd user/imp/tbemd/etc/rc.d/rfcomm_pppd_server user/imp/tbemd/etc/rc.d/routing user/imp/tbemd/etc/rc.d/savecore user/imp/tbemd/etc/rc.d/stf user/imp/tbemd/etc/rc.d/syscons user/imp/tbemd/etc/rc.d/sysctl user/imp/tbemd/etc/rc.d/ubthidhci user/imp/tbemd/etc/rc.d/zvol user/imp/tbemd/etc/rc.firewall user/imp/tbemd/etc/rc.initdiskless user/imp/tbemd/etc/rc.subr user/imp/tbemd/etc/regdomain.xml user/imp/tbemd/etc/services user/imp/tbemd/games/pom/pom.6 user/imp/tbemd/gnu/lib/libgcc/Makefile user/imp/tbemd/gnu/lib/libgomp/Makefile user/imp/tbemd/gnu/lib/libstdc++/Makefile user/imp/tbemd/gnu/lib/libsupc++/Makefile user/imp/tbemd/gnu/usr.bin/Makefile user/imp/tbemd/gnu/usr.bin/binutils/Makefile.inc0 user/imp/tbemd/gnu/usr.bin/binutils/ld/Makefile.mips user/imp/tbemd/gnu/usr.bin/binutils/libbfd/Makefile.mips user/imp/tbemd/gnu/usr.bin/binutils/libbfd/bfd.h user/imp/tbemd/gnu/usr.bin/cc/Makefile.inc user/imp/tbemd/gnu/usr.bin/cc/cc_tools/freebsd-native.h user/imp/tbemd/gnu/usr.bin/cc/include/Makefile user/imp/tbemd/gnu/usr.bin/dtc/Makefile user/imp/tbemd/gnu/usr.bin/groff/tmac/mdoc.local user/imp/tbemd/include/stdlib.h user/imp/tbemd/lib/Makefile user/imp/tbemd/lib/libarchive/Makefile user/imp/tbemd/lib/libarchive/archive_read_disk.3 user/imp/tbemd/lib/libarchive/archive_read_open_fd.c user/imp/tbemd/lib/libarchive/archive_read_open_filename.c user/imp/tbemd/lib/libarchive/config_freebsd.h user/imp/tbemd/lib/libarchive/cpio.5 user/imp/tbemd/lib/libc/compat-43/sigpause.2 user/imp/tbemd/lib/libc/gen/alarm.3 user/imp/tbemd/lib/libc/gen/fmtcheck.3 user/imp/tbemd/lib/libc/gen/fnmatch.c user/imp/tbemd/lib/libc/gen/getcwd.3 user/imp/tbemd/lib/libc/gen/glob.c user/imp/tbemd/lib/libc/gen/isgreater.3 user/imp/tbemd/lib/libc/gen/raise.3 user/imp/tbemd/lib/libc/gen/scandir.3 user/imp/tbemd/lib/libc/gen/sem_timedwait.3 user/imp/tbemd/lib/libc/gen/setproctitle.3 user/imp/tbemd/lib/libc/gen/siginterrupt.3 user/imp/tbemd/lib/libc/gen/sysctl.3 user/imp/tbemd/lib/libc/gen/tcgetsid.3 user/imp/tbemd/lib/libc/gen/ualarm.3 user/imp/tbemd/lib/libc/locale/isblank.3 user/imp/tbemd/lib/libc/posix1e/acl_branding.c user/imp/tbemd/lib/libc/posix1e/acl_entry.c user/imp/tbemd/lib/libc/posix1e/acl_get.c user/imp/tbemd/lib/libc/posix1e/acl_perm.c user/imp/tbemd/lib/libc/posix1e/acl_set.c user/imp/tbemd/lib/libc/posix1e/acl_strip.c user/imp/tbemd/lib/libc/posix1e/acl_support.c user/imp/tbemd/lib/libc/posix1e/acl_support.h user/imp/tbemd/lib/libc/posix1e/acl_to_text_nfs4.c user/imp/tbemd/lib/libc/posix1e/acl_valid.c user/imp/tbemd/lib/libc/stdio/fgets.3 user/imp/tbemd/lib/libc/stdio/fopen.3 user/imp/tbemd/lib/libc/stdio/printf.3 user/imp/tbemd/lib/libc/stdio/tmpnam.3 user/imp/tbemd/lib/libc/stdio/wprintf.3 user/imp/tbemd/lib/libc/stdlib/realpath.3 user/imp/tbemd/lib/libc/stdlib/realpath.c user/imp/tbemd/lib/libc/stdlib/strtod.3 user/imp/tbemd/lib/libc/stdtime/strptime.c user/imp/tbemd/lib/libc/string/strcat.3 user/imp/tbemd/lib/libc/string/strcpy.3 user/imp/tbemd/lib/libc/sys/access.2 user/imp/tbemd/lib/libc/sys/execve.2 user/imp/tbemd/lib/libc/sys/fcntl.2 user/imp/tbemd/lib/libc/sys/flock.2 user/imp/tbemd/lib/libc/sys/getitimer.2 user/imp/tbemd/lib/libc/sys/getrlimit.2 user/imp/tbemd/lib/libc/sys/getrusage.2 user/imp/tbemd/lib/libc/sys/ioctl.2 user/imp/tbemd/lib/libc/sys/mount.2 user/imp/tbemd/lib/libc/sys/mq_close.2 user/imp/tbemd/lib/libc/sys/mq_getattr.2 user/imp/tbemd/lib/libc/sys/mq_notify.2 user/imp/tbemd/lib/libc/sys/mq_open.2 user/imp/tbemd/lib/libc/sys/mq_receive.2 user/imp/tbemd/lib/libc/sys/mq_send.2 user/imp/tbemd/lib/libc/sys/mq_setattr.2 user/imp/tbemd/lib/libc/sys/ptrace.2 user/imp/tbemd/lib/libc/sys/quotactl.2 user/imp/tbemd/lib/libc/sys/setuid.2 user/imp/tbemd/lib/libc/sys/sigaction.2 user/imp/tbemd/lib/libc/sys/sigaltstack.2 user/imp/tbemd/lib/libc/sys/sigprocmask.2 user/imp/tbemd/lib/libc/sys/sigreturn.2 user/imp/tbemd/lib/libc/sys/unlink.2 user/imp/tbemd/lib/libc/sys/vfork.2 user/imp/tbemd/lib/libelf/elf.3 user/imp/tbemd/lib/libftpio/ftpio.3 user/imp/tbemd/lib/libgssapi/gss_compare_name.3 user/imp/tbemd/lib/libkvm/kvm.3 user/imp/tbemd/lib/libmagic/Makefile user/imp/tbemd/lib/libmagic/config.h user/imp/tbemd/lib/libpam/modules/pam_krb5/pam_krb5.8 user/imp/tbemd/lib/libpam/modules/pam_krb5/pam_krb5.c user/imp/tbemd/lib/libpmc/libpmc.c user/imp/tbemd/lib/libpmc/pmc.core.3 user/imp/tbemd/lib/libpmc/pmc.corei7.3 user/imp/tbemd/lib/libpmc/pmc.corei7uc.3 user/imp/tbemd/lib/libpmc/pmc.mips.3 user/imp/tbemd/lib/libpmc/pmc.ucf.3 user/imp/tbemd/lib/libpmc/pmc.westmereuc.3 user/imp/tbemd/lib/libpmc/pmc.xscale.3 user/imp/tbemd/lib/libpmc/pmclog.c user/imp/tbemd/lib/librpcsec_gss/rpc_gss_get_error.3 user/imp/tbemd/lib/librpcsec_gss/rpc_gss_get_mech_info.3 user/imp/tbemd/lib/librpcsec_gss/rpc_gss_get_mechanisms.3 user/imp/tbemd/lib/librpcsec_gss/rpc_gss_get_principal_name.3 user/imp/tbemd/lib/librpcsec_gss/rpc_gss_get_versions.3 user/imp/tbemd/lib/librpcsec_gss/rpc_gss_getcred.3 user/imp/tbemd/lib/librpcsec_gss/rpc_gss_is_installed.3 user/imp/tbemd/lib/librpcsec_gss/rpc_gss_max_data_length.3 user/imp/tbemd/lib/librpcsec_gss/rpc_gss_mech_to_oid.3 user/imp/tbemd/lib/librpcsec_gss/rpc_gss_oid_to_mech.3 user/imp/tbemd/lib/librpcsec_gss/rpc_gss_qop_to_num.3 user/imp/tbemd/lib/librpcsec_gss/rpc_gss_seccreate.3 user/imp/tbemd/lib/librpcsec_gss/rpc_gss_set_callback.3 user/imp/tbemd/lib/librpcsec_gss/rpc_gss_set_defaults.3 user/imp/tbemd/lib/librpcsec_gss/rpc_gss_set_svc_name.3 user/imp/tbemd/lib/librpcsec_gss/rpc_gss_svc_max_data_length.3 user/imp/tbemd/lib/librpcsec_gss/rpcsec_gss.3 user/imp/tbemd/lib/libthr/thread/thr_condattr.c user/imp/tbemd/lib/libufs/Makefile user/imp/tbemd/lib/libufs/cgroup.c user/imp/tbemd/lib/libufs/inode.c user/imp/tbemd/lib/libufs/libufs.h user/imp/tbemd/lib/libufs/sblock.c user/imp/tbemd/lib/libufs/type.c user/imp/tbemd/lib/libusb/libusb.h user/imp/tbemd/lib/libusb/libusb10.c user/imp/tbemd/lib/libusb/libusb10_desc.c user/imp/tbemd/lib/libusb/libusb10_io.c user/imp/tbemd/lib/libusb/libusb20_compat01.c user/imp/tbemd/lib/libusbhid/data.c user/imp/tbemd/lib/libusbhid/usbhid.h user/imp/tbemd/lib/libutil/Makefile user/imp/tbemd/lib/libutil/libutil.h user/imp/tbemd/lib/libz/ChangeLog user/imp/tbemd/lib/libz/README user/imp/tbemd/lib/libz/Symbol.map user/imp/tbemd/lib/libz/crc32.c user/imp/tbemd/lib/libz/deflate.c user/imp/tbemd/lib/libz/deflate.h user/imp/tbemd/lib/libz/gzguts.h user/imp/tbemd/lib/libz/gzlib.c user/imp/tbemd/lib/libz/inffast.c user/imp/tbemd/lib/libz/inffast.h user/imp/tbemd/lib/libz/inftrees.c user/imp/tbemd/lib/libz/inftrees.h user/imp/tbemd/lib/libz/minigzip.c user/imp/tbemd/lib/libz/trees.c user/imp/tbemd/lib/libz/trees.h user/imp/tbemd/lib/libz/zconf.h user/imp/tbemd/lib/libz/zlib.3 user/imp/tbemd/lib/libz/zlib.h user/imp/tbemd/lib/libz/zutil.c user/imp/tbemd/lib/libz/zutil.h user/imp/tbemd/lib/msun/man/atan2.3 user/imp/tbemd/lib/msun/man/fenv.3 user/imp/tbemd/lib/msun/man/hypot.3 user/imp/tbemd/lib/msun/man/math.3 user/imp/tbemd/lib/msun/man/remainder.3 user/imp/tbemd/libexec/rbootd/rbootd.8 user/imp/tbemd/libexec/rpc.rquotad/Makefile user/imp/tbemd/libexec/rpc.rquotad/rquotad.c user/imp/tbemd/libexec/rtld-elf/amd64/reloc.c user/imp/tbemd/libexec/rtld-elf/arm/reloc.c user/imp/tbemd/libexec/rtld-elf/i386/reloc.c user/imp/tbemd/libexec/rtld-elf/powerpc/reloc.c user/imp/tbemd/libexec/rtld-elf/rtld.c user/imp/tbemd/libexec/rtld-elf/sparc64/reloc.c user/imp/tbemd/libexec/tftpd/Makefile user/imp/tbemd/libexec/tftpd/tftpd.8 user/imp/tbemd/libexec/tftpd/tftpd.c user/imp/tbemd/release/amd64/boot_crunch.conf user/imp/tbemd/release/doc/en_US.ISO8859-1/hardware/article.sgml user/imp/tbemd/release/doc/en_US.ISO8859-1/relnotes/article.sgml user/imp/tbemd/release/doc/share/misc/dev.archlist.txt user/imp/tbemd/release/i386/boot_crunch.conf user/imp/tbemd/release/ia64/boot_crunch.conf user/imp/tbemd/release/ia64/mkisoimages.sh user/imp/tbemd/release/pc98/boot_crunch.conf user/imp/tbemd/release/powerpc/boot_crunch.conf user/imp/tbemd/release/sparc64/boot_crunch.conf user/imp/tbemd/release/sun4v/boot_crunch.conf user/imp/tbemd/rescue/rescue/Makefile user/imp/tbemd/sbin/bsdlabel/bsdlabel.c user/imp/tbemd/sbin/camcontrol/camcontrol.8 user/imp/tbemd/sbin/camcontrol/camcontrol.c user/imp/tbemd/sbin/devd/devd.conf.5 user/imp/tbemd/sbin/dumpfs/dumpfs.c user/imp/tbemd/sbin/fsck_ffs/Makefile user/imp/tbemd/sbin/fsck_ffs/fsck.h user/imp/tbemd/sbin/fsck_ffs/gjournal.c user/imp/tbemd/sbin/fsck_ffs/main.c user/imp/tbemd/sbin/fsck_ffs/pass2.c user/imp/tbemd/sbin/fsck_ffs/pass4.c user/imp/tbemd/sbin/fsck_ffs/pass5.c user/imp/tbemd/sbin/fsck_msdosfs/fsck_msdosfs.8 user/imp/tbemd/sbin/fsdb/fsdb.c user/imp/tbemd/sbin/fsdb/fsdbutil.c user/imp/tbemd/sbin/fsirand/Makefile user/imp/tbemd/sbin/fsirand/fsirand.8 user/imp/tbemd/sbin/fsirand/fsirand.c user/imp/tbemd/sbin/geom/class/part/geom_part.c user/imp/tbemd/sbin/geom/class/part/gpart.8 user/imp/tbemd/sbin/geom/misc/subr.c user/imp/tbemd/sbin/hastctl/Makefile user/imp/tbemd/sbin/hastctl/hastctl.8 user/imp/tbemd/sbin/hastd/Makefile user/imp/tbemd/sbin/hastd/hast.conf.5 user/imp/tbemd/sbin/hastd/hast.h user/imp/tbemd/sbin/hastd/hast_proto.c user/imp/tbemd/sbin/hastd/hastd.8 user/imp/tbemd/sbin/hastd/hastd.c user/imp/tbemd/sbin/hastd/metadata.c user/imp/tbemd/sbin/hastd/parse.y user/imp/tbemd/sbin/hastd/pjdlog.c user/imp/tbemd/sbin/hastd/primary.c user/imp/tbemd/sbin/hastd/proto.c user/imp/tbemd/sbin/hastd/proto.h user/imp/tbemd/sbin/hastd/proto_common.c user/imp/tbemd/sbin/hastd/proto_tcp4.c user/imp/tbemd/sbin/hastd/secondary.c user/imp/tbemd/sbin/hastd/token.l user/imp/tbemd/sbin/ifconfig/ifconfig.8 user/imp/tbemd/sbin/ifconfig/ifieee80211.c user/imp/tbemd/sbin/ipfw/dummynet.c user/imp/tbemd/sbin/ipfw/ipfw2.c user/imp/tbemd/sbin/ipfw/ipfw2.h user/imp/tbemd/sbin/kldstat/kldstat.c user/imp/tbemd/sbin/mksnap_ffs/mksnap_ffs.8 user/imp/tbemd/sbin/mount/mount.8 user/imp/tbemd/sbin/mount_hpfs/mount_hpfs.8 user/imp/tbemd/sbin/mount_msdosfs/mount_msdosfs.8 user/imp/tbemd/sbin/mount_ntfs/mount_ntfs.8 user/imp/tbemd/sbin/mount_reiserfs/mount_reiserfs.8 user/imp/tbemd/sbin/mount_std/mount_std.8 user/imp/tbemd/sbin/ping6/ping6.8 user/imp/tbemd/sbin/ping6/ping6.c user/imp/tbemd/sbin/quotacheck/Makefile user/imp/tbemd/sbin/quotacheck/preen.c user/imp/tbemd/sbin/quotacheck/quotacheck.8 user/imp/tbemd/sbin/quotacheck/quotacheck.c user/imp/tbemd/sbin/quotacheck/quotacheck.h user/imp/tbemd/sbin/rcorder/rcorder.8 user/imp/tbemd/sbin/restore/symtab.c user/imp/tbemd/sbin/tunefs/Makefile user/imp/tbemd/sbin/tunefs/tunefs.8 user/imp/tbemd/sbin/tunefs/tunefs.c user/imp/tbemd/share/doc/legal/Makefile user/imp/tbemd/share/examples/Makefile user/imp/tbemd/share/man/Makefile user/imp/tbemd/share/man/man1/builtin.1 user/imp/tbemd/share/man/man3/Makefile user/imp/tbemd/share/man/man3/fpgetround.3 user/imp/tbemd/share/man/man3/pthread_cond_timedwait.3 user/imp/tbemd/share/man/man3/pthread_condattr.3 user/imp/tbemd/share/man/man4/Makefile user/imp/tbemd/share/man/man4/acpi.4 user/imp/tbemd/share/man/man4/ae.4 user/imp/tbemd/share/man/man4/ahb.4 user/imp/tbemd/share/man/man4/amdtemp.4 user/imp/tbemd/share/man/man4/ataraid.4 user/imp/tbemd/share/man/man4/bwn.4 user/imp/tbemd/share/man/man4/cas.4 user/imp/tbemd/share/man/man4/cmx.4 user/imp/tbemd/share/man/man4/cpuctl.4 user/imp/tbemd/share/man/man4/dcons.4 user/imp/tbemd/share/man/man4/ddb.4 user/imp/tbemd/share/man/man4/ed.4 user/imp/tbemd/share/man/man4/ef.4 user/imp/tbemd/share/man/man4/em.4 user/imp/tbemd/share/man/man4/en.4 user/imp/tbemd/share/man/man4/fpa.4 user/imp/tbemd/share/man/man4/fxp.4 user/imp/tbemd/share/man/man4/geom_fox.4 user/imp/tbemd/share/man/man4/harp.4 user/imp/tbemd/share/man/man4/hatm.4 user/imp/tbemd/share/man/man4/hifn.4 user/imp/tbemd/share/man/man4/hwpmc.4 user/imp/tbemd/share/man/man4/igb.4 user/imp/tbemd/share/man/man4/inet.4 user/imp/tbemd/share/man/man4/io.4 user/imp/tbemd/share/man/man4/iscsi_initiator.4 user/imp/tbemd/share/man/man4/kbdmux.4 user/imp/tbemd/share/man/man4/ksyms.4 user/imp/tbemd/share/man/man4/lindev.4 user/imp/tbemd/share/man/man4/malo.4 user/imp/tbemd/share/man/man4/man4.i386/cs.4 user/imp/tbemd/share/man/man4/man4.i386/ie.4 user/imp/tbemd/share/man/man4/man4.i386/mse.4 user/imp/tbemd/share/man/man4/man4.i386/pnp.4 user/imp/tbemd/share/man/man4/man4.i386/pnpbios.4 user/imp/tbemd/share/man/man4/man4.i386/vx.4 user/imp/tbemd/share/man/man4/man4.i386/wl.4 user/imp/tbemd/share/man/man4/man4.powerpc/bm.4 user/imp/tbemd/share/man/man4/man4.powerpc/snd_ai2s.4 user/imp/tbemd/share/man/man4/man4.powerpc/snd_davbus.4 user/imp/tbemd/share/man/man4/man4.sparc64/clkbrd.4 user/imp/tbemd/share/man/man4/man4.sparc64/creator.4 user/imp/tbemd/share/man/man4/man4.sparc64/machfb.4 user/imp/tbemd/share/man/man4/man4.sparc64/ofw_console.4 user/imp/tbemd/share/man/man4/man4.sparc64/openfirm.4 user/imp/tbemd/share/man/man4/man4.sparc64/openprom.4 user/imp/tbemd/share/man/man4/md.4 user/imp/tbemd/share/man/man4/mfi.4 user/imp/tbemd/share/man/man4/mpt.4 user/imp/tbemd/share/man/man4/msk.4 user/imp/tbemd/share/man/man4/natm.4 user/imp/tbemd/share/man/man4/ng_bridge.4 user/imp/tbemd/share/man/man4/ng_ccatm.4 user/imp/tbemd/share/man/man4/ng_hub.4 user/imp/tbemd/share/man/man4/nve.4 user/imp/tbemd/share/man/man4/patm.4 user/imp/tbemd/share/man/man4/psm.4 user/imp/tbemd/share/man/man4/run.4 user/imp/tbemd/share/man/man4/sbp_targ.4 user/imp/tbemd/share/man/man4/sge.4 user/imp/tbemd/share/man/man4/smp.4 user/imp/tbemd/share/man/man4/snd_emu10kx.4 user/imp/tbemd/share/man/man4/splash.4 user/imp/tbemd/share/man/man4/syscons.4 user/imp/tbemd/share/man/man4/tx.4 user/imp/tbemd/share/man/man4/u3g.4 user/imp/tbemd/share/man/man4/uath.4 user/imp/tbemd/share/man/man4/ucom.4 user/imp/tbemd/share/man/man4/uhso.4 user/imp/tbemd/share/man/man4/usb.4 user/imp/tbemd/share/man/man4/usb2_template.4 user/imp/tbemd/share/man/man4/vkbd.4 user/imp/tbemd/share/man/man4/vlan.4 user/imp/tbemd/share/man/man4/wpi.4 user/imp/tbemd/share/man/man5/a.out.5 user/imp/tbemd/share/man/man5/boot.config.5 user/imp/tbemd/share/man/man5/devfs.5 user/imp/tbemd/share/man/man5/fdescfs.5 user/imp/tbemd/share/man/man5/linsysfs.5 user/imp/tbemd/share/man/man5/make.conf.5 user/imp/tbemd/share/man/man5/rc.conf.5 user/imp/tbemd/share/man/man5/reiserfs.5 user/imp/tbemd/share/man/man5/src.conf.5 user/imp/tbemd/share/man/man5/stab.5 user/imp/tbemd/share/man/man5/xfs.5 user/imp/tbemd/share/man/man8/nanobsd.8 user/imp/tbemd/share/man/man9/BUS_DESCRIBE_INTR.9 user/imp/tbemd/share/man/man9/alq.9 user/imp/tbemd/share/man/man9/atomic.9 user/imp/tbemd/share/man/man9/cr_seeothergids.9 user/imp/tbemd/share/man/man9/cr_seeotheruids.9 user/imp/tbemd/share/man/man9/fail.9 user/imp/tbemd/share/man/man9/ieee80211.9 user/imp/tbemd/share/man/man9/ieee80211_node.9 user/imp/tbemd/share/man/man9/make_dev.9 user/imp/tbemd/share/man/man9/mbpool.9 user/imp/tbemd/share/man/man9/namei.9 user/imp/tbemd/share/man/man9/p_candebug.9 user/imp/tbemd/share/man/man9/p_cansee.9 user/imp/tbemd/share/man/man9/prison_check.9 user/imp/tbemd/share/man/man9/uio.9 user/imp/tbemd/share/man/man9/usbdi.9 user/imp/tbemd/share/man/man9/watchdog.9 user/imp/tbemd/share/misc/bsd-family-tree user/imp/tbemd/share/misc/committers-src.dot user/imp/tbemd/share/misc/mdoc.template user/imp/tbemd/share/mk/bsd.README user/imp/tbemd/share/mk/bsd.cpu.mk user/imp/tbemd/share/mk/bsd.libnames.mk user/imp/tbemd/share/mk/bsd.own.mk user/imp/tbemd/sys/amd64/acpica/acpi_wakeup.c user/imp/tbemd/sys/amd64/amd64/apic_vector.S user/imp/tbemd/sys/amd64/amd64/bpf_jit_machdep.c user/imp/tbemd/sys/amd64/amd64/bpf_jit_machdep.h user/imp/tbemd/sys/amd64/amd64/cpu_switch.S user/imp/tbemd/sys/amd64/amd64/db_interface.c user/imp/tbemd/sys/amd64/amd64/elf_machdep.c user/imp/tbemd/sys/amd64/amd64/exception.S user/imp/tbemd/sys/amd64/amd64/fpu.c user/imp/tbemd/sys/amd64/amd64/identcpu.c user/imp/tbemd/sys/amd64/amd64/io.c user/imp/tbemd/sys/amd64/amd64/machdep.c user/imp/tbemd/sys/amd64/amd64/mp_machdep.c user/imp/tbemd/sys/amd64/amd64/pmap.c user/imp/tbemd/sys/amd64/amd64/trap.c user/imp/tbemd/sys/amd64/amd64/vm_machdep.c user/imp/tbemd/sys/amd64/conf/GENERIC user/imp/tbemd/sys/amd64/ia32/ia32_reg.c user/imp/tbemd/sys/amd64/ia32/ia32_signal.c user/imp/tbemd/sys/amd64/ia32/ia32_syscall.c user/imp/tbemd/sys/amd64/include/apicreg.h user/imp/tbemd/sys/amd64/include/apicvar.h user/imp/tbemd/sys/amd64/include/atomic.h user/imp/tbemd/sys/amd64/include/clock.h user/imp/tbemd/sys/amd64/include/fpu.h user/imp/tbemd/sys/amd64/include/iodev.h user/imp/tbemd/sys/amd64/include/mca.h user/imp/tbemd/sys/amd64/include/pcb.h user/imp/tbemd/sys/amd64/include/pcpu.h user/imp/tbemd/sys/amd64/include/pmap.h user/imp/tbemd/sys/amd64/include/proc.h user/imp/tbemd/sys/amd64/include/specialreg.h user/imp/tbemd/sys/amd64/include/vmparam.h user/imp/tbemd/sys/amd64/include/xen/xenfunc.h user/imp/tbemd/sys/amd64/include/xen/xenvar.h user/imp/tbemd/sys/amd64/linux32/linux32_machdep.c user/imp/tbemd/sys/amd64/linux32/linux32_sysvec.c user/imp/tbemd/sys/arm/arm/cpufunc.c user/imp/tbemd/sys/arm/arm/cpufunc_asm_fa526.S user/imp/tbemd/sys/arm/arm/elf_machdep.c user/imp/tbemd/sys/arm/arm/elf_trampoline.c user/imp/tbemd/sys/arm/arm/identcpu.c user/imp/tbemd/sys/arm/arm/pmap.c user/imp/tbemd/sys/arm/arm/trap.c user/imp/tbemd/sys/arm/at91/if_ate.c user/imp/tbemd/sys/arm/conf/DB-78XXX user/imp/tbemd/sys/arm/conf/DB-88F5XXX user/imp/tbemd/sys/arm/conf/DB-88F6XXX user/imp/tbemd/sys/arm/conf/HL200 user/imp/tbemd/sys/arm/conf/KB920X user/imp/tbemd/sys/arm/conf/LN2410SBC user/imp/tbemd/sys/arm/conf/SHEEVAPLUG user/imp/tbemd/sys/arm/include/cpuconf.h user/imp/tbemd/sys/arm/include/cpufunc.h user/imp/tbemd/sys/arm/include/disassem.h user/imp/tbemd/sys/arm/include/md_var.h user/imp/tbemd/sys/arm/include/metadata.h user/imp/tbemd/sys/arm/include/pmap.h user/imp/tbemd/sys/arm/include/proc.h user/imp/tbemd/sys/arm/mv/files.mv user/imp/tbemd/sys/arm/xscale/ixp425/if_npe.c user/imp/tbemd/sys/boot/Makefile user/imp/tbemd/sys/boot/arm/uboot/Makefile user/imp/tbemd/sys/boot/arm/uboot/version user/imp/tbemd/sys/boot/common/module.c user/imp/tbemd/sys/boot/forth/loader.conf user/imp/tbemd/sys/boot/forth/loader.conf.5 user/imp/tbemd/sys/boot/i386/boot0/Makefile user/imp/tbemd/sys/boot/i386/btx/btx/Makefile user/imp/tbemd/sys/boot/i386/btx/btxldr/Makefile user/imp/tbemd/sys/boot/i386/cdboot/Makefile user/imp/tbemd/sys/boot/i386/mbr/Makefile user/imp/tbemd/sys/boot/i386/pmbr/Makefile user/imp/tbemd/sys/boot/i386/zfsboot/zfsboot.c user/imp/tbemd/sys/boot/pc98/boot0.5/Makefile user/imp/tbemd/sys/boot/pc98/boot0/Makefile user/imp/tbemd/sys/boot/pc98/btx/btx/Makefile user/imp/tbemd/sys/boot/pc98/btx/btxldr/Makefile user/imp/tbemd/sys/boot/pc98/cdboot/Makefile user/imp/tbemd/sys/boot/powerpc/uboot/Makefile user/imp/tbemd/sys/boot/powerpc/uboot/version user/imp/tbemd/sys/boot/sparc64/boot1/Makefile user/imp/tbemd/sys/boot/sparc64/loader/main.c user/imp/tbemd/sys/boot/uboot/common/main.c user/imp/tbemd/sys/boot/uboot/common/metadata.c user/imp/tbemd/sys/boot/uboot/lib/Makefile user/imp/tbemd/sys/boot/uboot/lib/disk.c user/imp/tbemd/sys/boot/uboot/lib/glue.c user/imp/tbemd/sys/boot/zfs/zfs.c user/imp/tbemd/sys/boot/zfs/zfsimpl.c user/imp/tbemd/sys/cam/ata/ata_da.c user/imp/tbemd/sys/cam/ata/ata_pmp.c user/imp/tbemd/sys/cam/ata/ata_xpt.c user/imp/tbemd/sys/cam/cam_ccb.h user/imp/tbemd/sys/cam/cam_debug.h user/imp/tbemd/sys/cam/cam_periph.c user/imp/tbemd/sys/cam/cam_xpt.c user/imp/tbemd/sys/cam/cam_xpt_internal.h user/imp/tbemd/sys/cam/scsi/scsi_all.c user/imp/tbemd/sys/cam/scsi/scsi_all.h user/imp/tbemd/sys/cam/scsi/scsi_cd.c user/imp/tbemd/sys/cam/scsi/scsi_ch.h user/imp/tbemd/sys/cam/scsi/scsi_da.c user/imp/tbemd/sys/cam/scsi/scsi_sg.c user/imp/tbemd/sys/cam/scsi/scsi_xpt.c user/imp/tbemd/sys/cddl/boot/zfs/zfsimpl.h user/imp/tbemd/sys/cddl/compat/opensolaris/kern/opensolaris_taskq.c user/imp/tbemd/sys/cddl/compat/opensolaris/sys/dnlc.h user/imp/tbemd/sys/cddl/compat/opensolaris/sys/sysmacros.h user/imp/tbemd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c user/imp/tbemd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c user/imp/tbemd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c user/imp/tbemd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c user/imp/tbemd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c user/imp/tbemd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c user/imp/tbemd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c user/imp/tbemd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c user/imp/tbemd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c user/imp/tbemd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c user/imp/tbemd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c user/imp/tbemd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scrub.c user/imp/tbemd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c user/imp/tbemd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c user/imp/tbemd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c user/imp/tbemd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c user/imp/tbemd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h user/imp/tbemd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h user/imp/tbemd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h user/imp/tbemd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_zfetch.h user/imp/tbemd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h user/imp/tbemd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h user/imp/tbemd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h user/imp/tbemd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h user/imp/tbemd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h user/imp/tbemd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h user/imp/tbemd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h user/imp/tbemd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h user/imp/tbemd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c user/imp/tbemd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c user/imp/tbemd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c user/imp/tbemd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c user/imp/tbemd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c user/imp/tbemd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c user/imp/tbemd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c user/imp/tbemd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c user/imp/tbemd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c user/imp/tbemd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c user/imp/tbemd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c user/imp/tbemd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c user/imp/tbemd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c user/imp/tbemd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c user/imp/tbemd/sys/cddl/dev/cyclic/i386/cyclic_machdep.c user/imp/tbemd/sys/cddl/dev/systrace/systrace.c user/imp/tbemd/sys/compat/freebsd32/freebsd32.h user/imp/tbemd/sys/compat/freebsd32/freebsd32_misc.c user/imp/tbemd/sys/compat/freebsd32/freebsd32_util.h user/imp/tbemd/sys/compat/ia32/ia32_sysvec.c user/imp/tbemd/sys/compat/ia32/ia32_util.h user/imp/tbemd/sys/compat/linux/linux_ioctl.c user/imp/tbemd/sys/compat/linux/linux_ioctl.h user/imp/tbemd/sys/compat/svr4/svr4_sysvec.c user/imp/tbemd/sys/compat/x86bios/x86bios.c user/imp/tbemd/sys/conf/NOTES user/imp/tbemd/sys/conf/files user/imp/tbemd/sys/conf/files.amd64 user/imp/tbemd/sys/conf/files.i386 user/imp/tbemd/sys/conf/files.mips user/imp/tbemd/sys/conf/files.pc98 user/imp/tbemd/sys/conf/files.powerpc user/imp/tbemd/sys/conf/files.sparc64 user/imp/tbemd/sys/conf/files.sun4v user/imp/tbemd/sys/conf/kern.pre.mk user/imp/tbemd/sys/conf/kmod.mk user/imp/tbemd/sys/conf/options user/imp/tbemd/sys/conf/options.arm user/imp/tbemd/sys/contrib/dev/acpica/acpica_prep.sh user/imp/tbemd/sys/contrib/dev/acpica/changes.txt user/imp/tbemd/sys/contrib/dev/acpica/common/adisasm.c user/imp/tbemd/sys/contrib/dev/acpica/compiler/aslcompile.c user/imp/tbemd/sys/contrib/dev/acpica/compiler/aslcompiler.h user/imp/tbemd/sys/contrib/dev/acpica/compiler/asldefine.h user/imp/tbemd/sys/contrib/dev/acpica/compiler/aslfiles.c user/imp/tbemd/sys/contrib/dev/acpica/compiler/aslglobal.h user/imp/tbemd/sys/contrib/dev/acpica/compiler/asllisting.c user/imp/tbemd/sys/contrib/dev/acpica/compiler/aslmain.c user/imp/tbemd/sys/contrib/dev/acpica/compiler/aslpredef.c user/imp/tbemd/sys/contrib/dev/acpica/compiler/aslresource.c user/imp/tbemd/sys/contrib/dev/acpica/compiler/aslrestype1.c user/imp/tbemd/sys/contrib/dev/acpica/compiler/aslrestype2.c user/imp/tbemd/sys/contrib/dev/acpica/compiler/asltypes.h user/imp/tbemd/sys/contrib/dev/acpica/debugger/dbcmds.c user/imp/tbemd/sys/contrib/dev/acpica/debugger/dbdisply.c user/imp/tbemd/sys/contrib/dev/acpica/events/evgpe.c user/imp/tbemd/sys/contrib/dev/acpica/events/evgpeblk.c user/imp/tbemd/sys/contrib/dev/acpica/executer/exconfig.c user/imp/tbemd/sys/contrib/dev/acpica/executer/exoparg1.c user/imp/tbemd/sys/contrib/dev/acpica/executer/exsystem.c user/imp/tbemd/sys/contrib/dev/acpica/include/acevents.h user/imp/tbemd/sys/contrib/dev/acpica/include/acglobal.h user/imp/tbemd/sys/contrib/dev/acpica/include/acinterp.h user/imp/tbemd/sys/contrib/dev/acpica/include/aclocal.h user/imp/tbemd/sys/contrib/dev/acpica/include/acpiosxf.h user/imp/tbemd/sys/contrib/dev/acpica/include/acpixf.h user/imp/tbemd/sys/contrib/dev/acpica/include/actypes.h user/imp/tbemd/sys/contrib/dev/acpica/include/amlresrc.h user/imp/tbemd/sys/contrib/dev/acpica/osunixxf.c user/imp/tbemd/sys/contrib/dev/acpica/tables/tbfind.c user/imp/tbemd/sys/contrib/dev/acpica/tables/tbinstal.c user/imp/tbemd/sys/contrib/dev/acpica/tables/tbutils.c user/imp/tbemd/sys/contrib/dev/acpica/tables/tbxface.c user/imp/tbemd/sys/contrib/dev/acpica/utilities/utcopy.c user/imp/tbemd/sys/contrib/dev/acpica/utilities/utglobal.c user/imp/tbemd/sys/contrib/dev/acpica/utilities/uttrack.c user/imp/tbemd/sys/contrib/dev/run/rt2870.fw.uu user/imp/tbemd/sys/contrib/ipfilter/netinet/ip_auth.c user/imp/tbemd/sys/contrib/libfdt/libfdt_env.h user/imp/tbemd/sys/crypto/via/padlock.c user/imp/tbemd/sys/crypto/via/padlock.h user/imp/tbemd/sys/crypto/via/padlock_cipher.c user/imp/tbemd/sys/crypto/via/padlock_hash.c user/imp/tbemd/sys/ddb/db_command.c user/imp/tbemd/sys/ddb/db_command.h user/imp/tbemd/sys/ddb/db_output.c user/imp/tbemd/sys/ddb/db_thread.c user/imp/tbemd/sys/ddb/ddb.h user/imp/tbemd/sys/dev/acpica/Osd/OsdHardware.c user/imp/tbemd/sys/dev/acpica/acpi.c user/imp/tbemd/sys/dev/acpica/acpi_ec.c user/imp/tbemd/sys/dev/acpica/acpi_hpet.c user/imp/tbemd/sys/dev/acpica/acpivar.h user/imp/tbemd/sys/dev/ae/if_ae.c user/imp/tbemd/sys/dev/age/if_age.c user/imp/tbemd/sys/dev/agp/agp.c user/imp/tbemd/sys/dev/agp/agp_i810.c user/imp/tbemd/sys/dev/ahci/ahci.c user/imp/tbemd/sys/dev/ahci/ahci.h user/imp/tbemd/sys/dev/alc/if_alc.c user/imp/tbemd/sys/dev/ale/if_ale.c user/imp/tbemd/sys/dev/amdsbwd/amdsbwd.c user/imp/tbemd/sys/dev/an/if_an.c user/imp/tbemd/sys/dev/ata/ata-all.c user/imp/tbemd/sys/dev/ata/ata-all.h user/imp/tbemd/sys/dev/ata/ata-disk.c user/imp/tbemd/sys/dev/ata/ata-lowlevel.c user/imp/tbemd/sys/dev/ata/ata-pci.c user/imp/tbemd/sys/dev/ata/ata-pci.h user/imp/tbemd/sys/dev/ata/ata-queue.c user/imp/tbemd/sys/dev/ata/atapi-cam.c user/imp/tbemd/sys/dev/ata/chipsets/ata-acerlabs.c user/imp/tbemd/sys/dev/ata/chipsets/ata-intel.c user/imp/tbemd/sys/dev/ata/chipsets/ata-serverworks.c user/imp/tbemd/sys/dev/ath/ath_hal/ah.h user/imp/tbemd/sys/dev/ath/ath_hal/ah_eeprom_v1.c user/imp/tbemd/sys/dev/ath/ath_hal/ah_eeprom_v4k.c user/imp/tbemd/sys/dev/ath/ath_hal/ah_eeprom_v4k.h user/imp/tbemd/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c user/imp/tbemd/sys/dev/ath/ath_hal/ar5211/ar5211_reset.c user/imp/tbemd/sys/dev/ath/ath_hal/ar5212/ar5212_reset.c user/imp/tbemd/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c user/imp/tbemd/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c user/imp/tbemd/sys/dev/ath/ath_hal/ar5416/ar5416phy.h user/imp/tbemd/sys/dev/ath/ath_hal/ar5416/ar5416reg.h user/imp/tbemd/sys/dev/ath/ath_hal/ar5416/ar9285_attach.c user/imp/tbemd/sys/dev/ath/ath_hal/ar5416/ar9285_reset.c user/imp/tbemd/sys/dev/ath/if_ath.c user/imp/tbemd/sys/dev/atkbdc/atkbdc.c user/imp/tbemd/sys/dev/atkbdc/atkbdc_ebus.c user/imp/tbemd/sys/dev/atkbdc/atkbdc_isa.c user/imp/tbemd/sys/dev/atkbdc/atkbdcreg.h user/imp/tbemd/sys/dev/bce/if_bce.c user/imp/tbemd/sys/dev/bce/if_bcereg.h user/imp/tbemd/sys/dev/bge/if_bge.c user/imp/tbemd/sys/dev/bge/if_bgereg.h user/imp/tbemd/sys/dev/bwi/if_bwi.c user/imp/tbemd/sys/dev/bwn/if_bwn.c user/imp/tbemd/sys/dev/cas/if_cas.c user/imp/tbemd/sys/dev/cas/if_casreg.h user/imp/tbemd/sys/dev/ce/if_ce.c user/imp/tbemd/sys/dev/ciss/ciss.c user/imp/tbemd/sys/dev/cm/smc90cx6.c user/imp/tbemd/sys/dev/cp/if_cp.c user/imp/tbemd/sys/dev/cs/if_cs.c user/imp/tbemd/sys/dev/ctau/if_ct.c user/imp/tbemd/sys/dev/cx/if_cx.c user/imp/tbemd/sys/dev/cxgb/cxgb_adapter.h user/imp/tbemd/sys/dev/cxgb/cxgb_ioctl.h user/imp/tbemd/sys/dev/cxgb/cxgb_main.c user/imp/tbemd/sys/dev/cxgb/cxgb_sge.c user/imp/tbemd/sys/dev/cxgb/sys/mvec.h user/imp/tbemd/sys/dev/cxgb/sys/uipc_mvec.c user/imp/tbemd/sys/dev/drm/ati_pcigart.c user/imp/tbemd/sys/dev/drm/drmP.h user/imp/tbemd/sys/dev/drm/drm_bufs.c user/imp/tbemd/sys/dev/drm/drm_context.c user/imp/tbemd/sys/dev/drm/drm_drv.c user/imp/tbemd/sys/dev/drm/drm_hashtab.c user/imp/tbemd/sys/dev/drm/drm_memory.c user/imp/tbemd/sys/dev/drm/drm_mm.c user/imp/tbemd/sys/dev/drm/drm_scatter.c user/imp/tbemd/sys/dev/drm/drm_sman.c user/imp/tbemd/sys/dev/drm/drm_sysctl.c user/imp/tbemd/sys/dev/drm/drm_vm.c user/imp/tbemd/sys/dev/drm/i915_dma.c user/imp/tbemd/sys/dev/drm/mach64_dma.c user/imp/tbemd/sys/dev/drm/mga_dma.c user/imp/tbemd/sys/dev/drm/mga_warp.c user/imp/tbemd/sys/dev/drm/r128_cce.c user/imp/tbemd/sys/dev/drm/r128_state.c user/imp/tbemd/sys/dev/drm/r600_blit.c user/imp/tbemd/sys/dev/drm/r600_cp.c user/imp/tbemd/sys/dev/drm/radeon_cp.c user/imp/tbemd/sys/dev/drm/radeon_cs.c user/imp/tbemd/sys/dev/drm/radeon_state.c user/imp/tbemd/sys/dev/drm/savage_bci.c user/imp/tbemd/sys/dev/drm/via_dma.c user/imp/tbemd/sys/dev/drm/via_dmablit.c user/imp/tbemd/sys/dev/drm/via_map.c user/imp/tbemd/sys/dev/drm/via_mm.c user/imp/tbemd/sys/dev/drm/via_video.c user/imp/tbemd/sys/dev/e1000/if_em.c user/imp/tbemd/sys/dev/e1000/if_igb.c user/imp/tbemd/sys/dev/e1000/if_lem.c user/imp/tbemd/sys/dev/ed/if_ed.c user/imp/tbemd/sys/dev/ep/if_ep.c user/imp/tbemd/sys/dev/esp/esp_sbus.c user/imp/tbemd/sys/dev/ex/if_ex.c user/imp/tbemd/sys/dev/fb/vesa.c user/imp/tbemd/sys/dev/fdc/fdc_acpi.c user/imp/tbemd/sys/dev/fe/if_fe.c user/imp/tbemd/sys/dev/fxp/if_fxp.c user/imp/tbemd/sys/dev/fxp/if_fxpreg.h user/imp/tbemd/sys/dev/fxp/if_fxpvar.h user/imp/tbemd/sys/dev/hwpmc/hwpmc_mod.c user/imp/tbemd/sys/dev/ie/if_ie.c user/imp/tbemd/sys/dev/iicbus/if_ic.c user/imp/tbemd/sys/dev/iicbus/iic.h user/imp/tbemd/sys/dev/io/iodev.c user/imp/tbemd/sys/dev/ipw/if_ipw.c user/imp/tbemd/sys/dev/ipw/if_ipwvar.h user/imp/tbemd/sys/dev/isp/isp.c user/imp/tbemd/sys/dev/isp/isp_freebsd.c user/imp/tbemd/sys/dev/isp/isp_library.c user/imp/tbemd/sys/dev/isp/isp_pci.c user/imp/tbemd/sys/dev/isp/isp_sbus.c user/imp/tbemd/sys/dev/isp/ispvar.h user/imp/tbemd/sys/dev/iwi/if_iwi.c user/imp/tbemd/sys/dev/iwn/if_iwn.c user/imp/tbemd/sys/dev/ixgbe/ixgbe.c user/imp/tbemd/sys/dev/ixgbe/ixgbe.h user/imp/tbemd/sys/dev/le/lance.c user/imp/tbemd/sys/dev/malo/if_malo.c user/imp/tbemd/sys/dev/md/md.c user/imp/tbemd/sys/dev/mii/brgphy.c user/imp/tbemd/sys/dev/mii/e1000phy.c user/imp/tbemd/sys/dev/mii/miidevs user/imp/tbemd/sys/dev/mmc/mmc.c user/imp/tbemd/sys/dev/mpt/mpt.c user/imp/tbemd/sys/dev/mpt/mpt.h user/imp/tbemd/sys/dev/mpt/mpt_cam.c user/imp/tbemd/sys/dev/mpt/mpt_pci.c user/imp/tbemd/sys/dev/msk/if_msk.c user/imp/tbemd/sys/dev/msk/if_mskreg.h user/imp/tbemd/sys/dev/mwl/if_mwl.c user/imp/tbemd/sys/dev/mxge/eth_z8e.h user/imp/tbemd/sys/dev/mxge/ethp_z8e.h user/imp/tbemd/sys/dev/mxge/if_mxge.c user/imp/tbemd/sys/dev/mxge/rss_eth_z8e.h user/imp/tbemd/sys/dev/mxge/rss_ethp_z8e.h user/imp/tbemd/sys/dev/my/if_my.c user/imp/tbemd/sys/dev/nfe/if_nfe.c user/imp/tbemd/sys/dev/nxge/if_nxge.c user/imp/tbemd/sys/dev/ofw/ofw_bus_subr.c user/imp/tbemd/sys/dev/ofw/ofw_bus_subr.h user/imp/tbemd/sys/dev/ofw/ofw_if.m user/imp/tbemd/sys/dev/ofw/ofw_standard.c user/imp/tbemd/sys/dev/ofw/openfirm.c user/imp/tbemd/sys/dev/ofw/openfirm.h user/imp/tbemd/sys/dev/pci/pci.c user/imp/tbemd/sys/dev/pdq/pdq_ifsubr.c user/imp/tbemd/sys/dev/ppbus/if_plip.c user/imp/tbemd/sys/dev/puc/pucdata.c user/imp/tbemd/sys/dev/quicc/quicc_bfe.h user/imp/tbemd/sys/dev/ral/rt2560.c user/imp/tbemd/sys/dev/ral/rt2661.c user/imp/tbemd/sys/dev/random/nehemiah.c user/imp/tbemd/sys/dev/re/if_re.c user/imp/tbemd/sys/dev/sbni/if_sbni.c user/imp/tbemd/sys/dev/sge/if_sge.c user/imp/tbemd/sys/dev/sge/if_sgereg.h user/imp/tbemd/sys/dev/siis/siis.c user/imp/tbemd/sys/dev/siis/siis.h user/imp/tbemd/sys/dev/sis/if_sis.c user/imp/tbemd/sys/dev/smc/if_smc.c user/imp/tbemd/sys/dev/sn/if_sn.c user/imp/tbemd/sys/dev/snc/dp83932.c user/imp/tbemd/sys/dev/sound/pci/hda/hdac.c user/imp/tbemd/sys/dev/sound/pcm/buffer.c user/imp/tbemd/sys/dev/sound/pcm/buffer.h user/imp/tbemd/sys/dev/sound/usb/uaudio.c user/imp/tbemd/sys/dev/sym/sym_hipd.c user/imp/tbemd/sys/dev/syscons/syscons.c user/imp/tbemd/sys/dev/syscons/syscons.h user/imp/tbemd/sys/dev/ti/if_ti.c user/imp/tbemd/sys/dev/twa/tw_cl.h user/imp/tbemd/sys/dev/twa/tw_cl_fwif.h user/imp/tbemd/sys/dev/twa/tw_cl_init.c user/imp/tbemd/sys/dev/twa/tw_cl_intr.c user/imp/tbemd/sys/dev/twa/tw_cl_io.c user/imp/tbemd/sys/dev/twa/tw_cl_misc.c user/imp/tbemd/sys/dev/twa/tw_cl_share.h user/imp/tbemd/sys/dev/twa/tw_osl.h user/imp/tbemd/sys/dev/twa/tw_osl_cam.c user/imp/tbemd/sys/dev/twa/tw_osl_externs.h user/imp/tbemd/sys/dev/twa/tw_osl_freebsd.c user/imp/tbemd/sys/dev/twa/tw_osl_inline.h user/imp/tbemd/sys/dev/twa/tw_osl_share.h user/imp/tbemd/sys/dev/uart/uart_dev_ns8250.c user/imp/tbemd/sys/dev/usb/controller/ehci.c user/imp/tbemd/sys/dev/usb/controller/uhci.c user/imp/tbemd/sys/dev/usb/controller/usb_controller.c user/imp/tbemd/sys/dev/usb/controller/uss820dci.c user/imp/tbemd/sys/dev/usb/input/atp.c user/imp/tbemd/sys/dev/usb/input/uhid.c user/imp/tbemd/sys/dev/usb/input/ukbd.c user/imp/tbemd/sys/dev/usb/input/ums.c user/imp/tbemd/sys/dev/usb/misc/udbp.c user/imp/tbemd/sys/dev/usb/net/if_aue.c user/imp/tbemd/sys/dev/usb/net/if_axe.c user/imp/tbemd/sys/dev/usb/net/if_cdce.c user/imp/tbemd/sys/dev/usb/net/if_cue.c user/imp/tbemd/sys/dev/usb/net/if_kue.c user/imp/tbemd/sys/dev/usb/net/if_rue.c user/imp/tbemd/sys/dev/usb/net/if_udav.c user/imp/tbemd/sys/dev/usb/net/uhso.c user/imp/tbemd/sys/dev/usb/net/usb_ethernet.c user/imp/tbemd/sys/dev/usb/quirk/usb_quirk.c user/imp/tbemd/sys/dev/usb/serial/u3g.c user/imp/tbemd/sys/dev/usb/serial/ubsa.c user/imp/tbemd/sys/dev/usb/serial/ubser.c user/imp/tbemd/sys/dev/usb/serial/uchcom.c user/imp/tbemd/sys/dev/usb/serial/uftdi.c user/imp/tbemd/sys/dev/usb/serial/ulpt.c user/imp/tbemd/sys/dev/usb/serial/umodem.c user/imp/tbemd/sys/dev/usb/serial/umoscom.c user/imp/tbemd/sys/dev/usb/serial/uplcom.c user/imp/tbemd/sys/dev/usb/serial/usb_serial.c user/imp/tbemd/sys/dev/usb/serial/uslcom.c user/imp/tbemd/sys/dev/usb/serial/uvisor.c user/imp/tbemd/sys/dev/usb/serial/uvscom.c user/imp/tbemd/sys/dev/usb/storage/umass.c user/imp/tbemd/sys/dev/usb/storage/urio.c user/imp/tbemd/sys/dev/usb/storage/ustorage_fs.c user/imp/tbemd/sys/dev/usb/usb_compat_linux.c user/imp/tbemd/sys/dev/usb/usb_debug.h user/imp/tbemd/sys/dev/usb/usb_dev.c user/imp/tbemd/sys/dev/usb/usb_device.c user/imp/tbemd/sys/dev/usb/usb_device.h user/imp/tbemd/sys/dev/usb/usb_freebsd.h user/imp/tbemd/sys/dev/usb/usb_generic.c user/imp/tbemd/sys/dev/usb/usb_hid.c user/imp/tbemd/sys/dev/usb/usb_hub.c user/imp/tbemd/sys/dev/usb/usb_request.c user/imp/tbemd/sys/dev/usb/usb_transfer.c user/imp/tbemd/sys/dev/usb/usb_transfer.h user/imp/tbemd/sys/dev/usb/usbdevs user/imp/tbemd/sys/dev/usb/usbhid.h user/imp/tbemd/sys/dev/usb/wlan/if_rum.c user/imp/tbemd/sys/dev/usb/wlan/if_run.c user/imp/tbemd/sys/dev/usb/wlan/if_runreg.h user/imp/tbemd/sys/dev/usb/wlan/if_runvar.h user/imp/tbemd/sys/dev/usb/wlan/if_uath.c user/imp/tbemd/sys/dev/usb/wlan/if_upgt.c user/imp/tbemd/sys/dev/usb/wlan/if_ural.c user/imp/tbemd/sys/dev/usb/wlan/if_urtw.c user/imp/tbemd/sys/dev/usb/wlan/if_zyd.c user/imp/tbemd/sys/dev/vx/if_vx.c user/imp/tbemd/sys/dev/wi/if_wi.c user/imp/tbemd/sys/dev/wl/if_wl.c user/imp/tbemd/sys/dev/wpi/if_wpi.c user/imp/tbemd/sys/dev/xe/if_xe.c user/imp/tbemd/sys/dev/xen/netfront/netfront.c user/imp/tbemd/sys/fs/devfs/devfs.h user/imp/tbemd/sys/fs/devfs/devfs_devs.c user/imp/tbemd/sys/fs/devfs/devfs_int.h user/imp/tbemd/sys/fs/devfs/devfs_vnops.c user/imp/tbemd/sys/fs/ext2fs/ext2_readwrite.c user/imp/tbemd/sys/fs/ext2fs/ext2_vnops.c user/imp/tbemd/sys/fs/msdosfs/msdosfs_vnops.c user/imp/tbemd/sys/fs/nfs/nfs_commonkrpc.c user/imp/tbemd/sys/fs/nfs/nfs_commonport.c user/imp/tbemd/sys/fs/nfs/nfs_var.h user/imp/tbemd/sys/fs/nfs/nfsclstate.h user/imp/tbemd/sys/fs/nfs/nfskpiport.h user/imp/tbemd/sys/fs/nfs/nfsport.h user/imp/tbemd/sys/fs/nfsclient/nfs.h user/imp/tbemd/sys/fs/nfsclient/nfs_clbio.c user/imp/tbemd/sys/fs/nfsclient/nfs_clnfsiod.c user/imp/tbemd/sys/fs/nfsclient/nfs_clnode.c user/imp/tbemd/sys/fs/nfsclient/nfs_clport.c user/imp/tbemd/sys/fs/nfsclient/nfs_clrpcops.c user/imp/tbemd/sys/fs/nfsclient/nfs_clstate.c user/imp/tbemd/sys/fs/nfsclient/nfs_clsubs.c user/imp/tbemd/sys/fs/nfsclient/nfs_clvfsops.c user/imp/tbemd/sys/fs/nfsclient/nfs_clvnops.c user/imp/tbemd/sys/fs/nfsserver/nfs_nfsdstate.c user/imp/tbemd/sys/fs/nullfs/null_vnops.c user/imp/tbemd/sys/fs/nwfs/nwfs_io.c user/imp/tbemd/sys/fs/procfs/procfs_ctl.c user/imp/tbemd/sys/fs/pseudofs/pseudofs_vnops.c user/imp/tbemd/sys/fs/smbfs/smbfs_io.c user/imp/tbemd/sys/fs/tmpfs/tmpfs_vnops.c user/imp/tbemd/sys/fs/udf/udf_vnops.c user/imp/tbemd/sys/geom/geom.h user/imp/tbemd/sys/geom/geom_event.c user/imp/tbemd/sys/geom/geom_io.c user/imp/tbemd/sys/geom/geom_subr.c user/imp/tbemd/sys/geom/label/g_label.c user/imp/tbemd/sys/geom/mountver/g_mountver.c user/imp/tbemd/sys/geom/multipath/g_multipath.c user/imp/tbemd/sys/geom/part/g_part.c user/imp/tbemd/sys/geom/part/g_part_apm.c user/imp/tbemd/sys/geom/part/g_part_bsd.c user/imp/tbemd/sys/geom/part/g_part_gpt.c user/imp/tbemd/sys/geom/part/g_part_if.m user/imp/tbemd/sys/geom/part/g_part_mbr.c user/imp/tbemd/sys/geom/part/g_part_pc98.c user/imp/tbemd/sys/geom/part/g_part_vtoc8.c user/imp/tbemd/sys/geom/vinum/geom_vinum.c user/imp/tbemd/sys/geom/vinum/geom_vinum.h user/imp/tbemd/sys/geom/vinum/geom_vinum_events.c user/imp/tbemd/sys/geom/vinum/geom_vinum_var.h user/imp/tbemd/sys/geom/zero/g_zero.c user/imp/tbemd/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c user/imp/tbemd/sys/i386/conf/GENERIC user/imp/tbemd/sys/i386/conf/XBOX user/imp/tbemd/sys/i386/i386/apic_vector.s user/imp/tbemd/sys/i386/i386/bpf_jit_machdep.c user/imp/tbemd/sys/i386/i386/bpf_jit_machdep.h user/imp/tbemd/sys/i386/i386/elf_machdep.c user/imp/tbemd/sys/i386/i386/geode.c user/imp/tbemd/sys/i386/i386/identcpu.c user/imp/tbemd/sys/i386/i386/io.c user/imp/tbemd/sys/i386/i386/machdep.c user/imp/tbemd/sys/i386/i386/mp_machdep.c user/imp/tbemd/sys/i386/i386/pmap.c user/imp/tbemd/sys/i386/i386/ptrace_machdep.c user/imp/tbemd/sys/i386/i386/swtch.s user/imp/tbemd/sys/i386/i386/trap.c user/imp/tbemd/sys/i386/i386/vm_machdep.c user/imp/tbemd/sys/i386/ibcs2/ibcs2_sysvec.c user/imp/tbemd/sys/i386/include/apicreg.h user/imp/tbemd/sys/i386/include/apicvar.h user/imp/tbemd/sys/i386/include/atomic.h user/imp/tbemd/sys/i386/include/clock.h user/imp/tbemd/sys/i386/include/iodev.h user/imp/tbemd/sys/i386/include/mca.h user/imp/tbemd/sys/i386/include/npx.h user/imp/tbemd/sys/i386/include/pcb.h user/imp/tbemd/sys/i386/include/pcpu.h user/imp/tbemd/sys/i386/include/pmap.h user/imp/tbemd/sys/i386/include/proc.h user/imp/tbemd/sys/i386/include/specialreg.h user/imp/tbemd/sys/i386/include/xen/xenfunc.h user/imp/tbemd/sys/i386/include/xen/xenvar.h user/imp/tbemd/sys/i386/isa/npx.c user/imp/tbemd/sys/i386/linux/linux_machdep.c user/imp/tbemd/sys/i386/linux/linux_ptrace.c user/imp/tbemd/sys/i386/linux/linux_sysvec.c user/imp/tbemd/sys/i386/xen/pmap.c user/imp/tbemd/sys/ia64/conf/GENERIC user/imp/tbemd/sys/ia64/ia32/ia32_trap.c user/imp/tbemd/sys/ia64/ia64/db_machdep.c user/imp/tbemd/sys/ia64/ia64/elf_machdep.c user/imp/tbemd/sys/ia64/ia64/iodev_machdep.c user/imp/tbemd/sys/ia64/ia64/pmap.c user/imp/tbemd/sys/ia64/ia64/trap.c user/imp/tbemd/sys/ia64/include/ia64_cpu.h user/imp/tbemd/sys/ia64/include/iodev.h user/imp/tbemd/sys/ia64/include/pmap.h user/imp/tbemd/sys/ia64/include/proc.h user/imp/tbemd/sys/ia64/include/runq.h user/imp/tbemd/sys/ia64/include/sal.h user/imp/tbemd/sys/ia64/include/vmparam.h user/imp/tbemd/sys/isa/syscons_isa.c user/imp/tbemd/sys/kern/imgact_aout.c user/imp/tbemd/sys/kern/imgact_elf.c user/imp/tbemd/sys/kern/init_main.c user/imp/tbemd/sys/kern/kern_alq.c user/imp/tbemd/sys/kern/kern_clock.c user/imp/tbemd/sys/kern/kern_conf.c user/imp/tbemd/sys/kern/kern_descrip.c user/imp/tbemd/sys/kern/kern_exec.c user/imp/tbemd/sys/kern/kern_gzio.c user/imp/tbemd/sys/kern/kern_intr.c user/imp/tbemd/sys/kern/kern_jail.c user/imp/tbemd/sys/kern/kern_kthread.c user/imp/tbemd/sys/kern/kern_mutex.c user/imp/tbemd/sys/kern/kern_ntptime.c user/imp/tbemd/sys/kern/kern_proc.c user/imp/tbemd/sys/kern/kern_resource.c user/imp/tbemd/sys/kern/kern_shutdown.c user/imp/tbemd/sys/kern/kern_sig.c user/imp/tbemd/sys/kern/kern_sx.c user/imp/tbemd/sys/kern/kern_thread.c user/imp/tbemd/sys/kern/posix4_mib.c user/imp/tbemd/sys/kern/sched_4bsd.c user/imp/tbemd/sys/kern/sched_ule.c user/imp/tbemd/sys/kern/subr_acl_nfs4.c user/imp/tbemd/sys/kern/subr_acl_posix1e.c user/imp/tbemd/sys/kern/subr_bufring.c user/imp/tbemd/sys/kern/subr_bus.c user/imp/tbemd/sys/kern/subr_pcpu.c user/imp/tbemd/sys/kern/subr_smp.c user/imp/tbemd/sys/kern/subr_trap.c user/imp/tbemd/sys/kern/subr_uio.c user/imp/tbemd/sys/kern/subr_witness.c user/imp/tbemd/sys/kern/sys_generic.c user/imp/tbemd/sys/kern/sys_pipe.c user/imp/tbemd/sys/kern/sys_process.c user/imp/tbemd/sys/kern/uipc_cow.c user/imp/tbemd/sys/kern/uipc_mbuf.c user/imp/tbemd/sys/kern/uipc_sem.c user/imp/tbemd/sys/kern/uipc_shm.c user/imp/tbemd/sys/kern/uipc_socket.c user/imp/tbemd/sys/kern/uipc_syscalls.c user/imp/tbemd/sys/kern/vfs_acl.c user/imp/tbemd/sys/kern/vfs_bio.c user/imp/tbemd/sys/kern/vfs_cache.c user/imp/tbemd/sys/kern/vfs_default.c user/imp/tbemd/sys/kern/vfs_subr.c user/imp/tbemd/sys/kern/vfs_vnops.c user/imp/tbemd/sys/kern/vnode_if.src user/imp/tbemd/sys/mips/adm5120/if_admsw.c user/imp/tbemd/sys/mips/atheros/if_arge.c user/imp/tbemd/sys/mips/cavium/asm_octeon.S user/imp/tbemd/sys/mips/cavium/dev/rgmii/octeon_fau.h user/imp/tbemd/sys/mips/cavium/dev/rgmii/octeon_rgmx.c user/imp/tbemd/sys/mips/cavium/files.octeon1 user/imp/tbemd/sys/mips/cavium/octeon_machdep.c user/imp/tbemd/sys/mips/cavium/octeon_pcmap_regs.h user/imp/tbemd/sys/mips/cavium/uart_dev_oct16550.c user/imp/tbemd/sys/mips/conf/AR71XX user/imp/tbemd/sys/mips/conf/SENTRY5 user/imp/tbemd/sys/mips/conf/SWARM user/imp/tbemd/sys/mips/conf/XLR user/imp/tbemd/sys/mips/include/_inttypes.h user/imp/tbemd/sys/mips/include/_limits.h user/imp/tbemd/sys/mips/include/asm.h user/imp/tbemd/sys/mips/include/cpu.h user/imp/tbemd/sys/mips/include/cpufunc.h user/imp/tbemd/sys/mips/include/cpuregs.h user/imp/tbemd/sys/mips/include/db_machdep.h user/imp/tbemd/sys/mips/include/hwfunc.h user/imp/tbemd/sys/mips/include/locore.h user/imp/tbemd/sys/mips/include/param.h user/imp/tbemd/sys/mips/include/pcb.h user/imp/tbemd/sys/mips/include/pmap.h user/imp/tbemd/sys/mips/include/proc.h user/imp/tbemd/sys/mips/include/profile.h user/imp/tbemd/sys/mips/include/pte.h user/imp/tbemd/sys/mips/include/regnum.h user/imp/tbemd/sys/mips/include/sf_buf.h user/imp/tbemd/sys/mips/include/smp.h user/imp/tbemd/sys/mips/include/trap.h user/imp/tbemd/sys/mips/include/vmparam.h user/imp/tbemd/sys/mips/malta/gt_pci.c user/imp/tbemd/sys/mips/mips/autoconf.c user/imp/tbemd/sys/mips/mips/cpu.c user/imp/tbemd/sys/mips/mips/db_trace.c user/imp/tbemd/sys/mips/mips/elf64_machdep.c user/imp/tbemd/sys/mips/mips/elf_machdep.c user/imp/tbemd/sys/mips/mips/exception.S user/imp/tbemd/sys/mips/mips/fp.S user/imp/tbemd/sys/mips/mips/genassym.c user/imp/tbemd/sys/mips/mips/locore.S user/imp/tbemd/sys/mips/mips/machdep.c user/imp/tbemd/sys/mips/mips/mem.c user/imp/tbemd/sys/mips/mips/mp_machdep.c user/imp/tbemd/sys/mips/mips/mpboot.S user/imp/tbemd/sys/mips/mips/nexus.c user/imp/tbemd/sys/mips/mips/pmap.c user/imp/tbemd/sys/mips/mips/psraccess.S user/imp/tbemd/sys/mips/mips/support.S user/imp/tbemd/sys/mips/mips/swtch.S user/imp/tbemd/sys/mips/mips/tick.c user/imp/tbemd/sys/mips/mips/tlb.S user/imp/tbemd/sys/mips/mips/trap.c user/imp/tbemd/sys/mips/mips/uio_machdep.c user/imp/tbemd/sys/mips/mips/vm_machdep.c user/imp/tbemd/sys/mips/rmi/clock.c user/imp/tbemd/sys/mips/rmi/dev/xlr/rge.c user/imp/tbemd/sys/mips/rmi/files.xlr user/imp/tbemd/sys/mips/rmi/interrupt.h user/imp/tbemd/sys/mips/rmi/intr_machdep.c user/imp/tbemd/sys/mips/rmi/iodi.c user/imp/tbemd/sys/mips/rmi/on_chip.c user/imp/tbemd/sys/mips/rmi/pic.h user/imp/tbemd/sys/mips/rmi/xlr_machdep.c user/imp/tbemd/sys/mips/rmi/xlr_pci.c user/imp/tbemd/sys/mips/rmi/xlrconfig.h user/imp/tbemd/sys/mips/sibyte/sb_machdep.c user/imp/tbemd/sys/modules/Makefile user/imp/tbemd/sys/modules/acpi/acpi/Makefile user/imp/tbemd/sys/modules/ata/atadisk/Makefile user/imp/tbemd/sys/modules/cam/Makefile user/imp/tbemd/sys/modules/cas/Makefile user/imp/tbemd/sys/modules/cyclic/Makefile user/imp/tbemd/sys/modules/iwnfw/Makefile.inc user/imp/tbemd/sys/modules/linux/Makefile user/imp/tbemd/sys/modules/netgraph/Makefile user/imp/tbemd/sys/modules/uart/Makefile user/imp/tbemd/sys/modules/usb/usb/Makefile user/imp/tbemd/sys/modules/zfs/Makefile user/imp/tbemd/sys/net/bpf.c user/imp/tbemd/sys/net/bpf_zerocopy.c user/imp/tbemd/sys/net/bpfdesc.h user/imp/tbemd/sys/net/flowtable.c user/imp/tbemd/sys/net/flowtable.h user/imp/tbemd/sys/net/if.c user/imp/tbemd/sys/net/if_ef.c user/imp/tbemd/sys/net/if_gif.c user/imp/tbemd/sys/net/if_gif.h user/imp/tbemd/sys/net/if_gre.c user/imp/tbemd/sys/net/if_stf.c user/imp/tbemd/sys/net/if_var.h user/imp/tbemd/sys/net/if_vlan.c user/imp/tbemd/sys/net/route.c user/imp/tbemd/sys/net/rtsock.c user/imp/tbemd/sys/net/vnet.c user/imp/tbemd/sys/net/vnet.h user/imp/tbemd/sys/net80211/ieee80211.c user/imp/tbemd/sys/net80211/ieee80211_amrr.c user/imp/tbemd/sys/net80211/ieee80211_ht.h user/imp/tbemd/sys/net80211/ieee80211_hwmp.c user/imp/tbemd/sys/net80211/ieee80211_ioctl.c user/imp/tbemd/sys/net80211/ieee80211_node.c user/imp/tbemd/sys/net80211/ieee80211_rssadapt.c user/imp/tbemd/sys/net80211/ieee80211_scan_sta.c user/imp/tbemd/sys/net80211/ieee80211_var.h user/imp/tbemd/sys/netgraph/ng_base.c user/imp/tbemd/sys/netgraph/ng_bridge.c user/imp/tbemd/sys/netgraph/ng_bridge.h user/imp/tbemd/sys/netgraph/ng_eiface.c user/imp/tbemd/sys/netgraph/ng_fec.c user/imp/tbemd/sys/netgraph/ng_hub.c user/imp/tbemd/sys/netgraph/ng_hub.h user/imp/tbemd/sys/netgraph/ng_iface.c user/imp/tbemd/sys/netgraph/ng_ksocket.c user/imp/tbemd/sys/netgraph/ng_pipe.c user/imp/tbemd/sys/netgraph/ng_pppoe.c user/imp/tbemd/sys/netgraph/ng_socket.c user/imp/tbemd/sys/netgraph/ng_tty.c user/imp/tbemd/sys/netinet/icmp6.h user/imp/tbemd/sys/netinet/if_ether.c user/imp/tbemd/sys/netinet/igmp.c user/imp/tbemd/sys/netinet/in.c user/imp/tbemd/sys/netinet/in_gif.c user/imp/tbemd/sys/netinet/in_pcb.c user/imp/tbemd/sys/netinet/in_proto.c user/imp/tbemd/sys/netinet/in_rmx.c user/imp/tbemd/sys/netinet/ip_dummynet.h user/imp/tbemd/sys/netinet/ip_icmp.c user/imp/tbemd/sys/netinet/ip_icmp.h user/imp/tbemd/sys/netinet/ip_input.c user/imp/tbemd/sys/netinet/ip_mroute.c user/imp/tbemd/sys/netinet/ip_mroute.h user/imp/tbemd/sys/netinet/ip_options.c user/imp/tbemd/sys/netinet/ip_output.c user/imp/tbemd/sys/netinet/ip_var.h user/imp/tbemd/sys/netinet/ipfw/dn_sched.h user/imp/tbemd/sys/netinet/ipfw/dn_sched_rr.c user/imp/tbemd/sys/netinet/ipfw/dn_sched_wf2q.c user/imp/tbemd/sys/netinet/ipfw/ip_dn_private.h user/imp/tbemd/sys/netinet/ipfw/ip_dummynet.c user/imp/tbemd/sys/netinet/ipfw/ip_fw_pfil.c user/imp/tbemd/sys/netinet/ipfw/ip_fw_private.h user/imp/tbemd/sys/netinet/pim_var.h user/imp/tbemd/sys/netinet/raw_ip.c user/imp/tbemd/sys/netinet/sctp_asconf.c user/imp/tbemd/sys/netinet/sctp_auth.c user/imp/tbemd/sys/netinet/sctp_bsd_addr.c user/imp/tbemd/sys/netinet/sctp_bsd_addr.h user/imp/tbemd/sys/netinet/sctp_constants.h user/imp/tbemd/sys/netinet/sctp_indata.c user/imp/tbemd/sys/netinet/sctp_input.c user/imp/tbemd/sys/netinet/sctp_lock_bsd.h user/imp/tbemd/sys/netinet/sctp_output.c user/imp/tbemd/sys/netinet/sctp_pcb.c user/imp/tbemd/sys/netinet/sctp_pcb.h user/imp/tbemd/sys/netinet/sctp_structs.h user/imp/tbemd/sys/netinet/sctp_sysctl.c user/imp/tbemd/sys/netinet/sctp_timer.c user/imp/tbemd/sys/netinet/sctp_usrreq.c user/imp/tbemd/sys/netinet/sctputil.c user/imp/tbemd/sys/netinet/tcp_hostcache.c user/imp/tbemd/sys/netinet/tcp_input.c user/imp/tbemd/sys/netinet/tcp_output.c user/imp/tbemd/sys/netinet/tcp_reass.c user/imp/tbemd/sys/netinet/tcp_sack.c user/imp/tbemd/sys/netinet/tcp_subr.c user/imp/tbemd/sys/netinet/tcp_syncache.c user/imp/tbemd/sys/netinet/tcp_timewait.c user/imp/tbemd/sys/netinet/tcp_var.h user/imp/tbemd/sys/netinet/udp_usrreq.c user/imp/tbemd/sys/netinet/udp_var.h user/imp/tbemd/sys/netinet6/frag6.c user/imp/tbemd/sys/netinet6/icmp6.c user/imp/tbemd/sys/netinet6/in6.c user/imp/tbemd/sys/netinet6/in6_gif.c user/imp/tbemd/sys/netinet6/in6_ifattach.c user/imp/tbemd/sys/netinet6/in6_proto.c user/imp/tbemd/sys/netinet6/in6_rmx.c user/imp/tbemd/sys/netinet6/in6_src.c user/imp/tbemd/sys/netinet6/in6_var.h user/imp/tbemd/sys/netinet6/ip6_input.c user/imp/tbemd/sys/netinet6/ip6_mroute.c user/imp/tbemd/sys/netinet6/ip6_output.c user/imp/tbemd/sys/netinet6/ip6_var.h user/imp/tbemd/sys/netinet6/nd6.c user/imp/tbemd/sys/netinet6/nd6.h user/imp/tbemd/sys/netinet6/nd6_nbr.c user/imp/tbemd/sys/netinet6/nd6_rtr.c user/imp/tbemd/sys/netinet6/raw_ip6.c user/imp/tbemd/sys/netinet6/scope6.c user/imp/tbemd/sys/netinet6/udp6_usrreq.c user/imp/tbemd/sys/netipsec/ah_var.h user/imp/tbemd/sys/netipsec/esp_var.h user/imp/tbemd/sys/netipsec/ipcomp_var.h user/imp/tbemd/sys/netipsec/ipip_var.h user/imp/tbemd/sys/netipsec/ipsec.c user/imp/tbemd/sys/netipsec/ipsec.h user/imp/tbemd/sys/netipsec/ipsec6.h user/imp/tbemd/sys/netipsec/ipsec_input.c user/imp/tbemd/sys/netipsec/key.c user/imp/tbemd/sys/netipsec/xform_esp.c user/imp/tbemd/sys/nfsclient/nfs_bio.c user/imp/tbemd/sys/nfsclient/nfs_vfsops.c user/imp/tbemd/sys/nfsclient/nfs_vnops.c user/imp/tbemd/sys/opencrypto/crypto.c user/imp/tbemd/sys/pc98/cbus/clock.c user/imp/tbemd/sys/pc98/cbus/syscons_cbus.c user/imp/tbemd/sys/pc98/conf/GENERIC user/imp/tbemd/sys/pc98/include/md_var.h user/imp/tbemd/sys/pc98/pc98/machdep.c user/imp/tbemd/sys/pc98/pc98/pc98_machdep.c user/imp/tbemd/sys/pci/if_rl.c user/imp/tbemd/sys/powerpc/aim/mmu_oea.c user/imp/tbemd/sys/powerpc/aim/mmu_oea64.c user/imp/tbemd/sys/powerpc/aim/ofw_machdep.c user/imp/tbemd/sys/powerpc/aim/trap.c user/imp/tbemd/sys/powerpc/booke/pmap.c user/imp/tbemd/sys/powerpc/booke/trap.c user/imp/tbemd/sys/powerpc/conf/GENERIC user/imp/tbemd/sys/powerpc/conf/MPC85XX user/imp/tbemd/sys/powerpc/cpufreq/pcr.c user/imp/tbemd/sys/powerpc/include/intr_machdep.h user/imp/tbemd/sys/powerpc/include/metadata.h user/imp/tbemd/sys/powerpc/include/pmap.h user/imp/tbemd/sys/powerpc/include/proc.h user/imp/tbemd/sys/powerpc/ofw/ofw_pcibus.c user/imp/tbemd/sys/powerpc/ofw/ofw_real.c user/imp/tbemd/sys/powerpc/powermac/ata_kauai.c user/imp/tbemd/sys/powerpc/powermac/cpcht.c user/imp/tbemd/sys/powerpc/powermac/kiic.c user/imp/tbemd/sys/powerpc/powermac/macgpio.c user/imp/tbemd/sys/powerpc/powermac/smu.c user/imp/tbemd/sys/powerpc/powermac/uninorth.c user/imp/tbemd/sys/powerpc/powermac/uninorthvar.h user/imp/tbemd/sys/powerpc/powerpc/elf_machdep.c user/imp/tbemd/sys/powerpc/powerpc/intr_machdep.c user/imp/tbemd/sys/powerpc/powerpc/mmu_if.m user/imp/tbemd/sys/powerpc/powerpc/openpic.c user/imp/tbemd/sys/powerpc/powerpc/pmap_dispatch.c user/imp/tbemd/sys/security/audit/audit_bsm.c user/imp/tbemd/sys/sparc64/conf/GENERIC user/imp/tbemd/sys/sparc64/include/asi.h user/imp/tbemd/sys/sparc64/include/cache.h user/imp/tbemd/sys/sparc64/include/md_var.h user/imp/tbemd/sys/sparc64/include/ofw_machdep.h user/imp/tbemd/sys/sparc64/include/pmap.h user/imp/tbemd/sys/sparc64/include/proc.h user/imp/tbemd/sys/sparc64/isa/isa.c user/imp/tbemd/sys/sparc64/pci/schizo.c user/imp/tbemd/sys/sparc64/pci/schizoreg.h user/imp/tbemd/sys/sparc64/pci/schizovar.h user/imp/tbemd/sys/sparc64/sparc64/ata_machdep.c user/imp/tbemd/sys/sparc64/sparc64/cache.c user/imp/tbemd/sys/sparc64/sparc64/cheetah.c user/imp/tbemd/sys/sparc64/sparc64/elf_machdep.c user/imp/tbemd/sys/sparc64/sparc64/identcpu.c user/imp/tbemd/sys/sparc64/sparc64/interrupt.S user/imp/tbemd/sys/sparc64/sparc64/locore.S user/imp/tbemd/sys/sparc64/sparc64/machdep.c user/imp/tbemd/sys/sparc64/sparc64/mp_locore.S user/imp/tbemd/sys/sparc64/sparc64/mp_machdep.c user/imp/tbemd/sys/sparc64/sparc64/nexus.c user/imp/tbemd/sys/sparc64/sparc64/ofw_machdep.c user/imp/tbemd/sys/sparc64/sparc64/pmap.c user/imp/tbemd/sys/sparc64/sparc64/tick.c user/imp/tbemd/sys/sparc64/sparc64/trap.c user/imp/tbemd/sys/sun4v/conf/GENERIC user/imp/tbemd/sys/sun4v/include/ofw_machdep.h user/imp/tbemd/sys/sun4v/include/pmap.h user/imp/tbemd/sys/sun4v/include/proc.h user/imp/tbemd/sys/sun4v/sun4v/pmap.c user/imp/tbemd/sys/sun4v/sun4v/trap.c user/imp/tbemd/sys/sys/alq.h user/imp/tbemd/sys/sys/buf.h user/imp/tbemd/sys/sys/buf_ring.h user/imp/tbemd/sys/sys/conf.h user/imp/tbemd/sys/sys/dtrace_bsd.h user/imp/tbemd/sys/sys/endian.h user/imp/tbemd/sys/sys/eventhandler.h user/imp/tbemd/sys/sys/kernel.h user/imp/tbemd/sys/sys/kthread.h user/imp/tbemd/sys/sys/libkern.h user/imp/tbemd/sys/sys/lock.h user/imp/tbemd/sys/sys/mbuf.h user/imp/tbemd/sys/sys/mount.h user/imp/tbemd/sys/sys/nlist_aout.h user/imp/tbemd/sys/sys/param.h user/imp/tbemd/sys/sys/pcpu.h user/imp/tbemd/sys/sys/pmc.h user/imp/tbemd/sys/sys/posix4.h user/imp/tbemd/sys/sys/proc.h user/imp/tbemd/sys/sys/ptrace.h user/imp/tbemd/sys/sys/resource.h user/imp/tbemd/sys/sys/resourcevar.h user/imp/tbemd/sys/sys/sysent.h user/imp/tbemd/sys/sys/systm.h user/imp/tbemd/sys/sys/thr.h user/imp/tbemd/sys/sys/user.h user/imp/tbemd/sys/sys/vmmeter.h user/imp/tbemd/sys/sys/vnode.h user/imp/tbemd/sys/sys/vtoc.h user/imp/tbemd/sys/ufs/ffs/ffs_alloc.c user/imp/tbemd/sys/ufs/ffs/ffs_balloc.c user/imp/tbemd/sys/ufs/ffs/ffs_extern.h user/imp/tbemd/sys/ufs/ffs/ffs_inode.c user/imp/tbemd/sys/ufs/ffs/ffs_snapshot.c user/imp/tbemd/sys/ufs/ffs/ffs_softdep.c user/imp/tbemd/sys/ufs/ffs/ffs_subr.c user/imp/tbemd/sys/ufs/ffs/ffs_vfsops.c user/imp/tbemd/sys/ufs/ffs/ffs_vnops.c user/imp/tbemd/sys/ufs/ffs/fs.h user/imp/tbemd/sys/ufs/ffs/softdep.h user/imp/tbemd/sys/ufs/ufs/dinode.h user/imp/tbemd/sys/ufs/ufs/inode.h user/imp/tbemd/sys/ufs/ufs/quota.h user/imp/tbemd/sys/ufs/ufs/ufs_dirhash.c user/imp/tbemd/sys/ufs/ufs/ufs_extern.h user/imp/tbemd/sys/ufs/ufs/ufs_lookup.c user/imp/tbemd/sys/ufs/ufs/ufs_quota.c user/imp/tbemd/sys/ufs/ufs/ufs_vfsops.c user/imp/tbemd/sys/ufs/ufs/ufs_vnops.c user/imp/tbemd/sys/ufs/ufs/ufsmount.h user/imp/tbemd/sys/vm/device_pager.c user/imp/tbemd/sys/vm/phys_pager.c user/imp/tbemd/sys/vm/pmap.h user/imp/tbemd/sys/vm/sg_pager.c user/imp/tbemd/sys/vm/swap_pager.c user/imp/tbemd/sys/vm/uma_core.c user/imp/tbemd/sys/vm/vm_contig.c user/imp/tbemd/sys/vm/vm_extern.h user/imp/tbemd/sys/vm/vm_fault.c user/imp/tbemd/sys/vm/vm_glue.c user/imp/tbemd/sys/vm/vm_kern.c user/imp/tbemd/sys/vm/vm_map.c user/imp/tbemd/sys/vm/vm_map.h user/imp/tbemd/sys/vm/vm_mmap.c user/imp/tbemd/sys/vm/vm_object.c user/imp/tbemd/sys/vm/vm_page.c user/imp/tbemd/sys/vm/vm_page.h user/imp/tbemd/sys/vm/vm_pageout.c user/imp/tbemd/sys/vm/vm_pageout.h user/imp/tbemd/sys/vm/vm_param.h user/imp/tbemd/sys/vm/vnode_pager.c user/imp/tbemd/sys/x86/isa/clock.c user/imp/tbemd/tools/regression/bin/sh/builtins/var-assign2.0 user/imp/tbemd/tools/regression/bin/sh/errors/assignment-error1.0 user/imp/tbemd/tools/regression/bpf/bpf_filter/tests/test0083.h user/imp/tbemd/tools/regression/fstest/Makefile user/imp/tbemd/tools/regression/lib/libc/gen/Makefile user/imp/tbemd/tools/regression/usr.bin/jot/regress.sh user/imp/tbemd/tools/test/README user/imp/tbemd/tools/tools/ath/common/dumpregs_5416.c user/imp/tbemd/tools/tools/ether_reflect/ether_reflect.1 user/imp/tbemd/tools/tools/nanobsd/nanobsd.sh user/imp/tbemd/tools/tools/netrate/tcpp/README user/imp/tbemd/tools/tools/netrate/tcpp/tcpp.c user/imp/tbemd/tools/tools/netrate/tcpp/tcpp.h user/imp/tbemd/tools/tools/netrate/tcpp/tcpp_client.c user/imp/tbemd/tools/tools/netrate/tcpp/tcpp_server.c user/imp/tbemd/tools/tools/vimage/vimage.8 user/imp/tbemd/usr.bin/Makefile user/imp/tbemd/usr.bin/alias/Makefile user/imp/tbemd/usr.bin/ar/Makefile user/imp/tbemd/usr.bin/ar/acpyacc.y user/imp/tbemd/usr.bin/ar/ar.1 user/imp/tbemd/usr.bin/ar/ar.c user/imp/tbemd/usr.bin/ar/ar.h user/imp/tbemd/usr.bin/ar/read.c user/imp/tbemd/usr.bin/ar/write.c user/imp/tbemd/usr.bin/bc/scan.l user/imp/tbemd/usr.bin/bsdiff/bsdiff/bsdiff.1 user/imp/tbemd/usr.bin/bsdiff/bspatch/bspatch.1 user/imp/tbemd/usr.bin/calendar/calendars/calendar.freebsd user/imp/tbemd/usr.bin/calendar/calendars/calendar.history user/imp/tbemd/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.common (contents, props changed) user/imp/tbemd/usr.bin/calendar/io.c user/imp/tbemd/usr.bin/calendar/locale.c user/imp/tbemd/usr.bin/calendar/parsedata.c user/imp/tbemd/usr.bin/calendar/sunpos.c user/imp/tbemd/usr.bin/chpass/Makefile user/imp/tbemd/usr.bin/chpass/chpass.1 user/imp/tbemd/usr.bin/cpio/Makefile user/imp/tbemd/usr.bin/cpio/bsdcpio.1 user/imp/tbemd/usr.bin/cpio/cmdline.c user/imp/tbemd/usr.bin/cpio/config_freebsd.h user/imp/tbemd/usr.bin/cpio/cpio.c user/imp/tbemd/usr.bin/cpio/cpio.h user/imp/tbemd/usr.bin/cpio/cpio_platform.h user/imp/tbemd/usr.bin/cpio/err.c user/imp/tbemd/usr.bin/cpio/matching.c user/imp/tbemd/usr.bin/cpio/matching.h user/imp/tbemd/usr.bin/cpio/pathmatch.c user/imp/tbemd/usr.bin/cpio/pathmatch.h user/imp/tbemd/usr.bin/cpio/test/Makefile user/imp/tbemd/usr.bin/csup/cpasswd.1 user/imp/tbemd/usr.bin/csup/csup.1 user/imp/tbemd/usr.bin/dc/bcode.c user/imp/tbemd/usr.bin/dc/dc.c user/imp/tbemd/usr.bin/find/option.c user/imp/tbemd/usr.bin/gzip/gzip.1 user/imp/tbemd/usr.bin/gzip/gzip.c user/imp/tbemd/usr.bin/indent/lexi.c user/imp/tbemd/usr.bin/ipcs/ipc.c user/imp/tbemd/usr.bin/join/join.1 user/imp/tbemd/usr.bin/jot/jot.1 user/imp/tbemd/usr.bin/jot/jot.c user/imp/tbemd/usr.bin/killall/killall.1 user/imp/tbemd/usr.bin/lastcomm/lastcomm.1 user/imp/tbemd/usr.bin/less/Makefile user/imp/tbemd/usr.bin/less/lesspipe.sh user/imp/tbemd/usr.bin/mail/util.c user/imp/tbemd/usr.bin/make/make.1 user/imp/tbemd/usr.bin/mkuzip/mkuzip.8 user/imp/tbemd/usr.bin/newkey/newkey.8 user/imp/tbemd/usr.bin/pathchk/pathchk.1 user/imp/tbemd/usr.bin/pathchk/pathchk.c user/imp/tbemd/usr.bin/quota/Makefile user/imp/tbemd/usr.bin/quota/quota.c user/imp/tbemd/usr.bin/rpcgen/rpc_cout.c user/imp/tbemd/usr.bin/script/script.c user/imp/tbemd/usr.bin/setchannel/setchannel.1 user/imp/tbemd/usr.bin/stat/stat.1 user/imp/tbemd/usr.bin/stat/stat.c user/imp/tbemd/usr.bin/tar/Makefile user/imp/tbemd/usr.bin/tar/bsdtar.1 user/imp/tbemd/usr.bin/tar/config_freebsd.h user/imp/tbemd/usr.bin/tar/test/Makefile user/imp/tbemd/usr.bin/tftp/Makefile user/imp/tbemd/usr.bin/tftp/main.c user/imp/tbemd/usr.bin/tftp/tftp.1 user/imp/tbemd/usr.bin/tftp/tftp.c user/imp/tbemd/usr.bin/unzip/unzip.c user/imp/tbemd/usr.bin/vmstat/vmstat.8 user/imp/tbemd/usr.bin/vmstat/vmstat.c user/imp/tbemd/usr.bin/wc/wc.c user/imp/tbemd/usr.bin/wtmpcvt/wtmpcvt.1 user/imp/tbemd/usr.sbin/Makefile user/imp/tbemd/usr.sbin/acpi/acpidb/Makefile user/imp/tbemd/usr.sbin/acpi/iasl/Makefile user/imp/tbemd/usr.sbin/adduser/adduser.conf.5 user/imp/tbemd/usr.sbin/apm/apm.c user/imp/tbemd/usr.sbin/apmd/Makefile user/imp/tbemd/usr.sbin/apmd/README user/imp/tbemd/usr.sbin/apmd/apmd.8 user/imp/tbemd/usr.sbin/apmd/apmd.c user/imp/tbemd/usr.sbin/apmd/apmd.h user/imp/tbemd/usr.sbin/apmd/apmdlex.l user/imp/tbemd/usr.sbin/apmd/contrib/pccardq.c user/imp/tbemd/usr.sbin/bluetooth/bthidd/bthidd.8 user/imp/tbemd/usr.sbin/bluetooth/bthidd/hid.c user/imp/tbemd/usr.sbin/bluetooth/btpand/btpand.8 user/imp/tbemd/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.8 user/imp/tbemd/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.8 user/imp/tbemd/usr.sbin/bsnmpd/modules/snmp_hostres/snmp_hostres.3 user/imp/tbemd/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.3 user/imp/tbemd/usr.sbin/chown/chown.c user/imp/tbemd/usr.sbin/clear_locks/clear_locks.8 user/imp/tbemd/usr.sbin/config/config.h user/imp/tbemd/usr.sbin/config/configvers.h user/imp/tbemd/usr.sbin/config/main.c user/imp/tbemd/usr.sbin/config/mkmakefile.c user/imp/tbemd/usr.sbin/config/mkoptions.c user/imp/tbemd/usr.sbin/cpucontrol/cpucontrol.8 user/imp/tbemd/usr.sbin/cron/crontab/crontab.1 user/imp/tbemd/usr.sbin/crunch/crunchgen/crunchgen.1 user/imp/tbemd/usr.sbin/cxgbtool/cxgbtool.c user/imp/tbemd/usr.sbin/daemon/daemon.8 user/imp/tbemd/usr.sbin/dconschat/dconschat.8 user/imp/tbemd/usr.sbin/edquota/Makefile user/imp/tbemd/usr.sbin/edquota/edquota.8 user/imp/tbemd/usr.sbin/edquota/edquota.c user/imp/tbemd/usr.sbin/extattr/rmextattr.c user/imp/tbemd/usr.sbin/fdcontrol/fdcontrol.8 user/imp/tbemd/usr.sbin/fifolog/lib/fifolog_reader.c user/imp/tbemd/usr.sbin/gssd/gssd.8 user/imp/tbemd/usr.sbin/i2c/i2c.8 user/imp/tbemd/usr.sbin/iostat/iostat.8 user/imp/tbemd/usr.sbin/iostat/iostat.c user/imp/tbemd/usr.sbin/jail/jail.8 user/imp/tbemd/usr.sbin/jail/jail.c user/imp/tbemd/usr.sbin/makefs/ffs/ffs_bswap.c user/imp/tbemd/usr.sbin/mergemaster/mergemaster.sh user/imp/tbemd/usr.sbin/mixer/mixer.8 user/imp/tbemd/usr.sbin/mount_portalfs/mount_portalfs.8 user/imp/tbemd/usr.sbin/mountd/mountd.c user/imp/tbemd/usr.sbin/moused/moused.8 user/imp/tbemd/usr.sbin/mptable/mptable.1 user/imp/tbemd/usr.sbin/mptutil/mptutil.8 user/imp/tbemd/usr.sbin/mtree/mtree.5 user/imp/tbemd/usr.sbin/mtree/mtree.8 user/imp/tbemd/usr.sbin/newsyslog/newsyslog.8 user/imp/tbemd/usr.sbin/newsyslog/newsyslog.c user/imp/tbemd/usr.sbin/newsyslog/newsyslog.conf.5 user/imp/tbemd/usr.sbin/nfsd/nfsv4.4 user/imp/tbemd/usr.sbin/nfsd/stablerestart.5 user/imp/tbemd/usr.sbin/nfsdumpstate/nfsdumpstate.8 user/imp/tbemd/usr.sbin/nscd/nscd.8 user/imp/tbemd/usr.sbin/nscd/nscd.conf.5 user/imp/tbemd/usr.sbin/ntp/doc/ntpd.8 user/imp/tbemd/usr.sbin/pkg_install/Makefile user/imp/tbemd/usr.sbin/pkg_install/Makefile.inc user/imp/tbemd/usr.sbin/pkg_install/add/Makefile user/imp/tbemd/usr.sbin/pkg_install/add/extract.c user/imp/tbemd/usr.sbin/pkg_install/add/futil.c user/imp/tbemd/usr.sbin/pkg_install/add/main.c user/imp/tbemd/usr.sbin/pkg_install/add/perform.c user/imp/tbemd/usr.sbin/pkg_install/create/Makefile user/imp/tbemd/usr.sbin/pkg_install/create/main.c user/imp/tbemd/usr.sbin/pkg_install/create/perform.c user/imp/tbemd/usr.sbin/pkg_install/create/pl.c user/imp/tbemd/usr.sbin/pkg_install/delete/Makefile user/imp/tbemd/usr.sbin/pkg_install/delete/main.c user/imp/tbemd/usr.sbin/pkg_install/delete/perform.c user/imp/tbemd/usr.sbin/pkg_install/info/Makefile user/imp/tbemd/usr.sbin/pkg_install/info/info.h user/imp/tbemd/usr.sbin/pkg_install/info/main.c user/imp/tbemd/usr.sbin/pkg_install/info/perform.c user/imp/tbemd/usr.sbin/pkg_install/info/show.c user/imp/tbemd/usr.sbin/pkg_install/updating/Makefile user/imp/tbemd/usr.sbin/pkg_install/updating/main.c user/imp/tbemd/usr.sbin/pkg_install/updating/pkg_updating.1 user/imp/tbemd/usr.sbin/pkg_install/version/Makefile user/imp/tbemd/usr.sbin/pkg_install/version/main.c user/imp/tbemd/usr.sbin/pkg_install/version/perform.c user/imp/tbemd/usr.sbin/pmcstat/pmcpl_calltree.c user/imp/tbemd/usr.sbin/pmcstat/pmcstat.c user/imp/tbemd/usr.sbin/pmcstat/pmcstat_log.c user/imp/tbemd/usr.sbin/quotaon/Makefile user/imp/tbemd/usr.sbin/quotaon/quotaon.c user/imp/tbemd/usr.sbin/repquota/Makefile user/imp/tbemd/usr.sbin/repquota/repquota.8 user/imp/tbemd/usr.sbin/repquota/repquota.c user/imp/tbemd/usr.sbin/rtadvd/rtadvd.8 user/imp/tbemd/usr.sbin/rtprio/rtprio.1 user/imp/tbemd/usr.sbin/rtsold/rtsold.8 user/imp/tbemd/usr.sbin/sa/sa.8 user/imp/tbemd/usr.sbin/sade/disks.c user/imp/tbemd/usr.sbin/sade/menus.c user/imp/tbemd/usr.sbin/smbmsg/smbmsg.8 user/imp/tbemd/usr.sbin/snapinfo/snapinfo.8 user/imp/tbemd/usr.sbin/sysinstall/disks.c user/imp/tbemd/usr.sbin/sysinstall/menus.c user/imp/tbemd/usr.sbin/sysinstall/network.c user/imp/tbemd/usr.sbin/sysinstall/tcpip.c user/imp/tbemd/usr.sbin/timed/timed/timed.8 user/imp/tbemd/usr.sbin/tzsetup/tzsetup.c user/imp/tbemd/usr.sbin/uathload/uathload.8 user/imp/tbemd/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5 Directory Properties: user/imp/tbemd/ (props changed) user/imp/tbemd/cddl/contrib/opensolaris/ (props changed) user/imp/tbemd/contrib/bind9/ (props changed) user/imp/tbemd/contrib/ee/ (props changed) user/imp/tbemd/contrib/expat/ (props changed) user/imp/tbemd/contrib/file/ (props changed) user/imp/tbemd/contrib/gdb/ (props changed) user/imp/tbemd/contrib/gdtoa/ (props changed) user/imp/tbemd/contrib/gnu-sort/ (props changed) user/imp/tbemd/contrib/groff/ (props changed) user/imp/tbemd/contrib/less/ (props changed) user/imp/tbemd/contrib/libpcap/ (props changed) user/imp/tbemd/contrib/ncurses/ (props changed) user/imp/tbemd/contrib/netcat/ (props changed) user/imp/tbemd/contrib/ntp/ (props changed) user/imp/tbemd/contrib/one-true-awk/ (props changed) user/imp/tbemd/contrib/openbsm/ (props changed) user/imp/tbemd/contrib/openpam/ (props changed) user/imp/tbemd/contrib/pf/ (props changed) user/imp/tbemd/contrib/sendmail/ (props changed) user/imp/tbemd/contrib/tcpdump/ (props changed) user/imp/tbemd/contrib/tcsh/ (props changed) user/imp/tbemd/contrib/top/ (props changed) user/imp/tbemd/contrib/top/install-sh (props changed) user/imp/tbemd/contrib/tzcode/stdtime/ (props changed) user/imp/tbemd/contrib/tzcode/zic/ (props changed) user/imp/tbemd/contrib/tzdata/ (props changed) user/imp/tbemd/contrib/wpa/ (props changed) user/imp/tbemd/crypto/openssh/ (props changed) user/imp/tbemd/crypto/openssl/ (props changed) user/imp/tbemd/lib/libc/ (props changed) user/imp/tbemd/lib/libc/stdtime/ (props changed) user/imp/tbemd/lib/libutil/ (props changed) user/imp/tbemd/lib/libz/ (props changed) user/imp/tbemd/sbin/ (props changed) user/imp/tbemd/sbin/ipfw/ (props changed) user/imp/tbemd/share/man/man4/twa.4 (props changed) user/imp/tbemd/share/zoneinfo/ (props changed) user/imp/tbemd/sys/ (props changed) user/imp/tbemd/sys/amd64/include/xen/ (props changed) user/imp/tbemd/sys/cddl/contrib/opensolaris/ (props changed) user/imp/tbemd/sys/contrib/dev/acpica/ (props changed) user/imp/tbemd/sys/contrib/pf/ (props changed) user/imp/tbemd/sys/contrib/x86emu/ (props changed) user/imp/tbemd/sys/dev/xen/xenpci/ (props changed) user/imp/tbemd/sys/mips/rmi/debug.h (props changed) user/imp/tbemd/sys/mips/rmi/dev/sec/desc.h (props changed) user/imp/tbemd/sys/mips/rmi/msgring.h (props changed) user/imp/tbemd/sys/mips/rmi/shared_structs.h (props changed) user/imp/tbemd/sys/mips/rmi/shared_structs_func.h (props changed) user/imp/tbemd/sys/mips/rmi/shared_structs_offsets.h (props changed) user/imp/tbemd/usr.bin/csup/ (props changed) user/imp/tbemd/usr.bin/procstat/ (props changed) user/imp/tbemd/usr.sbin/zic/ (props changed) Modified: user/imp/tbemd/Makefile.inc1 ============================================================================== --- user/imp/tbemd/Makefile.inc1 Thu Jun 10 20:13:23 2010 (r209005) +++ user/imp/tbemd/Makefile.inc1 Thu Jun 10 20:15:45 2010 (r209006) @@ -256,7 +256,7 @@ WMAKEENV= ${CROSSENV} \ VERSION="${VERSION}" \ INSTALL="sh ${.CURDIR}/tools/install.sh" \ PATH=${TMPPATH} -.if ${MK_CDDL} == "no" || defined(NO_CTF) +.if ${MK_CDDL} == "no" WMAKEENV+= NO_CTF=1 .endif WMAKE= ${WMAKEENV} ${MAKE} -f Makefile.inc1 DESTDIR=${WORLDTMP} @@ -777,7 +777,7 @@ buildkernel: @echo "--------------------------------------------------------------" cd ${KRNLOBJDIR}/${_kernel}; \ MAKESRCPATH=${KERNSRCDIR}/dev/aic7xxx/aicasm \ - ${MAKE} SSP_CFLAGS= -DNO_CPU_CFLAGS -DNO_CTF \ + ${MAKE} SSP_CFLAGS= -DNO_CPU_CFLAGS \ -f ${KERNSRCDIR}/dev/aic7xxx/aicasm/Makefile # XXX - Gratuitously builds aicasm in the ``makeoptions NO_MODULES'' case. .if !defined(MODULES_WITH_WORLD) && !defined(NO_MODULES) && exists(${KERNSRCDIR}/modules) @@ -953,6 +953,13 @@ _gensnmptree= usr.sbin/bsnmpd/gensnmptre _crunchgen= usr.sbin/crunch/crunchgen .endif +# XXX: There is no way to specify bootstrap tools depending on MK-flags +# with different per-architecture default values. Always build tblgen. +_clang_tblgen= \ + lib/clang/libllvmsupport \ + lib/clang/libllvmsystem \ + usr.bin/clang/tblgen + .if ${MK_CDDL} != "no" _dtrace_tools= cddl/usr.bin/sgsmsg cddl/lib/libctf lib/libelf \ lib/libdwarf cddl/usr.bin/ctfconvert cddl/usr.bin/ctfmerge @@ -960,6 +967,7 @@ _dtrace_tools= cddl/usr.bin/sgsmsg cddl/ bootstrap-tools: .for _tool in \ + ${_clang_tblgen} \ ${_dtrace_tools} \ ${_strfile} \ ${_gperf} \ @@ -1108,9 +1116,9 @@ _prebuild_libs= ${_kerberos5_lib_libasn1 ${_kerberos5_lib_libhx509} ${_kerberos5_lib_libkrb5} \ ${_kerberos5_lib_libroken} \ lib/libbz2 lib/libcom_err lib/libcrypt \ - lib/libexpat \ + lib/libexpat lib/libfetch \ ${_lib_libgssapi} ${_lib_libipx} \ - lib/libkiconv lib/libkvm lib/libmd \ + lib/libkiconv lib/libkvm lib/liblzma lib/libmd \ lib/ncurses/ncurses lib/ncurses/ncursesw \ lib/libopie lib/libpam ${_lib_libthr} \ lib/libradius lib/libsbuf lib/libtacplus \ @@ -1135,6 +1143,7 @@ _cddl_lib= cddl/lib _secure_lib_libcrypto= secure/lib/libcrypto _secure_lib_libssl= secure/lib/libssl lib/libradius__L secure/lib/libssl__L: secure/lib/libcrypto__L +lib/libfetch__L: secure/lib/libcrypto__L secure/lib/libssl__L lib/libmd__L .if ${MK_OPENSSH} != "no" _secure_lib_libssh= secure/lib/libssh secure/lib/libssh__L: lib/libz__L secure/lib/libcrypto__L lib/libcrypt__L @@ -1170,7 +1179,7 @@ _lib_libypclnt= lib/libypclnt .endif .if ${MK_OPENSSL} == "no" -lib/libradius__L: lib/libmd__L +lib/libfetch__L lib/libradius__L: lib/libmd__L .endif .for _lib in ${_prereq_libs} Modified: user/imp/tbemd/ObsoleteFiles.inc ============================================================================== --- user/imp/tbemd/ObsoleteFiles.inc Thu Jun 10 20:13:23 2010 (r209005) +++ user/imp/tbemd/ObsoleteFiles.inc Thu Jun 10 20:15:45 2010 (r209006) @@ -14,6 +14,41 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20100514: library version bump for versioned symbols for liblzma +OLD_LIBS+=usr/lib/liblzma.so.0 +.if ${TARGET_ARCH} == "amd64" +OLD_LIBS+=usr/lib32/liblzma.so.0 +.endif +# 20100511: move GCC-specific headers to /usr/include/gcc +.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386" +OLD_FILES+=usr/include/emmintrin.h +OLD_FILES+=usr/include/mm_malloc.h +OLD_FILES+=usr/include/pmmintrin.h +OLD_FILES+=usr/include/xmmintrin.h +.endif +.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "arm" +OLD_FILES+=usr/include/mmintrin.h +.endif +.if ${TARGET_ARCH} == "ia64" +OLD_FILES+=usr/include/ia64intrin.h +.endif +.if ${TARGET_ARCH} == "powerpc" +OLD_FILES+=usr/include/altivec.h +OLD_FILES+=usr/include/ppc-asm.h +OLD_FILES+=usr/include/spe.h +.endif +# 20100416: [mips] removed +.if ${TARGET_ARCH} == "mips" +OLD_FILES+=usr/include/machine/psl.h +.endif +# 20100415: [mips] removed unused headers +.if ${TARGET_ARCH} == "mips" +OLD_FILES+=usr/include/machine/archtype.h +OLD_FILES+=usr/include/machine/segments.h +OLD_FILES+=usr/include/machine/rm7000.h +OLD_FILES+=usr/include/machine/defs.h +OLD_FILES+=usr/include/machine/queue.h +.endif # 20100326: [ia64] removed .if ${TARGET_ARCH} == "ia64" OLD_FILES+=usr/include/machine/nexusvar.h Modified: user/imp/tbemd/UPDATING ============================================================================== --- user/imp/tbemd/UPDATING Thu Jun 10 20:13:23 2010 (r209005) +++ user/imp/tbemd/UPDATING Thu Jun 10 20:15:45 2010 (r209006) @@ -22,6 +22,14 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 9. machines to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) + +20100429: + 'vm_page's are now hashed by physical address to an array of mutexes. + Currently this is only used to serialize access to hold_count. Over + time the page queue mutex will be peeled away. This changes the size + of pmap on every architecture. And requires all callers of vm_page_hold + and vm_page_unhold to be updated. + 20100402: WITH_CTF can now be specified in src.conf (not recommended, there are some problems with static executables), make.conf (would also @@ -75,6 +83,9 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 9. The meanings correspond to the relevant IPv4 variables. +20091125: + 8.0-RELEASE. + 20091113: The default terminal emulation for syscons(4) has been changed from cons25 to xterm on all platforms except pc98. This means Modified: user/imp/tbemd/bin/chio/chio.c ============================================================================== --- user/imp/tbemd/bin/chio/chio.c Thu Jun 10 20:13:23 2010 (r209005) +++ user/imp/tbemd/bin/chio/chio.c Thu Jun 10 20:15:45 2010 (r209006) @@ -1072,6 +1072,7 @@ find_element(char *voltag, uint16_t *et, /* Read in the changer slots */ if (cp.cp_nslots > 0) { + (void) memset(&cesr, 0, sizeof(cesr)); cesr.cesr_element_type = CHET_ST; cesr.cesr_element_base = 0; cesr.cesr_element_count = cp.cp_nslots; Modified: user/imp/tbemd/bin/cp/cp.c ============================================================================== --- user/imp/tbemd/bin/cp/cp.c Thu Jun 10 20:13:23 2010 (r209005) +++ user/imp/tbemd/bin/cp/cp.c Thu Jun 10 20:15:45 2010 (r209006) @@ -466,6 +466,7 @@ copy(char *argv[], enum op type, int fts case S_IFSOCK: warnx("%s is a socket (not copied).", curr->fts_path); + break; case S_IFIFO: if (Rflag) { if (copy_fifo(curr->fts_statp, !dne)) Modified: user/imp/tbemd/bin/date/date.1 ============================================================================== --- user/imp/tbemd/bin/date/date.1 Thu Jun 10 20:13:23 2010 (r209005) +++ user/imp/tbemd/bin/date/date.1 Thu Jun 10 20:15:45 2010 (r209006) @@ -32,7 +32,7 @@ .\" @(#)date.1 8.3 (Berkeley) 4/28/95 .\" $FreeBSD$ .\" -.Dd June 2, 2007 +.Dd June 3, 2010 .Dt DATE 1 .Os .Sh NAME @@ -219,6 +219,14 @@ When the date is adjusted to a specific the resulting timezone will be set so that the date matches the earlier of the two times. .Pp +It is not possible to adjust a date to an invalid absolute day, so using +the switches +.Fl v No 31d Fl v No 12m +will simply fail five months of the year. +It is therefore usual to set the month before setting the day; using +.Fl v No 12m Fl v No 31d +always works. +.Pp Adjusting the date by months is inherently ambiguous because a month is a unit of variable length depending on the current date. This kind of date adjustment is applied in the most intuitive way. @@ -339,9 +347,9 @@ will display the last day of February in .Pp .Dl "Tue Feb 29 03:18:00 GMT 2000" .Pp -So will do the command: +So will the command: .Pp -.Dl "date -v30d -v3m -v0y -v-1m" +.Dl "date -v3m -v30d -v0y -v-1m" .Pp because there is no such date as the 30th of February. .Pp Modified: user/imp/tbemd/bin/ln/ln.c ============================================================================== --- user/imp/tbemd/bin/ln/ln.c Thu Jun 10 20:13:23 2010 (r209005) +++ user/imp/tbemd/bin/ln/ln.c Thu Jun 10 20:15:45 2010 (r209006) @@ -47,6 +47,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -172,6 +173,52 @@ main(int argc, char *argv[]) exit(exitval); } +/* + * Two pathnames refer to the same directory entry if the directories match + * and the final components' names match. + */ +static int +samedirent(const char *path1, const char *path2) +{ + const char *file1, *file2; + char pathbuf[PATH_MAX]; + struct stat sb1, sb2; + + if (strcmp(path1, path2) == 0) + return 1; + file1 = strrchr(path1, '/'); + if (file1 != NULL) + file1++; + else + file1 = path1; + file2 = strrchr(path2, '/'); + if (file2 != NULL) + file2++; + else + file2 = path2; + if (strcmp(file1, file2) != 0) + return 0; + if (file1 - path1 >= PATH_MAX || file2 - path2 >= PATH_MAX) + return 0; + if (file1 == path1) + memcpy(pathbuf, ".", 2); + else { + memcpy(pathbuf, path1, file1 - path1); + pathbuf[file1 - path1] = '\0'; + } + if (stat(pathbuf, &sb1) != 0) + return 0; + if (file2 == path2) + memcpy(pathbuf, ".", 2); + else { + memcpy(pathbuf, path2, file2 - path2); + pathbuf[file2 - path2] = '\0'; + } + if (stat(pathbuf, &sb2) != 0) + return 0; + return sb1.st_dev == sb2.st_dev && sb1.st_ino == sb2.st_ino; +} + int linkit(const char *source, const char *target, int isdir) { @@ -180,6 +227,7 @@ linkit(const char *source, const char *t int ch, exists, first; char path[PATH_MAX]; char wbuf[PATH_MAX]; + char bbuf[PATH_MAX]; if (!sflag) { /* If source doesn't exist, quit now. */ @@ -202,11 +250,9 @@ linkit(const char *source, const char *t if (isdir || (lstat(target, &sb) == 0 && S_ISDIR(sb.st_mode)) || (!hflag && stat(target, &sb) == 0 && S_ISDIR(sb.st_mode))) { - if ((p = strrchr(source, '/')) == NULL) - p = source; - else - ++p; - if (snprintf(path, sizeof(path), "%s/%s", target, p) >= + if (strlcpy(bbuf, source, sizeof(bbuf)) >= sizeof(bbuf) || + (p = basename(bbuf)) == NULL || + snprintf(path, sizeof(path), "%s/%s", target, p) >= (ssize_t)sizeof(path)) { errno = ENAMETOOLONG; warn("%s", source); @@ -215,7 +261,6 @@ linkit(const char *source, const char *t target = path; } - exists = !lstat(target, &sb); /* * If the link source doesn't exist, and a symbolic link was * requested, and -w was specified, give a warning. @@ -231,19 +276,30 @@ linkit(const char *source, const char *t * absolute path of the source, by appending `source' * to the parent directory of the target. */ - p = strrchr(target, '/'); - if (p != NULL) - p++; - else - p = target; - (void)snprintf(wbuf, sizeof(wbuf), "%.*s%s", - (int)(p - target), target, source); - if (stat(wbuf, &sb) != 0) - warn("warning: %s", source); + strlcpy(bbuf, target, sizeof(bbuf)); + p = dirname(bbuf); + if (p != NULL) { + (void)snprintf(wbuf, sizeof(wbuf), "%s/%s", + p, source); + if (stat(wbuf, &sb) != 0) + warn("warning: %s", source); + } + } + } + + /* + * If the file exists, first check it is not the same directory entry. + */ + exists = !lstat(target, &sb); + if (exists) { + if (!sflag && samedirent(source, target)) { + warnx("%s and %s are the same directory entry", + source, target); + return (1); } } /* - * If the file exists, then unlink it forcibly if -f was specified + * Then unlink it forcibly if -f was specified * and interactively if -i was specified. */ if (fflag && exists) { Modified: user/imp/tbemd/bin/ln/symlink.7 ============================================================================== --- user/imp/tbemd/bin/ln/symlink.7 Thu Jun 10 20:13:23 2010 (r209005) +++ user/imp/tbemd/bin/ln/symlink.7 Thu Jun 10 20:15:45 2010 (r209006) @@ -29,7 +29,7 @@ .\" @(#)symlink.7 8.3 (Berkeley) 3/31/94 .\" $FreeBSD$ .\" -.Dd March 31, 1994 +.Dd April 25, 2010 .Dt SYMLINK 7 .Os .Sh NAME @@ -103,19 +103,23 @@ the system call would return a file descriptor to the file .Dq afile . .Pp -There are nine system calls that do not follow links, and which operate +There are thirteen system calls that do not follow links, and which operate on the symbolic link itself. They are: .Xr lchflags 2 , .Xr lchmod 2 , .Xr lchown 2 , +.Xr lpathconf 2 , .Xr lstat 2 , .Xr lutimes 2 , .Xr readlink 2 , +.Xr readlinkat 2 , .Xr rename 2 , +.Xr renameat 2 , .Xr rmdir 2 , +.Xr unlink 2 , and -.Xr unlink 2 . +.Xr unlinkat 2 . Because .Xr remove 3 is an alias for @@ -123,9 +127,30 @@ is an alias for it also does not follow symbolic links. When .Xr rmdir 2 +or +.Xr unlinkat 2 +with the +.Dv AT_REMOVEDIR +flag is applied to a symbolic link, it fails with the error .Er ENOTDIR . .Pp +The +.Xr linkat 2 +system call does not follow symbolic links +unless given the +.Dv AT_SYMLINK_FOLLOW +flag. +.Pp +The following system calls follow symbolic links +unless given the +.Dv AT_SYMLINK_NOFOLLOW +flag: +.Xr fchmodat 2 , +.Xr fchownat 2 +and +.Xr fstatat 2 . +.Pp The owner and group of an existing symbolic link can be changed by means of the .Xr lchown 2 @@ -138,8 +163,8 @@ an existing symbolic link can be changed and .Xr lutimes 2 system calls, respectively. -Of these, only the flags are used by the system; -the access permissions and ownership are ignored. +Of these, only the flags and ownership are used by the system; +the access permissions are ignored. .Pp The .Bx 4.4 Modified: user/imp/tbemd/bin/pax/pat_rep.c ============================================================================== --- user/imp/tbemd/bin/pax/pat_rep.c Thu Jun 10 20:13:23 2010 (r209005) +++ user/imp/tbemd/bin/pax/pat_rep.c Thu Jun 10 20:15:45 2010 (r209006) @@ -76,7 +76,7 @@ static char * range_match(char *, int); #ifdef NET2_REGEX static int resub(regexp *, char *, char *, char *); #else -static int resub(regex_t *, regmatch_t *, char *, char *, char *); +static int resub(regex_t *, regmatch_t *, char *, char *, char *, char *); #endif /* @@ -929,7 +929,7 @@ rep_name(char *name, int *nlen, int prnt # ifdef NET2_REGEX if ((res = resub(pt->rcmp,pt->nstr,outpt,endpt)) < 0) { # else - if ((res = resub(&(pt->rcmp),pm,pt->nstr,outpt,endpt)) + if ((res = resub(&(pt->rcmp),pm,inpt,pt->nstr,outpt,endpt)) < 0) { # endif if (prnt) @@ -1071,7 +1071,7 @@ resub(regexp *prog, char *src, char *des */ static int -resub(regex_t *rp, regmatch_t *pm, char *src, char *dest, +resub(regex_t *rp, regmatch_t *pm, char *orig, char *src, char *dest, char *destend) { char *spt; @@ -1121,7 +1121,7 @@ resub(regex_t *rp, regmatch_t *pm, char */ if (len > (destend - dpt)) len = destend - dpt; - if (l_strncpy(dpt, src + pmpt->rm_so, len) != len) + if (l_strncpy(dpt, orig + pmpt->rm_so, len) != len) return(-1); dpt += len; } Modified: user/imp/tbemd/bin/setfacl/setfacl.1 ============================================================================== --- user/imp/tbemd/bin/setfacl/setfacl.1 Thu Jun 10 20:13:23 2010 (r209005) +++ user/imp/tbemd/bin/setfacl/setfacl.1 Thu Jun 10 20:15:45 2010 (r209006) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd September 5, 2009 +.Dd May 13, 2010 .Dt SETFACL 1 .Os .Sh NAME @@ -453,8 +453,13 @@ as part of the .Tn TrustedBSD Project and introduced in .Fx 5.0 . +NFSv4 ACL support was introduced in +.Fx 8.1 . .Sh AUTHORS +.An -nosplit The .Nm utility was written by .An Chris D. Faulhaber Aq jedgar@fxp.org . +NFSv4 ACL support was implemented by +.An Edward Tomasz Napierala Aq trasz@FreeBSD.org . Modified: user/imp/tbemd/bin/sh/arith.y ============================================================================== --- user/imp/tbemd/bin/sh/arith.y Thu Jun 10 20:13:23 2010 (r209005) +++ user/imp/tbemd/bin/sh/arith.y Thu Jun 10 20:15:45 2010 (r209006) @@ -287,7 +287,9 @@ arith_t arith(const char *s) { arith_t result; + struct stackmark smark; + setstackmark(&smark); arith_buf = arith_startbuf = s; INTOFF; @@ -295,6 +297,8 @@ arith(const char *s) arith_lex_reset(); /* Reprime lex. */ INTON; + popstackmark(&smark); + return result; } Modified: user/imp/tbemd/bin/sh/arith_lex.l ============================================================================== --- user/imp/tbemd/bin/sh/arith_lex.l Thu Jun 10 20:13:23 2010 (r209005) +++ user/imp/tbemd/bin/sh/arith_lex.l Thu Jun 10 20:15:45 2010 (r209006) @@ -51,13 +51,6 @@ __FBSDID("$FreeBSD$"); int yylex(void); -struct varname -{ - struct varname *next; - char name[1]; -}; -static struct varname *varnames; - #undef YY_INPUT #define YY_INPUT(buf,result,max) \ result = (*buf = *arith_buf++) ? 1 : YY_NULL; @@ -87,14 +80,11 @@ static struct varname *varnames; * If variable doesn't exist, we should initialize * it to zero. */ - struct varname *temp; + char *temp; if (lookupvar(yytext) == NULL) setvarsafe(yytext, "0", 0); - temp = ckmalloc(sizeof(struct varname) + - strlen(yytext)); - temp->next = varnames; - varnames = temp; - yylval.s_value = strcpy(temp->name, yytext); + temp = stalloc(strlen(yytext) + 1); + yylval.s_value = strcpy(temp, yytext); return ARITH_VAR; } @@ -140,15 +130,5 @@ static struct varname *varnames; void arith_lex_reset(void) { - struct varname *name, *next; - YY_NEW_FILE; - - name = varnames; - while (name != NULL) { - next = name->next; - ckfree(name); - name = next; - } - varnames = NULL; } Modified: user/imp/tbemd/bin/sh/cd.c ============================================================================== --- user/imp/tbemd/bin/sh/cd.c Thu Jun 10 20:13:23 2010 (r209005) +++ user/imp/tbemd/bin/sh/cd.c Thu Jun 10 20:15:45 2010 (r209006) @@ -70,6 +70,7 @@ STATIC int docd(char *, int, int); STATIC char *getcomponent(void); STATIC char *findcwd(char *); STATIC void updatepwd(char *); +STATIC char *getpwd(void); STATIC char *getpwd2(void); STATIC char *curdir = NULL; /* current working directory */ @@ -351,7 +352,7 @@ pwdcmd(int argc, char **argv) /* * Get the current directory and cache the result in curdir. */ -char * +STATIC char * getpwd(void) { char *p; @@ -374,7 +375,6 @@ getpwd(void) STATIC char * getpwd2(void) { - struct stat stdot, stpwd; char *pwd; int i; @@ -387,12 +387,29 @@ getpwd2(void) break; } - pwd = getenv("PWD"); + return NULL; +} + +/* + * Initialize PWD in a new shell. + * If the shell is interactive, we need to warn if this fails. + */ +void +pwd_init(int warn) +{ + char *pwd; + struct stat stdot, stpwd; + + pwd = lookupvar("PWD"); if (pwd && *pwd == '/' && stat(".", &stdot) != -1 && stat(pwd, &stpwd) != -1 && stdot.st_dev == stpwd.st_dev && stdot.st_ino == stpwd.st_ino) { - return pwd; + if (curdir) + ckfree(curdir); + curdir = savestr(pwd); } - return NULL; + if (getpwd() == NULL && warn) + out2fmt_flush("sh: cannot determine working directory\n"); + setvar("PWD", curdir, VEXPORT); } Modified: user/imp/tbemd/bin/sh/cd.h ============================================================================== --- user/imp/tbemd/bin/sh/cd.h Thu Jun 10 20:13:23 2010 (r209005) +++ user/imp/tbemd/bin/sh/cd.h Thu Jun 10 20:15:45 2010 (r209006) @@ -29,6 +29,6 @@ * $FreeBSD$ */ -char *getpwd(void); +void pwd_init(int); int cdcmd (int, char **); int pwdcmd(int, char **); Modified: user/imp/tbemd/bin/sh/eval.c ============================================================================== --- user/imp/tbemd/bin/sh/eval.c Thu Jun 10 20:13:23 2010 (r209005) +++ user/imp/tbemd/bin/sh/eval.c Thu Jun 10 20:15:45 2010 (r209006) @@ -937,6 +937,8 @@ evalcommand(union node *cmd, int flags, cmdentry.special = 1; if (cmdentry.special) listsetvar(cmdenviron); + if (argc > 0) + bltinsetlocale(); commandname = argv[0]; argptr = argv + 1; nextopt_optptr = NULL; /* initialize nextopt */ @@ -944,6 +946,8 @@ evalcommand(union node *cmd, int flags, exitstatus = (*builtinfunc[cmdentry.u.index])(argc, argv); flushall(); cmddone: + if (argc > 0) + bltinunsetlocale(); cmdenviron = NULL; out1 = &output; out2 = &errout; @@ -1085,8 +1089,7 @@ breakcmd(int argc, char **argv) int commandcmd(int argc, char **argv) { - static char stdpath[] = _PATH_STDPATH; - char *path; + const char *path; int ch; int cmd = -1; @@ -1097,7 +1100,7 @@ commandcmd(int argc, char **argv) while ((ch = getopt(argc, argv, "pvV")) != -1) { switch (ch) { case 'p': - path = stdpath; + path = _PATH_STDPATH; break; case 'v': cmd = TYPECMD_SMALLV; @@ -1167,6 +1170,12 @@ truecmd(int argc __unused, char **argv _ int execcmd(int argc, char **argv) { + /* + * Because we have historically not supported any options, + * only treat "--" specially. + */ + if (argc > 1 && strcmp(argv[1], "--") == 0) + argc--, argv++; if (argc > 1) { struct strlist *sp; Modified: user/imp/tbemd/bin/sh/expand.c ============================================================================== --- user/imp/tbemd/bin/sh/expand.c Thu Jun 10 20:13:23 2010 (r209005) +++ user/imp/tbemd/bin/sh/expand.c Thu Jun 10 20:15:45 2010 (r209006) @@ -1,6 +1,8 @@ /*- * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. + * Copyright (c) 1997-2005 + * Herbert Xu . All rights reserved. * * This code is derived from software contributed to Berkeley by * Kenneth Almquist. @@ -360,7 +362,7 @@ removerecordregions(int endoff) void expari(int flag) { - char *p, *start; + char *p, *q, *start; arith_t result; int begoff; int quotes = flag & (EXP_FULL | EXP_CASE | EXP_REDIR); @@ -398,7 +400,9 @@ expari(int flag) removerecordregions(begoff); if (quotes) rmescapes(p+2); + q = grabstackstr(expdest); result = arith(p+2); + ungrabstackstr(q, expdest); fmtstr(p, DIGITS(result), ARITH_FORMAT_STR, result); while (*p++) ; @@ -1148,10 +1152,11 @@ expmeta(char *enddir, char *name) struct dirent *dp; int atend; int matchdot; + int esc; metaflag = 0; start = name; - for (p = name ; ; p++) { + for (p = name; esc = 0, *p; p += esc + 1) { if (*p == '*' || *p == '?') metaflag = 1; else if (*p == '[') { @@ -1176,12 +1181,14 @@ expmeta(char *enddir, char *name) break; else if (*p == CTLQUOTEMARK) continue; - else if (*p == CTLESC) - p++; - if (*p == '/') { - if (metaflag) - break; - start = p + 1; + else { + if (*p == CTLESC) + esc++; + if (p[esc] == '/') { + if (metaflag) + break; + start = p + esc + 1; + } } } if (metaflag == 0) { /* we've reached the end of the file name */ @@ -1227,7 +1234,8 @@ expmeta(char *enddir, char *name) atend = 1; } else { atend = 0; - *endname++ = '\0'; + *endname = '\0'; + endname += esc + 1; } matchdot = 0; p = start; @@ -1255,7 +1263,7 @@ expmeta(char *enddir, char *name) } closedir(dirp); if (! atend) - endname[-1] = '/'; + endname[-esc - 1] = esc ? CTLESC : '/'; } Modified: user/imp/tbemd/bin/sh/histedit.c ============================================================================== --- user/imp/tbemd/bin/sh/histedit.c Thu Jun 10 20:13:23 2010 (r209005) +++ user/imp/tbemd/bin/sh/histedit.c Thu Jun 10 20:15:45 2010 (r209006) @@ -98,6 +98,8 @@ histedit(void) /* * turn editing on */ + char *term; + INTOFF; if (el_in == NULL) el_in = fdopen(0, "r"); @@ -107,6 +109,11 @@ histedit(void) el_out = fdopen(2, "w"); if (el_in == NULL || el_err == NULL || el_out == NULL) goto bad; + term = lookupvar("TERM"); + if (term) + setenv("TERM", term, 1); + else + unsetenv("TERM"); el = el_init(arg0, el_in, el_out, el_err); if (el != NULL) { if (hist) @@ -160,6 +167,13 @@ sethistsize(hs) } } +void +setterm(const char *term) +{ + if (rootshell && el != NULL && term != NULL) + el_set(el, EL_TERMINAL, term); +} + int histcmd(int argc, char **argv) { Modified: user/imp/tbemd/bin/sh/jobs.c ============================================================================== --- user/imp/tbemd/bin/sh/jobs.c Thu Jun 10 20:13:23 2010 (r209005) +++ user/imp/tbemd/bin/sh/jobs.c Thu Jun 10 20:15:45 2010 (r209006) @@ -91,6 +91,7 @@ STATIC void freejob(struct job *); STATIC struct job *getjob(char *); STATIC pid_t dowait(int, struct job *); STATIC pid_t waitproc(int, int *); +STATIC void checkzombies(void); STATIC void cmdtxt(union node *); STATIC void cmdputs(const char *); #if JOBS @@ -400,7 +401,7 @@ showjobs(int change, int mode) struct job *jp; TRACE(("showjobs(%d) called\n", change)); - while (dowait(0, (struct job *)NULL) > 0); + checkzombies(); for (jobno = 1, jp = jobtab ; jobno <= njobs ; jobno++, jp++) { if (! jp->used) continue; @@ -742,6 +743,8 @@ forkshell(struct job *jp, union node *n, TRACE(("forkshell(%%%d, %p, %d) called\n", jp - jobtab, (void *)n, mode)); INTOFF; + if (mode == FORK_BG) + checkzombies(); flushall(); pid = fork(); if (pid == -1) { @@ -863,6 +866,7 @@ waitforjob(struct job *jp, int *origstat { #if JOBS pid_t mypgrp = getpgrp(); + int propagate_int = jp->jobctl && jp->foreground; #endif int status; int st; @@ -900,6 +904,11 @@ waitforjob(struct job *jp, int *origstat else CLEAR_PENDING_INT; } +#if JOBS + else if (rootshell && iflag && propagate_int && + WIFSIGNALED(status) && WTERMSIG(status) == SIGINT) + kill(getpid(), SIGINT); +#endif INTON; return st; } @@ -1056,6 +1065,15 @@ stoppedjobs(void) return (0); } + +STATIC void +checkzombies(void) +{ + while (njobs > 0 && dowait(0, NULL) > 0) + ; +} + + /* * Return a string identifying a command (to be printed by the * jobs command. Modified: user/imp/tbemd/bin/sh/main.c ============================================================================== --- user/imp/tbemd/bin/sh/main.c Thu Jun 10 20:13:23 2010 (r209005) +++ user/imp/tbemd/bin/sh/main.c Thu Jun 10 20:15:45 2010 (r209006) @@ -153,10 +153,7 @@ main(int argc, char *argv[]) init(); setstackmark(&smark); procargs(argc, argv); - if (getpwd() == NULL && iflag) - out2fmt_flush("sh: cannot determine working directory\n"); - if (getpwd() != NULL) - setvar ("PWD", getpwd(), VEXPORT); + pwd_init(iflag); if (iflag) chkmail(1); if (argv[0] && argv[0][0] == '-') { @@ -317,14 +314,20 @@ find_dot_file(char *basename) int dotcmd(int argc, char **argv) { - char *fullname; + char *filename, *fullname; if (argc < 2) error("missing filename"); exitstatus = 0; - fullname = find_dot_file(argv[1]); + /* + * Because we have historically not supported any options, + * only treat "--" specially. + */ + filename = argc > 2 && strcmp(argv[1], "--") == 0 ? argv[2] : argv[1]; + + fullname = find_dot_file(filename); setinputfile(fullname, 1); commandname = fullname; cmdloop(0); Modified: user/imp/tbemd/bin/sh/myhistedit.h ============================================================================== --- user/imp/tbemd/bin/sh/myhistedit.h Thu Jun 10 20:13:23 2010 (r209005) +++ user/imp/tbemd/bin/sh/myhistedit.h Thu Jun 10 20:15:45 2010 (r209006) @@ -38,6 +38,7 @@ extern int displayhist; void histedit(void); void sethistsize(const char *); +void setterm(const char *); int histcmd(int, char **); int not_fcnumber(const char *); int str_to_event(const char *, int); Modified: user/imp/tbemd/bin/sh/parser.c ============================================================================== --- user/imp/tbemd/bin/sh/parser.c Thu Jun 10 20:13:23 2010 (r209005) +++ user/imp/tbemd/bin/sh/parser.c Thu Jun 10 20:15:45 2010 (r209006) @@ -203,6 +203,7 @@ parsecmd(int interact) * which could happen if we add command substitution on PS1/PS2. */ parser_temp_free_all(); + heredoclist = NULL; tokpushback = 0; doprompt = interact; @@ -973,6 +974,8 @@ parsebackq(char *out, struct nodelist ** const int bq_startlinno = plinno; char *volatile ostr = NULL; struct parsefile *const savetopfile = getcurrentfile(); + struct heredoc *const saveheredoclist = heredoclist; + struct heredoc *here; str = NULL; if (setjmp(jmploc.loc)) { @@ -981,6 +984,7 @@ parsebackq(char *out, struct nodelist ** ckfree(str); if (ostr) ckfree(ostr); + heredoclist = saveheredoclist; handler = savehandler; if (exception == EXERROR) { startlinno = bq_startlinno; @@ -995,6 +999,7 @@ parsebackq(char *out, struct nodelist ** memcpy(str, stackblock(), savelen); } handler = &jmploc; + heredoclist = NULL; INTON; if (oldstyle) { /* We must read until the closing backquote, giving special @@ -1091,21 +1096,26 @@ done: while (stackblocksize() <= savelen) growstackblock(); STARTSTACKSTR(out); + INTOFF; if (str) { memcpy(out, str, savelen); STADJUST(savelen, out); - INTOFF; ckfree(str); str = NULL; - INTON; } if (ostr) { - INTOFF; ckfree(ostr); ostr = NULL; - INTON; + } + here = saveheredoclist; + if (here != NULL) { + while (here->next != NULL) + here = here->next; + here->next = heredoclist; + heredoclist = saveheredoclist; } handler = savehandler; + INTON; if (quoted) USTPUTC(CTLBACKQ | CTLQUOTE, out); else Modified: user/imp/tbemd/bin/sh/sh.1 ============================================================================== --- user/imp/tbemd/bin/sh/sh.1 Thu Jun 10 20:13:23 2010 (r209005) +++ user/imp/tbemd/bin/sh/sh.1 Thu Jun 10 20:15:45 2010 (r209006) @@ -32,7 +32,7 @@ .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 .\" $FreeBSD$ .\" -.Dd April 5, 2010 +.Dd May 24, 2010 .Dt SH 1 .Os .Sh NAME @@ -415,11 +415,11 @@ character, with the exception of the new .Pq Ql \en . A backslash preceding a newline is treated as a line continuation. .El -.Ss Reserved Words -Reserved words are words that have special meaning to the +.Ss Keywords +Keywords or reserved words are words that have special meaning to the shell and are recognized at the beginning of a line and after a control operator. -The following are reserved words: +The following are keywords: .Bl -column "doneXX" "elifXX" "elseXX" "untilXX" "whileX" -offset center .It Li \&! Ta { Ta } Ta Ic case Ta Ic do .It Ic done Ta Ic elif Ta Ic else Ta Ic esac Ta Ic fi @@ -429,8 +429,8 @@ The following are reserved words: An alias is a name and corresponding value set using the .Ic alias built-in command. -Whenever a reserved word may occur (see above), -and after checking for reserved words, the shell +Whenever a keyword may occur (see above), *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-user@FreeBSD.ORG Fri Jun 11 02:09:18 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B6E511065672; Fri, 11 Jun 2010 02:09:18 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A3F788FC12; Fri, 11 Jun 2010 02:09:18 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o5B29IPR033834; Fri, 11 Jun 2010 02:09:18 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o5B29IgS033828; Fri, 11 Jun 2010 02:09:18 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <201006110209.o5B29IgS033828@svn.freebsd.org> From: Warner Losh Date: Fri, 11 Jun 2010 02:09:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r209023 - in user/imp/tbemd: contrib/llvm/Xcode contrib/llvm/cmake contrib/llvm/projects contrib/llvm/tools/clang/INPUTS contrib/llvm/tools/clang/clang.xcodeproj contrib/llvm/tools/clan... X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Jun 2010 02:09:18 -0000 Author: imp Date: Fri Jun 11 02:09:18 2010 New Revision: 209023 URL: http://svn.freebsd.org/changeset/base/209023 Log: svn merge svn+ssh://svn.freebsd.org/base/head@209022 Deleted: user/imp/tbemd/contrib/llvm/Xcode/ user/imp/tbemd/contrib/llvm/cmake/ user/imp/tbemd/contrib/llvm/projects/ user/imp/tbemd/contrib/llvm/tools/clang/INPUTS/ user/imp/tbemd/contrib/llvm/tools/clang/clang.xcodeproj/ user/imp/tbemd/contrib/llvm/tools/clang/win32/ user/imp/tbemd/contrib/llvm/unittests/ user/imp/tbemd/contrib/llvm/win32/ Modified: user/imp/tbemd/sys/dev/isp/isp_library.c user/imp/tbemd/sys/net80211/ieee80211_hwmp.c user/imp/tbemd/sys/net80211/ieee80211_sta.c user/imp/tbemd/usr.bin/gzip/gzip.c user/imp/tbemd/usr.sbin/sysinstall/tcpip.c Directory Properties: user/imp/tbemd/ (props changed) user/imp/tbemd/cddl/contrib/opensolaris/ (props changed) user/imp/tbemd/contrib/bind9/ (props changed) user/imp/tbemd/contrib/ee/ (props changed) user/imp/tbemd/contrib/expat/ (props changed) user/imp/tbemd/contrib/file/ (props changed) user/imp/tbemd/contrib/gdb/ (props changed) user/imp/tbemd/contrib/gdtoa/ (props changed) user/imp/tbemd/contrib/gnu-sort/ (props changed) user/imp/tbemd/contrib/groff/ (props changed) user/imp/tbemd/contrib/less/ (props changed) user/imp/tbemd/contrib/libpcap/ (props changed) user/imp/tbemd/contrib/ncurses/ (props changed) user/imp/tbemd/contrib/netcat/ (props changed) user/imp/tbemd/contrib/ntp/ (props changed) user/imp/tbemd/contrib/one-true-awk/ (props changed) user/imp/tbemd/contrib/openbsm/ (props changed) user/imp/tbemd/contrib/openpam/ (props changed) user/imp/tbemd/contrib/pf/ (props changed) user/imp/tbemd/contrib/sendmail/ (props changed) user/imp/tbemd/contrib/tcpdump/ (props changed) user/imp/tbemd/contrib/tcsh/ (props changed) user/imp/tbemd/contrib/top/ (props changed) user/imp/tbemd/contrib/top/install-sh (props changed) user/imp/tbemd/contrib/tzcode/stdtime/ (props changed) user/imp/tbemd/contrib/tzcode/zic/ (props changed) user/imp/tbemd/contrib/tzdata/ (props changed) user/imp/tbemd/contrib/wpa/ (props changed) user/imp/tbemd/crypto/openssh/ (props changed) user/imp/tbemd/crypto/openssl/ (props changed) user/imp/tbemd/lib/libc/ (props changed) user/imp/tbemd/lib/libc/stdtime/ (props changed) user/imp/tbemd/lib/libutil/ (props changed) user/imp/tbemd/lib/libz/ (props changed) user/imp/tbemd/sbin/ (props changed) user/imp/tbemd/sbin/ipfw/ (props changed) user/imp/tbemd/share/zoneinfo/ (props changed) user/imp/tbemd/sys/ (props changed) user/imp/tbemd/sys/amd64/include/xen/ (props changed) user/imp/tbemd/sys/cddl/contrib/opensolaris/ (props changed) user/imp/tbemd/sys/contrib/dev/acpica/ (props changed) user/imp/tbemd/sys/contrib/pf/ (props changed) user/imp/tbemd/sys/contrib/x86emu/ (props changed) user/imp/tbemd/sys/dev/xen/xenpci/ (props changed) user/imp/tbemd/usr.bin/csup/ (props changed) user/imp/tbemd/usr.bin/procstat/ (props changed) user/imp/tbemd/usr.sbin/zic/ (props changed) Modified: user/imp/tbemd/sys/dev/isp/isp_library.c ============================================================================== --- user/imp/tbemd/sys/dev/isp/isp_library.c Fri Jun 11 01:32:42 2010 (r209022) +++ user/imp/tbemd/sys/dev/isp/isp_library.c Fri Jun 11 02:09:18 2010 (r209023) @@ -344,7 +344,7 @@ isp_print_qentry(ispsoftc_t *isp, const for (j = 0; j < (QENTRY_LEN >> 2); j++) { ISP_SNPRINTF(buf, TBA, "%s %02x", buf, ptr[amt++] & 0xff); } - isp_prt(isp, ISP_LOGALL, buf); + isp_prt(isp, ISP_LOGALL, "%s", buf); } } Modified: user/imp/tbemd/sys/net80211/ieee80211_hwmp.c ============================================================================== --- user/imp/tbemd/sys/net80211/ieee80211_hwmp.c Fri Jun 11 01:32:42 2010 (r209022) +++ user/imp/tbemd/sys/net80211/ieee80211_hwmp.c Fri Jun 11 02:09:18 2010 (r209023) @@ -707,9 +707,10 @@ hwmp_recv_preq(struct ieee80211vap *vap, rtorig = ieee80211_mesh_rt_find(vap, preq->preq_origaddr); if (rtorig == NULL) rtorig = ieee80211_mesh_rt_add(vap, preq->preq_origaddr); - if (rtorig == NULL) + if (rtorig == NULL) { /* XXX stat */ return; + } hrorig = IEEE80211_MESH_ROUTE_PRIV(rtorig, struct ieee80211_hwmp_route); /* * Sequence number validation. Modified: user/imp/tbemd/sys/net80211/ieee80211_sta.c ============================================================================== --- user/imp/tbemd/sys/net80211/ieee80211_sta.c Fri Jun 11 01:32:42 2010 (r209022) +++ user/imp/tbemd/sys/net80211/ieee80211_sta.c Fri Jun 11 02:09:18 2010 (r209023) @@ -584,7 +584,7 @@ sta_input(struct ieee80211_node *ni, str } IEEE80211_RSSI_LPF(ni->ni_avgrssi, rssi); ni->ni_noise = nf; - if (HAS_SEQ(type)) { + if (HAS_SEQ(type) && !IEEE80211_IS_MULTICAST(wh->i_addr1)) { uint8_t tid = ieee80211_gettid(wh); if (IEEE80211_QOS_HAS_SEQ(wh) && TID_TO_WME_AC(tid) >= WME_AC_VI) Modified: user/imp/tbemd/usr.bin/gzip/gzip.c ============================================================================== --- user/imp/tbemd/usr.bin/gzip/gzip.c Fri Jun 11 01:32:42 2010 (r209022) +++ user/imp/tbemd/usr.bin/gzip/gzip.c Fri Jun 11 02:09:18 2010 (r209023) @@ -65,10 +65,6 @@ __RCSID("$FreeBSD$"); #include #include -#ifndef PRIdOFF -#define PRIdOFF PRId64 -#endif - /* what type of file are we dealing with */ enum filetype { FT_GZIP, @@ -1221,46 +1217,46 @@ file_compress(char *file, char *outfile, in = open(file, O_RDONLY); if (in == -1) { maybe_warn("can't open %s", file); - return -1; + return (-1); } #ifndef SMALL if (fstat(in, &isb) != 0) { maybe_warn("couldn't stat: %s", file); close(in); - return -1; + return (-1); } #endif if (cflag == 0) { #ifndef SMALL - if (isb.st_nlink != 1 && fflag == 0) { - maybe_warnx("%s has %d other link%s -- " - "skipping", file, isb.st_nlink - 1, - isb.st_nlink == 1 ? "" : "s"); + if (isb.st_nlink > 1 && fflag == 0) { + maybe_warnx("%s has %d other link%s -- skipping", + file, isb.st_nlink - 1, + (isb.st_nlink - 1) == 1 ? "" : "s"); close(in); - return -1; + return (-1); } - if (fflag == 0 && (suff = check_suffix(file, 0)) - && suff->zipped[0] != 0) { + if (fflag == 0 && (suff = check_suffix(file, 0)) && + suff->zipped[0] != 0) { maybe_warnx("%s already has %s suffix -- unchanged", - file, suff->zipped); + file, suff->zipped); close(in); - return -1; + return (-1); } #endif /* Add (usually) .gz to filename */ if ((size_t)snprintf(outfile, outsize, "%s%s", - file, suffixes[0].zipped) >= outsize) + file, suffixes[0].zipped) >= outsize) memcpy(outfile + outsize - suffixes[0].ziplen - 1, - suffixes[0].zipped, suffixes[0].ziplen + 1); + suffixes[0].zipped, suffixes[0].ziplen + 1); #ifndef SMALL if (check_outfile(outfile) == 0) { close(in); - return -1; + return (-1); } #endif } @@ -1270,7 +1266,7 @@ file_compress(char *file, char *outfile, if (out == -1) { maybe_warn("could not create output: %s", outfile); fclose(stdin); - return -1; + return (-1); } #ifndef SMALL remove_file = outfile; @@ -1290,7 +1286,7 @@ file_compress(char *file, char *outfile, * has the expected size. */ if (cflag != 0) - return insize == -1 ? -1 : size; + return (insize == -1 ? -1 : size); #ifndef SMALL if (fstat(out, &osb) != 0) { @@ -1299,9 +1295,8 @@ file_compress(char *file, char *outfile, } if (osb.st_size != size) { - maybe_warnx("output file: %s wrong size (%" PRIdOFF - " != %" PRIdOFF "), deleting", - outfile, osb.st_size, size); + maybe_warnx("output file: %s wrong size (%ju != %ju), deleting", + outfile, (uintmax_t)osb.st_size, (uintmax_t)size); goto bad_outfile; } @@ -1313,7 +1308,7 @@ file_compress(char *file, char *outfile, /* output is good, ok to delete input */ unlink_input(file, &isb); - return size; + return (size); #ifndef SMALL bad_outfile: @@ -1322,7 +1317,7 @@ file_compress(char *file, char *outfile, maybe_warnx("leaving original %s", file); unlink(outfile); - return size; + return (size); #endif } @@ -1570,9 +1565,8 @@ file_uncompress(char *file, char *outfil return -1; } if (osb.st_size != size) { - maybe_warnx("stat gave different size: %" PRIdOFF - " != %" PRIdOFF " (leaving original)", - size, osb.st_size); + maybe_warnx("stat gave different size: %ju != %ju (leaving original)", + (uintmax_t)size, (uintmax_t)osb.st_size); close(ofd); unlink(outfile); return -1; Modified: user/imp/tbemd/usr.sbin/sysinstall/tcpip.c ============================================================================== --- user/imp/tbemd/usr.sbin/sysinstall/tcpip.c Fri Jun 11 01:32:42 2010 (r209022) +++ user/imp/tbemd/usr.sbin/sysinstall/tcpip.c Fri Jun 11 02:09:18 2010 (r209023) @@ -732,6 +732,9 @@ tcpDeviceSelect(void) return (NULL); } + devs = deviceFind(NULL, DEVICE_TYPE_NETWORK); + cnt = deviceCount(devs); + if ((!RunningAsInit) && (variable_check("NETWORK_CONFIGURED=NO") != TRUE)) { if (!msgYesNo("Running multi-user, assume that the network is already configured?")) return devs[0]; From owner-svn-src-user@FreeBSD.ORG Fri Jun 11 08:13:27 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0E9161065676; Fri, 11 Jun 2010 08:13:27 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id F33B78FC16; Fri, 11 Jun 2010 08:13:26 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o5B8DQta015727; Fri, 11 Jun 2010 08:13:26 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o5B8DQJc015726; Fri, 11 Jun 2010 08:13:26 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201006110813.o5B8DQJc015726@svn.freebsd.org> From: Doug Barton Date: Fri, 11 Jun 2010 08:13:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r209036 - user/dougb/portmaster X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Jun 2010 08:13:27 -0000 Author: dougb Date: Fri Jun 11 08:13:26 2010 New Revision: 209036 URL: http://svn.freebsd.org/changeset/base/209036 Log: In delete_all_distfiles() when there is no $origin (such as when a port has moved) but there IS a /var/db/ports//distfiles, we do not want to prompt the user if they are using -d, we just want to delete the files. In the code to strip a port from $build_l if the user chose not to update a port that has an +IGNOREME file, the backslash in "\t" needs to be escaped. Modified: user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Fri Jun 11 06:04:14 2010 (r209035) +++ user/dougb/portmaster/portmaster Fri Jun 11 08:13:26 2010 (r209036) @@ -1648,9 +1648,16 @@ delete_all_distfiles () { echo " Try ${0##*/} --clean-distfiles[-all] for a full cleanup" echo '' if [ -n "$dist_list_files" ]; then - echo "===>>> However, the list of files in $dist_list" - echo -n " should be current. Delete the files on this list? y/n [n] " - local answer f ; read answer + local answer f + # Outdent + if [ -z "$ALWAYS_SCRUB_DISTFILES" ]; then + echo "===>>> However, the list of files in $dist_list" + echo -n " should be current. Delete the files on this list? y/n [n] " + read answer + else + answer=y + fi + # Outdent case "$answer" in [yY]) for f in $dist_list_files; do if [ -f "${DISTDIR}${f}" ]; then @@ -2756,7 +2763,7 @@ if [ -e "$pdb/$upg_port/+IGNOREME" ]; th dep_of_deps=$(( $dep_of_deps - 1 )) if [ -n "$CONFIG_ONLY" ]; then num_of_deps=$(( $num_of_deps - 1 )) - build_l="${build_l%\t*}" + build_l="${build_l%\\t*}" fi fi # Outdent From owner-svn-src-user@FreeBSD.ORG Sat Jun 12 05:16:37 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8CEA51065673; Sat, 12 Jun 2010 05:16:37 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 7D7A28FC1C; Sat, 12 Jun 2010 05:16:37 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o5C5Gbje099250; Sat, 12 Jun 2010 05:16:37 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o5C5GbhJ099248; Sat, 12 Jun 2010 05:16:37 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201006120516.o5C5GbhJ099248@svn.freebsd.org> From: Doug Barton Date: Sat, 12 Jun 2010 05:16:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r209088 - user/dougb/portmaster X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Jun 2010 05:16:37 -0000 Author: dougb Date: Sat Jun 12 05:16:37 2010 New Revision: 209088 URL: http://svn.freebsd.org/changeset/base/209088 Log: Apparently, in some circumstances it's necessary to run ldconfig -R when one moves shared libs from /usr/local/lib to /usr/local/lib/compat/pkg. So, add that to the -w code. Modified: user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Sat Jun 12 04:41:13 2010 (r209087) +++ user/dougb/portmaster/portmaster Sat Jun 12 05:16:37 2010 (r209088) @@ -3281,6 +3281,8 @@ if [ -n "$upg_port" -o -n "$ro_upg_port" pm_sv Copying old shared libraries for -w $PM_SU_CMD cp -p $temp ${LOCALBASE_COMPAT}/ + pm_sv Running ldconfig + $PM_SU_CMD /etc/rc.d/ldconfig start > /dev/null fi pm_unlink $ldconfig_out ; unset ldconfig_out temp file From owner-svn-src-user@FreeBSD.ORG Sat Jun 12 06:00:48 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BCD1B106564A; Sat, 12 Jun 2010 06:00:48 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id AD50D8FC14; Sat, 12 Jun 2010 06:00:48 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o5C60mTT009096; Sat, 12 Jun 2010 06:00:48 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o5C60mxr009094; Sat, 12 Jun 2010 06:00:48 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201006120600.o5C60mxr009094@svn.freebsd.org> From: Doug Barton Date: Sat, 12 Jun 2010 06:00:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r209091 - user/dougb/portmaster X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Jun 2010 06:00:48 -0000 Author: dougb Date: Sat Jun 12 06:00:48 2010 New Revision: 209091 URL: http://svn.freebsd.org/changeset/base/209091 Log: There is no reason for uniquify_list() to reverse the entries Add code to post_config() to make sure that things in the build_only_dl_g are not listed as run dependencies for something already installed. Modified: user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Sat Jun 12 05:22:55 2010 (r209090) +++ user/dougb/portmaster/portmaster Sat Jun 12 06:00:48 2010 (r209091) @@ -2033,7 +2033,7 @@ uniquify_list () { for item in "$@"; do case "$temp_list" in *" $item "*) ;; - *) temp_list=" $item $temp_list" ;; + *) temp_list=" $temp_list $item " ;; esac done @@ -2314,7 +2314,7 @@ echo " all of the above try adding dep_of_deps=0 if [ -n "$PM_BUILD_ONLY_LIST" ]; then - local var real_rundep deplist dep + local var real_rundep deplist dep temp_bodlg for var in $rundep_list ; do real_rundep=no @@ -2332,6 +2332,13 @@ echo " all of the above try adding eval unset $var ${var}_p done + for dep in $build_only_dl_g; do + grep -q "@comment DEPORIGIN:${dep#$pd/}$" $pdb/*/+CONTENTS || + temp_bodlg="$temp_bodlg $dep" + done + + build_only_dl_g=" `uniquify_list $temp_bodlg` " + unset run_dl_g rundep_list PM_BUILD_ONLY_LIST=pm_bol fi