Date: Thu, 11 Feb 2010 20:00:13 GMT From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 174606 for review Message-ID: <201002112000.o1BK0DsC059658@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/chv.cgi?CH=174606 Change 174606 by peter@peter_daintree on 2010/02/11 19:59:16 IFC @174600 Affected files ... .. //depot/projects/hammer/bin/ls/ls.c#21 integrate .. //depot/projects/hammer/bin/pax/Makefile#5 integrate .. //depot/projects/hammer/bin/pax/cpio.h#3 integrate .. //depot/projects/hammer/bin/pax/tar.h#3 integrate .. //depot/projects/hammer/bin/pkill/pkill.c#7 integrate .. //depot/projects/hammer/bin/ps/ps.c#26 integrate .. //depot/projects/hammer/bin/sh/main.c#11 integrate .. //depot/projects/hammer/bin/sh/var.c#19 integrate .. //depot/projects/hammer/contrib/csup/Makefile#4 integrate .. //depot/projects/hammer/contrib/csup/TODO#4 integrate .. //depot/projects/hammer/contrib/csup/auth.c#1 branch .. //depot/projects/hammer/contrib/csup/auth.h#1 branch .. //depot/projects/hammer/contrib/csup/config.h#3 integrate .. //depot/projects/hammer/contrib/csup/cpasswd.1#1 branch .. //depot/projects/hammer/contrib/csup/cpasswd.sh#1 branch .. //depot/projects/hammer/contrib/csup/csup.1#4 integrate .. //depot/projects/hammer/contrib/csup/main.c#3 integrate .. //depot/projects/hammer/contrib/csup/proto.c#5 integrate .. //depot/projects/hammer/contrib/netcat/FREEBSD-vendor#5 integrate .. //depot/projects/hammer/etc/defaults/rc.conf#104 integrate .. //depot/projects/hammer/etc/network.subr#34 integrate .. //depot/projects/hammer/etc/rc.d/Makefile#71 integrate .. //depot/projects/hammer/etc/rc.d/ipfw#21 integrate .. //depot/projects/hammer/etc/rc.d/ntpdate#15 integrate .. //depot/projects/hammer/etc/rc.d/rtsold#3 branch .. //depot/projects/hammer/etc/services#19 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes#92 integrate .. //depot/projects/hammer/games/grdc/grdc.c#4 integrate .. //depot/projects/hammer/games/morse/Makefile#3 integrate .. //depot/projects/hammer/games/morse/morse.c#9 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/Makefile.inc#6 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/gdb/Makefile.alpha#3 delete .. //depot/projects/hammer/gnu/usr.bin/binutils/ld/Makefile.alpha#8 delete .. //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/Makefile#12 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/Makefile.alpha#7 delete .. //depot/projects/hammer/gnu/usr.bin/binutils/libopcodes/Makefile.alpha#2 delete .. //depot/projects/hammer/gnu/usr.bin/groff/tmac/mdoc.local#38 integrate .. //depot/projects/hammer/lib/Makefile#81 integrate .. //depot/projects/hammer/lib/libc/gen/devname.c#5 integrate .. //depot/projects/hammer/lib/libc/gen/getutxent.3#3 integrate .. //depot/projects/hammer/lib/libc/gen/rand48.3#5 integrate .. //depot/projects/hammer/lib/libc/mips/sys/ptrace.S#2 integrate .. //depot/projects/hammer/lib/libc/net/sctp_opt_info.3#5 integrate .. //depot/projects/hammer/lib/libc/net/sctp_recvmsg.3#5 integrate .. //depot/projects/hammer/lib/libc/net/sctp_send.3#6 integrate .. //depot/projects/hammer/lib/libc/net/sctp_sendmsg.3#6 integrate .. //depot/projects/hammer/lib/libc/net/sctp_sys_calls.c#10 integrate .. //depot/projects/hammer/lib/libc/nls/msgcat.c#10 integrate .. //depot/projects/hammer/lib/libc/posix1e/mac.3#10 integrate .. //depot/projects/hammer/lib/libc/stdlib/malloc.3#23 integrate .. //depot/projects/hammer/lib/libc/stdlib/malloc.c#55 integrate .. //depot/projects/hammer/lib/libc/stdlib/ql.h#1 branch .. //depot/projects/hammer/lib/libc/stdlib/qr.h#1 branch .. //depot/projects/hammer/lib/libc/stdlib/strfmon.c#10 integrate .. //depot/projects/hammer/lib/libc/string/memccpy.3#3 integrate .. //depot/projects/hammer/lib/libc/string/memchr.3#6 integrate .. //depot/projects/hammer/lib/libc/string/memcmp.3#4 integrate .. //depot/projects/hammer/lib/libc/string/memset.3#4 integrate .. //depot/projects/hammer/lib/libc/string/strndup.c#2 integrate .. //depot/projects/hammer/lib/libc/sys/ptrace.2#12 integrate .. //depot/projects/hammer/lib/libc/sys/shm_open.2#2 integrate .. //depot/projects/hammer/lib/libefi/Makefile#1 branch .. //depot/projects/hammer/lib/libefi/efi_getvar.c#1 branch .. //depot/projects/hammer/lib/libefi/efi_nextvarname.c#1 branch .. //depot/projects/hammer/lib/libefi/efi_setvar.c#1 branch .. //depot/projects/hammer/lib/libefi/libefi.3#1 branch .. //depot/projects/hammer/lib/libefi/libefi.c#1 branch .. //depot/projects/hammer/lib/libefi/libefi.h#1 branch .. //depot/projects/hammer/lib/libefi/libefi_int.h#1 branch .. //depot/projects/hammer/lib/libgpib/Makefile#10 integrate .. //depot/projects/hammer/lib/libgpib/gpib.3#1 branch .. //depot/projects/hammer/lib/libpam/modules/pam_unix/pam_unix.c#12 integrate .. //depot/projects/hammer/lib/libufs/Makefile#12 integrate .. //depot/projects/hammer/lib/libufs/cgroup.c#4 integrate .. //depot/projects/hammer/lib/libufs/sblock.c#5 integrate .. //depot/projects/hammer/lib/libusb/libusb.h#4 integrate .. //depot/projects/hammer/lib/libusb/libusb10.c#4 integrate .. //depot/projects/hammer/lib/libusb/libusb10_desc.c#4 integrate .. //depot/projects/hammer/lib/libusb/libusb10_io.c#4 integrate .. //depot/projects/hammer/lib/libusb/libusb20.3#4 integrate .. //depot/projects/hammer/lib/libusb/libusb20.c#6 integrate .. //depot/projects/hammer/lib/libusb/libusb20.h#5 integrate .. //depot/projects/hammer/lib/libusb/libusb20_compat01.c#4 integrate .. //depot/projects/hammer/lib/libusb/libusb20_desc.c#3 integrate .. //depot/projects/hammer/lib/libusb/libusb20_int.h#5 integrate .. //depot/projects/hammer/lib/libusb/libusb20_ugen20.c#6 integrate .. //depot/projects/hammer/lib/libusb/usb.h#2 integrate .. //depot/projects/hammer/lib/msun/amd64/fenv.c#5 integrate .. //depot/projects/hammer/lib/msun/amd64/fenv.h#5 integrate .. //depot/projects/hammer/lib/msun/i387/fenv.c#4 integrate .. //depot/projects/hammer/lib/msun/i387/fenv.h#5 integrate .. //depot/projects/hammer/libexec/ftpd/logwtmp.c#6 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/article.sgml#21 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/article.sgml#43 integrate .. //depot/projects/hammer/sbin/camcontrol/camcontrol.c#17 integrate .. //depot/projects/hammer/sbin/dump/itime.c#6 integrate .. //depot/projects/hammer/sbin/dump/main.c#18 integrate .. //depot/projects/hammer/sbin/geom/class/multipath/geom_multipath.c#3 integrate .. //depot/projects/hammer/sbin/growfs/growfs.c#17 integrate .. //depot/projects/hammer/sbin/ifconfig/ifcarp.c#2 integrate .. //depot/projects/hammer/sbin/iscontrol/iscontrol.h#3 integrate .. //depot/projects/hammer/sbin/iscontrol/pdu.c#3 integrate .. //depot/projects/hammer/sbin/mknod/mknod.8#12 integrate .. //depot/projects/hammer/sbin/mknod/mknod.c#4 integrate .. //depot/projects/hammer/sbin/mount/mount.8#32 integrate .. //depot/projects/hammer/sbin/mount_nfs/mount_nfs.c#24 integrate .. //depot/projects/hammer/sbin/newfs/mkfs.c#27 integrate .. //depot/projects/hammer/sbin/newfs/newfs.c#20 integrate .. //depot/projects/hammer/sbin/newfs/newfs.h#12 integrate .. //depot/projects/hammer/sbin/restore/Makefile#6 integrate .. //depot/projects/hammer/sbin/restore/dirs.c#11 integrate .. //depot/projects/hammer/sbin/restore/extern.h#5 integrate .. //depot/projects/hammer/sbin/restore/interactive.c#11 integrate .. //depot/projects/hammer/sbin/restore/tape.c#11 integrate .. //depot/projects/hammer/sbin/sysctl/sysctl.8#16 integrate .. //depot/projects/hammer/sbin/sysctl/sysctl.c#28 integrate .. //depot/projects/hammer/sbin/tunefs/tunefs.c#10 integrate .. //depot/projects/hammer/sbin/umount/umount.c#14 integrate .. //depot/projects/hammer/share/examples/kld/cdev/test/Makefile#5 integrate .. //depot/projects/hammer/share/examples/kld/syscall/test/Makefile#6 integrate .. //depot/projects/hammer/share/man/man4/Makefile#129 integrate .. //depot/projects/hammer/share/man/man4/acpi_asus.4#4 integrate .. //depot/projects/hammer/share/man/man4/acpi_fujitsu.4#2 integrate .. //depot/projects/hammer/share/man/man4/acpi_hp.4#3 integrate .. //depot/projects/hammer/share/man/man4/acpi_ibm.4#2 integrate .. //depot/projects/hammer/share/man/man4/acpi_panasonic.4#3 integrate .. //depot/projects/hammer/share/man/man4/acpi_sony.4#2 integrate .. //depot/projects/hammer/share/man/man4/acpi_toshiba.4#2 integrate .. //depot/projects/hammer/share/man/man4/acpi_wmi.4#3 integrate .. //depot/projects/hammer/share/man/man4/ahci.4#3 integrate .. //depot/projects/hammer/share/man/man4/alpm.4#1 branch .. //depot/projects/hammer/share/man/man4/amdpm.4#1 branch .. //depot/projects/hammer/share/man/man4/gpib.4#2 integrate .. //depot/projects/hammer/share/man/man4/io.4#2 integrate .. //depot/projects/hammer/share/man/man4/iwn.4#7 integrate .. //depot/projects/hammer/share/man/man4/iwnfw.4#4 integrate .. //depot/projects/hammer/share/man/man4/linux.4#2 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/Makefile#42 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/alpm.4#2 delete .. //depot/projects/hammer/share/man/man4/man4.i386/amdpm.4#4 delete .. //depot/projects/hammer/share/man/man4/man4.i386/mcd.4#7 delete .. //depot/projects/hammer/share/man/man4/man4.i386/padlock.4#6 delete .. //depot/projects/hammer/share/man/man4/man4.i386/pcf.4#2 delete .. //depot/projects/hammer/share/man/man4/man4.i386/scd.4#7 delete .. //depot/projects/hammer/share/man/man4/man4.i386/viapm.4#3 delete .. //depot/projects/hammer/share/man/man4/mcd.4#1 branch .. //depot/projects/hammer/share/man/man4/ndis.4#4 integrate .. //depot/projects/hammer/share/man/man4/nvram.4#2 integrate .. //depot/projects/hammer/share/man/man4/padlock.4#1 branch .. //depot/projects/hammer/share/man/man4/pcf.4#1 branch .. //depot/projects/hammer/share/man/man4/pcii.4#2 integrate .. //depot/projects/hammer/share/man/man4/run.4#1 branch .. //depot/projects/hammer/share/man/man4/scd.4#1 branch .. //depot/projects/hammer/share/man/man4/sctp.4#4 integrate .. //depot/projects/hammer/share/man/man4/tnt4882.4#2 integrate .. //depot/projects/hammer/share/man/man4/viapm.4#1 branch .. //depot/projects/hammer/share/man/man4/vr.4#17 integrate .. //depot/projects/hammer/share/man/man5/rc.conf.5#102 integrate .. //depot/projects/hammer/share/man/man5/tmpfs.5#4 integrate .. //depot/projects/hammer/share/man/man8/rc.subr.8#15 integrate .. //depot/projects/hammer/share/man/man9/VFS.9#7 integrate .. //depot/projects/hammer/share/man/man9/alloc_unr.9#4 integrate .. //depot/projects/hammer/share/man/man9/locking.9#6 integrate .. //depot/projects/hammer/share/man/man9/mtx_pool.9#7 integrate .. //depot/projects/hammer/share/man/man9/vnode.9#9 integrate .. //depot/projects/hammer/share/misc/committers-src.dot#25 integrate .. //depot/projects/hammer/share/zoneinfo/Makefile#8 integrate .. //depot/projects/hammer/sys/amd64/amd64/amd64_mem.c#15 integrate .. //depot/projects/hammer/sys/amd64/amd64/msi.c#11 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC#128 integrate .. //depot/projects/hammer/sys/amd64/conf/NOTES#126 integrate .. //depot/projects/hammer/sys/amd64/conf/XENHVM#5 integrate .. //depot/projects/hammer/sys/arm/arm/db_trace.c#15 integrate .. //depot/projects/hammer/sys/arm/arm/pmap.c#60 integrate .. //depot/projects/hammer/sys/arm/conf/AVILA#23 integrate .. //depot/projects/hammer/sys/arm/conf/BWCT#10 integrate .. //depot/projects/hammer/sys/arm/conf/CAMBRIA#9 integrate .. //depot/projects/hammer/sys/arm/conf/CNS11XXNAS#2 integrate .. //depot/projects/hammer/sys/arm/conf/CRB#10 integrate .. //depot/projects/hammer/sys/arm/conf/DB-78XXX#6 integrate .. //depot/projects/hammer/sys/arm/conf/DB-88F5XXX#6 integrate .. //depot/projects/hammer/sys/arm/conf/DB-88F6XXX#6 integrate .. //depot/projects/hammer/sys/arm/conf/EP80219#11 integrate .. //depot/projects/hammer/sys/arm/conf/GUMSTIX#6 integrate .. //depot/projects/hammer/sys/arm/conf/HL200#12 integrate .. //depot/projects/hammer/sys/arm/conf/IQ31244#21 integrate .. //depot/projects/hammer/sys/arm/conf/KB920X#17 integrate .. //depot/projects/hammer/sys/arm/conf/NSLU#8 integrate .. //depot/projects/hammer/sys/arm/conf/SIMICS#18 integrate .. //depot/projects/hammer/sys/arm/conf/SKYEYE#11 integrate .. //depot/projects/hammer/sys/arm/xscale/ixp425/cambria_fled.c#2 integrate .. //depot/projects/hammer/sys/cam/ata/ata_all.c#6 integrate .. //depot/projects/hammer/sys/cam/ata/ata_da.c#6 integrate .. //depot/projects/hammer/sys/cam/ata/ata_pmp.c#3 integrate .. //depot/projects/hammer/sys/cam/ata/ata_xpt.c#6 integrate .. //depot/projects/hammer/sys/cam/cam.c#10 integrate .. //depot/projects/hammer/sys/cam/cam.h#7 integrate .. //depot/projects/hammer/sys/cam/cam_ccb.h#13 integrate .. //depot/projects/hammer/sys/cam/cam_periph.c#32 integrate .. //depot/projects/hammer/sys/cam/cam_periph.h#10 integrate .. //depot/projects/hammer/sys/cam/cam_queue.h#5 integrate .. //depot/projects/hammer/sys/cam/cam_sim.c#9 integrate .. //depot/projects/hammer/sys/cam/cam_xpt.c#48 integrate .. //depot/projects/hammer/sys/cam/cam_xpt.h#8 integrate .. //depot/projects/hammer/sys/cam/cam_xpt_internal.h#5 integrate .. //depot/projects/hammer/sys/cam/cam_xpt_periph.h#6 integrate .. //depot/projects/hammer/sys/cam/cam_xpt_sim.h#5 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_all.c#20 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_cd.c#34 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_ch.c#18 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_da.c#56 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_low.c#14 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_pass.c#17 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_xpt.c#4 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#6 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/sys/dkio.h#3 delete .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/sys/dklabel.h#3 delete .. //depot/projects/hammer/sys/compat/freebsd32/syscalls.master#70 integrate .. //depot/projects/hammer/sys/compat/linux/linux_socket.c#40 integrate .. //depot/projects/hammer/sys/compat/svr4/syscalls.master#9 integrate .. //depot/projects/hammer/sys/conf/NOTES#171 integrate .. //depot/projects/hammer/sys/conf/files#209 integrate .. //depot/projects/hammer/sys/conf/files.amd64#118 integrate .. //depot/projects/hammer/sys/conf/files.i386#110 integrate .. //depot/projects/hammer/sys/conf/files.ia64#50 integrate .. //depot/projects/hammer/sys/conf/files.mips#8 integrate .. //depot/projects/hammer/sys/conf/files.pc98#80 integrate .. //depot/projects/hammer/sys/conf/files.sparc64#54 integrate .. //depot/projects/hammer/sys/contrib/dev/run/LICENSE#1 branch .. //depot/projects/hammer/sys/contrib/dev/run/rt2870.fw.uu#1 branch .. //depot/projects/hammer/sys/dev/acpi_support/acpi_sony.c#10 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi.c#95 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_cpu.c#50 integrate .. //depot/projects/hammer/sys/dev/ahci/ahci.c#9 integrate .. //depot/projects/hammer/sys/dev/ahci/ahci.h#5 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx_osm.c#25 integrate .. //depot/projects/hammer/sys/dev/asr/asr.c#27 integrate .. //depot/projects/hammer/sys/dev/ata/ata-all.c#79 integrate .. //depot/projects/hammer/sys/dev/ata/ata-all.h#57 integrate .. //depot/projects/hammer/sys/dev/ata/atapi-cam.c#34 integrate .. //depot/projects/hammer/sys/dev/ata/chipsets/ata-netcell.c#5 integrate .. //depot/projects/hammer/sys/dev/ata/chipsets/ata-siliconimage.c#7 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ah_eeprom_v14.h#2 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ah_eeprom_v4k.h#2 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5212/ar5212_power.c#2 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5212/ar5212reg.h#3 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar5416.h#4 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar5416_ani.c#3 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c#6 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar5416_beacon.c#2 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c#3 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar5416_cal.h#3 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar5416_cal_adcdc.c#2 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar5416_cal_adcgain.c#2 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar5416_cal_iq.c#2 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar5416_eeprom.c#2 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar5416_gpio.c#3 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar5416_keycache.c#2 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c#2 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar5416_phy.c#2 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar5416_power.c#2 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar5416_recv.c#2 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#7 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar5416desc.h#2 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar5416phy.h#2 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar5416reg.h#3 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar9160_attach.c#4 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar9280.c#2 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar9280.h#2 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar9280_attach.c#2 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar9285.ini#1 branch .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar9285v2.ini#1 branch .. //depot/projects/hammer/sys/dev/ath/if_ath.c#78 integrate .. //depot/projects/hammer/sys/dev/ath/if_athvar.h#43 integrate .. //depot/projects/hammer/sys/dev/bge/if_bge.c#96 integrate .. //depot/projects/hammer/sys/dev/ciss/ciss.c#58 integrate .. //depot/projects/hammer/sys/dev/drm/drmP.h#26 integrate .. //depot/projects/hammer/sys/dev/drm/drm_hashtab.c#1 branch .. //depot/projects/hammer/sys/dev/drm/drm_hashtab.h#1 branch .. //depot/projects/hammer/sys/dev/drm/drm_linux_list.h#7 integrate .. //depot/projects/hammer/sys/dev/drm/drm_memory.c#5 integrate .. //depot/projects/hammer/sys/dev/drm/drm_mm.c#1 branch .. //depot/projects/hammer/sys/dev/drm/drm_mm.h#1 branch .. //depot/projects/hammer/sys/dev/drm/drm_sman.c#1 branch .. //depot/projects/hammer/sys/dev/drm/drm_sman.h#1 branch .. //depot/projects/hammer/sys/dev/drm/i915_drv.c#11 integrate .. //depot/projects/hammer/sys/dev/drm/i915_drv.h#11 integrate .. //depot/projects/hammer/sys/dev/drm/via_3d_reg.h#1 branch .. //depot/projects/hammer/sys/dev/drm/via_dma.c#1 branch .. //depot/projects/hammer/sys/dev/drm/via_dmablit.c#1 branch .. //depot/projects/hammer/sys/dev/drm/via_dmablit.h#1 branch .. //depot/projects/hammer/sys/dev/drm/via_drm.h#1 branch .. //depot/projects/hammer/sys/dev/drm/via_drv.c#1 branch .. //depot/projects/hammer/sys/dev/drm/via_drv.h#1 branch .. //depot/projects/hammer/sys/dev/drm/via_irq.c#1 branch .. //depot/projects/hammer/sys/dev/drm/via_map.c#1 branch .. //depot/projects/hammer/sys/dev/drm/via_mm.c#1 branch .. //depot/projects/hammer/sys/dev/drm/via_verifier.c#1 branch .. //depot/projects/hammer/sys/dev/drm/via_verifier.h#1 branch .. //depot/projects/hammer/sys/dev/drm/via_video.c#1 branch .. //depot/projects/hammer/sys/dev/e1000/if_em.c#14 integrate .. //depot/projects/hammer/sys/dev/e1000/if_igb.c#13 integrate .. //depot/projects/hammer/sys/dev/fb/vesa.c#6 integrate .. //depot/projects/hammer/sys/dev/hptiop/hptiop.c#6 integrate .. //depot/projects/hammer/sys/dev/hptrr/hptrr_osm_bsd.c#6 integrate .. //depot/projects/hammer/sys/dev/hptrr/os_bsd.h#3 integrate .. //depot/projects/hammer/sys/dev/ieee488/ibfoo.c#5 integrate .. //depot/projects/hammer/sys/dev/ieee488/pcii.c#8 integrate .. //depot/projects/hammer/sys/dev/ieee488/tnt4882.c#5 integrate .. //depot/projects/hammer/sys/dev/ieee488/tnt4882.h#1 branch .. //depot/projects/hammer/sys/dev/ieee488/upd7210.c#10 integrate .. //depot/projects/hammer/sys/dev/ieee488/upd7210.h#7 integrate .. //depot/projects/hammer/sys/dev/isp/isp.c#34 integrate .. //depot/projects/hammer/sys/dev/isp/isp_freebsd.c#38 integrate .. //depot/projects/hammer/sys/dev/isp/isp_library.c#10 integrate .. //depot/projects/hammer/sys/dev/isp/isp_library.h#7 integrate .. //depot/projects/hammer/sys/dev/isp/isp_pci.c#33 integrate .. //depot/projects/hammer/sys/dev/isp/isp_sbus.c#23 integrate .. //depot/projects/hammer/sys/dev/isp/ispmbox.h#16 integrate .. //depot/projects/hammer/sys/dev/isp/ispvar.h#22 integrate .. //depot/projects/hammer/sys/dev/mly/mly.c#23 integrate .. //depot/projects/hammer/sys/dev/mpt/mpt_cam.c#24 integrate .. //depot/projects/hammer/sys/dev/mpt/mpt_cam.h#7 integrate .. //depot/projects/hammer/sys/dev/mpt/mpt_raid.c#17 integrate .. //depot/projects/hammer/sys/dev/pci/pci.c#80 integrate .. //depot/projects/hammer/sys/dev/pci/pcireg.h#26 integrate .. //depot/projects/hammer/sys/dev/pci/pcivar.h#22 integrate .. //depot/projects/hammer/sys/dev/ppbus/vpo.c#16 integrate .. //depot/projects/hammer/sys/dev/siba/siba.c#2 integrate .. //depot/projects/hammer/sys/dev/siba/siba_bwn.c#1 branch .. //depot/projects/hammer/sys/dev/siba/siba_cc.c#2 integrate .. //depot/projects/hammer/sys/dev/siba/siba_core.c#1 branch .. //depot/projects/hammer/sys/dev/siba/siba_ids.h#2 integrate .. //depot/projects/hammer/sys/dev/siba/siba_pcib.c#2 integrate .. //depot/projects/hammer/sys/dev/siba/sibareg.h#2 integrate .. //depot/projects/hammer/sys/dev/siba/sibavar.h#2 integrate .. //depot/projects/hammer/sys/dev/siis/siis.c#6 integrate .. //depot/projects/hammer/sys/dev/siis/siis.h#4 integrate .. //depot/projects/hammer/sys/dev/sound/usb/uaudio.c#26 integrate .. //depot/projects/hammer/sys/dev/sound/usb/uaudioreg.h#8 integrate .. //depot/projects/hammer/sys/dev/trm/trm.c#25 integrate .. //depot/projects/hammer/sys/dev/twa/tw_osl_cam.c#12 integrate .. //depot/projects/hammer/sys/dev/usb/controller/ehci.c#9 integrate .. //depot/projects/hammer/sys/dev/usb/controller/ehci.h#7 integrate .. //depot/projects/hammer/sys/dev/usb/controller/ehci_pci.c#9 integrate .. //depot/projects/hammer/sys/dev/usb/quirk/usb_quirk.c#8 integrate .. //depot/projects/hammer/sys/dev/usb/serial/u3g.c#11 integrate .. //depot/projects/hammer/sys/dev/usb/storage/umass.c#12 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#129 integrate .. //depot/projects/hammer/sys/dev/usb/wlan/if_rum.c#8 integrate .. //depot/projects/hammer/sys/dev/usb/wlan/if_run.c#1 branch .. //depot/projects/hammer/sys/dev/usb/wlan/if_runreg.h#1 branch .. //depot/projects/hammer/sys/dev/usb/wlan/if_runvar.h#1 branch .. //depot/projects/hammer/sys/dev/usb/wlan/if_uath.c#7 integrate .. //depot/projects/hammer/sys/dev/usb/wlan/if_zyd.c#8 integrate .. //depot/projects/hammer/sys/fs/devfs/devfs_devs.c#25 integrate .. //depot/projects/hammer/sys/fs/nfsclient/nfs.h#3 integrate .. //depot/projects/hammer/sys/fs/nfsclient/nfs_clbio.c#6 integrate .. //depot/projects/hammer/sys/fs/nfsclient/nfs_clnfsiod.c#2 integrate .. //depot/projects/hammer/sys/fs/nfsclient/nfs_clsubs.c#4 integrate .. //depot/projects/hammer/sys/fs/nfsclient/nfs_clvfsops.c#5 integrate .. //depot/projects/hammer/sys/fs/nfsclient/nfs_clvnops.c#8 integrate .. //depot/projects/hammer/sys/fs/nfsclient/nfsmount.h#2 integrate .. //depot/projects/hammer/sys/fs/nfsclient/nfsnode.h#2 integrate .. //depot/projects/hammer/sys/fs/tmpfs/tmpfs_vfsops.c#19 integrate .. //depot/projects/hammer/sys/geom/geom_redboot.c#3 integrate .. //depot/projects/hammer/sys/geom/part/g_part_gpt.c#19 integrate .. //depot/projects/hammer/sys/geom/virstor/g_virstor.c#4 integrate .. //depot/projects/hammer/sys/i386/conf/GENERIC#87 integrate .. //depot/projects/hammer/sys/i386/conf/NOTES#119 integrate .. //depot/projects/hammer/sys/i386/conf/XEN#8 integrate .. //depot/projects/hammer/sys/i386/i386/i686_mem.c#14 integrate .. //depot/projects/hammer/sys/i386/i386/msi.c#11 integrate .. //depot/projects/hammer/sys/i386/i386/pmap.c#129 integrate .. //depot/projects/hammer/sys/i386/ibcs2/syscalls.master#11 integrate .. //depot/projects/hammer/sys/ia64/conf/GENERIC#44 integrate .. //depot/projects/hammer/sys/ia64/ia64/trap.c#45 integrate .. //depot/projects/hammer/sys/ia64/pci/pci_cfgreg.c#2 integrate .. //depot/projects/hammer/sys/kern/kern_shutdown.c#63 integrate .. //depot/projects/hammer/sys/kern/kern_umtx.c#38 integrate .. //depot/projects/hammer/sys/kern/makesyscalls.sh#17 integrate .. //depot/projects/hammer/sys/kern/subr_bus.c#75 integrate .. //depot/projects/hammer/sys/kern/sys_process.c#52 integrate .. //depot/projects/hammer/sys/kern/syscalls.master#78 integrate .. //depot/projects/hammer/sys/kern/tty_inq.c#5 integrate .. //depot/projects/hammer/sys/kern/tty_outq.c#3 integrate .. //depot/projects/hammer/sys/kern/vfs_lookup.c#48 integrate .. //depot/projects/hammer/sys/mips/atheros/ar71xx_pci.c#2 integrate .. //depot/projects/hammer/sys/mips/cavium/asm_octeon.S#2 integrate .. //depot/projects/hammer/sys/mips/cavium/dev/rgmii/octeon_fau.c#2 integrate .. //depot/projects/hammer/sys/mips/cavium/dev/rgmii/octeon_fau.h#2 integrate .. //depot/projects/hammer/sys/mips/cavium/dev/rgmii/octeon_fpa.c#3 integrate .. //depot/projects/hammer/sys/mips/cavium/dev/rgmii/octeon_fpa.h#2 integrate .. //depot/projects/hammer/sys/mips/cavium/dev/rgmii/octeon_ipd.c#2 integrate .. //depot/projects/hammer/sys/mips/cavium/dev/rgmii/octeon_ipd.h#2 integrate .. //depot/projects/hammer/sys/mips/cavium/dev/rgmii/octeon_pip.h#2 integrate .. //depot/projects/hammer/sys/mips/cavium/dev/rgmii/octeon_pko.c#2 integrate .. //depot/projects/hammer/sys/mips/cavium/dev/rgmii/octeon_pko.h#2 integrate .. //depot/projects/hammer/sys/mips/cavium/dev/rgmii/octeon_rgmx.c#2 integrate .. //depot/projects/hammer/sys/mips/cavium/dev/rgmii/octeon_rgmx.h#2 integrate .. //depot/projects/hammer/sys/mips/cavium/driveid.h#2 integrate .. //depot/projects/hammer/sys/mips/cavium/obiovar.h#2 integrate .. //depot/projects/hammer/sys/mips/cavium/octeon_ebt3000_cf.c#2 integrate .. //depot/projects/hammer/sys/mips/cavium/octeon_ebt3000_cf.h#2 integrate .. //depot/projects/hammer/sys/mips/cavium/octeon_machdep.c#4 integrate .. //depot/projects/hammer/sys/mips/cavium/octeon_pcmap_regs.h#3 integrate .. //depot/projects/hammer/sys/mips/conf/ADM5120#7 integrate .. //depot/projects/hammer/sys/mips/conf/ALCHEMY#2 integrate .. //depot/projects/hammer/sys/mips/conf/AR71XX#3 integrate .. //depot/projects/hammer/sys/mips/conf/IDT#8 integrate .. //depot/projects/hammer/sys/mips/conf/MALTA#7 integrate .. //depot/projects/hammer/sys/mips/conf/MALTA64#3 integrate .. //depot/projects/hammer/sys/mips/conf/OCTEON1#3 integrate .. //depot/projects/hammer/sys/mips/conf/OCTEON1-32#4 integrate .. //depot/projects/hammer/sys/mips/conf/QEMU#6 integrate .. //depot/projects/hammer/sys/mips/conf/SENTRY5#8 integrate .. //depot/projects/hammer/sys/mips/conf/SWARM#3 integrate .. //depot/projects/hammer/sys/mips/conf/SWARM_SMP#1 branch .. //depot/projects/hammer/sys/mips/conf/XLR#3 integrate .. //depot/projects/hammer/sys/mips/include/asm.h#3 integrate .. //depot/projects/hammer/sys/mips/include/cpu.h#4 integrate .. //depot/projects/hammer/sys/mips/include/hwfunc.h#3 integrate .. //depot/projects/hammer/sys/mips/include/intr_machdep.h#3 integrate .. //depot/projects/hammer/sys/mips/include/pcpu.h#3 integrate .. //depot/projects/hammer/sys/mips/include/proc.h#3 integrate .. //depot/projects/hammer/sys/mips/include/smp.h#4 integrate .. //depot/projects/hammer/sys/mips/mips/exception.S#5 integrate .. //depot/projects/hammer/sys/mips/mips/genassym.c#3 integrate .. //depot/projects/hammer/sys/mips/mips/intr_machdep.c#6 integrate .. //depot/projects/hammer/sys/mips/mips/locore.S#4 integrate .. //depot/projects/hammer/sys/mips/mips/machdep.c#11 integrate .. //depot/projects/hammer/sys/mips/mips/mp_machdep.c#6 integrate .. //depot/projects/hammer/sys/mips/mips/mpboot.S#1 branch .. //depot/projects/hammer/sys/mips/mips/pmap.c#15 integrate .. //depot/projects/hammer/sys/mips/mips/swtch.S#5 integrate .. //depot/projects/hammer/sys/mips/mips/tick.c#5 integrate .. //depot/projects/hammer/sys/mips/mips/trap.c#6 integrate .. //depot/projects/hammer/sys/mips/rmi/dev/xlr/rge.c#3 integrate .. //depot/projects/hammer/sys/mips/rmi/on_chip.c#2 integrate .. //depot/projects/hammer/sys/mips/rmi/pic.h#3 integrate .. //depot/projects/hammer/sys/mips/rmi/xlr_machdep.c#4 integrate .. //depot/projects/hammer/sys/mips/sibyte/sb_asm.S#2 integrate .. //depot/projects/hammer/sys/mips/sibyte/sb_machdep.c#4 integrate .. //depot/projects/hammer/sys/mips/sibyte/sb_scd.c#2 integrate .. //depot/projects/hammer/sys/mips/sibyte/sb_scd.h#2 integrate .. //depot/projects/hammer/sys/mips/sibyte/sb_zbbus.c#2 integrate .. //depot/projects/hammer/sys/mips/sibyte/sb_zbpci.c#2 integrate .. //depot/projects/hammer/sys/modules/Makefile#150 integrate .. //depot/projects/hammer/sys/modules/ath/Makefile#9 integrate .. //depot/projects/hammer/sys/modules/drm/Makefile#6 integrate .. //depot/projects/hammer/sys/modules/drm/drm/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/drm/via/Makefile#1 branch .. //depot/projects/hammer/sys/modules/runfw/Makefile#1 branch .. //depot/projects/hammer/sys/modules/siba_bwn/Makefile#1 branch .. //depot/projects/hammer/sys/modules/usb/Makefile#17 integrate .. //depot/projects/hammer/sys/modules/usb/run/Makefile#1 branch .. //depot/projects/hammer/sys/net/if_bridge.c#56 integrate .. //depot/projects/hammer/sys/net/if_lagg.c#24 integrate .. //depot/projects/hammer/sys/net/if_lagg.h#8 integrate .. //depot/projects/hammer/sys/net/vnet.c#3 integrate .. //depot/projects/hammer/sys/net/vnet.h#9 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_adhoc.c#10 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_crypto_tkip.c#15 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_hostap.c#13 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_ioctl.h#30 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_mesh.c#5 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_sta.c#12 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_wds.c#10 integrate .. //depot/projects/hammer/sys/netinet/in.c#48 integrate .. //depot/projects/hammer/sys/netinet/ip.h#13 integrate .. //depot/projects/hammer/sys/netinet/sctp_input.c#31 integrate .. //depot/projects/hammer/sys/netinet/tcp.h#23 integrate .. //depot/projects/hammer/sys/netinet/tcp_hostcache.c#23 integrate .. //depot/projects/hammer/sys/nfs/nfs_common.c#12 integrate .. //depot/projects/hammer/sys/nfs/nfs_common.h#6 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_krpc.c#5 integrate .. //depot/projects/hammer/sys/nfsserver/nfs.h#22 integrate .. //depot/projects/hammer/sys/nfsserver/nfs_fha.c#6 integrate .. //depot/projects/hammer/sys/nfsserver/nfs_srvkrpc.c#8 integrate .. //depot/projects/hammer/sys/pc98/conf/GENERIC#69 integrate .. //depot/projects/hammer/sys/powerpc/conf/GENERIC#56 integrate .. //depot/projects/hammer/sys/powerpc/conf/MPC85XX#8 integrate .. //depot/projects/hammer/sys/powerpc/mpc85xx/pci_ocp.c#5 integrate .. //depot/projects/hammer/sys/security/audit/audit_bsm.c#22 integrate .. //depot/projects/hammer/sys/sparc64/conf/GENERIC#78 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/genassym.c#19 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/swtch.S#12 integrate .. //depot/projects/hammer/sys/sun4v/conf/GENERIC#20 integrate .. //depot/projects/hammer/sys/sun4v/include/bus.h#3 integrate .. //depot/projects/hammer/sys/sun4v/sun4v/bus_machdep.c#4 integrate .. //depot/projects/hammer/sys/sys/ata.h#27 integrate .. //depot/projects/hammer/sys/sys/fbio.h#7 integrate .. //depot/projects/hammer/sys/sys/ptrace.h#13 integrate .. //depot/projects/hammer/sys/teken/teken_scs.h#3 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_alloc.c#41 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_vfsops.c#88 integrate .. //depot/projects/hammer/sys/ufs/ffs/fs.h#17 integrate .. //depot/projects/hammer/sys/vm/vm_map.c#80 integrate .. //depot/projects/hammer/tools/build/mk/OptionalObsoleteFiles.inc#18 integrate .. //depot/projects/hammer/tools/regression/bin/sh/parameters/mail1.0#1 branch .. //depot/projects/hammer/tools/regression/bin/sh/parameters/mail2.0#1 branch .. //depot/projects/hammer/usr.bin/Makefile#72 integrate .. //depot/projects/hammer/usr.bin/bc/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/bc/bc.y#2 integrate .. //depot/projects/hammer/usr.bin/bc/extern.h#2 integrate .. //depot/projects/hammer/usr.bin/bc/scan.l#2 integrate .. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.freebsd#75 integrate .. //depot/projects/hammer/usr.bin/cpio/cmdline.c#8 integrate .. //depot/projects/hammer/usr.bin/cpio/cpio.c#12 integrate .. //depot/projects/hammer/usr.bin/cpio/cpio.h#7 integrate .. //depot/projects/hammer/usr.bin/csup/Makefile#4 integrate .. //depot/projects/hammer/usr.bin/dc/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/dc/bcode.c#2 integrate .. //depot/projects/hammer/usr.bin/dc/bcode.h#2 integrate .. //depot/projects/hammer/usr.bin/dc/dc.c#2 integrate .. //depot/projects/hammer/usr.bin/dc/inout.c#2 integrate .. //depot/projects/hammer/usr.bin/dc/mem.c#2 integrate .. //depot/projects/hammer/usr.bin/dc/stack.c#2 integrate .. //depot/projects/hammer/usr.bin/ee/Makefile#4 integrate .. //depot/projects/hammer/usr.bin/ee/nls/pt_BR.ISO8859-1/ee.msg#1 branch .. //depot/projects/hammer/usr.bin/find/Makefile#4 integrate .. //depot/projects/hammer/usr.bin/find/extern.h#8 integrate .. //depot/projects/hammer/usr.bin/find/function.c#16 integrate .. //depot/projects/hammer/usr.bin/find/getdate.y#5 integrate .. //depot/projects/hammer/usr.bin/gcore/extern.h#3 integrate .. //depot/projects/hammer/usr.bin/gcore/gcore.c#6 integrate .. //depot/projects/hammer/usr.bin/kdump/kdump.c#30 integrate .. //depot/projects/hammer/usr.bin/procstat/procstat.1#9 integrate .. //depot/projects/hammer/usr.bin/tar/Makefile#34 integrate .. //depot/projects/hammer/usr.bin/tar/bsdtar.c#43 integrate .. //depot/projects/hammer/usr.bin/tar/bsdtar.h#28 integrate .. //depot/projects/hammer/usr.bin/tar/bsdtar_platform.h#20 integrate .. //depot/projects/hammer/usr.bin/tar/cmdline.c#4 integrate .. //depot/projects/hammer/usr.bin/tar/config_freebsd.h#9 integrate .. //depot/projects/hammer/usr.bin/tar/err.c#1 branch .. //depot/projects/hammer/usr.bin/tar/err.h#1 branch .. //depot/projects/hammer/usr.bin/tar/getdate.c#3 integrate .. //depot/projects/hammer/usr.bin/tar/line_reader.c#1 branch .. //depot/projects/hammer/usr.bin/tar/line_reader.h#1 branch .. //depot/projects/hammer/usr.bin/tar/matching.c#16 integrate .. //depot/projects/hammer/usr.bin/tar/matching.h#1 branch .. //depot/projects/hammer/usr.bin/tar/pathmatch.c#1 branch .. //depot/projects/hammer/usr.bin/tar/pathmatch.h#1 branch .. //depot/projects/hammer/usr.bin/tar/read.c#31 integrate .. //depot/projects/hammer/usr.bin/tar/siginfo.c#3 delete .. //depot/projects/hammer/usr.bin/tar/subst.c#4 integrate .. //depot/projects/hammer/usr.bin/tar/util.c#21 integrate .. //depot/projects/hammer/usr.bin/tar/write.c#40 integrate .. //depot/projects/hammer/usr.bin/truss/mips-fbsd.c#4 integrate .. //depot/projects/hammer/usr.bin/uname/uname.1#7 integrate .. //depot/projects/hammer/usr.bin/uname/uname.c#9 integrate .. //depot/projects/hammer/usr.bin/w/w.c#12 integrate .. //depot/projects/hammer/usr.sbin/powerd/Makefile#6 integrate .. //depot/projects/hammer/usr.sbin/powerd/powerd.c#17 integrate .. //depot/projects/hammer/usr.sbin/rpcbind/rpcb_svc_com.c#6 integrate .. //depot/projects/hammer/usr.sbin/rpcbind/rpcbind.c#12 integrate .. //depot/projects/hammer/usr.sbin/rpcbind/rpcbind.h#4 integrate .. //depot/projects/hammer/usr.sbin/rpcbind/util.c#4 integrate .. //depot/projects/hammer/usr.sbin/rtsold/rtsold.c#8 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/package.c#6 integrate .. //depot/projects/hammer/usr.sbin/wake/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/wake/wake.8#5 integrate .. //depot/projects/hammer/usr.sbin/wake/wake.c#3 integrate Differences ... ==== //depot/projects/hammer/bin/ls/ls.c#21 (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/hammer/bin/pax/Makefile#5 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/bin/pax/Makefile,v 1.12 2004/05/14 13:31:19 cognet 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,8 +33,4 @@ #MAN= pax.1 tar.1 cpio.1 #LINKS= ${BINDIR}/pax ${BINDIR}/tar ${BINDIR}/pax ${BINDIR}/cpio -.if ${MACHINE_ARCH} == "arm" -WARNS?= 3 -.endif - .include <bsd.prog.mk> ==== //depot/projects/hammer/bin/pax/cpio.h#3 (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/hammer/bin/pax/tar.h#3 (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/hammer/bin/pkill/pkill.c#7 (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.8 2010/02/08 21:23:48 brucec Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -180,7 +180,8 @@ debug_opt = 0; pidfile = NULL; pidfilelock = 0; - execf = coref = _PATH_DEVNULL; + execf = NULL; + coref = _PATH_DEVNULL; while ((ch = getopt(argc, argv, "DF:G:ILM:N:P:SU:ad:fg:ij:lnos:t:u:vx")) != -1) switch (ch) { ==== //depot/projects/hammer/bin/ps/ps.c#26 (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/hammer/bin/sh/main.c#11 (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/hammer/bin/sh/var.c#19 (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/hammer/contrib/csup/Makefile#4 (text) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/contrib/csup/Makefile,v 1.2 2009/01/05 15:18:16 lulf Exp $ +# $FreeBSD: src/contrib/csup/Makefile,v 1.3 2010/02/02 05:57:42 lulf Exp $ PREFIX?= /usr/local BINDIR?= ${PREFIX}/bin @@ -7,7 +7,7 @@ UNAME!= /usr/bin/uname -s PROG= csup -SRCS= attrstack.c config.c detailer.c diff.c fattr.c fixups.c fnmatch.c \ +SRCS= attrstack.c auth.c config.c detailer.c diff.c fattr.c fixups.c fnmatch.c \ globtree.c idcache.c keyword.c lister.c main.c misc.c mux.c parse.y \ pathcomp.c proto.c status.c stream.c threads.c token.l updater.c \ rcsfile.c rcsparse.c lex.rcs.c rsyncfile.c @@ -42,4 +42,7 @@ DPADD= ${LIBCRYPTO} ${LIBZ} LDADD= -lcrypto -lz +SCRIPTS= cpasswd.sh +MAN= csup.1 cpasswd.1 + .include <bsd.prog.mk> ==== //depot/projects/hammer/contrib/csup/TODO#4 (text) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/contrib/csup/TODO,v 1.2 2009/01/05 15:18:16 lulf Exp $ +$FreeBSD: src/contrib/csup/TODO,v 1.3 2010/02/02 05:57:42 lulf Exp $ BUGS: @@ -17,7 +17,6 @@ MISSING FEATURES: -- Add support for authentication. - Add support for shell commands sent by the server. - Add missing support for various CVSup options : -D, -a (requires authentication support), -e and -E (requires shell commands support) ==== //depot/projects/hammer/contrib/csup/config.h#3 (text) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/contrib/csup/config.h,v 1.1.1.2 2006/03/14 03:51:12 mux Exp $ + * $FreeBSD: src/contrib/csup/config.h,v 1.2 2010/02/02 05:57:42 lulf Exp $ */ #ifndef _CONFIG_H_ #define _CONFIG_H_ @@ -108,6 +108,7 @@ struct chan *chan1; struct stream *server; fattr_support_t fasupport; + int reqauth; }; struct config *config_init(const char *, struct coll *, int); ==== //depot/projects/hammer/contrib/csup/csup.1#4 (text) ==== @@ -22,7 +22,7 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" $Id: cvsup.1,v 1.70 2003/03/04 18:23:46 jdp Exp $ -.\" $FreeBSD: src/contrib/csup/csup.1,v 1.2 2009/01/07 18:37:07 lulf Exp $ +.\" $FreeBSD: src/contrib/csup/csup.1,v 1.3 2010/02/02 05:57:42 lulf Exp $ .\" .Dd February 1, 2006 .Os FreeBSD @@ -32,7 +32,7 @@ .Nd network distribution package for CVS repositories .Sh SYNOPSIS .Nm -.Op Fl 146ksvzZ +.Op Fl 146aksvzZ .Op Fl A Ar addr .Op Fl b Ar base .Op Fl c Ar collDir @@ -106,6 +106,12 @@ Forces .Nm to use IPv6 addresses only. +.It Fl a +Requires the server to authenticate itself (prove its identity) to +the client. If authentication of the server fails, the update is +canceled. See +.Sx AUTHENTICATION , +below. .It Fl A Ar addr Specifies a local address to bind to when connecting to the server. The local address might be a hostname or a numeric host address string @@ -793,6 +799,102 @@ .It .Pa /bar/stool/src-all/refuse.cvs:RELENG_3 .El +.Sh AUTHENTICATION +.Nm +implements an optional authentication mechanism which can be used by the +client and server to verify each other's identities. +Public CVSup servers normally do not enable authentication. +.Nm +users may ignore this section unless they have been informed +that authentication is required by the administrator of their server. +.Pp +The authentication subsystem uses a +challenge-response protocol which is immune to packet sniffing and +replay attacks. No passwords are sent over the network in either +direction. Both the client and the server can independently verify +the identities of each other. +.Pp +The file +.Li $ Ns Ev HOME Ns Pa /.csup/auth +holds the information used for authentication. This file contains a +record for each server that the client is allowed to access. Each +record occupies one line in the file. Lines beginning with +.Ql # +are ignored, as are lines containing only white space. White space is +significant everywhere else in the file. Fields are separated by +.Ql \&: +characters. +.Pp +Each record of the file has the following form: +.Bd -literal -offset indent +.Sm off +.Xo Ar serverName No : Ar clientName No : +.Ar password No : Ar comment +.Xc +.Sm on +.Ed +.Pp +All fields must be present even if some of them are empty. +.Ar ServerName +is the name of the server to which the record applies. By convention, +it is the canonical fully-qualified domain name of the server, e.g., +.Ql CVSup177.FreeBSD.ORG . +This must agree with the server's own idea of its name. The name is +case-insensitive. +.Pp +.Ar ClientName +is the name the client uses to gain access to the server. By +convention, e-mail addresses are used for all client names, e.g., +.Ql BillyJoe@FreeBSD.ORG . +Client names are case-insensitive. +.Pp +.Ar Password +is a secret string of characters that the client uses to prove its +identity. It may not contain any +.Ql \&: +or newline characters. +.Pp +.Ar Comment +may contain any additional information to identify the record. It +is not interpreted by the program. +.Pp +To set up authentication for a given server, one must perform the +following steps: +.Bl -enum +.It +Obtain the official +.Ar serverName +from the administrator of the server or from some other source. +.It +Choose an appropriate +.Ar clientName . +It should be in the form of a valid e-mail address, to make it easy +for the server administrator to contact the user if necessary. +.It +Choose an arbitrary secret +.Ar password . +.It +Run the +.Nm cpasswd +utility, and type in the +.Ar password +when prompted for it. The utility will print out a line to send +to the server administrator, and instruct you how to modify your +.Li $ Ns Ev HOME Ns Pa /.csup/auth +file. You should use a secure channel to send the line to the +server administrator. +.El +.Pp +Since +.Li $ Ns Ev HOME Ns Pa /.csup/auth +contains passwords, you should ensure that it is not readable by +anyone except yourself. +.Pp +Authentication works independently in both directions. The server +administrator controls whether you must prove your identity. +You control whether to check the server's identity, by means of the +.Fl a +command line option. >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201002112000.o1BK0DsC059658>