PERFORCE change 65290 for review

Sam Leffler sam at FreeBSD.org
Tue Nov 16 17:55:03 PST 2004


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

Change 65290 by sam at sam_ebb on 2004/11/17 01:54:04

	IFC @ 65289

Affected files ...

.. //depot/projects/wifi/Makefile.inc1#4 integrate
.. //depot/projects/wifi/UPDATING#3 integrate
.. //depot/projects/wifi/bin/pax/tar.c#2 integrate
.. //depot/projects/wifi/bin/ps/Makefile#2 integrate
.. //depot/projects/wifi/bin/ps/ps.c#2 integrate
.. //depot/projects/wifi/bin/rm/rm.c#3 integrate
.. //depot/projects/wifi/contrib/gcc/gcc.1#2 integrate
.. //depot/projects/wifi/contrib/pf/man/pf.conf.5#2 integrate
.. //depot/projects/wifi/etc/defaults/rc.conf#4 integrate
.. //depot/projects/wifi/etc/rc.d/Makefile#4 integrate
.. //depot/projects/wifi/etc/rc.d/ramdisk-own#2 integrate
.. //depot/projects/wifi/etc/rc.d/serial#2 integrate
.. //depot/projects/wifi/games/fortune/datfiles/fortunes2#2 integrate
.. //depot/projects/wifi/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#2 integrate
.. //depot/projects/wifi/include/Makefile#2 integrate
.. //depot/projects/wifi/lib/Makefile#2 integrate
.. //depot/projects/wifi/lib/libarchive/archive_write_set_format_pax.c#3 integrate
.. //depot/projects/wifi/lib/libc/Makefile#3 integrate
.. //depot/projects/wifi/lib/libc/gen/getnetgrent.c#2 integrate
.. //depot/projects/wifi/lib/libc/i386/net/htonl.S#2 integrate
.. //depot/projects/wifi/lib/libc/i386/net/ntohl.S#2 integrate
.. //depot/projects/wifi/lib/libc/net/rcmd.c#2 integrate
.. //depot/projects/wifi/lib/libc/rpc/netnamer.c#2 integrate
.. //depot/projects/wifi/lib/libc/stdlib/rand.3#2 integrate
.. //depot/projects/wifi/lib/libc/sys/read.2#3 integrate
.. //depot/projects/wifi/lib/libc/sys/stat.2#2 integrate
.. //depot/projects/wifi/lib/libdisk/disk.c#2 integrate
.. //depot/projects/wifi/lib/libkvm/kvm_getprocs.3#2 integrate
.. //depot/projects/wifi/lib/libkvm/kvm_proc.c#2 integrate
.. //depot/projects/wifi/lib/libpam/modules/pam_unix/Makefile#2 integrate
.. //depot/projects/wifi/lib/librpcsvc/Makefile#3 integrate
.. //depot/projects/wifi/lib/libwrap/Makefile#2 integrate
.. //depot/projects/wifi/lib/libxpg4/Makefile#3 delete
.. //depot/projects/wifi/lib/libxpg4/fakelib.c#2 delete
.. //depot/projects/wifi/libexec/Makefile#2 integrate
.. //depot/projects/wifi/libexec/ftpd/ftpcmd.y#2 integrate
.. //depot/projects/wifi/libexec/ftpd/ftpd.c#5 integrate
.. //depot/projects/wifi/libexec/ftpd/popen.c#2 integrate
.. //depot/projects/wifi/libexec/rtld-elf/Makefile#4 integrate
.. //depot/projects/wifi/libexec/rtld-elf/alpha/lockdflt.c#2 delete
.. //depot/projects/wifi/libexec/rtld-elf/amd64/lockdflt.c#2 delete
.. //depot/projects/wifi/libexec/rtld-elf/arm/lockdflt.c#2 delete
.. //depot/projects/wifi/libexec/rtld-elf/i386/lockdflt.c#2 delete
.. //depot/projects/wifi/libexec/rtld-elf/ia64/lockdflt.c#2 delete
.. //depot/projects/wifi/libexec/rtld-elf/powerpc/lockdflt.c#2 delete
.. //depot/projects/wifi/libexec/rtld-elf/rtld_lock.c#2 integrate
.. //depot/projects/wifi/libexec/rtld-elf/sparc64/lockdflt.c#2 delete
.. //depot/projects/wifi/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#2 integrate
.. //depot/projects/wifi/release/picobsd/bridge/PICOBSD#2 integrate
.. //depot/projects/wifi/rescue/librescue/Makefile#3 integrate
.. //depot/projects/wifi/sbin/Makefile#4 integrate
.. //depot/projects/wifi/sbin/comcontrol/comcontrol.8#2 integrate
.. //depot/projects/wifi/sbin/fdisk/fdisk.c#2 integrate
.. //depot/projects/wifi/sbin/gpt/create.c#3 integrate
.. //depot/projects/wifi/sbin/gpt/gpt.8#3 integrate
.. //depot/projects/wifi/sbin/gpt/migrate.c#4 integrate
.. //depot/projects/wifi/sbin/mdconfig/mdconfig.c#3 integrate
.. //depot/projects/wifi/sbin/mount_cd9660/mount_cd9660.8#2 integrate
.. //depot/projects/wifi/sbin/mount_cd9660/mount_cd9660.c#2 integrate
.. //depot/projects/wifi/sbin/slattach/slattach.8#2 integrate
.. //depot/projects/wifi/share/examples/etc/make.conf#4 integrate
.. //depot/projects/wifi/share/man/man4/Makefile#4 integrate
.. //depot/projects/wifi/share/man/man4/altq.4#3 integrate
.. //depot/projects/wifi/share/man/man4/gdb.4#3 integrate
.. //depot/projects/wifi/share/man/man4/mouse.4#2 integrate
.. //depot/projects/wifi/share/man/man4/polling.4#2 integrate
.. //depot/projects/wifi/share/man/man4/vkbd.4#1 branch
.. //depot/projects/wifi/share/man/man4/vlan.4#3 integrate
.. //depot/projects/wifi/share/man/man5/make.conf.5#3 integrate
.. //depot/projects/wifi/share/man/man5/rc.conf.5#4 integrate
.. //depot/projects/wifi/share/man/man5/remote.5#2 integrate
.. //depot/projects/wifi/share/man/man7/tuning.7#3 integrate
.. //depot/projects/wifi/share/man/man9/get_cyclecount.9#2 integrate
.. //depot/projects/wifi/share/mk/bsd.cpu.mk#2 integrate
.. //depot/projects/wifi/share/mk/bsd.libnames.mk#2 integrate
.. //depot/projects/wifi/share/mk/bsd.prog.mk#3 integrate
.. //depot/projects/wifi/share/mk/sys.mk#3 integrate
.. //depot/projects/wifi/share/numericdef/eu_ES.ISO8859-1.src#2 integrate
.. //depot/projects/wifi/sys/alpha/conf/GENERIC#3 integrate
.. //depot/projects/wifi/sys/alpha/conf/NOTES#2 integrate
.. //depot/projects/wifi/sys/amd64/amd64/busdma_machdep.c#3 integrate
.. //depot/projects/wifi/sys/arm/arm/busdma_machdep.c#2 integrate
.. //depot/projects/wifi/sys/arm/arm/cpufunc.c#3 integrate
.. //depot/projects/wifi/sys/arm/arm/genassym.c#2 integrate
.. //depot/projects/wifi/sys/arm/arm/intr.c#2 integrate
.. //depot/projects/wifi/sys/arm/arm/irq_dispatch.S#2 integrate
.. //depot/projects/wifi/sys/arm/arm/pmap.c#3 integrate
.. //depot/projects/wifi/sys/arm/conf/IQ31244#4 integrate
.. //depot/projects/wifi/sys/arm/xscale/i80321/i80321.c#2 integrate
.. //depot/projects/wifi/sys/arm/xscale/i80321/iq31244_machdep.c#3 integrate
.. //depot/projects/wifi/sys/boot/common/commands.c#2 integrate
.. //depot/projects/wifi/sys/coda/coda_vnops.c#2 integrate
.. //depot/projects/wifi/sys/compat/linprocfs/linprocfs.c#2 integrate
.. //depot/projects/wifi/sys/compat/svr4/svr4_filio.c#3 integrate
.. //depot/projects/wifi/sys/compat/svr4/svr4_misc.c#2 integrate
.. //depot/projects/wifi/sys/conf/NOTES#5 integrate
.. //depot/projects/wifi/sys/conf/files#6 integrate
.. //depot/projects/wifi/sys/conf/files.i386#3 integrate
.. //depot/projects/wifi/sys/conf/files.sparc64#3 integrate
.. //depot/projects/wifi/sys/conf/kern.post.mk#2 integrate
.. //depot/projects/wifi/sys/conf/options#3 integrate
.. //depot/projects/wifi/sys/conf/options.arm#2 integrate
.. //depot/projects/wifi/sys/conf/options.i386#2 integrate
.. //depot/projects/wifi/sys/conf/options.pc98#2 integrate
.. //depot/projects/wifi/sys/crypto/blowfish/arch/i386/bf_enc.S#2 integrate
.. //depot/projects/wifi/sys/dev/acpi_support/acpi_asus.c#1 branch
.. //depot/projects/wifi/sys/dev/acpi_support/acpi_panasonic.c#1 branch
.. //depot/projects/wifi/sys/dev/acpi_support/acpi_sony.c#1 branch
.. //depot/projects/wifi/sys/dev/acpi_support/acpi_toshiba.c#1 branch
.. //depot/projects/wifi/sys/dev/acpica/acpi_cpu.c#2 integrate
.. //depot/projects/wifi/sys/dev/acpica/acpi_pcib.c#2 integrate
.. //depot/projects/wifi/sys/dev/aha/aha_isa.c#2 integrate
.. //depot/projects/wifi/sys/dev/ata/ata-card.c#2 integrate
.. //depot/projects/wifi/sys/dev/ed/if_ed.c#2 integrate
.. //depot/projects/wifi/sys/dev/ed/if_ed_cbus.c#2 integrate
.. //depot/projects/wifi/sys/dev/em/if_em.c#3 integrate
.. //depot/projects/wifi/sys/dev/em/if_em.h#2 integrate
.. //depot/projects/wifi/sys/dev/esp/esp_sbus.c#2 integrate
.. //depot/projects/wifi/sys/dev/esp/lsi64854.c#2 delete
.. //depot/projects/wifi/sys/dev/esp/lsi64854reg.h#2 delete
.. //depot/projects/wifi/sys/dev/esp/lsi64854var.h#2 delete
.. //depot/projects/wifi/sys/dev/firewire/fwmem.c#2 integrate
.. //depot/projects/wifi/sys/dev/mc146818/mc146818reg.h#1 branch
.. //depot/projects/wifi/sys/dev/md/md.c#3 integrate
.. //depot/projects/wifi/sys/dev/pbio/pbio.c#2 integrate
.. //depot/projects/wifi/sys/dev/pci/pci.c#3 integrate
.. //depot/projects/wifi/sys/dev/puc/puc_sbus.c#2 integrate
.. //depot/projects/wifi/sys/dev/sound/pci/maestro.c#2 integrate
.. //depot/projects/wifi/sys/dev/sound/pci/maestro_reg.h#2 integrate
.. //depot/projects/wifi/sys/dev/streams/streams.c#2 integrate
.. //depot/projects/wifi/sys/dev/uart/uart_bus.h#2 integrate
.. //depot/projects/wifi/sys/dev/uart/uart_core.c#2 integrate
.. //depot/projects/wifi/sys/dev/uart/uart_dev_ns8250.c#2 integrate
.. //depot/projects/wifi/sys/dev/uart/uart_subr.c#2 integrate
.. //depot/projects/wifi/sys/dev/usb/ehci.c#4 integrate
.. //depot/projects/wifi/sys/dev/usb/ohci.c#2 integrate
.. //depot/projects/wifi/sys/dev/usb/uhci.c#3 integrate
.. //depot/projects/wifi/sys/dev/usb/umass.c#2 integrate
.. //depot/projects/wifi/sys/dev/usb/usb_port.h#2 integrate
.. //depot/projects/wifi/sys/dev/vkbd/vkbd.c#1 branch
.. //depot/projects/wifi/sys/dev/vkbd/vkbd_var.h#1 branch
.. //depot/projects/wifi/sys/fs/autofs/autofs.h#2 delete
.. //depot/projects/wifi/sys/fs/autofs/autofs_util.c#2 delete
.. //depot/projects/wifi/sys/fs/autofs/autofs_vfsops.c#2 delete
.. //depot/projects/wifi/sys/fs/autofs/autofs_vnops.c#2 delete
.. //depot/projects/wifi/sys/fs/deadfs/dead_vnops.c#2 integrate
.. //depot/projects/wifi/sys/fs/devfs/devfs_vfsops.c#3 integrate
.. //depot/projects/wifi/sys/fs/devfs/devfs_vnops.c#5 integrate
.. //depot/projects/wifi/sys/fs/fdescfs/fdesc_vfsops.c#2 integrate
.. //depot/projects/wifi/sys/fs/fdescfs/fdesc_vnops.c#2 integrate
.. //depot/projects/wifi/sys/fs/fifofs/fifo_vnops.c#3 integrate
.. //depot/projects/wifi/sys/fs/hpfs/hpfs_vfsops.c#3 integrate
.. //depot/projects/wifi/sys/fs/hpfs/hpfs_vnops.c#3 integrate
.. //depot/projects/wifi/sys/fs/msdosfs/msdosfs_vfsops.c#4 integrate
.. //depot/projects/wifi/sys/fs/msdosfs/msdosfs_vnops.c#3 integrate
.. //depot/projects/wifi/sys/fs/ntfs/ntfs_vfsops.c#4 integrate
.. //depot/projects/wifi/sys/fs/ntfs/ntfs_vnops.c#3 integrate
.. //depot/projects/wifi/sys/fs/nullfs/null_vfsops.c#2 integrate
.. //depot/projects/wifi/sys/fs/nwfs/nwfs_vfsops.c#2 integrate
.. //depot/projects/wifi/sys/fs/portalfs/portal_vfsops.c#2 integrate
.. //depot/projects/wifi/sys/fs/smbfs/smbfs_vfsops.c#2 integrate
.. //depot/projects/wifi/sys/fs/udf/udf_vnops.c#3 integrate
.. //depot/projects/wifi/sys/fs/umapfs/umap_vfsops.c#2 integrate
.. //depot/projects/wifi/sys/fs/unionfs/union_subr.c#2 integrate
.. //depot/projects/wifi/sys/fs/unionfs/union_vfsops.c#2 integrate
.. //depot/projects/wifi/sys/fs/unionfs/union_vnops.c#3 integrate
.. //depot/projects/wifi/sys/geom/geom.h#3 integrate
.. //depot/projects/wifi/sys/geom/geom_event.c#2 integrate
.. //depot/projects/wifi/sys/geom/mirror/g_mirror.c#3 integrate
.. //depot/projects/wifi/sys/geom/raid3/g_raid3.c#3 integrate
.. //depot/projects/wifi/sys/geom/vinum/geom_vinum.h#2 integrate
.. //depot/projects/wifi/sys/geom/vinum/geom_vinum_raid5.c#2 integrate
.. //depot/projects/wifi/sys/geom/vinum/geom_vinum_share.c#2 integrate
.. //depot/projects/wifi/sys/geom/vinum/geom_vinum_share.h#2 integrate
.. //depot/projects/wifi/sys/geom/vinum/geom_vinum_subr.c#2 integrate
.. //depot/projects/wifi/sys/gnu/ext2fs/ext2_bmap.c#4 integrate
.. //depot/projects/wifi/sys/i386/acpica/acpi_asus.c#4 delete
.. //depot/projects/wifi/sys/i386/acpica/acpi_panasonic.c#3 delete
.. //depot/projects/wifi/sys/i386/acpica/acpi_toshiba.c#2 delete
.. //depot/projects/wifi/sys/i386/conf/NOTES#3 integrate
.. //depot/projects/wifi/sys/i386/i386/autoconf.c#2 integrate
.. //depot/projects/wifi/sys/i386/i386/identcpu.c#2 integrate
.. //depot/projects/wifi/sys/i386/i386/machdep.c#4 integrate
.. //depot/projects/wifi/sys/i386/i386/mp_machdep.c#3 integrate
.. //depot/projects/wifi/sys/i386/i386/pmap.c#3 integrate
.. //depot/projects/wifi/sys/i386/i386/support.s#2 integrate
.. //depot/projects/wifi/sys/i386/i386/trap.c#2 integrate
.. //depot/projects/wifi/sys/i386/include/atomic.h#2 integrate
.. //depot/projects/wifi/sys/i386/include/cpu.h#2 integrate
.. //depot/projects/wifi/sys/i386/include/endian.h#2 integrate
.. //depot/projects/wifi/sys/i386/isa/pbio.c#2 delete
.. //depot/projects/wifi/sys/ia64/conf/GENERIC.hints#2 integrate
.. //depot/projects/wifi/sys/isofs/cd9660/cd9660_bmap.c#3 integrate
.. //depot/projects/wifi/sys/isofs/cd9660/cd9660_vfsops.c#3 integrate
.. //depot/projects/wifi/sys/kern/kern_descrip.c#3 integrate
.. //depot/projects/wifi/sys/kern/kern_event.c#2 integrate
.. //depot/projects/wifi/sys/kern/kern_exec.c#3 integrate
.. //depot/projects/wifi/sys/kern/kern_fork.c#3 integrate
.. //depot/projects/wifi/sys/kern/kern_intr.c#4 integrate
.. //depot/projects/wifi/sys/kern/kern_sig.c#3 integrate
.. //depot/projects/wifi/sys/kern/sched_ule.c#3 integrate
.. //depot/projects/wifi/sys/kern/sys_generic.c#2 integrate
.. //depot/projects/wifi/sys/kern/sys_pipe.c#3 integrate
.. //depot/projects/wifi/sys/kern/sys_socket.c#2 integrate
.. //depot/projects/wifi/sys/kern/sysv_msg.c#2 integrate
.. //depot/projects/wifi/sys/kern/sysv_sem.c#2 integrate
.. //depot/projects/wifi/sys/kern/sysv_shm.c#2 integrate
.. //depot/projects/wifi/sys/kern/tty.c#3 integrate
.. //depot/projects/wifi/sys/kern/uipc_domain.c#3 integrate
.. //depot/projects/wifi/sys/kern/uipc_syscalls.c#4 integrate
.. //depot/projects/wifi/sys/kern/vfs_cluster.c#5 integrate
.. //depot/projects/wifi/sys/kern/vfs_default.c#5 integrate
.. //depot/projects/wifi/sys/kern/vfs_mount.c#2 integrate
.. //depot/projects/wifi/sys/kern/vfs_subr.c#5 integrate
.. //depot/projects/wifi/sys/kern/vfs_syscalls.c#3 integrate
.. //depot/projects/wifi/sys/kern/vfs_vnops.c#3 integrate
.. //depot/projects/wifi/sys/kern/vnode_if.src#3 integrate
.. //depot/projects/wifi/sys/modules/Makefile#5 integrate
.. //depot/projects/wifi/sys/modules/acpi/Makefile#2 integrate
.. //depot/projects/wifi/sys/modules/acpi/acpi_asus/Makefile#2 integrate
.. //depot/projects/wifi/sys/modules/acpi/acpi_panasonic/Makefile#2 integrate
.. //depot/projects/wifi/sys/modules/acpi/acpi_snc/Makefile#1 branch
.. //depot/projects/wifi/sys/modules/acpi/acpi_sony/Makefile#1 branch
.. //depot/projects/wifi/sys/modules/acpi/acpi_toshiba/Makefile#2 integrate
.. //depot/projects/wifi/sys/modules/autofs/Makefile#2 delete
.. //depot/projects/wifi/sys/modules/esp/Makefile#2 integrate
.. //depot/projects/wifi/sys/modules/vkbd/Makefile#1 branch
.. //depot/projects/wifi/sys/net/if_var.h#5 integrate
.. //depot/projects/wifi/sys/netgraph/ng_device.c#3 integrate
.. //depot/projects/wifi/sys/netinet/in.c#2 integrate
.. //depot/projects/wifi/sys/netinet/ip_divert.c#4 integrate
.. //depot/projects/wifi/sys/netsmb/smb_dev.c#2 integrate
.. //depot/projects/wifi/sys/nfs4client/nfs4_vfsops.c#4 integrate
.. //depot/projects/wifi/sys/nfsclient/nfs_vfsops.c#2 integrate
.. //depot/projects/wifi/sys/nfsserver/nfs_serv.c#2 integrate
.. //depot/projects/wifi/sys/pc98/conf/GENERIC#3 integrate
.. //depot/projects/wifi/sys/pc98/conf/NOTES#2 integrate
.. //depot/projects/wifi/sys/pc98/i386/machdep.c#3 integrate
.. //depot/projects/wifi/sys/pci/if_sf.c#2 integrate
.. //depot/projects/wifi/sys/pci/if_sfreg.h#2 integrate
.. //depot/projects/wifi/sys/pci/if_sk.c#3 integrate
.. //depot/projects/wifi/sys/pci/if_skreg.h#3 integrate
.. //depot/projects/wifi/sys/sparc64/sbus/lsi64854.c#2 integrate
.. //depot/projects/wifi/sys/sys/buf.h#5 integrate
.. //depot/projects/wifi/sys/sys/conf.h#4 integrate
.. //depot/projects/wifi/sys/sys/filedesc.h#3 integrate
.. //depot/projects/wifi/sys/sys/msg.h#2 integrate
.. //depot/projects/wifi/sys/sys/pbioio.h#2 delete
.. //depot/projects/wifi/sys/sys/rman.h#2 integrate
.. //depot/projects/wifi/sys/sys/sem.h#2 integrate
.. //depot/projects/wifi/sys/sys/shm.h#2 integrate
.. //depot/projects/wifi/sys/sys/vnode.h#4 integrate
.. //depot/projects/wifi/sys/ufs/ffs/ffs_vfsops.c#5 integrate
.. //depot/projects/wifi/sys/ufs/ufs/ufs_bmap.c#3 integrate
.. //depot/projects/wifi/sys/vm/vm_pager.c#4 integrate
.. //depot/projects/wifi/sys/vm/vnode_pager.c#5 integrate
.. //depot/projects/wifi/tools/regression/README#2 integrate
.. //depot/projects/wifi/tools/regression/TODO#1 branch
.. //depot/projects/wifi/tools/regression/geom/RunTest.t#1 branch
.. //depot/projects/wifi/tools/regression/geom_concat/test-1.t#1 branch
.. //depot/projects/wifi/tools/regression/geom_concat/test-2.t#1 branch
.. //depot/projects/wifi/tools/regression/geom_gate/test-1.t#1 branch
.. //depot/projects/wifi/tools/regression/geom_gate/test-2.t#1 branch
.. //depot/projects/wifi/tools/regression/geom_gate/test-3.t#1 branch
.. //depot/projects/wifi/tools/regression/include/tgmath/tgmath.c#2 integrate
.. //depot/projects/wifi/tools/regression/include/tgmath/tgmath.t#1 branch
.. //depot/projects/wifi/tools/regression/lib/libc/locale/test-btowc.c#2 integrate
.. //depot/projects/wifi/tools/regression/lib/libc/locale/test-btowc.t#1 branch
.. //depot/projects/wifi/tools/regression/lib/libc/locale/test-iswctype.c#2 integrate
.. //depot/projects/wifi/tools/regression/lib/libc/locale/test-iswctype.t#1 branch
.. //depot/projects/wifi/tools/regression/lib/libc/locale/test-mblen.c#2 integrate
.. //depot/projects/wifi/tools/regression/lib/libc/locale/test-mblen.t#1 branch
.. //depot/projects/wifi/tools/regression/lib/libc/locale/test-mbrlen.c#2 integrate
.. //depot/projects/wifi/tools/regression/lib/libc/locale/test-mbrlen.t#1 branch
.. //depot/projects/wifi/tools/regression/lib/libc/locale/test-mbrtowc.c#2 integrate
.. //depot/projects/wifi/tools/regression/lib/libc/locale/test-mbrtowc.t#1 branch
.. //depot/projects/wifi/tools/regression/lib/libc/locale/test-mbsnrtowcs.c#2 integrate
.. //depot/projects/wifi/tools/regression/lib/libc/locale/test-mbsnrtowcs.t#1 branch
.. //depot/projects/wifi/tools/regression/lib/libc/locale/test-mbsrtowcs.c#2 integrate
.. //depot/projects/wifi/tools/regression/lib/libc/locale/test-mbsrtowcs.t#1 branch
.. //depot/projects/wifi/tools/regression/lib/libc/locale/test-mbstowcs.c#2 integrate
.. //depot/projects/wifi/tools/regression/lib/libc/locale/test-mbstowcs.t#1 branch
.. //depot/projects/wifi/tools/regression/lib/libc/locale/test-mbtowc.c#2 integrate
.. //depot/projects/wifi/tools/regression/lib/libc/locale/test-mbtowc.t#1 branch
.. //depot/projects/wifi/tools/regression/lib/libc/locale/test-sgetrune.c#2 integrate
.. //depot/projects/wifi/tools/regression/lib/libc/locale/test-sgetrune.t#1 branch
.. //depot/projects/wifi/tools/regression/lib/libc/locale/test-sputrune.c#2 integrate
.. //depot/projects/wifi/tools/regression/lib/libc/locale/test-sputrune.t#1 branch
.. //depot/projects/wifi/tools/regression/lib/libc/locale/test-towctrans.c#2 integrate
.. //depot/projects/wifi/tools/regression/lib/libc/locale/test-towctrans.t#1 branch
.. //depot/projects/wifi/tools/regression/lib/libc/locale/test-wcrtomb.c#2 integrate
.. //depot/projects/wifi/tools/regression/lib/libc/locale/test-wcrtomb.t#1 branch
.. //depot/projects/wifi/tools/regression/lib/libc/locale/test-wcsnrtombs.c#2 integrate
.. //depot/projects/wifi/tools/regression/lib/libc/locale/test-wcsnrtombs.t#1 branch
.. //depot/projects/wifi/tools/regression/lib/libc/locale/test-wcsrtombs.c#2 integrate
.. //depot/projects/wifi/tools/regression/lib/libc/locale/test-wcsrtombs.t#1 branch
.. //depot/projects/wifi/tools/regression/lib/libc/locale/test-wcstombs.c#2 integrate
.. //depot/projects/wifi/tools/regression/lib/libc/locale/test-wcstombs.t#1 branch
.. //depot/projects/wifi/tools/regression/lib/libc/locale/test-wctomb.c#2 integrate
.. //depot/projects/wifi/tools/regression/lib/libc/locale/test-wctomb.t#1 branch
.. //depot/projects/wifi/tools/regression/lib/libc/net/test-eui64_aton.c#2 integrate
.. //depot/projects/wifi/tools/regression/lib/libc/net/test-eui64_aton.t#1 branch
.. //depot/projects/wifi/tools/regression/lib/libc/net/test-eui64_line.c#2 integrate
.. //depot/projects/wifi/tools/regression/lib/libc/net/test-eui64_line.t#1 branch
.. //depot/projects/wifi/tools/regression/lib/libc/net/test-eui64_ntoa.c#2 integrate
.. //depot/projects/wifi/tools/regression/lib/libc/net/test-eui64_ntoa.t#1 branch
.. //depot/projects/wifi/tools/regression/lib/libc/stdio/test-perror.c#2 integrate
.. //depot/projects/wifi/tools/regression/lib/libc/stdio/test-perror.t#1 branch
.. //depot/projects/wifi/tools/regression/lib/libc/stdio/test-printfloat.c#2 integrate
.. //depot/projects/wifi/tools/regression/lib/libc/stdio/test-printfloat.t#1 branch
.. //depot/projects/wifi/tools/regression/lib/libc/stdio/test-scanfloat.c#2 integrate
.. //depot/projects/wifi/tools/regression/lib/libc/stdio/test-scanfloat.t#1 branch
.. //depot/projects/wifi/tools/regression/lib/libc/stdlib/test-heapsort.c#2 integrate
.. //depot/projects/wifi/tools/regression/lib/libc/stdlib/test-heapsort.t#1 branch
.. //depot/projects/wifi/tools/regression/lib/libc/stdlib/test-mergesort.c#2 integrate
.. //depot/projects/wifi/tools/regression/lib/libc/stdlib/test-mergesort.t#1 branch
.. //depot/projects/wifi/tools/regression/lib/libc/stdlib/test-qsort.c#2 integrate
.. //depot/projects/wifi/tools/regression/lib/libc/stdlib/test-qsort.t#1 branch
.. //depot/projects/wifi/tools/regression/lib/libc/string/test-strerror.c#2 integrate
.. //depot/projects/wifi/tools/regression/lib/libc/string/test-strerror.t#1 branch
.. //depot/projects/wifi/tools/regression/lib/msun/test-fenv.c#2 integrate
.. //depot/projects/wifi/tools/regression/lib/msun/test-fenv.t#1 branch
.. //depot/projects/wifi/tools/regression/lib/msun/test-ilogb.c#2 integrate
.. //depot/projects/wifi/tools/regression/lib/msun/test-ilogb.t#1 branch
.. //depot/projects/wifi/tools/regression/netinet/ipsockopt/ipsockopt.c#2 integrate
.. //depot/projects/wifi/tools/regression/netinet/ipsockopt/ipsockopt.t#1 branch
.. //depot/projects/wifi/tools/regression/pipe/bigpipetest.c#2 integrate
.. //depot/projects/wifi/tools/regression/pipe/bigpipetest.t#1 branch
.. //depot/projects/wifi/tools/regression/sockets/accept_fd_leak/accept_fd_leak.c#2 integrate
.. //depot/projects/wifi/tools/regression/sockets/accept_fd_leak/accept_fd_leak.t#1 branch
.. //depot/projects/wifi/tools/regression/sockets/accf_data_attach/accf_data_attach.c#2 integrate
.. //depot/projects/wifi/tools/regression/sockets/accf_data_attach/accf_data_attach.t#1 branch
.. //depot/projects/wifi/tools/regression/sockets/kqueue/kqueue.c#2 integrate
.. //depot/projects/wifi/tools/regression/sockets/kqueue/kqueue.t#1 branch
.. //depot/projects/wifi/tools/regression/usr.bin/file2c/regress.sh#2 integrate
.. //depot/projects/wifi/tools/regression/usr.bin/file2c/regress.t#1 branch
.. //depot/projects/wifi/tools/regression/usr.bin/join/regress.sh#2 integrate
.. //depot/projects/wifi/tools/regression/usr.bin/join/regress.t#1 branch
.. //depot/projects/wifi/tools/regression/usr.bin/jot/regress.sh#2 integrate
.. //depot/projects/wifi/tools/regression/usr.bin/jot/regress.t#1 branch
.. //depot/projects/wifi/tools/regression/usr.bin/m4/regress.sh#2 integrate
.. //depot/projects/wifi/tools/regression/usr.bin/m4/regress.t#1 branch
.. //depot/projects/wifi/tools/regression/usr.bin/make/Makefile#2 integrate
.. //depot/projects/wifi/tools/regression/usr.bin/make/regress.t#1 branch
.. //depot/projects/wifi/tools/regression/usr.bin/regress.m4#2 integrate
.. //depot/projects/wifi/tools/regression/usr.bin/sed/regress.sh#2 integrate
.. //depot/projects/wifi/tools/regression/usr.bin/sed/regress.t#1 branch
.. //depot/projects/wifi/tools/regression/usr.bin/uudecode/regress.sh#2 integrate
.. //depot/projects/wifi/tools/regression/usr.bin/uudecode/regress.t#1 branch
.. //depot/projects/wifi/tools/regression/usr.bin/uuencode/regress.sh#2 integrate
.. //depot/projects/wifi/tools/regression/usr.bin/uuencode/regress.t#1 branch
.. //depot/projects/wifi/tools/regression/usr.bin/xargs/regress.sh#2 integrate
.. //depot/projects/wifi/tools/regression/usr.bin/xargs/regress.t#1 branch
.. //depot/projects/wifi/tools/tools/nanobsd/make.conf#4 integrate
.. //depot/projects/wifi/tools/tools/tinderbox/etc/releng_5.rc#2 integrate
.. //depot/projects/wifi/tools/tools/tinderbox/etc/update_releng_5.rc#2 integrate
.. //depot/projects/wifi/usr.bin/Makefile#2 integrate
.. //depot/projects/wifi/usr.bin/chkey/Makefile#2 integrate
.. //depot/projects/wifi/usr.bin/chpass/Makefile#2 integrate
.. //depot/projects/wifi/usr.bin/ipcs/ipcs.c#2 integrate
.. //depot/projects/wifi/usr.bin/make/compat.c#2 integrate
.. //depot/projects/wifi/usr.bin/make/config.h#3 integrate
.. //depot/projects/wifi/usr.bin/make/job.c#3 integrate
.. //depot/projects/wifi/usr.bin/make/job.h#3 integrate
.. //depot/projects/wifi/usr.bin/make/main.c#3 integrate
.. //depot/projects/wifi/usr.bin/make/make.c#2 integrate
.. //depot/projects/wifi/usr.bin/newkey/Makefile#2 integrate
.. //depot/projects/wifi/usr.bin/pkill/Makefile#2 integrate
.. //depot/projects/wifi/usr.bin/pkill/pkill.c#2 integrate
.. //depot/projects/wifi/usr.bin/tar/Makefile#3 integrate
.. //depot/projects/wifi/usr.bin/tr/str.c#2 integrate
.. //depot/projects/wifi/usr.sbin/Makefile#2 integrate
.. //depot/projects/wifi/usr.sbin/acpi/acpiconf/Makefile#2 integrate
.. //depot/projects/wifi/usr.sbin/acpi/acpiconf/acpiconf.c#2 integrate
.. //depot/projects/wifi/usr.sbin/acpi/acpidb/Makefile#2 integrate
.. //depot/projects/wifi/usr.sbin/acpi/acpidb/acpidb.c#2 integrate
.. //depot/projects/wifi/usr.sbin/amd/Makefile.inc#2 integrate
.. //depot/projects/wifi/usr.sbin/amd/amd/Makefile#2 integrate
.. //depot/projects/wifi/usr.sbin/amd/include/Makefile#2 integrate
.. //depot/projects/wifi/usr.sbin/bootparamd/bootparamd/Makefile#2 integrate
.. //depot/projects/wifi/usr.sbin/bootparamd/bootparamd/bootparamd.c#2 integrate
.. //depot/projects/wifi/usr.sbin/moused/moused.8#2 integrate
.. //depot/projects/wifi/usr.sbin/pppd/cbcp.c#2 integrate
.. //depot/projects/wifi/usr.sbin/pstat/pstat.8#2 integrate
.. //depot/projects/wifi/usr.sbin/sendmail/Makefile#2 integrate
.. //depot/projects/wifi/usr.sbin/sysinstall/Makefile#2 integrate
.. //depot/projects/wifi/usr.sbin/sysinstall/anonFTP.c#2 integrate
.. //depot/projects/wifi/usr.sbin/sysinstall/config.c#4 integrate
.. //depot/projects/wifi/usr.sbin/syslogd/syslogd.c#3 integrate

