PERFORCE change 35640 for review
Robert Watson
rwatson at FreeBSD.org
Wed Aug 6 18:32:45 GMT 2003
http://perforce.freebsd.org/chv.cgi?CH=35640
Change 35640 by rwatson at rwatson_paprika on 2003/08/06 11:31:48
IFC the TrustedBSD base branch: bring in various fixes,
including some VM/swap bits, further removal of the bogus
swap pager vnode. Also bring in the ACL-related structural
cleanups.
Affected files ...
.. //depot/projects/trustedbsd/base/MAINTAINERS#21 integrate
.. //depot/projects/trustedbsd/base/Makefile#26 integrate
.. //depot/projects/trustedbsd/base/bin/ps/ps.1#15 integrate
.. //depot/projects/trustedbsd/base/bin/sh/expand.c#12 integrate
.. //depot/projects/trustedbsd/base/contrib/isc-dhcp/client/dhclient.c#8 integrate
.. //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/dhcpd.h#7 integrate
.. //depot/projects/trustedbsd/base/etc/mtree/BSD.local.dist#18 integrate
.. //depot/projects/trustedbsd/base/etc/mtree/BSD.usr.dist#28 integrate
.. //depot/projects/trustedbsd/base/etc/rc.d/Makefile#13 integrate
.. //depot/projects/trustedbsd/base/etc/rc.d/localdaemons#3 integrate
.. //depot/projects/trustedbsd/base/etc/rc.d/localpkg#1 branch
.. //depot/projects/trustedbsd/base/etc/rc.d/netoptions#2 integrate
.. //depot/projects/trustedbsd/base/games/fortune/datfiles/Makefile#5 integrate
.. //depot/projects/trustedbsd/base/games/fortune/datfiles/freebsd-tips#13 integrate
.. //depot/projects/trustedbsd/base/games/fortune/strfile/strfile.c#5 integrate
.. //depot/projects/trustedbsd/base/gnu/lib/libregex/regex.c#2 integrate
.. //depot/projects/trustedbsd/base/gnu/usr.bin/groff/Makefile.inc#4 integrate
.. //depot/projects/trustedbsd/base/gnu/usr.bin/groff/tmac/mdoc.local#15 integrate
.. //depot/projects/trustedbsd/base/gnu/usr.bin/groff/tmac/ru.KOI8-R#2 integrate
.. //depot/projects/trustedbsd/base/gnu/usr.bin/man/man/glob.c#2 integrate
.. //depot/projects/trustedbsd/base/lib/libc/i386/sys/i386_get_ldt.2#5 integrate
.. //depot/projects/trustedbsd/base/lib/libc/ia64/sys/Makefile.inc#3 integrate
.. //depot/projects/trustedbsd/base/lib/libc/ia64/sys/Ovfork.S#3 integrate
.. //depot/projects/trustedbsd/base/lib/libc/ia64/sys/fork.S#3 integrate
.. //depot/projects/trustedbsd/base/lib/libc/ia64/sys/getcontext.S#1 branch
.. //depot/projects/trustedbsd/base/lib/libc/ia64/sys/setlogin.S#3 integrate
.. //depot/projects/trustedbsd/base/lib/libc/ia64/sys/swapcontext.S#1 branch
.. //depot/projects/trustedbsd/base/lib/libc/locale/collcmp.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libc/sys/connect.2#5 integrate
.. //depot/projects/trustedbsd/base/lib/libc/sys/kqueue.2#6 integrate
.. //depot/projects/trustedbsd/base/lib/libedit/makelist#3 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/arch/amd64/Makefile.inc#2 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/arch/amd64/amd64/enter_uts.S#3 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/arch/amd64/amd64/pthread_md.c#1 branch
.. //depot/projects/trustedbsd/base/lib/libpthread/arch/amd64/include/ksd.h#3 delete
.. //depot/projects/trustedbsd/base/lib/libpthread/arch/amd64/include/pthread_md.h#2 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/arch/i386/Makefile.inc#3 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/arch/i386/i386/ksd.c#4 delete
.. //depot/projects/trustedbsd/base/lib/libpthread/arch/i386/i386/pthread_md.c#1 branch
.. //depot/projects/trustedbsd/base/lib/libpthread/arch/i386/i386/thr_getcontext.S#3 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/arch/i386/include/ksd.h#4 delete
.. //depot/projects/trustedbsd/base/lib/libpthread/arch/i386/include/pthread_md.h#4 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/arch/ia64/Makefile.inc#3 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/arch/ia64/ia64/context.S#2 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/arch/ia64/ia64/pthread_md.c#1 branch
.. //depot/projects/trustedbsd/base/lib/libpthread/arch/ia64/include/ksd.h#2 delete
.. //depot/projects/trustedbsd/base/lib/libpthread/arch/ia64/include/pthread_md.h#3 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_cancel.c#8 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_concurrency.c#5 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_create.c#9 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_init.c#10 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_kern.c#14 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_private.h#12 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_sig.c#11 integrate
.. //depot/projects/trustedbsd/base/release/Makefile#48 integrate
.. //depot/projects/trustedbsd/base/release/Makefile.inc.docports#9 integrate
.. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/errata/article.sgml#10 integrate
.. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#19 integrate
.. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#71 integrate
.. //depot/projects/trustedbsd/base/release/doc/ja_JP.eucJP/errata/article.sgml#11 integrate
.. //depot/projects/trustedbsd/base/release/ia64/doFS.sh#6 delete
.. //depot/projects/trustedbsd/base/release/ia64/mkisoimages.sh#4 integrate
.. //depot/projects/trustedbsd/base/release/pc98/dokern.sh#13 integrate
.. //depot/projects/trustedbsd/base/sbin/atm/Makefile#2 integrate
.. //depot/projects/trustedbsd/base/sbin/atm/Makefile.inc#2 integrate
.. //depot/projects/trustedbsd/base/sbin/atm/atm/Makefile#4 integrate
.. //depot/projects/trustedbsd/base/sbin/atm/fore_dnld/Makefile#4 integrate
.. //depot/projects/trustedbsd/base/sbin/atm/ilmid/Makefile#5 integrate
.. //depot/projects/trustedbsd/base/sbin/camcontrol/Makefile#8 integrate
.. //depot/projects/trustedbsd/base/sbin/camcontrol/camcontrol.c#12 integrate
.. //depot/projects/trustedbsd/base/sbin/camcontrol/modeedit.c#7 integrate
.. //depot/projects/trustedbsd/base/sbin/camcontrol/util.c#4 integrate
.. //depot/projects/trustedbsd/base/sbin/mdmfs/mdmfs.8#10 integrate
.. //depot/projects/trustedbsd/base/sbin/mdmfs/mdmfs.c#8 integrate
.. //depot/projects/trustedbsd/base/sbin/newfs/mkfs.c#17 integrate
.. //depot/projects/trustedbsd/base/sbin/restore/interactive.c#5 integrate
.. //depot/projects/trustedbsd/base/sbin/restore/main.c#8 integrate
.. //depot/projects/trustedbsd/base/sbin/route/Makefile#4 integrate
.. //depot/projects/trustedbsd/base/share/colldef/Makefile#15 integrate
.. //depot/projects/trustedbsd/base/share/examples/kld/cdev/module/Makefile#2 integrate
.. //depot/projects/trustedbsd/base/share/examples/kld/cdev/module/cdevmod.c#2 integrate
.. //depot/projects/trustedbsd/base/share/examples/kld/cdev/test/Makefile#2 integrate
.. //depot/projects/trustedbsd/base/share/examples/kld/cdev/test/testcdev.c#2 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/ath.4#4 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/firewire.4#6 integrate
.. //depot/projects/trustedbsd/base/share/man/man7/release.7#15 integrate
.. //depot/projects/trustedbsd/base/share/mklocale/Makefile#14 integrate
.. //depot/projects/trustedbsd/base/share/mklocale/am_ET.UTF-8.src#1 branch
.. //depot/projects/trustedbsd/base/share/monetdef/Makefile#14 integrate
.. //depot/projects/trustedbsd/base/share/monetdef/am_ET.UTF-8.src#1 branch
.. //depot/projects/trustedbsd/base/share/msgdef/Makefile#14 integrate
.. //depot/projects/trustedbsd/base/share/msgdef/am_ET.UTF-8.src#1 branch
.. //depot/projects/trustedbsd/base/share/numericdef/Makefile#14 integrate
.. //depot/projects/trustedbsd/base/share/numericdef/am_ET.UTF-8.src#1 branch
.. //depot/projects/trustedbsd/base/share/termcap/termcap.src#15 integrate
.. //depot/projects/trustedbsd/base/share/timedef/Makefile#13 integrate
.. //depot/projects/trustedbsd/base/share/timedef/am_ET.UTF-8.src#1 branch
.. //depot/projects/trustedbsd/base/sys/alpha/alpha/critical.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/alpha/include/critical.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/alpha/include/endian.h#7 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/amd64/busdma_machdep.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/amd64/critical.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/amd64/pmap.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/include/critical.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/include/ieeefp.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/arm/include/endian.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/boot/efi/libefi/efiboot.h#4 integrate
.. //depot/projects/trustedbsd/base/sys/boot/efi/libefi/efifs.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/boot/efi/loader/main.c#9 integrate
.. //depot/projects/trustedbsd/base/sys/boot/powerpc/loader/start.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_da.c#36 integrate
.. //depot/projects/trustedbsd/base/sys/compat/linprocfs/linprocfs.c#19 integrate
.. //depot/projects/trustedbsd/base/sys/conf/NOTES#40 integrate
.. //depot/projects/trustedbsd/base/sys/conf/files.alpha#18 integrate
.. //depot/projects/trustedbsd/base/sys/conf/files.amd64#5 integrate
.. //depot/projects/trustedbsd/base/sys/conf/files.i386#34 integrate
.. //depot/projects/trustedbsd/base/sys/conf/files.pc98#31 integrate
.. //depot/projects/trustedbsd/base/sys/conf/options#40 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/README#2 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/ah.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/freebsd/ah_osdep.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/freebsd/ah_osdep.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/freebsd/i386-elf.hal.o.uu#2 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/version.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/oltr/if_oltr.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ath/if_ath.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/dev/bge/if_bge.c#26 integrate
.. //depot/projects/trustedbsd/base/sys/dev/digi/digi.h#5 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ed/if_ed_cbus.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/dev/em/if_em.c#23 integrate
.. //depot/projects/trustedbsd/base/sys/dev/em/if_em.h#16 integrate
.. //depot/projects/trustedbsd/base/sys/dev/em/if_em_osdep.h#12 integrate
.. //depot/projects/trustedbsd/base/sys/dev/en/if_en_pci.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/dev/en/midway.c#16 integrate
.. //depot/projects/trustedbsd/base/sys/dev/en/midwayvar.h#7 integrate
.. //depot/projects/trustedbsd/base/sys/dev/fatm/if_fatm.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/dev/firewire/firewire.c#19 integrate
.. //depot/projects/trustedbsd/base/sys/dev/firewire/firewire.h#8 integrate
.. //depot/projects/trustedbsd/base/sys/dev/firewire/firewirereg.h#12 integrate
.. //depot/projects/trustedbsd/base/sys/dev/firewire/fwdev.c#9 integrate
.. //depot/projects/trustedbsd/base/sys/dev/firewire/fwohci.c#17 integrate
.. //depot/projects/trustedbsd/base/sys/dev/firewire/fwohci_pci.c#14 integrate
.. //depot/projects/trustedbsd/base/sys/dev/firewire/if_fwe.c#13 integrate
.. //depot/projects/trustedbsd/base/sys/dev/fxp/if_fxp.c#30 integrate
.. //depot/projects/trustedbsd/base/sys/dev/hatm/if_hatm_ioctl.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/dev/hatm/if_hatm_rx.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/dev/hatm/if_hatm_tx.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/dev/hatm/if_hatmvar.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ie/if_ievar.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/dev/md/md.c#29 integrate
.. //depot/projects/trustedbsd/base/sys/dev/patm/if_patm_ioctl.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/dev/patm/if_patm_rx.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/dev/patm/if_patm_tx.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/dev/patm/if_patmvar.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/dev/pci/pci.c#25 integrate
.. //depot/projects/trustedbsd/base/sys/dev/pci/pcireg.h#4 integrate
.. //depot/projects/trustedbsd/base/sys/dev/puc/pucdata.c#13 integrate
.. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/feeder.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/feeder.h#4 integrate
.. //depot/projects/trustedbsd/base/sys/dev/sym/sym_fw.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/dev/twe/twe.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/dev/twe/twe_compat.h#5 integrate
.. //depot/projects/trustedbsd/base/sys/dev/twe/twe_freebsd.c#14 integrate
.. //depot/projects/trustedbsd/base/sys/dev/twe/twe_tables.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/dev/twe/tweio.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/dev/twe/twereg.h#4 integrate
.. //depot/projects/trustedbsd/base/sys/dev/twe/twevar.h#4 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/umass.c#28 integrate
.. //depot/projects/trustedbsd/base/sys/fs/specfs/spec_vnops.c#22 integrate
.. //depot/projects/trustedbsd/base/sys/geom/geom_dev.c#30 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/busdma_machdep.c#15 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/critical.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/exception.s#8 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/identcpu.c#20 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/pmap.c#40 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/sys_machdep.c#16 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/tsc.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/i386/include/clock.h#4 integrate
.. //depot/projects/trustedbsd/base/sys/i386/include/critical.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/i386/include/endian.h#9 integrate
.. //depot/projects/trustedbsd/base/sys/i386/include/sysarch.h#5 integrate
.. //depot/projects/trustedbsd/base/sys/i386/isa/clock.c#18 integrate
.. //depot/projects/trustedbsd/base/sys/i386/isa/cxreg.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/i386/isa/if_rdp.c#10 integrate
.. //depot/projects/trustedbsd/base/sys/i386/isa/spic.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/i386/isa/wt.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/i386/pci/pci_bus.c#18 integrate
.. //depot/projects/trustedbsd/base/sys/i386/pci/pci_cfgreg.c#16 integrate
.. //depot/projects/trustedbsd/base/sys/ia64/ia64/clock.c#10 integrate
.. //depot/projects/trustedbsd/base/sys/ia64/ia64/critical.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/ia64/ia64/exception.S#2 integrate
.. //depot/projects/trustedbsd/base/sys/ia64/ia64/genassym.c#13 integrate
.. //depot/projects/trustedbsd/base/sys/ia64/ia64/interrupt.c#15 integrate
.. //depot/projects/trustedbsd/base/sys/ia64/ia64/machdep.c#39 integrate
.. //depot/projects/trustedbsd/base/sys/ia64/ia64/mp_machdep.c#19 integrate
.. //depot/projects/trustedbsd/base/sys/ia64/ia64/timerreg.h#2 delete
.. //depot/projects/trustedbsd/base/sys/ia64/include/clock.h#5 integrate
.. //depot/projects/trustedbsd/base/sys/ia64/include/cpu.h#9 integrate
.. //depot/projects/trustedbsd/base/sys/ia64/include/critical.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/ia64/include/endian.h#7 integrate
.. //depot/projects/trustedbsd/base/sys/ia64/include/pcpu.h#4 integrate
.. //depot/projects/trustedbsd/base/sys/ia64/include/ucontext.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_acl.c#15 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_descrip.c#43 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_fork.c#35 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_ktr.c#14 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_physio.c#9 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_proc.c#37 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_thread.c#31 integrate
.. //depot/projects/trustedbsd/base/sys/kern/subr_trap.c#26 integrate
.. //depot/projects/trustedbsd/base/sys/kern/subr_witness.c#38 integrate
.. //depot/projects/trustedbsd/base/sys/kern/sys_process.c#15 integrate
.. //depot/projects/trustedbsd/base/sys/kern/uipc_socket.c#34 integrate
.. //depot/projects/trustedbsd/base/sys/kern/uipc_syscalls.c#32 integrate
.. //depot/projects/trustedbsd/base/sys/kern/vfs_bio.c#34 integrate
.. //depot/projects/trustedbsd/base/sys/kern/vfs_syscalls.c#47 integrate
.. //depot/projects/trustedbsd/base/sys/modules/en/Makefile#3 integrate
.. //depot/projects/trustedbsd/base/sys/modules/ep/Makefile#3 integrate
.. //depot/projects/trustedbsd/base/sys/net/bpf.c#20 integrate
.. //depot/projects/trustedbsd/base/sys/net/bpfdesc.h#6 integrate
.. //depot/projects/trustedbsd/base/sys/net/if_atm.h#10 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/if_atm.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/ip_mroute.c#17 integrate
.. //depot/projects/trustedbsd/base/sys/netinet6/nd6.c#9 integrate
.. //depot/projects/trustedbsd/base/sys/netinet6/nd6.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/netinet6/nd6_rtr.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/netnatm/natm.c#12 integrate
.. //depot/projects/trustedbsd/base/sys/netnatm/natm.h#4 integrate
.. //depot/projects/trustedbsd/base/sys/netnatm/natm_pcb.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/netnatm/natm_proto.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/pc98/pc98/ppc.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/pc98/pc98/sio.c#23 integrate
.. //depot/projects/trustedbsd/base/sys/pci/if_ti.c#21 integrate
.. //depot/projects/trustedbsd/base/sys/powerpc/include/critical.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/powerpc/include/endian.h#7 integrate
.. //depot/projects/trustedbsd/base/sys/powerpc/powerpc/critical.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/powerpc/powerpc/pmap.c#22 integrate
.. //depot/projects/trustedbsd/base/sys/sparc64/include/critical.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/critical.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/sys/acl.h#6 integrate
.. //depot/projects/trustedbsd/base/sys/sys/buf.h#16 integrate
.. //depot/projects/trustedbsd/base/sys/sys/kse.h#15 integrate
.. //depot/projects/trustedbsd/base/sys/sys/param.h#29 integrate
.. //depot/projects/trustedbsd/base/sys/sys/proc.h#45 integrate
.. //depot/projects/trustedbsd/base/sys/sys/socketvar.h#28 integrate
.. //depot/projects/trustedbsd/base/sys/ufs/ufs/acl.h#4 integrate
.. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufs_acl.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufs_vnops.c#31 integrate
.. //depot/projects/trustedbsd/base/sys/vm/default_pager.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/vm/device_pager.c#11 integrate
.. //depot/projects/trustedbsd/base/sys/vm/phys_pager.c#10 integrate
.. //depot/projects/trustedbsd/base/sys/vm/swap_pager.c#23 integrate
.. //depot/projects/trustedbsd/base/sys/vm/swap_pager.h#12 integrate
.. //depot/projects/trustedbsd/base/sys/vm/uma_core.c#25 integrate
.. //depot/projects/trustedbsd/base/sys/vm/vm_glue.c#30 integrate
.. //depot/projects/trustedbsd/base/sys/vm/vm_kern.c#19 integrate
.. //depot/projects/trustedbsd/base/sys/vm/vm_object.c#39 integrate
.. //depot/projects/trustedbsd/base/sys/vm/vm_pageout.c#26 integrate
.. //depot/projects/trustedbsd/base/sys/vm/vm_pageout.h#9 integrate
.. //depot/projects/trustedbsd/base/sys/vm/vm_pager.c#13 integrate
.. //depot/projects/trustedbsd/base/sys/vm/vm_pager.h#7 integrate
.. //depot/projects/trustedbsd/base/sys/vm/vnode_pager.c#26 integrate
.. //depot/projects/trustedbsd/base/tools/tools/README#10 integrate
.. //depot/projects/trustedbsd/base/tools/tools/hcomp/Makefile#1 branch
.. //depot/projects/trustedbsd/base/tools/tools/hcomp/hcomp.pl#1 branch
.. //depot/projects/trustedbsd/base/tools/tools/tinderbox/etc/experimental.rc#2 integrate
.. //depot/projects/trustedbsd/base/tools/tools/tinderbox/powerpc.diff#1 branch
.. //depot/projects/trustedbsd/base/tools/tools/tinderbox/tbmaster.1#4 integrate
.. //depot/projects/trustedbsd/base/tools/tools/tinderbox/tbmaster.pl#12 integrate
.. //depot/projects/trustedbsd/base/tools/tools/tinderbox/www/index.cgi#4 integrate
.. //depot/projects/trustedbsd/base/usr.bin/calendar/calendars/calendar.birthday#9 integrate
.. //depot/projects/trustedbsd/base/usr.bin/jot/jot.c#6 integrate
.. //depot/projects/trustedbsd/base/usr.bin/netstat/mroute.c#3 integrate
.. //depot/projects/trustedbsd/base/usr.bin/quota/quota.c#7 integrate
.. //depot/projects/trustedbsd/base/usr.bin/systat/Makefile#5 integrate
.. //depot/projects/trustedbsd/base/usr.bin/systat/cmdtab.c#4 integrate
.. //depot/projects/trustedbsd/base/usr.bin/systat/extern.h#5 integrate
.. //depot/projects/trustedbsd/base/usr.bin/systat/icmp6.c#1 branch
.. //depot/projects/trustedbsd/base/usr.bin/systat/ip6.c#1 branch
.. //depot/projects/trustedbsd/base/usr.bin/systat/netstat.c#5 integrate
.. //depot/projects/trustedbsd/base/usr.bin/systat/systat.1#8 integrate
.. //depot/projects/trustedbsd/base/usr.bin/tr/extern.h#4 integrate
.. //depot/projects/trustedbsd/base/usr.bin/tr/str.c#7 integrate
.. //depot/projects/trustedbsd/base/usr.bin/tr/tr.1#6 integrate
.. //depot/projects/trustedbsd/base/usr.bin/tr/tr.c#9 integrate
.. //depot/projects/trustedbsd/base/usr.bin/truss/ia64-fbsd.c#4 integrate
.. //depot/projects/trustedbsd/base/usr.bin/truss/syscalls.c#11 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/acpi/acpidump/acpi.c#5 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/acpi/acpidump/acpidump.h#6 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/amd/include/newvers.sh#2 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/fwcontrol/fwcontrol.8#7 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/fwcontrol/fwcontrol.c#7 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/mergemaster/mergemaster.sh#12 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/named/Makefile.maninc#3 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/ndp/ndp.8#4 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/ndp/ndp.c#3 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/newsyslog/newsyslog.c#16 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/pccard/pccardd/cardd.h#5 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/lib/match.c#5 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/config.c#14 integrate
Differences ...
==== //depot/projects/trustedbsd/base/MAINTAINERS#21 (text+ko) ====
@@ -1,4 +1,4 @@
-$FreeBSD: src/MAINTAINERS,v 1.76 2003/07/30 10:43:13 bp Exp $
+$FreeBSD: src/MAINTAINERS,v 1.77 2003/08/01 17:54:11 mbr Exp $
subsystem login notes
-----------------------------
@@ -44,7 +44,7 @@
Keep in sync with -STABLE.
etc/sendmail gshapiro Pre-commit review requested.
Keep in sync with -STABLE.
-dhcp murray Needs to pre-approve commits to contrib/isc-dhcp, so
+dhcp mbr Needs to pre-approve commits to contrib/isc-dhcp, so
changes can be made to the isc.org CVS repository.
RELENG_4_* security-officer Requires Security Officer approval.
libfetch des Advance notification requested.
==== //depot/projects/trustedbsd/base/Makefile#26 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile,v 1.286 2003/07/20 12:38:29 ru Exp $
+# $FreeBSD: src/Makefile,v 1.287 2003/08/06 11:06:38 ru Exp $
#
# The user-driven targets are:
#
@@ -105,7 +105,7 @@
#
world: upgrade_checks
@echo "--------------------------------------------------------------"
- @echo ">>> elf make world started on ${STARTTIME}"
+ @echo ">>> make world started on ${STARTTIME}"
@echo "--------------------------------------------------------------"
.if target(pre-world)
@echo
@@ -125,7 +125,8 @@
.endif
@echo
@echo "--------------------------------------------------------------"
- @printf ">>> elf make world completed on `LC_ALL=C date`\n (started ${STARTTIME})\n"
+ @echo ">>> make world completed on `LC_ALL=C date`"
+ @echo " (started ${STARTTIME})"
@echo "--------------------------------------------------------------"
#
@@ -198,7 +199,8 @@
.endfor
.endfor
@echo "--------------------------------------------------------------"
- @printf ">>> make universe completed on `LC_ALL=C date`\n (started ${STARTTIME})\n"
+ @echo ">>> make universe completed on `LC_ALL=C date`"
+ @echo " (started ${STARTTIME})"
@echo "--------------------------------------------------------------"
KERNCONFS!= cd ${.CURDIR}/sys/${TARGET}/conf && \
==== //depot/projects/trustedbsd/base/bin/ps/ps.1#15 (text+ko) ====
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)ps.1 8.3 (Berkeley) 4/18/94
-.\" $FreeBSD: src/bin/ps/ps.1,v 1.63 2003/06/12 16:53:55 scottl Exp $
+.\" $FreeBSD: src/bin/ps/ps.1,v 1.64 2003/08/05 10:31:28 brueffer Exp $
.\"
.Dd April 18, 1994
.Dt PS 1
@@ -262,9 +262,9 @@
displayed using the ``%a6.15p'' format.
Otherwise, the start time is displayed using the ``%e%b%y'' format.
.It state
-The state is given by a sequence of letters, for example,
+The state is given by a sequence of characters, for example,
.Dq Tn RWNA .
-The first letter indicates the run state of the process:
+The first character indicates the run state of the process:
.Pp
.Bl -tag -width indent -compact
.It D
==== //depot/projects/trustedbsd/base/bin/sh/expand.c#12 (text+ko) ====
@@ -40,7 +40,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.44 2003/07/05 15:18:44 dds Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.45 2003/08/03 04:28:10 ache Exp $");
#include <sys/types.h>
#include <sys/time.h>
@@ -116,20 +116,13 @@
STATIC int collate_range_cmp(int, int);
STATIC int
-collate_range_cmp (int c1, int c2)
+collate_range_cmp(int c1, int c2)
{
static char s1[2], s2[2];
- int ret;
- c1 &= UCHAR_MAX;
- c2 &= UCHAR_MAX;
- if (c1 == c2)
- return (0);
s1[0] = c1;
s2[0] = c2;
- if ((ret = strcoll(s1, s2)) != 0)
- return (ret);
- return (c1 - c2);
+ return (strcoll(s1, s2));
}
/*
==== //depot/projects/trustedbsd/base/contrib/isc-dhcp/client/dhclient.c#8 (text+ko) ====
@@ -42,7 +42,7 @@
#ifndef lint
static char ocopyright[] =
"$Id: dhclient.c,v 1.129.2.12 2002/11/07 23:26:38 dhankins Exp $ Copyright (c) 1995-2002 Internet Software Consortium. All rights reserved.\n"
-"$FreeBSD: src/contrib/isc-dhcp/client/dhclient.c,v 1.27 2003/07/28 13:25:04 mbr Exp $\n";
+"$FreeBSD: src/contrib/isc-dhcp/client/dhclient.c,v 1.28 2003/08/06 15:19:52 mbr Exp $\n";
#endif /* not lint */
#include "dhcpd.h"
@@ -217,7 +217,7 @@
} else if (!strcmp (argv [i], "-i")) {
if (++i == argc)
usage ();
- polling_interval = (int)strtol(argv [i],
+ polling_interval = (int)strtol (argv [i],
(char **)NULL, 10);
if (polling_interval <= 0) {
log_info ("Incorrect polling interval %d",
@@ -257,8 +257,8 @@
log_fatal ("%s: interface name too long (max %ld)",
argv [i], (long)strlen (argv [i]));
strlcpy (tmp -> name, argv [i], IFNAMSIZ);
- set_ieee802(tmp);
- tmp->linkstatus = interface_active(tmp);
+ set_ieee80211 (tmp);
+ tmp -> linkstatus = interface_active (tmp);
if (interfaces) {
interface_reference (&tmp -> next,
interfaces, MDL);
@@ -286,16 +286,16 @@
/* first kill of any currently running client */
if (release_mode) {
- if ((pidfd = fopen(path_dhclient_pid, "r")) != NULL) {
- e = fscanf(pidfd, "%d", &oldpid);
+ if ((pidfd = fopen (path_dhclient_pid, "r")) != NULL) {
+ e = fscanf (pidfd, "%d", &oldpid);
if (e != 0 && e != EOF) {
if (oldpid) {
- if (kill(oldpid, SIGKILL) == 0)
- unlink(path_dhclient_pid);
+ if (kill (oldpid, SIGKILL) == 0)
+ unlink (path_dhclient_pid);
}
}
- fclose(pidfd);
+ fclose (pidfd);
}
}
@@ -412,7 +412,7 @@
INTERFACE_AUTOMATIC)) !=
INTERFACE_REQUESTED))
continue;
- set_ieee802(ip);
+ set_ieee80211 (ip);
script_init (ip -> client,
"PREINIT", (struct string_list *)0);
if (ip -> client -> alias)
@@ -459,7 +459,7 @@
add_timeout (cur_time + random () % 5,
state_link, client, 0, 0);
#else
- add_timeout(cur_time + random () % 5,
+ add_timeout (cur_time + random () % 5,
state_reboot, client, 0, 0);
#endif
}
@@ -1385,7 +1385,7 @@
int interval;
int increase = 1;
- if (interface_active(client -> interface) == 0)
+ if (interface_active (client -> interface) == 0)
return;
/* Figure out how long it's been since we started transmitting. */
@@ -1493,7 +1493,7 @@
struct client_lease *loop;
struct client_lease *lp;
- if (interface_active(client -> interface) == 0)
+ if (interface_active (client -> interface) == 0)
return;
loop = lp = client -> active;
@@ -2809,8 +2809,8 @@
break;
}
client -> state = S_INIT;
- if (interface_active(ip))
- state_reboot(client);
+ if (interface_active (ip))
+ state_reboot (client);
}
}
}
@@ -2971,8 +2971,8 @@
client -> state = S_INIT;
/* Set up a timeout to start the initialization
process. */
- if (interface_active(ip)) {
- add_timeout(cur_time + random () % 5,
+ if (interface_active (ip)) {
+ add_timeout (cur_time + random () % 5,
state_reboot, client, 0, 0);
}
}
@@ -3038,8 +3038,8 @@
break;
case server_awaken:
- if (interface_active(ip))
- state_reboot(client);
+ if (interface_active (ip))
+ state_reboot (client);
break;
}
}
@@ -3188,32 +3188,32 @@
ifname = ip -> name;
- if ((sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0)
- log_fatal("Can't create interface_active socket");
+ if ((sock = socket (AF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0)
+ log_fatal ("Can't create interface_active socket");
- (void) memset(&ifmr, 0, sizeof(ifmr));
- (void) strncpy(ifmr.ifm_name, ifname, sizeof(ifmr.ifm_name));
+ (void) memset (&ifmr, 0, sizeof (ifmr));
+ (void) strncpy (ifmr.ifm_name, ifname, sizeof (ifmr.ifm_name));
- if (ioctl(sock, SIOCGIFMEDIA, (caddr_t)&ifmr) < 0) {
+ if (ioctl (sock, SIOCGIFMEDIA, (caddr_t)&ifmr) < 0) {
/*
* Interface doesn't support SIOCGIFMEDIA, presume okay
*/
- close(sock);
+ close (sock);
return (1);
}
- close(sock);
+ close (sock);
if (ifmr.ifm_count == 0) {
/*
* this is unexpected (to me), but we'll just assume
* that this means interface does not support SIOCGIFMEDIA
*/
- log_fatal("%s: no media types?", ifname);
+ log_fatal ("%s: no media types?", ifname);
return (1);
}
if (ifmr.ifm_status & IFM_AVALID) {
- if (ip->ieee802) {
+ if (ip -> ieee80211) {
if ((IFM_TYPE(ifmr.ifm_active) == IFM_IEEE80211) &&
(ifmr.ifm_status & IFM_ACTIVE))
return (1);
@@ -3231,7 +3231,7 @@
}
#ifdef __FreeBSD__
-set_ieee802 (struct interface_info *ip) {
+set_ieee80211 (struct interface_info *ip) {
struct ieee80211req ireq;
u_int8_t data[32];
@@ -3242,11 +3242,11 @@
ifname = ip -> name;
- if ((sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0)
- log_fatal("Can't create interface_active socket");
+ if ((sock = socket (AF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0)
+ log_fatal ("Can't create interface_active socket");
- (void) memset(&ireq, 0, sizeof(ireq));
- (void) strncpy(ireq.i_name, ifname, sizeof(ireq.i_name));
+ (void) memset (&ireq, 0, sizeof (ireq));
+ (void) strncpy (ireq.i_name, ifname, sizeof (ireq.i_name));
ireq.i_data = &data;
ireq.i_type = IEEE80211_IOC_SSID;
ireq.i_val = -1;
@@ -3254,15 +3254,15 @@
* If we can't get the SSID,
* this isn't an 802.11 device.
*/
- if (ioctl(sock, SIOCG80211, &ireq) < 0)
- ip->ieee802 = 0;
+ if (ioctl (sock, SIOCG80211, &ireq) < 0)
+ ip -> ieee80211 = 0;
else {
#ifdef DEBUG
- printf("Device %s has 802.11\n", ifname);
+ printf ("Device %s has 802.11\n", ifname);
#endif
- ip->ieee802 = 1;
+ ip -> ieee80211 = 1;
}
- close(sock);
+ close (sock);
}
#endif /* __FreeBSD__ */
@@ -3275,29 +3275,29 @@
struct client_state *client;
#ifdef DEBUG
- printf("Polling interface status\n");
+ printf ("Polling interface status\n");
#endif
for (ip = interfaces; ip; ip = ip -> next) {
- if (ip->linkstatus == 0 || doinitcheck == 0) {
- if (interface_active(ip)) {
+ if (ip -> linkstatus == 0 || doinitcheck == 0) {
+ if (interface_active (ip)) {
#ifdef DEBUG
- printf("%s: Found Link on interface\n", ip->name);
+ printf ("%s: Found Link on interface\n", ip -> name);
#endif
for (client = ip -> client;
client; client = client -> next) {
- add_timeout(cur_time + random () % 5,
+ add_timeout (cur_time + random () % 5,
state_reboot, client, 0, 0);
}
- ip->linkstatus = 1;
+ ip -> linkstatus = 1;
} else {
#ifdef DEBUG
- printf("%s: No Link on interface\n", ip->name);
+ printf ("%s: No Link on interface\n", ip -> name);
#endif
for (client = ip -> client;
client; client = client -> next) {
- cancel_timeout(state_init, client);
- cancel_timeout(send_discover, client);
- cancel_timeout(send_request, client);
+ cancel_timeout (state_init, client);
+ cancel_timeout (send_discover, client);
+ cancel_timeout (send_request, client);
/*
* XXX without this, dhclient does
* not poll on a interface if there
@@ -3305,18 +3305,18 @@
* time
*/
if (client -> state == S_INIT) {
- add_timeout(cur_time + polling_interval,
+ add_timeout (cur_time + polling_interval,
state_link, client, 0, 0);
}
}
- ip->linkstatus = 0;
+ ip -> linkstatus = 0;
}
} else {
- if (interface_active(ip) == 0) {
+ if (interface_active (ip) == 0) {
#ifdef DEBUG
- printf("%s: Lost Link on interface\n", ip->name);
+ printf ("%s: Lost Link on interface\n", ip -> name);
#endif
- ip->linkstatus = 0;
+ ip -> linkstatus = 0;
}
}
}
==== //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/dhcpd.h#7 (text+ko) ====
@@ -40,7 +40,7 @@
* see ``http://www.vix.com''. To learn more about Nominum, Inc., see
* ``http://www.nominum.com''.
*
- * $FreeBSD: src/contrib/isc-dhcp/includes/dhcpd.h,v 1.3 2003/07/28 11:49:07 mbr Exp $
+ * $FreeBSD: src/contrib/isc-dhcp/includes/dhcpd.h,v 1.4 2003/08/06 15:19:52 mbr Exp $
*/
#ifndef __CYGWIN32__
@@ -781,7 +781,7 @@
char name [IFNAMSIZ]; /* Its name... */
int linkstatus; /* Link status */
- int ieee802; /* True if media is ieee802 */
+ int ieee80211; /* True if media is ieee80211 */
int index; /* Its index. */
int rfdesc; /* Its read file descriptor. */
int wfdesc; /* Its write file descriptor, if
==== //depot/projects/trustedbsd/base/etc/mtree/BSD.local.dist#18 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.99 2003/07/29 08:02:26 ache Exp $
+# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.100 2003/08/05 05:42:07 mtm Exp $
#
# Please see the file src/etc/mtree/README before making changes to this file.
#
@@ -277,6 +277,8 @@
..
af_ZA.ISO8859-15
..
+ am_ET.UTF-8
+ ..
bg_BG.CP1251
..
ca_ES.ISO8859-1
==== //depot/projects/trustedbsd/base/etc/mtree/BSD.usr.dist#28 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.277 2003/07/29 08:02:26 ache Exp $
+# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.278 2003/08/05 05:42:07 mtm Exp $
#
# Please see the file src/etc/mtree/README before making changes to this file.
#
@@ -337,6 +337,8 @@
..
af_ZA.ISO8859-15
..
+ am_ET.UTF-8
+ ..
bg_BG.CP1251
..
ca_ES.ISO8859-1
@@ -667,6 +669,8 @@
..
af_ZA.ISO8859-15
..
+ am_ET.UTF-8
+ ..
bg_BG.CP1251
..
ca_ES.ISO8859-1
==== //depot/projects/trustedbsd/base/etc/rc.d/Makefile#13 (text+ko) ====
@@ -1,5 +1,5 @@
# $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $
-# $FreeBSD: src/etc/rc.d/Makefile,v 1.23 2003/07/30 20:05:20 mtm Exp $
+# $FreeBSD: src/etc/rc.d/Makefile,v 1.24 2003/08/06 00:35:13 mtm Exp $
.include <bsd.own.mk>
@@ -19,7 +19,7 @@
ipnat ipsec ipxrouted isdnd \
jail \
kadmind kerberos keyserv kldxref kpasswdd \
- ldconfig local localdaemons lomac lpd \
+ ldconfig local localdaemons localpkg lomac lpd \
motd mountcritlocal mountcritremote \
mountd moused mroute6d mrouted msgs \
named netif netoptions \
==== //depot/projects/trustedbsd/base/etc/rc.d/localdaemons#3 (text+ko) ====
@@ -1,12 +1,12 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/localdaemons,v 1.2 2003/05/05 15:38:41 mtm Exp $
+# $FreeBSD: src/etc/rc.d/localdaemons,v 1.3 2003/08/06 00:35:13 mtm Exp $
#
# PROVIDE: localdaemons
# REQUIRE: abi
# BEFORE: securelevel
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: FreeBSD nostart
. /etc/rc.subr
==== //depot/projects/trustedbsd/base/etc/rc.d/netoptions#2 (text+ko) ====
@@ -1,10 +1,10 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/netoptions,v 1.138 2003/06/29 05:09:48 mtm Exp $
+# $FreeBSD: src/etc/rc.d/netoptions,v 1.139 2003/08/06 00:35:13 mtm Exp $
#
# PROVIDE: netoptions
-# REQUIRE: localdaemons
+# REQUIRE: localpkg
# BEFORE: securelevel
# KEYWORD: FreeBSD
==== //depot/projects/trustedbsd/base/games/fortune/datfiles/Makefile#5 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.2 (Berkeley) 4/19/94
-# $FreeBSD: src/games/fortune/datfiles/Makefile,v 1.30 2003/06/19 07:02:00 murray Exp $
+# $FreeBSD: src/games/fortune/datfiles/Makefile,v 1.32 2003/08/04 21:31:53 ache Exp $
FILES= fortunes fortunes2 freebsd-tips murphy startrek zippy
BLDS= fortunes.dat fortunes2.dat murphy.dat startrek.dat zippy.dat \
@@ -37,6 +37,6 @@
strfile -Csx ${.ALLSRC} ${.TARGET}
fortunes-o: fortunes-o.${TYPE}
- tr a-zA-Z n-za-mN-ZA-M < ${.ALLSRC} > ${.TARGET}
+ LC_ALL=C tr a-zA-Z n-za-mN-ZA-M < ${.ALLSRC} > ${.TARGET}
.include <bsd.prog.mk>
==== //depot/projects/trustedbsd/base/games/fortune/datfiles/freebsd-tips#13 (text+ko) ====
@@ -1,5 +1,5 @@
This fortune brought to you by:
-$FreeBSD: src/games/fortune/datfiles/freebsd-tips,v 1.30 2003/02/15 09:11:25 robert Exp $
+$FreeBSD: src/games/fortune/datfiles/freebsd-tips,v 1.31 2003/08/02 20:36:28 schweikh Exp $
%
Having trouble using fetch through a firewall? Try setting the environment
variable FTP_PASSIVE_MODE to yes, and see fetch(3) for more details.
@@ -439,7 +439,7 @@
"sockstat -4l" for IPv4, and "sockstat -l" for IPv4 and IPv6.
-- Dru <genesis at istar.ca>
%
-Can't remember is you've installed a certain port or not? Try "pkg_info |
+Can't remember if you've installed a certain port or not? Try "pkg_info |
grep port_name".
-- Dru <genesis at istar.ca>
%
@@ -449,7 +449,7 @@
To repeat the last command in the C shell, type "!!".
-- Dru <genesis at istar.ca>
%
-Need to quickly empty a file? Use "echo > filename".
+Need to quickly empty a file? Use ": > filename".
-- Dru <genesis at istar.ca>
%
To see all of the directories on your FreeBSD system, type
@@ -466,10 +466,6 @@
ifconfig -a
-- Dru <genesis at istar.ca>
%
-You can save your kernel startup configuration with kget(8). The
-Configuration can be edited at boot time with 'boot -c' command in loader.
-See boot(8), loader(8) for details.
-%
You can open up a new split-screen window in (n)vi with :N or :E and then
use ^w to switch between the two.
%
==== //depot/projects/trustedbsd/base/games/fortune/strfile/strfile.c#5 (text+ko) ====
@@ -46,7 +46,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/games/fortune/strfile/strfile.c,v 1.22 2003/05/05 09:52:25 obrien Exp $");
+__FBSDID("$FreeBSD: src/games/fortune/strfile/strfile.c,v 1.23 2003/08/03 19:44:36 ache Exp $");
# include <sys/param.h>
# include <arpa/inet.h>
@@ -131,7 +131,7 @@
void add_offset(FILE *, long);
int cmp_str(const void *, const void *);
-static int collate_range_cmp(int, int);
+static int stable_collate_range_cmp(int, int);
void do_order(void);
void getargs(int, char **);
void randomize(void);
@@ -367,16 +367,12 @@
Tbl.str_flags |= STR_ORDERED;
}
-static int collate_range_cmp (c1, c2)
+static int stable_collate_range_cmp(c1, c2)
int c1, c2;
{
static char s1[2], s2[2];
int ret;
- c1 &= UCHAR_MAX;
- c2 &= UCHAR_MAX;
- if (c1 == c2)
- return (0);
s1[0] = c1;
s2[0] = c2;
if ((ret = strcoll(s1, s2)) != 0)
@@ -404,8 +400,8 @@
c1 = (unsigned char) p1->first;
c2 = (unsigned char) p2->first;
- if ((r = collate_range_cmp(c1, c2)) != 0)
- return r;
+ if ((r = stable_collate_range_cmp(c1, c2)) != 0)
+ return (r);
(void) fseek(Sort_1, p1->pos, 0);
(void) fseek(Sort_2, p2->pos, 0);
@@ -424,8 +420,8 @@
if (isupper(c2))
c2 = tolower(c2);
}
- if ((r = collate_range_cmp(c1, c2)) != 0)
- return r;
+ if ((r = stable_collate_range_cmp(c1, c2)) != 0)
+ return (r);
SET_N(n1, c1);
SET_N(n2, c2);
c1 = getc(Sort_1);
@@ -435,7 +431,7 @@
c1 = 0;
if (IS_END(c2, n2))
c2 = 0;
- return collate_range_cmp(c1, c2);
+ return (stable_collate_range_cmp(c1, c2));
}
/*
==== //depot/projects/trustedbsd/base/gnu/lib/libregex/regex.c#2 (text+ko) ====
@@ -19,6 +19,8 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
+/* $FreeBSD: src/gnu/lib/libregex/regex.c,v 1.10 2003/08/03 04:36:09 ache Exp $ */
+
/* AIX requires this to be the first thing in the file. */
#if defined (_AIX) && !defined (REGEX_MALLOC)
#pragma alloca
@@ -1114,19 +1116,14 @@
regnum_t regnum));
#ifdef __FreeBSD__
-static int collate_range_cmp (a, b)
+static int collate_range_cmp(a, b)
int a, b;
{
- int r;
static char s[2][2];
- if ((unsigned char)a == (unsigned char)b)
- return 0;
s[0][0] = a;
s[1][0] = b;
- if ((r = strcoll(s[0], s[1])) == 0)
- r = (unsigned char)a - (unsigned char)b;
- return r;
+ return (strcoll(s[0], s[1]));
}
#endif
==== //depot/projects/trustedbsd/base/gnu/usr.bin/groff/Makefile.inc#4 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/usr.bin/groff/Makefile.inc,v 2.7 2003/05/01 13:22:18 ru Exp $
+# $FreeBSD: src/gnu/usr.bin/groff/Makefile.inc,v 2.9 2003/08/04 21:31:52 ache Exp $
BINDIR?= /usr/bin
SHELL= /bin/sh
@@ -125,7 +125,7 @@
-e "s;@VERSION@;$(version)$(revision);g" \
-e "s;@MDATE@;`$(SHELL) ${GROFF_DIST}/mdate.sh $<`;g" \
-e "s;@g@;$(g);g" \
- -e "s;@G@;`echo $(g) | tr [a-z] [A-Z]`;g" \
+ -e "s;@G@;`echo $(g) | LC_ALL=C tr a-z A-Z`;g" \
$< >$@
.SUFFIXES: .sh .pl
>>> TRUNCATED FOR MAIL (1000 lines) <<<
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message
More information about the trustedbsd-cvs
mailing list