From owner-p4-projects Wed Jan 1 13:40:24 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4235D37B406; Wed, 1 Jan 2003 13:40:22 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D84A037B401 for ; Wed, 1 Jan 2003 13:40:21 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DF2C643EC2 for ; Wed, 1 Jan 2003 13:40:20 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h01LeKfh018037 for ; Wed, 1 Jan 2003 13:40:20 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h01LeKPZ018016 for perforce@freebsd.org; Wed, 1 Jan 2003 13:40:20 -0800 (PST) Date: Wed, 1 Jan 2003 13:40:20 -0800 (PST) Message-Id: <200301012140.h01LeKPZ018016@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 23028 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=23028 Change 23028 by marcel@marcel_nfs on 2003/01/01 13:39:52 On second thought, don't set RB_SERIAL if we happen to have a HCDP table. The existence of the HCDP table does not imply that the console is in fact serial. Affected files ... .. //depot/projects/ia64/sys/ia64/ia64/sio_machdep.c#9 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia64/sio_machdep.c#9 (text+ko) ==== @@ -32,7 +32,7 @@ #include #include #include -#include + #include #include #include @@ -95,7 +95,6 @@ if (ent->type != DIG64_HCDP_CONSOLE) continue; - boothowto |= RB_SERIAL; cd->bsh = ent->address.addr_high; cd->bsh = (cd->bsh << 32) + ent->address.addr_low; cd->bst = (ent->address.addr_space == 0) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jan 1 14: 3:53 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B581837B405; Wed, 1 Jan 2003 14:03:50 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4860D37B401 for ; Wed, 1 Jan 2003 14:03:50 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D638643EB2 for ; Wed, 1 Jan 2003 14:03:49 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h01M3nfh028014 for ; Wed, 1 Jan 2003 14:03:49 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h01M3nKH028011 for perforce@freebsd.org; Wed, 1 Jan 2003 14:03:49 -0800 (PST) Date: Wed, 1 Jan 2003 14:03:49 -0800 (PST) Message-Id: <200301012203.h01M3nKH028011@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 23029 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=23029 Change 23029 by marcel@marcel_nfs on 2003/01/01 14:03:34 Manually inline handleclock() at the one and only call-site. Remove handleclock(). While here, reload cr.itm (interval timer match register) based on the old value of cr.itm and not cr.itc (interval timer counter). The value of cr.itc is non-deterministicly close to the value of cr.itm at the time of the interrupt. The SDM clearly states that they are not guaranteed to be identical, even though the interrupt is triggered when cr.itc equals cr.itm). Reloading cr.itm based on the value of cr.itc will therefore introduce a non-deterministic error in the clocks. This will also reduce clock skew due to interrupt latency. Affected files ... .. //depot/projects/ia64/sys/ia64/ia64/clock.c#13 edit .. //depot/projects/ia64/sys/ia64/ia64/interrupt.c#21 edit .. //depot/projects/ia64/sys/ia64/include/clock.h#6 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia64/clock.c#13 (text+ko) ==== @@ -254,13 +254,6 @@ } #endif -void -handleclock(void* arg) -{ - ia64_set_itm(ia64_get_itc() + (itc_frequency + hz/2) / hz); - hardclock(arg); -} - /* * We assume newhz is either stathz or profhz, and that neither will * change after being set up above. Could recalculate intervals here ==== //depot/projects/ia64/sys/ia64/ia64/interrupt.c#21 (text+ko) ==== @@ -128,13 +128,14 @@ /* Only the BSP runs the real clock */ if (PCPU_GET(cpuid) == 0) { #endif - handleclock(framep); + ia64_set_itm(ia64_get_itm() + itm_reload); + hardclock((struct clockframe *)framep); /* divide hz (1024) by 8 to get stathz (128) */ if ((++schedclk2 & 0x7) == 0) statclock((struct clockframe *)framep); #ifdef SMP } else { - ia64_set_itm(ia64_get_itc() + itm_reload); + ia64_set_itm(ia64_get_itm() + itm_reload); mtx_lock_spin(&sched_lock); hardclock_process(curthread, TRAPF_USERMODE(framep)); if ((schedclk2 & 0x7) == 0) ==== //depot/projects/ia64/sys/ia64/include/clock.h#6 (text+ko) ==== @@ -23,7 +23,6 @@ int sysbeep(int pitch, int period); int acquire_timer2(int mode); int release_timer2(void); -void handleclock(void *arg); #endif To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jan 1 14: 9: 0 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9184C37B405; Wed, 1 Jan 2003 14:08:57 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 29DC237B401 for ; Wed, 1 Jan 2003 14:08:57 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B62E743EA9 for ; Wed, 1 Jan 2003 14:08:56 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h01M8ufh028291 for ; Wed, 1 Jan 2003 14:08:56 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h01M8uvE028288 for perforce@freebsd.org; Wed, 1 Jan 2003 14:08:56 -0800 (PST) Date: Wed, 1 Jan 2003 14:08:56 -0800 (PST) Message-Id: <200301012208.h01M8uvE028288@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 23030 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=23030 Change 23030 by marcel@marcel_nfs on 2003/01/01 14:08:12 In map_pal_code() and map_port_space(), purge the TRs before we insert a new translation. This avoids machine checks when overlapping translations already exist. Affected files ... .. //depot/projects/ia64/sys/ia64/ia64/machdep.c#58 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia64/machdep.c#58 (text+ko) ==== @@ -293,19 +293,20 @@ pte.pte_ar = PTE_AR_RWX; pte.pte_ppn = ia64_pal_base >> 12; - __asm __volatile("mov %0=psr;;" : "=r" (psr)); - __asm __volatile("rsm psr.ic|psr.i;;"); - __asm __volatile("srlz.d"); + __asm __volatile("ptr.d %0,%1; ptr.i %0,%1" :: + "r"(IA64_PHYS_TO_RR7(ia64_pal_base)), "r"(28 << 2)); + + __asm __volatile("mov %0=psr" : "=r"(psr)); + __asm __volatile("rsm psr.ic|psr.i"); + __asm __volatile("srlz.i"); __asm __volatile("mov cr.ifa=%0" :: "r"(IA64_PHYS_TO_RR7(ia64_pal_base))); - __asm __volatile("mov cr.itir=%0;;" :: "r"(28 << 2)); - __asm __volatile("itr.d dtr[%0]=%1;;" :: "r"(1), - "r"(*(u_int64_t*)&pte)); + __asm __volatile("mov cr.itir=%0" :: "r"(28 << 2)); + __asm __volatile("itr.d dtr[%0]=%1" :: "r"(1), "r"(*(u_int64_t*)&pte)); __asm __volatile("srlz.d"); /* XXX not needed. */ - __asm __volatile("itr.i itr[%0]=%1;;" :: "r"(1), - "r"(*(u_int64_t*)&pte)); + __asm __volatile("itr.i itr[%0]=%1" :: "r"(1), "r"(*(u_int64_t*)&pte)); __asm __volatile("mov psr.l=%0" :: "r" (psr)); - __asm __volatile("srlz.i;;"); + __asm __volatile("srlz.i"); } void @@ -327,14 +328,15 @@ pte.pte_ar = PTE_AR_RW; pte.pte_ppn = ia64_port_base >> 12; - __asm __volatile("mov %0=psr;;" : "=r" (psr)); - __asm __volatile("rsm psr.ic|psr.i;;"); + __asm __volatile("ptr.d %0,%1" :: "r"(ia64_port_base), "r"(24 << 2)); + + __asm __volatile("mov %0=psr" : "=r" (psr)); + __asm __volatile("rsm psr.ic|psr.i"); __asm __volatile("srlz.d"); __asm __volatile("mov cr.ifa=%0" :: "r"(ia64_port_base)); /* XXX We should use the size from the memory descriptor. */ - __asm __volatile("mov cr.itir=%0;;" :: "r"(24 << 2)); - __asm __volatile("itr.d dtr[%0]=%1;;" :: "r"(2), - "r"(*(u_int64_t*)&pte)); + __asm __volatile("mov cr.itir=%0" :: "r"(24 << 2)); + __asm __volatile("itr.d dtr[%0]=%1" :: "r"(2), "r"(*(u_int64_t*)&pte)); __asm __volatile("mov psr.l=%0" :: "r" (psr)); __asm __volatile("srlz.d"); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jan 1 14:26:24 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2725D37B405; Wed, 1 Jan 2003 14:26:19 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B41D537B401 for ; Wed, 1 Jan 2003 14:26:18 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6AA5D43EB2 for ; Wed, 1 Jan 2003 14:26:18 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h01MQIfh035404 for ; Wed, 1 Jan 2003 14:26:18 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h01MQHEa035401 for perforce@freebsd.org; Wed, 1 Jan 2003 14:26:17 -0800 (PST) Date: Wed, 1 Jan 2003 14:26:17 -0800 (PST) Message-Id: <200301012226.h01MQHEa035401@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 23031 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=23031 Change 23031 by marcel@marcel_nfs on 2003/01/01 14:25:52 I cannot convince myself that reloading cr.itm with a delta of cr.itm and not a delta of cr.itc without the logic to detect missed interrupts is not going to harm. Revert the change and add a comment. We should really use cr.itm, but we need to check for missed interrupts so that we don't reload with a value that is smaller than the current counter and thus don't get timer interrupts until the 64-bit counter wraps. Affected files ... .. //depot/projects/ia64/sys/ia64/ia64/interrupt.c#22 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia64/interrupt.c#22 (text+ko) ==== @@ -128,14 +128,16 @@ /* Only the BSP runs the real clock */ if (PCPU_GET(cpuid) == 0) { #endif - ia64_set_itm(ia64_get_itm() + itm_reload); + /* XXX don't reload ITM based on ITC. */ + ia64_set_itm(ia64_get_itc() + itm_reload); hardclock((struct clockframe *)framep); /* divide hz (1024) by 8 to get stathz (128) */ if ((++schedclk2 & 0x7) == 0) statclock((struct clockframe *)framep); #ifdef SMP } else { - ia64_set_itm(ia64_get_itm() + itm_reload); + /* XXX don't reload ITM based on ITC. */ + ia64_set_itm(ia64_get_itc() + itm_reload); mtx_lock_spin(&sched_lock); hardclock_process(curthread, TRAPF_USERMODE(framep)); if ((schedclk2 & 0x7) == 0) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jan 1 15:37:25 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D873237B405; Wed, 1 Jan 2003 15:37:01 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6B79537B401 for ; Wed, 1 Jan 2003 15:37:01 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0B04443EC2 for ; Wed, 1 Jan 2003 15:37:00 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h01Naxfh060142 for ; Wed, 1 Jan 2003 15:36:59 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h01NahRo060138 for perforce@freebsd.org; Wed, 1 Jan 2003 15:36:43 -0800 (PST) Date: Wed, 1 Jan 2003 15:36:43 -0800 (PST) Message-Id: <200301012336.h01NahRo060138@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 23032 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=23032 Change 23032 by marcel@marcel_vaio on 2003/01/01 15:35:59 IFC @23027 Affected files ... .. //depot/projects/ia64/UPDATING#27 integrate .. //depot/projects/ia64/bin/chio/chio.1#2 integrate .. //depot/projects/ia64/bin/csh/USD.doc/csh.1#2 integrate .. //depot/projects/ia64/bin/csh/USD.doc/csh.g#3 integrate .. //depot/projects/ia64/bin/ed/io.c#4 integrate .. //depot/projects/ia64/bin/pax/ar_io.c#5 integrate .. //depot/projects/ia64/bin/pax/buf_subs.c#6 integrate .. //depot/projects/ia64/bin/pax/cache.c#4 integrate .. //depot/projects/ia64/bin/pax/cpio.c#5 integrate .. //depot/projects/ia64/bin/pax/ftree.c#6 integrate .. //depot/projects/ia64/bin/pax/options.c#7 integrate .. //depot/projects/ia64/bin/pax/pat_rep.c#6 integrate .. //depot/projects/ia64/bin/pax/pax.h#4 integrate .. //depot/projects/ia64/bin/pax/sel_subs.c#5 integrate .. //depot/projects/ia64/bin/pax/tables.c#4 integrate .. //depot/projects/ia64/etc/MAKEDEV#15 integrate .. //depot/projects/ia64/games/fortune/Notes#2 integrate .. //depot/projects/ia64/games/fortune/datfiles/fortunes#21 integrate .. //depot/projects/ia64/games/fortune/datfiles/fortunes2#13 integrate .. //depot/projects/ia64/games/fortune/datfiles/fortunes2-o#5 integrate .. //depot/projects/ia64/games/fortune/datfiles/murphy#2 integrate .. //depot/projects/ia64/games/primes/pattern.c#4 integrate .. //depot/projects/ia64/games/primes/primes.h#3 integrate .. //depot/projects/ia64/include/rpc/auth.h#4 integrate .. //depot/projects/ia64/include/rpc/rpc_msg.h#3 integrate .. //depot/projects/ia64/include/rpc/xdr.h#5 integrate .. //depot/projects/ia64/include/rpcsvc/nis.x#2 integrate .. //depot/projects/ia64/lib/libalias/alias_nbt.c#4 integrate .. //depot/projects/ia64/lib/libalias/alias_proxy.c#4 integrate .. //depot/projects/ia64/lib/libc/db/btree/bt_utils.c#3 integrate .. //depot/projects/ia64/lib/libc/gen/getcap.3#4 integrate .. //depot/projects/ia64/lib/libc/gen/getnetgrent.c#4 integrate .. //depot/projects/ia64/lib/libc/gen/nlist.c#3 integrate .. //depot/projects/ia64/lib/libc/gen/psignal.3#2 integrate .. //depot/projects/ia64/lib/libc/i386/string/swab.S#3 integrate .. //depot/projects/ia64/lib/libc/ia64/gen/__moddi3.S#2 integrate .. //depot/projects/ia64/lib/libc/ia64/gen/__umoddi3.S#2 integrate .. //depot/projects/ia64/lib/libc/locale/wcstoimax.c#2 integrate .. //depot/projects/ia64/lib/libc/net/inet_neta.c#3 integrate .. //depot/projects/ia64/lib/libc/net/ns_name.c#3 integrate .. //depot/projects/ia64/lib/libc/rpc/PSD.doc/rpc.prog.ms#4 integrate .. //depot/projects/ia64/lib/libc/rpc/PSD.doc/xdr.nts.ms#3 integrate .. //depot/projects/ia64/lib/libc/rpc/rpc_svc_calls.3#4 integrate .. //depot/projects/ia64/lib/libc/stdlib/strtoimax.c#6 integrate .. //depot/projects/ia64/lib/libc/sys/socket.2#6 integrate .. //depot/projects/ia64/lib/libdisk/libdisk.h#11 integrate .. //depot/projects/ia64/lib/libedit/chared.h#3 integrate .. //depot/projects/ia64/lib/libedit/common.c#2 integrate .. //depot/projects/ia64/lib/libedit/emacs.c#2 integrate .. //depot/projects/ia64/lib/libedit/key.c#2 integrate .. //depot/projects/ia64/lib/libedit/vi.c#2 integrate .. //depot/projects/ia64/lib/libipsec/ipsec_set_policy.3#4 integrate .. //depot/projects/ia64/lib/libnetgraph/sock.c#2 integrate .. //depot/projects/ia64/lib/libutil/realhostname_sa.3#2 integrate .. //depot/projects/ia64/lib/libvgl/vgl.3#2 integrate .. //depot/projects/ia64/lib/msun/bsdsrc/b_log.c#3 integrate .. //depot/projects/ia64/lib/msun/src/k_tan.c#3 integrate .. //depot/projects/ia64/libexec/bootpd/getether.c#4 integrate .. //depot/projects/ia64/libexec/getty/chat.c#3 integrate .. //depot/projects/ia64/libexec/mknetid/hash.c#3 integrate .. //depot/projects/ia64/libexec/mknetid/mknetid.8#4 integrate .. //depot/projects/ia64/libexec/rtld-aout/dynamic.h#2 integrate .. //depot/projects/ia64/libexec/rtld-aout/rtld.c#4 integrate .. //depot/projects/ia64/release/Makefile#33 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#17 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#31 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/sparc64/Makefile#2 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/sparc64/article.sgml#3 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/sparc64/proc-sparc64.sgml#4 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/installation/common/trouble.sgml#8 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#60 integrate .. //depot/projects/ia64/release/doc/fr_FR.ISO8859-1/hardware/alpha/proc-alpha.sgml#3 integrate .. //depot/projects/ia64/release/doc/fr_FR.ISO8859-1/installation/common/trouble.sgml#2 integrate .. //depot/projects/ia64/release/scripts/print-cdrom-packages.sh#21 integrate .. //depot/projects/ia64/sbin/atm/ilmid/ilmid.c#5 integrate .. //depot/projects/ia64/sbin/fdisk/fdisk.c#14 integrate .. //depot/projects/ia64/sbin/fdisk_pc98/fdisk.c#6 integrate .. //depot/projects/ia64/sbin/growfs/growfs.c#8 integrate .. //depot/projects/ia64/sbin/ipfw/ipfw2.c#10 integrate .. //depot/projects/ia64/sbin/mount_ext2fs/mount_ext2fs.8#5 integrate .. //depot/projects/ia64/sbin/natd/natd.c#4 integrate .. //depot/projects/ia64/sbin/routed/if.c#3 integrate .. //depot/projects/ia64/sbin/routed/table.c#3 integrate .. //depot/projects/ia64/sbin/savecore/savecore.c#16 integrate .. //depot/projects/ia64/sbin/umount/umount.c#5 integrate .. //depot/projects/ia64/share/doc/IPv6/IMPLEMENTATION#2 integrate .. //depot/projects/ia64/share/doc/papers/diskperf/motivation.ms#2 integrate .. //depot/projects/ia64/share/doc/papers/diskperf/tests.ms#2 integrate .. //depot/projects/ia64/share/doc/papers/sysperf/4.t#2 integrate .. //depot/projects/ia64/share/doc/papers/sysperf/5.t#2 integrate .. //depot/projects/ia64/share/doc/psd/21.ipc/3.t#2 integrate .. //depot/projects/ia64/share/doc/smm/01.setup/3.t#2 integrate .. //depot/projects/ia64/share/doc/smm/05.fastfs/3.t#2 integrate .. //depot/projects/ia64/share/doc/smm/06.nfs/1.t#2 integrate .. //depot/projects/ia64/share/doc/smm/06.nfs/2.t#2 integrate .. //depot/projects/ia64/share/doc/smm/18.net/7.t#2 integrate .. //depot/projects/ia64/share/doc/usd/18.msdiffs/ms.diffs#2 integrate .. //depot/projects/ia64/share/doc/usd/21.troff/m1#2 integrate .. //depot/projects/ia64/share/doc/usd/21.troff/m2#2 integrate .. //depot/projects/ia64/share/doc/usd/22.trofftut/tt04#2 integrate .. //depot/projects/ia64/share/examples/ipfilter/examples.txt#2 integrate .. //depot/projects/ia64/share/examples/ipfilter/ipf-howto.txt#2 integrate .. //depot/projects/ia64/share/examples/isdn/FAQ#4 integrate .. //depot/projects/ia64/share/examples/isdn/Overview#2 integrate .. //depot/projects/ia64/share/examples/isdn/i4brunppp/README#2 integrate .. //depot/projects/ia64/share/examples/isdn/i4brunppp/i4brunppp.c#2 integrate .. //depot/projects/ia64/share/examples/ppp/ppp.conf.sample#3 integrate .. //depot/projects/ia64/share/man/man4/Makefile#29 integrate .. //depot/projects/ia64/share/man/man4/blackhole.4#2 integrate .. //depot/projects/ia64/share/man/man4/ciss.4#1 branch .. //depot/projects/ia64/share/man/man4/keyboard.4#2 integrate .. //depot/projects/ia64/share/man/man4/polling.4#4 integrate .. //depot/projects/ia64/share/man/man4/tcp.4#12 integrate .. //depot/projects/ia64/share/man/man4/wi.4#9 integrate .. //depot/projects/ia64/share/man/man5/msdosfs.5#3 integrate .. //depot/projects/ia64/share/man/man9/scheduler.9#4 integrate .. //depot/projects/ia64/share/termcap/map3270#2 integrate .. //depot/projects/ia64/sys/boot/ficl/words.c#4 integrate .. //depot/projects/ia64/sys/boot/i386/Makefile#6 integrate .. //depot/projects/ia64/sys/boot/i386/liloldr/Makefile#3 delete .. //depot/projects/ia64/sys/boot/i386/liloldr/lilobsect.s#2 delete .. //depot/projects/ia64/sys/boot/i386/liloldr/liloldr.s#2 delete .. //depot/projects/ia64/sys/cam/cam_queue.c#2 integrate .. //depot/projects/ia64/sys/compat/linux/linux_util.h#5 integrate .. //depot/projects/ia64/sys/conf/NOTES#32 integrate .. //depot/projects/ia64/sys/conf/files#53 integrate .. //depot/projects/ia64/sys/conf/majors#17 integrate .. //depot/projects/ia64/sys/ddb/db_break.c#3 integrate .. //depot/projects/ia64/sys/ddb/db_break.h#3 integrate .. //depot/projects/ia64/sys/ddb/ddb.h#7 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_pci_link.c#5 integrate .. //depot/projects/ia64/sys/dev/aha/aha.c#4 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/ahc_eisa.c#7 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/ahc_pci.c#9 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/ahd_pci.c#6 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx.c#6 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx.c#8 integrate .. //depot/projects/ia64/sys/dev/amr/amr.c#10 integrate .. //depot/projects/ia64/sys/dev/ar/if_arregs.h#2 integrate .. //depot/projects/ia64/sys/dev/asr/asr.c#10 integrate .. //depot/projects/ia64/sys/dev/asr/osd_util.h#4 integrate .. //depot/projects/ia64/sys/dev/ccd/ccd.c#11 integrate .. //depot/projects/ia64/sys/dev/cm/smc90cx6.c#5 integrate .. //depot/projects/ia64/sys/dev/ed/if_ed.c#7 integrate .. //depot/projects/ia64/sys/dev/ed/if_ed_cbus.c#3 integrate .. //depot/projects/ia64/sys/dev/em/if_em_hw.h#7 integrate .. //depot/projects/ia64/sys/dev/firewire/fwcrom.c#1 branch .. //depot/projects/ia64/sys/dev/firewire/fwohci.c#5 integrate .. //depot/projects/ia64/sys/dev/firewire/fwohci_pci.c#6 integrate .. //depot/projects/ia64/sys/dev/firewire/fwohcireg.h#3 integrate .. //depot/projects/ia64/sys/dev/firewire/fwohcivar.h#3 integrate .. //depot/projects/ia64/sys/dev/firewire/sbp.c#6 integrate .. //depot/projects/ia64/sys/dev/hea/eni.h#5 integrate .. //depot/projects/ia64/sys/dev/idt/idt.c#2 integrate .. //depot/projects/ia64/sys/dev/idt/idtvar.h#2 integrate .. //depot/projects/ia64/sys/dev/isp/Hardware.txt#2 integrate .. //depot/projects/ia64/sys/dev/isp/isp.c#14 integrate .. //depot/projects/ia64/sys/dev/isp/isp_target.c#6 integrate .. //depot/projects/ia64/sys/dev/isp/isp_tpublic.h#2 integrate .. //depot/projects/ia64/sys/dev/lmc/if_lmc.c#5 integrate .. //depot/projects/ia64/sys/dev/nge/if_nge.c#14 integrate .. //depot/projects/ia64/sys/dev/ppbus/if_plip.c#4 integrate .. //depot/projects/ia64/sys/dev/ppbus/ppi.c#4 integrate .. //depot/projects/ia64/sys/dev/pst/pst-iop.c#3 integrate .. //depot/projects/ia64/sys/dev/puc/puc.c#12 integrate .. //depot/projects/ia64/sys/dev/raidframe/rf_freebsdkintf.c#4 integrate .. //depot/projects/ia64/sys/dev/ray/if_ray.c#4 integrate .. //depot/projects/ia64/sys/dev/sound/isa/mss.c#6 integrate .. //depot/projects/ia64/sys/dev/sound/pci/als4000.c#2 integrate .. //depot/projects/ia64/sys/dev/sound/pci/cmi.c#6 integrate .. //depot/projects/ia64/sys/dev/sym/sym_fw1.h#3 integrate .. //depot/projects/ia64/sys/dev/sym/sym_fw2.h#3 integrate .. //depot/projects/ia64/sys/dev/sym/sym_hipd.c#8 integrate .. //depot/projects/ia64/sys/dev/ubsec/ubsec.c#6 integrate .. //depot/projects/ia64/sys/dev/ubsec/ubsecvar.h#2 integrate .. //depot/projects/ia64/sys/dev/usb/uhci.c#12 integrate .. //depot/projects/ia64/sys/dev/usb/ulpt.c#9 integrate .. //depot/projects/ia64/sys/dev/usb/umass.c#16 integrate .. //depot/projects/ia64/sys/dev/usb/urio.c#8 integrate .. //depot/projects/ia64/sys/dev/usb/usb_quirks.c#3 integrate .. //depot/projects/ia64/sys/dev/usb/usbdevs#19 integrate .. //depot/projects/ia64/sys/dev/usb/usbdevs.h#18 integrate .. //depot/projects/ia64/sys/dev/usb/usbdevs_data.h#18 integrate .. //depot/projects/ia64/sys/dev/wl/if_wl.c#6 integrate .. //depot/projects/ia64/sys/dev/zs/z8530reg.h#1 branch .. //depot/projects/ia64/sys/dev/zs/zs.c#1 branch .. //depot/projects/ia64/sys/fs/hpfs/hpfs_vnops.c#15 integrate .. //depot/projects/ia64/sys/fs/nullfs/null_vnops.c#9 integrate .. //depot/projects/ia64/sys/fs/smbfs/smbfs_smb.c#7 integrate .. //depot/projects/ia64/sys/gnu/ext2fs/ext2_linux_balloc.c#3 integrate .. //depot/projects/ia64/sys/gnu/ext2fs/ext2_vfsops.c#14 integrate .. //depot/projects/ia64/sys/i386/i386/mem.c#7 integrate .. //depot/projects/ia64/sys/i386/i386/pmap.c#30 integrate .. //depot/projects/ia64/sys/i386/ibcs2/ibcs2_misc.c#6 integrate .. //depot/projects/ia64/sys/i386/include/limits.h#5 integrate .. //depot/projects/ia64/sys/i386/isa/if_el.c#4 integrate .. //depot/projects/ia64/sys/i386/isa/istallion.c#3 integrate .. //depot/projects/ia64/sys/i386/isa/mse.c#4 integrate .. //depot/projects/ia64/sys/i386/isa/pcf.c#4 integrate .. //depot/projects/ia64/sys/i4b/layer3/i4b_q931.h#3 integrate .. //depot/projects/ia64/sys/i4b/layer4/i4b_l4mgmt.c#5 integrate .. //depot/projects/ia64/sys/ia64/include/limits.h#5 integrate .. //depot/projects/ia64/sys/kern/imgact_gzip.c#7 integrate .. //depot/projects/ia64/sys/kern/imgact_shell.c#4 integrate .. //depot/projects/ia64/sys/kern/kern_acl.c#14 integrate .. //depot/projects/ia64/sys/kern/kern_descrip.c#41 integrate .. //depot/projects/ia64/sys/kern/kern_event.c#12 integrate .. //depot/projects/ia64/sys/kern/kern_exec.c#38 integrate .. //depot/projects/ia64/sys/kern/kern_fork.c#26 integrate .. //depot/projects/ia64/sys/kern/kern_proc.c#28 integrate .. //depot/projects/ia64/sys/kern/kern_time.c#14 integrate .. //depot/projects/ia64/sys/kern/subr_bus.c#14 integrate .. //depot/projects/ia64/sys/kern/sys_socket.c#13 integrate .. //depot/projects/ia64/sys/kern/tty_subr.c#3 integrate .. //depot/projects/ia64/sys/kern/vfs_bio.c#31 integrate .. //depot/projects/ia64/sys/kern/vfs_mount.c#10 integrate .. //depot/projects/ia64/sys/libkern/ia64/__moddi3.S#2 integrate .. //depot/projects/ia64/sys/libkern/ia64/__umoddi3.S#2 integrate .. //depot/projects/ia64/sys/modules/firewire/firewire/Makefile#4 integrate .. //depot/projects/ia64/sys/net/if_iso88025subr.c#6 integrate .. //depot/projects/ia64/sys/net/if_var.h#16 integrate .. //depot/projects/ia64/sys/netatm/atm_cm.c#10 integrate .. //depot/projects/ia64/sys/netatm/spans/spans_kxdr.h#2 integrate .. //depot/projects/ia64/sys/netatm/spans/spans_msg.c#6 integrate .. //depot/projects/ia64/sys/netatm/spans/spans_util.c#3 integrate .. //depot/projects/ia64/sys/netatm/uni/sscop_lower.c#5 integrate .. //depot/projects/ia64/sys/netatm/uni/unisig_print.c#3 integrate .. //depot/projects/ia64/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#3 integrate .. //depot/projects/ia64/sys/netgraph/ng_base.c#9 integrate .. //depot/projects/ia64/sys/netgraph/ng_socket.c#10 integrate .. //depot/projects/ia64/sys/netinet/in.h#16 integrate .. //depot/projects/ia64/sys/netinet/ip_dummynet.c#14 integrate .. //depot/projects/ia64/sys/netinet/ip_output.c#19 integrate .. //depot/projects/ia64/sys/netinet6/in6_cksum.c#3 integrate .. //depot/projects/ia64/sys/netinet6/ip6_var.h#4 integrate .. //depot/projects/ia64/sys/netinet6/ipsec.c#6 integrate .. //depot/projects/ia64/sys/netinet6/nd6_nbr.c#5 integrate .. //depot/projects/ia64/sys/netinet6/nd6_rtr.c#6 integrate .. //depot/projects/ia64/sys/netipsec/ipsec.c#2 integrate .. //depot/projects/ia64/sys/netipsec/key.c#2 integrate .. //depot/projects/ia64/sys/netipx/ipx_pcb.h#3 integrate .. //depot/projects/ia64/sys/netkey/key.c#8 integrate .. //depot/projects/ia64/sys/netsmb/smb.h#6 integrate .. //depot/projects/ia64/sys/netsmb/smb_dev.c#4 integrate .. //depot/projects/ia64/sys/nfsclient/bootp_subr.c#10 integrate .. //depot/projects/ia64/sys/nfsserver/nfs_serv.c#15 integrate .. //depot/projects/ia64/sys/pc98/conf/GENERIC#22 integrate .. //depot/projects/ia64/sys/pc98/pc98/mse.c#4 integrate .. //depot/projects/ia64/sys/pc98/pc98/olpt.c#2 integrate .. //depot/projects/ia64/sys/pc98/pc98/sio.c#17 integrate .. //depot/projects/ia64/sys/pccard/pcic_isa.c#3 integrate .. //depot/projects/ia64/sys/pci/if_de.c#6 integrate .. //depot/projects/ia64/sys/pci/if_xl.c#15 integrate .. //depot/projects/ia64/sys/pci/ncr.c#4 integrate .. //depot/projects/ia64/sys/powerpc/include/limits.h#5 integrate .. //depot/projects/ia64/sys/sparc64/conf/GENERIC#24 integrate .. //depot/projects/ia64/sys/sparc64/include/limits.h#5 integrate .. //depot/projects/ia64/sys/sparc64/pci/psycho.c#14 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/cache.c#8 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/interrupt.S#3 integrate .. //depot/projects/ia64/sys/sys/_timeval.h#1 branch .. //depot/projects/ia64/sys/sys/copyright.h#3 integrate .. //depot/projects/ia64/sys/sys/filedesc.h#11 integrate .. //depot/projects/ia64/sys/sys/namei.h#6 integrate .. //depot/projects/ia64/sys/sys/proc.h#42 integrate .. //depot/projects/ia64/sys/sys/protosw.h#5 integrate .. //depot/projects/ia64/sys/sys/select.h#7 integrate .. //depot/projects/ia64/sys/sys/sigio.h#1 branch .. //depot/projects/ia64/sys/sys/soundcard.h#3 integrate .. //depot/projects/ia64/sys/sys/time.h#12 integrate .. //depot/projects/ia64/sys/sys/unpcb.h#3 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_alloc.c#15 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_softdep.c#20 integrate .. //depot/projects/ia64/sys/ufs/ufs/dirhash.h#3 integrate .. //depot/projects/ia64/sys/vm/uma_core.c#31 integrate .. //depot/projects/ia64/sys/vm/vm_map.c#39 integrate .. //depot/projects/ia64/sys/vm/vm_map.h#19 integrate .. //depot/projects/ia64/sys/vm/vm_object.c#35 integrate .. //depot/projects/ia64/sys/vm/vm_page.c#31 integrate .. //depot/projects/ia64/sys/x86_64/include/limits.h#4 integrate .. //depot/projects/ia64/tools/tools/mid/mid-build#2 integrate .. //depot/projects/ia64/usr.bin/chat/chat.8#3 integrate .. //depot/projects/ia64/usr.bin/cmp/cmp.1#2 integrate .. //depot/projects/ia64/usr.bin/compress/doc/README#3 integrate .. //depot/projects/ia64/usr.bin/indent/indent.c#6 integrate .. //depot/projects/ia64/usr.bin/ldd/ldd.1#5 integrate .. //depot/projects/ia64/usr.bin/lex/flexdef.h#2 integrate .. //depot/projects/ia64/usr.bin/lex/lex.1#3 integrate .. //depot/projects/ia64/usr.bin/make/suff.c#8 integrate .. //depot/projects/ia64/usr.bin/nm/nm.c#4 integrate .. //depot/projects/ia64/usr.bin/pr/pr.c#7 integrate .. //depot/projects/ia64/usr.bin/sed/misc.c#4 integrate .. //depot/projects/ia64/usr.bin/talk/display.c#4 integrate .. //depot/projects/ia64/usr.bin/talk/invite.c#3 integrate .. //depot/projects/ia64/usr.bin/tr/tr.1#5 integrate .. //depot/projects/ia64/usr.bin/tset/tset.1#3 integrate .. //depot/projects/ia64/usr.bin/xlint/lint1/decl.c#3 integrate .. //depot/projects/ia64/usr.bin/xlint/lint1/emit1.c#5 integrate .. //depot/projects/ia64/usr.bin/xlint/lint1/init.c#5 integrate .. //depot/projects/ia64/usr.bin/xlint/lint1/lint1.h#5 integrate .. //depot/projects/ia64/usr.bin/xlint/lint1/scan.l#3 integrate .. //depot/projects/ia64/usr.bin/xlint/lint1/tree.c#3 integrate .. //depot/projects/ia64/usr.bin/xlint/lint2/main2.c#5 integrate .. //depot/projects/ia64/usr.bin/xlint/lint2/read.c#3 integrate .. //depot/projects/ia64/usr.sbin/IPXrouted/sap_tables.c#2 integrate .. //depot/projects/ia64/usr.sbin/bluetooth/hccontrol/status.c#4 integrate .. //depot/projects/ia64/usr.sbin/ctm/mkCTM/mkCTM#2 integrate .. //depot/projects/ia64/usr.sbin/faithd/README#4 integrate .. //depot/projects/ia64/usr.sbin/i4b/dtmfdecode/dtmfdecode.c#2 integrate .. //depot/projects/ia64/usr.sbin/i4b/isdnd/isdnd.rc.5#5 integrate .. //depot/projects/ia64/usr.sbin/i4b/isdnmonitor/monitor.h#2 integrate .. //depot/projects/ia64/usr.sbin/moused/moused.c#6 integrate .. //depot/projects/ia64/usr.sbin/ndp/ndp.8#3 integrate .. //depot/projects/ia64/usr.sbin/ntp/config.h#4 integrate .. //depot/projects/ia64/usr.sbin/ntp/doc/ntp-genkeys.8#4 integrate .. //depot/projects/ia64/usr.sbin/ntp/doc/ntp.conf.5#7 integrate .. //depot/projects/ia64/usr.sbin/pccard/pccardd/cardd.c#5 integrate .. //depot/projects/ia64/usr.sbin/pcvt/Misc/Doc/NotesAndHints#2 integrate .. //depot/projects/ia64/usr.sbin/pcvt/keycap/man5/keycap.5#2 integrate .. //depot/projects/ia64/usr.sbin/pcvt/userkeys/vt220keys.1#3 integrate .. //depot/projects/ia64/usr.sbin/pkg_install/add/pkg_add.1#7 integrate .. //depot/projects/ia64/usr.sbin/ppp/ipcp.c#7 integrate .. //depot/projects/ia64/usr.sbin/pppd/RELNOTES#2 integrate .. //depot/projects/ia64/usr.sbin/pppd/fsm.c#3 integrate .. //depot/projects/ia64/usr.sbin/pppd/ipxcp.c#2 integrate .. //depot/projects/ia64/usr.sbin/pppd/lcp.c#2 integrate .. //depot/projects/ia64/usr.sbin/pppd/pppd.8#4 integrate .. //depot/projects/ia64/usr.sbin/prefix/prefix.8#5 integrate .. //depot/projects/ia64/usr.sbin/route6d/route6d.c#2 integrate .. //depot/projects/ia64/usr.sbin/rpcbind/rpcb_svc_com.c#4 integrate .. //depot/projects/ia64/usr.sbin/rpcbind/rpcbind.c#8 integrate .. //depot/projects/ia64/usr.sbin/rpcbind/warmstart.c#3 integrate .. //depot/projects/ia64/usr.sbin/rtadvd/config.c#4 integrate .. //depot/projects/ia64/usr.sbin/setkey/sample.cf#2 integrate .. //depot/projects/ia64/usr.sbin/setkey/setkey.8#5 integrate .. //depot/projects/ia64/usr.sbin/stallion/bootcode/stl.4#2 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/sysinstall.8#8 integrate .. //depot/projects/ia64/usr.sbin/tcpdump/tcpdump/config.h#3 integrate .. //depot/projects/ia64/usr.sbin/timed/SMM.doc/timed/timed.ms#2 integrate .. //depot/projects/ia64/usr.sbin/traceroute6/traceroute6.c#3 integrate .. //depot/projects/ia64/usr.sbin/watch/watch.8#5 integrate .. //depot/projects/ia64/usr.sbin/ypserv/ypinit.sh#2 integrate Differences ... ==== //depot/projects/ia64/UPDATING#27 (text+ko) ==== @@ -30,7 +30,7 @@ A name change in /etc/netconfig has been reverted to stay compatible with with suns TIRPC and also with NetBSD. You need to run mergemaster after make world. A new libc does still work - with a outdated /etc/netconfig for some time, but you'll get + with an outdated /etc/netconfig for some time, but you'll get a warning. This warning will be removed in 20030301. 20021202: @@ -267,7 +267,7 @@ MACHINE_ARCH to indicate the target. In the future, one will set TARGET_MACHINE where you set MACHINE now. At the moment, setting MACHINE alone for same MACHINE_ARCH machines works - (eg, you can build pc98 on a i386 machine and vice versa). + (eg, you can build pc98 on an i386 machine and vice versa). 20010927: Some weird problems result from using ACPI on some machines. @@ -1171,4 +1171,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.232 2002/12/22 07:08:14 kan Exp $ +$FreeBSD: src/UPDATING,v 1.233 2003/01/01 18:48:38 schweikh Exp $ ==== //depot/projects/ia64/bin/chio/chio.1#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/bin/chio/chio.1,v 1.21 2001/08/10 17:35:07 ru Exp $ +.\" $FreeBSD: src/bin/chio/chio.1,v 1.22 2003/01/01 18:48:38 schweikh Exp $ .\" .Dd May 14, 1998 .Dt CHIO 1 @@ -190,7 +190,7 @@ .Xc Change volume tag for an element in the media changer. This command is only supported by few media changers. If it is not supported by a -device, using this command will usually result in a "Invalid Field in +device, using this command will usually result in an "Invalid Field in CDB" error message on the console. .Pp If the ==== //depot/projects/ia64/bin/csh/USD.doc/csh.1#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)csh.1 8.1 (Berkeley) 6/8/93 -.\" $FreeBSD: src/bin/csh/USD.doc/csh.1,v 1.10 2001/07/15 07:49:00 dd Exp $ +.\" $FreeBSD: src/bin/csh/USD.doc/csh.1,v 1.11 2002/12/30 21:18:01 schweikh Exp $ .\" .EH 'USD:4-%''An Introduction to the C shell' .OH 'An Introduction to the C shell''USD:4-%' @@ -739,7 +739,7 @@ echo * .DE will not echo the character `*'. -It will either echo an sorted list of filenames in the +It will either echo a sorted list of filenames in the current .I "working directory," or print the message `No match' if there are ==== //depot/projects/ia64/bin/csh/USD.doc/csh.g#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)csh.g 8.1 (Berkeley) 6/8/93 -.\" $FreeBSD: src/bin/csh/USD.doc/csh.g,v 1.6 2002/08/21 17:32:29 trhodes Exp $ +.\" $FreeBSD: src/bin/csh/USD.doc/csh.g,v 1.7 2002/12/30 21:18:01 schweikh Exp $ .\" .SH Glossary @@ -57,20 +57,20 @@ .I pwd; see also .I dirs. -The current directory `.' is usually the first -.I component +The current directory `.' is usually the first +.I component of the search path contained in the variable .I path , thus commands which are in `.' are found first (2.2). -The character `.' is also used in separating -.I components +The character `.' is also used in separating +.I components of filenames (1.6). -The character `.' at the beginning of a -.I component -of a -.I pathname -is treated specially and not matched by the +The character `.' at the beginning of a +.I component +of a +.I pathname +is treated specially and not matched by the .I "filename expansion" metacharacters `?', `*', and `[' `]' pairs (1.6). .IP \&\fB..\fR @@ -91,22 +91,22 @@ (2.7). .IP a.out Compilers which create executable images create them, by default, in the -file +file .I a.out. for historical reasons (2.3). .IP "absolute pathname" .br -A -.I pathname +A +.I pathname which begins with a `/' is .I absolute -since it specifies the -.I path +since it specifies the +.I path of directories from the beginning of the entire directory system \- called the .I root -directory. -.I Pathname s +directory. +.I Pathname s which are not .I absolute are called @@ -122,17 +122,17 @@ the shell. The shell has a command .I alias -which establishes -.I aliases +which establishes +.I aliases and can print their current values. The command .I unalias -is used to remove -.I aliases +is used to remove +.I aliases (2.4). .IP argument -Commands in \s-2UNIX\s0 receive a list of -.I argument +Commands in \s-2UNIX\s0 receive a list of +.I argument words. Thus the command .DS @@ -140,11 +140,11 @@ .DE consists of the .I "command name" -`echo' and three -.I argument +`echo' and three +.I argument words `a', `b' and `c'. -The set of -.I arguments +The set of +.I arguments after the .I "command name" is said to be the @@ -164,8 +164,8 @@ .IP base A filename is sometimes thought of as consisting of a .I base -part, before any `.' character, and an -.I extension +part, before any `.' character, and an +.I extension \- the part after the `.'. See .I filename @@ -176,17 +176,17 @@ The .I bg command causes a -.I suspended +.I suspended job to continue execution in the .I background (2.6). .IP bin A directory containing binaries of programs and shell scripts to be -executed is typically called a -.I bin +executed is typically called a +.I bin directory. -The standard system -.I bin +The standard system +.I bin directories are `/bin' containing the most heavily used commands and `/usr/bin' which contains most other user programs. @@ -195,8 +195,8 @@ `/usr/games'. You can place binaries in any directory. If you wish to execute them often, the name of the directories -should be a -.I component +should be a +.I component of the variable .I path . .IP break @@ -216,8 +216,8 @@ .I builtin command. Most commands in \s-2UNIX\s0 are not built into the shell, -but rather exist as files in -.I bin +but rather exist as files in +.I bin directories. These commands are accessible because the directories in which they reside are named in the @@ -234,19 +234,19 @@ .IP cat The .I cat -program catenates a list of specified files on the +program catenates a list of specified files on the .I "standard output" . It is usually used to look at the contents of a single file on the terminal, to `cat a file' (1.8, 2.3). .IP cd The .I cd -command is used to change the +command is used to change the .I "working directory" . With no arguments, .I cd -changes your -.I "working directory" +changes your +.I "working directory" to be your .I home directory (2.4, 2.7). @@ -261,7 +261,7 @@ The .I chsh command is used to change the shell which you use on \s-2UNIX\s0. -By default, you use an different version of the shell +By default, you use a different version of the shell which resides in `/bin/sh'. You can change your shell to `/bin/csh' by doing .DS @@ -285,7 +285,7 @@ described in `diff (1)' is used. .IP command A function performed by the system, either by the shell -(a builtin +(a builtin .I command ) or by a program residing in a file in a directory within the \s-2UNIX\s0 system, is called a @@ -302,7 +302,7 @@ .IP "command substitution" .br The replacement of a command enclosed in `\`' characters -by the text output by that command +by the text output by that command is called .I "command substitution" (4.3). @@ -311,7 +311,7 @@ .I pathname between `/' characters is called a .I component -of that +of that .I pathname . A variable which has multiple strings as value is said to have @@ -337,7 +337,7 @@ the \s-2SHIFT\s0 key is used to produce upper case characters. Thus .I control- c is produced by holding down the \s-2CONTROL\s0 key while pressing the -`c' key. Usually \s-2UNIX\s0 prints an caret (^) followed by the +`c' key. Usually \s-2UNIX\s0 prints a caret (^) followed by the corresponding letter when you type a .I control character (e.g. `^C' for @@ -346,7 +346,7 @@ .IP "core\ dump" When a program terminates abnormally, the system places an image of its current state in a file named `core'. -This +This .I "core dump" can be examined with the system debugger `adb (1)' or `sdb (1)' in order to determine what went wrong with the program (1.8). @@ -356,7 +356,7 @@ .DE (where `Illegal instruction' is only one of several possible messages), you should report this to the author of the program -or a system administrator, +or a system administrator, saving the `core' file. .IP cp The @@ -396,8 +396,8 @@ .I Debugging is the process of correcting mistakes in programs and shell scripts. The shell has several options and variables which may be used -to aid in shell -.I debugging +to aid in shell +.I debugging (4.4). .IP default: The label @@ -416,37 +416,37 @@ key on the terminal normally causes an interrupt to be sent to the current job. Many users change the interrupt character to be ^C. .IP detached -A command that continues running in the -.I background -after you logout is said to be +A command that continues running in the +.I background +after you logout is said to be .I detached . .IP diagnostic An error message produced by a program is often referred to as a .I diagnostic . -Most error messages are not written to the +Most error messages are not written to the .I "standard output" , since that is often directed away from the terminal (1.3, 1.5). Error messsages are instead written to the .I "diagnostic output" which may be directed away from the terminal, but usually is not. -Thus -.I diagnostics +Thus +.I diagnostics will usually appear on the terminal (2.5). .IP directory A structure which contains files. -At any time you are in one particular -.I directory -whose names can be printed by the command +At any time you are in one particular +.I directory +whose names can be printed by the command .I pwd . The .I chdir -command will change you to another -.I directory , +command will change you to another +.I directory , and make the files -in that -.I directory -visible. The -.I directory +in that +.I directory +visible. The +.I directory in which you are when you first login is your .I home directory (1.1, 2.7). @@ -470,7 +470,7 @@ The .I dirs command prints the shell's -.I "directory stack" +.I "directory stack" (2.7). .IP du The @@ -511,13 +511,13 @@ it has been given as input. Commands receiving input from a .I pipe -receive an -.I "end\f1-\fPof\f1-\fPfile" +receive an +.I "end\f1-\fPof\f1-\fPfile" when the command sending them input completes. -Most commands terminate when they receive an +Most commands terminate when they receive an .I "end\f1-\fPof\f1-\fPfile" . -The shell has an option to ignore -.I "end\f1-\fPof\f1-\fPfile" +The shell has an option to ignore +.I "end\f1-\fPof\f1-\fPfile" from a terminal input which may help you keep from logging out accidentally by typing too many control-d's (1.1, 1.8, 3.8). @@ -539,15 +539,15 @@ .I escape s `*' (1.7). There is also a non-printing character called -.I escape , +.I escape , usually labelled \s-2ESC\s0 or \s-2ALTMODE\s0 on terminal keyboards. Some older \s-2UNIX\s0 systems use this character to indicate that -output is to be -.I suspended . +output is to be +.I suspended . Most systems use control-s to stop the output and control-q to start it. .IP /etc/passwd This file contains information about the accounts currently on the @@ -579,7 +579,7 @@ The .I exit command can be used to force a shell command script to give a non-zero -.I "exit status" +.I "exit status" (3.6). .IP expansion The replacement of strings in the shell input which contain metacharacters @@ -589,17 +589,17 @@ in the current directory is a `filename expansion'. Similarly the replacement of the characters `!!' by the text of the last command is a `history expansion'. -.I Expansions +.I Expansions are also referred to as .I substitutions (1.6, 3.4, 4.2). .IP expressions -.I Expressions +.I Expressions are used in the shell to control the conditional structures used in the writing of shell scripts and in calculating values for these scripts. -The operators available in shell -.I expressions +The operators available in shell +.I expressions are those of the language C (3.5). .IP extension @@ -608,8 +608,8 @@ name and an .I extension separated by the character `.'. -By convention, groups of related files often share the same -.I root +By convention, groups of related files often share the same +.I root name. Thus if `prog.c' were a C program, then the object file for this program would be stored in `prog.o'. @@ -636,28 +636,28 @@ Each file in \s-2UNIX\s0 has a name consisting of up to 14 characters and not including the character `/' which is used in .I pathname -building. Most +building. Most .I filenames -do not begin with the character `.', and contain +do not begin with the character `.', and contain only letters and digits with perhaps a `.' separating the .I base -portion of the -.I filename -from an -.I extension +portion of the +.I filename +from an +.I extension (1.6). .IP "filename expansion" .br -.I "Filename expansion" +.I "Filename expansion" uses the metacharacters `*', `?' and `[' and `]' to provide a convenient mechanism for naming files. -Using -.I "filename expansion" +Using +.I "filename expansion" it is easy to name all the files in -the current directory, or all files which have a common -.I root -name. Other -.I "filename expansion" +the current directory, or all files which have a common +.I root +name. Other +.I "filename expansion" mechanisms use the metacharacter `~' and allow files in other users' directories to be named easily (1.6, 4.2). .IP flag @@ -687,7 +687,7 @@ command they are said to be .I "foreground jobs" or -.I "running in the foreground" \&. +.I "running in the foreground" \&. This is as opposed to .I background . .I Foreground @@ -711,14 +711,14 @@ which contains the string `bill'. Actually, .I grep -scans for +scans for .I "regular expressions" in the sense of the editors `ed (1)' and `ex (1)'. .I Grep stands for -`globally find -.I "regular expression" +`globally find +.I "regular expression" and print' (2.4). .IP head The @@ -742,8 +742,8 @@ .I head or .I tail -of a -.I pathname +of a +.I pathname stored in a shell variable to be used (3.6). .IP history The @@ -758,7 +758,7 @@ variable which controls how large this list is (2.3). .IP "home\ directory" .br -Each user has a +Each user has a .I "home directory" , which is given in your entry in the password file, @@ -771,11 +771,11 @@ command with no arguments takes you back to this directory, whose name is recorded in the shell variable .I home . -You can also access the -.I "home directories" +You can also access the +.I "home directories" of other users in forming -filenames using a -.I "filename expansion" +filenames using a +.I "filename expansion" notation and the character `~' (1.6). .IP if A conditional command within the shell, the @@ -804,26 +804,26 @@ files which they then act on. This information is called .I input . -Commands normally read for -.I input +Commands normally read for +.I input from their .I "standard input" which is, by default, the terminal. -This -.I "standard input" +This +.I "standard input" can be redirected from a file using a shell metanotation with the character `<'. Many commands will also read from a file specified as argument. -Commands placed in +Commands placed in .I pipelines will read from the output of the previous -command in the +command in the .I pipeline . -The leftmost command in a -.I pipeline +The leftmost command in a +.I pipeline reads from the terminal if -you neither redirect its -.I input +you neither redirect its +.I input nor give it a filename to use as .I "standard input" . Special mechanisms exist for supplying input to commands in shell @@ -835,18 +835,18 @@ of UNIX the \s-2RUBOUT\s0 or \s-2DELETE\s0 key were used for this purpose.) It causes most programs to stop execution. Certain programs, such as the shell and the editors, -handle an -.I interrupt +handle an +.I interrupt in special ways, usually by stopping what they are doing and prompting for another command. While the shell is executing another command and waiting for it -to finish, the shell does not listen to +to finish, the shell does not listen to .I interrupts. -The shell often wakes up when you hit -.I interrupt +The shell often wakes up when you hit +.I interrupt because many commands -die when they receive an -.I interrupt +die when they receive an +.I interrupt (1.8, 3.9). .IP job One or more commands @@ -854,7 +854,7 @@ are run together and are called a .I job \&. Simple commands run by themselves without any `|' or `;' characters -are the simplest >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jan 2 1:47:17 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8164A37B405; Thu, 2 Jan 2003 01:47:15 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F3CF437B401; Thu, 2 Jan 2003 01:47:14 -0800 (PST) Received: from herring.nlsystems.com (mailgate.nlsystems.com [62.49.251.130]) by mx1.FreeBSD.org (Postfix) with ESMTP id 485E043EA9; Thu, 2 Jan 2003 01:47:13 -0800 (PST) (envelope-from dfr@nlsystems.com) Received: from herring.nlsystems.com (herring.nlsystems.com [10.0.0.2]) by herring.nlsystems.com (8.12.6/8.12.6) with ESMTP id h029l4OR023552; Thu, 2 Jan 2003 09:47:04 GMT (envelope-from dfr@nlsystems.com) Content-Type: text/plain; charset="iso-8859-1" From: Doug Rabson To: Marcel Moolenaar , Perforce Change Reviews Subject: Re: PERFORCE change 23031 for review Date: Thu, 2 Jan 2003 09:47:04 +0000 User-Agent: KMail/1.4.3 References: <200301012226.h01MQHEa035401@repoman.freebsd.org> In-Reply-To: <200301012226.h01MQHEa035401@repoman.freebsd.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-Id: <200301020947.04412.dfr@nlsystems.com> X-Spam-Status: No, hits=-7.7 required=6.0 tests=IN_REP_TO,QUOTED_EMAIL_TEXT,REFERENCES,SPAM_PHRASE_00_01, USER_AGENT,USER_AGENT_KMAIL version=2.41 Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Wednesday 01 January 2003 10:26 pm, Marcel Moolenaar wrote: > http://perforce.freebsd.org/chv.cgi?CH=3D23031 > > Change 23031 by marcel@marcel_nfs on 2003/01/01 14:25:52 > > =09I cannot convince myself that reloading cr.itm with a delta > =09of cr.itm and not a delta of cr.itc without the logic to > =09detect missed interrupts is not going to harm. Revert the > =09change and add a comment. We should really use cr.itm, but > =09we need to check for missed interrupts so that we don't > =09reload with a value that is smaller than the current counter > =09and thus don't get timer interrupts until the 64-bit counter > =09wraps. It doesn't matter much if there is some inaccuracy in the frequency of=20 calls to hardclock since the actual time is read from the timecounter.=20 The HZ poll rate is used for scheduling and similar, not for timing. --=20 Doug Rabson=09=09=09=09Mail: dfr@nlsystems.com =09=09=09=09=09Phone: +44 20 8348 6160 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jan 2 7:59:33 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7A4FE37B406; Thu, 2 Jan 2003 07:59:31 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8AAE737B401 for ; Thu, 2 Jan 2003 07:59:23 -0800 (PST) Received: from mail.speakeasy.net (mail11.speakeasy.net [216.254.0.211]) by mx1.FreeBSD.org (Postfix) with ESMTP id C6A0F43E4A for ; Thu, 2 Jan 2003 07:59:22 -0800 (PST) (envelope-from jhb@FreeBSD.org) Received: (qmail 23284 invoked from network); 2 Jan 2003 15:59:25 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) by mail11.speakeasy.net (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP for ; 2 Jan 2003 15:59:25 -0000 Received: from laptop.baldwin.cx (laptop.baldwin.cx [192.168.0.4]) by server.baldwin.cx (8.12.6/8.12.6) with ESMTP id h02FxLUT059855; Thu, 2 Jan 2003 10:59:21 -0500 (EST) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.2 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: <200301012203.h01M3nKH028011@repoman.freebsd.org> Date: Thu, 02 Jan 2003 10:59:29 -0500 (EST) From: John Baldwin To: Marcel Moolenaar Subject: RE: PERFORCE change 23029 for review Cc: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On 01-Jan-2003 Marcel Moolenaar wrote: > http://perforce.freebsd.org/chv.cgi?CH=23029 > > Change 23029 by marcel@marcel_nfs on 2003/01/01 14:03:34 > > Manually inline handleclock() at the one and only call-site. > Remove handleclock(). I should do this on alpha as well. -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jan 2 7:59:34 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0925B37B40C; Thu, 2 Jan 2003 07:59:32 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7014D37B405 for ; Thu, 2 Jan 2003 07:59:25 -0800 (PST) Received: from mail.speakeasy.net (mail14.speakeasy.net [216.254.0.214]) by mx1.FreeBSD.org (Postfix) with ESMTP id AACDC43EB2 for ; Thu, 2 Jan 2003 07:59:24 -0800 (PST) (envelope-from jhb@FreeBSD.org) Received: (qmail 8781 invoked from network); 2 Jan 2003 15:59:26 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) by mail14.speakeasy.net (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP for ; 2 Jan 2003 15:59:26 -0000 Received: from laptop.baldwin.cx (laptop.baldwin.cx [192.168.0.4]) by server.baldwin.cx (8.12.6/8.12.6) with ESMTP id h02FxMUT059859; Thu, 2 Jan 2003 10:59:22 -0500 (EST) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.2 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: <200301012203.h01M3nKH028011@repoman.freebsd.org> Date: Thu, 02 Jan 2003 10:59:30 -0500 (EST) From: John Baldwin To: Marcel Moolenaar Subject: RE: PERFORCE change 23029 for review Cc: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On 01-Jan-2003 Marcel Moolenaar wrote: > http://perforce.freebsd.org/chv.cgi?CH=23029 > > Change 23029 by marcel@marcel_nfs on 2003/01/01 14:03:34 > > While here, reload cr.itm (interval timer match register) > based on the old value of cr.itm and not cr.itc (interval > timer counter). The value of cr.itc is non-deterministicly > close to the value of cr.itm at the time of the interrupt. > The SDM clearly states that they are not guaranteed to be > identical, even though the interrupt is triggered when > cr.itc equals cr.itm). Reloading cr.itm based on the value > of cr.itc will therefore introduce a non-deterministic error > in the clocks. This will also reduce clock skew due to > interrupt latency. Cool. Peter says the Linux code does something similar but goes to extra efforts to handle the case of missing entire ticks and what not.w -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jan 2 9: 3:21 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0618437B405; Thu, 2 Jan 2003 09:03:20 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 924BE37B401 for ; Thu, 2 Jan 2003 09:03:19 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4B94F43EA9 for ; Thu, 2 Jan 2003 09:03:19 -0800 (PST) (envelope-from green@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h02H3Jfh039142 for ; Thu, 2 Jan 2003 09:03:19 -0800 (PST) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h02H3Ib8039139 for perforce@freebsd.org; Thu, 2 Jan 2003 09:03:18 -0800 (PST) Date: Thu, 2 Jan 2003 09:03:18 -0800 (PST) Message-Id: <200301021703.h02H3Ib8039139@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 23045 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=23045 Change 23045 by green@green_laptop_2 on 2003/01/02 09:02:32 * In SEBSD's query_user_context(), detect an EOF and stop looping for input in that case. Affected files ... .. //depot/projects/trustedbsd/mac/lib/libsebsd/query_user_context.c#2 edit Differences ... ==== //depot/projects/trustedbsd/mac/lib/libsebsd/query_user_context.c#2 (text+ko) ==== @@ -63,6 +63,10 @@ return (-1); if (response == NULL) continue; + if (response[0] == '\0') { /* EOF */ + free(response); + return (-1); + } if (sscanf(response, "%d", &number_response) != 1 || number_response < 1 || number_response > length) { (void)pam_prompt(pamh, PAM_TEXT_INFO, &discard, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jan 2 10:16:52 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3FB1437B405; Thu, 2 Jan 2003 10:16:50 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CBC4637B401 for ; Thu, 2 Jan 2003 10:16:49 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5AF9743EC5 for ; Thu, 2 Jan 2003 10:16:49 -0800 (PST) (envelope-from green@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h02IGnfh065244 for ; Thu, 2 Jan 2003 10:16:49 -0800 (PST) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h02IGmIV065241 for perforce@freebsd.org; Thu, 2 Jan 2003 10:16:48 -0800 (PST) Date: Thu, 2 Jan 2003 10:16:48 -0800 (PST) Message-Id: <200301021816.h02IGmIV065241@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 23047 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=23047 Change 23047 by green@green_laptop_2 on 2003/01/02 10:15:51 * You won't be able to tell a single "enter" from an EOF from pam_prompt(3) without an error return value, so fix the openpam_ttyconv(3) function so that it returns error on EOF. Affected files ... .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_ttyconv.c#10 edit .. //depot/projects/trustedbsd/mac/lib/libsebsd/query_user_context.c#3 edit Differences ... ==== //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_ttyconv.c#10 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_ttyconv.c#9 $ + * $P4: //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_ttyconv.c#10 $ */ #include @@ -89,7 +89,7 @@ sigaction(SIGALRM, &saved_action, NULL); sigprocmask(SIG_SETMASK, &saved_sigset, NULL); alarm(saved_alarm); - if (timed_out || ferror(stdin)) + if (timed_out || ferror(stdin) || feof(stdin)) return (NULL); /* trim trailing whitespace */ for (len = strlen(buf); len > 0; --len) ==== //depot/projects/trustedbsd/mac/lib/libsebsd/query_user_context.c#3 (text+ko) ==== @@ -62,11 +62,7 @@ "Enter number of choice: ")) return (-1); if (response == NULL) - continue; - if (response[0] == '\0') { /* EOF */ - free(response); return (-1); - } if (sscanf(response, "%d", &number_response) != 1 || number_response < 1 || number_response > length) { (void)pam_prompt(pamh, PAM_TEXT_INFO, &discard, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jan 2 11:20:43 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ADC1837B406; Thu, 2 Jan 2003 11:20:18 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3FB4737B401 for ; Thu, 2 Jan 2003 11:20:18 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E1ACC43EDC for ; Thu, 2 Jan 2003 11:20:15 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h02JKFfh088747 for ; Thu, 2 Jan 2003 11:20:15 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h02JK8hQ088631 for perforce@freebsd.org; Thu, 2 Jan 2003 11:20:08 -0800 (PST) Date: Thu, 2 Jan 2003 11:20:08 -0800 (PST) Message-Id: <200301021920.h02JK8hQ088631@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 23051 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=23051 Change 23051 by jhb@jhb_laptop on 2003/01/02 11:19:33 IFC. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/pmap.c#41 integrate .. //depot/projects/smpng/sys/alpha/alpha/sys_machdep.c#12 integrate .. //depot/projects/smpng/sys/alpha/alpha/vm_machdep.c#19 integrate .. //depot/projects/smpng/sys/alpha/include/limits.h#5 integrate .. //depot/projects/smpng/sys/alpha/osf1/osf1_misc.c#19 integrate .. //depot/projects/smpng/sys/alpha/osf1/osf1_mount.c#6 integrate .. //depot/projects/smpng/sys/alpha/osf1/osf1_signal.c#14 integrate .. //depot/projects/smpng/sys/alpha/osf1/osf1_util.h#5 integrate .. //depot/projects/smpng/sys/arm/include/limits.h#3 integrate .. //depot/projects/smpng/sys/boot/alpha/common/conf.c#2 integrate .. //depot/projects/smpng/sys/boot/arc/loader/conf.c#2 integrate .. //depot/projects/smpng/sys/boot/common/loader.8#18 integrate .. //depot/projects/smpng/sys/boot/common/ufsread.c#5 integrate .. //depot/projects/smpng/sys/boot/efi/Makefile.inc#5 integrate .. //depot/projects/smpng/sys/boot/efi/include/efilib.h#2 integrate .. //depot/projects/smpng/sys/boot/efi/libefi/Makefile#7 integrate .. //depot/projects/smpng/sys/boot/efi/libefi/arch/ia64/start.S#5 integrate .. //depot/projects/smpng/sys/boot/efi/libefi/bootinfo.c#6 integrate .. //depot/projects/smpng/sys/boot/efi/libefi/exit.c#2 delete .. //depot/projects/smpng/sys/boot/efi/libefi/libefi.c#2 integrate .. //depot/projects/smpng/sys/boot/efi/loader/conf.c#7 integrate .. //depot/projects/smpng/sys/boot/efi/loader/main.c#8 integrate .. //depot/projects/smpng/sys/boot/efi/loader/version#4 integrate .. //depot/projects/smpng/sys/boot/ficl/words.c#5 integrate .. //depot/projects/smpng/sys/boot/i386/Makefile#5 integrate .. //depot/projects/smpng/sys/boot/i386/boot2/Makefile#9 integrate .. //depot/projects/smpng/sys/boot/i386/boot2/boot1.s#5 integrate .. //depot/projects/smpng/sys/boot/i386/boot2/boot2.c#15 integrate .. //depot/projects/smpng/sys/boot/i386/liloldr/Makefile#3 delete .. //depot/projects/smpng/sys/boot/i386/liloldr/lilobsect.s#2 delete .. //depot/projects/smpng/sys/boot/i386/liloldr/liloldr.s#2 delete .. //depot/projects/smpng/sys/boot/i386/loader/conf.c#6 integrate .. //depot/projects/smpng/sys/boot/i386/pxeldr/pxeboot.8#3 integrate .. //depot/projects/smpng/sys/boot/ia64/skiload/conf.c#2 integrate .. //depot/projects/smpng/sys/boot/libstand/Makefile#2 delete .. //depot/projects/smpng/sys/boot/libstand/__main.c#2 delete .. //depot/projects/smpng/sys/boot/libstand/alpha/_setjmp.S#2 delete .. //depot/projects/smpng/sys/boot/libstand/arp.c#2 delete .. //depot/projects/smpng/sys/boot/libstand/assert.c#2 delete .. //depot/projects/smpng/sys/boot/libstand/bcd.c#2 delete .. //depot/projects/smpng/sys/boot/libstand/bootp.c#2 delete .. //depot/projects/smpng/sys/boot/libstand/bootp.h#2 delete .. //depot/projects/smpng/sys/boot/libstand/bootparam.c#2 delete .. //depot/projects/smpng/sys/boot/libstand/bootparam.h#2 delete .. //depot/projects/smpng/sys/boot/libstand/bswap.c#2 delete .. //depot/projects/smpng/sys/boot/libstand/bzipfs.c#2 delete .. //depot/projects/smpng/sys/boot/libstand/bzlib.c.diff#2 delete .. //depot/projects/smpng/sys/boot/libstand/bzlib.h.diff#2 delete .. //depot/projects/smpng/sys/boot/libstand/bzlib_private.h.diff#2 delete .. //depot/projects/smpng/sys/boot/libstand/cd9660.c#2 delete .. //depot/projects/smpng/sys/boot/libstand/close.c#2 delete .. //depot/projects/smpng/sys/boot/libstand/closeall.c#2 delete .. //depot/projects/smpng/sys/boot/libstand/dev.c#2 delete .. //depot/projects/smpng/sys/boot/libstand/dosfs.c#2 delete .. //depot/projects/smpng/sys/boot/libstand/dosfs.h#2 delete .. //depot/projects/smpng/sys/boot/libstand/environment.c#2 delete .. //depot/projects/smpng/sys/boot/libstand/ether.c#2 delete .. //depot/projects/smpng/sys/boot/libstand/ext2fs.c#2 delete .. //depot/projects/smpng/sys/boot/libstand/fstat.c#2 delete .. //depot/projects/smpng/sys/boot/libstand/getopt.c#2 delete .. //depot/projects/smpng/sys/boot/libstand/gets.c#2 delete .. //depot/projects/smpng/sys/boot/libstand/globals.c#2 delete .. //depot/projects/smpng/sys/boot/libstand/i386/_setjmp.S#2 delete .. //depot/projects/smpng/sys/boot/libstand/if_ether.h#2 delete .. //depot/projects/smpng/sys/boot/libstand/in_cksum.c#2 delete .. //depot/projects/smpng/sys/boot/libstand/inet_ntoa.c#2 delete .. //depot/projects/smpng/sys/boot/libstand/ioctl.c#2 delete .. //depot/projects/smpng/sys/boot/libstand/iodesc.h#2 delete .. //depot/projects/smpng/sys/boot/libstand/libstand.3#3 delete .. //depot/projects/smpng/sys/boot/libstand/lseek.c#2 delete .. //depot/projects/smpng/sys/boot/libstand/net.c#2 delete .. //depot/projects/smpng/sys/boot/libstand/net.h#2 delete .. //depot/projects/smpng/sys/boot/libstand/netif.c#2 delete .. //depot/projects/smpng/sys/boot/libstand/netif.h#2 delete .. //depot/projects/smpng/sys/boot/libstand/nfs.c#2 delete .. //depot/projects/smpng/sys/boot/libstand/nfsv2.h#2 delete .. //depot/projects/smpng/sys/boot/libstand/nullfs.c#2 delete .. //depot/projects/smpng/sys/boot/libstand/open.c#2 delete .. //depot/projects/smpng/sys/boot/libstand/pager.c#2 delete .. //depot/projects/smpng/sys/boot/libstand/powerpc/_setjmp.S#2 delete .. //depot/projects/smpng/sys/boot/libstand/printf.c#2 delete .. //depot/projects/smpng/sys/boot/libstand/qdivrem.c#2 delete .. //depot/projects/smpng/sys/boot/libstand/quad.h#2 delete .. //depot/projects/smpng/sys/boot/libstand/random.c#2 delete .. //depot/projects/smpng/sys/boot/libstand/rarp.c#2 delete .. //depot/projects/smpng/sys/boot/libstand/read.c#2 delete .. //depot/projects/smpng/sys/boot/libstand/readdir.c#2 delete .. //depot/projects/smpng/sys/boot/libstand/rpc.c#2 delete .. //depot/projects/smpng/sys/boot/libstand/rpc.h#2 delete .. //depot/projects/smpng/sys/boot/libstand/rpcv2.h#2 delete .. //depot/projects/smpng/sys/boot/libstand/saioctl.h#2 delete .. //depot/projects/smpng/sys/boot/libstand/sbrk.c#2 delete .. //depot/projects/smpng/sys/boot/libstand/sparc64/_setjmp.S#2 delete .. //depot/projects/smpng/sys/boot/libstand/splitfs.c#2 delete .. //depot/projects/smpng/sys/boot/libstand/stand.h#2 delete .. //depot/projects/smpng/sys/boot/libstand/stat.c#2 delete .. //depot/projects/smpng/sys/boot/libstand/strcasecmp.c#2 delete .. //depot/projects/smpng/sys/boot/libstand/strdup.c#2 delete .. //depot/projects/smpng/sys/boot/libstand/strerror.c#2 delete .. //depot/projects/smpng/sys/boot/libstand/strtol.c#2 delete .. //depot/projects/smpng/sys/boot/libstand/tftp.c#2 delete .. //depot/projects/smpng/sys/boot/libstand/tftp.h#2 delete .. //depot/projects/smpng/sys/boot/libstand/twiddle.c#2 delete .. //depot/projects/smpng/sys/boot/libstand/udp.c#2 delete .. //depot/projects/smpng/sys/boot/libstand/ufs.c#3 delete .. //depot/projects/smpng/sys/boot/libstand/write.c#2 delete .. //depot/projects/smpng/sys/boot/libstand/zalloc.c#2 delete .. //depot/projects/smpng/sys/boot/libstand/zalloc_defs.h#2 delete .. //depot/projects/smpng/sys/boot/libstand/zalloc_malloc.c#2 delete .. //depot/projects/smpng/sys/boot/libstand/zalloc_mem.h#2 delete .. //depot/projects/smpng/sys/boot/libstand/zalloc_protos.h#2 delete .. //depot/projects/smpng/sys/boot/libstand/zipfs.c#2 delete .. //depot/projects/smpng/sys/boot/libstand/zutil.h.diff#2 delete .. //depot/projects/smpng/sys/boot/powerpc/loader/conf.c#3 integrate .. //depot/projects/smpng/sys/boot/sparc64/loader/Makefile#13 integrate .. //depot/projects/smpng/sys/boot/sparc64/loader/main.c#12 integrate .. //depot/projects/smpng/sys/cam/cam_queue.c#2 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_da.c#29 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_sa.c#8 integrate .. //depot/projects/smpng/sys/compat/linprocfs/linprocfs.c#22 integrate .. //depot/projects/smpng/sys/compat/linux/linux_ioctl.c#20 integrate .. //depot/projects/smpng/sys/compat/linux/linux_ipc.c#10 integrate .. //depot/projects/smpng/sys/compat/linux/linux_sysctl.c#6 integrate .. //depot/projects/smpng/sys/compat/linux/linux_util.c#7 integrate .. //depot/projects/smpng/sys/compat/linux/linux_util.h#8 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_fcntl.c#12 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_filio.c#8 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_ioctl.c#8 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_ipc.c#3 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_misc.c#20 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_resource.c#7 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_signal.c#7 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_socket.c#3 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_sockio.c#6 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_stat.c#10 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_stream.c#12 integrate .. //depot/projects/smpng/sys/conf/NOTES#31 integrate .. //depot/projects/smpng/sys/conf/files#59 integrate .. //depot/projects/smpng/sys/conf/kmod.mk#17 integrate .. //depot/projects/smpng/sys/conf/majors#20 integrate .. //depot/projects/smpng/sys/conf/newvers.sh#3 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/fil.c#9 integrate .. //depot/projects/smpng/sys/ddb/db_break.c#4 integrate .. //depot/projects/smpng/sys/ddb/db_break.h#4 integrate .. //depot/projects/smpng/sys/ddb/db_command.c#9 integrate .. //depot/projects/smpng/sys/ddb/db_ps.c#15 integrate .. //depot/projects/smpng/sys/ddb/ddb.h#6 integrate .. //depot/projects/smpng/sys/dev/aac/aac.c#19 integrate .. //depot/projects/smpng/sys/dev/aac/aac_pci.c#16 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi.c#37 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pci_link.c#5 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_resource.c#11 integrate .. //depot/projects/smpng/sys/dev/acpica/acpivar.h#22 integrate .. //depot/projects/smpng/sys/dev/aha/aha.c#4 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/ahc_eisa.c#6 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/ahc_pci.c#8 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/ahd_pci.c#6 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx.c#6 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx.c#11 integrate .. //depot/projects/smpng/sys/dev/amd/amd.c#1 branch .. //depot/projects/smpng/sys/dev/amd/amd.h#1 branch .. //depot/projects/smpng/sys/dev/amr/amr.c#11 integrate .. //depot/projects/smpng/sys/dev/amr/amr_cam.c#4 integrate .. //depot/projects/smpng/sys/dev/amr/amr_disk.c#6 integrate .. //depot/projects/smpng/sys/dev/amr/amr_pci.c#7 integrate .. //depot/projects/smpng/sys/dev/amr/amrvar.h#7 integrate .. //depot/projects/smpng/sys/dev/an/if_aironet_ieee.h#6 integrate .. //depot/projects/smpng/sys/dev/an/if_an.c#26 integrate .. //depot/projects/smpng/sys/dev/an/if_an_pccard.c#5 integrate .. //depot/projects/smpng/sys/dev/an/if_an_pci.c#8 integrate .. //depot/projects/smpng/sys/dev/an/if_anreg.h#7 integrate .. //depot/projects/smpng/sys/dev/ar/if_arregs.h#2 integrate .. //depot/projects/smpng/sys/dev/asr/asr.c#15 integrate .. //depot/projects/smpng/sys/dev/asr/osd_util.h#5 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.h#12 integrate .. //depot/projects/smpng/sys/dev/ata/ata-cbus.c#2 integrate .. //depot/projects/smpng/sys/dev/ata/ata-disk.c#24 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-cd.c#28 integrate .. //depot/projects/smpng/sys/dev/awi/awi.c#12 integrate .. //depot/projects/smpng/sys/dev/awi/awi_wep.c#9 integrate .. //depot/projects/smpng/sys/dev/ccd/ccd.c#17 integrate .. //depot/projects/smpng/sys/dev/cm/smc90cx6.c#5 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed.c#9 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_cbus.c#3 integrate .. //depot/projects/smpng/sys/dev/em/README#5 integrate .. //depot/projects/smpng/sys/dev/em/if_em.c#15 integrate .. //depot/projects/smpng/sys/dev/em/if_em.h#11 integrate .. //depot/projects/smpng/sys/dev/em/if_em_hw.c#6 integrate .. //depot/projects/smpng/sys/dev/em/if_em_hw.h#6 integrate .. //depot/projects/smpng/sys/dev/em/if_em_osdep.h#9 integrate .. //depot/projects/smpng/sys/dev/en/midway.c#6 integrate .. //depot/projects/smpng/sys/dev/exca/excavar.h#3 integrate .. //depot/projects/smpng/sys/dev/firewire/firewire.c#6 integrate .. //depot/projects/smpng/sys/dev/firewire/firewire.h#2 integrate .. //depot/projects/smpng/sys/dev/firewire/fwcrom.c#1 branch .. //depot/projects/smpng/sys/dev/firewire/fwmem.c#3 integrate .. //depot/projects/smpng/sys/dev/firewire/fwohci.c#5 integrate .. //depot/projects/smpng/sys/dev/firewire/fwohci_pci.c#6 integrate .. //depot/projects/smpng/sys/dev/firewire/fwohcireg.h#2 integrate .. //depot/projects/smpng/sys/dev/firewire/fwohcivar.h#2 integrate .. //depot/projects/smpng/sys/dev/firewire/iec13213.h#2 integrate .. //depot/projects/smpng/sys/dev/firewire/if_fwe.c#4 integrate .. //depot/projects/smpng/sys/dev/firewire/sbp.c#6 integrate .. //depot/projects/smpng/sys/dev/hea/eni.h#6 integrate .. //depot/projects/smpng/sys/dev/hifn/hifn7751.c#3 integrate .. //depot/projects/smpng/sys/dev/idt/idt.c#2 integrate .. //depot/projects/smpng/sys/dev/idt/idtvar.h#2 integrate .. //depot/projects/smpng/sys/dev/iir/iir_ctrl.c#4 integrate .. //depot/projects/smpng/sys/dev/isp/Hardware.txt#2 integrate .. //depot/projects/smpng/sys/dev/isp/isp.c#26 integrate .. //depot/projects/smpng/sys/dev/isp/isp_pci.c#18 integrate .. //depot/projects/smpng/sys/dev/isp/isp_target.c#7 integrate .. //depot/projects/smpng/sys/dev/isp/isp_tpublic.h#3 integrate .. //depot/projects/smpng/sys/dev/lmc/if_lmc.c#6 integrate .. //depot/projects/smpng/sys/dev/nge/if_nge.c#19 integrate .. //depot/projects/smpng/sys/dev/ppbus/if_plip.c#4 integrate .. //depot/projects/smpng/sys/dev/ppbus/pcfclock.c#5 integrate .. //depot/projects/smpng/sys/dev/ppbus/ppi.c#5 integrate .. //depot/projects/smpng/sys/dev/ppbus/pps.c#9 integrate .. //depot/projects/smpng/sys/dev/pst/pst-iop.c#2 integrate .. //depot/projects/smpng/sys/dev/pst/pst-pci.c#2 integrate .. //depot/projects/smpng/sys/dev/puc/puc.c#9 integrate .. //depot/projects/smpng/sys/dev/puc/pucdata.c#8 integrate .. //depot/projects/smpng/sys/dev/puc/pucvar.h#6 integrate .. //depot/projects/smpng/sys/dev/raidframe/rf_freebsdkintf.c#3 integrate .. //depot/projects/smpng/sys/dev/random/yarrow.c#8 integrate .. //depot/projects/smpng/sys/dev/ray/if_ray.c#4 integrate .. //depot/projects/smpng/sys/dev/sab/sab.c#4 integrate .. //depot/projects/smpng/sys/dev/sio/sio_pccard.c#5 integrate .. //depot/projects/smpng/sys/dev/sound/isa/ad1816.c#8 integrate .. //depot/projects/smpng/sys/dev/sound/isa/ess.c#5 integrate .. //depot/projects/smpng/sys/dev/sound/isa/mss.c#10 integrate .. //depot/projects/smpng/sys/dev/sound/isa/sb16.c#7 integrate .. //depot/projects/smpng/sys/dev/sound/isa/sb8.c#5 integrate .. //depot/projects/smpng/sys/dev/sound/isa/sbc.c#7 integrate .. //depot/projects/smpng/sys/dev/sound/isa/uartsio.c#7 integrate .. //depot/projects/smpng/sys/dev/sound/pci/als4000.c#6 integrate .. //depot/projects/smpng/sys/dev/sound/pci/cmi.c#12 integrate .. //depot/projects/smpng/sys/dev/sound/pci/fm801.c#6 integrate .. //depot/projects/smpng/sys/dev/streams/streams.c#10 integrate .. //depot/projects/smpng/sys/dev/sym/sym_fw1.h#3 integrate .. //depot/projects/smpng/sys/dev/sym/sym_fw2.h#3 integrate .. //depot/projects/smpng/sys/dev/sym/sym_hipd.c#9 integrate .. //depot/projects/smpng/sys/dev/tdfx/tdfx_pci.c#8 integrate .. //depot/projects/smpng/sys/dev/tga/tga_pci.c#3 integrate .. //depot/projects/smpng/sys/dev/trm/trm.c#3 integrate .. //depot/projects/smpng/sys/dev/trm/trm.h#2 integrate .. //depot/projects/smpng/sys/dev/ubsec/ubsec.c#4 integrate .. //depot/projects/smpng/sys/dev/ubsec/ubsecvar.h#2 integrate .. //depot/projects/smpng/sys/dev/usb/ohci.c#20 integrate .. //depot/projects/smpng/sys/dev/usb/ubsa.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/uftdi.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/uhci.c#21 integrate .. //depot/projects/smpng/sys/dev/usb/ulpt.c#11 integrate .. //depot/projects/smpng/sys/dev/usb/umass.c#18 integrate .. //depot/projects/smpng/sys/dev/usb/urio.c#11 integrate .. //depot/projects/smpng/sys/dev/usb/usb_quirks.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#24 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs.h#25 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs_data.h#25 integrate .. //depot/projects/smpng/sys/dev/vinum/vinumconfig.c#9 integrate .. //depot/projects/smpng/sys/dev/vinum/vinumioctl.c#10 integrate .. //depot/projects/smpng/sys/dev/vinum/vinumrevive.c#6 integrate .. //depot/projects/smpng/sys/dev/wi/if_wi.c#41 integrate .. //depot/projects/smpng/sys/dev/wl/if_wl.c#9 integrate .. //depot/projects/smpng/sys/dev/zs/z8530reg.h#1 branch .. //depot/projects/smpng/sys/dev/zs/zs.c#1 branch .. //depot/projects/smpng/sys/fs/devfs/devfs_vnops.c#24 integrate .. //depot/projects/smpng/sys/fs/fifofs/fifo_vnops.c#18 integrate .. //depot/projects/smpng/sys/fs/hpfs/hpfs_vnops.c#14 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vnops.c#13 integrate .. //depot/projects/smpng/sys/fs/nullfs/null_vnops.c#10 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs.h#5 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_io.c#9 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_node.c#9 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_node.h#3 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_smb.c#7 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_subr.c#2 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_vfsops.c#13 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_vnops.c#13 integrate .. //depot/projects/smpng/sys/geom/bde/g_bde.c#3 integrate .. //depot/projects/smpng/sys/geom/bde/g_bde_crypt.c#5 integrate .. //depot/projects/smpng/sys/geom/bde/g_bde_lock.c#4 integrate .. //depot/projects/smpng/sys/geom/bde/g_bde_work.c#3 integrate .. //depot/projects/smpng/sys/geom/geom.h#17 integrate .. //depot/projects/smpng/sys/geom/geom_aes.c#5 integrate .. //depot/projects/smpng/sys/geom/geom_bsd.c#18 integrate .. //depot/projects/smpng/sys/geom/geom_dev.c#15 integrate .. //depot/projects/smpng/sys/geom/geom_disk.c#14 integrate .. //depot/projects/smpng/sys/geom/geom_dump.c#13 integrate .. //depot/projects/smpng/sys/geom/geom_gpt.c#7 integrate .. //depot/projects/smpng/sys/geom/geom_io.c#12 integrate .. //depot/projects/smpng/sys/geom/geom_kern.c#9 integrate .. //depot/projects/smpng/sys/geom/geom_mbr.c#14 integrate .. //depot/projects/smpng/sys/geom/geom_pc98.c#12 integrate .. //depot/projects/smpng/sys/geom/geom_slice.c#13 integrate .. //depot/projects/smpng/sys/geom/geom_slice.h#9 integrate .. //depot/projects/smpng/sys/geom/geom_subr.c#16 integrate .. //depot/projects/smpng/sys/geom/geom_sunlabel.c#13 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_linux_balloc.c#3 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_vfsops.c#19 integrate .. //depot/projects/smpng/sys/i386/acpica/OsdEnvironment.c#5 integrate .. //depot/projects/smpng/sys/i386/conf/GENERIC#31 integrate .. //depot/projects/smpng/sys/i386/conf/OLDCARD#7 integrate .. //depot/projects/smpng/sys/i386/conf/SMP#1 branch .. //depot/projects/smpng/sys/i386/i386/autoconf.c#13 integrate .. //depot/projects/smpng/sys/i386/i386/db_trace.c#10 integrate .. //depot/projects/smpng/sys/i386/i386/dump_machdep.c#4 integrate .. //depot/projects/smpng/sys/i386/i386/i386-gdbstub.c#3 integrate .. //depot/projects/smpng/sys/i386/i386/mem.c#12 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#30 integrate .. //depot/projects/smpng/sys/i386/i386/vm_machdep.c#30 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_fcntl.c#6 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_ioctl.c#10 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_ipc.c#4 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_misc.c#8 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_signal.c#7 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_stat.c#7 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_sysi86.c#7 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_util.h#4 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_xenix.c#8 integrate .. //depot/projects/smpng/sys/i386/include/limits.h#5 integrate .. //depot/projects/smpng/sys/i386/isa/if_el.c#5 integrate .. //depot/projects/smpng/sys/i386/isa/istallion.c#6 integrate .. //depot/projects/smpng/sys/i386/isa/mse.c#6 integrate .. //depot/projects/smpng/sys/i386/isa/pcf.c#4 integrate .. //depot/projects/smpng/sys/i386/isa/vesa.c#5 integrate .. //depot/projects/smpng/sys/i386/pci/pci_bus.c#12 integrate .. //depot/projects/smpng/sys/i386/svr4/svr4_machdep.c#9 integrate .. //depot/projects/smpng/sys/i4b/layer3/i4b_q931.h#4 integrate .. //depot/projects/smpng/sys/i4b/layer4/i4b_l4mgmt.c#5 integrate .. //depot/projects/smpng/sys/ia64/acpica/OsdEnvironment.c#4 integrate .. //depot/projects/smpng/sys/ia64/ia32/ia32_misc.c#3 integrate .. //depot/projects/smpng/sys/ia64/ia32/ia32_proto.h#6 integrate .. //depot/projects/smpng/sys/ia64/ia32/ia32_syscall.h#6 integrate .. //depot/projects/smpng/sys/ia64/ia32/ia32_sysent.c#6 integrate .. //depot/projects/smpng/sys/ia64/ia32/ia32_util.h#2 integrate .. //depot/projects/smpng/sys/ia64/ia32/syscalls.master#7 integrate .. //depot/projects/smpng/sys/ia64/ia64/dump_machdep.c#4 integrate .. //depot/projects/smpng/sys/ia64/ia64/sys_machdep.c#3 integrate .. //depot/projects/smpng/sys/ia64/ia64/vm_machdep.c#22 integrate .. //depot/projects/smpng/sys/ia64/include/dig64.h#1 branch .. //depot/projects/smpng/sys/ia64/include/limits.h#5 integrate .. //depot/projects/smpng/sys/isa/fd.c#15 integrate .. //depot/projects/smpng/sys/kern/imgact_elf.c#24 integrate .. //depot/projects/smpng/sys/kern/imgact_gzip.c#7 integrate .. //depot/projects/smpng/sys/kern/imgact_shell.c#4 integrate .. //depot/projects/smpng/sys/kern/init_main.c#29 integrate .. //depot/projects/smpng/sys/kern/init_sysent.c#24 integrate .. //depot/projects/smpng/sys/kern/kern_acct.c#23 integrate .. //depot/projects/smpng/sys/kern/kern_acl.c#18 integrate .. //depot/projects/smpng/sys/kern/kern_condvar.c#22 integrate .. //depot/projects/smpng/sys/kern/kern_conf.c#15 integrate .. //depot/projects/smpng/sys/kern/kern_descrip.c#40 integrate .. //depot/projects/smpng/sys/kern/kern_environment.c#10 integrate .. //depot/projects/smpng/sys/kern/kern_event.c#16 integrate .. //depot/projects/smpng/sys/kern/kern_exec.c#49 integrate .. //depot/projects/smpng/sys/kern/kern_exit.c#51 integrate .. //depot/projects/smpng/sys/kern/kern_fork.c#49 integrate .. //depot/projects/smpng/sys/kern/kern_intr.c#25 integrate .. //depot/projects/smpng/sys/kern/kern_jail.c#23 integrate .. //depot/projects/smpng/sys/kern/kern_linker.c#27 integrate .. //depot/projects/smpng/sys/kern/kern_mac.c#13 integrate .. //depot/projects/smpng/sys/kern/kern_module.c#9 integrate .. //depot/projects/smpng/sys/kern/kern_proc.c#41 integrate .. //depot/projects/smpng/sys/kern/kern_sig.c#50 integrate .. //depot/projects/smpng/sys/kern/kern_subr.c#17 integrate .. //depot/projects/smpng/sys/kern/kern_switch.c#24 integrate .. //depot/projects/smpng/sys/kern/kern_synch.c#39 integrate .. //depot/projects/smpng/sys/kern/kern_thread.c#14 integrate .. //depot/projects/smpng/sys/kern/kern_time.c#20 integrate .. //depot/projects/smpng/sys/kern/kern_uuid.c#4 integrate .. //depot/projects/smpng/sys/kern/sched_4bsd.c#3 integrate .. //depot/projects/smpng/sys/kern/subr_blist.c#3 integrate .. //depot/projects/smpng/sys/kern/subr_bus.c#17 integrate .. //depot/projects/smpng/sys/kern/subr_diskslice.c#15 integrate .. //depot/projects/smpng/sys/kern/subr_mchain.c#9 integrate .. //depot/projects/smpng/sys/kern/subr_smp.c#15 integrate .. //depot/projects/smpng/sys/kern/subr_trap.c#44 integrate .. //depot/projects/smpng/sys/kern/subr_witness.c#67 integrate .. //depot/projects/smpng/sys/kern/sys_generic.c#22 integrate .. //depot/projects/smpng/sys/kern/sys_pipe.c#24 integrate .. //depot/projects/smpng/sys/kern/sys_socket.c#14 integrate .. //depot/projects/smpng/sys/kern/syscalls.c#24 integrate .. //depot/projects/smpng/sys/kern/syscalls.master#23 integrate .. //depot/projects/smpng/sys/kern/sysv_msg.c#16 integrate .. //depot/projects/smpng/sys/kern/sysv_shm.c#13 integrate .. //depot/projects/smpng/sys/kern/tty_cons.c#16 integrate .. //depot/projects/smpng/sys/kern/tty_pty.c#17 integrate .. //depot/projects/smpng/sys/kern/tty_subr.c#3 integrate .. //depot/projects/smpng/sys/kern/uipc_mbuf.c#12 integrate .. //depot/projects/smpng/sys/kern/uipc_mbuf2.c#7 integrate .. //depot/projects/smpng/sys/kern/uipc_socket.c#31 integrate .. //depot/projects/smpng/sys/kern/uipc_syscalls.c#28 integrate .. //depot/projects/smpng/sys/kern/uipc_usrreq.c#25 integrate .. //depot/projects/smpng/sys/kern/vfs_aio.c#32 integrate .. //depot/projects/smpng/sys/kern/vfs_bio.c#32 integrate .. //depot/projects/smpng/sys/kern/vfs_export.c#8 integrate .. //depot/projects/smpng/sys/kern/vfs_mount.c#9 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#40 integrate .. //depot/projects/smpng/sys/kern/vfs_syscalls.c#49 integrate .. //depot/projects/smpng/sys/kern/vfs_vnops.c#33 integrate .. //depot/projects/smpng/sys/kern/vnode_if.src#11 integrate .. //depot/projects/smpng/sys/libkern/ia64/__moddi3.S#2 integrate .. //depot/projects/smpng/sys/libkern/ia64/__umoddi3.S#2 integrate .. //depot/projects/smpng/sys/modules/Makefile#41 integrate .. //depot/projects/smpng/sys/modules/amd/Makefile#1 branch .. //depot/projects/smpng/sys/modules/firewire/firewire/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/libmchain/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/netgraph/fec/Makefile#2 integrate .. //depot/projects/smpng/sys/net/bpf.c#20 integrate .. //depot/projects/smpng/sys/net/bpf_compat.h#2 integrate .. //depot/projects/smpng/sys/net/bridge.c#17 integrate .. //depot/projects/smpng/sys/net/if.c#29 integrate .. //depot/projects/smpng/sys/net/if_ef.c#7 integrate .. //depot/projects/smpng/sys/net/if_ethersubr.c#24 integrate .. //depot/projects/smpng/sys/net/if_iso88025subr.c#8 integrate .. //depot/projects/smpng/sys/net/if_loop.c#12 integrate .. //depot/projects/smpng/sys/net/if_var.h#15 integrate .. //depot/projects/smpng/sys/net/net_osdep.h#7 integrate .. //depot/projects/smpng/sys/net/radix.c#6 integrate .. //depot/projects/smpng/sys/net/radix.h#3 integrate .. //depot/projects/smpng/sys/net/raw_cb.c#6 integrate .. //depot/projects/smpng/sys/net/raw_usrreq.c#11 integrate .. //depot/projects/smpng/sys/net/route.c#8 integrate .. //depot/projects/smpng/sys/net/rtsock.c#23 integrate .. //depot/projects/smpng/sys/netatalk/at_control.c#6 integrate .. //depot/projects/smpng/sys/netatm/atm_cm.c#9 integrate .. //depot/projects/smpng/sys/netatm/atm_if.c#8 integrate .. //depot/projects/smpng/sys/netatm/atm_usrreq.c#8 integrate .. //depot/projects/smpng/sys/netatm/port.h#6 integrate .. //depot/projects/smpng/sys/netatm/spans/spans_kxdr.h#2 integrate .. //depot/projects/smpng/sys/netatm/spans/spans_msg.c#6 integrate .. //depot/projects/smpng/sys/netatm/spans/spans_util.c#3 integrate .. //depot/projects/smpng/sys/netatm/uni/sscop_lower.c#5 integrate .. //depot/projects/smpng/sys/netatm/uni/unisig_print.c#3 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#3 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#2 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#2 integrate .. //depot/projects/smpng/sys/netgraph/ng_base.c#11 integrate .. //depot/projects/smpng/sys/netgraph/ng_bridge.c#6 integrate .. //depot/projects/smpng/sys/netgraph/ng_ether.c#9 integrate .. //depot/projects/smpng/sys/netgraph/ng_fec.c#2 integrate .. //depot/projects/smpng/sys/netgraph/ng_gif.c#3 integrate .. //depot/projects/smpng/sys/netgraph/ng_l2tp.c#2 integrate .. //depot/projects/smpng/sys/netgraph/ng_mppc.c#7 integrate .. //depot/projects/smpng/sys/netgraph/ng_one2many.c#5 integrate .. //depot/projects/smpng/sys/netgraph/ng_ppp.c#8 integrate .. //depot/projects/smpng/sys/netgraph/ng_pptpgre.c#7 integrate .. //depot/projects/smpng/sys/netgraph/ng_socket.c#16 integrate .. //depot/projects/smpng/sys/netgraph/ng_source.c#2 integrate .. //depot/projects/smpng/sys/netgraph/ng_tee.c#5 integrate .. //depot/projects/smpng/sys/netinet/in.c#15 integrate .. //depot/projects/smpng/sys/netinet/in.h#18 integrate .. //depot/projects/smpng/sys/netinet/in_rmx.c#4 integrate .. //depot/projects/smpng/sys/netinet/ip_dummynet.c#13 integrate .. //depot/projects/smpng/sys/netinet/ip_dummynet.h#9 integrate .. //depot/projects/smpng/sys/netinet/ip_encap.c#8 integrate .. //depot/projects/smpng/sys/netinet/ip_fw.c#16 integrate .. //depot/projects/smpng/sys/netinet/ip_fw2.c#9 integrate .. //depot/projects/smpng/sys/netinet/ip_icmp.c#15 integrate .. //depot/projects/smpng/sys/netinet/ip_input.c#26 integrate .. //depot/projects/smpng/sys/netinet/ip_output.c#31 integrate .. //depot/projects/smpng/sys/netinet/tcp_input.c#26 integrate .. //depot/projects/smpng/sys/netinet/tcp_subr.c#26 integrate .. //depot/projects/smpng/sys/netinet/tcp_syncache.c#15 integrate .. //depot/projects/smpng/sys/netinet/tcp_timer.c#9 integrate .. //depot/projects/smpng/sys/netinet6/esp_core.c#5 integrate .. //depot/projects/smpng/sys/netinet6/esp_input.c#9 integrate .. //depot/projects/smpng/sys/netinet6/icmp6.c#10 integrate .. //depot/projects/smpng/sys/netinet6/in6.c#11 integrate .. //depot/projects/smpng/sys/netinet6/in6_cksum.c#3 integrate .. //depot/projects/smpng/sys/netinet6/in6_ifattach.c#4 integrate .. //depot/projects/smpng/sys/netinet6/in6_rmx.c#3 integrate .. //depot/projects/smpng/sys/netinet6/ip6_fw.c#8 integrate .. //depot/projects/smpng/sys/netinet6/ip6_input.c#18 integrate .. //depot/projects/smpng/sys/netinet6/ip6_mroute.c#11 integrate .. //depot/projects/smpng/sys/netinet6/ip6_output.c#15 integrate .. //depot/projects/smpng/sys/netinet6/ip6_var.h#5 integrate .. //depot/projects/smpng/sys/netinet6/ipcomp_output.c#3 integrate .. //depot/projects/smpng/sys/netinet6/ipsec.c#6 integrate .. //depot/projects/smpng/sys/netinet6/nd6_nbr.c#5 integrate .. //depot/projects/smpng/sys/netinet6/nd6_rtr.c#5 integrate .. //depot/projects/smpng/sys/netipsec/ipsec.c#2 integrate .. //depot/projects/smpng/sys/netipsec/ipsec_mbuf.c#2 integrate .. //depot/projects/smpng/sys/netipsec/ipsec_output.c#2 integrate .. //depot/projects/smpng/sys/netipsec/key.c#2 integrate .. //depot/projects/smpng/sys/netipsec/keysock.c#2 integrate .. //depot/projects/smpng/sys/netipsec/xform_ipip.c#2 integrate .. //depot/projects/smpng/sys/netipx/ipx_pcb.h#4 integrate .. //depot/projects/smpng/sys/netkey/key.c#14 integrate .. //depot/projects/smpng/sys/netkey/keysock.c#11 integrate .. //depot/projects/smpng/sys/netsmb/smb.h#7 integrate .. //depot/projects/smpng/sys/netsmb/smb_dev.c#7 integrate .. //depot/projects/smpng/sys/netsmb/smb_iod.c#8 integrate .. //depot/projects/smpng/sys/netsmb/smb_rq.c#8 integrate .. //depot/projects/smpng/sys/netsmb/smb_subr.c#9 integrate .. //depot/projects/smpng/sys/netsmb/smb_trantcp.c#13 integrate .. //depot/projects/smpng/sys/nfsclient/bootp_subr.c#14 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_bio.c#16 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_diskless.c#2 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vfsops.c#19 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vnops.c#18 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_serv.c#24 integrate .. //depot/projects/smpng/sys/pc98/conf/GENERIC#29 integrate .. //depot/projects/smpng/sys/pc98/pc98/diskslice_machdep.c#5 integrate .. //depot/projects/smpng/sys/pc98/pc98/mse.c#5 integrate .. //depot/projects/smpng/sys/pc98/pc98/olpt.c#5 integrate .. //depot/projects/smpng/sys/pc98/pc98/sio.c#23 integrate .. //depot/projects/smpng/sys/pccard/pcic_isa.c#8 integrate .. //depot/projects/smpng/sys/pci/agp.c#9 integrate .. //depot/projects/smpng/sys/pci/amd.c#4 delete .. //depot/projects/smpng/sys/pci/amd.h#2 delete .. //depot/projects/smpng/sys/pci/if_dcreg.h#10 integrate .. //depot/projects/smpng/sys/pci/if_de.c#6 integrate .. //depot/projects/smpng/sys/pci/if_sis.c#17 integrate .. //depot/projects/smpng/sys/pci/if_ste.c#13 integrate .. //depot/projects/smpng/sys/pci/if_stereg.h#4 integrate .. //depot/projects/smpng/sys/pci/if_xl.c#16 integrate .. //depot/projects/smpng/sys/pci/if_xlreg.h#5 integrate .. //depot/projects/smpng/sys/pci/ncr.c#5 integrate .. //depot/projects/smpng/sys/powerpc/include/limits.h#5 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/vm_machdep.c#21 integrate .. //depot/projects/smpng/sys/security/mac_biba/mac_biba.c#11 integrate .. //depot/projects/smpng/sys/security/mac_bsdextended/mac_bsdextended.c#4 integrate .. //depot/projects/smpng/sys/security/mac_lomac/mac_lomac.c#3 integrate .. //depot/projects/smpng/sys/security/mac_mls/mac_mls.c#11 integrate .. //depot/projects/smpng/sys/security/mac_none/mac_none.c#8 integrate .. //depot/projects/smpng/sys/security/mac_seeotheruids/mac_seeotheruids.c#3 integrate .. //depot/projects/smpng/sys/security/mac_test/mac_test.c#8 integrate .. //depot/projects/smpng/sys/sparc64/conf/GENERIC#24 integrate .. //depot/projects/smpng/sys/sparc64/include/atomic.h#5 integrate .. //depot/projects/smpng/sys/sparc64/include/limits.h#5 integrate .. //depot/projects/smpng/sys/sparc64/include/pmap.h#18 integrate .. //depot/projects/smpng/sys/sparc64/include/smp.h#11 integrate .. //depot/projects/smpng/sys/sparc64/include/tlb.h#15 integrate .. //depot/projects/smpng/sys/sparc64/include/tte.h#11 integrate .. //depot/projects/smpng/sys/sparc64/include/vmparam.h#12 integrate .. //depot/projects/smpng/sys/sparc64/pci/psycho.c#15 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/cache.c#8 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/dump_machdep.c#3 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/exception.S#6 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/genassym.c#25 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/interrupt.S#2 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/machdep.c#41 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/mem.c#2 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/mp_exception.S#2 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/mp_machdep.c#14 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/pmap.c#31 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/tlb.c#5 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/tsb.c#16 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/vm_machdep.c#25 integrate .. //depot/projects/smpng/sys/sys/_iovec.h#1 branch .. //depot/projects/smpng/sys/sys/_mutex.h#10 integrate .. //depot/projects/smpng/sys/sys/_timeval.h#1 branch .. //depot/projects/smpng/sys/sys/_types.h#7 integrate .. //depot/projects/smpng/sys/sys/acl.h#7 integrate .. //depot/projects/smpng/sys/sys/blist.h#4 integrate .. //depot/projects/smpng/sys/sys/conf.h#17 integrate .. //depot/projects/smpng/sys/sys/copyright.h#3 integrate .. //depot/projects/smpng/sys/sys/diskmbr.h#2 integrate .. //depot/projects/smpng/sys/sys/file.h#14 integrate .. //depot/projects/smpng/sys/sys/filedesc.h#15 integrate .. //depot/projects/smpng/sys/sys/ipc.h#7 integrate .. //depot/projects/smpng/sys/sys/mbuf.h#15 integrate .. //depot/projects/smpng/sys/sys/mchain.h#6 integrate .. //depot/projects/smpng/sys/sys/mount.h#18 integrate .. //depot/projects/smpng/sys/sys/msg.h#4 integrate .. //depot/projects/smpng/sys/sys/mutex.h#30 integrate .. //depot/projects/smpng/sys/sys/namei.h#9 integrate .. //depot/projects/smpng/sys/sys/pcpu.h#9 integrate .. //depot/projects/smpng/sys/sys/proc.h#68 integrate .. //depot/projects/smpng/sys/sys/protosw.h#8 integrate .. //depot/projects/smpng/sys/sys/select.h#7 integrate .. //depot/projects/smpng/sys/sys/sigio.h#1 branch .. //depot/projects/smpng/sys/sys/signal.h#12 integrate .. //depot/projects/smpng/sys/sys/socket.h#11 integrate .. //depot/projects/smpng/sys/sys/socketvar.h#26 integrate .. //depot/projects/smpng/sys/sys/soundcard.h#4 integrate .. //depot/projects/smpng/sys/sys/syscall.h#24 integrate .. //depot/projects/smpng/sys/sys/syscall.mk#24 integrate .. //depot/projects/smpng/sys/sys/sysent.h#9 integrate .. //depot/projects/smpng/sys/sys/sysproto.h#26 integrate .. //depot/projects/smpng/sys/sys/time.h#11 integrate .. //depot/projects/smpng/sys/sys/types.h#20 integrate .. //depot/projects/smpng/sys/sys/uio.h#9 integrate .. //depot/projects/smpng/sys/sys/unpcb.h#5 integrate .. //depot/projects/smpng/sys/sys/vnode.h#29 integrate .. //depot/projects/smpng/sys/ufs/ffs/README.snapshot#3 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_alloc.c#18 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_extern.h#10 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_snapshot.c#21 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_softdep.c#21 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_subr.c#6 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#36 integrate .. //depot/projects/smpng/sys/ufs/ufs/dirhash.h#3 integrate .. //depot/projects/smpng/sys/ufs/ufs/inode.h#8 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_dirhash.c#15 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_inode.c#12 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufsmount.h#7 integrate .. //depot/projects/smpng/sys/vm/phys_pager.c#8 integrate .. //depot/projects/smpng/sys/vm/swap_pager.c#21 integrate .. //depot/projects/smpng/sys/vm/swap_pager.h#5 integrate .. //depot/projects/smpng/sys/vm/uma_core.c#24 integrate .. //depot/projects/smpng/sys/vm/vm.h#5 integrate .. //depot/projects/smpng/sys/vm/vm_contig.c#10 integrate .. //depot/projects/smpng/sys/vm/vm_fault.c#19 integrate .. //depot/projects/smpng/sys/vm/vm_glue.c#20 integrate .. //depot/projects/smpng/sys/vm/vm_kern.c#9 integrate .. //depot/projects/smpng/sys/vm/vm_map.c#26 integrate .. //depot/projects/smpng/sys/vm/vm_map.h#15 integrate .. //depot/projects/smpng/sys/vm/vm_meter.c#11 integrate .. //depot/projects/smpng/sys/vm/vm_object.c#23 integrate .. //depot/projects/smpng/sys/vm/vm_object.h#12 integrate .. //depot/projects/smpng/sys/vm/vm_page.c#25 integrate .. //depot/projects/smpng/sys/vm/vm_page.h#17 integrate .. //depot/projects/smpng/sys/vm/vm_pageout.c#21 integrate .. //depot/projects/smpng/sys/vm/vm_pageout.h#6 integrate .. //depot/projects/smpng/sys/vm/vm_pager.h#5 integrate .. //depot/projects/smpng/sys/vm/vm_swap.c#18 integrate .. //depot/projects/smpng/sys/vm/vnode_pager.c#23 integrate .. //depot/projects/smpng/sys/x86_64/include/limits.h#3 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/pmap.c#41 (text+ko) ==== @@ -43,7 +43,7 @@ * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 * from: i386 Id: pmap.c,v 1.193 1998/04/19 15:22:48 bde Exp * with some ideas from NetBSD's alpha pmap - * $FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.114 2002/11/18 01:36:09 alc Exp $ + * $FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.117 2002/12/28 22:47:45 alc Exp $ */ /* @@ -1010,9 +1010,11 @@ if (oldpte) pmap_invalidate_page(kernel_pmap, ks + i * PAGE_SIZE); + vm_page_lock_queues(); vm_page_wakeup(m); vm_page_flag_clear(m, PG_ZERO); m->valid = VM_PAGE_BITS_ALL; + vm_page_unlock_queues(); } } @@ -1173,8 +1175,8 @@ _pmap_unwire_pte_hold(pmap_t pmap, vm_offset_t va, vm_page_t m) { - while (vm_page_sleep_busy(m, FALSE, "pmuwpt")) - ; + while (vm_page_sleep_if_busy(m, FALSE, "pmuwpt")) + vm_page_lock_queues(); if (m->hold_count == 0) { vm_offset_t pteva; @@ -1198,8 +1200,10 @@ if (m->pindex < NUSERLEV3MAPS) { /* unhold the level 2 page table */ vm_page_t lev2pg; - lev2pg = pmap_page_lookup(pmap->pm_pteobj, + lev2pg = vm_page_lookup(pmap->pm_pteobj, NUSERLEV3MAPS + pmap_lev1_index(va)); + while (vm_page_sleep_if_busy(lev2pg, FALSE, "pulook")) + vm_page_lock_queues(); vm_page_unhold(lev2pg); if (lev2pg->hold_count == 0) _pmap_unwire_pte_hold(pmap, va, lev2pg); @@ -1256,7 +1260,9 @@ (pmap->pm_ptphint->pindex == ptepindex)) { mpte = pmap->pm_ptphint; } else { - mpte = pmap_page_lookup(pmap->pm_pteobj, ptepindex); + while ((mpte = vm_page_lookup(pmap->pm_pteobj, ptepindex)) != NULL && + vm_page_sleep_if_busy(mpte, FALSE, "pulook")) + vm_page_lock_queues(); pmap->pm_ptphint = mpte; } } @@ -1304,13 +1310,12 @@ * allocate the page directory page */ lev1pg = vm_page_grab(pmap->pm_pteobj, NUSERLEV3MAPS + NUSERLEV2MAPS, - VM_ALLOC_NORMAL | VM_ALLOC_RETRY); + VM_ALLOC_NORMAL | VM_ALLOC_RETRY | VM_ALLOC_WIRED); - lev1pg->wire_count = 1; - ++cnt.v_wire_count; - + vm_page_lock_queues(); vm_page_flag_clear(lev1pg, PG_BUSY); lev1pg->valid = VM_PAGE_BITS_ALL; + vm_page_unlock_queues(); pmap->pm_lev1 = (pt_entry_t*) ALPHA_PHYS_TO_K0SEG(VM_PAGE_TO_PHYS(lev1pg)); if ((lev1pg->flags & PG_ZERO) == 0) @@ -1432,15 +1437,11 @@ * Find or fabricate a new pagetable page */ m = vm_page_grab(pmap->pm_pteobj, ptepindex, - VM_ALLOC_ZERO | VM_ALLOC_RETRY); + VM_ALLOC_WIRED | VM_ALLOC_ZERO | VM_ALLOC_RETRY); KASSERT(m->queue == PQ_NONE, ("_pmap_allocpte: %p->queue != PQ_NONE", m)); - if (m->wire_count == 0) - cnt.v_wire_count++; - m->wire_count++; - /* * Increment the hold count for the page table page * (denoting a new mapping.) @@ -1484,9 +1485,11 @@ if ((m->flags & PG_ZERO) == 0) bzero((caddr_t) ALPHA_PHYS_TO_K0SEG(ptepa), PAGE_SIZE); + vm_page_lock_queues(); m->valid = VM_PAGE_BITS_ALL; vm_page_flag_clear(m, PG_ZERO); vm_page_wakeup(m); + vm_page_unlock_queues(); return m; } @@ -2133,7 +2136,9 @@ */ if (opa) { int err; + vm_page_lock_queues(); err = pmap_remove_pte(pmap, pte, va); + vm_page_unlock_queues(); if (err) panic("pmap_enter: pte vanished, va: 0x%lx", va); } @@ -2258,8 +2263,11 @@ */ pte = vtopte(va); if (*pte) { - if (mpte) + if (mpte != NULL) { + vm_page_lock_queues(); pmap_unwire_pte_hold(pmap, va, mpte); + vm_page_unlock_queues(); + } alpha_pal_imb(); /* XXX overkill? */ return 0; } ==== //depot/projects/smpng/sys/alpha/alpha/sys_machdep.c#12 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)sys_machdep.c 5.5 (Berkeley) 1/19/91 - * $FreeBSD: src/sys/alpha/alpha/sys_machdep.c,v 1.18 2002/07/31 19:37:02 jhb Exp $ + * $FreeBSD: src/sys/alpha/alpha/sys_machdep.c,v 1.21 2002/12/14 01:56:23 alfred Exp $ * */ @@ -76,7 +76,7 @@ { int error = 0; - switch(SCARG(uap,op)) { + switch(uap->op) { case ALPHA_SETHAE: error = alpha_sethae(td, uap->parms); break; ==== //depot/projects/smpng/sys/alpha/alpha/vm_machdep.c#19 (text+ko) ==== @@ -38,7 +38,7 @@ * * from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91 * Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$ - * $FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.76 2002/12/02 01:12:05 alc Exp $ + * $FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.77 2002/12/10 02:33:43 julian Exp $ */ /* * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University. @@ -261,7 +261,7 @@ } void -cpu_thread_dtor(struct thread *td) +cpu_thread_clean(struct thread *td) { } ==== //depot/projects/smpng/sys/alpha/include/limits.h#5 (text+ko) ==== @@ -32,14 +32,13 @@ * * @(#)limits.h 8.3 (Berkeley) 1/4/94 * From: NetBSD: limits.h,v 1.3 1997/04/06 08:47:31 cgd Exp - * $FreeBSD: src/sys/alpha/include/limits.h,v 1.9 2002/07/29 17:41:06 mike Exp $ + * $FreeBSD: src/sys/alpha/include/limits.h,v 1.10 2002/12/22 06:38:44 tjr Exp $ */ #ifndef _MACHINE_LIMITS_H_ #define _MACHINE_LIMITS_H_ #define CHAR_BIT 8 /* number of bits in a char */ -#define MB_LEN_MAX 6 /* Allow 31 bit UTF2 */ /* * According to ANSI (section 2.2.4.2), the values below must be usable by ==== //depot/projects/smpng/sys/alpha/osf1/osf1_misc.c#19 (text+ko) ==== @@ -29,7 +29,7 @@ /* * Additional Copyright (c) 1999 by Andrew Gallatin - * $FreeBSD: src/sys/alpha/osf1/osf1_misc.c,v 1.33 2002/08/30 04:04:34 peter Exp $ + * $FreeBSD: src/sys/alpha/osf1/osf1_misc.c,v 1.36 2002/12/14 01:56:24 alfred Exp $ */ @@ -249,9 +249,9 @@ sg = stackgap_init(); CHECKALTEXIST(td, &sg, uap->path); - SCARG(&a, path) = SCARG(uap, path); - SCARG(&a, flags) = SCARG(uap, flags); /* XXX translate */ - SCARG(&a, mode) = SCARG(uap, mode); + a.path = uap->path; + a.flags = uap->flags; /* XXX translate */ + a.mode = uap->mode; return open(td, &a); } @@ -396,16 +396,16 @@ syscallarg(struct rlimit *) rlp; } */ a; - if (SCARG(uap, which) >= OSF1_RLIMIT_NLIMITS) + if (uap->which >= OSF1_RLIMIT_NLIMITS) return (EINVAL); - if (SCARG(uap, which) <= OSF1_RLIMIT_LASTCOMMON) - SCARG(&a, which) = SCARG(uap, which); - else if (SCARG(uap, which) == OSF1_RLIMIT_NOFILE) - SCARG(&a, which) = RLIMIT_NOFILE; + if (uap->which <= OSF1_RLIMIT_LASTCOMMON) + a.which = uap->which; + else if (uap->which == OSF1_RLIMIT_NOFILE) + a.which = RLIMIT_NOFILE; else return (0); - SCARG(&a, rlp) = (struct rlimit *)SCARG(uap, rlp); + a.rlp = (struct rlimit *)uap->rlp; return getrlimit(td, &a); } @@ -421,16 +421,16 @@ syscallarg(struct rlimit *) rlp; } */ a; - if (SCARG(uap, which) >= OSF1_RLIMIT_NLIMITS) + if (uap->which >= OSF1_RLIMIT_NLIMITS) return (EINVAL); - if (SCARG(uap, which) <= OSF1_RLIMIT_LASTCOMMON) - SCARG(&a, which) = SCARG(uap, which); - else if (SCARG(uap, which) == OSF1_RLIMIT_NOFILE) - SCARG(&a, which) = RLIMIT_NOFILE; + if (uap->which <= OSF1_RLIMIT_LASTCOMMON) + a.which = uap->which; + else if (uap->which == OSF1_RLIMIT_NOFILE) + a.which = RLIMIT_NOFILE; else return (0); - SCARG(&a, rlp) = (struct rlimit *)SCARG(uap, rlp); + a.rlp = (struct rlimit *)uap->rlp; return setrlimit(td, &a); } @@ -476,14 +476,14 @@ GIANT_REQUIRED; - SCARG(&a, addr) = SCARG(uap, addr); - SCARG(&a, len) = SCARG(uap, len); - SCARG(&a, prot) = SCARG(uap, prot); - SCARG(&a, fd) = SCARG(uap, fd); - SCARG(&a, pad) = 0; - SCARG(&a, pos) = SCARG(uap, pos); + a.addr = uap->addr; + a.len = uap->len; + a.prot = uap->prot; + a.fd = uap->fd; + a.pad = 0; + a.pos = uap->pos; - SCARG(&a, flags) = 0; + a.flags = 0; /* * OSF/1's mmap, unlike FreeBSD's, does its best to map memory at the @@ -493,8 +493,8 @@ * close to where they've requested as possible. */ - if (SCARG(uap, addr) != NULL) - addr = round_page((vm_offset_t)SCARG(&a,addr)); + if (uap->addr != NULL) + addr = round_page((vm_offset_t)a.addr); else /* * Try to use the apparent OSF/1 default placement of 0x10000 for @@ -502,55 +502,55 @@ * SEGV'ing. */ addr = round_page((vm_offset_t)0x10000UL); - len = (vm_offset_t)SCARG(&a, len); + len = (vm_offset_t)a.len; map = &td->td_proc->p_vmspace->vm_map; if (!vm_map_findspace(map, addr, len, &newaddr)) { - SCARG(&a,addr) = (caddr_t) newaddr; - SCARG(&a, flags) |= (MAP_FIXED); + a.addr = (caddr_t) newaddr; + a.flags |= (MAP_FIXED); } #ifdef DEBUG else uprintf("osf1_mmap:vm_map_findspace failed for: %p 0x%lx\n", (caddr_t)addr, len); #endif - if (SCARG(uap, flags) & OSF1_MAP_SHARED) - SCARG(&a, flags) |= MAP_SHARED; - if (SCARG(uap, flags) & OSF1_MAP_PRIVATE) - SCARG(&a, flags) |= MAP_PRIVATE; + if (uap->flags & OSF1_MAP_SHARED) + a.flags |= MAP_SHARED; + if (uap->flags & OSF1_MAP_PRIVATE) + a.flags |= MAP_PRIVATE; - switch (SCARG(uap, flags) & OSF1_MAP_TYPE) { + switch (uap->flags & OSF1_MAP_TYPE) { case OSF1_MAP_ANONYMOUS: - SCARG(&a, flags) |= MAP_ANON; + a.flags |= MAP_ANON; break; case OSF1_MAP_FILE: - SCARG(&a, flags) |= MAP_FILE; + a.flags |= MAP_FILE; break; default: return (EINVAL); } - if (SCARG(uap, flags) & OSF1_MAP_FIXED) - SCARG(&a, flags) |= MAP_FIXED; - if (SCARG(uap, flags) & OSF1_MAP_HASSEMAPHORE) - SCARG(&a, flags) |= MAP_HASSEMAPHORE; - if (SCARG(uap, flags) & OSF1_MAP_INHERIT) + if (uap->flags & OSF1_MAP_FIXED) + a.flags |= MAP_FIXED; + if (uap->flags & OSF1_MAP_HASSEMAPHORE) + a.flags |= MAP_HASSEMAPHORE; + if (uap->flags & OSF1_MAP_INHERIT) return (EINVAL); - if (SCARG(uap, flags) & OSF1_MAP_UNALIGNED) + if (uap->flags & OSF1_MAP_UNALIGNED) return (EINVAL); /* * Emulate an osf/1 bug: Apparently, mmap'ed segments are always * readable even if the user doesn't or in PROT_READ. This causes * some buggy programs to segv. */ - SCARG(&a, prot) |= PROT_READ; + a.prot |= PROT_READ; retval = mmap(td, &a); #ifdef DEBUG uprintf( "\nosf1_mmap: addr=%p (%p), len = 0x%lx, prot=0x%x, fd=%d, pad=0, pos=0x%lx", - SCARG(uap, addr), SCARG(&a, addr),SCARG(uap, len), SCARG(uap, prot), - SCARG(uap, fd), SCARG(uap, pos)); - printf(" flags = 0x%x\n",SCARG(uap, flags)); + uap->addr, a.addr,uap->len, uap->prot, + uap->fd, uap->pos); + printf(" flags = 0x%x\n",uap->flags); #endif return (retval); } @@ -562,15 +562,15 @@ { >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jan 2 11:22:24 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1EEC437B405; Thu, 2 Jan 2003 11:22:20 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9588337B401 for ; Thu, 2 Jan 2003 11:22:19 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3B8CC43EC2 for ; Thu, 2 Jan 2003 11:22:19 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h02JMJfh091818 for ; Thu, 2 Jan 2003 11:22:19 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h02JMIgx091815 for perforce@freebsd.org; Thu, 2 Jan 2003 11:22:18 -0800 (PST) Date: Thu, 2 Jan 2003 11:22:18 -0800 (PST) Message-Id: <200301021922.h02JMIgx091815@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 23052 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=23052 Change 23052 by jhb@jhb_laptop on 2003/01/02 11:21:21 IFC @23050. Affected files ... .. //depot/projects/smpng/sys/dev/zs/zs.c#2 integrate Differences ... ==== //depot/projects/smpng/sys/dev/zs/zs.c#2 (text+ko) ==== @@ -67,7 +67,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/zs/zs.c,v 1.1 2003/01/01 19:49:29 jake Exp $ + * $FreeBSD: src/sys/dev/zs/zs.c,v 1.2 2003/01/02 19:04:35 jake Exp $ */ /* @@ -132,20 +132,19 @@ int sc_icnt; uint8_t *sc_iput; uint8_t *sc_iget; + int sc_ocnt; uint8_t *sc_oget; - int sc_ocnt; int sc_brg_clk; int sc_alt_break_state; struct mtx sc_mtx; uint8_t sc_console; - uint8_t sc_opening; uint8_t sc_tx_busy; uint8_t sc_tx_done; uint8_t sc_preg_held; uint8_t sc_creg[16]; uint8_t sc_preg[16]; + uint8_t sc_ibuf[CBLOCK]; uint8_t sc_obuf[CBLOCK]; - uint8_t sc_ibuf[CBLOCK]; }; struct zs_softc { @@ -371,11 +370,17 @@ int needsoft; uint8_t rr3; + /* + * There is only one status register, which is on channel a. In order + * to avoid needing to know which channel we're on in the tty interrupt + * handler we shift the channel a status bits into the channel b + * bit positions and always test the channel b bits. + */ needsoft = 0; rr3 = ZS_READ_REG(sc->sc_child[0], 3); if ((rr3 & (ZSRR3_IP_A_RX | ZSRR3_IP_A_TX | ZSRR3_IP_A_STAT)) != 0) { ZS_WRITE(sc->sc_child[0], ZS_CSR, ZSWR0_CLR_INTR); - needsoft |= zstty_intr(sc->sc_child[0], rr3); + needsoft |= zstty_intr(sc->sc_child[0], rr3 >> 3); } if ((rr3 & (ZSRR3_IP_B_RX | ZSRR3_IP_B_TX | ZSRR3_IP_B_STAT)) != 0) { ZS_WRITE(sc->sc_child[1], ZS_CSR, ZSWR0_CLR_INTR); @@ -436,6 +441,8 @@ sc->sc_bt = sc->sc_parent->sc_bt; sc->sc_channel = device_get_unit(dev) & 1; sc->sc_brg_clk = ZS_CLOCK / ZS_CLOCK_DIV; + sc->sc_iput = sc->sc_iget = sc->sc_ibuf; + sc->sc_oget = sc->sc_obuf; switch (sc->sc_channel) { case 0: @@ -513,6 +520,11 @@ return (bus_generic_detach(dev)); } +/* + * Note that the rr3 value is shifted so the channel a status bits are in the + * channel b bit positions, which makes the bit positions uniform for both + * channels. + */ static int zstty_intr(struct zstty_softc *sc, uint8_t rr3) { @@ -526,7 +538,7 @@ brk = 0; needsoft = 0; - if ((rr3 & ZSRR3_IP_A_RX) != 0) { + if ((rr3 & ZSRR3_IP_B_RX) != 0) { needsoft = 1; do { /* @@ -539,7 +551,8 @@ if ((rr1 & (ZSRR1_FE | ZSRR1_DO | ZSRR1_PE)) != 0) ZS_WRITE(sc, ZS_CSR, ZSWR0_RESET_ERRORS); #if defined(DDB) && defined(ALT_BREAK_TO_DEBUGGER) - brk = db_alt_break(c, &sc->sc_alt_break_state); + if (sc->sc_console != 0) + brk = db_alt_break(c, &sc->sc_alt_break_state); #endif *sc->sc_iput++ = c; *sc->sc_iput++ = rr1; @@ -548,17 +561,17 @@ } while ((ZS_READ(sc, ZS_CSR) & ZSRR0_RX_READY) != 0); } - if ((rr3 & ZSRR3_IP_A_STAT) != 0) { + if ((rr3 & ZSRR3_IP_B_STAT) != 0) { rr0 = ZS_READ(sc, ZS_CSR); ZS_WRITE(sc, ZS_CSR, ZSWR0_RESET_STATUS); #if defined(DDB) && defined(BREAK_TO_DEBUGGER) - if ((rr0 & ZSRR0_BREAK) != 0) + if (sc->sc_console != 0 && (rr0 & ZSRR0_BREAK) != 0) brk = 1; #endif /* XXX do something about flow control */ } - if ((rr3 & ZSRR3_IP_A_TX) != 0) { + if ((rr3 & ZSRR3_IP_B_TX) != 0) { /* * If we've delayed a paramter change, do it now. */ @@ -854,6 +867,15 @@ if (ospeed < 0 || (t->c_ispeed && t->c_ispeed != t->c_ospeed)) return (EINVAL); + /* + * If there were no changes, don't do anything. This avoids dropping + * input and improves performance when all we did was frob things like + * VMIN and VTIME. + */ + if (tp->t_ospeed == t->c_ospeed && + tp->t_cflag == t->c_cflag) + return (0); + zstty_mdmctrl(sc, TIOCM_DTR, (t->c_ospeed == 0) ? DMBIC : DMBIS); @@ -893,6 +915,12 @@ if (cflag & PARENB) wr4 |= ZSWR4_PARENB; + tp->t_ispeed = 0; + tp->t_ospeed = t->c_ospeed; + tp->t_cflag = cflag; + + ttsetwater(tp); + ZSTTY_LOCK(sc); sc->sc_preg[3] = wr3; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jan 2 12: 5:27 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4765E37B405; Thu, 2 Jan 2003 12:05:26 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E8D5737B401 for ; Thu, 2 Jan 2003 12:05:25 -0800 (PST) Received: from kayak.xcllnt.net (209-128-86-226.BAYAREA.NET [209.128.86.226]) by mx1.FreeBSD.org (Postfix) with ESMTP id 81DD643ED1 for ; Thu, 2 Jan 2003 12:05:24 -0800 (PST) (envelope-from marcel@xcllnt.net) Received: from dhcp01.pn.xcllnt.net (dhcp01.pn.xcllnt.net [192.168.4.201]) by kayak.xcllnt.net (8.12.6/8.12.6) with ESMTP id h02K5OrT029288; Thu, 2 Jan 2003 12:05:24 -0800 (PST) (envelope-from marcel@kayak.pn.xcllnt.net) Received: from dhcp01.pn.xcllnt.net (localhost [127.0.0.1]) by dhcp01.pn.xcllnt.net (8.12.6/8.12.6) with ESMTP id h02K6dLL000652; Thu, 2 Jan 2003 12:06:39 -0800 (PST) (envelope-from marcel@dhcp01.pn.xcllnt.net) Received: (from marcel@localhost) by dhcp01.pn.xcllnt.net (8.12.6/8.12.6/Submit) id h02K6cP9000651; Thu, 2 Jan 2003 12:06:38 -0800 (PST) (envelope-from marcel) Date: Thu, 2 Jan 2003 12:06:38 -0800 From: Marcel Moolenaar To: Doug Rabson Cc: Perforce Change Reviews Subject: Re: PERFORCE change 23031 for review Message-ID: <20030102200638.GA616@dhcp01.pn.xcllnt.net> References: <200301012226.h01MQHEa035401@repoman.freebsd.org> <200301020947.04412.dfr@nlsystems.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200301020947.04412.dfr@nlsystems.com> User-Agent: Mutt/1.5.1i Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Thu, Jan 02, 2003 at 09:47:04AM +0000, Doug Rabson wrote: > On Wednesday 01 January 2003 10:26 pm, Marcel Moolenaar wrote: > > http://perforce.freebsd.org/chv.cgi?CH=23031 > > > > Change 23031 by marcel@marcel_nfs on 2003/01/01 14:25:52 > > > > I cannot convince myself that reloading cr.itm with a delta > > of cr.itm and not a delta of cr.itc without the logic to > > detect missed interrupts is not going to harm. Revert the > > change and add a comment. We should really use cr.itm, but > > we need to check for missed interrupts so that we don't > > reload with a value that is smaller than the current counter > > and thus don't get timer interrupts until the 64-bit counter > > wraps. > > It doesn't matter much if there is some inaccuracy in the frequency of > calls to hardclock since the actual time is read from the timecounter. > The HZ poll rate is used for scheduling and similar, not for timing. Ah, ok. Thanks, -- Marcel Moolenaar USPA: A-39004 marcel@xcllnt.net To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jan 2 12:13:30 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D8A9737B405; Thu, 2 Jan 2003 12:13:28 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 68EA937B401; Thu, 2 Jan 2003 12:13:28 -0800 (PST) Received: from kayak.xcllnt.net (209-128-86-226.BAYAREA.NET [209.128.86.226]) by mx1.FreeBSD.org (Postfix) with ESMTP id 73E7C43E4A; Thu, 2 Jan 2003 12:13:27 -0800 (PST) (envelope-from marcel@xcllnt.net) Received: from dhcp01.pn.xcllnt.net (dhcp01.pn.xcllnt.net [192.168.4.201]) by kayak.xcllnt.net (8.12.6/8.12.6) with ESMTP id h02KDMrT029317; Thu, 2 Jan 2003 12:13:22 -0800 (PST) (envelope-from marcel@kayak.pn.xcllnt.net) Received: from dhcp01.pn.xcllnt.net (localhost [127.0.0.1]) by dhcp01.pn.xcllnt.net (8.12.6/8.12.6) with ESMTP id h02KEbLL000677; Thu, 2 Jan 2003 12:14:37 -0800 (PST) (envelope-from marcel@dhcp01.pn.xcllnt.net) Received: (from marcel@localhost) by dhcp01.pn.xcllnt.net (8.12.6/8.12.6/Submit) id h02KEb4P000676; Thu, 2 Jan 2003 12:14:37 -0800 (PST) (envelope-from marcel) Date: Thu, 2 Jan 2003 12:14:37 -0800 From: Marcel Moolenaar To: John Baldwin Cc: Perforce Change Reviews Subject: Re: PERFORCE change 23029 for review Message-ID: <20030102201437.GB616@dhcp01.pn.xcllnt.net> References: <200301012203.h01M3nKH028011@repoman.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.1i Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Thu, Jan 02, 2003 at 10:59:30AM -0500, John Baldwin wrote: > > On 01-Jan-2003 Marcel Moolenaar wrote: > > http://perforce.freebsd.org/chv.cgi?CH=23029 > > > > Change 23029 by marcel@marcel_nfs on 2003/01/01 14:03:34 > > > > While here, reload cr.itm (interval timer match register) > > based on the old value of cr.itm and not cr.itc (interval > > timer counter). The value of cr.itc is non-deterministicly > > close to the value of cr.itm at the time of the interrupt. > > The SDM clearly states that they are not guaranteed to be > > identical, even though the interrupt is triggered when > > cr.itc equals cr.itm). Reloading cr.itm based on the value > > of cr.itc will therefore introduce a non-deterministic error > > in the clocks. This will also reduce clock skew due to > > interrupt latency. > > Cool. Peter says the Linux code does something similar but goes > to extra efforts to handle the case of missing entire ticks and > what not.w Yeah, that hit me after committing and I noticed that sparc64 does that too. As you have probably seen, I reverted the change for now. A missed clock interrupt is worse than a slight error. Doug got me a bit confused though, so I won't touch the code until I deconfused myself :-) -- Marcel Moolenaar USPA: A-39004 marcel@xcllnt.net To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jan 2 12:16:47 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A5A6B37B405; Thu, 2 Jan 2003 12:16:44 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3C8FC37B401 for ; Thu, 2 Jan 2003 12:16:44 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BCD6B43EC5 for ; Thu, 2 Jan 2003 12:16:43 -0800 (PST) (envelope-from green@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h02KGhfh011206 for ; Thu, 2 Jan 2003 12:16:43 -0800 (PST) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h02KGhAw011203 for perforce@freebsd.org; Thu, 2 Jan 2003 12:16:43 -0800 (PST) Date: Thu, 2 Jan 2003 12:16:43 -0800 (PST) Message-Id: <200301022016.h02KGhAw011203@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 23057 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=23057 Change 23057 by green@green_laptop_2 on 2003/01/02 12:16:08 * Set SEBSD tty labels in login.c. Affected files ... .. //depot/projects/trustedbsd/mac/usr.bin/login/login.c#27 edit Differences ... ==== //depot/projects/trustedbsd/mac/usr.bin/login/login.c#27 (text+ko) ==== @@ -80,6 +80,7 @@ #include #include +#include #include "login.h" #include "pathnames.h" @@ -175,7 +176,8 @@ const char *tp; const char *shell = NULL; login_cap_t *lc = NULL; - mac_t execlabel = NULL; + mac_t execlabel = NULL; /* label to transition to in exec */ + mac_t oldttylabel = NULL; /* previous tty label to restore */ const char *label_string; pid_t pid; @@ -498,10 +500,14 @@ * Determine if we must execute a transition when we * run our shell, for MAC policies which require it. For now, * this is just SEBSD, and therefore not generic at all. + * When using SEBSD, the terminal device needs to be relabeled + * according to what the security server reports. */ if (sebsd_enabled()) { - char *labeltext, *queried, **contexts; + char *labeltext, *queried, *oldttylabeltext, *tty_queried, + **contexts; size_t ncontexts; + mac_t newttylabel; int n; if (get_ordered_context_list(username, NULL, &contexts, @@ -516,9 +522,33 @@ bail(NO_SLEEP_EXIT, 1); } free(labeltext); + mac_prepare(&oldttylabel, "sebsd"); + if (mac_get_file(ttyn, oldttylabel) != 0 || + mac_to_text(oldttylabel, &oldttylabeltext) != 0) { + syslog(LOG_ERR, "Getting SEBSD label on terminal " + "%s: %m", ttyn); + bail(NO_SLEEP_EXIT, 1); + } + if (security_change_context(queried, oldttylabeltext + + sizeof("sebsd/") - 1, SECCLASS_CHR_FILE, + &tty_queried) != 0 || + asprintf(&labeltext, "sebsd/%s", tty_queried) == -1) { + syslog(LOG_ERR, "Determining SEBSD label for terminal " + "%s: %m", ttyn); + bail(NO_SLEEP_EXIT, 1); + } + free(oldttylabeltext); + free(tty_queried); for (n = 0; n < ncontexts; n++) free(contexts[n]); free(contexts); + if (mac_from_text(&newttylabel, labeltext) != 0 || + mac_set_file(ttyn, newttylabel) != 0) { + syslog(LOG_ERR, "Setting SEBSD label on terminal " + "%s: %m", ttyn); + bail(NO_SLEEP_EXIT, 1); + } + mac_free(newttylabel); } nosebsd: @@ -568,6 +598,7 @@ */ setproctitle("-%s [pam]", getprogname()); wait(NULL); + (void)mac_set_file(ttyn, oldttylabel); bail(NO_SLEEP_EXIT, 0); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jan 2 12:19:55 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2E21A37B405; Thu, 2 Jan 2003 12:19:49 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id ACBB137B401 for ; Thu, 2 Jan 2003 12:19:48 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4929A43E4A for ; Thu, 2 Jan 2003 12:19:48 -0800 (PST) (envelope-from green@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h02KJmfh011353 for ; Thu, 2 Jan 2003 12:19:48 -0800 (PST) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h02KJleP011350 for perforce@freebsd.org; Thu, 2 Jan 2003 12:19:47 -0800 (PST) Date: Thu, 2 Jan 2003 12:19:47 -0800 (PST) Message-Id: <200301022019.h02KJleP011350@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 23058 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=23058 Change 23058 by green@green_laptop_2 on 2003/01/02 12:18:49 * Add locking to SEBSD's AVC. Linux uses spin-locks here, but in FreeBSD spin-locks are almost always the improper type to use. * Add some locking-related comments to the SEBSD sysctls. * Remove the debugging printf() from the SEBSD syscalls. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/sebsd/avc/avc.c#11 edit .. //depot/projects/trustedbsd/mac/sys/security/sebsd/avc/avc.h#9 edit .. //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd_syscall.c#4 edit .. //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd_sysctl.c#6 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/avc/avc.c#11 (text+ko) ==== @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include @@ -43,6 +44,8 @@ extern int ss_initialized; int avc_debug_always_allow = 1; +struct mtx avc_lock; + typedef struct avc_node { struct avc_entry ae; struct avc_node *next; @@ -231,6 +234,7 @@ avc_audit_buffer = (char *)malloc(4000, M_SEBSD_AVC, M_WAITOK); if (!avc_audit_buffer) panic("AVC: unable to allocate audit buffer\n"); + mtx_init(&avc_lock, "SEBSD AVC", NULL, MTX_DEF); } /* @@ -612,7 +616,7 @@ avc_node_t *node; int i; -/* spin_lock(&avc_lock); */ + mtx_lock(&avc_lock); if (ssid == SECSID_WILD || tsid == SECSID_WILD) { /* apply to all matching nodes */ @@ -634,7 +638,7 @@ } } -/* spin_unlock(&avc_lock); */ + mtx_unlock(&avc_lock); return 0; } @@ -693,10 +697,10 @@ *out_retained = tretained; } -/* spin_lock(&avc_lock); */ + mtx_lock(&avc_lock); if (seqno > avc_cache.latest_notif) avc_cache.latest_notif = seqno; -/* spin_unlock(&avc_lock); */ + mtx_unlock(&avc_lock); return 0; } @@ -760,7 +764,7 @@ avc_hash_eval("reset"); -/* spin_lock(&avc_lock); */ + mtx_lock(&avc_lock); for (i = 0; i < AVC_CACHE_SLOTS; i++) { node = avc_cache.slots[i]; @@ -780,7 +784,7 @@ } avc_cache.lru_hint = 0; -/* spin_unlock(&avc_lock); */ + mtx_unlock(&avc_lock); for (i = 0; i < AVC_NSTATS; i++) avc_cache_stats[i] = 0; @@ -794,10 +798,10 @@ } } -/* spin_lock(&avc_lock); */ + mtx_lock(&avc_lock); if (seqno > avc_cache.latest_notif) avc_cache.latest_notif = seqno; -/* spin_unlock(&avc_lock); */ + mtx_unlock(&avc_lock); return 0; } ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/avc/avc.h#9 (text+ko) ==== @@ -23,6 +23,8 @@ #ifdef _KERNEL #include MALLOC_DECLARE(M_SEBSD_AVC); +#include +#include #else /* _KERNEL */ #include #endif /* _KERNEL */ @@ -123,9 +125,7 @@ { memset((_d), 0, sizeof(struct avc_audit_data)); (_d)->type = AVC_AUDIT_DATA_##_t; } -#ifdef CDV_TBD -/* extern spinlock_t avc_lock; */ -#endif +extern struct mtx avc_lock; /* @@ -240,11 +240,10 @@ { struct avc_entry *ae; int rc; -/* unsigned long flags; */ struct avc_entry entry; __u32 seqno; -/* spin_lock_irqsave(&avc_lock, flags); */ + mtx_lock(&avc_lock); avc_cache_stats_incr(AVC_ENTRY_LOOKUPS); ae = aeref->ae; if (ae) { @@ -264,7 +263,7 @@ avc_cache_stats_incr(AVC_ENTRY_MISSES); rc = avc_lookup(ssid, tsid, tclass, requested, aeref); if (rc) { -/* spin_unlock_irqrestore(&avc_lock,flags); */ + mtx_unlock(&avc_lock); rc = security_compute_av(ssid,tsid,tclass,requested, &entry.allowed, &entry.decided, @@ -273,10 +272,10 @@ &seqno); if (rc) return rc; -/* spin_lock_irqsave(&avc_lock, flags); */ + mtx_lock(&avc_lock); rc = avc_insert(ssid,tsid,tclass,&entry,seqno,aeref); if (rc) { -/* spin_unlock_irqrestore(&avc_lock,flags); */ + mtx_unlock(&avc_lock); return rc; } } @@ -293,14 +292,14 @@ #ifndef __TBD_CDV__ if (avc_debug_always_allow) { ae->allowed |= requested; -/* spin_unlock_irqrestore(&avc_lock,flags); */ + mtx_unlock(&avc_lock); return 0; } else { -/* spin_unlock_irqrestore(&avc_lock,flags); */ + mtx_unlock(&avc_lock); return -EACCES; } #else /* __TBD_CDV__ */ -/* spin_unlock_irqrestore(&avc_lock,flags); */ + mtx_unlock(&avc_lock); return -EACCES; #endif /* __TBD_CDV__ */ } @@ -309,7 +308,7 @@ avc_audit(ssid, tsid, tclass, requested, ae, AVC_AUDITALLOW, auditdata); -/* spin_unlock_irqrestore(&avc_lock,flags); */ + mtx_unlock(&avc_lock); return 0; } ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd_syscall.c#4 (text+ko) ==== @@ -89,7 +89,5 @@ break; } - printf("SEBSD syscall: call=%d err=%d\n", call, err); - return err; } ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd_sysctl.c#6 (text+ko) ==== @@ -67,6 +67,11 @@ error = SYSCTL_OUT(req, buffer, len); if (error) goto out; + /* + * XXX What's keeping the SID table from changing? POLICY_RDLOCK + * would not be able to do it as of now, so what we really need is + * SIDTAB_LOCK. + */ for (i = 0; i < SIDTAB_SIZE; i++) { cur = sidtab.htable[i]; while (cur != NULL && count > 0) { @@ -155,6 +160,9 @@ goto out; } username = context + len + 1; + /* + * XXX We need POLICY_RDLOCK here, but it's not exported! + */ error = security_context_to_sid(context, len + 1, &sid); if (error) goto out; @@ -211,6 +219,9 @@ goto out; } bcopy(&scontext[strlen(scontext) + 1], &tclass, sizeof(tclass)); + /* + * XXX We need POLICY_RDLOCK here, but it's not exported! + */ error = security_context_to_sid(scontext, strlen(scontext) + 1, &sid); if (error) goto out; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jan 2 12:21:54 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A0F3A37B405; Thu, 2 Jan 2003 12:21:52 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4B56C37B406 for ; Thu, 2 Jan 2003 12:21:52 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8DF3643EA9 for ; Thu, 2 Jan 2003 12:21:51 -0800 (PST) (envelope-from cvance@tislabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h02KLpfh014772 for ; Thu, 2 Jan 2003 12:21:51 -0800 (PST) (envelope-from cvance@tislabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h02KLoBe014769 for perforce@freebsd.org; Thu, 2 Jan 2003 12:21:50 -0800 (PST) Date: Thu, 2 Jan 2003 12:21:50 -0800 (PST) Message-Id: <200301022021.h02KLoBe014769@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cvance@tislabs.com using -f From: Chris Vance Subject: PERFORCE change 23059 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=23059 Change 23059 by cvance@cvance_laptop on 2003/01/02 12:21:49 Misc. updates to todo list Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/sebsd/TODO#2 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/TODO#2 (text+ko) ==== @@ -19,21 +19,18 @@ SELinux and should be resync'd, probably along with the rest of the AVC and Security Server. -* Convert sebsd_enforcing and sebsd_toggle back to sysctls. These were - sysctls, then I coverted them to system calls, now I think they should - be sysctls again. Perhaps instead of the SELinux toggle - semantics, the enforcing program should be specific "on" vs "off"? +* Provide user-space tools for load_policy, enforcing, etc. * Port/write newrole application * Port/write run_init application -* Modify login to query permitted roles - -* Add syscall so policy my be reloaded on a live system +* Generate a table comparing SELinux and TrustedBSD hooks and coverage * Fix policy - Fix existing policy - Remove unused domains and policy components + - newsyslog is busted + - cron has issues To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jan 2 12:29: 9 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D04F737B405; Thu, 2 Jan 2003 12:29:01 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5199237B401 for ; Thu, 2 Jan 2003 12:29:01 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EDB5343EA9 for ; Thu, 2 Jan 2003 12:29:00 -0800 (PST) (envelope-from cvance@tislabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h02KT0fh014993 for ; Thu, 2 Jan 2003 12:29:00 -0800 (PST) (envelope-from cvance@tislabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h02KT0nh014990 for perforce@freebsd.org; Thu, 2 Jan 2003 12:29:00 -0800 (PST) Date: Thu, 2 Jan 2003 12:29:00 -0800 (PST) Message-Id: <200301022029.h02KT0nh014990@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cvance@tislabs.com using -f From: Chris Vance Subject: PERFORCE change 23060 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=23060 Change 23060 by cvance@cvance_laptop on 2003/01/02 12:28:25 Allow SEBSD to be pushed into enforcing mode via a sysctl. We'll leave the system call intact for now as well. This should permit the very special pain of booting in enforcing mode. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/sebsd/avc/avc.c#12 edit .. //depot/projects/trustedbsd/mac/sys/security/sebsd/avc/avc.h#10 edit .. //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd_sysctl.c#7 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/avc/avc.c#12 (text+ko) ==== @@ -875,7 +875,23 @@ return 0; } +int +sys_avc_set_enforcing(struct thread *td, int enforcing) +{ + int error; + + error = thread_has_system(td, SYSTEM__AVC_TOGGLE); + if (error) + return (error); + if (enforcing && avc_debug_always_allow) { + avc_ss_reset(avc_cache.latest_notif); + if (!ss_initialized && security_init() != 0) + panic("SELinux: Could not initialize\n"); + } + avc_debug_always_allow = !enforcing; + return (0); +} #ifdef CONFIG_SECURITY_SELINUX_DEVELOP /* * TBD: should have build-time non development mode that does not permit ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/avc/avc.h#10 (text+ko) ==== @@ -344,6 +344,7 @@ #ifdef _KERNEL extern int sys_avc_toggle(struct thread *td); extern int sys_avc_enforcing(struct thread *td); +extern int sys_avc_set_enforcing(struct thread *td, int enforcing); #endif #endif /* _LINUX_AVC_H_ */ ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd_sysctl.c#7 (text+ko) ==== @@ -47,6 +47,8 @@ #include #include +#include + /* * Sysctl handler for security.mac.sebsd.sids * Lists the SIDs currently active in the security server @@ -93,7 +95,6 @@ return (error); } -#if 0 /* * Sysctl handler for security.mac.sebsd.enforcing * Get and/or set whether the avc is in enforcement mode. @@ -103,30 +104,21 @@ { int error, enforcing; - if (req->oldptr != NULL) { - /* XXX Always allow the users to find out? */ - enforcing = !avc_debug_always_allow; - error = SYSCTL_OUT(req, &enforcing, sizeof(enforcing)); - if (error) - return (error); - } + /* TBD: XXX Always allow the users to find out? */ + enforcing = !avc_debug_always_allow; + error = SYSCTL_OUT(req, &enforcing, sizeof(enforcing)); + if (error) + return (error); + if (req->newptr != NULL) { - error = thread_has_system(curthread, SYSTEM__AVC_TOGGLE); - if (error) - return (error); error = SYSCTL_IN(req, &enforcing, sizeof(enforcing)); if (error) return (error); - if (enforcing && avc_debug_always_allow) { - avc_ss_reset(avc_cache.latest_notif); - if (!ss_initialized && security_init() != 0) - panic("SELinux: Could not initialize\n"); - } - avc_debug_always_allow = !enforcing; + return(sys_avc_set_enforcing(curthread, enforcing)); } + return (0); } -#endif /* * Sysctl handler for security.mac.sebsd.user_sids @@ -257,8 +249,5 @@ SYSCTL_PROC(_security_mac_sebsd, OID_AUTO, change_sid, CTLTYPE_STRING | CTLFLAG_RW | CTLFLAG_ANYBODY, NULL, 0, sysctl_change_sid, "A", "SEBSD (tty) SID relabel to perform along with transition"); - -#if 0 SYSCTL_PROC(_security_mac_sebsd, OID_AUTO, enforcing, CTLTYPE_INT | CTLFLAG_RW, - 0, 0, sysctl_sebsd_enforcing, "I", "SEBSD avc enforcement"); -#endif + NULL, 0, sysctl_sebsd_enforcing, "I", "SEBSD avc enforcement"); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jan 2 13:26:16 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5CC2337B406; Thu, 2 Jan 2003 13:26:14 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0963E37B405 for ; Thu, 2 Jan 2003 13:26:14 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9EF7E43EA9 for ; Thu, 2 Jan 2003 13:26:13 -0800 (PST) (envelope-from green@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h02LQDfh036728 for ; Thu, 2 Jan 2003 13:26:13 -0800 (PST) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h02LQD0e036725 for perforce@freebsd.org; Thu, 2 Jan 2003 13:26:13 -0800 (PST) Date: Thu, 2 Jan 2003 13:26:13 -0800 (PST) Message-Id: <200301022126.h02LQD0e036725@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 23064 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=23064 Change 23064 by green@green_laptop_2 on 2003/01/02 13:25:51 * Correct input of the security class paramater for the change_sid sysctl. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd_sysctl.c#8 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd_sysctl.c#8 (text+ko) ==== @@ -210,7 +210,7 @@ error = EINVAL; goto out; } - bcopy(&scontext[strlen(scontext) + 1], &tclass, sizeof(tclass)); + bcopy(&tcontext[strlen(tcontext) + 1], &tclass, sizeof(tclass)); /* * XXX We need POLICY_RDLOCK here, but it's not exported! */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jan 2 13:35:28 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2AE8A37B405; Thu, 2 Jan 2003 13:35:26 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CFAEA37B401 for ; Thu, 2 Jan 2003 13:35:25 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 84A6743EC2 for ; Thu, 2 Jan 2003 13:35:25 -0800 (PST) (envelope-from cvance@tislabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h02LZPfh040277 for ; Thu, 2 Jan 2003 13:35:25 -0800 (PST) (envelope-from cvance@tislabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h02LZOeI040274 for perforce@freebsd.org; Thu, 2 Jan 2003 13:35:24 -0800 (PST) Date: Thu, 2 Jan 2003 13:35:24 -0800 (PST) Message-Id: <200301022135.h02LZOeI040274@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cvance@tislabs.com using -f From: Chris Vance Subject: PERFORCE change 23065 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=23065 Change 23065 by cvance@cvance_laptop on 2003/01/02 13:35:06 Fix policy so syslogd can read from /dev/klog Affected files ... .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/syslogd.te#2 edit .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/genfs_contexts#6 edit Differences ... ==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/syslogd.te#2 (text+ko) ==== @@ -17,6 +17,7 @@ type syslogd_exec_t, file_type, sysadmfile, exec_type; domain_auto_trans(initrc_t, syslogd_exec_t, syslogd_t) type_transition init_t syslogd_exec_t:process syslogd_t; +type klog_device_t, file_type, sysadmfile; type devlog_t, file_type, sysadmfile; type syslogd_tmp_t, file_type, sysadmfile, tmpfile; @@ -45,3 +46,6 @@ # Write to the cron log. allow syslogd_t cron_log_t:file rw_file_perms; + +# Read/poll /dev/klog +allow syslogd_t klog_device_t:chr_file {read poll}; ==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/genfs_contexts#6 (text+ko) ==== @@ -76,4 +76,5 @@ genfscon devfs /sound -c system_u:object_r:sound_device_t genfscon devfs /usb system_u:object_r:usbdevfs_device_t genfscon devfs /bpf -c system_u:object_r:bpf_device_t +genfscon devfs /klog system_u:object_r:klog_device_t # FLASK To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jan 2 18:18:16 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AA41D37B405; Thu, 2 Jan 2003 18:18:14 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 41E5D37B401 for ; Thu, 2 Jan 2003 18:18:14 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EF73943EA9 for ; Thu, 2 Jan 2003 18:18:13 -0800 (PST) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h032IDfh040808 for ; Thu, 2 Jan 2003 18:18:13 -0800 (PST) (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h032IDgF040805 for perforce@freebsd.org; Thu, 2 Jan 2003 18:18:13 -0800 (PST) Date: Thu, 2 Jan 2003 18:18:13 -0800 (PST) Message-Id: <200301030218.h032IDgF040805@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 23072 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=23072 Change 23072 by des@des.at.des.thinksec.com on 2003/01/02 18:17:16 Fix typo in debugging macro. Submitted by: Mikko Tyolajarvi Affected files ... .. //depot/projects/openpam/lib/openpam_impl.h#18 edit Differences ... ==== //depot/projects/openpam/lib/openpam_impl.h#18 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/openpam_impl.h#17 $ + * $P4: //depot/projects/openpam/lib/openpam_impl.h#18 $ */ #ifndef _OPENPAM_IMPL_H_INCLUDED @@ -153,7 +153,7 @@ #define ENTER() #define RETURNV() return #define RETURNC(c) return (c) -#define RETURNI(n) return (i) +#define RETURNI(i) return (i) #define RETURNP(p) return (p) #define RETURNS(s) return (s) #endif To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jan 2 18:22:21 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5F4B237B405; Thu, 2 Jan 2003 18:22:20 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EC86A37B401 for ; Thu, 2 Jan 2003 18:22:19 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A61CB43EB2 for ; Thu, 2 Jan 2003 18:22:19 -0800 (PST) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h032MJfh044239 for ; Thu, 2 Jan 2003 18:22:19 -0800 (PST) (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h032MJWh044236 for perforce@freebsd.org; Thu, 2 Jan 2003 18:22:19 -0800 (PST) Date: Thu, 2 Jan 2003 18:22:19 -0800 (PST) Message-Id: <200301030222.h032MJWh044236@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 23073 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=23073 Change 23073 by des@des.at.des.thinksec.com on 2003/01/02 18:21:32 Credit Mikko Työläjärvi for his patch (see change 23072) Affected files ... .. //depot/projects/openpam/CREDITS#5 edit Differences ... ==== //depot/projects/openpam/CREDITS#5 (text+ko) ==== @@ -18,9 +18,10 @@ Gary Winiger Joe Marcus Clarke Mark Murray + Mikko Työläjärvi Robert Watson Ruslan Ermilov Solar Designer Takanori Saneto -$P4: //depot/projects/openpam/CREDITS#4 $ +$P4: //depot/projects/openpam/CREDITS#5 $ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jan 2 18:31:34 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 23C5137B405; Thu, 2 Jan 2003 18:31:32 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id ACD6737B401 for ; Thu, 2 Jan 2003 18:31:31 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6435343EB2 for ; Thu, 2 Jan 2003 18:31:31 -0800 (PST) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h032VVfh047803 for ; Thu, 2 Jan 2003 18:31:31 -0800 (PST) (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h032VUgC047800 for perforce@freebsd.org; Thu, 2 Jan 2003 18:31:30 -0800 (PST) Date: Thu, 2 Jan 2003 18:31:30 -0800 (PST) Message-Id: <200301030231.h032VUgC047800@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 23074 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=23074 Change 23074 by des@des.at.des.thinksec.com on 2003/01/02 18:30:52 Fix a typo in the active version of RETURNC(), and a cosmetic nit in the active version of RETURNI(). Affected files ... .. //depot/projects/openpam/lib/openpam_impl.h#19 edit Differences ... ==== //depot/projects/openpam/lib/openpam_impl.h#19 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/openpam_impl.h#18 $ + * $P4: //depot/projects/openpam/lib/openpam_impl.h#19 $ */ #ifndef _OPENPAM_IMPL_H_INCLUDED @@ -125,15 +125,15 @@ #define ENTER() openpam_log(PAM_LOG_DEBUG, "entering") #define RETURNV() openpam_log(PAM_LOG_DEBUG, "returning") #define RETURNC(c) do { \ - if ((c) >= 0 && (c) < PAM_NUM_ERRORS) + if ((c) >= 0 && (c) < PAM_NUM_ERRORS) \ openpam_log(PAM_LOG_DEBUG, "returning %s", _pam_err_name[c]); \ else \ openpam_log(PAM_LOG_DEBUG, "returning %d!", (c)); \ return (c); \ } while (0) -#define RETURNI(n) do { \ - openpam_log(PAM_LOG_DEBUG, "returning %d", (n)); \ - return (n); \ +#define RETURNI(i) do { \ + openpam_log(PAM_LOG_DEBUG, "returning %d", (i)); \ + return (i); \ } while (0) #define RETURNP(p) do { \ if ((p) == NULL) \ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jan 2 18:34:38 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 94BB337B405; Thu, 2 Jan 2003 18:34:36 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2F98837B401 for ; Thu, 2 Jan 2003 18:34:36 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DC7DB43EC5 for ; Thu, 2 Jan 2003 18:34:35 -0800 (PST) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h032YZfh047859 for ; Thu, 2 Jan 2003 18:34:35 -0800 (PST) (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h032YZn3047856 for perforce@freebsd.org; Thu, 2 Jan 2003 18:34:35 -0800 (PST) Date: Thu, 2 Jan 2003 18:34:35 -0800 (PST) Message-Id: <200301030234.h032YZn3047856@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 23075 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=23075 Change 23075 by des@des.at.des.thinksec.com on 2003/01/02 18:34:13 Have prompt() return NULL if EOF occurred on stdin, instead of acting as if the user had just pressed enter. Obtained from: TrustedBSD Affected files ... .. //depot/projects/openpam/lib/openpam_ttyconv.c#15 edit Differences ... ==== //depot/projects/openpam/lib/openpam_ttyconv.c#15 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/openpam_ttyconv.c#14 $ + * $P4: //depot/projects/openpam/lib/openpam_ttyconv.c#15 $ */ #include @@ -89,7 +89,7 @@ sigaction(SIGALRM, &saved_action, NULL); sigprocmask(SIG_SETMASK, &saved_sigset, NULL); alarm(saved_alarm); - if (timed_out || ferror(stdin)) + if (timed_out || ferror(stdin) || feof(stdin)) return (NULL); /* trim trailing whitespace */ for (len = strlen(buf); len > 0; --len) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jan 2 18:47:55 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 22C0337B405; Thu, 2 Jan 2003 18:47:54 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AF86A37B401 for ; Thu, 2 Jan 2003 18:47:53 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6928643E4A for ; Thu, 2 Jan 2003 18:47:53 -0800 (PST) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h032lrfh051618 for ; Thu, 2 Jan 2003 18:47:53 -0800 (PST) (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h032lqkj051615 for perforce@freebsd.org; Thu, 2 Jan 2003 18:47:52 -0800 (PST) Date: Thu, 2 Jan 2003 18:47:52 -0800 (PST) Message-Id: <200301030247.h032lqkj051615@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 23077 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=23077 Change 23077 by des@des.at.des.thinksec.com on 2003/01/02 18:47:06 Use RETURNP() rather than RETURNC(). Affected files ... .. //depot/projects/openpam/lib/pam_getenv.c#9 edit Differences ... ==== //depot/projects/openpam/lib/pam_getenv.c#9 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_getenv.c#8 $ + * $P4: //depot/projects/openpam/lib/pam_getenv.c#9 $ */ #include @@ -56,12 +56,12 @@ ENTER(); if (pamh == NULL) - RETURNC(NULL); + RETURNP(NULL); if (name == NULL || strchr(name, '=') != NULL) - RETURNC(NULL); + RETURNP(NULL); if ((i = openpam_findenv(pamh, name, strlen(name))) == -1) - RETURNC(NULL); - RETURNC(strdup(pamh->env[i])); + RETURNP(NULL); + RETURNP(strdup(pamh->env[i])); } /** To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jan 2 18:49:59 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5996F37B405; Thu, 2 Jan 2003 18:49:57 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E3BBE37B401 for ; Thu, 2 Jan 2003 18:49:56 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9CD9F43E4A for ; Thu, 2 Jan 2003 18:49:56 -0800 (PST) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h032nufh051781 for ; Thu, 2 Jan 2003 18:49:56 -0800 (PST) (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h032nuGm051778 for perforce@freebsd.org; Thu, 2 Jan 2003 18:49:56 -0800 (PST) Date: Thu, 2 Jan 2003 18:49:56 -0800 (PST) Message-Id: <200301030249.h032nuGm051778@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 23078 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=23078 Change 23078 by des@des.at.des.thinksec.com on 2003/01/02 18:49:21 On second thought, use RETURNS() since environment variables are strings. Affected files ... .. //depot/projects/openpam/lib/pam_getenv.c#10 edit Differences ... ==== //depot/projects/openpam/lib/pam_getenv.c#10 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_getenv.c#9 $ + * $P4: //depot/projects/openpam/lib/pam_getenv.c#10 $ */ #include @@ -56,12 +56,12 @@ ENTER(); if (pamh == NULL) - RETURNP(NULL); + RETURNS(NULL); if (name == NULL || strchr(name, '=') != NULL) - RETURNP(NULL); + RETURNS(NULL); if ((i = openpam_findenv(pamh, name, strlen(name))) == -1) - RETURNP(NULL); - RETURNP(strdup(pamh->env[i])); + RETURNS(NULL); + RETURNS(strdup(pamh->env[i])); } /** To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jan 3 0:50:23 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 113E137B406; Fri, 3 Jan 2003 00:49:59 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9993737B401 for ; Fri, 3 Jan 2003 00:49:58 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 49F2F43EC5 for ; Fri, 3 Jan 2003 00:49:57 -0800 (PST) (envelope-from chris@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h038nvfh084833 for ; Fri, 3 Jan 2003 00:49:57 -0800 (PST) (envelope-from chris@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h038nu0C084830 for perforce@freebsd.org; Fri, 3 Jan 2003 00:49:56 -0800 (PST) Date: Fri, 3 Jan 2003 00:49:56 -0800 (PST) Message-Id: <200301030849.h038nu0C084830@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to chris@freebsd.org using -f From: Chris Costello Subject: PERFORCE change 23094 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=23094 Change 23094 by chris@chris_holly on 2003/01/03 00:49:22 Beginning to get the updates to the MPO doc online. Still needs plenty of work but this stuff needs to be committed. A good chunk of the new additions to the entry point list has been added, with more to come. However, I am still not finished. Just as in this commit, the next few commits will include new additions as well as revisions to existing entry points. A few upcoming major changes: o We're going to rely more on entities for otherwise repetitive markup. For example, in this commit I add an entity representing the parameters for the internalize and externalize prototypes, one for the listing, and one for the paragraph, since they all essentially do the same thing. The next wave of this 'entitization' will address reused parameters, e.g. "struct label *label" will become &mac.struct.label.label;. o Reorganization. Once all the individual entry points are up to date, all the various sections will be reexamined. (I know many entry points are not in the right place at all.) o An index or contents. Still need to figure out how to do this properly, because this is just one big file with no links into various parts of it, which makes it kinda hard to use. Affected files ... .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/mac.ent#4 edit .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/mac/chapter.sgml#18 edit .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml#9 edit .. //depot/projects/trustedbsd/doc/share/sgml/man-refs.ent#10 edit Differences ... ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/mac.ent#4 (text+ko) ==== @@ -12,3 +12,109 @@ '> + +struct label *label + char *element_name + char *element_data + size_t size + size_t *len + int *claimed +'> + + + + label + Label to be externalized + + + + element_name + Name of the policy whose label should be externalized + + + + element_data + Buffer; to be filled in with text representation of label + + + + size + Size of element_data + + + + len + To be filled in with the length of the string representing the + label data. + + + + claimed + Should be incremented when element_data + can be filled in. + + +'> + +Produce an externalized label based on the label structure passed. + An externalized label consists of a text representation of the label + contents that can be used with userland applications and read by the + user. Currently, all policies' externalize entry + points will be called, so the implementation should check the contents + of element_name before attempting to fill in + element_data. If + element_name does not match the name of your + policy, simply return 0. Only return nonzero + if an error occurs while externalizing the label data. Once the policy + fills in element_data, *claimed + should be incremented. +"> + +struct label *label + char *element_name + char *element_data + int *claimed +'> + + + + label + Label to be filled in + + + + element_name + Name of the policy whose label should be internalized + + + + element_data + Text data to be internalized + + + + claimed + Should be incremented when data can be successfully + internalized. + + +'> + +Produce an internal label structure based on externalized label data + in text format. Currently, all policies' internalize + entry points are called when internalization is requested, so the + implementation should compare the contents of + element_name to its own name in order to be sure + it should be internalizing the data in element_data. + Just as in the externalize entry points, the entry + point should return 0 if + element_name does not match its own name, or when + data can successfully be internalized, in which case + *claimed should be incremented. +"> ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/mac/chapter.sgml#18 (text+ko) ==== @@ -60,7 +60,7 @@ - Writing MAC Policies + The TrustedBSD MAC Framework Synopsis @@ -166,37 +166,33 @@ policy, provides a reference to the MAC entry point vector, provides load-time flags determining how the policy framework should handle the policy, and optionally requests the - allocation of label state by the framework: - - static struct mac_policy_op_entry &mac.mpo;_ops[] = -{ - { MAC_DESTROY, - (macop_t)mac_none_destroy }, - { MAC_INIT, - (macop_t)mac_none_init }, - { MAC_INIT_BPFDESC, - (macop_t)mac_none_init_bpfdesc }, + allocation of label state by the framework. + + static struct mac_policy_ops mac_policy_ops = +{ + .mpo_destroy = mac_policy_destroy, + .mpo_init = mac_policy_init, + .mpo_init_bpfdesc_label = mac_policy_init_bpfdesc_label, + .mpo_init_cred_label = mac_policy_init_label, /* ... */ - { MAC_CHECK_VNODE_STAT, - (macop_t)mac_none_check_vnode_stat }, - { MAC_CHECK_VNODE_WRITE, - (macop_t)mac_none_check_vnode_write }, - { MAC_OP_LAST, NULL } + .mpo_check_vnode_setutimes = mac_policy_check_vnode_setutimes, + .mpo_check_vnode_stat = mac_policy_check_vnode_stat, + .mpo_check_vnode_write = mac_policy_check_vnode_write, }; The MAC policy entry point vector, - mac_none_ops in this example, associates + mac_policy_ops in this example, associates functions defined in the module with specific entry points. A complete listing of available entry points and their prototypes may be found in the MAC entry point reference section. Of specific interest during module registration are - the MAC_DESTROY and MAC_INIT - entry points. MAC_INIT will be invoked once a + the .mpo_destroy and .mpo_init + entry points. .mpo_init will be invoked once a policy is successfully registered with the module framework but prior to any other entry points becoming active. This permits the policy to perform any policy-specific allocation and initialization, such as initialization of any data or - locks. MAC_DESTROY will be invoked when a + locks. .mpo_destroy will be invoked when a policy module is unloaded to permit releasing of any allocated memory and destruction of locks. Currently, these two entry points are invoked with the MAC policy list mutex held to @@ -304,6 +300,8 @@ Policy load event. The policy list mutex is held, so caution should be applied. + + @@ -379,6 +377,115 @@ File System Object Labeling Event Operations + + + <function>&mac.mpo;_associate_vnode_devfs</function> + + + + void + &mac.mpo;_associate_vnode_devfs + + struct mount + *mp + struct label + *fslabel + struct devfs_dirent + *de + struct label + *delabel + struct vnode + *vp + struct label + *vlabel + + + + + + &mac.thead; + + + + mp + Devfs mount point + + + + fslabel + Devfs file system label + (mp->mnt_fslabel) + + + + de + Devfs directory entry + + + + delabel + Policy label associated with + de + + + + vp + vnode associated with + de + + + + vlabel + Policy label associated with + vp + + + + + + Fill in the label (vlabel) for + a newly created devfs vnode based on the devfs directory + entry passed in de and its + label. + + + + <function>&mac.mpo;_copy_vnode_label</function> + + + + void + &mac.mpo;_copy_vnode_label + + struct label + *src + struct label + *dest + + + + + + &mac.thead; + + + + src + Source label + + + + dest + Destination label + + + + + + Copy the label information in + src into + dest. + <function>&mac.mpo;_create_devfs_device</function> @@ -688,55 +795,53 @@ the root file system is mounted, after &mac.mpo;_create_mount;. - - <function>&mac.mpo;_stdcreatevnode_ea</function> - + + + <function>&mac.mpo;_externalize_vnode_label</function> + + + + int + &mac.mpo;_externalize_vnode_label + + &mac.externalize.paramdefs; + + + + + + &mac.thead; + + &mac.externalize.tbody; + + + + &mac.externalize.para; + + + + <function>&mac.mpo;_internalize_vnode_label</function> + int - &mac.mpo;_stdcreatevnode_ea - - struct vnode - *vp - struct label - *vnodelabel + &mac.mpo;_internalize_vnode_label + + &mac.internalize.paramdefs; - + &mac.thead; - - - - vp - vnode to commit - Locked on entry, locked on exit - - - - vnodelabel - Label associated with - vp - - + + &mac.internalize.tbody; - - - This entry point is called when a vnode is to be - committed to disk via the extended attribute service (see - &man.extattr.9;). If committing to the disk is successful, - a value of 0 should be returned; - otherwise, an appropriate error code should be - returned. - - The current implementation as of July 24, 2002 - commits the data to disk from within the architecture. - The implementation will be updated to be closer to the - above documentation as development progresses. + + &mac.internalize.para; - + <function>&mac.mpo;_update_devfsdirent</function> @@ -1021,6 +1126,44 @@ IPC Object Labeling Event Operations + + + <function>&mac.mpo;_copy_pipe_label</function> + + + + void + &mac.mpo;_copy_pipe_label + + struct label + *src + struct label + *dest + + + + + + &mac.thead; + + + + src + Source label + + + + dest + Destination label + + + + + + Copy the label information in + src into + dest. + <function>&mac.mpo;_create_mbuf_from_socket</function> @@ -1123,63 +1266,169 @@ subject credential. This call is made when a socket is created. - - - <function>&mac.mpo;_create_socket_from_socket</function> - + + + <function>&mac.mpo;_externalize_ifnet_label</function> + + + + int + &mac.mpo;_externalize_ifnet_label + + &mac.externalize.paramdefs; + + + + + + &mac.thead; + + &mac.externalize.tbody; + + + + &mac.externalize.para; + + + + <function>&mac.mpo;_externalize_pipe_label</function> + + + + int + &mac.mpo;_externalize_pipe_label + + &mac.externalize.paramdefs; + + + + + + &mac.thead; + + &mac.externalize.tbody; + + + + &mac.externalize.para; + + + + <function>&mac.mpo;_externalize_socket_label</function> + + + + int + &mac.mpo;_externalize_socket_label + + &mac.externalize.paramdefs; + + + + + + &mac.thead; + + &mac.externalize.tbody; + + + + &mac.externalize.para; + + + + <function>&mac.mpo;_externalize_socket_peer_label</function> + + + + int + &mac.mpo;_externalize_socket_peer_label + + &mac.externalize.paramdefs; + + + + + + &mac.thead; + + &mac.externalize.tbody; + + + + &mac.externalize.para; + + + + <function>&mac.mpo;_internalize_ifnet_label</function> + + + + int + &mac.mpo;_internalize_ifnet_label + + &mac.internalize.paramdefs; + + + + + + &mac.thead; + + &mac.internalize.tbody; + + + + &mac.internalize.para; + + + + <function>&mac.mpo;_internalize_pipe_label</function> + + + + int + &mac.mpo;_internalize_pipe_label + + &mac.internalize.paramdefs; + + + + + + &mac.thead; + + &mac.internalize.tbody; + + + + &mac.internalize.para; + + + + <function>&mac.mpo;_internalize_socket_label</function> + - void - &mac.mpo;_create_socket_from_socket - - struct socket - *oldsocket - struct label - *oldsocketlabel - struct socket - *newsocket - struct label - *newsocketlabel + int + &mac.mpo;_internalize_socket_label + + &mac.internalize.paramdefs; - + &mac.thead; - - - - oldsocket - Object; parent socket; created from - &man.listen.2; - - - - oldsocketlabel - Label for - oldsocket - - - - newsocket - Object; child socket; incoming connection - - - - newsocketlabel - Label to be filled in for - newsocket - - + + &mac.internalize.tbody; - - Set the label on a newly created stream socket from the - passed listen socket. This call may occur during &man.accept.2;, - or prior to &man.accept.2;, depending on the protocol. + + &mac.internalize.para; - - + + <function>&mac.mpo;_socket_relabel</function> @@ -2155,10 +2404,9 @@ - Set the label of a newly created subject credential from the passed subject credential. This call will be made when - crcopy(9) is invoked on a newly created struct + &man.crcopy.9; is invoked on a newly created struct ucred. This call should not be confused with a process forking or creation event. @@ -2383,6 +2631,52 @@ Update the label on a subject credential from the passed update label. + + + <function>&mac.mpo;_externalize_cred_label</function> + + + + int + &mac.mpo;_externalize_cred_label + + &mac.externalize.paramdefs; + + + + + + &mac.thead; + + &mac.externalize.tbody; + + + + &mac.externalize.para; + + + + <function>&mac.mpo;_internalize_cred_label</function> + + + + int + &mac.mpo;_internalize_cred_label + + &mac.internalize.paramdefs; + + + + + + &mac.thead; + + &mac.internalize.tbody; + + + + &mac.internalize.para; + @@ -4733,12 +5027,12 @@ - <function>&mac.mpo;_init_bpfdesc</function> + <function>&mac.mpo;_init_bpfdesc_label</function> void - &mac.mpo;_init_bpfdesc + &mac.mpo;_init_bpfdesc_label struct bpf_d *bpf_d @@ -4770,12 +5064,12 @@ - <function>&mac.mpo;_init_devfsdirent</function> + <function>&mac.mpo;_init_devfsdirent_label</function> void - &mac.mpo;_init_devfsdirent + &mac.mpo;_init_devfsdirent_label struct devfs_dirent *devfs_dirent @@ -4807,12 +5101,12 @@ - <function>&mac.mpo;_init_ifnet</function> + <function>&mac.mpo;_init_ifnet_label</function> void - &mac.mpo;_init_ifnet + &mac.mpo;_init_ifnet_label struct ifnet *ifnet @@ -4844,12 +5138,12 @@ - <function>&mac.mpo;_init_ipq</function> + <function>&mac.mpo;_init_ipq_label</function> void - &mac.mpo;_init_ipq + &mac.mpo;_init_ipq_label struct ipq *ipq @@ -4879,14 +5173,14 @@ Initialize the label on a newly instantiated IP fragment reassembly queue. - + - <function>&mac.mpo;_init_mbuf</function> + <function>&mac.mpo;_init_mbuf_label</function> void - &mac.mpo;_init_mbuf + &mac.mpo;_init_mbuf_label struct mbuf *mbuf @@ -4908,7 +5202,7 @@ how - Blocking/non-blocking &man.malloc.9; see + Blocking/non-blocking &man.malloc.9;; see below @@ -4933,12 +5227,12 @@ - <function>&mac.mpo;_init_mount</function> + <function>&mac.mpo;_init_mount_label</function> void - &mac.mpo;_init_mount + &mac.mpo;_init_mount_label struct mount *mount @@ -4978,21 +5272,76 @@ Initialize the labels on a newly instantiated mount point. + + + <function>&mac.mpo;_init_mount_fs_label</function> + + + + void + &mac.mpo;_init_mount_fs_label + + struct label + *label + + + + + + &mac.thead; + + + + label + Label to be initialized + + + + + + Initialize the label on a newly mounted file + system. + + + + <function>&mac.mpo;_init_pipe_label</function> + + + + void + &mac.mpo;_init_pipe_label + + struct + label*label + + + + + + &mac.thead; + + + + label + Label to be filled in + + + + + Initialize a label for a newly instantiated pipe. + - <function>&mac.mpo;_init_socket</function> + <function>&mac.mpo;_init_socket_label</function> void - &mac.mpo;_init_socket + &mac.mpo;_init_socket_label - struct socket - *socket struct label *label - struct label - *peerlabel + int flag @@ -5002,37 +5351,66 @@ - socket - Object; socket + label + New label to initialize + flag + &man.malloc.9; flags + + + + + + Initialize a label for a newly instantiated + socket. + + + + <function>&mac.mpo;_init_socket_peer_label</function> + + + + void + &mac.mpo;_init_socket_peer_label + + struct label + *label + int flag + + + + + + &mac.thead; + + + label - New label to apply to the socket + New label to initialize - + - peerlabel - New label to apply to the socket's peer + flag + &man.malloc.9; flags - - Initialize the labels on a newly instantiated + >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jan 3 1:24:14 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1FABA37B405; Fri, 3 Jan 2003 01:23:50 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A37AE37B401 for ; Fri, 3 Jan 2003 01:23:49 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 96DEA43EA9 for ; Fri, 3 Jan 2003 01:23:47 -0800 (PST) (envelope-from chris@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h039Nlfh099120 for ; Fri, 3 Jan 2003 01:23:47 -0800 (PST) (envelope-from chris@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h039Nf5x099117 for perforce@freebsd.org; Fri, 3 Jan 2003 01:23:41 -0800 (PST) Date: Fri, 3 Jan 2003 01:23:41 -0800 (PST) Message-Id: <200301030923.h039Nf5x099117@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to chris@freebsd.org using -f From: Chris Costello Subject: PERFORCE change 23097 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=23097 Change 23097 by chris@chris_holly on 2003/01/03 01:23:07 Integ. Affected files ... .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/faq/book.sgml#6 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/Makefile#4 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/basics/chapter.sgml#6 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/bibliography/chapter.sgml#5 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/book.sgml#5 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/boot/chapter.sgml#6 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/chapters.ent#4 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/colophon.sgml#3 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/config/chapter.sgml#6 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#5 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/desktop/chapter.sgml#3 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/disks/chapter.sgml#6 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/eresources/chapter.sgml#4 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#5 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/l10n/chapter.sgml#5 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/linuxemu/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/mail/chapter.sgml#3 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/mirrors/chapter.sgml#4 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#1 branch .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/ports/chapter.sgml#5 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#3 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/preface/preface.sgml#3 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/security/chapter.sgml#5 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/serialcomms/chapter.sgml#5 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/users/chapter.sgml#5 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/x11/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/share/sgml/bookinfo.ent#2 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/share/sgml/catalog#2 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/share/sgml/legalnotice.sgml#2 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/share/sgml/mailing-lists.ent#3 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/share/sgml/teams.ent#4 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/Makefile#5 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/checkpoint/Makefile#1 branch .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/checkpoint/article.sgml#1 branch .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/committers-guide/article.sgml#9 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/console-server/article.sgml#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/contributing/article.sgml#5 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/contributors/article.sgml#12 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/cvsup-advanced/article.sgml#5 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/diskless-x/article.sgml#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/euro/article.sgml#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/filtering-bridges/article.sgml#4 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/hubs/article.sgml#5 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/serial-uart/article.sgml#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/smp/Makefile#1 branch .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/smp/article.sgml#1 branch .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/vinum/article.sgml#4 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/driverbasics/chapter.sgml#5 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/isa/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/vm/chapter.sgml#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/faq/book.sgml#10 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/fdp-primer/book.sgml#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/fdp-primer/tools/chapter.sgml#4 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#10 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/basics/chapter.sgml#8 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/book.sgml#5 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/boot/chapter.sgml#6 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/colophon.sgml#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/config/chapter.sgml#8 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#11 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#4 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#9 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml#8 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml#10 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml#5 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#7 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml#7 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/mail/chapter.sgml#7 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#11 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml#6 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/README#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#8 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/hrs.key#1 branch .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/leeym.key#1 branch .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/pgpkeys.ent#8 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/roam.key#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/roberto.key#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/trhodes.key#1 branch .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#8 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/printing/chapter.sgml#6 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml#10 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/serialcomms/chapter.sgml#7 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/x11/chapter.sgml#7 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#12 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/ppp-primer/Makefile#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/ppp-primer/book.sgml#3 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/share/sgml/mailing-lists.ent#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/share/sgml/teams.ent#3 integrate .. //depot/projects/trustedbsd/doc/es_ES.ISO8859-1/books/Makefile#2 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/articles/contributors/article.sgml#4 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/articles/cvsup-advanced/article.sgml#4 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/articles/pr-guidelines/article.sgml#3 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/developers-handbook/locking/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/basics/chapter.sgml#6 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/book.sgml#5 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/boot/chapter.sgml#3 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/colophon.sgml#2 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/config/chapter.sgml#5 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/cutting-edge/Makefile#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#3 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/install/chapter.sgml#6 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/introduction/chapter.sgml#4 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#6 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/x11/chapter.sgml#5 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/share/sgml/freebsd.dsl#7 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/articles/dialup-firewall/article.sgml#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/articles/zip-drive/article.sgml#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/design-44bsd/book.sgml#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/faq/book.sgml#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/advanced-networking/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/boot/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/config/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/eresources/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/hw/chapter.sgml#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/install/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/internals/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/kernelconfig/chapter.sgml#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/kerneldebug/chapter.sgml#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/mirrors/chapter.sgml#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/ppp-and-slip/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/printing/chapter.sgml#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/security/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/Makefile#5 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/a2p.1#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/addftinfo.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/addr2line.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/afmtodit.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/apply.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/apropos.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ar.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/at.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/basename.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/bc.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/bdes.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/biff.1#5 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/brandelf.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/builtin.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/c89.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/calendar.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/cap_mkdb.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/cat.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/catman.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/cccp.1#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/cdcontrol.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/checknr.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/chflags.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/chgrp.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/chio.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/chkey.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/chmod.1#5 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/chpass.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ckdist.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/cksum.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/cmp.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/co.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/col.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/colcrt.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/colldef.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/colrm.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/column.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/comm.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/compile_et.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/compress.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/cp.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/cpp.1#1 branch .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/crontab.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/crunchgen.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/crunchide.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ctags.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ctm.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ctm_rmail.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/cu.1#3 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/cursor.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/cut.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/cvs.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/date.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/dc.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/dd.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/df.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/diff.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/dig.1#5 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/domainname.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/doscmd.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/dtmfdecode.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/du.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/echo.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ed.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ee.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/enigma.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/eqn.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/expand.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/expr.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/false.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/fdformat.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/fdwrite.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/fetch.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/file.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/file2c.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/find.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/finger.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/fmt.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/fold.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/fontedit.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/from.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/fstat.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/fsync.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ftp.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/g711conv.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/gasp.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/gawk.1#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/gcc.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/gcore.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/gencat.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/getNAME.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/getopt.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/gprof.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/grep.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/grn.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/grodvi.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/grog.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/grolbp.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/grolj4.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/grops.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/grotty.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/groups.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/gzip.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/h2ph.1#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/head.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/hexdump.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/host.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/hostname.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/hpftodit.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/id.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/indent.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/indxbib.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/install.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/intro.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ipcrm.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ipcs.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ipnat.1#3 branch .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/join.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/jot.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/kbdcontrol.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/kbdmap.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/kcon.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/kdump.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/kenv.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/key.1#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/keyinfo.1#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/keyinit.1#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/keylogin.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/keylogout.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/kill.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/killall.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ktrace.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/lam.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/last.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/lastcomm.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ld.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ldd.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/leave.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/less.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/lesskey.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/lex.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/limits.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/lint.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/lkbib.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ln.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/loadfont.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/locate.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/lock.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/lockf.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/logger.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/login.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/logname.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/look.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/lookbib.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/lp.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/lpq.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/lpr.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/lprm.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/lptest.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ls.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/lsvfs.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/m4.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/mail.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/mailq.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/make.1#5 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/makewhatis.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/man.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/manpath.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/mcon.1#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/md5.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/mesg.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/minigzip.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/mkdep.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/mkdir.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/mkfifo.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/mklocale.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/mkstr.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/mktemp.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/mmroff.1#1 branch .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/mptable.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/msgs.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/mt.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/mv.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ncal.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ncplist.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ncplogin.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ncplogout.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/neqn.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/nfsstat.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/nice.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/nl.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/nm.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/nohup.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/nroff.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/objcopy.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/objdump.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/objformat.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/od.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/opieinfo.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/opiekey.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/opiepasswd.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/pagesize.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/passwd.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/paste.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/patch.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/pax.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/perl.1#3 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/pfbtops.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/pic.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/pkg_add.1#5 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/pkg_create.1#6 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/pkg_delete.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/pkg_info.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/pkg_sign.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/pkg_update.1#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/pkg_version.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/pr.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/printenv.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/printf.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ps.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/psroff.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/pwd.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/quota.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ranlib.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/rdist.1#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/readelf.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/realpath.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/refer.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/rev.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/rlogin.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/rm.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/rmdir.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/rpcgen.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/rs.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/rsh.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/rtld.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/rtprio.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/rup.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ruptime.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/rusers.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/rwall.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/rwho.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/sasc.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/scon.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/scp.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/script.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/sed.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/send-pr.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/sftp.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/sgsc.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/sh.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/shar.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/size.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/skey.1#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/sleep.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/sockstat.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/split.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ssh-add.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ssh-agent.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ssh-keygen.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ssh-keyscan.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ssh.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/startslip.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/strings.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/strip.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/stty.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/su.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/symorder.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/systat.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/tail.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/talk.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/tar.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/tbl.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/tcopy.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/tcpdump.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/tcpslice.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/tcsh.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/tee.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/telnet.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/test.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/tfmtodit.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/tftp.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/time.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/tip.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/top.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/touch.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/tput.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/tr.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/troff.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/true.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/truncate.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/truss.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/tset.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/tsort.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/tty.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ul.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/uname.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/unifdef.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/uniq.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/units.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/unvis.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/uptime.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/usbhidctl.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/users.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/uuconv.1#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/uucp.1#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/uuencode.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/uulog.1#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/uuname.1#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/uupick.1#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/uustat.1#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/uuto.1#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/uux.1#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/vacation.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/vgrind.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/vi.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/vidcontrol.1#5 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/vis.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/vt220keys.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/vttest.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/w.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/wall.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/wc.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/what.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/whereis.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/which.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/who.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/whoami.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/whois.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/window.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/write.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/xargs.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/xstr.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/xten.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/yacc.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/yes.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ypcat.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ypmatch.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ypwhich.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/yyfix.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/Makefile#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/_exit.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/accept.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/access.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/acct.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/adjtime.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/aio_cancel.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/aio_error.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/aio_read.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/aio_return.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/aio_suspend.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/aio_waitcomplete.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/aio_write.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/bind.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/brk.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/chdir.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/chflags.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/chmod.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/chown.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/chroot.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/clock_gettime.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/close.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/connect.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/creat.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/dup.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/execve.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/fcntl.2#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/fhopen.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/flock.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/fork.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/fsync.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/getdirentries.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/getdtablesize.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/getfh.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/getfsstat.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/getgid.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/getgroups.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/getitimer.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/getlogin.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/getpeername.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/getpgrp.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/getpid.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/getpriority.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/getrlimit.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/getrusage.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/getsid.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/getsockname.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/getsockopt.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/gettimeofday.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/getuid.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/i386_get_ioperm.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/i386_get_ldt.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/i386_vm86.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/intro.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/ioctl.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/issetugid.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/jail.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/kill.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/killpg.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/kldfind.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/kldfirstmod.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/kldload.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/kldnext.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/kldstat.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/kldsym.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/kldunload.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/kqueue.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/ktrace.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/link.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/listen.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/lseek.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/madvise.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/mincore.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/minherit.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/mkdir.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/mkfifo.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/mknod.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/mlock.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/mmap.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/modfind.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/modnext.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/modstat.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/mount.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/mprotect.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/msync.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/munmap.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/nanosleep.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/nfssvc.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/open.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/pathconf.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/pipe.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/poll.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/profil.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/ptrace.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/quotactl.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/read.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/readlink.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/reboot.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/recv.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/rename.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/revoke.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/rfork.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/rmdir.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/rtprio.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/sched_get_priority_max.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/sched_setparam.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/sched_setscheduler.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/sched_yield.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/select.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/semctl.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/semget.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/semop.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/send.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/sendfile.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/setgroups.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/setpgid.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/setregid.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/setresuid.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/setreuid.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/setsid.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/setuid.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/shmat.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/shmctl.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/shmget.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/shutdown.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/sigaction.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/sigaltstack.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/sigblock.2#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/sigpause.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/sigpending.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/sigprocmask.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/sigreturn.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/sigsetmask.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/sigstack.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/sigsuspend.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/sigvec.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/socket.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/socketpair.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/stat.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/statfs.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/swapon.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/symlink.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/sync.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/sysarch.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/syscall.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/truncate.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/umask.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/undelete.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/unlink.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/utimes.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/vfork.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/wait.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/write.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/readline.3#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/rpc.3#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/tcsetattr.3#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man4/bpf.4#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man4/dummynet.4#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/Makefile#5 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/a.out.5#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/acct.5#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/aliases.5#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/amd.conf.5#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/auth.conf.5#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/bootparams.5#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/bootptab.5#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/core.5#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/crontab.5#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/ctm.5#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/cvs.5#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/dhclient.conf.5#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/dhclient.leases.5#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/dhcp-eval.5#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/dhcp-options.5#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/dir.5#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/disklabel.5#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/disktab.5#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/dm.conf.5#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/drivers.conf.5#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/elf.5#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/ethers.5#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/exports.5#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/fbtab.5#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/fdesc.5#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/fdescfs.5#1 branch .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/finger.conf.5#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/forward.5#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/fs.5#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/fstab.5#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/gettytab.5#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/group.5#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/host.conf.5#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/hosts.5#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/hosts.equiv.5#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/hosts.lpd.5#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/intro.5#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/ipf.5#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/isdnd.acct.5#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/isdnd.rates.5#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/isdnd.rc.5#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/kbdmap.5#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/kernfs.5#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/link.5#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/linprocfs.5#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/loader.conf.5#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/login.access.5#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/login.conf.5#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/magic.5#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/mailer.conf.5#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/make.conf.5#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/modems.5#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/motd.5#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/netgroup.5#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/netid.5#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/networks.5#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/nologin.5#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/ntp.conf.5#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/ntp.keys.5#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/opieaccess.5#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/opiekeys.5#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/pbm.5#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/pccard.conf.5#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/periodic.conf.5#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/phones.5#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/printcap.5#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/procfs.5#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/protocols.5#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/publickey.5#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/pw.conf.5#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/radius.conf.5#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/ranlib.5#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/rc.conf.5#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/rcsfile.5#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/remote.5#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/resolver.5#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/rpc.5#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/rrenumd.conf.5#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/rtadvd.conf.5#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/services.5#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/shells.5#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/skey.access.5#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/ssh_config.5#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/sshd_config.5#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/stab.5#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/sysctl.conf.5#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/syslog.conf.5#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/tacplus.conf.5#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/term.5#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/termcap.5#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/ttys.5#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/types.5#3 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/tzfile.5#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/usbd.conf.5#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/utmp.5#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/uuencode.format.5#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/vgrindefs.5#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man6/Makefile#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man6/adventure.6#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man6/arithmetic.6#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man6/atc.6#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man6/backgammon.6#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man6/banner.6#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man6/battlestar.6#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man6/bcd.6#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man6/bs.6#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man6/caesar.6#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man6/canfield.6#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man6/cribbage.6#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man6/factor.6#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man6/fish.6#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man6/fortune.6#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man6/grdc.6#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man6/hack.6#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man6/hangman.6#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man6/intro.6#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man6/larn.6#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man6/mille.6#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man6/morse.6#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man6/number.6#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man6/phantasia.6#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man6/piano.6#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man6/pig.6#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man6/pom.6#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man6/quiz.6#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man6/rain.6#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man6/random.6#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man6/robots.6#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man6/rogue.6#3 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man6/sail.6#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man6/snake.6#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man6/trek.6#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man6/wargames.6#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man6/worm.6#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man6/worms.6#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man6/wump.6#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man7/Makefile#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man7/ascii.7#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man7/build.7#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man7/clocks.7#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man7/environ.7#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man7/firewall.7#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man7/groff_man.7#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man7/groff_mdoc.7#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man7/groff_me.7#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man7/groff_mm.7#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man7/groff_mmse.7#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man7/hier.7#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man7/hostname.7#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man7/intro.7#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man7/mailaddr.7#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man7/mmroff.7#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man7/operator.7#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man7/ports.7#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man7/re_format.7#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man7/release.7#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man7/security.7#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man7/style.perl.7#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man7/symlink.7#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man7/term.7#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man7/tuning.7#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/Makefile#7 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/adduser.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/adjkerntz.8#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/amd.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/amq.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/ancontrol.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/arp.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/atacontrol.8#6 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/bootpd.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/burncd.8#5 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/config.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/crash.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/disklabel.8#5 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/diskless.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/dump.8#5 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/edquota.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/faithd.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/fdcontrol.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/fixmount.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/fsck.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/fsdb.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/fsinfo.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/ftpd.8#5 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/growfs.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/hlfsd.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/ifconfig.8#6 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/ifmcstat.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/inetd.8#5 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/intro.8#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/iostat.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/ipfw.8#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/isdndebug.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/loader.8#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/lpc.8#6 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/memcontrol.8#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/mount.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/mount_nullfs.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/mount_umapfs.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/mount_unionfs.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/mountd.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/mtree.8#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/named-xfer.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/newsyslog.8#5 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/ntp-genkeys.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/ntpd.8#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/ntpdate.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/ntpdc.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/ntpq.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/pam_radius.8#5 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/pccardd.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/picobsd.8#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/pppd.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/pw.8#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/pwd_mkdb.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/pxeboot.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/quot.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/quotaon.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/rc.8#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/rc.sendmail.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/reboot.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/repquota.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/rmuser.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/route6d.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/rpc.rquotad.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/rpc.umntall.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/rpc.ypxfrd.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/rpcinfo.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/sftp-server.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/showmount.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/sicontrol.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/ssh-keysign.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/sshd.8#5 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/stlstats.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/sysinstall.8#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/syslogd.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/telnetd.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/wicontrol.8#5 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/wire-test.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/ypserv.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/ypxfr.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/Makefile#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/SPLASSERT.9#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/VFS.9#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/VFS_CHECKEXP.9#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/VFS_FHTOVP.9#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/VFS_INIT.9#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/VFS_MOUNT.9#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/VFS_QUOTACTL.9#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/VFS_ROOT.9#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/VFS_START.9#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/VFS_STATFS.9#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/VFS_SYNC.9#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/VFS_UNMOUNT.9#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/VFS_VGET.9#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/VOP_ACCESS.9#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/VOP_ACLCHECK.9#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/VOP_ADVLOCK.9#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/VOP_ATTRIB.9#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/VOP_BWRITE.9#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/VOP_CREATE.9#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/VOP_FSYNC.9#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/VOP_GETACL.9#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/VOP_GETEXTATTR.9#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/VOP_INACTIVE.9#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/VOP_IOCTL.9#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/VOP_LINK.9#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/VOP_LOCK.9#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/VOP_LOOKUP.9#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/VOP_MMAP.9#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/VOP_OPENCLOSE.9#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/VOP_RDWR.9#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/VOP_RENAME.9#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/VOP_SETACL.9#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/VOP_SETEXTATTR.9#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/VOP_STRATEGY.9#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/at_exit.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/at_fork.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/bios.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/boot.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/bus_alloc_resource.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/bus_generic_attach.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/bus_generic_detach.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/bus_generic_map_intr.9#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/bus_generic_print_child.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/bus_generic_read_ivar.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/bus_generic_shutdown.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/bus_release_resource.9#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/cd.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/copy.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/devclass.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/devclass_add_driver.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/devclass_find.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/devclass_get_device.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/devclass_get_devices.9#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/devclass_get_maxunit.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/devclass_get_name.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/devclass_get_softc.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/device.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/device_add_child.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/device_delete_child.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/device_enable.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/device_find_child.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/device_get_children.9#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/device_get_devclass.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/device_get_driver.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/device_get_ivars.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/device_get_softc.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/device_get_state.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/device_get_unit.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/device_probe_and_attach.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/device_quiet.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/device_set_desc.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/device_set_flags.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/devstat.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/devtoname.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/driver.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/fetch.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/inittodr.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/intro.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/kernacc.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/malloc.9#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/mi_switch.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/microtime.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/microuptime.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/module.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/panic.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/physio.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/posix4.9#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/psignal.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/resettodr.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/sbuf.9#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/spl.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/store.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/suser.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/sysctl_add_oid.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/sysctl_ctx_init.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/time.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/tvtohz.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/uio.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/vfs_unmountall.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/vget.9#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/vnode.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/vput.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/vref.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/vrele.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/vslock.9#2 integrate .. //depot/projects/trustedbsd/doc/share/mk/doc.docbook.mk#5 integrate .. //depot/projects/trustedbsd/doc/share/mk/doc.html.mk#4 integrate .. //depot/projects/trustedbsd/doc/share/sgml/freebsd.dsl#4 integrate .. //depot/projects/trustedbsd/doc/share/sgml/freebsd.ent#6 integrate .. //depot/projects/trustedbsd/doc/share/sgml/man-refs.ent#11 integrate .. //depot/projects/trustedbsd/doc/share/xsl/freebsd-common.xsl#1 branch .. //depot/projects/trustedbsd/doc/share/xsl/freebsd-fo.xsl#1 branch .. //depot/projects/trustedbsd/doc/share/xsl/freebsd-html-chunk.xsl#1 branch .. //depot/projects/trustedbsd/doc/share/xsl/freebsd-html.xsl#1 branch Differences ... ==== //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/faq/book.sgml#6 (text+ko) ==== @@ -2,10 +2,10 @@ The FreeBSD Documentation Project The FreeBSD German Documentation Project -$FreeBSD: doc/de_DE.ISO8859-1/books/faq/book.sgml,v 1.26 2002/11/14 19:02:13 mheinen Exp $ -$FreeBSDde: de-docproj/books/faq/book.sgml,v 1.375 2002/11/13 21:44:15 mheinen Exp $ +$FreeBSD: doc/de_DE.ISO8859-1/books/faq/book.sgml,v 1.31 2002/12/31 12:56:48 mheinen Exp $ +$FreeBSDde: de-docproj/books/faq/book.sgml,v 1.393 2002/12/24 11:30:46 mheinen Exp $ - basiert auf: 1.490 + basiert auf: 1.503 >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jan 3 11: 9:35 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BCC5F37B413; Fri, 3 Jan 2003 11:09:32 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4A44F37B405; Fri, 3 Jan 2003 11:09:32 -0800 (PST) Received: from canning.wemm.org (canning.wemm.org [192.203.228.65]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1C8CB43EA9; Fri, 3 Jan 2003 11:09:23 -0800 (PST) (envelope-from peter@wemm.org) Received: from wemm.org (localhost [127.0.0.1]) by canning.wemm.org (Postfix) with ESMTP id 044292A8A8; Fri, 3 Jan 2003 11:09:18 -0800 (PST) (envelope-from peter@wemm.org) X-Mailer: exmh version 2.5 07/13/2001 with nmh-1.0.4 To: Marcel Moolenaar Cc: John Baldwin , Perforce Change Reviews Subject: Re: PERFORCE change 23029 for review In-Reply-To: <20030102201437.GB616@dhcp01.pn.xcllnt.net> Date: Fri, 03 Jan 2003 11:09:18 -0800 From: Peter Wemm Message-Id: <20030103190918.044292A8A8@canning.wemm.org> Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Marcel Moolenaar wrote: > On Thu, Jan 02, 2003 at 10:59:30AM -0500, John Baldwin wrote: > > > > On 01-Jan-2003 Marcel Moolenaar wrote: > > > http://perforce.freebsd.org/chv.cgi?CH=23029 > > > > > > Change 23029 by marcel@marcel_nfs on 2003/01/01 14:03:34 > > > > > > While here, reload cr.itm (interval timer match register) > > > based on the old value of cr.itm and not cr.itc (interval > > > timer counter). The value of cr.itc is non-deterministicly > > > close to the value of cr.itm at the time of the interrupt. > > > The SDM clearly states that they are not guaranteed to be > > > identical, even though the interrupt is triggered when > > > cr.itc equals cr.itm). Reloading cr.itm based on the value > > > of cr.itc will therefore introduce a non-deterministic error > > > in the clocks. This will also reduce clock skew due to > > > interrupt latency. > > > > Cool. Peter says the Linux code does something similar but goes > > to extra efforts to handle the case of missing entire ticks and > > what not.w > > Yeah, that hit me after committing and I noticed that sparc64 does > that too. As you have probably seen, I reverted the change for now. > A missed clock interrupt is worse than a slight error. > > Doug got me a bit confused though, so I won't touch the code until > I deconfused myself :-) I've half done something based on what the linux folks did. What they do is check that they do not set the new cr.itm to be too close to the current cr.itc. They keep per-cpu track of when they're expecting the next tick to happen and "catch up" if needed. They never set the new cr.itm to less than half of the tick interval away from the current cr.itc. However, they also use this for keeping data about each cpu's cr.itc in sync for use as a timecounter so they need to go to the extra trouble. Cheers, -Peter -- Peter Wemm - peter@wemm.org; peter@FreeBSD.org; peter@yahoo-inc.com "All of this is for nothing if we don't go to the stars" - JMS/B5 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jan 4 13:23:33 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B18B437B405; Sat, 4 Jan 2003 13:23:08 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 45FD037B401 for ; Sat, 4 Jan 2003 13:23:08 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 33C8843E4A for ; Sat, 4 Jan 2003 13:23:07 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h04LN7fh078758 for ; Sat, 4 Jan 2003 13:23:07 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h04LN5F3078755 for perforce@freebsd.org; Sat, 4 Jan 2003 13:23:05 -0800 (PST) Date: Sat, 4 Jan 2003 13:23:05 -0800 (PST) Message-Id: <200301042123.h04LN5F3078755@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 23169 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=23169 Change 23169 by peter@peter_overcee on 2003/01/04 13:22:45 IFC @23168 Affected files ... .. //depot/projects/ia64/contrib/openpam/lib/openpam_impl.h#12 integrate .. //depot/projects/ia64/etc/services#6 integrate .. //depot/projects/ia64/games/fortune/datfiles/startrek#3 integrate .. //depot/projects/ia64/games/fortune/datfiles/startrek.sp.ok#2 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/gdb/Makefile#8 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/gdb/freebsd-uthread.c#4 integrate .. //depot/projects/ia64/include/stdlib.h#16 integrate .. //depot/projects/ia64/include/ulimit.h#2 integrate .. //depot/projects/ia64/include/wordexp.h#2 integrate .. //depot/projects/ia64/lib/libc/gen/exec.c#4 integrate .. //depot/projects/ia64/lib/libc/gen/fts.c#4 integrate .. //depot/projects/ia64/lib/libc/gen/getcap.c#5 integrate .. //depot/projects/ia64/lib/libc/gen/getgrent.c#3 integrate .. //depot/projects/ia64/lib/libc/gen/getnetgrent.c#5 integrate .. //depot/projects/ia64/lib/libc/gen/getvfsent.c#4 integrate .. //depot/projects/ia64/lib/libc/gen/opendir.c#3 integrate .. //depot/projects/ia64/lib/libc/gen/popen.3#2 integrate .. //depot/projects/ia64/lib/libc/gen/popen.c#3 integrate .. //depot/projects/ia64/lib/libc/gen/sysctlnametomib.c#3 integrate .. //depot/projects/ia64/lib/libc/gen/ulimit.3#5 integrate .. //depot/projects/ia64/lib/libc/gen/ulimit.c#2 integrate .. //depot/projects/ia64/lib/libc/gen/wordexp.3#3 integrate .. //depot/projects/ia64/lib/libc/gen/wordexp.c#3 integrate .. //depot/projects/ia64/lib/libc/stdio/freopen.c#4 integrate .. //depot/projects/ia64/lib/libc/stdio/fscanf.c#5 integrate .. //depot/projects/ia64/lib/libc/stdio/scanf.c#5 integrate .. //depot/projects/ia64/lib/libc/stdio/vscanf.c#5 integrate .. //depot/projects/ia64/lib/libc/stdlib/Makefile.inc#9 integrate .. //depot/projects/ia64/lib/libc/stdlib/getsubopt.c#3 integrate .. //depot/projects/ia64/lib/libc/stdlib/grantpt.3#1 branch .. //depot/projects/ia64/lib/libc/stdlib/grantpt.c#1 branch .. //depot/projects/ia64/lib/libc/stdlib/insque.c#2 integrate .. //depot/projects/ia64/lib/libc/stdlib/rand.c#3 integrate .. //depot/projects/ia64/lib/libc/stdlib/remque.c#2 integrate .. //depot/projects/ia64/lib/libc/stdlib/strfmon.c#8 integrate .. //depot/projects/ia64/lib/libc/stdtime/strftime.3#7 integrate .. //depot/projects/ia64/lib/libc/stdtime/strptime.3#7 integrate .. //depot/projects/ia64/lib/libc/string/strerror.c#8 integrate .. //depot/projects/ia64/lib/libdisk/write_pc98_disk.c#5 integrate .. //depot/projects/ia64/lib/libfetch/common.c#8 integrate .. //depot/projects/ia64/lib/libkvm/kvm_getswapinfo.c#2 integrate .. //depot/projects/ia64/libexec/Makefile#9 integrate .. //depot/projects/ia64/libexec/pt_chown/Makefile#1 branch .. //depot/projects/ia64/libexec/pt_chown/pt_chown.c#1 branch .. //depot/projects/ia64/release/Makefile#34 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#32 integrate .. //depot/projects/ia64/sbin/ccdconfig/ccdconfig.8#5 integrate .. //depot/projects/ia64/sbin/ccdconfig/ccdconfig.c#3 integrate .. //depot/projects/ia64/sbin/disklabel/disklabel.c#20 integrate .. //depot/projects/ia64/sbin/fdisk_pc98/fdisk.c#7 integrate .. //depot/projects/ia64/share/Makefile#5 integrate .. //depot/projects/ia64/share/man/man4/gif.4#7 integrate .. //depot/projects/ia64/share/man/man9/sleep.9#4 integrate .. //depot/projects/ia64/share/man/man9/sysctl_add_oid.9#3 integrate .. //depot/projects/ia64/sys/alpha/alpha/dump_machdep.c#3 integrate .. //depot/projects/ia64/sys/boot/pc98/boot2/disk.c#4 integrate .. //depot/projects/ia64/sys/boot/pc98/libpc98/biosdisk.c#4 integrate .. //depot/projects/ia64/sys/compat/linux/linux_ioctl.c#16 integrate .. //depot/projects/ia64/sys/compat/linux/linux_ipc.c#5 integrate .. //depot/projects/ia64/sys/compat/linux/linux_sysctl.c#5 integrate .. //depot/projects/ia64/sys/compat/linux/linux_util.c#4 integrate .. //depot/projects/ia64/sys/compat/linux/linux_util.h#6 integrate .. //depot/projects/ia64/sys/dev/ccd/ccd.c#12 integrate .. //depot/projects/ia64/sys/dev/firewire/firewire.c#6 integrate .. //depot/projects/ia64/sys/dev/firewire/firewire.h#3 integrate .. //depot/projects/ia64/sys/dev/firewire/firewirebusreg.h#2 delete .. //depot/projects/ia64/sys/dev/firewire/fwcrom.c#2 integrate .. //depot/projects/ia64/sys/dev/firewire/fwdev.c#2 integrate .. //depot/projects/ia64/sys/dev/firewire/fwohci.c#6 integrate .. //depot/projects/ia64/sys/dev/firewire/fwohci_pci.c#7 integrate .. //depot/projects/ia64/sys/dev/firewire/fwohcireg.h#4 integrate .. //depot/projects/ia64/sys/dev/firewire/fwohcivar.h#4 integrate .. //depot/projects/ia64/sys/dev/firewire/sbp.c#7 integrate .. //depot/projects/ia64/sys/dev/isp/isp_pci.c#12 integrate .. //depot/projects/ia64/sys/dev/raidframe/rf_freebsdkintf.c#5 integrate .. //depot/projects/ia64/sys/dev/usb/ubsa.c#3 integrate .. //depot/projects/ia64/sys/dev/usb/usb_quirks.c#4 integrate .. //depot/projects/ia64/sys/dev/usb/usbdevs#20 integrate .. //depot/projects/ia64/sys/dev/usb/usbdevs.h#19 integrate .. //depot/projects/ia64/sys/dev/usb/usbdevs_data.h#19 integrate .. //depot/projects/ia64/sys/dev/vinum/vinumdaemon.c#5 integrate .. //depot/projects/ia64/sys/dev/vinum/vinuminterrupt.c#4 integrate .. //depot/projects/ia64/sys/dev/vinum/vinumio.c#8 integrate .. //depot/projects/ia64/sys/dev/vinum/vinumrequest.c#8 integrate .. //depot/projects/ia64/sys/dev/zs/zs.c#2 integrate .. //depot/projects/ia64/sys/fs/devfs/devfs_vnops.c#20 integrate .. //depot/projects/ia64/sys/fs/fdescfs/fdesc_vnops.c#8 integrate .. //depot/projects/ia64/sys/fs/hpfs/hpfs_vnops.c#16 integrate .. //depot/projects/ia64/sys/fs/msdosfs/msdosfs_vnops.c#11 integrate .. //depot/projects/ia64/sys/fs/ntfs/ntfs_vnops.c#8 integrate .. //depot/projects/ia64/sys/fs/nwfs/nwfs_vnops.c#4 integrate .. //depot/projects/ia64/sys/fs/pseudofs/pseudofs_vnops.c#14 integrate .. //depot/projects/ia64/sys/fs/smbfs/smbfs_vnops.c#10 integrate .. //depot/projects/ia64/sys/fs/specfs/spec_vnops.c#13 integrate .. //depot/projects/ia64/sys/fs/udf/udf_vnops.c#11 integrate .. //depot/projects/ia64/sys/fs/unionfs/union_vnops.c#7 integrate .. //depot/projects/ia64/sys/geom/bde/g_bde.h#4 integrate .. //depot/projects/ia64/sys/geom/bde/g_bde_crypt.c#7 integrate .. //depot/projects/ia64/sys/geom/bde/g_bde_work.c#4 integrate .. //depot/projects/ia64/sys/geom/geom_dev.c#21 integrate .. //depot/projects/ia64/sys/geom/geom_pc98.c#16 integrate .. //depot/projects/ia64/sys/gnu/ext2fs/ext2_bmap.c#3 integrate .. //depot/projects/ia64/sys/gnu/ext2fs/ext2_vnops.c#12 integrate .. //depot/projects/ia64/sys/i386/i386/identcpu.c#9 integrate .. //depot/projects/ia64/sys/ia64/conf/SKI#9 integrate .. //depot/projects/ia64/sys/ia64/ia64/pmap.c#51 integrate .. //depot/projects/ia64/sys/isofs/cd9660/cd9660_vnops.c#9 integrate .. //depot/projects/ia64/sys/kern/kern_exec.c#39 integrate .. //depot/projects/ia64/sys/kern/kern_physio.c#5 integrate .. //depot/projects/ia64/sys/kern/kern_proc.c#29 integrate .. //depot/projects/ia64/sys/kern/kern_shutdown.c#15 integrate .. //depot/projects/ia64/sys/kern/kern_tc.c#16 integrate .. //depot/projects/ia64/sys/kern/kern_thread.c#23 integrate .. //depot/projects/ia64/sys/kern/subr_disklabel.c#10 integrate .. //depot/projects/ia64/sys/kern/subr_diskmbr.c#7 integrate .. //depot/projects/ia64/sys/kern/subr_mbuf.c#16 integrate .. //depot/projects/ia64/sys/kern/subr_prf.c#17 integrate .. //depot/projects/ia64/sys/kern/syscalls.master#24 integrate .. //depot/projects/ia64/sys/kern/sysv_shm.c#6 integrate .. //depot/projects/ia64/sys/kern/vfs_aio.c#25 integrate .. //depot/projects/ia64/sys/kern/vfs_bio.c#32 integrate .. //depot/projects/ia64/sys/kern/vfs_default.c#13 integrate .. //depot/projects/ia64/sys/modules/firewire/firewire/Makefile#5 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_vnops.c#11 integrate .. //depot/projects/ia64/sys/opencrypto/crypto.c#4 integrate .. //depot/projects/ia64/sys/opencrypto/cryptodev.c#4 integrate .. //depot/projects/ia64/sys/opencrypto/cryptodev.h#2 integrate .. //depot/projects/ia64/sys/pc98/pc98/diskslice_machdep.c#7 integrate .. //depot/projects/ia64/sys/pc98/pc98/fd.c#13 integrate .. //depot/projects/ia64/sys/pccard/pcic_pci.c#14 integrate .. //depot/projects/ia64/sys/sys/buf.h#12 integrate .. //depot/projects/ia64/sys/sys/ccdvar.h#2 integrate .. //depot/projects/ia64/sys/sys/conf.h#13 integrate .. //depot/projects/ia64/sys/sys/diskpc98.h#3 integrate .. //depot/projects/ia64/sys/sys/dmap.h#3 delete .. //depot/projects/ia64/sys/sys/exec.h#3 integrate .. //depot/projects/ia64/sys/sys/mbuf.h#14 integrate .. //depot/projects/ia64/sys/sys/proc.h#43 integrate .. //depot/projects/ia64/sys/sys/sysctl.h#12 integrate .. //depot/projects/ia64/sys/sys/systm.h#20 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_inode.c#10 integrate .. //depot/projects/ia64/sys/ufs/ufs/ufs_bmap.c#7 integrate .. //depot/projects/ia64/sys/ufs/ufs/ufs_vnops.c#22 integrate .. //depot/projects/ia64/sys/vm/swap_pager.c#18 integrate .. //depot/projects/ia64/sys/vm/swap_pager.h#7 integrate .. //depot/projects/ia64/sys/vm/vm_kern.c#20 integrate .. //depot/projects/ia64/sys/vm/vm_map.c#40 integrate .. //depot/projects/ia64/sys/vm/vm_meter.c#9 integrate .. //depot/projects/ia64/sys/vm/vm_object.c#36 integrate .. //depot/projects/ia64/sys/vm/vm_page.c#32 integrate .. //depot/projects/ia64/sys/vm/vm_pageout.c#26 integrate .. //depot/projects/ia64/sys/vm/vm_swap.c#14 integrate .. //depot/projects/ia64/sys/vm/vnode_pager.c#24 integrate .. //depot/projects/ia64/tools/regression/lib/libc/gen/Makefile#1 branch .. //depot/projects/ia64/tools/regression/lib/libc/gen/test-wordexp.c#1 branch .. //depot/projects/ia64/tools/tools/kernxref/kernxref.sh#5 integrate .. //depot/projects/ia64/usr.bin/Makefile#37 integrate .. //depot/projects/ia64/usr.bin/bzip2recover/Makefile#1 branch .. //depot/projects/ia64/usr.bin/vi/Makefile#7 integrate .. //depot/projects/ia64/usr.sbin/fwcontrol/fwcontrol.8#2 integrate .. //depot/projects/ia64/usr.sbin/fwcontrol/fwcontrol.c#2 integrate .. //depot/projects/ia64/usr.sbin/fwcontrol/fwcrom.c#2 integrate .. //depot/projects/ia64/usr.sbin/pstat/pstat.c#8 integrate Differences ... ==== //depot/projects/ia64/contrib/openpam/lib/openpam_impl.h#12 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/openpam_impl.h#17 $ + * $P4: //depot/projects/openpam/lib/openpam_impl.h#18 $ */ #ifndef _OPENPAM_IMPL_H_INCLUDED @@ -153,7 +153,7 @@ #define ENTER() #define RETURNV() return #define RETURNC(c) return (c) -#define RETURNI(n) return (i) +#define RETURNI(i) return (i) #define RETURNP(p) return (p) #define RETURNS(s) return (s) #endif ==== //depot/projects/ia64/etc/services#6 (text+ko) ==== @@ -16,7 +16,7 @@ # Kerberos services are for Kerberos v4, and are unofficial. Sites running # v5 should uncomment v5 entries and comment v4 entries. # -# $FreeBSD: src/etc/services,v 1.89 2002/12/17 23:59:10 eric Exp $ +# $FreeBSD: src/etc/services,v 1.91 2003/01/04 16:03:56 schweikh Exp $ # From: @(#)services 5.8 (Berkeley) 5/9/91 # # WELL KNOWN PORT NUMBERS @@ -447,8 +447,9 @@ mpp 218/udp #Netix Message Posting Protocol uarps 219/tcp #Unisys ARPs uarps 219/udp #Unisys ARPs -imap3 220/tcp #Interactive Mail Access Protocol v3 -imap3 220/udp #Interactive Mail Access Protocol v3 +#imap3@220 was never used and never should have been allocated. See PR 46294. +#imap3 220/tcp #Interactive Mail Access Protocol v3 +#imap3 220/udp #Interactive Mail Access Protocol v3 fln-spx 221/tcp #Berkeley rlogind with SPX auth fln-spx 221/udp #Berkeley rlogind with SPX auth rsh-spx 222/tcp #Berkeley rshd with SPX auth @@ -1039,8 +1040,9 @@ philips-vc 583/udp #Philips Video-Conferencing keyserver 584/tcp keyserver 584/udp -imap4-ssl 585/tcp #IMAP4+SSL (use of 585 is not recommended, -imap4-ssl 585/udp # use 993 instead) +#imap4-ssl@585 never should have been allocated. See PR 46294. +#imap4-ssl 585/tcp #IMAP4+SSL (use of 585 is not recommended, +#imap4-ssl 585/udp # use 993 instead) password-chg 586/tcp password-chg 586/udp submission 587/tcp @@ -1721,6 +1723,10 @@ netview-aix-11 1671/udp netview-aix-12 1672/tcp netview-aix-12 1672/udp +l2f 1701/tcp #l2f +l2f 1701/udp #l2f +l2tp 1701/tcp #Layer 2 Tunnelling Protocol +l2tp 1701/udp #Layer 2 Tunnelling Protocol pptp 1723/tcp #Point-to-point tunnelling protocol # IMPORTANT NOTE: See comments for ports 1645/1646 when using older equipment radius 1812/udp #RADIUS authentication protocol (IANA sanctioned) ==== //depot/projects/ia64/games/fortune/datfiles/startrek#3 (text+ko) ==== @@ -1,4 +1,4 @@ -%% $FreeBSD: src/games/fortune/datfiles/startrek,v 1.2 2002/11/17 09:53:11 schweikh Exp $ +%% $FreeBSD: src/games/fortune/datfiles/startrek,v 1.3 2003/01/04 17:08:23 schweikh Exp $ A father doesn't destroy his children. -- Lt. Carolyn Palamas, "Who Mourns for Adonais?", stardate 3468.1. @@ -387,7 +387,7 @@ -- Kirk, "Dagger of the Mind", stardate 2715.2 % Only a fool fights in a burning house. - -- Kank the Klingon, "Day of the Dove", stardate unknown + -- Kang the Klingon, "Day of the Dove", stardate unknown % Our missions are peaceful -- not for conquest. When we do battle, it is only because we have no choice. ==== //depot/projects/ia64/games/fortune/datfiles/startrek.sp.ok#2 (text+ko) ==== @@ -1,3 +1,4 @@ +# $FreeBSD: src/games/fortune/datfiles/startrek.sp.ok,v 1.2 2003/01/04 17:08:23 schweikh Exp $ Adonais Amanda Apella @@ -24,7 +25,7 @@ Hag Hedford Hodin -Kank +Kang Kanuto Kelinda Kelvan ==== //depot/projects/ia64/gnu/usr.bin/binutils/gdb/Makefile#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/gdb/Makefile,v 1.62 2002/10/12 21:23:53 mp Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/gdb/Makefile,v 1.64 2003/01/04 17:51:59 obrien Exp $ .include "../Makefile.inc0" @@ -14,29 +14,31 @@ NOSHARED?=yes PROG= gdb -XSRCS= annotate.c ax-general.c ax-gdb.c bcache.c blockframe.c \ - breakpoint.c buildsym.c c-exp.y c-lang.c c-typeprint.c \ - c-valprint.c ch-exp.c ch-lang.c ch-typeprint.c ch-valprint.c \ - coffread.c complaints.c copying.c \ - corefile.c corelow.c cp-valprint.c dcache.c dbxread.c \ - demangle.c dwarfread.c dwarf2read.c elfread.c environ.c eval.c \ - exec.c expprint.c f-exp.y f-lang.c f-typeprint.c f-valprint.c \ - findvar.c fork-child.c gdbarch.c gdbtypes.c \ - infcmd.c inflow.c infptrace.c infrun.c inftarg.c language.c \ +XSRCS= annotate.c arch-utils.c ax-general.c ax-gdb.c bcache.c \ + blockframe.c breakpoint.c buildsym.c complaints.c completer.c \ + copying.c corefile.c corelow.c dcache.c doublest.c event-loop.c \ + event-top.c environ.c eval.c exec.c expprint.c fork-child.c \ + frame.c gdb-events.c gdbarch.c gdbtypes.c infcmd.c inflow.c \ + infptrace.c inf-loop.c infrun.c inftarg.c language.c linespec.c \ + main.c maint.c mdebugread.c mem-break.c memattr.c minsyms.c \ + objfiles.c parse.c printcmd.c regcache.c remote.c \ + remote-utils.c signals.c source.c stabsread.c stack.c symfile.c \ + symmisc.c symtab.c target.c thread.c top.c tracepoint.c \ + typeprint.c ui-file.c ui-out.c utils.c valarith.c valops.c \ + valprint.c values.c wrapper.c \ + cli-cmds.c cli-cmds.h cli-decode.c cli-decode.h cli-out.c \ + cli-script.c cli-script.h cli-setshow.c cli-setshow.h \ + cli-utils.c cli-utils.h \ + serial.c ser-unix.c ser-tcp.c \ + c-exp.y c-lang.c c-typeprint.c c-valprint.c \ + ch-exp.c ch-lang.c ch-typeprint.c ch-valprint.c \ + cp-abi.c gnu-v2-abi.c gnu-v3-abi.c cp-valprint.c demangle.c \ + f-exp.y f-lang.c f-typeprint.c f-valprint.c findvar.c \ jv-exp.y jv-lang.c jv-valprint.c jv-typeprint.c nlmread.c \ - m2-lang.c m2-exp.y m2-typeprint.c m2-valprint.c main.c maint.c \ - mdebugread.c mem-break.c minsyms.c objfiles.c parse.c \ - printcmd.c remote.c remote-utils.c scm-exp.c scm-lang.c \ - scm-valprint.c solib.c source.c stabsread.c stack.c symfile.c \ - symmisc.c symtab.c target.c thread.c top.c tracepoint.c \ - typeprint.c utils.c valarith.c valops.c valprint.c values.c \ - serial.c ser-unix.c ser-tcp.c -XSRCS+= arch-utils.c cp-abi.c completer.c doublest.c event-loop.c \ - event-top.c frame.c gdb-events.c inf-loop.c linespec.c \ - memattr.c regcache.c signals.c solib-svr4.c solib-legacy.c \ - ui-file.c ui-out.c wrapper.c cli-out.c \ - cli-cmds.c cli-cmds.h cli-decode.c cli-decode.h cli-script.c \ - cli-script.h cli-setshow.c cli-setshow.h cli-utils.c cli-utils.h + m2-lang.c m2-exp.y m2-typeprint.c m2-valprint.c \ + scm-exp.c scm-lang.c scm-valprint.c \ + coffread.c dbxread.c dwarfread.c dwarf2read.c elfread.c \ + solib.c solib-svr4.c solib-legacy.c XSRCS+= freebsd-uthread.c kvm-fbsd.c SRCS= init.c ${XSRCS} nm.h tm.h xm.h gdbversion.c xregex.h ==== //depot/projects/ia64/gnu/usr.bin/binutils/gdb/freebsd-uthread.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/binutils/gdb/freebsd-uthread.c,v 1.9 2002/06/29 03:16:10 obrien Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/binutils/gdb/freebsd-uthread.c,v 1.10 2003/01/04 17:35:54 fjoe Exp $ */ /* Low level interface for debugging FreeBSD user threads for GDB, the GNU debugger. Copyright 1996, 1999 Free Software Foundation, Inc. @@ -411,30 +411,6 @@ /* XXX: this needs to be selected by target, not [build] host */ #ifdef __i386__ -static char sigmap[MAX_NUM_REGS] = /* map reg to sigcontext */ -{ - 12, /* eax */ - 11, /* ecx */ - 10, /* edx */ - 9, /* ebx */ - 8, /* esp */ - 7, /* ebp */ - 6, /* esi */ - 5, /* edi */ - 15, /* eip */ - 17, /* eflags */ - 16, /* cs */ - 19, /* ss */ - 4, /* ds */ - 3, /* es */ - 2, /* fs */ - 1, /* gs */ - -1, -1, -1, -1, -1, -1, -1, /* st0-st7 */ - -1, -1, -1, -1, -1, -1, -1, /* fctrl-fop */ - -1, -1, -1, -1, -1, -1, -1, /* xmm0-xmm7 */ - -1, /* mxcsr */ -}; - static char jmpmap[MAX_NUM_REGS] = /* map reg to jmp_buf */ { 6, /* eax */ @@ -463,18 +439,6 @@ #ifdef __alpha__ -static char sigmap[NUM_REGS] = /* map reg to sigcontext */ -{ - 1, 2, 3, 4, 5, 6, 7, 8, /* v0 - t6 */ - 9, 10, 11, 12, 13, 14, 15, 16, /* t7 - fp */ - 17, 18, 19, 20, 21, 22, 23, 24, /* a0 - t9 */ - 25, 26, 27, 28, 29, 30, 31, 32, /* t10 - zero */ - 38, 39, 40, 41, 42, 43, 44, 45, /* f0 - f7 */ - 46, 47, 48, 49, 50, 51, 52, 53, /* f8 - f15 */ - 54, 55, 56, 57, 58, 59, 60, 61, /* f16 - f23 */ - 62, 63, 64, 65, 66, 67, 68, 69, /* f24 - f31 */ - 33, -1 /* pc, vfp */ -}; static char jmpmap[NUM_REGS] = { 4, 5, 6, 7, 8, 9, 10, 11, /* v0 - t6 */ 12, 13, 14, 15, 16, 17, 18, 19, /* t7 - fp */ @@ -491,10 +455,6 @@ #ifdef __sparc64__ -static char sigmap[125] = /* map reg to sigcontext */ -{ - -1 -}; static char jmpmap[125] = { -1 }; ==== //depot/projects/ia64/include/stdlib.h#16 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)stdlib.h 8.5 (Berkeley) 5/19/95 - * $FreeBSD: src/include/stdlib.h,v 1.46 2002/12/30 11:12:16 obrien Exp $ + * $FreeBSD: src/include/stdlib.h,v 1.47 2003/01/02 20:44:41 jmallett Exp $ */ #ifndef _STDLIB_H_ @@ -184,7 +184,7 @@ int getsubopt(char **, char *const *, char **); #define _GETSUBOPT_DECLARED #endif -/* int grantpt(int); */ +int grantpt(int); char *initstate(unsigned long /* XSI requires u_int */, char *, long); long jrand48(unsigned short[3]); /* char *l64a(long); */ @@ -200,8 +200,8 @@ #endif long mrand48(void); long nrand48(unsigned short[3]); -/* int posix_openpt(int); */ -/* char *ptsname(int); */ +int posix_openpt(int); +char *ptsname(int); int putenv(const char *); long random(void); char *realpath(const char *, char resolved_path[]); @@ -214,7 +214,7 @@ char *setstate(/* const */ char *); void srand48(long); void srandom(unsigned long); -/* int unlockpt(int); */ +int unlockpt(int); #endif /* __XSI_VISIBLE */ #if __BSD_VISIBLE ==== //depot/projects/ia64/include/ulimit.h#2 (text+ko) ==== @@ -23,15 +23,28 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/ulimit.h,v 1.1 2002/08/08 04:50:36 mike Exp $ + * $FreeBSD: src/include/ulimit.h,v 1.3 2003/01/04 01:11:49 tjr Exp $ */ #ifndef _ULIMIT_H_ #define _ULIMIT_H_ -#define UL_GETSIZE 1 -#define UL_SETSIZE 2 +#include + +#define UL_GETFSIZE 1 +#define UL_SETFSIZE 2 + +#if __BSD_VISIBLE +/* + * The "F" was mistakenly omitted from the macro names in FreeBSD 5.0. + * Do not use these names; they will be removed before 6.0. + */ +#define UL_GETSIZE UL_GETFSIZE +#define UL_SETSIZE UL_SETFSIZE +#endif +__BEGIN_DECLS long ulimit(int, ...); +__END_DECLS #endif /* !_ULIMIT_H_ */ ==== //depot/projects/ia64/include/wordexp.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/wordexp.h,v 1.3 2002/12/26 14:44:45 tjr Exp $ + * $FreeBSD: src/include/wordexp.h,v 1.4 2003/01/03 12:03:38 tjr Exp $ */ #ifndef _WORDEXP_H_ @@ -50,7 +50,7 @@ */ #define WRDE_APPEND 0x1 /* append to previously generated */ #define WRDE_DOOFS 0x2 /* we_offs member is valid */ -#define WRDE_NOCMD 0x4 +#define WRDE_NOCMD 0x4 /* disallow command substitution */ #define WRDE_REUSE 0x8 /* reuse wordexp_t */ #define WRDE_SHOWERR 0x10 /* don't redirect stderr to /dev/null */ #define WRDE_UNDEF 0x20 /* disallow undefined shell vars */ ==== //depot/projects/ia64/lib/libc/gen/exec.c#4 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)exec.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/exec.c,v 1.19 2002/05/28 16:59:39 alfred Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/exec.c,v 1.20 2003/01/03 23:16:55 tjr Exp $"); #include "namespace.h" #include @@ -110,7 +110,6 @@ execlp(const char *name, const char *arg, ...) { va_list ap; - int sverrno; char **argv; int n; ==== //depot/projects/ia64/lib/libc/gen/fts.c#4 (text+ko) ==== @@ -37,7 +37,7 @@ static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/94"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/fts.c,v 1.21 2002/09/21 01:28:38 wollman Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/fts.c,v 1.22 2003/01/03 23:25:25 tjr Exp $"); #include "namespace.h" #include @@ -273,7 +273,6 @@ fts_read(sp) FTS *sp; { - struct stat sb; FTSENT *p, *tmp; int instr; char *t; ==== //depot/projects/ia64/lib/libc/gen/getcap.c#5 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)getcap.c 8.3 (Berkeley) 3/25/94"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/getcap.c,v 1.18 2002/12/27 08:43:40 alfred Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/getcap.c,v 1.19 2003/01/02 10:19:43 thomas Exp $"); #include "namespace.h" #include @@ -577,6 +577,9 @@ { const char *np, *bp; + if (name == NULL || *name == '\0') + return -1; + /* * Start search at beginning of record. */ ==== //depot/projects/ia64/lib/libc/gen/getgrent.c#3 (text+ko) ==== @@ -37,7 +37,7 @@ #endif /* LIBC_SCCS and not lint */ /* $NetBSD: getgrent.c,v 1.34.2.1 1999/04/27 14:10:58 perry Exp $ */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/getgrent.c,v 1.22 2002/02/01 01:32:19 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/getgrent.c,v 1.23 2003/01/04 00:24:35 tjr Exp $"); #include @@ -263,7 +263,6 @@ char **hp; void *context; int r; - size_t sz; r = NS_UNAVAIL; if (!search && _gr_hesnum == -1) @@ -327,7 +326,6 @@ char *key, *data; int keylen, datalen; int r; - size_t sz; if(__ypdomain == NULL) { switch (yp_get_default_domain(&__ypdomain)) { ==== //depot/projects/ia64/lib/libc/gen/getnetgrent.c#5 (text+ko) ==== @@ -38,8 +38,9 @@ static char sccsid[] = "@(#)getnetgrent.c 8.2 (Berkeley) 4/27/95"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/getnetgrent.c,v 1.29 2002/12/30 21:18:02 schweikh Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/getnetgrent.c,v 1.30 2003/01/03 23:55:58 tjr Exp $"); +#include #include #include #include ==== //depot/projects/ia64/lib/libc/gen/getvfsent.c#4 (text+ko) ==== @@ -6,10 +6,11 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/getvfsent.c,v 1.19 2002/08/10 20:19:03 mux Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/getvfsent.c,v 1.20 2003/01/04 00:13:00 tjr Exp $"); #include #include +#include #include #include #include ==== //depot/projects/ia64/lib/libc/gen/opendir.c#3 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)opendir.c 8.8 (Berkeley) 5/1/95"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/opendir.c,v 1.18 2002/02/01 00:57:29 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/opendir.c,v 1.19 2003/01/04 00:18:50 tjr Exp $"); #include "namespace.h" #include @@ -46,6 +46,7 @@ #include #include #include +#include #include #include "un-namespace.h" ==== //depot/projects/ia64/lib/libc/gen/popen.3#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)popen.3 8.2 (Berkeley) 5/3/95 -.\" $FreeBSD: src/lib/libc/gen/popen.3,v 1.14 2001/10/01 16:08:51 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/popen.3,v 1.15 2003/01/03 05:21:59 tjr Exp $ .\" .Dd May 3, 1995 .Dt POPEN 3 @@ -184,7 +184,7 @@ .Pp The .Fn popen -argument +function always calls .Xr sh 1 , never calls ==== //depot/projects/ia64/lib/libc/gen/popen.c#3 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)popen.c 8.3 (Berkeley) 5/3/95"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/popen.c,v 1.16 2002/02/01 01:08:48 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/popen.c,v 1.18 2003/01/04 00:15:15 tjr Exp $"); #include "namespace.h" #include @@ -51,7 +51,9 @@ #include #include #include +#include #include "un-namespace.h" +#include "libc_private.h" extern char **environ; @@ -60,7 +62,11 @@ FILE *fp; pid_t pid; } *pidlist; +static pthread_mutex_t pidlist_mutex = PTHREAD_MUTEX_INITIALIZER; +#define THREAD_LOCK() if (__isthreaded) _pthread_mutex_lock(&pidlist_mutex) +#define THREAD_UNLOCK() if (__isthreaded) _pthread_mutex_unlock(&pidlist_mutex) + FILE * popen(command, type) const char *command, *type; @@ -97,8 +103,10 @@ argv[2] = (char *)command; argv[3] = NULL; + THREAD_LOCK(); switch (pid = vfork()) { case -1: /* Error. */ + THREAD_UNLOCK(); (void)_close(pdes[0]); (void)_close(pdes[1]); free(cur); @@ -136,6 +144,7 @@ _exit(127); /* NOTREACHED */ } + THREAD_UNLOCK(); /* Parent; assume fdopen can't fail. */ if (*type == 'r') { @@ -148,9 +157,11 @@ /* Link into list of file descriptors. */ cur->fp = iop; - cur->pid = pid; + cur->pid = pid; + THREAD_LOCK(); cur->next = pidlist; pidlist = cur; + THREAD_UNLOCK(); return (iop); } @@ -165,16 +176,25 @@ FILE *iop; { struct pid *cur, *last; - int omask; int pstat; pid_t pid; - /* Find the appropriate file pointer. */ + /* + * Find the appropriate file pointer and remove it from the list. + */ + THREAD_LOCK(); for (last = NULL, cur = pidlist; cur; last = cur, cur = cur->next) if (cur->fp == iop) break; - if (cur == NULL) + if (cur == NULL) { + THREAD_UNLOCK(); return (-1); + } + if (last == NULL) + pidlist = cur->next; + else + last->next = cur->next; + THREAD_UNLOCK(); (void)fclose(iop); @@ -182,11 +202,6 @@ pid = _wait4(cur->pid, &pstat, 0, (struct rusage *)0); } while (pid == -1 && errno == EINTR); - /* Remove the entry from the linked list. */ - if (last == NULL) - pidlist = cur->next; - else - last->next = cur->next; free(cur); return (pid == -1 ? -1 : pstat); ==== //depot/projects/ia64/lib/libc/gen/sysctlnametomib.c#3 (text+ko) ==== @@ -25,10 +25,11 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/sysctlnametomib.c,v 1.3 2002/02/01 00:57:29 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/sysctlnametomib.c,v 1.4 2003/01/04 00:11:11 tjr Exp $"); #include #include +#include /* * This function uses a presently undocumented interface to the kernel ==== //depot/projects/ia64/lib/libc/gen/ulimit.3#5 (text+ko) ==== @@ -21,9 +21,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/gen/ulimit.3,v 1.4 2002/12/19 09:40:21 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/ulimit.3,v 1.5 2003/01/04 01:11:49 tjr Exp $ .\" -.Dd August 8, 2002 +.Dd January 4, 2003 .Dt ULIMIT 3 .Os .Sh NAME @@ -43,11 +43,11 @@ The .Fa cmd argument is one of the following: -.Bl -tag -width ".Dv UL_GETSIZE" -.It Dv UL_GETSIZE +.Bl -tag -width ".Dv UL_GETFSIZE" +.It Dv UL_GETFSIZE will return the maximum file size in units of 512 blocks of the current process. -.It Dv UL_SETSIZE +.It Dv UL_SETFSIZE will attempt to set the maximum file size of the current process and its children with the second argument expressed as a long. .El ==== //depot/projects/ia64/lib/libc/gen/ulimit.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/gen/ulimit.c,v 1.1 2002/08/08 04:50:36 mike Exp $ + * $FreeBSD: src/lib/libc/gen/ulimit.c,v 1.3 2003/01/04 01:11:49 tjr Exp $ */ #include @@ -40,16 +40,16 @@ { struct rlimit limit; va_list ap; - long arg, size; + long arg; - if (cmd == UL_GETSIZE) { + if (cmd == UL_GETFSIZE) { if (getrlimit(RLIMIT_FSIZE, &limit) == -1) return (-1); limit.rlim_cur /= 512; if (limit.rlim_cur > LONG_MAX) return (LONG_MAX); return ((long)limit.rlim_cur); - } else if (cmd == UL_SETSIZE) { + } else if (cmd == UL_SETFSIZE) { va_start(ap, cmd); arg = va_arg(ap, long); va_end(ap); ==== //depot/projects/ia64/lib/libc/gen/wordexp.3#3 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/gen/wordexp.3,v 1.2 2002/12/27 08:28:53 tjr Exp $ +.\" $FreeBSD: src/lib/libc/gen/wordexp.3,v 1.3 2003/01/03 12:04:36 tjr Exp $ .\" .Dd December 27, 2002 .Dt WORDEXP 3 @@ -34,7 +34,6 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS -.In sys/types.h .In wordexp.h .Ft int .Fo wordexp ==== //depot/projects/ia64/lib/libc/gen/wordexp.c#3 (text+ko) ==== @@ -37,7 +37,7 @@ #include #include "un-namespace.h" -__FBSDID("$FreeBSD: src/lib/libc/gen/wordexp.c,v 1.2 2002/12/27 01:01:03 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/wordexp.c,v 1.3 2003/01/04 06:07:44 tjr Exp $"); static int we_askshell(const char *, wordexp_t *, int); static int we_check(const char *, int); @@ -141,7 +141,8 @@ close(pdes[1]); if (read(pdes[0], wbuf, 8) != 8 || read(pdes[0], bbuf, 8) != 8) { close(pdes[0]); - return (WRDE_NOSPACE); /* XXX */ + waitpid(pid, &status, 0); + return (flags & WRDE_UNDEF ? WRDE_BADVAL : WRDE_SYNTAX); } wbuf[8] = bbuf[8] = '\0'; nwords = strtol(wbuf, NULL, 16); @@ -154,17 +155,21 @@ */ sofs = we->we_nbytes; vofs = we->we_wordc; + if ((flags & (WRDE_DOOFS|WRDE_APPEND)) == (WRDE_DOOFS|WRDE_APPEND)) + vofs += we->we_offs; we->we_wordc += nwords; we->we_nbytes += nbytes; if ((nwv = realloc(we->we_wordv, (we->we_wordc + 1 + (flags & WRDE_DOOFS ? we->we_offs : 0)) * sizeof(char *))) == NULL) { close(pdes[0]); + waitpid(pid, &status, 0); return (WRDE_NOSPACE); } we->we_wordv = nwv; if ((nstrings = realloc(we->we_strings, we->we_nbytes)) == NULL) { close(pdes[0]); + waitpid(pid, &status, 0); return (WRDE_NOSPACE); } for (i = 0; i < vofs; i++) @@ -174,7 +179,8 @@ if (read(pdes[0], we->we_strings + sofs, nbytes) != nbytes) { close(pdes[0]); - return (WRDE_NOSPACE); /* XXX */ + waitpid(pid, &status, 0); + return (flags & WRDE_UNDEF ? WRDE_BADVAL : WRDE_SYNTAX); } if (waitpid(pid, &status, 0) < 0 || !WIFEXITED(status) || @@ -221,7 +227,7 @@ switch (c) { case '\\': quote ^= 1; - break; + continue; case '\'': if (quote + dquote == 0) squote ^= 1; @@ -247,8 +253,8 @@ case '$': if ((c = *words++) == '\0') break; - else if (c == '(') { - if (flags & WRDE_NOCMD) + else if (quote + squote == 0 && c == '(') { + if (flags & WRDE_NOCMD && *words != '(') return (WRDE_CMDSUB); level = 1; while ((c = *words++) != '\0') { @@ -262,7 +268,7 @@ } if (c == '\0' || level != 0) return (WRDE_SYNTAX); - } else if (c == '{') { + } else if (quote + squote == 0 && c == '{') { level = 1; while ((c = *words++) != '\0') { if (c == '\\') { @@ -275,11 +281,13 @@ } if (c == '\0' || level != 0) return (WRDE_SYNTAX); - } + } else + c = *--words; break; default: break; } + quote = 0; } if (quote + squote + dquote != 0) return (WRDE_SYNTAX); ==== //depot/projects/ia64/lib/libc/stdio/freopen.c#4 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)freopen.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/freopen.c,v 1.9 2002/10/12 16:13:39 mike Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/freopen.c,v 1.10 2003/01/03 12:27:19 tjr Exp $"); #include "namespace.h" #include @@ -133,6 +133,7 @@ if (HASLB(fp)) FREELB(fp); fp->_lb._size = 0; + fp->_extra->orientation = 0; if (f < 0) { /* did not get it after all */ fp->_flags = 0; /* set it free */ ==== //depot/projects/ia64/lib/libc/stdio/fscanf.c#5 (text+ko) ==== @@ -38,13 +38,14 @@ static char sccsid[] = "@(#)fscanf.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/fscanf.c,v 1.11 2002/10/12 16:13:40 mike Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/fscanf.c,v 1.12 2003/01/03 23:27:27 tjr Exp $"); #include "namespace.h" #include >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jan 4 15:11:43 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9B6BB37B405; Sat, 4 Jan 2003 15:11:24 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2E9F737B401 for ; Sat, 4 Jan 2003 15:11:24 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6126443E4A for ; Sat, 4 Jan 2003 15:11:23 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h04NBNfh018192 for ; Sat, 4 Jan 2003 15:11:23 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h04NBMHa018179 for perforce@freebsd.org; Sat, 4 Jan 2003 15:11:22 -0800 (PST) Date: Sat, 4 Jan 2003 15:11:22 -0800 (PST) Message-Id: <200301042311.h04NBMHa018179@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 23175 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=23175 Change 23175 by marcel@marcel_vaio on 2003/01/04 15:10:32 IFC @23174 Affected files ... .. //depot/projects/ia64/sys/conf/files#54 integrate .. //depot/projects/ia64/sys/conf/files.ia64#28 integrate .. //depot/projects/ia64/sys/fs/hpfs/hpfs_vnops.c#17 integrate .. //depot/projects/ia64/sys/fs/msdosfs/msdosfs_vnops.c#12 integrate .. //depot/projects/ia64/sys/fs/specfs/spec_vnops.c#14 integrate .. //depot/projects/ia64/sys/fs/udf/udf_vnops.c#12 integrate .. //depot/projects/ia64/sys/isofs/cd9660/cd9660_vnops.c#10 integrate .. //depot/projects/ia64/sys/kern/imgact_elf.c#26 integrate .. //depot/projects/ia64/sys/kern/imgact_elf32.c#3 integrate .. //depot/projects/ia64/sys/kern/imgact_elf64.c#3 integrate .. //depot/projects/ia64/sys/kern/imgact_elfN.c#4 delete .. //depot/projects/ia64/sys/kern/init_main.c#22 integrate .. //depot/projects/ia64/sys/kern/kern_mib.c#11 integrate .. //depot/projects/ia64/sys/kern/vfs_bio.c#33 integrate .. //depot/projects/ia64/sys/kern/vfs_default.c#14 integrate .. //depot/projects/ia64/sys/kern/vnode_if.src#11 integrate .. //depot/projects/ia64/sys/ufs/ufs/ufs_vnops.c#23 integrate .. //depot/projects/ia64/sys/vm/vm_swap.c#15 integrate .. //depot/projects/ia64/usr.bin/systat/Makefile#4 integrate .. //depot/projects/ia64/usr.bin/systat/cmds.c#3 integrate .. //depot/projects/ia64/usr.bin/systat/cmdtab.c#3 integrate .. //depot/projects/ia64/usr.bin/systat/convtbl.c#1 branch .. //depot/projects/ia64/usr.bin/systat/convtbl.h#1 branch .. //depot/projects/ia64/usr.bin/systat/extern.h#4 integrate .. //depot/projects/ia64/usr.bin/systat/ifcmds.c#1 branch .. //depot/projects/ia64/usr.bin/systat/ifstat.c#1 branch .. //depot/projects/ia64/usr.bin/systat/systat.1#6 integrate Differences ... ==== //depot/projects/ia64/sys/conf/files#54 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.742 2003/01/01 19:49:29 jake Exp $ +# $FreeBSD: src/sys/conf/files,v 1.743 2003/01/04 22:07:48 jake Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -968,9 +968,7 @@ isofs/cd9660/cd9660_util.c optional cd9660 isofs/cd9660/cd9660_vfsops.c optional cd9660 isofs/cd9660/cd9660_vnops.c optional cd9660 -kern/imgact_elf32.c standard -kern/imgact_elf64.c standard -kern/imgact_elfN.c standard +kern/imgact_elf.c standard kern/imgact_shell.c standard kern/inflate.c optional gzip kern/init_main.c standard ==== //depot/projects/ia64/sys/conf/files.ia64#28 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.ia64,v 1.41 2002/10/24 19:05:03 jhb Exp $ +# $FreeBSD: src/sys/conf/files.ia64,v 1.42 2003/01/04 22:07:48 jake Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -114,6 +114,7 @@ isa/ppc.c optional ppc isa isa/psm.c optional psm isa isa/syscons_isa.c optional sc +kern/imgact_elf32.c optional ia32 kern/subr_diskmbr.c standard libkern/ia64/bswap16.S standard libkern/ia64/bswap32.S standard ==== //depot/projects/ia64/sys/fs/hpfs/hpfs_vnops.c#17 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/hpfs/hpfs_vnops.c,v 1.37 2003/01/04 08:47:17 phk Exp $ + * $FreeBSD: src/sys/fs/hpfs/hpfs_vnops.c,v 1.38 2003/01/04 22:10:34 phk Exp $ */ #include @@ -706,7 +706,7 @@ return (0); } bp->b_dev = hp->h_devvp->v_rdev; - VOP_STRATEGY(hp->h_devvp, bp); + VOP_SPECSTRATEGY(hp->h_devvp, bp); return (0); } ==== //depot/projects/ia64/sys/fs/msdosfs/msdosfs_vnops.c#12 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_vnops.c,v 1.128 2003/01/04 08:47:18 phk Exp $ */ +/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_vnops.c,v 1.129 2003/01/04 22:10:35 phk Exp $ */ /* $NetBSD: msdosfs_vnops.c,v 1.68 1998/02/10 14:10:04 mrg Exp $ */ /*- @@ -1820,7 +1820,7 @@ */ vp = dep->de_devvp; bp->b_dev = vp->v_rdev; - VOP_STRATEGY(vp, bp); + VOP_SPECSTRATEGY(vp, bp); return (0); } ==== //depot/projects/ia64/sys/fs/specfs/spec_vnops.c#14 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)spec_vnops.c 8.14 (Berkeley) 5/21/95 - * $FreeBSD: src/sys/fs/specfs/spec_vnops.c,v 1.190 2003/01/04 20:32:03 phk Exp $ + * $FreeBSD: src/sys/fs/specfs/spec_vnops.c,v 1.191 2003/01/04 22:10:35 phk Exp $ */ #include @@ -56,7 +56,6 @@ #include #include - static int spec_advlock(struct vop_advlock_args *); static int spec_close(struct vop_close_args *); static int spec_freeblks(struct vop_freeblks_args *); @@ -69,6 +68,8 @@ static int spec_print(struct vop_print_args *); static int spec_read(struct vop_read_args *); static int spec_strategy(struct vop_strategy_args *); +static int spec_xstrategy(struct vop_strategy_args *); +static int spec_specstrategy(struct vop_specstrategy_args *); static int spec_write(struct vop_write_args *); vop_t **spec_vnodeop_p; @@ -104,6 +105,7 @@ { &vop_rename_desc, (vop_t *) vop_panic }, { &vop_rmdir_desc, (vop_t *) vop_panic }, { &vop_setattr_desc, (vop_t *) vop_ebadf }, + { &vop_specstrategy_desc, (vop_t *) spec_specstrategy }, { &vop_strategy_desc, (vop_t *) spec_strategy }, { &vop_symlink_desc, (vop_t *) vop_panic }, { &vop_unlock_desc, (vop_t *) vop_nounlock }, @@ -522,7 +524,7 @@ * Just call the device strategy routine */ static int -spec_strategy(ap) +spec_xstrategy(ap) struct vop_strategy_args /* { struct vnode *a_vp; struct buf *a_bp; @@ -609,6 +611,41 @@ return (0); } +/* + * Decoy strategy routine. We should always come in via the specstrategy + * method, but in case some code has botched it, we have a strategy as + * well. We will deal with the request anyway and first time around we + * print some debugging useful information. + */ + +static int +spec_strategy(ap) + struct vop_strategy_args /* { + struct vnode *a_vp; + struct buf *a_bp; + } */ *ap; +{ + static int once; + + if (!once) { + vprint("\nVOP_STRATEGY on VCHR\n", ap->a_vp); + backtrace(); + once++; + } + return spec_xstrategy(ap); +} + +static int +spec_specstrategy(ap) + struct vop_specstrategy_args /* { + struct vnode *a_vp; + struct buf *a_bp; + } */ *ap; +{ + + return spec_xstrategy((void *)ap); +} + static int spec_freeblks(ap) struct vop_freeblks_args /* { ==== //depot/projects/ia64/sys/fs/udf/udf_vnops.c#12 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/udf/udf_vnops.c,v 1.18 2003/01/04 08:47:18 phk Exp $ + * $FreeBSD: src/sys/fs/udf/udf_vnops.c,v 1.19 2003/01/04 22:10:35 phk Exp $ */ /* udf_vnops.c */ @@ -828,7 +828,7 @@ } vp = node->i_devvp; bp->b_dev = vp->v_rdev; - VOP_STRATEGY(vp, bp); + VOP_SPECSTRATEGY(vp, bp); return (0); } ==== //depot/projects/ia64/sys/isofs/cd9660/cd9660_vnops.c#10 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)cd9660_vnops.c 8.19 (Berkeley) 5/27/95 - * $FreeBSD: src/sys/isofs/cd9660/cd9660_vnops.c,v 1.83 2003/01/04 08:47:19 phk Exp $ + * $FreeBSD: src/sys/isofs/cd9660/cd9660_vnops.c,v 1.84 2003/01/04 22:10:35 phk Exp $ */ #include @@ -731,7 +731,7 @@ } vp = ip->i_devvp; bp->b_dev = vp->v_rdev; - VOP_STRATEGY(vp, bp); + VOP_SPECSTRATEGY(vp, bp); return (0); } ==== //depot/projects/ia64/sys/kern/imgact_elf.c#26 (text+ko) ==== @@ -27,7 +27,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/imgact_elf.c,v 1.134 2002/12/21 01:15:39 marcel Exp $ + * $FreeBSD: src/sys/kern/imgact_elf.c,v 1.135 2003/01/04 22:07:48 jake Exp $ */ #include @@ -81,20 +81,24 @@ vm_prot_t prot, size_t pagesize); static int __CONCAT(exec_, __elfN(imgact))(struct image_params *imgp); +SYSCTL_NODE(_kern, OID_AUTO, __CONCAT(elf, __ELF_WORD_SIZE), CTLFLAG_RW, 0, + ""); + +static int fallback_brand = -1; +SYSCTL_INT(__CONCAT(_kern_elf, __ELF_WORD_SIZE), OID_AUTO, fallback_brand, + CTLFLAG_RW, &fallback_brand, 0, + __XSTRING(__CONCAT(ELF, __ELF_WORD_SIZE)) " brand of last resort"); +TUNABLE_INT("kern.elf" __XSTRING(__ELF_WORD_SIZE) ".fallback_brand", + &fallback_brand); + static int elf_trace = 0; +SYSCTL_INT(_debug, OID_AUTO, __elfN(trace), CTLFLAG_RW, &elf_trace, 0, ""); + static int elf_legacy_coredump = 0; -#if __ELF_WORD_SIZE == 32 -SYSCTL_INT(_debug, OID_AUTO, elf32_trace, CTLFLAG_RW, &elf_trace, 0, ""); -SYSCTL_INT(_debug, OID_AUTO, elf32_legacy_coredump, CTLFLAG_RW, +SYSCTL_INT(_debug, OID_AUTO, __elfN(legacy_coredump), CTLFLAG_RW, &elf_legacy_coredump, 0, ""); -#else -SYSCTL_INT(_debug, OID_AUTO, elf64_trace, CTLFLAG_RW, &elf_trace, 0, ""); -SYSCTL_INT(_debug, OID_AUTO, elf64_legacy_coredump, CTLFLAG_RW, - &elf_legacy_coredump, 0, ""); -#endif static Elf_Brandinfo *elf_brand_list[MAX_BRANDS]; -extern int fallback_elf_brand; int __elfN(insert_brand_entry)(Elf_Brandinfo *entry) @@ -184,7 +188,7 @@ for (i = 0; i < MAX_BRANDS; i++) { bi = elf_brand_list[i]; if (bi != NULL && hdr->e_machine == bi->machine && - fallback_elf_brand == bi->brand) + fallback_brand == bi->brand) return (bi); } return (NULL); @@ -849,22 +853,16 @@ return (error); } -#if __ELF_WORD_SIZE == 32 -#define suword suword32 -#define stacktype u_int32_t -#else -#define suword suword64 -#define stacktype u_int64_t -#endif +#define suword __CONCAT(suword, __ELF_WORD_SIZE) int __elfN(freebsd_fixup)(register_t **stack_base, struct image_params *imgp) { Elf_Auxargs *args = (Elf_Auxargs *)imgp->auxargs; - stacktype *base; - stacktype *pos; + Elf_Addr *base; + Elf_Addr *pos; - base = (stacktype *)*stack_base; + base = (Elf_Addr *)*stack_base; pos = base + (imgp->argc + imgp->envc + 2); if (args->trace) { @@ -1260,10 +1258,8 @@ /* * Tell kern_execve.c about it, with a little help from the linker. */ -#if __ELF_WORD_SIZE == 32 -static struct execsw elf_execsw = {exec_elf32_imgact, "ELF32"}; -EXEC_SET(elf32, elf_execsw); -#else -static struct execsw elf_execsw = {exec_elf64_imgact, "ELF64"}; -EXEC_SET(elf64, elf_execsw); -#endif +static struct execsw __elfN(execsw) = { + __CONCAT(exec_, __elfN(imgact)), + __XSTRING(__CONCAT(ELF, __ELF_WORD_SIZE)) +}; +EXEC_SET(__CONCAT(elf, __ELF_WORD_SIZE), __elfN(execsw)); ==== //depot/projects/ia64/sys/kern/imgact_elf32.c#3 (text+ko) ==== @@ -23,16 +23,8 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/imgact_elf32.c,v 1.1 2002/07/20 02:56:11 peter Exp $ - */ - -/* - * There ought to be a better way of deciding this. + * $FreeBSD: src/sys/kern/imgact_elf32.c,v 1.2 2003/01/04 22:07:48 jake Exp $ */ -#if defined(__i386__) || defined(__ia64__) || defined(__powerpc__) #define __ELF_WORD_SIZE 32 - #include - -#endif ==== //depot/projects/ia64/sys/kern/imgact_elf64.c#3 (text+ko) ==== @@ -23,16 +23,8 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/imgact_elf64.c,v 1.1 2002/07/20 02:56:11 peter Exp $ - */ - -/* - * There ought to be a better way of deciding this. + * $FreeBSD: src/sys/kern/imgact_elf64.c,v 1.2 2003/01/04 22:07:48 jake Exp $ */ -#if defined(__alpha__) || defined(__ia64__) || defined(__sparc64__) #define __ELF_WORD_SIZE 64 - #include - -#endif ==== //depot/projects/ia64/sys/kern/init_main.c#22 (text+ko) ==== @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * @(#)init_main.c 8.9 (Berkeley) 1/21/94 - * $FreeBSD: src/sys/kern/init_main.c,v 1.217 2002/12/28 01:23:07 julian Exp $ + * $FreeBSD: src/sys/kern/init_main.c,v 1.218 2003/01/04 22:07:48 jake Exp $ */ #include "opt_init_path.h" @@ -98,7 +98,6 @@ struct proc *initproc; int cmask = CMASK; -extern int fallback_elf_brand; struct vnode *rootvp; int boothowto = 0; /* initialized so that it can be patched */ @@ -592,10 +591,6 @@ strlcpy(init_path, var, sizeof(init_path)); freeenv(var); } - if ((var = getenv("kern.fallback_elf_brand")) != NULL) { - fallback_elf_brand = strtol(var, NULL, 0); - freeenv(var); - } for (path = init_path; *path != '\0'; path = next) { while (*path == ':') ==== //depot/projects/ia64/sys/kern/kern_mib.c#11 (text+ko) ==== @@ -37,7 +37,7 @@ * SUCH DAMAGE. * * @(#)kern_sysctl.c 8.4 (Berkeley) 4/14/94 - * $FreeBSD: src/sys/kern/kern_mib.c,v 1.62 2002/11/07 23:57:17 tmm Exp $ + * $FreeBSD: src/sys/kern/kern_mib.c,v 1.63 2003/01/04 22:07:48 jake Exp $ */ #include "opt_posix.h" @@ -361,3 +361,7 @@ #include SYSCTL_INT(_debug_sizeof, OID_AUTO, kinfo_proc, CTLFLAG_RD, 0, sizeof(struct kinfo_proc), "sizeof(struct kinfo_proc)"); + +SYSCTL_STRING(_kern, OID_AUTO, fallback_elf_brand, CTLFLAG_RD, + "kern.fallback_elf_brand is deprecated, use kern.elf32.fallback_brand or " + "kern.elf64.fallback_brand" , 0, ""); ==== //depot/projects/ia64/sys/kern/vfs_bio.c#33 (text+ko) ==== @@ -11,7 +11,7 @@ * 2. Absolutely no warranty of function or purpose is made by the author * John S. Dyson. * - * $FreeBSD: src/sys/kern/vfs_bio.c,v 1.348 2003/01/04 09:37:42 phk Exp $ + * $FreeBSD: src/sys/kern/vfs_bio.c,v 1.349 2003/01/04 22:10:35 phk Exp $ */ /* @@ -701,7 +701,10 @@ if (bp->b_rcred == NOCRED && cred != NOCRED) bp->b_rcred = crhold(cred); vfs_busy_pages(bp, 0); - VOP_STRATEGY(vp, bp); + if (vp->v_type == VCHR) + VOP_SPECSTRATEGY(vp, bp); + else + VOP_STRATEGY(vp, bp); ++readwait; } @@ -721,7 +724,10 @@ rabp->b_rcred = crhold(cred); vfs_busy_pages(rabp, 0); BUF_KERNPROC(rabp); - VOP_STRATEGY(vp, rabp); + if (vp->v_type == VCHR) + VOP_SPECSTRATEGY(vp, bp); + else + VOP_STRATEGY(vp, bp); } else { brelse(rabp); } @@ -855,7 +861,10 @@ splx(s); if (oldflags & B_ASYNC) BUF_KERNPROC(bp); - VOP_STRATEGY(bp->b_vp, bp); + if (bp->b_vp->v_type == VCHR) + VOP_SPECSTRATEGY(bp->b_vp, bp); + else + VOP_STRATEGY(bp->b_vp, bp); if ((oldflags & B_ASYNC) == 0) { int rtval = bufwait(bp); ==== //depot/projects/ia64/sys/kern/vfs_default.c#14 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * - * $FreeBSD: src/sys/kern/vfs_default.c,v 1.69 2003/01/04 20:31:27 phk Exp $ + * $FreeBSD: src/sys/kern/vfs_default.c,v 1.70 2003/01/04 22:10:36 phk Exp $ */ #include @@ -66,6 +66,7 @@ static int vop_nolookup(struct vop_lookup_args *); static int vop_nostrategy(struct vop_strategy_args *); +static int vop_nospecstrategy(struct vop_specstrategy_args *); /* * This vnode table stores what we want to do if the filesystem doesn't @@ -98,6 +99,7 @@ { &vop_putpages_desc, (vop_t *) vop_stdputpages }, { &vop_readlink_desc, (vop_t *) vop_einval }, { &vop_revoke_desc, (vop_t *) vop_revoke }, + { &vop_specstrategy_desc, (vop_t *) vop_nospecstrategy }, { &vop_strategy_desc, (vop_t *) vop_nostrategy }, { &vop_unlock_desc, (vop_t *) vop_stdunlock }, { NULL, NULL } @@ -221,6 +223,29 @@ } /* + * vop_nospecstrategy: + * + * This shouldn't happen. VOP_SPECSTRATEGY should always have a VCHR + * argument vnode, and thos have a method for specstrategy over in + * specfs, so we only ever get here if somebody botched it. + * Pass the call to VOP_STRATEGY() and get on with life. + * The first time we print some info useful for debugging. + */ + +static int +vop_nospecstrategy (struct vop_specstrategy_args *ap) +{ + static int once; + + if (!once) { + vprint("\nVOP_SPECSTRATEGY on non-VCHR\n", ap->a_vp); + backtrace(); + once++; + } + return VOP_STRATEGY(ap->a_vp, ap->a_bp); +} + +/* * vop_stdpathconf: * * Standard implementation of POSIX pathconf, to get information about limits ==== //depot/projects/ia64/sys/kern/vnode_if.src#11 (text+ko) ==== @@ -31,7 +31,7 @@ # SUCH DAMAGE. # # @(#)vnode_if.src 8.12 (Berkeley) 5/14/95 -# $FreeBSD: src/sys/kern/vnode_if.src,v 1.59 2002/12/24 19:47:13 rwatson Exp $ +# $FreeBSD: src/sys/kern/vnode_if.src,v 1.60 2003/01/04 22:10:36 phk Exp $ # # @@ -400,6 +400,15 @@ }; # +# specstrategy vp L L L +#! specstrategy pre vop_strategy_pre +# +vop_specstrategy { + IN struct vnode *vp; + IN struct buf *bp; +}; + +# #% getwritemount vp = = = # vop_getwritemount { ==== //depot/projects/ia64/sys/ufs/ufs/ufs_vnops.c#23 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)ufs_vnops.c 8.27 (Berkeley) 5/27/95 - * $FreeBSD: src/sys/ufs/ufs/ufs_vnops.c,v 1.221 2003/01/04 08:47:19 phk Exp $ + * $FreeBSD: src/sys/ufs/ufs/ufs_vnops.c,v 1.222 2003/01/04 22:10:36 phk Exp $ */ #include "opt_mac.h" @@ -1968,7 +1968,7 @@ } vp = ip->i_devvp; bp->b_dev = vp->v_rdev; - VOP_STRATEGY(vp, bp); + VOP_SPECSTRATEGY(vp, bp); return (0); } ==== //depot/projects/ia64/sys/vm/vm_swap.c#15 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)vm_swap.c 8.5 (Berkeley) 2/17/94 - * $FreeBSD: src/sys/vm/vm_swap.c,v 1.129 2003/01/03 19:16:48 phk Exp $ + * $FreeBSD: src/sys/vm/vm_swap.c,v 1.130 2003/01/04 22:10:36 phk Exp $ */ #include "opt_mac.h" @@ -164,7 +164,7 @@ } bp->b_vp = sp->sw_vp; splx(s); - VOP_STRATEGY(bp->b_vp, bp); + VOP_SPECSTRATEGY(bp->b_vp, bp); return 0; } ==== //depot/projects/ia64/usr.bin/systat/Makefile#4 (text+ko) ==== @@ -1,10 +1,10 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 -# $FreeBSD: src/usr.bin/systat/Makefile,v 1.12 2002/02/08 23:07:35 markm Exp $ +# $FreeBSD: src/usr.bin/systat/Makefile,v 1.13 2003/01/04 22:07:24 phk Exp $ PROG= systat SRCS= cmds.c cmdtab.c devs.c fetch.c iostat.c keyboard.c main.c \ mbufs.c netcmds.c netstat.c pigs.c swap.c icmp.c mode.c ip.c tcp.c \ - vmstat.c + vmstat.c convtbl.c ifcmds.c ifstat.c DPADD= ${LIBCURSES} ${LIBM} ${LIBKVM} ${LIBDEVSTAT} LDADD= -lcurses -lm -lkvm -ldevstat ==== //depot/projects/ia64/usr.bin/systat/cmds.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ #include -__FBSDID("$FreeBSD: src/usr.bin/systat/cmds.c,v 1.4 2001/12/12 00:13:37 markm Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/systat/cmds.c,v 1.5 2003/01/04 21:58:25 phk Exp $"); #ifdef lint static const char sccsid[] = "@(#)cmds.c 8.2 (Berkeley) 4/29/95"; @@ -119,6 +119,7 @@ goto done; alarm(0); (*curcmd->c_close)(wnd); + curcmd->c_flags &= ~CF_INIT; wnd = (*p->c_open)(); if (wnd == 0) { error("Couldn't open new display"); ==== //depot/projects/ia64/usr.bin/systat/cmdtab.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ #include -__FBSDID("$FreeBSD: src/usr.bin/systat/cmdtab.c,v 1.7 2001/12/12 00:13:37 markm Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/systat/cmdtab.c,v 1.8 2003/01/04 22:07:24 phk Exp $"); #ifdef lint static const char sccsid[] = "@(#)cmdtab.c 8.1 (Berkeley) 6/6/93"; @@ -71,6 +71,9 @@ { "tcp", showtcp, fetchtcp, labeltcp, inittcp, opentcp, closetcp, cmdmode, resettcp, 0 }, + { "ifstat", showifstat, fetchifstat, labelifstat, + initifstat, openifstat, closeifstat, cmdifstat, + 0, CF_LOADAV }, { NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0 } }; struct cmdtab *curcmd = &cmdtab[0]; ==== //depot/projects/ia64/usr.bin/systat/extern.h#4 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)extern.h 8.1 (Berkeley) 6/6/93 - * $FreeBSD: src/usr.bin/systat/extern.h,v 1.11 2002/03/22 01:42:31 imp Exp $ + * $FreeBSD: src/usr.bin/systat/extern.h,v 1.12 2003/01/04 22:07:24 phk Exp $ */ #include @@ -72,8 +72,9 @@ int checkhost(struct inpcb *); int checkport(struct inpcb *); +void closeicmp(WINDOW *); +void closeifstat(WINDOW *); void closeiostat(WINDOW *); -void closeicmp(WINDOW *); void closeip(WINDOW *); void closekre(WINDOW *); void closembufs(WINDOW *); @@ -81,6 +82,7 @@ void closepigs(WINDOW *); void closeswap(WINDOW *); void closetcp(WINDOW *); +int cmdifstat(const char *, const char *); int cmdiostat(const char *, const char *); int cmdkre(const char *, const char *); int cmdnetstat(const char *, const char *); @@ -92,6 +94,7 @@ int dkcmd(char *, char *); void error(const char *fmt, ...) __printflike(1, 2); void fetchicmp(void); +void fetchifstat(void); void fetchip(void); void fetchiostat(void); void fetchkre(void); @@ -102,6 +105,7 @@ void fetchtcp(void); void getsysctl(const char *, void *, size_t); int initicmp(void); +int initifstat(void); int initip(void); int initiostat(void); int initkre(void); @@ -113,6 +117,7 @@ int keyboard(void); int kvm_ckread(void *, void *, int); void labelicmp(void); +void labelifstat(void); void labelip(void); void labeliostat(void); void labelkre(void); @@ -126,6 +131,7 @@ int netcmd(const char *, const char *); void nlisterr(struct nlist []); WINDOW *openicmp(void); +WINDOW *openifstat(void); WINDOW *openip(void); WINDOW *openiostat(void); WINDOW *openkre(void); @@ -139,6 +145,7 @@ void resetip(void); void resettcp(void); void showicmp(void); +void showifstat(void); void showip(void); void showiostat(void); void showkre(void); ==== //depot/projects/ia64/usr.bin/systat/systat.1#6 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)systat.1 8.2 (Berkeley) 12/30/93 -.\" $FreeBSD: src/usr.bin/systat/systat.1,v 1.36 2002/12/27 12:15:35 schweikh Exp $ +.\" $FreeBSD: src/usr.bin/systat/systat.1,v 1.37 2003/01/04 22:07:24 phk Exp $ .\" .Dd September 9, 1997 .Dt SYSTAT 1 @@ -88,6 +88,7 @@ .Ar display to be one of: .Ic icmp , +.Ic ifstat , .Ic iostat , .Ic ip , .Ic mbufs , @@ -432,6 +433,28 @@ Reset the port, host, and protocol matching mechanisms to the default (any protocol, port, or host). .El +.It Ic ifstat +Display the network traffic going through active interfaces on the +system. Idle interfaces will not be displayed until they receive some +traffic. +.Pp +For each interface being displayed, the current, peak and total +statistics are displayed for incoming and outgoing traffic. By default, +the +.Ic ifstat +display will automatically scale the units being used so that they are +in a human-readable format. The scaling units used for the current and +peak +traffic columns can be altered by the +.Ic scale +command. +.Pp +.Bl -tag -width Ar -compact +.It Cm scale Op Ar units +Modify the scale used to display the current and peak traffic over all +interfaces. The following units are recognised: kbit, kbyte, mbit, +mbyte, gbit, gbyte and auto. +.El .El .Pp Commands to switch between displays may be abbreviated to the To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message