Differences ...

==== //depot/projects/wifi/Makefile.inc1#4 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile.inc1,v 1.451 2004/11/06 03:14:26 peter Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.456 2004/11/15 05:59:10 peter Exp $
 #
 # Make command line options:
 #	-DNO_DYNAMICROOT do not link /bin and /sbin dynamically
@@ -83,7 +83,7 @@
 .endif
 
 CVS?=		cvs
-CVSFLAGS?=	-A -P -d
+CVSFLAGS?=	-A -P -d -I!
 SUP?=		/usr/local/bin/cvsup
 SUPFLAGS?=	-g -L 2 -P -
 .if defined(SUPHOST)
@@ -201,7 +201,7 @@
 		PATH=${TMPPATH}
 WMAKE=		${WMAKEENV} ${MAKE} -f Makefile.inc1 DESTDIR=${WORLDTMP}
 
-.if ${MACHINE_ARCH} == amd64
+.if ${MACHINE_ARCH} == "amd64"
 # 32 bit world
 LIB32TMP=	${OBJTREE}${.CURDIR}/lib32
 
@@ -378,7 +378,7 @@
 	@echo ">>> stage 4.4: building everything"
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${.CURDIR}; ${WMAKE} par-all
-.if ${MACHINE_ARCH} == amd64
+.if ${MACHINE_ARCH} == "amd64"
 build32:
 	@echo
 	@echo "--------------------------------------------------------------"
