Date: Sun, 14 Feb 2010 12:05:35 GMT From: Alexander Motin <mav@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 174692 for review Message-ID: <201002141205.o1EC5Z1n011590@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/chv.cgi?CH=174692 Change 174692 by mav@mav_mavbook on 2010/02/14 12:04:53 IFC Affected files ... .. //depot/projects/scottl-camlock/src/bin/ls/ls.c#5 integrate .. //depot/projects/scottl-camlock/src/bin/pax/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/bin/pax/cpio.h#2 integrate .. //depot/projects/scottl-camlock/src/bin/pax/tar.h#2 integrate .. //depot/projects/scottl-camlock/src/bin/pkill/pkill.1#2 integrate .. //depot/projects/scottl-camlock/src/bin/pkill/pkill.c#4 integrate .. //depot/projects/scottl-camlock/src/bin/ps/ps.c#4 integrate .. //depot/projects/scottl-camlock/src/bin/sh/main.c#6 integrate .. //depot/projects/scottl-camlock/src/bin/sh/var.c#8 integrate .. //depot/projects/scottl-camlock/src/etc/defaults/rc.conf#16 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/ipfw#7 integrate .. //depot/projects/scottl-camlock/src/etc/services#7 integrate .. //depot/projects/scottl-camlock/src/games/fortune/datfiles/fortunes#9 integrate .. //depot/projects/scottl-camlock/src/games/grdc/grdc.c#2 integrate .. //depot/projects/scottl-camlock/src/gnu/usr.bin/gdb/kgdb/kthr.c#3 integrate .. //depot/projects/scottl-camlock/src/gnu/usr.bin/groff/tmac/mdoc.local#8 integrate .. //depot/projects/scottl-camlock/src/lib/libc/nls/msgcat.c#4 integrate .. //depot/projects/scottl-camlock/src/lib/libc/posix1e/mac.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/stdlib/strfmon.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/sys/ptrace.2#6 integrate .. //depot/projects/scottl-camlock/src/lib/libefi/libefi.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libufs/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/lib/libufs/cgroup.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libufs/sblock.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libusb/libusb.h#5 integrate .. //depot/projects/scottl-camlock/src/lib/libusb/libusb10.c#7 integrate .. //depot/projects/scottl-camlock/src/lib/libusb/libusb10_desc.c#5 integrate .. //depot/projects/scottl-camlock/src/lib/libusb/libusb10_io.c#5 integrate .. //depot/projects/scottl-camlock/src/lib/libusb/libusb20.c#7 integrate .. //depot/projects/scottl-camlock/src/lib/libusb/libusb20.h#5 integrate .. //depot/projects/scottl-camlock/src/lib/libusb/libusb20_compat01.c#4 integrate .. //depot/projects/scottl-camlock/src/lib/libusb/libusb20_desc.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libusb/libusb20_ugen20.c#7 integrate .. //depot/projects/scottl-camlock/src/lib/libusb/usb.h#2 integrate .. //depot/projects/scottl-camlock/src/libexec/ftpd/logwtmp.c#4 integrate .. //depot/projects/scottl-camlock/src/sbin/growfs/growfs.c#5 integrate .. //depot/projects/scottl-camlock/src/sbin/mount/mount.8#6 integrate .. //depot/projects/scottl-camlock/src/sbin/newfs/mkfs.c#4 integrate .. //depot/projects/scottl-camlock/src/sbin/newfs/newfs.c#3 integrate .. //depot/projects/scottl-camlock/src/sbin/newfs/newfs.h#3 integrate .. //depot/projects/scottl-camlock/src/sbin/restore/tape.c#4 integrate .. //depot/projects/scottl-camlock/src/sbin/sysctl/sysctl.8#4 integrate .. //depot/projects/scottl-camlock/src/sbin/sysctl/sysctl.c#7 integrate .. //depot/projects/scottl-camlock/src/sbin/tunefs/tunefs.c#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/Makefile#22 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/acpi_asus.4#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/acpi_fujitsu.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/acpi_hp.4#4 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/acpi_ibm.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/acpi_panasonic.4#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/acpi_sony.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/acpi_toshiba.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/acpi_wmi.4#4 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/alpm.4#1 branch .. //depot/projects/scottl-camlock/src/share/man/man4/amdpm.4#1 branch .. //depot/projects/scottl-camlock/src/share/man/man4/io.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/iwn.4#5 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/iwnfw.4#4 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/linux.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/man4.i386/Makefile#5 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/man4.i386/alpm.4#2 delete .. //depot/projects/scottl-camlock/src/share/man/man4/man4.i386/amdpm.4#2 delete .. //depot/projects/scottl-camlock/src/share/man/man4/man4.i386/mcd.4#2 delete .. //depot/projects/scottl-camlock/src/share/man/man4/man4.i386/padlock.4#3 delete .. //depot/projects/scottl-camlock/src/share/man/man4/man4.i386/pcf.4#2 delete .. //depot/projects/scottl-camlock/src/share/man/man4/man4.i386/scd.4#3 delete .. //depot/projects/scottl-camlock/src/share/man/man4/man4.i386/viapm.4#2 delete .. //depot/projects/scottl-camlock/src/share/man/man4/mcd.4#1 branch .. //depot/projects/scottl-camlock/src/share/man/man4/ndis.4#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/nvram.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/padlock.4#1 branch .. //depot/projects/scottl-camlock/src/share/man/man4/pcf.4#1 branch .. //depot/projects/scottl-camlock/src/share/man/man4/scd.4#1 branch .. //depot/projects/scottl-camlock/src/share/man/man4/sctp.4#4 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/viapm.4#1 branch .. //depot/projects/scottl-camlock/src/share/man/man4/vr.4#4 integrate .. //depot/projects/scottl-camlock/src/share/man/man5/rc.conf.5#13 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/VFS.9#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/alloc_unr.9#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/locking.9#4 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/mtx_pool.9#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/vnode.9#2 integrate .. //depot/projects/scottl-camlock/src/share/misc/committers-src.dot#11 integrate .. //depot/projects/scottl-camlock/src/share/zoneinfo/Makefile#5 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/conf/GENERIC#32 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/conf/NOTES#25 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/conf/XENHVM#6 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/pmap.c#26 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/AVILA#12 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/BWCT#6 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/CAMBRIA#8 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/CNS11XXNAS#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/CRB#5 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/DB-78XXX#4 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/DB-88F5XXX#4 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/DB-88F6XXX#4 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/EP80219#8 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/GUMSTIX#4 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/HL200#5 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/IQ31244#12 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/KB920X#12 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/NSLU#3 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/SIMICS#12 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/SKYEYE#10 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/armreg.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/cambria_fled.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/sparc64/loader/main.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/sys/dkio.h#3 delete .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/sys/dklabel.h#3 delete .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/syscalls.master#28 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_socket.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/compat/svr4/syscalls.master#6 integrate .. //depot/projects/scottl-camlock/src/sys/conf/NOTES#50 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files#65 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.amd64#27 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.i386#27 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.ia64#20 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.mips#3 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.pc98#20 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.sparc64#18 integrate .. //depot/projects/scottl-camlock/src/sys/conf/options.mips#3 integrate .. //depot/projects/scottl-camlock/src/sys/ddb/db_thread.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aac/aac.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aac/aac_pci.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aac/aacreg.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aac/aacvar.h#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpi_support/acpi_asus.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpi_support/acpi_sony.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi.c#29 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_cpu.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_video.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx_osm.c#23 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ah_eeprom_v14.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5416/ar5416phy.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5416/ar9280.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5416/ar9280.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5416/ar9280_attach.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/if_ath.c#34 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/if_athvar.h#21 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bge/if_bge.c#37 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/cxgb_sge.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/if_em.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/if_igb.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fb/vesa.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ixgbe/ixgbe.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mxge/if_mxge.c#26 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/usb/uaudio.c#27 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/usb/uaudioreg.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ehci.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ehci.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ehci_pci.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/fs/msdosfs/bootsect.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/fs/msdosfs/bpb.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/fs/msdosfs/denode.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/fs/msdosfs/direntry.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/fs/msdosfs/msdosfs_conv.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/fs/msdosfs/msdosfs_denode.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/fs/msdosfs/msdosfs_lookup.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/fs/msdosfs/msdosfs_vnops.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nfsserver/nfs_nfsdcache.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nfsserver/nfs_nfsdstate.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/i386/conf/GENERIC#31 integrate .. //depot/projects/scottl-camlock/src/sys/i386/conf/NOTES#32 integrate .. //depot/projects/scottl-camlock/src/sys/i386/conf/XEN#3 integrate .. //depot/projects/scottl-camlock/src/sys/i386/ibcs2/syscalls.master#9 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/conf/GENERIC#21 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/trap.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_umtx.c#23 integrate .. //depot/projects/scottl-camlock/src/sys/kern/makesyscalls.sh#10 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_bus.c#40 integrate .. //depot/projects/scottl-camlock/src/sys/kern/sys_process.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/kern/syscalls.master#23 integrate .. //depot/projects/scottl-camlock/src/sys/kern/tty_inq.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/kern/tty_outq.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/conf/ADM5120#4 integrate .. //depot/projects/scottl-camlock/src/sys/mips/conf/ALCHEMY#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/conf/AR71XX#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/conf/IDT#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/conf/MALTA#4 integrate .. //depot/projects/scottl-camlock/src/sys/mips/conf/MALTA64#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/conf/OCTEON1#4 integrate .. //depot/projects/scottl-camlock/src/sys/mips/conf/OCTEON1-32#5 integrate .. //depot/projects/scottl-camlock/src/sys/mips/conf/QEMU#4 integrate .. //depot/projects/scottl-camlock/src/sys/mips/conf/SENTRY5#4 integrate .. //depot/projects/scottl-camlock/src/sys/mips/conf/SWARM#4 integrate .. //depot/projects/scottl-camlock/src/sys/mips/conf/SWARM_SMP#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/conf/XLR#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/asm.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/cpu.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/hwfunc.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/intr_machdep.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/pcpu.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/smp.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/exception.S#6 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/intr_machdep.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/machdep.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/mp_machdep.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/mpboot.S#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/mips/nexus.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/pmap.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/tick.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/mips/rmi/dev/xlr/rge.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/sibyte/sb_asm.S#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/sibyte/sb_machdep.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/mips/sibyte/sb_scd.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/sibyte/sb_scd.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/sibyte/sb_zbbus.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/mips/sibyte/sb_zbpci.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_lagg.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_lagg.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_var.h#33 integrate .. //depot/projects/scottl-camlock/src/sys/net/vnet.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_crypto_tkip.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_ioctl.h#18 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_header.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_hostcache.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/nfs/nfs_common.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/nfs/nfs_common.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_krpc.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/nfsserver/nfs.h#15 integrate .. //depot/projects/scottl-camlock/src/sys/nfsserver/nfs_fha.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/nfsserver/nfs_srvkrpc.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/pc98/conf/GENERIC#25 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/conf/GENERIC#27 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/conf/MPC85XX#8 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/conf/GENERIC#30 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/include/asi.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/include/asmacros.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/include/cmt.h#1 branch .. //depot/projects/scottl-camlock/src/sys/sparc64/include/fireplane.h#1 branch .. //depot/projects/scottl-camlock/src/sys/sparc64/include/jbus.h#1 branch .. //depot/projects/scottl-camlock/src/sys/sparc64/include/ktr.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/include/md_var.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/include/upa.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/locore.S#4 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/machdep.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/mp_locore.S#4 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/mp_machdep.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/nexus.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/pmap.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/ssm.c#1 branch .. //depot/projects/scottl-camlock/src/sys/sun4v/conf/GENERIC#16 integrate .. //depot/projects/scottl-camlock/src/sys/sun4v/include/asi.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/sun4v/include/cmt.h#1 branch .. //depot/projects/scottl-camlock/src/sys/sun4v/include/fireplane.h#1 branch .. //depot/projects/scottl-camlock/src/sys/sun4v/include/jbus.h#1 branch .. //depot/projects/scottl-camlock/src/sys/sys/fbio.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/sys/ptrace.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/teken/teken_scs.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ffs/ffs_alloc.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ffs/ffs_vfsops.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ffs/fs.h#9 integrate .. //depot/projects/scottl-camlock/src/tools/build/mk/OptionalObsoleteFiles.inc#9 integrate .. //depot/projects/scottl-camlock/src/tools/regression/bin/sh/parameters/mail1.0#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/bin/sh/parameters/mail2.0#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/file/newfileops_on_fork/newfileops_on_fork.c#2 integrate .. //depot/projects/scottl-camlock/src/tools/regression/gaithrstress/gaithrstress.c#2 integrate .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/pkill/pgrep-q.t#1 branch .. //depot/projects/scottl-camlock/src/tools/tools/mctest/mctest.cc#2 integrate .. //depot/projects/scottl-camlock/src/tools/tools/netrate/http/http.c#2 integrate .. //depot/projects/scottl-camlock/src/tools/tools/netrate/httpd/httpd.c#2 integrate .. //depot/projects/scottl-camlock/src/tools/tools/netrate/juggle/juggle.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/Makefile#8 integrate .. //depot/projects/scottl-camlock/src/usr.bin/ee/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/usr.bin/ee/nls/pt_BR.ISO8859-1/ee.msg#1 branch .. //depot/projects/scottl-camlock/src/usr.bin/elf2aout/elf2aout.1#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/elf2aout/elf2aout.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/find/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/find/extern.h#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/find/function.c#6 integrate .. //depot/projects/scottl-camlock/src/usr.bin/find/getdate.y#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/kdump/kdump.c#6 integrate .. //depot/projects/scottl-camlock/src/usr.bin/procstat/procstat.1#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/tar/Makefile#6 integrate .. //depot/projects/scottl-camlock/src/usr.bin/tar/bsdtar.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/tar/bsdtar.h#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/tar/bsdtar_platform.h#4 integrate .. //depot/projects/scottl-camlock/src/usr.bin/tar/cmdline.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/tar/config_freebsd.h#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/tar/err.c#1 branch .. //depot/projects/scottl-camlock/src/usr.bin/tar/err.h#1 branch .. //depot/projects/scottl-camlock/src/usr.bin/tar/getdate.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/tar/line_reader.c#1 branch .. //depot/projects/scottl-camlock/src/usr.bin/tar/line_reader.h#1 branch .. //depot/projects/scottl-camlock/src/usr.bin/tar/matching.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/tar/matching.h#1 branch .. //depot/projects/scottl-camlock/src/usr.bin/tar/pathmatch.c#1 branch .. //depot/projects/scottl-camlock/src/usr.bin/tar/pathmatch.h#1 branch .. //depot/projects/scottl-camlock/src/usr.bin/tar/read.c#5 integrate .. //depot/projects/scottl-camlock/src/usr.bin/tar/siginfo.c#2 delete .. //depot/projects/scottl-camlock/src/usr.bin/tar/subst.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/tar/util.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/tar/write.c#5 integrate .. //depot/projects/scottl-camlock/src/usr.bin/uname/uname.1#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/uname/uname.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/w/w.c#8 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/pmcstat/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/pmcstat/pmcpl_annotate.c#1 branch .. //depot/projects/scottl-camlock/src/usr.sbin/pmcstat/pmcpl_annotate.h#1 branch .. //depot/projects/scottl-camlock/src/usr.sbin/pmcstat/pmcpl_callgraph.c#1 branch .. //depot/projects/scottl-camlock/src/usr.sbin/pmcstat/pmcpl_callgraph.h#1 branch .. //depot/projects/scottl-camlock/src/usr.sbin/pmcstat/pmcpl_calltree.c#1 branch .. //depot/projects/scottl-camlock/src/usr.sbin/pmcstat/pmcpl_calltree.h#1 branch .. //depot/projects/scottl-camlock/src/usr.sbin/pmcstat/pmcpl_gprof.c#1 branch .. //depot/projects/scottl-camlock/src/usr.sbin/pmcstat/pmcpl_gprof.h#1 branch .. //depot/projects/scottl-camlock/src/usr.sbin/pmcstat/pmcstat.8#4 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/pmcstat/pmcstat.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/pmcstat/pmcstat.h#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/pmcstat/pmcstat_log.c#4 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/pmcstat/pmcstat_log.h#1 branch .. //depot/projects/scottl-camlock/src/usr.sbin/pmcstat/pmcstat_top.h#1 branch .. //depot/projects/scottl-camlock/src/usr.sbin/rpcbind/rpcb_svc_com.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/rpcbind/rpcbind.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/rpcbind/rpcbind.h#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/rpcbind/util.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/sysinstall/package.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/wake/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/wake/wake.8#5 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/wake/wake.c#3 integrate Differences ... ==== //depot/projects/scottl-camlock/src/bin/ls/ls.c#5 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.89 2010/01/24 19:23:07 jh Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.90 2010/02/08 15:42:55 jh Exp $"); #include <sys/types.h> #include <sys/stat.h> @@ -113,6 +113,7 @@ static int f_listdot; /* list files beginning with . */ static int f_noautodot; /* do not automatically enable -A for root */ int f_longform; /* long listing format */ +static int f_nofollow; /* don't follow symbolic link arguments */ int f_nonprint; /* show unprintables as ? */ static int f_nosort; /* don't sort output */ int f_notabs; /* don't use tab-separated multi-col output */ @@ -234,6 +235,7 @@ break; case 'H': fts_options |= FTS_COMFOLLOW; + f_nofollow = 0; break; case 'G': setenv("CLICOLOR", "", 1); @@ -241,11 +243,13 @@ case 'L': fts_options &= ~FTS_PHYSICAL; fts_options |= FTS_LOGICAL; + f_nofollow = 0; break; case 'P': fts_options &= ~FTS_COMFOLLOW; fts_options &= ~FTS_LOGICAL; fts_options |= FTS_PHYSICAL; + f_nofollow = 1; break; case 'R': f_recursive = 1; @@ -396,10 +400,10 @@ fts_options |= FTS_NOSTAT; /* - * If not -F, -d or -l options, follow any symbolic links listed on + * If not -F, -P, -d or -l options, follow any symbolic links listed on * the command line. */ - if (!f_longform && !f_listdir && (!f_type || f_slash)) + if (!f_nofollow && !f_longform && !f_listdir && (!f_type || f_slash)) fts_options |= FTS_COMFOLLOW; /* ==== //depot/projects/scottl-camlock/src/bin/pax/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/bin/pax/Makefile,v 1.13 2010/02/04 07:18:19 imp Exp $ +# $FreeBSD: src/bin/pax/Makefile,v 1.14 2010/02/07 17:05:22 imp Exp $ # To install on versions prior to BSD 4.4 the following may have to be # defined with CFLAGS += @@ -33,6 +33,4 @@ #MAN= pax.1 tar.1 cpio.1 #LINKS= ${BINDIR}/pax ${BINDIR}/tar ${BINDIR}/pax ${BINDIR}/cpio -WARNS?= 3 - .include <bsd.prog.mk> ==== //depot/projects/scottl-camlock/src/bin/pax/cpio.h#2 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)cpio.h 8.1 (Berkeley) 5/31/93 - * $FreeBSD: src/bin/pax/cpio.h,v 1.7 2004/04/06 20:06:48 markm Exp $ + * $FreeBSD: src/bin/pax/cpio.h,v 1.8 2010/02/07 17:05:22 imp Exp $ */ /* @@ -67,7 +67,7 @@ char c_mtime[11]; /* modification time */ char c_namesize[6]; /* length of pathname */ char c_filesize[11]; /* length of file in bytes */ -} HD_CPIO; +} HD_CPIO __aligned(1); #define MAGIC 070707 /* transportable archive id */ @@ -98,7 +98,7 @@ u_char h_namesize[2]; u_char h_filesize_1[2]; u_char h_filesize_2[2]; -} HD_BCPIO; +} HD_BCPIO __aligned(1); #ifdef _PAX_ /* @@ -136,7 +136,7 @@ char c_rmin[8]; /* special file minor # */ char c_namesize[8]; /* length of pathname */ char c_chksum[8]; /* 0 OR CRC of bytes of FILE data */ -} HD_VCPIO; +} HD_VCPIO __aligned(1); #define VMAGIC 070701 /* sVr4 new portable archive id */ #define VCMAGIC 070702 /* sVr4 new portable archive id CRC */ ==== //depot/projects/scottl-camlock/src/bin/pax/tar.h#2 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tar.h 8.2 (Berkeley) 4/18/94 - * $FreeBSD: src/bin/pax/tar.h,v 1.7 2004/04/06 20:06:49 markm Exp $ + * $FreeBSD: src/bin/pax/tar.h,v 1.8 2010/02/07 17:05:22 imp Exp $ */ /* @@ -96,7 +96,7 @@ char chksum[CHK_LEN]; /* checksum */ char linkflag; /* norm, hard, or sym. */ char linkname[TNMSZ]; /* linked to name */ -} HD_TAR; +} HD_TAR __aligned(1); #ifdef _PAX_ /* @@ -142,4 +142,4 @@ char devmajor[8]; /* major device number */ char devminor[8]; /* minor device number */ char prefix[TPFSZ]; /* linked to name */ -} HD_USTAR; +} HD_USTAR __aligned(1); ==== //depot/projects/scottl-camlock/src/bin/pkill/pkill.1#2 (text+ko) ==== @@ -1,6 +1,6 @@ .\" $NetBSD: pkill.1,v 1.8 2003/02/14 15:59:18 grant Exp $ .\" -.\" $FreeBSD: src/bin/pkill/pkill.1,v 1.4 2009/05/17 04:34:14 brian Exp $ +.\" $FreeBSD: src/bin/pkill/pkill.1,v 1.5 2010/02/12 18:52:24 pjd Exp $ .\" .\" Copyright (c) 2002 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -36,7 +36,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd May 16, 2009 +.Dd February 11, 2010 .Dt PKILL 1 .Os .Sh NAME @@ -44,7 +44,7 @@ .Nd find or signal processes by name .Sh SYNOPSIS .Nm pgrep -.Op Fl LSafilnovx +.Op Fl LSafilnoqvx .Op Fl F Ar pidfile .Op Fl G Ar gid .Op Fl M Ar core @@ -175,6 +175,8 @@ Select only the newest (most recently started) of the matching processes. .It Fl o Select only the oldest (least recently started) of the matching processes. +.It Fl q +Do not write anything to standard output. .It Fl s Ar sid Restrict matches to processes with a session ID in the comma-separated list ==== //depot/projects/scottl-camlock/src/bin/pkill/pkill.c#4 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/pkill/pkill.c,v 1.7 2010/01/04 10:50:17 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/pkill/pkill.c,v 1.9 2010/02/12 18:52:24 pjd Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -49,6 +49,7 @@ #include <sys/time.h> #include <sys/user.h> +#include <assert.h> #include <stdio.h> #include <stdlib.h> #include <limits.h> @@ -110,6 +111,7 @@ static int fullmatch; static int kthreads; static int cflags = REG_EXTENDED; +static int quiet; static kvm_t *kd; static pid_t mypid; @@ -180,9 +182,11 @@ debug_opt = 0; pidfile = NULL; pidfilelock = 0; - execf = coref = _PATH_DEVNULL; + quiet = 0; + execf = NULL; + coref = _PATH_DEVNULL; - while ((ch = getopt(argc, argv, "DF:G:ILM:N:P:SU:ad:fg:ij:lnos:t:u:vx")) != -1) + while ((ch = getopt(argc, argv, "DF:G:ILM:N:P:SU:ad:fg:ij:lnoqs:t:u:vx")) != -1) switch (ch) { case 'D': debug_opt++; @@ -257,6 +261,11 @@ oldest = 1; criteria = 1; break; + case 'q': + if (!pgrep) + usage(); + quiet = 1; + break; case 's': makelist(&sidlist, LT_SID, optarg); criteria = 1; @@ -548,7 +557,7 @@ const char *ustr; if (pgrep) - ustr = "[-LSfilnovx] [-d delim]"; + ustr = "[-LSfilnoqvx] [-d delim]"; else ustr = "[-signal] [-ILfinovx]"; @@ -566,6 +575,10 @@ { char **argv; + if (quiet) { + assert(pgrep); + return; + } if ((longfmt || !pgrep) && matchargs && (argv = kvm_getargv(kd, kp, 0)) != NULL) { printf("%d ", (int)kp->ki_pid); @@ -622,7 +635,8 @@ { show_process(kp); - printf("%s", delim); + if (!quiet) + printf("%s", delim); return (1); } ==== //depot/projects/scottl-camlock/src/bin/ps/ps.c#4 (text+ko) ==== @@ -47,7 +47,7 @@ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.117 2009/07/23 10:20:12 brian Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.118 2010/02/08 21:23:48 brucec Exp $"); #include <sys/param.h> #include <sys/proc.h> @@ -212,7 +212,8 @@ init_list(&sesslist, addelem_pid, sizeof(pid_t), "session id"); init_list(&ttylist, addelem_tty, sizeof(dev_t), "tty"); init_list(&uidlist, addelem_uid, sizeof(uid_t), "user"); - memf = nlistf = _PATH_DEVNULL; + memf = _PATH_DEVNULL; + nlistf = NULL; while ((ch = getopt(argc, argv, PS_ARGS)) != -1) switch (ch) { case 'A': ==== //depot/projects/scottl-camlock/src/bin/sh/main.c#6 (text+ko) ==== @@ -42,7 +42,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/main.c,v 1.36 2009/12/27 18:04:05 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/main.c,v 1.37 2010/02/06 22:57:24 jilles Exp $"); #include <stdio.h> #include <signal.h> @@ -157,6 +157,8 @@ out2fmt_flush("sh: cannot determine working directory\n"); if (getpwd() != NULL) setvar ("PWD", getpwd(), VEXPORT); + if (iflag) + chkmail(1); if (argv[0] && argv[0][0] == '-') { state = 1; read_profile("/etc/profile"); ==== //depot/projects/scottl-camlock/src/bin/sh/var.c#8 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/var.c,v 1.44 2009/12/27 18:32:44 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/var.c,v 1.45 2010/02/06 22:57:24 jilles Exp $"); #include <unistd.h> #include <stdlib.h> @@ -337,8 +337,13 @@ /* * We could roll this to a function, to handle it as * a regular variable function callback, but why bother? + * + * Note: this assumes iflag is not set to 1 initially. + * As part of init(), this is called before arguments + * are looked at. */ - if (vp == &vmpath || (vp == &vmail && ! mpathset())) + if ((vp == &vmpath || (vp == &vmail && ! mpathset())) && + iflag == 1) chkmail(1); if ((vp->flags & VEXPORT) && localevar(s)) { change_env(s, 1); ==== //depot/projects/scottl-camlock/src/etc/defaults/rc.conf#16 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.368 2010/02/03 16:18:42 ume Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.369 2010/02/08 18:51:24 emax Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -118,6 +118,8 @@ firewall_quiet="NO" # Set to YES to suppress rule display firewall_logging="NO" # Set to YES to enable events logging firewall_flags="" # Flags passed to ipfw when type is a file +firewall_coscripts="" # List of executables/scripts to run after + # firewall starts/stops firewall_client_net="192.0.2.0/24" # IPv4 Network address for "client" # firewall. #firewall_client_net_ipv6="2001:db8:2:1::/64" # IPv6 network prefix for ==== //depot/projects/scottl-camlock/src/etc/rc.d/ipfw#7 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ipfw,v 1.22 2009/12/02 15:05:26 ume Exp $ +# $FreeBSD: src/etc/rc.d/ipfw,v 1.23 2010/02/08 18:51:24 emax Exp $ # # PROVIDE: ipfw @@ -14,6 +14,7 @@ rcvar="firewall_enable" start_cmd="ipfw_start" start_precmd="ipfw_prestart" +start_postcmd="ipfw_poststart" stop_cmd="ipfw_stop" required_modules="ipfw" @@ -42,9 +43,6 @@ [ -z "${firewall_script}" ] && firewall_script=/etc/rc.firewall if [ -r "${firewall_script}" ]; then - if [ -f /etc/rc.d/natd ] ; then - /etc/rc.d/natd quietstart - fi /bin/sh "${firewall_script}" "${_firewall_type}" echo 'Firewall rules loaded.' elif [ "`ipfw list 65535`" = "65535 deny ip from any to any" ]; then @@ -59,6 +57,19 @@ echo 'Firewall logging enabled.' sysctl net.inet.ip.fw.verbose=1 >/dev/null fi +} + +ipfw_poststart() +{ + local _coscript + + # Start firewall coscripts + # + for _coscript in ${firewall_coscripts} ; do + if [ -f "${_coscript}" ]; then + ${_coscript} quietstart + fi + done # Enable the firewall # @@ -75,16 +86,25 @@ ipfw_stop() { + local _coscript + # Disable the firewall # ${SYSCTL_W} net.inet.ip.fw.enable=0 if afexists inet6; then ${SYSCTL_W} net.inet6.ip6.fw.enable=0 fi - if [ -f /etc/rc.d/natd ] ; then - /etc/rc.d/natd quietstop - fi + + # Stop firewall coscripts + # + for _coscript in `reverse_list ${firewall_coscripts}` ; do + if [ -f "${_coscript}" ]; then + ${_coscript} quietstop + fi + done } load_rc_config $name +firewall_coscripts="/etc/rc.d/natd ${firewall_coscripts}" + run_rc_command $* ==== //depot/projects/scottl-camlock/src/etc/services#7 (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.117 2010/02/01 13:30:06 ume Exp $ +# $FreeBSD: src/etc/services,v 1.118 2010/02/06 21:22:01 bms Exp $ # From: @(#)services 5.8 (Berkeley) 5/9/91 # # WELL KNOWN PORT NUMBERS @@ -2340,6 +2340,8 @@ sge_execd 6445/udp #Grid Engine Execution Service xdsxdm 6558/tcp xdsxdm 6558/udp +sane-port 6566/tcp #Scanner Access Now Easy (SANE) Control Port +sane-port 6566/udp #Scanner Access Now Easy (SANE) Control Port ircd 6667/tcp #Internet Relay Chat (unoffical) acmsoda 6969/tcp acmsoda 6969/udp ==== //depot/projects/scottl-camlock/src/games/fortune/datfiles/fortunes#9 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.283 2010/01/05 23:35:43 stas Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.284 2010/02/09 14:51:39 gnn Exp $ % ======================================================================= || || @@ -33335,6 +33335,12 @@ % Mistakes are often the stepping stones to utter failure. % +Mistakeholder, n.: + A person who depends on accidental features or + implementation errors and so now has a vested + interest in keeping things from being fixed. + -- Chip Morningstar +% Mistrust first impulses; they are always right. % MIT: ==== //depot/projects/scottl-camlock/src/games/grdc/grdc.c#2 (text+ko) ==== @@ -11,7 +11,7 @@ * modified 03-25-03 for 12 hour option * - Samy Al Bahra <samy@kerneled.com> * - * $FreeBSD: src/games/grdc/grdc.c,v 1.12 2003/06/23 16:02:40 will Exp $ + * $FreeBSD: src/games/grdc/grdc.c,v 1.13 2010/02/10 18:20:20 delphij Exp $ */ #include <err.h> @@ -59,6 +59,7 @@ int argc; char **argv; { +struct timespec ts; long t, a; int i, j, s, k; int n; @@ -136,9 +137,9 @@ attrset(COLOR_PAIR(2)); } + time(&now); do { mask = 0; - time(&now); tm = localtime(&now); set(tm->tm_sec%10, 0); set(tm->tm_sec/10, 4); @@ -193,7 +194,19 @@ } movto(6, 0); refresh(); - sleep(1); + clock_gettime(CLOCK_REALTIME_FAST, &ts); + if (ts.tv_sec == now) { + if (ts.tv_nsec > 0) { + ts.tv_sec = 0; + ts.tv_nsec = 1000000000 - ts.tv_nsec; + } else { + ts.tv_sec = 1; + ts.tv_nsec = 0; + } + nanosleep(&ts, NULL); + now = ts.tv_sec + 1; + } else + now = ts.tv_sec; if (sigtermed) { standend(); clear(); ==== //depot/projects/scottl-camlock/src/gnu/usr.bin/gdb/kgdb/kthr.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/kthr.c,v 1.12 2008/05/01 20:36:48 jhb Exp $"); +__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/kthr.c,v 1.13 2010/02/13 11:47:04 avg Exp $"); #include <sys/param.h> #include <sys/proc.h> @@ -58,6 +58,7 @@ { struct nlist nl[2]; + nl[0].n_type = N_UNDF; nl[0].n_name = (char *)(uintptr_t)sym; nl[1].n_name = NULL; if (kvm_nlist(kvm, nl) != 0) ==== //depot/projects/scottl-camlock/src/gnu/usr.bin/groff/tmac/mdoc.local#8 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.73 2010/02/01 20:54:45 joerg Exp $ +.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.74 2010/02/09 18:40:40 marcel Exp $ .\" .\" %beginstrip% . @@ -43,6 +43,7 @@ .ds doc-str-Lb-libdevstat Device Statistics Library (libdevstat, \-ldevstat) .ds doc-str-Lb-libdisk Interface to Slice and Partition Labels Library (libdisk, \-ldisk) .ds doc-str-Lb-libedit Line Editor and History Library (libedit, \-ledit) +.ds doc-str-Lb-libefi EFI Runtime Services Library (libefi, \-lefi) .ds doc-str-Lb-libelf ELF Parsing Library (libelf, \-lelf) .ds doc-str-Lb-libfetch File Transfer Library (libfetch, \-lfetch) .ds doc-str-Lb-libgeom Userland API Library for kernel GEOM subsystem (libgeom, \-lgeom) ==== //depot/projects/scottl-camlock/src/lib/libc/nls/msgcat.c#4 (text+ko) ==== @@ -32,7 +32,7 @@ ******************************************************************/ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/nls/msgcat.c,v 1.53 2010/01/29 18:33:59 gabor Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/nls/msgcat.c,v 1.54 2010/02/09 19:37:12 gabor Exp $"); #define _NLS_PRIVATE @@ -77,19 +77,22 @@ #define NLERR ((nl_catd) -1) #define NLRETERR(errc) { errno = errc; return (NLERR); } -#define SAVEFAIL(n, e) { WLOCK(NLERR); \ - np = malloc(sizeof(struct catentry)); \ - if (np != NULL) { \ - np->name = strdup(n); \ - np->caterrno = e; \ - SLIST_INSERT_HEAD(&cache, np, list); \ - } \ - UNLOCK; \ - } +#define SAVEFAIL(n, l, e) { WLOCK(NLERR); \ + np = malloc(sizeof(struct catentry)); \ + if (np != NULL) { \ + np->name = strdup(n); \ + np->path = NULL; \ + np->lang = (l == NULL) ? NULL : strdup(l); \ + np->caterrno = e; \ + SLIST_INSERT_HEAD(&cache, np, list); \ + } \ + UNLOCK; \ + errno = e; \ + } static nl_catd load_msgcat(const char *, const char *, const char *); -static pthread_rwlock_t rwlock; +static pthread_rwlock_t rwlock = PTHREAD_RWLOCK_INITIALIZER; struct catentry { SLIST_ENTRY(catentry) list; @@ -114,10 +117,12 @@ int saverr, spcleft; char path[PATH_MAX]; + /* sanity checking */ if (name == NULL || *name == '\0') NLRETERR(EINVAL); if (strchr(name, '/') != NULL) + /* have a pathname */ lang = NULL; else { if (type == NL_CAT_LOCALE) @@ -135,12 +140,14 @@ /* Try to get it from the cache first */ RLOCK(NLERR); SLIST_FOREACH(np, &cache, list) { - if (strcmp(np->name, name) == 0) { + if ((strcmp(np->name, name) == 0) && + ((lang != NULL && np->lang != NULL && + strcmp(np->lang, lang) == 0) || (np->lang == lang))) { if (np->caterrno != 0) { /* Found cached failing entry */ UNLOCK; NLRETERR(np->caterrno); - } else if (strcmp(np->lang, lang) == 0) { + } else { /* Found cached successful entry */ np->refcount++; UNLOCK; @@ -154,6 +161,7 @@ if (strchr(name, '/') != NULL) return (load_msgcat(name, name, lang)); + /* sanity checking */ if ((plang = cptr1 = strdup(lang)) == NULL) return (NLERR); if ((cptr = strchr(cptr1, '@')) != NULL) @@ -218,6 +226,7 @@ too_long: free(plang); free(base); + SAVEFAIL(name, lang, ENAMETOOLONG); NLRETERR(ENAMETOOLONG); } pathP += strlen(tmpptr); @@ -241,6 +250,7 @@ } free(plang); free(base); + SAVEFAIL(name, lang, ENOENT); NLRETERR(ENOENT); } @@ -317,6 +327,7 @@ { struct catentry *np; + /* sanity checking */ if (catd == NULL || catd == NLERR) { >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201002141205.o1EC5Z1n011590>