Date: Fri, 20 Oct 2006 23:01:25 GMT From: Olivier Houchard <cognet@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 108197 for review Message-ID: <200610202301.k9KN1PZU076303@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=108197 Change 108197 by cognet@cognet on 2006/10/20 23:01:03 IFC Affected files ... .. //depot/projects/arm/src/Makefile#6 integrate .. //depot/projects/arm/src/Makefile.inc1#16 integrate .. //depot/projects/arm/src/bin/cp/cp.1#3 integrate .. //depot/projects/arm/src/bin/cp/cp.c#4 integrate .. //depot/projects/arm/src/bin/cp/utils.c#3 integrate .. //depot/projects/arm/src/bin/ls/ls.1#3 integrate .. //depot/projects/arm/src/bin/ls/print.c#2 integrate .. //depot/projects/arm/src/bin/mkdir/mkdir.c#2 integrate .. //depot/projects/arm/src/bin/rm/rm.c#2 integrate .. //depot/projects/arm/src/bin/sh/jobs.c#2 integrate .. //depot/projects/arm/src/bin/sh/jobs.h#2 integrate .. //depot/projects/arm/src/bin/sh/main.c#2 integrate .. //depot/projects/arm/src/bin/sh/sh.1#5 integrate .. //depot/projects/arm/src/contrib/ncurses/man/MKterminfo.sh#2 integrate .. //depot/projects/arm/src/contrib/traceroute/traceroute.8#2 integrate .. //depot/projects/arm/src/contrib/traceroute/traceroute.c#2 integrate .. //depot/projects/arm/src/crypto/openssh/config.h#3 integrate .. //depot/projects/arm/src/etc/defaults/rc.conf#7 integrate .. //depot/projects/arm/src/etc/disktab#2 integrate .. //depot/projects/arm/src/etc/libalias.conf#2 integrate .. //depot/projects/arm/src/etc/mtree/BSD.include.dist#4 integrate .. //depot/projects/arm/src/etc/network.subr#4 integrate .. //depot/projects/arm/src/etc/rc.d/Makefile#5 integrate .. //depot/projects/arm/src/etc/rc.d/amd#2 integrate .. //depot/projects/arm/src/etc/rc.d/auto_linklocal#1 branch .. //depot/projects/arm/src/etc/rc.d/cleartmp#2 integrate .. //depot/projects/arm/src/etc/rc.d/idmapd#1 branch .. //depot/projects/arm/src/etc/rc.d/mixer#2 integrate .. //depot/projects/arm/src/games/fortune/datfiles/fortunes#5 integrate .. //depot/projects/arm/src/games/fortune/datfiles/freebsd-tips#2 integrate .. //depot/projects/arm/src/gnu/lib/libgcc/Makefile#3 integrate .. //depot/projects/arm/src/gnu/usr.bin/binutils/as/Makefile#4 integrate .. //depot/projects/arm/src/gnu/usr.bin/binutils/as/tc-sparc-fixed.c#1 branch .. //depot/projects/arm/src/gnu/usr.bin/gdb/kgdb/kgdb.1#2 integrate .. //depot/projects/arm/src/gnu/usr.bin/gdb/kgdb/kthr.c#3 integrate .. //depot/projects/arm/src/gnu/usr.bin/gdb/kgdb/trgt.c#2 integrate .. //depot/projects/arm/src/gnu/usr.bin/gdb/kgdb/trgt_arm.c#4 integrate .. //depot/projects/arm/src/gnu/usr.bin/gdb/kgdb/trgt_powerpc.c#2 integrate .. //depot/projects/arm/src/gnu/usr.bin/grep/grep.1#2 integrate .. //depot/projects/arm/src/gnu/usr.bin/send-pr/send-pr.1#2 integrate .. //depot/projects/arm/src/include/Makefile#4 integrate .. //depot/projects/arm/src/lib/csu/sparc64/crt1.c#2 integrate .. //depot/projects/arm/src/lib/libalias/modules/Makefile.inc#2 integrate .. //depot/projects/arm/src/lib/libalias/modules/cuseeme/Makefile#2 integrate .. //depot/projects/arm/src/lib/libalias/modules/dummy/Makefile#2 integrate .. //depot/projects/arm/src/lib/libalias/modules/ftp/Makefile#2 integrate .. //depot/projects/arm/src/lib/libalias/modules/irc/Makefile#2 integrate .. //depot/projects/arm/src/lib/libalias/modules/nbt/Makefile#2 integrate .. //depot/projects/arm/src/lib/libalias/modules/pptp/Makefile#2 integrate .. //depot/projects/arm/src/lib/libalias/modules/skinny/Makefile#2 integrate .. //depot/projects/arm/src/lib/libalias/modules/smedia/Makefile#2 integrate .. //depot/projects/arm/src/lib/libc/compat-43/killpg.2#2 integrate .. //depot/projects/arm/src/lib/libc/gen/basename.3#2 integrate .. //depot/projects/arm/src/lib/libc/gen/dirname.3#2 integrate .. //depot/projects/arm/src/lib/libc/gen/getobjformat.3#2 integrate .. //depot/projects/arm/src/lib/libc/gen/msgsnd.3#2 integrate .. //depot/projects/arm/src/lib/libc/gen/tls.c#4 integrate .. //depot/projects/arm/src/lib/libc/i386/sys/i386_get_ldt.2#2 integrate .. //depot/projects/arm/src/lib/libc/locale/wctype.3#2 integrate .. //depot/projects/arm/src/lib/libc/sparc64/fpu/fpu_emu.h#2 integrate .. //depot/projects/arm/src/lib/libc/sparc64/gen/_set_tp.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/freopen.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdlib/getenv.3#2 integrate .. //depot/projects/arm/src/lib/libc/string/ffs.3#2 integrate .. //depot/projects/arm/src/lib/libc/sys/Makefile.inc#2 integrate .. //depot/projects/arm/src/lib/libc/sys/aio_return.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/intro.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/lio_listio.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/read.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/stat.2#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_init.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_select.c#2 integrate .. //depot/projects/arm/src/lib/libc_r/uthread/uthread_sig.c#2 integrate .. //depot/projects/arm/src/lib/libdisk/Makefile#2 integrate .. //depot/projects/arm/src/lib/libkvm/Makefile#2 integrate .. //depot/projects/arm/src/lib/libkvm/kvm_sparc64.c#2 integrate .. //depot/projects/arm/src/lib/libnetgraph/msg.c#2 integrate .. //depot/projects/arm/src/lib/libnetgraph/sock.c#2 integrate .. //depot/projects/arm/src/lib/libpam/modules/pam_unix/pam_unix.8#2 integrate .. //depot/projects/arm/src/lib/libthr/thread/thr_fork.c#3 integrate .. //depot/projects/arm/src/lib/libthr/thread/thr_private.h#6 integrate .. //depot/projects/arm/src/lib/libthr/thread/thr_umtx.c#4 integrate .. //depot/projects/arm/src/lib/libthr/thread/thr_umtx.h#4 integrate .. //depot/projects/arm/src/lib/libutil/login.conf.5#3 integrate .. //depot/projects/arm/src/lib/msun/i387/fenv.h#2 integrate .. //depot/projects/arm/src/libexec/rtld-elf/sparc64/reloc.c#2 integrate .. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#14 integrate .. //depot/projects/arm/src/release/doc/zh_CN.GB2312/hardware/common/artheader.sgml#2 integrate .. //depot/projects/arm/src/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#2 integrate .. //depot/projects/arm/src/release/doc/zh_CN.GB2312/hardware/common/hw.ent#2 integrate .. //depot/projects/arm/src/release/doc/zh_CN.GB2312/installation/Makefile#2 integrate .. //depot/projects/arm/src/release/doc/zh_CN.GB2312/installation/alpha/Makefile#2 delete .. //depot/projects/arm/src/release/doc/zh_CN.GB2312/installation/alpha/article.sgml#2 delete .. //depot/projects/arm/src/release/doc/zh_CN.GB2312/installation/common/artheader.sgml#2 integrate .. //depot/projects/arm/src/release/doc/zh_CN.GB2312/installation/common/install.sgml#2 integrate .. //depot/projects/arm/src/release/doc/zh_CN.GB2312/installation/common/layout.sgml#2 integrate .. //depot/projects/arm/src/release/doc/zh_CN.GB2312/relnotes/Makefile#2 integrate .. //depot/projects/arm/src/release/doc/zh_CN.GB2312/relnotes/alpha/Makefile#2 delete .. //depot/projects/arm/src/release/doc/zh_CN.GB2312/relnotes/alpha/article.sgml#2 delete .. //depot/projects/arm/src/release/doc/zh_CN.GB2312/relnotes/common/new.sgml#2 integrate .. //depot/projects/arm/src/release/doc/zh_CN.GB2312/relnotes/powerpc/Makefile#1 branch .. //depot/projects/arm/src/release/doc/zh_CN.GB2312/relnotes/powerpc/article.sgml#1 branch .. //depot/projects/arm/src/release/doc/zh_CN.GB2312/relnotes/sparc64/Makefile#2 integrate .. //depot/projects/arm/src/release/scripts/package-split.py#3 integrate .. //depot/projects/arm/src/sbin/Makefile#3 integrate .. //depot/projects/arm/src/sbin/bsdlabel/bsdlabel.8#3 integrate .. //depot/projects/arm/src/sbin/devd/devd.conf.5#2 integrate .. //depot/projects/arm/src/sbin/dump/main.c#3 integrate .. //depot/projects/arm/src/sbin/geom/class/Makefile#2 integrate .. //depot/projects/arm/src/sbin/geom/class/cache/Makefile#1 branch .. //depot/projects/arm/src/sbin/geom/class/cache/geom_cache.c#1 branch .. //depot/projects/arm/src/sbin/geom/class/mirror/geom_mirror.c#3 integrate .. //depot/projects/arm/src/sbin/geom/class/raid3/geom_raid3.c#3 integrate .. //depot/projects/arm/src/sbin/idmapd/Makefile#2 integrate .. //depot/projects/arm/src/sbin/idmapd/idmapd.8#2 integrate .. //depot/projects/arm/src/sbin/ifconfig/ifconfig.8#5 integrate .. //depot/projects/arm/src/sbin/ipfw/ipfw.8#5 integrate .. //depot/projects/arm/src/sbin/kldload/kldload.8#2 integrate .. //depot/projects/arm/src/sbin/mount_nfs/mount_nfs.8#2 integrate .. //depot/projects/arm/src/sbin/restore/restore.8#2 integrate .. //depot/projects/arm/src/sbin/sysctl/sysctl.c#7 integrate .. //depot/projects/arm/src/secure/usr.bin/sftp/Makefile#2 integrate .. //depot/projects/arm/src/share/examples/etc/README.examples#2 integrate .. //depot/projects/arm/src/share/man/man1/builtin.1#2 integrate .. //depot/projects/arm/src/share/man/man3/pthread_schedparam.3#3 integrate .. //depot/projects/arm/src/share/man/man4/Makefile#3 integrate .. //depot/projects/arm/src/share/man/man4/aue.4#2 integrate .. //depot/projects/arm/src/share/man/man4/ddb.4#4 integrate .. //depot/projects/arm/src/share/man/man4/geom_uzip.4#1 branch .. //depot/projects/arm/src/share/man/man4/gre.4#2 integrate .. //depot/projects/arm/src/share/man/man4/if_bridge.4#5 integrate .. //depot/projects/arm/src/share/man/man4/ipfirewall.4#3 integrate .. //depot/projects/arm/src/share/man/man4/kue.4#2 integrate .. //depot/projects/arm/src/share/man/man4/man4.i386/ndis.4#2 integrate .. //depot/projects/arm/src/share/man/man4/pcm.4#3 integrate .. //depot/projects/arm/src/share/man/man4/sis.4#2 integrate .. //depot/projects/arm/src/share/man/man4/snd_hda.4#2 integrate .. //depot/projects/arm/src/share/man/man4/tun.4#2 integrate .. //depot/projects/arm/src/share/man/man4/ural.4#2 integrate .. //depot/projects/arm/src/share/man/man4/uscanner.4#3 integrate .. //depot/projects/arm/src/share/man/man5/disktab.5#2 integrate .. //depot/projects/arm/src/share/man/man5/hosts.equiv.5#2 integrate .. //depot/projects/arm/src/share/man/man5/rc.conf.5#4 integrate .. //depot/projects/arm/src/share/man/man9/hash.9#3 integrate .. //depot/projects/arm/src/share/man/man9/ktr.9#3 integrate .. //depot/projects/arm/src/share/misc/iso3166#2 integrate .. //depot/projects/arm/src/share/mk/bsd.cpu.mk#5 integrate .. //depot/projects/arm/src/share/mk/sys.mk#2 integrate .. //depot/projects/arm/src/share/timedef/da_DK.ISO8859-1.src#2 integrate .. //depot/projects/arm/src/share/timedef/da_DK.UTF-8.src#2 integrate .. //depot/projects/arm/src/share/zoneinfo/africa#2 integrate .. //depot/projects/arm/src/share/zoneinfo/asia#2 integrate .. //depot/projects/arm/src/share/zoneinfo/australasia#2 integrate .. //depot/projects/arm/src/share/zoneinfo/backward#2 integrate .. //depot/projects/arm/src/share/zoneinfo/europe#2 integrate .. //depot/projects/arm/src/share/zoneinfo/northamerica#2 integrate .. //depot/projects/arm/src/share/zoneinfo/southamerica#2 integrate .. //depot/projects/arm/src/share/zoneinfo/yearistype.sh#2 integrate .. //depot/projects/arm/src/share/zoneinfo/zone.tab#2 integrate .. //depot/projects/arm/src/sys/amd64/amd64/busdma_machdep.c#10 integrate .. //depot/projects/arm/src/sys/amd64/amd64/db_trace.c#8 integrate .. //depot/projects/arm/src/sys/amd64/amd64/intr_machdep.c#7 integrate .. //depot/projects/arm/src/sys/amd64/amd64/io_apic.c#8 integrate .. //depot/projects/arm/src/sys/amd64/amd64/local_apic.c#14 integrate .. //depot/projects/arm/src/sys/amd64/amd64/machdep.c#14 integrate .. //depot/projects/arm/src/sys/amd64/amd64/mp_machdep.c#12 integrate .. //depot/projects/arm/src/sys/amd64/amd64/support.S#6 integrate .. //depot/projects/arm/src/sys/amd64/conf/NOTES#12 integrate .. //depot/projects/arm/src/sys/amd64/include/apicvar.h#8 integrate .. //depot/projects/arm/src/sys/amd64/include/intr_machdep.h#5 integrate .. //depot/projects/arm/src/sys/amd64/isa/atpic.c#5 integrate .. //depot/projects/arm/src/sys/amd64/linux32/linux.h#5 integrate .. //depot/projects/arm/src/sys/amd64/linux32/linux32_machdep.c#9 integrate .. //depot/projects/arm/src/sys/amd64/linux32/linux32_proto.h#14 integrate .. //depot/projects/arm/src/sys/amd64/linux32/linux32_syscall.h#14 integrate .. //depot/projects/arm/src/sys/amd64/linux32/linux32_sysent.c#14 integrate .. //depot/projects/arm/src/sys/amd64/linux32/syscalls.master#14 integrate .. //depot/projects/arm/src/sys/arm/arm/fusu.S#5 integrate .. //depot/projects/arm/src/sys/arm/arm/trap.c#11 integrate .. //depot/projects/arm/src/sys/arm/at91/at91_spi.c#11 integrate .. //depot/projects/arm/src/sys/arm/at91/at91_ssc.c#10 integrate .. //depot/projects/arm/src/sys/arm/at91/at91_sscreg.h#6 integrate .. //depot/projects/arm/src/sys/arm/at91/at91_twi.c#26 integrate .. //depot/projects/arm/src/sys/arm/at91/if_ate.c#57 integrate .. //depot/projects/arm/src/sys/arm/at91/kb920x_machdep.c#37 integrate .. //depot/projects/arm/src/sys/boot/Makefile#6 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/boot2/kb920x_board.c#1 branch .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/Makefile#23 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/at91rm9200.h#7 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#10 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac.c#35 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac.h#14 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac_init.c#7 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/lib.h#20 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/lib_AT91RM9200.h#6 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/mci_device.c#19 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/mci_device.h#10 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/p_string.c#14 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/printf.c#6 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/putchar.c#7 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/sd-card.c#12 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/spi_flash.c#18 integrate .. //depot/projects/arm/src/sys/boot/common/help.common#4 integrate .. //depot/projects/arm/src/sys/boot/common/loader.8#5 integrate .. //depot/projects/arm/src/sys/boot/forth/support.4th#2 integrate .. //depot/projects/arm/src/sys/boot/i386/pxeldr/pxeboot.8#2 integrate .. //depot/projects/arm/src/sys/boot/ofw/libofw/Makefile#2 integrate .. //depot/projects/arm/src/sys/boot/ofw/libofw/openfirm.c#3 integrate .. //depot/projects/arm/src/sys/boot/ofw/libofw/openfirm_mmu.c#1 branch .. //depot/projects/arm/src/sys/boot/sparc64/loader/hcall.S#1 branch .. //depot/projects/arm/src/sys/boot/sparc64/loader/main.c#2 integrate .. //depot/projects/arm/src/sys/cam/scsi/scsi_da.c#12 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_proto.h#17 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_syscall.h#17 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_syscalls.c#17 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_sysent.c#17 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/syscalls.master#18 integrate .. //depot/projects/arm/src/sys/compat/linprocfs/linprocfs.c#10 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_aio.c#1 branch .. //depot/projects/arm/src/sys/compat/linux/linux_aio.h#1 branch .. //depot/projects/arm/src/sys/compat/linux/linux_emul.c#5 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_ipc.c#6 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_misc.c#14 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_signal.c#7 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_signal.h#2 integrate .. //depot/projects/arm/src/sys/conf/NOTES#34 integrate .. //depot/projects/arm/src/sys/conf/files#48 integrate .. //depot/projects/arm/src/sys/conf/files.amd64#17 integrate .. //depot/projects/arm/src/sys/conf/files.i386#19 integrate .. //depot/projects/arm/src/sys/conf/files.pc98#10 integrate .. //depot/projects/arm/src/sys/conf/files.sun4v#2 integrate .. //depot/projects/arm/src/sys/conf/kern.post.mk#12 integrate .. //depot/projects/arm/src/sys/conf/kern.pre.mk#7 integrate .. //depot/projects/arm/src/sys/conf/kmod.mk#13 integrate .. //depot/projects/arm/src/sys/conf/options#31 integrate .. //depot/projects/arm/src/sys/ddb/db_command.c#7 integrate .. //depot/projects/arm/src/sys/ddb/db_examine.c#2 integrate .. //depot/projects/arm/src/sys/ddb/db_output.c#4 integrate .. //depot/projects/arm/src/sys/ddb/db_output.h#3 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-chipset.c#30 integrate .. //depot/projects/arm/src/sys/dev/ath/if_athvar.h#13 integrate .. //depot/projects/arm/src/sys/dev/awi/if_awi_pccard.c#3 integrate .. //depot/projects/arm/src/sys/dev/bce/if_bce.c#8 integrate .. //depot/projects/arm/src/sys/dev/bce/if_bcereg.h#3 integrate .. //depot/projects/arm/src/sys/dev/bge/if_bge.c#24 integrate .. //depot/projects/arm/src/sys/dev/fxp/if_fxp.c#11 integrate .. //depot/projects/arm/src/sys/dev/ipmi/ipmi.c#5 integrate .. //depot/projects/arm/src/sys/dev/iwi/if_iwi.c#9 integrate .. //depot/projects/arm/src/sys/dev/mfi/mfi.c#9 integrate .. //depot/projects/arm/src/sys/dev/mfi/mfi_debug.c#2 integrate .. //depot/projects/arm/src/sys/dev/mfi/mfi_disk.c#4 integrate .. //depot/projects/arm/src/sys/dev/mfi/mfireg.h#5 integrate .. //depot/projects/arm/src/sys/dev/mfi/mfivar.h#5 integrate .. //depot/projects/arm/src/sys/dev/mxge/if_mxge.c#7 integrate .. //depot/projects/arm/src/sys/dev/nfe/if_nfe.c#6 integrate .. //depot/projects/arm/src/sys/dev/nfe/if_nfereg.h#4 integrate .. //depot/projects/arm/src/sys/dev/ofw/openfirm.c#3 integrate .. //depot/projects/arm/src/sys/dev/ofw/openfirm.h#2 integrate .. //depot/projects/arm/src/sys/dev/pci/pci.c#14 integrate .. //depot/projects/arm/src/sys/dev/pci/pci_if.m#3 integrate .. //depot/projects/arm/src/sys/dev/pci/pci_pci.c#5 integrate .. //depot/projects/arm/src/sys/dev/pci/pci_private.h#7 integrate .. //depot/projects/arm/src/sys/dev/pci/pci_user.c#4 integrate .. //depot/projects/arm/src/sys/dev/pci/pcivar.h#6 integrate .. //depot/projects/arm/src/sys/dev/ray/if_ray.c#3 integrate .. //depot/projects/arm/src/sys/dev/sk/if_sk.c#8 integrate .. //depot/projects/arm/src/sys/dev/sk/if_skreg.h#4 integrate .. //depot/projects/arm/src/sys/dev/sound/midi/sequencer.c#6 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/hda/hdac.c#2 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/hda/hdac_private.h#2 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/dsp.c#10 integrate .. //depot/projects/arm/src/sys/dev/spibus/spibus.c#7 integrate .. //depot/projects/arm/src/sys/dev/usb/ehci.c#13 integrate .. //depot/projects/arm/src/sys/dev/usb/if_aue.c#6 integrate .. //depot/projects/arm/src/sys/dev/usb/if_axe.c#8 integrate .. //depot/projects/arm/src/sys/dev/usb/if_cdce.c#5 integrate .. //depot/projects/arm/src/sys/dev/usb/if_kue.c#4 integrate .. //depot/projects/arm/src/sys/dev/usb/if_udav.c#6 integrate .. //depot/projects/arm/src/sys/dev/usb/if_ural.c#15 integrate .. //depot/projects/arm/src/sys/dev/usb/ohci.c#14 integrate .. //depot/projects/arm/src/sys/dev/usb/uhci.c#8 integrate .. //depot/projects/arm/src/sys/dev/usb/umass.c#12 integrate .. //depot/projects/arm/src/sys/dev/usb/usb.c#5 integrate .. //depot/projects/arm/src/sys/dev/usb/usb_quirks.c#10 integrate .. //depot/projects/arm/src/sys/dev/usb/usbdevs#20 integrate .. //depot/projects/arm/src/sys/dev/usb/usbdi.h#5 integrate .. //depot/projects/arm/src/sys/dev/usb/uscanner.c#8 integrate .. //depot/projects/arm/src/sys/fs/devfs/devfs.h#7 integrate .. //depot/projects/arm/src/sys/fs/devfs/devfs_devs.c#7 integrate .. //depot/projects/arm/src/sys/fs/devfs/devfs_int.h#2 integrate .. //depot/projects/arm/src/sys/fs/devfs/devfs_vnops.c#10 integrate .. //depot/projects/arm/src/sys/geom/cache/g_cache.c#1 branch .. //depot/projects/arm/src/sys/geom/cache/g_cache.h#1 branch .. //depot/projects/arm/src/sys/geom/raid3/g_raid3.c#23 integrate .. //depot/projects/arm/src/sys/i386/acpica/Makefile#3 integrate .. //depot/projects/arm/src/sys/i386/conf/NOTES#19 integrate .. //depot/projects/arm/src/sys/i386/i386/db_trace.c#7 integrate .. //depot/projects/arm/src/sys/i386/i386/intr_machdep.c#7 integrate .. //depot/projects/arm/src/sys/i386/i386/io_apic.c#7 integrate .. //depot/projects/arm/src/sys/i386/i386/local_apic.c#13 integrate .. //depot/projects/arm/src/sys/i386/i386/mp_machdep.c#11 integrate .. //depot/projects/arm/src/sys/i386/i386/support.s#5 integrate .. //depot/projects/arm/src/sys/i386/include/apicvar.h#7 integrate .. //depot/projects/arm/src/sys/i386/include/intr_machdep.h#5 integrate .. //depot/projects/arm/src/sys/i386/isa/atpic.c#5 integrate .. //depot/projects/arm/src/sys/i386/linux/linux.h#6 integrate .. //depot/projects/arm/src/sys/i386/linux/linux_machdep.c#9 integrate .. //depot/projects/arm/src/sys/i386/linux/linux_proto.h#17 integrate .. //depot/projects/arm/src/sys/i386/linux/linux_syscall.h#17 integrate .. //depot/projects/arm/src/sys/i386/linux/linux_sysent.c#17 integrate .. //depot/projects/arm/src/sys/i386/linux/syscalls.master#17 integrate .. //depot/projects/arm/src/sys/ia64/conf/NOTES#6 integrate .. //depot/projects/arm/src/sys/ia64/ia32/ia32_signal.c#3 integrate .. //depot/projects/arm/src/sys/ia64/ia64/busdma_machdep.c#4 integrate .. //depot/projects/arm/src/sys/ia64/ia64/clock.c#5 integrate .. //depot/projects/arm/src/sys/ia64/ia64/support.S#3 integrate .. //depot/projects/arm/src/sys/kern/init_sysent.c#18 integrate .. //depot/projects/arm/src/sys/kern/kern_conf.c#8 integrate .. //depot/projects/arm/src/sys/kern/kern_intr.c#6 integrate .. //depot/projects/arm/src/sys/kern/kern_sig.c#14 integrate .. //depot/projects/arm/src/sys/kern/kern_timeout.c#4 integrate .. //depot/projects/arm/src/sys/kern/kern_umtx.c#11 integrate .. //depot/projects/arm/src/sys/kern/subr_trap.c#5 integrate .. //depot/projects/arm/src/sys/kern/sys_generic.c#7 integrate .. //depot/projects/arm/src/sys/kern/sys_process.c#8 integrate .. //depot/projects/arm/src/sys/kern/syscalls.c#18 integrate .. //depot/projects/arm/src/sys/kern/syscalls.master#21 integrate .. //depot/projects/arm/src/sys/kern/systrace_args.c#6 integrate .. //depot/projects/arm/src/sys/kern/vfs_aio.c#13 integrate .. //depot/projects/arm/src/sys/modules/aio/Makefile#2 integrate .. //depot/projects/arm/src/sys/modules/geom/Makefile#3 integrate .. //depot/projects/arm/src/sys/modules/geom/geom_cache/Makefile#1 branch .. //depot/projects/arm/src/sys/modules/linux/Makefile#7 integrate .. //depot/projects/arm/src/sys/modules/mem/Makefile#2 integrate .. //depot/projects/arm/src/sys/modules/mmc/Makefile#1 branch .. //depot/projects/arm/src/sys/modules/mmcsd/Makefile#1 branch .. //depot/projects/arm/src/sys/modules/uart/Makefile#4 integrate .. //depot/projects/arm/src/sys/net/if_bridge.c#24 integrate .. //depot/projects/arm/src/sys/net/if_vlan.c#19 integrate .. //depot/projects/arm/src/sys/netgraph/netflow/netflow.c#7 integrate .. //depot/projects/arm/src/sys/netgraph/netflow/ng_netflow.c#5 integrate .. //depot/projects/arm/src/sys/netgraph/netgraph.h#6 integrate .. //depot/projects/arm/src/sys/netgraph/ng_base.c#7 integrate .. //depot/projects/arm/src/sys/netgraph/ng_message.h#4 integrate .. //depot/projects/arm/src/sys/netgraph/ng_nat.c#2 integrate .. //depot/projects/arm/src/sys/netgraph/ng_socket.c#8 integrate .. //depot/projects/arm/src/sys/netgraph/ng_socket.h#2 integrate .. //depot/projects/arm/src/sys/netinet/ip_carp.c#9 integrate .. //depot/projects/arm/src/sys/netinet/ip_fw2.c#21 integrate .. //depot/projects/arm/src/sys/netinet/ip_fw_pfil.c#5 integrate .. //depot/projects/arm/src/sys/netinet/ip_input.c#13 integrate .. //depot/projects/arm/src/sys/netinet/libalias/libalias.3#5 integrate .. //depot/projects/arm/src/sys/netinet6/in6_ifattach.c#7 integrate .. //depot/projects/arm/src/sys/netinet6/in6_proto.c#5 integrate .. //depot/projects/arm/src/sys/nfsclient/nfs.h#5 integrate .. //depot/projects/arm/src/sys/nfsclient/nfs_vnops.c#13 integrate .. //depot/projects/arm/src/sys/pc98/conf/NOTES#13 integrate .. //depot/projects/arm/src/sys/pci/agp.c#6 integrate .. //depot/projects/arm/src/sys/pci/agp_amd64.c#7 integrate .. //depot/projects/arm/src/sys/pci/nfsmb.c#5 integrate .. //depot/projects/arm/src/sys/powerpc/powerpc/copyinout.c#3 integrate .. //depot/projects/arm/src/sys/powerpc/powerpc/db_interface.c#2 integrate .. //depot/projects/arm/src/sys/security/audit/audit_syscalls.c#6 integrate .. //depot/projects/arm/src/sys/security/mac_portacl/mac_portacl.c#3 integrate .. //depot/projects/arm/src/sys/sparc64/conf/NOTES#8 integrate .. //depot/projects/arm/src/sys/sparc64/include/asi.h#3 integrate .. //depot/projects/arm/src/sys/sparc64/pci/ofw_pcib.c#4 integrate .. //depot/projects/arm/src/sys/sparc64/pci/ofw_pcib_subr.c#3 integrate .. //depot/projects/arm/src/sys/sparc64/pci/ofw_pcibus.c#7 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/db_interface.c#2 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/genassym.c#4 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/support.S#3 integrate .. //depot/projects/arm/src/sys/sun4v/conf/GENERIC#2 integrate .. //depot/projects/arm/src/sys/sun4v/conf/NOTES#2 integrate .. //depot/projects/arm/src/sys/sun4v/include/asi.h#2 integrate .. //depot/projects/arm/src/sys/sun4v/include/tte.h#2 integrate .. //depot/projects/arm/src/sys/sun4v/sun4v/exception.S#2 integrate .. //depot/projects/arm/src/sys/sun4v/sun4v/fpemu.c#2 delete .. //depot/projects/arm/src/sys/sun4v/sun4v/genassym.c#2 delete .. //depot/projects/arm/src/sys/sun4v/sun4v/hvcons.c#2 integrate .. //depot/projects/arm/src/sys/sun4v/sun4v/machdep.c#2 integrate .. //depot/projects/arm/src/sys/sun4v/sun4v/support.S#2 integrate .. //depot/projects/arm/src/sys/sun4v/sun4v/t1_copy.S#2 integrate .. //depot/projects/arm/src/sys/sun4v/sun4v/trap.c#2 integrate .. //depot/projects/arm/src/sys/sun4v/sun4v/tsb.c#2 integrate .. //depot/projects/arm/src/sys/sun4v/sun4v/vnex.c#2 integrate .. //depot/projects/arm/src/sys/sys/conf.h#6 integrate .. //depot/projects/arm/src/sys/sys/elf32.h#4 integrate .. //depot/projects/arm/src/sys/sys/elf64.h#5 integrate .. //depot/projects/arm/src/sys/sys/rwlock.h#4 integrate .. //depot/projects/arm/src/sys/sys/sem.h#2 integrate .. //depot/projects/arm/src/sys/sys/syscall.h#18 integrate .. //depot/projects/arm/src/sys/sys/syscall.mk#18 integrate .. //depot/projects/arm/src/sys/sys/sysproto.h#19 integrate .. //depot/projects/arm/src/sys/sys/systm.h#15 integrate .. //depot/projects/arm/src/sys/sys/umtx.h#7 integrate .. //depot/projects/arm/src/sys/ufs/ffs/ffs_inode.c#5 integrate .. //depot/projects/arm/src/sys/ufs/ffs/ffs_snapshot.c#15 integrate .. //depot/projects/arm/src/sys/ufs/ffs/ffs_vnops.c#5 integrate .. //depot/projects/arm/src/sys/ufs/ufs/inode.h#4 integrate .. //depot/projects/arm/src/sys/ufs/ufs/ufs_vnops.c#9 integrate .. //depot/projects/arm/src/sys/vm/vm_contig.c#9 integrate .. //depot/projects/arm/src/sys/vm/vnode_pager.c#9 integrate .. //depot/projects/arm/src/tools/regression/execve/Makefile#2 integrate .. //depot/projects/arm/src/tools/regression/execve/execve.t#2 integrate .. //depot/projects/arm/src/tools/tools/tinybsd/tinybsd#2 integrate .. //depot/projects/arm/src/usr.bin/calendar/calendars/calendar.australia#2 integrate .. //depot/projects/arm/src/usr.bin/calendar/calendars/calendar.holiday#3 integrate .. //depot/projects/arm/src/usr.bin/expand/expand.1#2 integrate .. //depot/projects/arm/src/usr.bin/find/find.1#3 integrate .. //depot/projects/arm/src/usr.bin/jot/jot.1#2 integrate .. //depot/projects/arm/src/usr.bin/lam/lam.1#2 integrate .. //depot/projects/arm/src/usr.bin/make/str.c#2 integrate .. //depot/projects/arm/src/usr.bin/rs/rs.1#2 integrate .. //depot/projects/arm/src/usr.bin/systat/systat.1#2 integrate .. //depot/projects/arm/src/usr.bin/tput/tput.c#2 integrate .. //depot/projects/arm/src/usr.bin/tr/tr.1#2 integrate .. //depot/projects/arm/src/usr.bin/unexpand/unexpand.c#2 integrate .. //depot/projects/arm/src/usr.sbin/Makefile#8 integrate .. //depot/projects/arm/src/usr.sbin/arp/arp.c#3 integrate .. //depot/projects/arm/src/usr.sbin/bluetooth/bthidd/bthidd.8#2 integrate .. //depot/projects/arm/src/usr.sbin/bluetooth/bthidd/hid.c#3 integrate .. //depot/projects/arm/src/usr.sbin/mountd/mountd.c#2 integrate .. //depot/projects/arm/src/usr.sbin/ndiscvt/ndiscvt.8#2 integrate .. //depot/projects/arm/src/usr.sbin/pccard/Makefile#2 integrate .. //depot/projects/arm/src/usr.sbin/pccard/dumpcis/Makefile#1 branch .. //depot/projects/arm/src/usr.sbin/pccard/dumpcis/dumpcis.8#1 branch .. //depot/projects/arm/src/usr.sbin/pccard/dumpcis/main.c#1 branch .. //depot/projects/arm/src/usr.sbin/pccard/pccardd/Makefile#2 delete .. //depot/projects/arm/src/usr.sbin/pccard/pccardd/cardd.c#2 delete .. //depot/projects/arm/src/usr.sbin/pccard/pccardd/cardd.h#2 delete .. //depot/projects/arm/src/usr.sbin/pccard/pccardd/file.c#2 delete .. //depot/projects/arm/src/usr.sbin/pccard/pccardd/pccard.conf.5#2 delete .. //depot/projects/arm/src/usr.sbin/pccard/pccardd/pccardd.8#2 delete .. //depot/projects/arm/src/usr.sbin/pccard/pccardd/pccardd.c#2 delete .. //depot/projects/arm/src/usr.sbin/pccard/pccardd/server.c#2 delete .. //depot/projects/arm/src/usr.sbin/pccard/pccardd/util.c#2 delete .. //depot/projects/arm/src/usr.sbin/pw/pw.8#2 integrate .. //depot/projects/arm/src/usr.sbin/sysinstall/disks.c#2 integrate .. //depot/projects/arm/src/usr.sbin/syslogd/syslog.conf.5#3 integrate .. //depot/projects/arm/src/usr.sbin/wicontrol/wicontrol.8#2 integrate .. //depot/projects/arm/src/usr.sbin/wicontrol/wicontrol.c#2 integrate .. //depot/projects/arm/src/usr.sbin/zic/zdump/Makefile#2 integrate .. //depot/projects/arm/src/usr.sbin/zic/zic/Makefile#2 integrate Differences ... ==== //depot/projects/arm/src/Makefile#6 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.335 2006/09/08 10:13:15 ru Exp $ +# $FreeBSD: src/Makefile,v 1.336 2006/10/16 22:18:59 jb Exp $ # # The user-driven targets are: # @@ -268,7 +268,7 @@ @echo "--------------------------------------------------------------" @echo ">>> make universe started on ${STARTTIME}" @echo "--------------------------------------------------------------" -.for target in amd64 i386 ia64 pc98 sparc64 +.for target in amd64 i386 ia64 pc98 sparc64 sun4v KERNCONFS!= cd ${.CURDIR}/sys/${target}/conf && \ find [A-Z]*[A-Z] -type f -maxdepth 0 \ ! -name DEFAULTS ! -name LINT ==== //depot/projects/arm/src/Makefile.inc1#16 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.559 2006/09/08 10:09:02 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.563 2006/10/16 22:18:13 jb Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -98,7 +98,7 @@ # Guess machine architecture from machine type, and vice versa. .if !defined(TARGET_ARCH) && defined(TARGET) -TARGET_ARCH= ${TARGET:S/pc98/i386/} +TARGET_ARCH= ${TARGET:S/pc98/i386/:S/sun4v/sparc64/} .elif !defined(TARGET) && defined(TARGET_ARCH) && \ ${TARGET_ARCH} != ${MACHINE_ARCH} TARGET= ${TARGET_ARCH} @@ -107,7 +107,7 @@ TARGET?= ${MACHINE} TARGET_ARCH?= ${MACHINE_ARCH} -KNOWN_ARCHES?= amd64 arm i386 i386/pc98 ia64 powerpc sparc64 +KNOWN_ARCHES?= amd64 arm i386 i386/pc98 ia64 powerpc sparc64 sparc64/sun4v .if ${TARGET} == ${TARGET_ARCH} _t= ${TARGET} .else @@ -1012,56 +1012,58 @@ _startup_libs+= lib/csu/${MACHINE_ARCH} .endif -_prebuild_libs= +_prebuild_libs= ${_kerberos5_lib_libasn1} ${_kerberos5_lib_libkrb5} \ + ${_kerberos5_lib_libroken} \ + lib/libbz2 lib/libcom_err lib/libcrypt lib/libexpat \ + ${_lib_libgssapi} ${_lib_libipx} \ + lib/libkiconv lib/libkvm lib/libmd \ + lib/libncurses lib/libopie lib/libpam \ + lib/libradius lib/libsbuf lib/libtacplus lib/libutil \ + ${_lib_libypclnt} lib/libz lib/msun \ + ${_secure_lib_libcrypto} ${_secure_lib_libssh} \ + ${_secure_lib_libssl} -_generic_libs= gnu/lib - -.if ${MK_IPX} != "no" -_prebuild_libs+= lib/libipx -.endif - -.if ${MK_KERBEROS} != "no" -_prebuild_libs+= kerberos5/lib/libasn1 -_prebuild_libs+= kerberos5/lib/libkrb5 -_prebuild_libs+= kerberos5/lib/libroken -_generic_libs+= kerberos5/lib -.endif - -_prebuild_libs+= lib/libbz2 lib/libcom_err lib/libcrypt lib/libexpat \ - lib/libkiconv lib/libkvm lib/libmd \ - lib/libncurses lib/libnetgraph lib/libopie lib/libpam \ - lib/libradius \ - lib/libsbuf lib/libtacplus lib/libutil \ - lib/libz lib/msun lib/libgssapi +_generic_libs= gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib lib/libopie__L lib/libtacplus__L: lib/libmd__L -_generic_libs+= lib - .if ${MK_CRYPT} != "no" .if ${MK_OPENSSL} != "no" -_prebuild_libs+= secure/lib/libcrypto secure/lib/libssl +_secure_lib_libcrypto= secure/lib/libcrypto +_secure_lib_libssl= secure/lib/libssl lib/libradius__L secure/lib/libssl__L: secure/lib/libcrypto__L .if ${MK_OPENSSH} != "no" -_prebuild_libs+= secure/lib/libssh +_secure_lib_libssh= secure/lib/libssh secure/lib/libssh__L: lib/libz__L secure/lib/libcrypto__L lib/libcrypt__L .if ${MK_KERBEROS} != "no" -secure/lib/libssh__L: lib/libgssapi__L +secure/lib/libssh__L: lib/libgssapi__L kerberos5/lib/libkrb5__L \ + kerberos5/lib/libasn1__L lib/libcom_err__L lib/libmd__L \ + kerberos5/lib/libroken__L +.endif .endif .endif +_secure_lib= secure/lib .endif -_generic_libs+= secure/lib + +.if ${MK_IPX} != "no" +_lib_libipx= lib/libipx .endif -.if ${MK_OPENSSL} == "no" -lib/libradius__L: lib/libmd__L +.if ${MK_KERBEROS} != "no" +_kerberos5_lib= kerberos5/lib +_kerberos5_lib_libasn1= kerberos5/lib/libasn1 +_kerberos5_lib_libkrb5= kerberos5/lib/libkrb5 +_kerberos5_lib_libroken= kerberos5/lib/libroken +_lib_libgssapi= lib/libgssapi .endif .if ${MK_NIS} != "no" -_prebuild_libs+= lib/libypclnt +_lib_libypclnt= lib/libypclnt .endif -_generic_libs+= usr.bin/lex/lib +.if ${MK_OPENSSL} == "no" +lib/libradius__L: lib/libmd__L +.endif .for _lib in ${_startup_libs} ${_prebuild_libs:Nlib/libpam} ${_generic_libs} ${_lib}__L: .PHONY ==== //depot/projects/arm/src/bin/cp/cp.1#3 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)cp.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/cp/cp.1,v 1.35 2006/08/25 09:58:13 ru Exp $ +.\" $FreeBSD: src/bin/cp/cp.1,v 1.36 2006/10/07 22:14:43 trhodes Exp $ .\" -.Dd August 24, 2006 +.Dd October 7, 2006 .Dt CP 1 .Os .Sh NAME @@ -252,8 +252,37 @@ .Fl r option. This implementation supports that option, however, its use is strongly -discouraged, as it does not correctly copy special files, symbolic links -or fifo's. +discouraged as its behavior is very implementation dependent. +In this version of +.Nm , +.Fl r +is just a synonym for +.Fl RL . +The +.Fl R +option gives the correct behavior while +.Fl L +preserves the sometimes-useful historical behavior of following symbolic links. +The +.Fl r +option is deprecated in +.Tn POSIX + and its behavior is likely to be different +in future versions of +.Nm +and its behavior is likely to be different +in future versions of +.Fx . +Previous versions of +.Nm +in +.Fx , +the +.Fl r +behavior was to not correctly copy special files, symbolic links +or fifos. +Symbolic links were followed, and the contents of special +files and fifos were copied to regular files. .Pp The .Fl v ==== //depot/projects/arm/src/bin/cp/cp.c#4 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.55 2006/09/29 06:06:39 ru Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.57 2006/10/11 10:26:34 trhodes Exp $"); /* * Cp copies source files to target files. @@ -138,7 +138,8 @@ pflag = 1; break; case 'r': - rflag = 1; + rflag = Lflag = 1; + Hflag = Pflag = 0; break; case 'v': vflag = 1; @@ -154,16 +155,10 @@ usage(); fts_options = FTS_NOCHDIR | FTS_PHYSICAL; - if (rflag) { - if (Rflag) - errx(1, - "the -R and -r options may not be specified together."); - if (Hflag || Lflag || Pflag) - errx(1, - "the -H, -L, and -P options may not be specified with the -r option."); - fts_options &= ~FTS_PHYSICAL; - fts_options |= FTS_LOGICAL; - } + if (Rflag && rflag) + errx(1, "the -R and -r options may not be specified together"); + if (rflag) + Rflag = 1; if (Rflag) { if (Hflag) fts_options |= FTS_COMFOLLOW; @@ -227,12 +222,12 @@ * the initial mkdir(). */ if (r == -1) { - if (rflag || (Rflag && (Lflag || Hflag))) + if (Rflag && (Lflag || Hflag)) stat(*argv, &tmp_stat); else lstat(*argv, &tmp_stat); - if (S_ISDIR(tmp_stat.st_mode) && (Rflag || rflag)) + if (S_ISDIR(tmp_stat.st_mode) && Rflag) type = DIR_TO_DNE; else type = FILE_TO_FILE; @@ -420,7 +415,7 @@ } break; case S_IFDIR: - if (!Rflag && !rflag) { + if (!Rflag) { warnx("%s is a directory (not copied).", curr->fts_path); (void)fts_set(ftsp, curr, FTS_SKIP); ==== //depot/projects/arm/src/bin/cp/utils.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.49 2006/08/25 09:58:13 ru Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.52 2006/10/07 12:14:50 maxim Exp $"); #include <sys/types.h> #include <sys/acl.h> @@ -54,17 +54,18 @@ #include <unistd.h> #include "extern.h" -#define cp_pct(x,y) (int)(100.0 * (double)(x) / (double)(y)) + +#define cp_pct(x, y) ((y == 0) ? 0 : (int)(100.0 * (x) / (y))) int copy_file(const FTSENT *entp, int dne) { static char buf[MAXBSIZE]; struct stat *fs; - int ch, checkch, from_fd = 0, rcount, rval, to_fd = 0; ssize_t wcount; size_t wresid; - size_t wtotal; + off_t wtotal; + int ch, checkch, from_fd = 0, rcount, rval, to_fd = 0; char *bufp; #ifdef VM_AND_BUFFER_CACHE_SYNCHRONIZED char *p; @@ -149,16 +150,17 @@ for (bufp = p, wresid = fs->st_size; ; bufp += wcount, wresid -= (size_t)wcount) { wcount = write(to_fd, bufp, wresid); + if (wcount <= 0) + break; wtotal += wcount; if (info) { info = 0; (void)fprintf(stderr, - "%s -> %s %3d%%\n", - entp->fts_path, to.p_path, - cp_pct(wtotal, fs->st_size)); - + "%s -> %s %3d%%\n", + entp->fts_path, to.p_path, + cp_pct(wtotal, fs->st_size)); } - if (wcount >= (ssize_t)wresid || wcount <= 0) + if (wcount >= (ssize_t)wresid) break; } if (wcount != (ssize_t)wresid) { @@ -179,16 +181,17 @@ for (bufp = buf, wresid = rcount; ; bufp += wcount, wresid -= wcount) { wcount = write(to_fd, bufp, wresid); + if (wcount <= 0) + break; wtotal += wcount; if (info) { info = 0; (void)fprintf(stderr, - "%s -> %s %3d%%\n", - entp->fts_path, to.p_path, - cp_pct(wtotal, fs->st_size)); - + "%s -> %s %3d%%\n", + entp->fts_path, to.p_path, + cp_pct(wtotal, fs->st_size)); } - if (wcount >= (ssize_t)wresid || wcount <= 0) + if (wcount >= (ssize_t)wresid) break; } if (wcount != (ssize_t)wresid) { ==== //depot/projects/arm/src/bin/ls/ls.1#3 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)ls.1 8.7 (Berkeley) 7/29/94 -.\" $FreeBSD: src/bin/ls/ls.1,v 1.99 2006/09/17 17:40:06 ru Exp $ +.\" $FreeBSD: src/bin/ls/ls.1,v 1.100 2006/10/12 10:08:52 ru Exp $ .\" -.Dd March 24, 2006 +.Dd October 12, 2006 .Dt LS 1 .Os .Sh NAME @@ -68,7 +68,10 @@ The following options are available: .Bl -tag -width indent .It Fl A -List all entries except for +Include directory entries whose names begin with a +dot +.Pq Sq Pa \&. +except for .Pa \&. and .Pa .. . @@ -159,7 +162,7 @@ .It Fl a Include directory entries whose names begin with a dot -.Pq Pa \&. . +.Pq Sq Pa \&. . .It Fl b As .Fl B , @@ -364,6 +367,8 @@ follows: .Pp .Bl -tag -width 4n -offset indent -compact +.It Sy \- +Regular file. .It Sy b Block special file. .It Sy c @@ -372,12 +377,12 @@ Directory. .It Sy l Symbolic link. -.It Sy s -Socket link. .It Sy p .Tn FIFO . -.It Sy \- -Regular file. +.It Sy s +Socket. +.It Sy w +Whiteout. .El .Pp The next three fields ==== //depot/projects/arm/src/bin/ls/print.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.75 2006/03/24 16:38:02 jhb Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.76 2006/10/18 10:58:27 ru Exp $"); #include <sys/param.h> #include <sys/stat.h> @@ -628,9 +628,10 @@ p->fts_parent->fts_accpath, p->fts_name); /* * We have no way to tell whether a symbolic link has an ACL since - * pathconf() and acl_get_file() both follow them. + * pathconf() and acl_get_file() both follow them. They also don't + * support whiteouts. */ - if (S_ISLNK(p->fts_statp->st_mode)) { + if (S_ISLNK(p->fts_statp->st_mode) || S_ISWHT(p->fts_statp->st_mode)) { *haveacls = 1; return; } ==== //depot/projects/arm/src/bin/mkdir/mkdir.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/mkdir/mkdir.c,v 1.32 2005/02/09 17:37:38 ru Exp $"); +__FBSDID("$FreeBSD: src/bin/mkdir/mkdir.c,v 1.33 2006/10/10 20:18:20 ru Exp $"); #include <sys/types.h> #include <sys/stat.h> @@ -99,19 +99,19 @@ } for (exitval = 0; *argv != NULL; ++argv) { - success = 1; if (pflag) { - if (build(*argv, omode)) - success = 0; + success = build(*argv, omode); } else if (mkdir(*argv, omode) < 0) { if (errno == ENOTDIR || errno == ENOENT) warn("%s", dirname(*argv)); else warn("%s", *argv); success = 0; - } else if (vflag) - (void)printf("%s\n", *argv); - + } else { + success = 1; + if (vflag) + (void)printf("%s\n", *argv); + } if (!success) exitval = 1; /* @@ -119,9 +119,10 @@ * nine bits, so if you try to set a mode including the * sticky, setuid, setgid bits you lose them. Don't do * this unless the user has specifically requested a mode, - * as chmod will (obviously) ignore the umask. + * as chmod will (obviously) ignore the umask. Do this + * on newly created directories only. */ - if (success && mode != NULL && chmod(*argv, omode) == -1) { + if (success == 1 && mode != NULL && chmod(*argv, omode) == -1) { warn("%s", *argv); exitval = 1; } @@ -129,6 +130,11 @@ exit(exitval); } + +/* + * Returns 1 if a directory has been created, + * 2 if it already existed, and 0 on failure. + */ int build(char *path, mode_t omode) { @@ -139,7 +145,7 @@ p = path; oumask = 0; - retval = 0; + retval = 1; if (p[0] == '/') /* Skip leading '/'. */ ++p; for (first = 1, last = 0; !last ; ++p) { @@ -154,7 +160,7 @@ /* * POSIX 1003.2: * For each dir operand that does not name an existing - * directory, effects equivalent to those cased by the + * directory, effects equivalent to those caused by the * following command shall occcur: * * mkdir -p -m $(umask -S),u+wx $(dirname dir) && @@ -174,7 +180,7 @@ if (errno == EEXIST || errno == EISDIR) { if (stat(path, &sb) < 0) { warn("%s", path); - retval = 1; + retval = 0; break; } else if (!S_ISDIR(sb.st_mode)) { if (last) @@ -182,12 +188,14 @@ else errno = ENOTDIR; warn("%s", path); - retval = 1; + retval = 0; break; } + if (last) + retval = 2; } else { warn("%s", path); - retval = 1; + retval = 0; break; } } else if (vflag) ==== //depot/projects/arm/src/bin/rm/rm.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/rm/rm.c,v 1.54 2006/04/15 09:26:23 maxim Exp $"); +__FBSDID("$FreeBSD: src/bin/rm/rm.c,v 1.56 2006/10/18 13:16:06 maxim Exp $"); #include <sys/stat.h> #include <sys/param.h> @@ -347,7 +347,7 @@ if (!fflag && !S_ISWHT(sb.st_mode) && !check(f, f, &sb)) continue; rval = 0; >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200610202301.k9KN1PZU076303>