@@ -404,11 +404,21 @@
 	cd ${.CURDIR}/secure/lib; \
 	    ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t}
 .endif
+.if !defined(NO_KERBEROS) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
+	cd ${.CURDIR}/kerberos5/lib; \
+	    ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t}
+.endif
 .endfor
 .for _dir in lib/libncurses lib/libmagic
 	cd ${.CURDIR}/${_dir}; \
 	    MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} build-tools
 .endfor
+.if !defined(NO_KERBEROS) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
+.for _t in obj depend all
+	cd ${.CURDIR}/kerberos5/tools; \
+	    MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} ${_t}
+.endfor
+.endif
 	cd ${.CURDIR}; \
 	    ${LIB32MAKE} -f Makefile.inc1 DESTDIR=${LIB32TMP} libraries 
 .for _t in obj depend all
@@ -436,7 +446,7 @@
 WMAKE_TGTS+=	_cross-tools
 .endif
 WMAKE_TGTS+=	_includes _libraries _depend everything
-.if ${MACHINE_ARCH} == amd64 && defined(WANT_LIB32)
+.if ${MACHINE_ARCH} == "amd64" && defined(WITH_LIB32)
 WMAKE_TGTS+=	build32
 .endif
 
@@ -569,7 +579,7 @@
 	@echo ">>> Installing everything"
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install
-.if ${MACHINE_ARCH} == amd64 && defined(WANT_LIB32)
+.if ${MACHINE_ARCH} == "amd64" && defined(WITH_LIB32)
 	${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install32
 .endif
 
@@ -992,7 +1002,7 @@
 		lib/libkvm lib/libmd \
 		lib/libncurses lib/libnetgraph lib/libopie lib/libpam \
 		lib/libradius \
-		lib/libsbuf lib/libtacplus lib/libutil lib/libypclnt \
+		lib/libsbuf lib/libtacplus lib/libutil \
 		lib/libz lib/msun
 
 lib/libopie__L lib/libtacplus__L: lib/libmd__L
@@ -1029,6 +1039,10 @@
 lib/libradius__L: lib/libmd__L
 .endif
 
+.if !defined(NO_NIS)
+_prebuild_libs+=	lib/libypclnt
+.endif
+
 _generic_libs+=	usr.bin/lex/lib
 
 .if ${MACHINE_ARCH} == "i386"

==== //depot/projects/wifi/UPDATING#3 (text+ko) ====

@@ -23,6 +23,18 @@
 	developers choose to disable these features on build machines
 	to maximize performance.
 
+20041116:
+	Support for systems with an 80386 CPU has been removed.  Please
+	use FreeBSD 5.x or earlier on systems with an 80386.
+
+20041110:
+	We have had a hack which would mount the root filesystem
+	R/W if the device were named 'md*'.  As part of the vnode
+	work I'm doing I have had to remove this hack.  People
+	building systems which use preloaded MD root filesystems
+	may need to insert a "/sbin/mount -u -o rw /dev/md0 /" in
+	their /etc/rc scripts.
+
 20041102:
 	The size of struct tcpcb has changed again due to the removal
 	of RFC1644 T/TCP.  You have to recompile userland programs that
@@ -1961,4 +1973,4 @@
 Contact Warner Losh if you have any questions about your use of
 this document.
 
-$FreeBSD: src/UPDATING,v 1.377 2004/11/02 22:22:22 andre Exp $
+$FreeBSD: src/UPDATING,v 1.379 2004/11/16 21:18:41 jhb Exp $

==== //depot/projects/wifi/bin/pax/tar.c#2 (text+ko) ====

@@ -37,7 +37,7 @@
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/pax/tar.c,v 1.23 2004/04/06 20:06:48 markm Exp $");
+__FBSDID("$FreeBSD: src/bin/pax/tar.c,v 1.24 2004/11/13 10:56:35 yar Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
@@ -387,7 +387,13 @@
 	 * copy out the name and values in the stat buffer
 	 */
 	hd = (HD_TAR *)buf;
-	arcn->nlen = l_strncpy(arcn->name, hd->name, sizeof(arcn->name) - 1);
+	/*
+	 * old tar format specifies the name always be null-terminated,
+	 * but let's be robust to broken archives.
+	 * the same applies to handling links below.
+	 */
+	arcn->nlen = l_strncpy(arcn->name, hd->name,
+	    MIN(sizeof(hd->name), sizeof(arcn->name)) - 1);
 	arcn->name[arcn->nlen] = '\0';
 	arcn->sb.st_mode = (mode_t)(asc_ul(hd->mode,sizeof(hd->mode),OCT) &
 	    0xfff);
@@ -417,7 +423,7 @@
 		 */
 		arcn->type = PAX_SLK;
 		arcn->ln_nlen = l_strncpy(arcn->ln_name, hd->linkname,
-			sizeof(arcn->ln_name) - 1);
+		    MIN(sizeof(hd->linkname), sizeof(arcn->ln_name)) - 1);
 		arcn->ln_name[arcn->ln_nlen] = '\0';
 		arcn->sb.st_mode |= S_IFLNK;
 		break;
@@ -429,7 +435,7 @@
 		arcn->type = PAX_HLK;
 		arcn->sb.st_nlink = 2;
 		arcn->ln_nlen = l_strncpy(arcn->ln_name, hd->linkname,
-			sizeof(arcn->ln_name) - 1);
+		    MIN(sizeof(hd->linkname), sizeof(arcn->ln_name)) - 1);
 		arcn->ln_name[arcn->ln_nlen] = '\0';
 
 		/*
@@ -533,7 +539,7 @@
 	case PAX_SLK:
 	case PAX_HLK:
 	case PAX_HRG:
-		if (arcn->ln_nlen > (int)sizeof(hd->linkname)) {
+		if (arcn->ln_nlen >= (int)sizeof(hd->linkname)) {
 			paxwarn(1,"Link name too long for tar %s", arcn->ln_name);
 			return(1);
 		}
@@ -749,12 +755,19 @@
 	 */
 	dest = arcn->name;
 	if (*(hd->prefix) != '\0') {
-		cnt = l_strncpy(dest, hd->prefix, sizeof(arcn->name) - 2);
+		cnt = l_strncpy(dest, hd->prefix,
+		    MIN(sizeof(hd->prefix), sizeof(arcn->name) - 2));
 		dest += cnt;
 		*dest++ = '/';
 		cnt++;
 	}
-	arcn->nlen = cnt + l_strncpy(dest, hd->name, sizeof(arcn->name) - cnt);
+	/*
+	 * ustar format specifies the name may be unterminated
+	 * if it fills the entire field.  this also applies to
+	 * the prefix and the linkname.
+	 */
+	arcn->nlen = cnt + l_strncpy(dest, hd->name,
+	    MIN(sizeof(hd->name), sizeof(arcn->name) - cnt - 1));
 	arcn->name[arcn->nlen] = '\0';
 
 	/*
@@ -848,7 +861,7 @@
 		 * copy the link name
 		 */
 		arcn->ln_nlen = l_strncpy(arcn->ln_name, hd->linkname,
-			sizeof(arcn->ln_name) - 1);
+		    MIN(sizeof(hd->linkname), sizeof(arcn->ln_name) - 1));
 		arcn->ln_name[arcn->ln_nlen] = '\0';
 		break;
 	case CONTTYPE:
@@ -900,7 +913,7 @@
 	 */
 	if (((arcn->type == PAX_SLK) || (arcn->type == PAX_HLK) ||
 	    (arcn->type == PAX_HRG)) &&
-	    (arcn->ln_nlen >= (int)sizeof(hd->linkname))) {
+	    (arcn->ln_nlen > (int)sizeof(hd->linkname))) {
 		paxwarn(1, "Link name too long for ustar %s", arcn->ln_name);
 		return(1);
 	}
@@ -925,17 +938,16 @@
 		 * occur, we remove the / and copy the first part to the prefix
 		 */
 		*pt = '\0';
-		l_strncpy(hd->prefix, arcn->name, sizeof(hd->prefix) - 1);
+		l_strncpy(hd->prefix, arcn->name, sizeof(hd->prefix));
 		*pt++ = '/';
 	} else
 		memset(hd->prefix, 0, sizeof(hd->prefix));
 
 	/*
 	 * copy the name part. this may be the whole path or the part after
-	 * the prefix
+	 * the prefix.  both the name and prefix may fill the entire field.
 	 */
-	l_strncpy(hd->name, pt, sizeof(hd->name) - 1);
-	hd->name[sizeof(hd->name) - 1] = '\0';
+	l_strncpy(hd->name, pt, sizeof(hd->name));
 
 	/*
 	 * set the fields in the header that are type dependent
@@ -978,8 +990,8 @@
 			hd->typeflag = SYMTYPE;
 		else
 			hd->typeflag = LNKTYPE;
-		l_strncpy(hd->linkname,arcn->ln_name, sizeof(hd->linkname) - 1);
-		hd->linkname[sizeof(hd->linkname) - 1] = '\0';
+		/* the link name may occupy the entire field in ustar */
+		l_strncpy(hd->linkname,arcn->ln_name, sizeof(hd->linkname));
 		memset(hd->devmajor, 0, sizeof(hd->devmajor));
 		memset(hd->devminor, 0, sizeof(hd->devminor));
 		if (ul_oct((u_long)0L, hd->size, sizeof(hd->size), 3))
@@ -1072,9 +1084,9 @@
 	 * check to see if the file name is small enough to fit in the name
 	 * field. if so just return a pointer to the name.
 	 */
-	if (len < TNMSZ)
+	if (len <= TNMSZ)
 		return(name);
-	if (len > (TPFSZ + TNMSZ))
+	if (len > (TPFSZ + TNMSZ + 1))
 		return(NULL);
 
 	/*
@@ -1083,7 +1095,7 @@
 	 * to find the biggest piece to fit in the name field (or the smallest
 	 * prefix we can find)
 	 */
-	start = name + len - TNMSZ;
+	start = name + len - TNMSZ - 1;
 	while ((*start != '\0') && (*start != '/'))
 		++start;
 
@@ -1101,7 +1113,7 @@
 	 * the file would then expand on extract to //str. The len == 0 below
 	 * makes this special case follow the spec to the letter.
 	 */
-	if ((len >= TPFSZ) || (len == 0))
+	if ((len > TPFSZ) || (len == 0))
 		return(NULL);
 
 	/*

==== //depot/projects/wifi/bin/ps/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/bin/ps/Makefile,v 1.25 2004/02/23 20:05:14 johan Exp $
+# $FreeBSD: src/bin/ps/Makefile,v 1.26 2004/11/13 17:12:22 ru Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/2/93
 
 PROG=	ps
@@ -13,7 +13,5 @@
 CFLAGS+=-DLAZY_PS
 DPADD=	${LIBM} ${LIBKVM}
 LDADD=	-lm -lkvm
-#BINGRP=	kmem
-#BINMODE=2555
 
 .include <bsd.prog.mk>

==== //depot/projects/wifi/bin/ps/ps.c#2 (text+ko) ====

@@ -47,7 +47,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.106 2004/06/27 22:56:58 gad Exp $");
+__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.108 2004/11/14 19:30:02 csjp Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
@@ -55,6 +55,7 @@
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/sysctl.h>
+#include <sys/mount.h>
 
 #include <ctype.h>
 #include <err.h>
@@ -128,6 +129,7 @@
 	} l;
 };
 
+static int	 check_procfs(void);
 static int	 addelem_gid(struct listinfo *, const char *);
 static int	 addelem_pid(struct listinfo *, const char *);
 static int	 addelem_tty(struct listinfo *, const char *);
@@ -171,7 +173,7 @@
 	struct winsize ws;
 	const char *nlistf, *memf;
 	char *cols;
-	int all, ch, dropgid, elem, flag, _fmt, i, lineno;
+	int all, ch, elem, flag, _fmt, i, lineno;
 	int nentries, nkept, nselectors;
 	int prtheader, showthreads, wflag, what, xkeep, xkeep_implied;
 	char errbuf[_POSIX2_LINE_MAX];
@@ -196,7 +198,7 @@
 	if (argc > 1)
 		argv[1] = kludge_oldps_options(PS_ARGS, argv[1], argv[2]);
 
-	all = dropgid = _fmt = nselectors = optfatal = 0;
+	all = _fmt = nselectors = optfatal = 0;
 	prtheader = showthreads = wflag = xkeep_implied = 0;
 	xkeep = -1;			/* Neither -x nor -X. */
 	init_list(&gidlist, addelem_gid, sizeof(gid_t), "group");
@@ -278,14 +280,12 @@
 			break;
 		case 'M':
 			memf = optarg;
-			dropgid = 1;
 			break;
 		case 'm':
 			sortby = SORTMEM;
 			break;
 		case 'N':
 			nlistf = optarg;
-			dropgid = 1;
 			break;
 		case 'O':
 			parsefmt(o1, 1);
@@ -404,6 +404,14 @@
 	argv += optind;
 
 	/*
+	 * If the user specified ps -e then they want a copy of the process
+	 * environment kvm_getenvv(3) attempts to open /proc/<pid>/mem.
+	 * Check to make sure that procfs is mounted on /proc, otherwise
+	 * print a warning informing the user that output will be incomplete.
+	 */
+	if (needenv == 1 && check_procfs() == 0)
+		warnx("Process environment requires procfs(5)");
+	/*
 	 * If there arguments after processing all the options, attempt
 	 * to treat them as a list of process ids.
 	 */
@@ -423,14 +431,6 @@
 	if (xkeep < 0)			/* Neither -X nor -x was specified. */
 		xkeep = xkeep_implied;
 
-
-	/*
-	 * Discard setgid privileges if not the running kernel so that bad
-	 * guys can't print interesting stuff from kernel memory.
-	 */
-	if (dropgid)
-		setgid(getgid());
-
 	kd = kvm_openfiles(nlistf, memf, NULL, O_RDONLY, errbuf);
 	if (kd == 0)
 		errx(1, "%s", errbuf);
@@ -1176,6 +1176,21 @@
 	return (newopts);
 }
 
+static int
+check_procfs(void)
+{
+	struct statfs *mntbuf;
+	size_t mntsize, i;
+
+	mntsize = getmntinfo(&mntbuf, MNT_NOWAIT);
+	for (i = 0; i < mntsize; i++)
+		if (strcmp(mntbuf[i].f_mntonname, "/proc") == 0 &&
+		    strcmp(mntbuf[i].f_fstypename, "procfs") == 0) {
+			return (1);
+		}
+	return (0);
+}
+
 static void
 usage(void)
 {

==== //depot/projects/wifi/bin/rm/rm.c#3 (text+ko) ====

@@ -39,7 +39,7 @@
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/rm/rm.c,v 1.51 2004/10/28 08:25:30 delphij Exp $");
+__FBSDID("$FreeBSD: src/bin/rm/rm.c,v 1.52 2004/11/13 04:07:01 jkh Exp $");
 
 #include <sys/stat.h>
 #include <sys/param.h>
@@ -192,8 +192,11 @@
 		flags |= FTS_NOSTAT;
 	if (Wflag)
 		flags |= FTS_WHITEOUT;
-	if (!(fts = fts_open(argv, flags, NULL)))
+	if (!(fts = fts_open(argv, flags, NULL))) {
+		if (fflag && errno == ENOENT)
+			return;
 		err(1, "fts_open");
+	}
 	while ((p = fts_read(fts)) != NULL) {
 		switch (p->fts_info) {
 		case FTS_DNR:

==== //depot/projects/wifi/contrib/gcc/gcc.1#2 (text+ko) ====

@@ -1,4 +1,4 @@
-.\" $FreeBSD: src/contrib/gcc/gcc.1,v 1.19 2003/06/25 16:12:05 obrien Exp $
+.\" $FreeBSD: src/contrib/gcc/gcc.1,v 1.21 2004/11/11 07:50:09 obrien Exp $
 .\" Copyright (c) 1991, 1992, 1993, 1994 Free Software Foundation    -*-Text-*-
 .\" See section COPYING for conditions for redistribution
 .\"
@@ -24,7 +24,7 @@
 .Id $Id: gcc.1,v 1.9 1998/12/16 20:55:57 law Exp $
 .TH GCC 1 "\*(Dt" "GNU Tools" "GNU Tools"
 .SH NAME
-gcc, g++ \- GNU project C and C++ Compiler (gcc-3.2.1)
+gcc, g++ \- GNU project C and C++ Compiler
 .SH SYNOPSIS
 .B gcc
 .RI "[ " option " | " filename " ].\|.\|."
@@ -2461,10 +2461,11 @@
 .B \-finline\-functions.
 .TP
 .B \-Os
-Optimize for size. This enables all
+Optimize for size.
+This enables all
 .B \-O2
-optimizations that do not typically increase code size.  It also performs
-further optimizations designed to reduce code size.
+optimizations that do not typically increase code size.
+It also performs further optimizations designed to reduce code size.
 .TP
 .B \-O0
 Do not optimize.
@@ -3628,17 +3629,19 @@
 (pentium),
 .B pentium,
 .B i686
-(pentiumpro), and
+(pentiumpro),
+and
 .B pentiumpro.
 While picking a specific CPU TYPE will schedule things appropriately for that
-particular chip, the compiler will not generate any code that does not run on
-the i386 without the
+particular chip,
+the compiler will not generate any code that does not run on the i386 without
+the
 .B \-march=\fIcpu type\fP
 option being used.
 .TP
 .B \-march=\fIcpu type\fP
-Generate instructions for the machine type CPU TYPE.  The choices for CPU TYPE
-are:
+Generate instructions for the machine type CPU TYPE.
+The choices for CPU TYPE are:
 .B i386,
 .B i486,
 .B pentium,

==== //depot/projects/wifi/contrib/pf/man/pf.conf.5#2 (text+ko) ====

@@ -1,4 +1,4 @@
-.\"	$FreeBSD: src/contrib/pf/man/pf.conf.5,v 1.4 2004/10/07 15:39:02 mlaier Exp $
+.\"	$FreeBSD: src/contrib/pf/man/pf.conf.5,v 1.5 2004/11/14 17:05:54 mlaier Exp $
 .\"	$OpenBSD: pf.conf.5,v 1.292 2004/02/24 05:44:48 mcbride Exp $
 .\"
 .\" Copyright (c) 2002, Daniel Hartmeier
@@ -349,7 +349,7 @@
 .It Ar set limit
 Sets hard limits on the memory pools used by the packet filter.
 See
-.Xr pool 9
+.Xr zone 9
 for an explanation of memory pools.
 .Pp
 For example,

==== //depot/projects/wifi/etc/defaults/rc.conf#4 (text+ko) ====

@@ -13,7 +13,7 @@
 #
 # All arguments must be in double or single quotes.
 #
-# $FreeBSD: src/etc/defaults/rc.conf,v 1.230 2004/11/09 10:03:17 keramida Exp $
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.231 2004/11/09 21:33:18 keramida Exp $
 
 ##############################################################
 ###  Important initial Boot-time options  ####################
@@ -40,7 +40,7 @@
 removable_interfaces=""	# Removable network interfaces for /etc/pccard_ether.
 tmpmfs="AUTO"		# Set to YES to always create an mfs /tmp, NO to never
 tmpsize="20m"		# Size of mfs /tmp if created
-tmpmfs_flags="-S -o noexec,nosuid,nodev" # Extra mdmfs options for the mfs /tmp
+tmpmfs_flags="-S"	# Extra mdmfs options for the mfs /tmp
 varmfs="AUTO"		# Set to YES to always create an mfs /var, NO to never
 varsize="32m"		# Size of mfs /var if created
 varmfs_flags="-S"	# Extra mount options for the mfs /var

==== //depot/projects/wifi/etc/rc.d/Makefile#4 (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.46 2004/11/04 12:59:16 phk Exp $
+# $FreeBSD: src/etc/rc.d/Makefile,v 1.47 2004/11/16 04:20:09 wes Exp $
 
 FILES=	DAEMON LOGIN NETWORKING SERVERS \
 	abi accounting addswap adjkerntz amd \
@@ -28,7 +28,7 @@
 	pccard pcvt pf pflog \
 	power_profile ppp-user pppoed preseedrandom pwcheck \
 	quota \
-	random rarpd rcconf.sh resolv root \
+	ramdisk ramdisk-own random rarpd rcconf.sh resolv root \
 	route6d routed routing rpcbind rtadvd rwho \
 	savecore securelevel sendmail \
 	serial sppp sshd swap1 \

==== //depot/projects/wifi/etc/rc.d/ramdisk-own#2 (text+ko) ====

@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD: src/etc/rc.d/ramdisk-own,v 1.3 2004/10/07 13:55:26 mtm Exp $
+# $FreeBSD: src/etc/rc.d/ramdisk-own,v 1.4 2004/11/16 04:14:28 wes Exp $
 #
 
 # PROVIDE: ramdisk-own
@@ -39,7 +39,6 @@
 
 ramdisk_own_start()
 {
-set -x
 	for unit in $ramdisk_units; do
 		device="/dev/md$unit"
 		dir=`mount | grep $device | cut -d' ' -f3`

==== //depot/projects/wifi/etc/rc.d/serial#2 (text+ko) ====

@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD: src/etc/rc.d/serial,v 1.22 2004/10/07 13:55:26 mtm Exp $
+# $FreeBSD: src/etc/rc.d/serial,v 1.24 2004/11/14 19:51:34 obrien Exp $
 #
 
 # PROVIDE: serial
@@ -45,73 +45,69 @@
 default() {
 	# Reset everything changed by the other functions to initial defaults.
 
-	ci=$1; shift	# call in device identifier
-	co=$1; shift	# call out device identifier
+	dc=$1; shift	# device name character
 	drainwait=`sysctl -n kern.drainwait`
 
 	for i in $*
 	do
-		comcontrol /dev/tty${ci}${i} dtrwait 300 drainwait $drainwait
-		stty < /dev/ttyi${ci}${i} -clocal crtscts hupcl 9600 reprint ^R
-		stty < /dev/ttyl${ci}${i} -clocal -crtscts -hupcl 0
-		stty < /dev/cuai${co}${i} -clocal crtscts hupcl 9600 reprint ^R
-		stty < /dev/cual${co}${i} -clocal -crtscts -hupcl 0
+		comcontrol /dev/tty${dc}${i} dtrwait 300 drainwait $drainwait
+		stty < /dev/tty${dc}${i}.init -clocal crtscts hupcl 9600 reprint ^R
+		stty < /dev/tty${dc}${i}.lock -clocal -crtscts -hupcl 0

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


More information about the p4-projects mailing list