PERFORCE change 108241 for review
Marcel Moolenaar
marcel at FreeBSD.org
Sat Oct 21 13:07:13 PDT 2006
http://perforce.freebsd.org/chv.cgi?CH=108241
Change 108241 by marcel at marcel_nfs on 2006/10/21 20:06:46
IFC @108240
Affected files ...
.. //depot/projects/ia64/Makefile#52 integrate
.. //depot/projects/ia64/Makefile.inc1#112 integrate
.. //depot/projects/ia64/bin/cp/cp.1#12 integrate
.. //depot/projects/ia64/bin/cp/cp.c#20 integrate
.. //depot/projects/ia64/bin/ls/ls.1#31 integrate
.. //depot/projects/ia64/bin/ls/print.c#21 integrate
.. //depot/projects/ia64/bin/mkdir/mkdir.c#9 integrate
.. //depot/projects/ia64/bin/rm/rm.c#16 integrate
.. //depot/projects/ia64/contrib/ncurses/man/MKterminfo.sh#3 integrate
.. //depot/projects/ia64/contrib/traceroute/traceroute.8#7 integrate
.. //depot/projects/ia64/contrib/traceroute/traceroute.c#10 integrate
.. //depot/projects/ia64/etc/defaults/rc.conf#72 integrate
.. //depot/projects/ia64/etc/disktab#3 integrate
.. //depot/projects/ia64/etc/libalias.conf#2 integrate
.. //depot/projects/ia64/etc/rc.d/Makefile#42 integrate
.. //depot/projects/ia64/etc/rc.d/amd#14 integrate
.. //depot/projects/ia64/etc/rc.d/auto_linklocal#2 integrate
.. //depot/projects/ia64/etc/rc.d/cleartmp#12 integrate
.. //depot/projects/ia64/etc/rc.d/idmapd#1 branch
.. //depot/projects/ia64/games/fortune/datfiles/fortunes#59 integrate
.. //depot/projects/ia64/games/fortune/datfiles/freebsd-tips#19 integrate
.. //depot/projects/ia64/gnu/lib/libgcc/Makefile#23 integrate
.. //depot/projects/ia64/gnu/usr.bin/binutils/as/Makefile#7 integrate
.. //depot/projects/ia64/gnu/usr.bin/binutils/as/tc-sparc-fixed.c#1 branch
.. //depot/projects/ia64/gnu/usr.bin/gdb/kgdb/kgdb.1#6 integrate
.. //depot/projects/ia64/gnu/usr.bin/gdb/kgdb/kthr.c#5 integrate
.. //depot/projects/ia64/gnu/usr.bin/gdb/kgdb/trgt.c#5 integrate
.. //depot/projects/ia64/gnu/usr.bin/gdb/kgdb/trgt_arm.c#2 integrate
.. //depot/projects/ia64/gnu/usr.bin/gdb/kgdb/trgt_powerpc.c#2 integrate
.. //depot/projects/ia64/gnu/usr.bin/grep/grep.1#12 integrate
.. //depot/projects/ia64/gnu/usr.bin/send-pr/send-pr.1#9 integrate
.. //depot/projects/ia64/lib/csu/sparc64/crt1.c#10 integrate
.. //depot/projects/ia64/lib/libalias/modules/Makefile.inc#2 integrate
.. //depot/projects/ia64/lib/libalias/modules/cuseeme/Makefile#2 integrate
.. //depot/projects/ia64/lib/libalias/modules/dummy/Makefile#2 integrate
.. //depot/projects/ia64/lib/libalias/modules/ftp/Makefile#2 integrate
.. //depot/projects/ia64/lib/libalias/modules/irc/Makefile#2 integrate
.. //depot/projects/ia64/lib/libalias/modules/nbt/Makefile#2 integrate
.. //depot/projects/ia64/lib/libalias/modules/pptp/Makefile#2 integrate
.. //depot/projects/ia64/lib/libalias/modules/skinny/Makefile#2 integrate
.. //depot/projects/ia64/lib/libalias/modules/smedia/Makefile#2 integrate
.. //depot/projects/ia64/lib/libc/compat-43/killpg.2#4 integrate
.. //depot/projects/ia64/lib/libc/gen/basename.3#4 integrate
.. //depot/projects/ia64/lib/libc/gen/dirname.3#5 integrate
.. //depot/projects/ia64/lib/libc/gen/getobjformat.3#4 integrate
.. //depot/projects/ia64/lib/libc/gen/msgsnd.3#6 integrate
.. //depot/projects/ia64/lib/libc/gen/tls.c#8 integrate
.. //depot/projects/ia64/lib/libc/i386/sys/i386_get_ldt.2#9 integrate
.. //depot/projects/ia64/lib/libc/locale/wctype.3#6 integrate
.. //depot/projects/ia64/lib/libc/sparc64/fpu/fpu_emu.h#4 integrate
.. //depot/projects/ia64/lib/libc/sparc64/gen/_set_tp.c#2 integrate
.. //depot/projects/ia64/lib/libc/stdio/freopen.c#7 integrate
.. //depot/projects/ia64/lib/libc/stdlib/getenv.3#5 integrate
.. //depot/projects/ia64/lib/libc/string/ffs.3#6 integrate
.. //depot/projects/ia64/lib/libc/sys/Makefile.inc#27 integrate
.. //depot/projects/ia64/lib/libc/sys/intro.2#16 integrate
.. //depot/projects/ia64/lib/libc/sys/read.2#14 integrate
.. //depot/projects/ia64/lib/libc/sys/stat.2#15 integrate
.. //depot/projects/ia64/lib/libc_r/uthread/uthread_init.c#15 integrate
.. //depot/projects/ia64/lib/libc_r/uthread/uthread_select.c#5 integrate
.. //depot/projects/ia64/lib/libc_r/uthread/uthread_sig.c#11 integrate
.. //depot/projects/ia64/lib/libdisk/Makefile#15 integrate
.. //depot/projects/ia64/lib/libkvm/Makefile#4 integrate
.. //depot/projects/ia64/lib/libkvm/kvm_sparc64.c#8 integrate
.. //depot/projects/ia64/lib/libnetgraph/msg.c#7 integrate
.. //depot/projects/ia64/lib/libnetgraph/sock.c#7 integrate
.. //depot/projects/ia64/lib/libpam/modules/pam_unix/pam_unix.8#8 integrate
.. //depot/projects/ia64/lib/libthr/thread/thr_fork.c#5 integrate
.. //depot/projects/ia64/lib/libthr/thread/thr_private.h#28 integrate
.. //depot/projects/ia64/lib/libthr/thread/thr_umtx.c#4 integrate
.. //depot/projects/ia64/lib/libthr/thread/thr_umtx.h#5 integrate
.. //depot/projects/ia64/lib/libthread_db/thread_db.c#3 integrate
.. //depot/projects/ia64/lib/libutil/login.conf.5#13 integrate
.. //depot/projects/ia64/lib/msun/i387/fenv.h#4 integrate
.. //depot/projects/ia64/libexec/rtld-elf/sparc64/reloc.c#12 integrate
.. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#162 integrate
.. //depot/projects/ia64/release/doc/zh_CN.GB2312/hardware/common/artheader.sgml#4 integrate
.. //depot/projects/ia64/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#9 integrate
.. //depot/projects/ia64/release/doc/zh_CN.GB2312/hardware/common/hw.ent#2 integrate
.. //depot/projects/ia64/release/doc/zh_CN.GB2312/installation/Makefile#2 integrate
.. //depot/projects/ia64/release/doc/zh_CN.GB2312/installation/alpha/Makefile#2 delete
.. //depot/projects/ia64/release/doc/zh_CN.GB2312/installation/alpha/article.sgml#2 delete
.. //depot/projects/ia64/release/doc/zh_CN.GB2312/installation/common/artheader.sgml#4 integrate
.. //depot/projects/ia64/release/doc/zh_CN.GB2312/installation/common/install.sgml#4 integrate
.. //depot/projects/ia64/release/doc/zh_CN.GB2312/installation/common/layout.sgml#3 integrate
.. //depot/projects/ia64/release/doc/zh_CN.GB2312/relnotes/Makefile#2 integrate
.. //depot/projects/ia64/release/doc/zh_CN.GB2312/relnotes/alpha/Makefile#2 delete
.. //depot/projects/ia64/release/doc/zh_CN.GB2312/relnotes/alpha/article.sgml#2 delete
.. //depot/projects/ia64/release/doc/zh_CN.GB2312/relnotes/common/new.sgml#8 integrate
.. //depot/projects/ia64/release/doc/zh_CN.GB2312/relnotes/powerpc/Makefile#1 branch
.. //depot/projects/ia64/release/doc/zh_CN.GB2312/relnotes/powerpc/article.sgml#1 branch
.. //depot/projects/ia64/release/doc/zh_CN.GB2312/relnotes/sparc64/Makefile#2 integrate
.. //depot/projects/ia64/release/scripts/package-split.py#8 integrate
.. //depot/projects/ia64/sbin/Makefile#51 integrate
.. //depot/projects/ia64/sbin/bsdlabel/bsdlabel.8#14 integrate
.. //depot/projects/ia64/sbin/bsdlabel/bsdlabel.c#19 integrate
.. //depot/projects/ia64/sbin/devd/devd.conf.5#8 integrate
.. //depot/projects/ia64/sbin/dump/main.c#26 integrate
.. //depot/projects/ia64/sbin/geom/class/mirror/geom_mirror.c#10 integrate
.. //depot/projects/ia64/sbin/geom/class/raid3/geom_raid3.c#11 integrate
.. //depot/projects/ia64/sbin/idmapd/Makefile#4 integrate
.. //depot/projects/ia64/sbin/idmapd/idmapd.8#5 integrate
.. //depot/projects/ia64/sbin/ifconfig/ifconfig.8#40 integrate
.. //depot/projects/ia64/sbin/ipfw/ipfw.8#54 integrate
.. //depot/projects/ia64/sbin/kldload/kldload.8#10 integrate
.. //depot/projects/ia64/sbin/mount_nfs/mount_nfs.8#15 integrate
.. //depot/projects/ia64/sbin/restore/restore.8#16 integrate
.. //depot/projects/ia64/sbin/sysctl/sysctl.c#25 integrate
.. //depot/projects/ia64/share/examples/etc/README.examples#7 integrate
.. //depot/projects/ia64/share/man/man1/builtin.1#10 integrate
.. //depot/projects/ia64/share/man/man3/pthread_schedparam.3#3 integrate
.. //depot/projects/ia64/share/man/man4/Makefile#97 integrate
.. //depot/projects/ia64/share/man/man4/ddb.4#13 integrate
.. //depot/projects/ia64/share/man/man4/geom_uzip.4#1 branch
.. //depot/projects/ia64/share/man/man4/gre.4#6 integrate
.. //depot/projects/ia64/share/man/man4/if_bridge.4#10 integrate
.. //depot/projects/ia64/share/man/man4/ipfirewall.4#7 integrate
.. //depot/projects/ia64/share/man/man4/man4.i386/ndis.4#6 integrate
.. //depot/projects/ia64/share/man/man4/pcm.4#17 integrate
.. //depot/projects/ia64/share/man/man4/sis.4#9 integrate
.. //depot/projects/ia64/share/man/man4/snd_hda.4#2 integrate
.. //depot/projects/ia64/share/man/man4/tun.4#6 integrate
.. //depot/projects/ia64/share/man/man5/disktab.5#9 integrate
.. //depot/projects/ia64/share/man/man5/hosts.equiv.5#6 integrate
.. //depot/projects/ia64/share/man/man5/rc.conf.5#75 integrate
.. //depot/projects/ia64/share/man/man9/hash.9#3 integrate
.. //depot/projects/ia64/share/man/man9/ktr.9#11 integrate
.. //depot/projects/ia64/share/misc/iso3166#9 integrate
.. //depot/projects/ia64/share/mk/bsd.cpu.mk#30 integrate
.. //depot/projects/ia64/share/zoneinfo/africa#7 integrate
.. //depot/projects/ia64/share/zoneinfo/asia#12 integrate
.. //depot/projects/ia64/share/zoneinfo/australasia#11 integrate
.. //depot/projects/ia64/share/zoneinfo/backward#9 integrate
.. //depot/projects/ia64/share/zoneinfo/europe#12 integrate
.. //depot/projects/ia64/share/zoneinfo/northamerica#12 integrate
.. //depot/projects/ia64/share/zoneinfo/southamerica#13 integrate
.. //depot/projects/ia64/share/zoneinfo/yearistype.sh#4 integrate
.. //depot/projects/ia64/share/zoneinfo/zone.tab#13 integrate
.. //depot/projects/ia64/sys/amd64/amd64/busdma_machdep.c#20 integrate
.. //depot/projects/ia64/sys/amd64/amd64/db_trace.c#16 integrate
.. //depot/projects/ia64/sys/amd64/amd64/intr_machdep.c#14 integrate
.. //depot/projects/ia64/sys/amd64/amd64/io_apic.c#11 integrate
.. //depot/projects/ia64/sys/amd64/amd64/local_apic.c#16 integrate
.. //depot/projects/ia64/sys/amd64/amd64/machdep.c#40 integrate
.. //depot/projects/ia64/sys/amd64/amd64/mp_machdep.c#25 integrate
.. //depot/projects/ia64/sys/amd64/amd64/support.S#15 integrate
.. //depot/projects/ia64/sys/amd64/conf/GENERIC.hints#4 integrate
.. //depot/projects/ia64/sys/amd64/conf/NOTES#22 integrate
.. //depot/projects/ia64/sys/amd64/include/apicvar.h#12 integrate
.. //depot/projects/ia64/sys/amd64/include/intr_machdep.h#8 integrate
.. //depot/projects/ia64/sys/amd64/isa/atpic.c#12 integrate
.. //depot/projects/ia64/sys/amd64/linux32/linux.h#4 integrate
.. //depot/projects/ia64/sys/amd64/linux32/linux32_machdep.c#9 integrate
.. //depot/projects/ia64/sys/amd64/linux32/linux32_proto.h#10 integrate
.. //depot/projects/ia64/sys/amd64/linux32/linux32_syscall.h#10 integrate
.. //depot/projects/ia64/sys/amd64/linux32/linux32_sysent.c#10 integrate
.. //depot/projects/ia64/sys/amd64/linux32/syscalls.master#10 integrate
.. //depot/projects/ia64/sys/arm/arm/cpufunc.c#11 integrate
.. //depot/projects/ia64/sys/arm/arm/elf_trampoline.c#7 integrate
.. //depot/projects/ia64/sys/arm/arm/fusu.S#8 integrate
.. //depot/projects/ia64/sys/arm/arm/nexus_io.c#5 integrate
.. //depot/projects/ia64/sys/arm/arm/trap.c#18 integrate
.. //depot/projects/ia64/sys/arm/arm/undefined.c#11 integrate
.. //depot/projects/ia64/sys/arm/at91/at91_mci.c#1 branch
.. //depot/projects/ia64/sys/arm/at91/at91_mcireg.h#1 branch
.. //depot/projects/ia64/sys/arm/at91/at91_spi.c#3 integrate
.. //depot/projects/ia64/sys/arm/at91/at91_ssc.c#3 integrate
.. //depot/projects/ia64/sys/arm/at91/at91_sscreg.h#2 integrate
.. //depot/projects/ia64/sys/arm/at91/at91_twi.c#4 integrate
.. //depot/projects/ia64/sys/arm/at91/if_ate.c#5 integrate
.. //depot/projects/ia64/sys/arm/at91/kb920x_machdep.c#4 integrate
.. //depot/projects/ia64/sys/arm/sa11x0/sa11x0.c#6 integrate
.. //depot/projects/ia64/sys/arm/sa11x0/sa11x0_io.c#7 integrate
.. //depot/projects/ia64/sys/arm/sa11x0/sa11x0_irqhandler.c#6 integrate
.. //depot/projects/ia64/sys/arm/sa11x0/sa11x0_ost.c#5 integrate
.. //depot/projects/ia64/sys/boot/Makefile#19 integrate
.. //depot/projects/ia64/sys/boot/arm/at91/boot2/Makefile#1 branch
.. //depot/projects/ia64/sys/boot/arm/at91/boot2/boot2.c#1 branch
.. //depot/projects/ia64/sys/boot/arm/at91/boot2/kb920x_board.c#1 branch
.. //depot/projects/ia64/sys/boot/arm/at91/libat91/Makefile#3 integrate
.. //depot/projects/ia64/sys/boot/arm/at91/libat91/at91rm9200.h#3 integrate
.. //depot/projects/ia64/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#2 integrate
.. //depot/projects/ia64/sys/boot/arm/at91/libat91/emac.c#3 integrate
.. //depot/projects/ia64/sys/boot/arm/at91/libat91/emac.h#3 integrate
.. //depot/projects/ia64/sys/boot/arm/at91/libat91/emac_init.c#2 integrate
.. //depot/projects/ia64/sys/boot/arm/at91/libat91/lib.h#3 integrate
.. //depot/projects/ia64/sys/boot/arm/at91/libat91/lib_AT91RM9200.h#2 integrate
.. //depot/projects/ia64/sys/boot/arm/at91/libat91/mci_device.c#2 integrate
.. //depot/projects/ia64/sys/boot/arm/at91/libat91/mci_device.h#2 integrate
.. //depot/projects/ia64/sys/boot/arm/at91/libat91/memcmp.c#1 branch
.. //depot/projects/ia64/sys/boot/arm/at91/libat91/memcpy.c#1 branch
.. //depot/projects/ia64/sys/boot/arm/at91/libat91/memset.c#1 branch
.. //depot/projects/ia64/sys/boot/arm/at91/libat91/p_string.c#3 integrate
.. //depot/projects/ia64/sys/boot/arm/at91/libat91/printf.c#2 integrate
.. //depot/projects/ia64/sys/boot/arm/at91/libat91/putchar.c#2 integrate
.. //depot/projects/ia64/sys/boot/arm/at91/libat91/sd-card.c#2 integrate
.. //depot/projects/ia64/sys/boot/arm/at91/libat91/spi_flash.c#2 integrate
.. //depot/projects/ia64/sys/boot/arm/at91/libat91/strcmp.c#1 branch
.. //depot/projects/ia64/sys/boot/arm/at91/libat91/strcpy.c#1 branch
.. //depot/projects/ia64/sys/boot/arm/at91/libat91/strcvt.c#1 branch
.. //depot/projects/ia64/sys/boot/arm/at91/libat91/strlen.c#1 branch
.. //depot/projects/ia64/sys/boot/common/help.common#18 integrate
.. //depot/projects/ia64/sys/boot/common/loader.8#33 integrate
.. //depot/projects/ia64/sys/boot/forth/support.4th#4 integrate
.. //depot/projects/ia64/sys/boot/ofw/libofw/Makefile#6 integrate
.. //depot/projects/ia64/sys/boot/ofw/libofw/openfirm.c#8 integrate
.. //depot/projects/ia64/sys/boot/ofw/libofw/openfirm_mmu.c#1 branch
.. //depot/projects/ia64/sys/boot/sparc64/loader/hcall.S#1 branch
.. //depot/projects/ia64/sys/boot/sparc64/loader/main.c#19 integrate
.. //depot/projects/ia64/sys/compat/freebsd32/freebsd32_proto.h#20 integrate
.. //depot/projects/ia64/sys/compat/freebsd32/freebsd32_syscall.h#20 integrate
.. //depot/projects/ia64/sys/compat/freebsd32/freebsd32_syscalls.c#20 integrate
.. //depot/projects/ia64/sys/compat/freebsd32/freebsd32_sysent.c#20 integrate
.. //depot/projects/ia64/sys/compat/freebsd32/syscalls.master#20 integrate
.. //depot/projects/ia64/sys/compat/linprocfs/linprocfs.c#44 integrate
.. //depot/projects/ia64/sys/compat/linux/linux_aio.c#1 branch
.. //depot/projects/ia64/sys/compat/linux/linux_aio.h#1 branch
.. //depot/projects/ia64/sys/compat/linux/linux_emul.c#2 integrate
.. //depot/projects/ia64/sys/compat/linux/linux_ipc.c#18 integrate
.. //depot/projects/ia64/sys/compat/linux/linux_misc.c#46 integrate
.. //depot/projects/ia64/sys/compat/linux/linux_signal.c#20 integrate
.. //depot/projects/ia64/sys/compat/linux/linux_signal.h#3 integrate
.. //depot/projects/ia64/sys/conf/NOTES#105 integrate
.. //depot/projects/ia64/sys/conf/files#145 integrate
.. //depot/projects/ia64/sys/conf/files.amd64#40 integrate
.. //depot/projects/ia64/sys/conf/files.i386#79 integrate
.. //depot/projects/ia64/sys/conf/files.pc98#66 integrate
.. //depot/projects/ia64/sys/conf/files.sun4v#2 integrate
.. //depot/projects/ia64/sys/conf/kern.post.mk#62 integrate
.. //depot/projects/ia64/sys/conf/kern.pre.mk#40 integrate
.. //depot/projects/ia64/sys/conf/kmod.mk#55 integrate
.. //depot/projects/ia64/sys/ddb/db_command.c#25 integrate
.. //depot/projects/ia64/sys/ddb/db_examine.c#7 integrate
.. //depot/projects/ia64/sys/ddb/db_output.c#11 integrate
.. //depot/projects/ia64/sys/ddb/db_output.h#5 integrate
.. //depot/projects/ia64/sys/dev/ata/ata-chipset.c#55 integrate
.. //depot/projects/ia64/sys/dev/ath/if_athvar.h#22 integrate
.. //depot/projects/ia64/sys/dev/awi/if_awi_pccard.c#16 integrate
.. //depot/projects/ia64/sys/dev/bce/if_bce.c#4 integrate
.. //depot/projects/ia64/sys/dev/bce/if_bcereg.h#4 integrate
.. //depot/projects/ia64/sys/dev/bge/if_bge.c#70 integrate
.. //depot/projects/ia64/sys/dev/ipmi/ipmi.c#4 integrate
.. //depot/projects/ia64/sys/dev/iwi/if_iwi.c#10 integrate
.. //depot/projects/ia64/sys/dev/mfi/mfi.c#6 integrate
.. //depot/projects/ia64/sys/dev/mfi/mfi_debug.c#2 integrate
.. //depot/projects/ia64/sys/dev/mfi/mfi_disk.c#3 integrate
.. //depot/projects/ia64/sys/dev/mfi/mfireg.h#4 integrate
.. //depot/projects/ia64/sys/dev/mfi/mfivar.h#4 integrate
.. //depot/projects/ia64/sys/dev/mmc/bridge.h#1 branch
.. //depot/projects/ia64/sys/dev/mmc/mmc.c#1 branch
.. //depot/projects/ia64/sys/dev/mmc/mmcbr_if.m#1 branch
.. //depot/projects/ia64/sys/dev/mmc/mmcbrvar.h#1 branch
.. //depot/projects/ia64/sys/dev/mmc/mmcbus_if.m#1 branch
.. //depot/projects/ia64/sys/dev/mmc/mmcreg.h#1 branch
.. //depot/projects/ia64/sys/dev/mmc/mmcsd.c#1 branch
.. //depot/projects/ia64/sys/dev/mmc/mmcvar.h#1 branch
.. //depot/projects/ia64/sys/dev/mxge/if_mxge.c#3 integrate
.. //depot/projects/ia64/sys/dev/nfe/if_nfe.c#3 integrate
.. //depot/projects/ia64/sys/dev/nfe/if_nfereg.h#3 integrate
.. //depot/projects/ia64/sys/dev/ofw/openfirm.c#11 integrate
.. //depot/projects/ia64/sys/dev/ofw/openfirm.h#7 integrate
.. //depot/projects/ia64/sys/dev/pci/pci.c#58 integrate
.. //depot/projects/ia64/sys/dev/pci/pci_if.m#6 integrate
.. //depot/projects/ia64/sys/dev/pci/pci_pci.c#30 integrate
.. //depot/projects/ia64/sys/dev/pci/pci_private.h#14 integrate
.. //depot/projects/ia64/sys/dev/pci/pcivar.h#16 integrate
.. //depot/projects/ia64/sys/dev/ray/if_ray.c#22 integrate
.. //depot/projects/ia64/sys/dev/sk/if_sk.c#5 integrate
.. //depot/projects/ia64/sys/dev/sk/if_skreg.h#5 integrate
.. //depot/projects/ia64/sys/dev/sound/midi/sequencer.c#12 integrate
.. //depot/projects/ia64/sys/dev/sound/pci/hda/hdac.c#2 integrate
.. //depot/projects/ia64/sys/dev/sound/pcm/dsp.c#26 integrate
.. //depot/projects/ia64/sys/dev/spibus/spibus.c#2 integrate
.. //depot/projects/ia64/sys/dev/usb/ehci.c#17 integrate
.. //depot/projects/ia64/sys/dev/usb/if_axe.c#22 integrate
.. //depot/projects/ia64/sys/dev/usb/if_udav.c#12 integrate
.. //depot/projects/ia64/sys/dev/usb/if_ural.c#11 integrate
.. //depot/projects/ia64/sys/dev/usb/ohci.c#35 integrate
.. //depot/projects/ia64/sys/dev/usb/uhci.c#34 integrate
.. //depot/projects/ia64/sys/dev/usb/usb.c#29 integrate
.. //depot/projects/ia64/sys/dev/usb/usbdi.h#16 integrate
.. //depot/projects/ia64/sys/fs/devfs/devfs.h#17 integrate
.. //depot/projects/ia64/sys/fs/devfs/devfs_devs.c#21 integrate
.. //depot/projects/ia64/sys/fs/devfs/devfs_int.h#3 integrate
.. //depot/projects/ia64/sys/fs/devfs/devfs_vnops.c#48 integrate
.. //depot/projects/ia64/sys/fs/ntfs/ntfs_vnops.c#25 integrate
.. //depot/projects/ia64/sys/geom/raid3/g_raid3.c#21 integrate
.. //depot/projects/ia64/sys/i386/acpica/Makefile#6 integrate
.. //depot/projects/ia64/sys/i386/conf/NOTES#77 integrate
.. //depot/projects/ia64/sys/i386/i386/db_trace.c#24 integrate
.. //depot/projects/ia64/sys/i386/i386/intr_machdep.c#13 integrate
.. //depot/projects/ia64/sys/i386/i386/io_apic.c#12 integrate
.. //depot/projects/ia64/sys/i386/i386/local_apic.c#17 integrate
.. //depot/projects/ia64/sys/i386/i386/mp_machdep.c#55 integrate
.. //depot/projects/ia64/sys/i386/i386/support.s#18 integrate
.. //depot/projects/ia64/sys/i386/include/apicvar.h#13 integrate
.. //depot/projects/ia64/sys/i386/include/intr_machdep.h#9 integrate
.. //depot/projects/ia64/sys/i386/isa/atpic.c#13 integrate
.. //depot/projects/ia64/sys/i386/linux/linux.h#10 integrate
.. //depot/projects/ia64/sys/i386/linux/linux_machdep.c#23 integrate
.. //depot/projects/ia64/sys/i386/linux/linux_proto.h#20 integrate
.. //depot/projects/ia64/sys/i386/linux/linux_syscall.h#20 integrate
.. //depot/projects/ia64/sys/i386/linux/linux_sysent.c#21 integrate
.. //depot/projects/ia64/sys/i386/linux/syscalls.master#19 integrate
.. //depot/projects/ia64/sys/ia64/conf/NOTES#10 integrate
.. //depot/projects/ia64/sys/ia64/ia64/busdma_machdep.c#23 integrate
.. //depot/projects/ia64/sys/ia64/ia64/clock.c#23 integrate
.. //depot/projects/ia64/sys/ia64/ia64/support.S#8 integrate
.. //depot/projects/ia64/sys/kern/init_sysent.c#55 integrate
.. //depot/projects/ia64/sys/kern/kern_conf.c#41 integrate
.. //depot/projects/ia64/sys/kern/kern_intr.c#41 integrate
.. //depot/projects/ia64/sys/kern/kern_sig.c#93 integrate
.. //depot/projects/ia64/sys/kern/kern_timeout.c#19 integrate
.. //depot/projects/ia64/sys/kern/kern_umtx.c#22 integrate
.. //depot/projects/ia64/sys/kern/subr_trap.c#51 integrate
.. //depot/projects/ia64/sys/kern/sys_generic.c#42 integrate
.. //depot/projects/ia64/sys/kern/sys_process.c#38 integrate
.. //depot/projects/ia64/sys/kern/syscalls.c#56 integrate
.. //depot/projects/ia64/sys/kern/syscalls.master#57 integrate
.. //depot/projects/ia64/sys/kern/systrace_args.c#2 integrate
.. //depot/projects/ia64/sys/kern/vfs_aio.c#57 integrate
.. //depot/projects/ia64/sys/modules/aio/Makefile#2 integrate
.. //depot/projects/ia64/sys/modules/linux/Makefile#15 integrate
.. //depot/projects/ia64/sys/modules/mem/Makefile#4 integrate
.. //depot/projects/ia64/sys/modules/mmc/Makefile#1 branch
.. //depot/projects/ia64/sys/modules/mmcsd/Makefile#1 branch
.. //depot/projects/ia64/sys/modules/uart/Makefile#11 integrate
.. //depot/projects/ia64/sys/net/if_bridge.c#10 integrate
.. //depot/projects/ia64/sys/net/if_ppp.c#27 integrate
.. //depot/projects/ia64/sys/net/if_vlan.c#32 integrate
.. //depot/projects/ia64/sys/netgraph/netflow/netflow.c#12 integrate
.. //depot/projects/ia64/sys/netgraph/netflow/ng_netflow.c#8 integrate
.. //depot/projects/ia64/sys/netgraph/netgraph.h#19 integrate
.. //depot/projects/ia64/sys/netgraph/ng_base.c#31 integrate
.. //depot/projects/ia64/sys/netgraph/ng_message.h#12 integrate
.. //depot/projects/ia64/sys/netgraph/ng_nat.c#3 integrate
.. //depot/projects/ia64/sys/netgraph/ng_socket.c#31 integrate
.. //depot/projects/ia64/sys/netgraph/ng_socket.h#4 integrate
.. //depot/projects/ia64/sys/netinet/ip_fw2.c#59 integrate
.. //depot/projects/ia64/sys/netinet/ip_fw_pfil.c#13 integrate
.. //depot/projects/ia64/sys/netinet/ip_input.c#64 integrate
.. //depot/projects/ia64/sys/netinet/libalias/libalias.3#5 integrate
.. //depot/projects/ia64/sys/netinet6/in6_ifattach.c#19 integrate
.. //depot/projects/ia64/sys/netinet6/in6_proto.c#16 integrate
.. //depot/projects/ia64/sys/nfsclient/nfs.h#23 integrate
.. //depot/projects/ia64/sys/nfsclient/nfs_vnops.c#52 integrate
.. //depot/projects/ia64/sys/pc98/conf/NOTES#38 integrate
.. //depot/projects/ia64/sys/pci/agp.c#30 integrate
.. //depot/projects/ia64/sys/pci/agp_amd64.c#11 integrate
.. //depot/projects/ia64/sys/pci/nfsmb.c#4 integrate
.. //depot/projects/ia64/sys/powerpc/powerpc/copyinout.c#14 integrate
.. //depot/projects/ia64/sys/powerpc/powerpc/db_interface.c#5 integrate
.. //depot/projects/ia64/sys/security/audit/audit_syscalls.c#4 integrate
.. //depot/projects/ia64/sys/security/mac_portacl/mac_portacl.c#9 integrate
.. //depot/projects/ia64/sys/sparc64/conf/NOTES#18 integrate
.. //depot/projects/ia64/sys/sparc64/include/asi.h#6 integrate
.. //depot/projects/ia64/sys/sparc64/pci/ofw_pcib.c#6 integrate
.. //depot/projects/ia64/sys/sparc64/pci/ofw_pcib_subr.c#6 integrate
.. //depot/projects/ia64/sys/sparc64/pci/ofw_pcibus.c#8 integrate
.. //depot/projects/ia64/sys/sparc64/sparc64/db_interface.c#8 integrate
.. //depot/projects/ia64/sys/sparc64/sparc64/genassym.c#29 integrate
.. //depot/projects/ia64/sys/sparc64/sparc64/support.S#11 integrate
.. //depot/projects/ia64/sys/sun4v/conf/GENERIC#2 integrate
.. //depot/projects/ia64/sys/sun4v/conf/NOTES#2 integrate
.. //depot/projects/ia64/sys/sun4v/include/asi.h#2 integrate
.. //depot/projects/ia64/sys/sun4v/include/tte.h#2 integrate
.. //depot/projects/ia64/sys/sun4v/sun4v/exception.S#2 integrate
.. //depot/projects/ia64/sys/sun4v/sun4v/fpemu.c#2 delete
.. //depot/projects/ia64/sys/sun4v/sun4v/genassym.c#2 delete
.. //depot/projects/ia64/sys/sun4v/sun4v/hvcons.c#2 integrate
.. //depot/projects/ia64/sys/sun4v/sun4v/machdep.c#2 integrate
.. //depot/projects/ia64/sys/sun4v/sun4v/support.S#2 integrate
.. //depot/projects/ia64/sys/sun4v/sun4v/t1_copy.S#2 integrate
.. //depot/projects/ia64/sys/sun4v/sun4v/trap.c#2 integrate
.. //depot/projects/ia64/sys/sun4v/sun4v/tsb.c#2 integrate
.. //depot/projects/ia64/sys/sun4v/sun4v/vnex.c#2 integrate
.. //depot/projects/ia64/sys/sys/conf.h#44 integrate
.. //depot/projects/ia64/sys/sys/elf32.h#6 integrate
.. //depot/projects/ia64/sys/sys/elf64.h#7 integrate
.. //depot/projects/ia64/sys/sys/rwlock.h#5 integrate
.. //depot/projects/ia64/sys/sys/sem.h#6 integrate
.. //depot/projects/ia64/sys/sys/syscall.h#55 integrate
.. //depot/projects/ia64/sys/sys/syscall.mk#55 integrate
.. //depot/projects/ia64/sys/sys/sysproto.h#58 integrate
.. //depot/projects/ia64/sys/sys/systm.h#50 integrate
.. //depot/projects/ia64/sys/sys/umtx.h#12 integrate
.. //depot/projects/ia64/sys/ufs/ffs/ffs_inode.c#23 integrate
.. //depot/projects/ia64/sys/ufs/ffs/ffs_snapshot.c#50 integrate
.. //depot/projects/ia64/sys/ufs/ffs/ffs_vnops.c#50 integrate
.. //depot/projects/ia64/sys/ufs/ufs/inode.h#15 integrate
.. //depot/projects/ia64/sys/ufs/ufs/ufs_vnops.c#55 integrate
.. //depot/projects/ia64/sys/vm/vm_contig.c#32 integrate
.. //depot/projects/ia64/sys/vm/vnode_pager.c#60 integrate
.. //depot/projects/ia64/tools/regression/execve/Makefile#2 integrate
.. //depot/projects/ia64/tools/regression/execve/execve.t#2 integrate
.. //depot/projects/ia64/tools/tools/tinybsd/tinybsd#2 integrate
.. //depot/projects/ia64/usr.bin/calendar/calendars/calendar.holiday#14 integrate
.. //depot/projects/ia64/usr.bin/expand/expand.1#7 integrate
.. //depot/projects/ia64/usr.bin/find/find.1#24 integrate
.. //depot/projects/ia64/usr.bin/jot/jot.1#6 integrate
.. //depot/projects/ia64/usr.bin/lam/lam.1#4 integrate
.. //depot/projects/ia64/usr.bin/make/str.c#18 integrate
.. //depot/projects/ia64/usr.bin/rs/rs.1#5 integrate
.. //depot/projects/ia64/usr.bin/systat/systat.1#16 integrate
.. //depot/projects/ia64/usr.bin/tput/tput.c#8 integrate
.. //depot/projects/ia64/usr.bin/tr/tr.1#11 integrate
.. //depot/projects/ia64/usr.bin/unexpand/unexpand.c#9 integrate
.. //depot/projects/ia64/usr.sbin/Makefile#80 integrate
.. //depot/projects/ia64/usr.sbin/arp/arp.c#23 integrate
.. //depot/projects/ia64/usr.sbin/bluetooth/bthidd/bthidd.8#2 integrate
.. //depot/projects/ia64/usr.sbin/bluetooth/bthidd/hid.c#5 integrate
.. //depot/projects/ia64/usr.sbin/mountd/mountd.c#19 integrate
.. //depot/projects/ia64/usr.sbin/ndiscvt/ndiscvt.8#6 integrate
.. //depot/projects/ia64/usr.sbin/pccard/Makefile#3 integrate
.. //depot/projects/ia64/usr.sbin/pccard/dumpcis/Makefile#1 branch
.. //depot/projects/ia64/usr.sbin/pccard/dumpcis/dumpcis.8#1 branch
.. //depot/projects/ia64/usr.sbin/pccard/dumpcis/main.c#1 branch
.. //depot/projects/ia64/usr.sbin/pccard/pccardd/Makefile#3 delete
.. //depot/projects/ia64/usr.sbin/pccard/pccardd/cardd.c#9 delete
.. //depot/projects/ia64/usr.sbin/pccard/pccardd/cardd.h#6 delete
.. //depot/projects/ia64/usr.sbin/pccard/pccardd/file.c#5 delete
.. //depot/projects/ia64/usr.sbin/pccard/pccardd/pccard.conf.5#7 delete
.. //depot/projects/ia64/usr.sbin/pccard/pccardd/pccardd.8#8 delete
.. //depot/projects/ia64/usr.sbin/pccard/pccardd/pccardd.c#4 delete
.. //depot/projects/ia64/usr.sbin/pccard/pccardd/server.c#3 delete
.. //depot/projects/ia64/usr.sbin/pccard/pccardd/util.c#2 delete
.. //depot/projects/ia64/usr.sbin/pw/pw.8#11 integrate
.. //depot/projects/ia64/usr.sbin/sysinstall/disks.c#24 integrate
.. //depot/projects/ia64/usr.sbin/syslogd/syslog.conf.5#17 integrate
.. //depot/projects/ia64/usr.sbin/wicontrol/wicontrol.8#22 integrate
.. //depot/projects/ia64/usr.sbin/wicontrol/wicontrol.c#17 integrate
.. //depot/projects/ia64/usr.sbin/zic/zdump/Makefile#3 integrate
.. //depot/projects/ia64/usr.sbin/zic/zic/Makefile#3 integrate
Differences ...
==== //depot/projects/ia64/Makefile#52 (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:
#
@@ -266,7 +266,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/ia64/Makefile.inc1#112 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile.inc1,v 1.561 2006/10/07 19:26:46 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
==== //depot/projects/ia64/bin/cp/cp.1#12 (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/ia64/bin/cp/cp.c#20 (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/ia64/bin/ls/ls.1#31 (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/ia64/bin/ls/print.c#21 (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/ia64/bin/mkdir/mkdir.c#9 (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/ia64/bin/rm/rm.c#16 (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;
- if (!uid &&
+ if (!uid && !S_ISWHT(sb.st_mode) &&
(sb.st_flags & (UF_APPEND|UF_IMMUTABLE)) &&
!(sb.st_flags & (SF_APPEND|SF_IMMUTABLE)))
rval = chflags(f, sb.st_flags & ~(UF_APPEND|UF_IMMUTABLE));
==== //depot/projects/ia64/contrib/ncurses/man/MKterminfo.sh#3 (text+ko) ====
@@ -1,6 +1,10 @@
#!/bin/sh
+# $Id: MKterminfo.sh,v 1.12 2003/01/11 21:42:12 tom Exp $
+#
+# MKterminfo.sh -- generate terminfo.5 from Caps tabular data
+#
#***************************************************************************
-# Copyright (c) 1998,2000,2001 Free Software Foundation, Inc. *
+# Copyright (c) 1998,2002,2003 Free Software Foundation, Inc. *
# *
# Permission is hereby granted, free of charge, to any person obtaining a *
# copy of this software and associated documentation files (the *
@@ -27,10 +31,6 @@
# authorization. *
#***************************************************************************
#
-# $Id: MKterminfo.sh,v 1.9 2001/09/01 23:06:18 tom Exp $
-#
-# MKterminfo.sh -- generate terminfo.5 from Caps tabular data
-#
# This script takes terminfo.head and terminfo.tail and splices in between
# them a table derived from the Caps data file. Besides avoiding having
# the docs fall out of sync with the table, this also lets us set up tbl
@@ -41,10 +41,13 @@
# had better be no s in the table source text.
#
# keep the order independent of locale:
-LANGUAGE=C
-LC_ALL=C
-export LANGUAGE
-export LC_ALL
+if test "${LANGUAGE+set}" = set; then LANGUAGE=C; export LANGUAGE; fi
+if test "${LANG+set}" = set; then LANG=C; export LANG; fi
+if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
+if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
+if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi
+if test "${LC_COLLATE+set}" = set; then LC_COLLATE=C; export LC_COLLATE; fi
+
#
head=$1
caps=$2
@@ -66,11 +69,11 @@
sed -n <$caps "\
/%%-STOP-HERE-%%/q
-/^#%/s///p
+/^#%/s/#%//p
/^#/d
-s/[ ]\+/ /g
+s/[ ][ ]*/ /g
s/$/T}/
-s/ [A-Z0-9_()\-]\+ [0-9\-]\+ [Y\-][B\-][C\-][G\-][EK\-]\** / T{/
+s/ [A-Z0-9_()\-][A-Z0-9_()\-]* [0-9\-][0-9\-]* [Y\-][B\-][C\-][G\-][EK\-]\** / T{/
s/ bool / /p
s/ num / /p
s/ str / /p
==== //depot/projects/ia64/contrib/traceroute/traceroute.8#7 (text+ko) ====
@@ -14,7 +14,7 @@
.\" WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
.\"
.\" $Id: traceroute.8,v 1.19 2000/09/21 08:44:19 leres Exp $
-.\" $FreeBSD: src/contrib/traceroute/traceroute.8,v 1.14 2006/06/13 14:59:07 dwmalone Exp $
+.\" $FreeBSD: src/contrib/traceroute/traceroute.8,v 1.16 2006/10/15 17:44:49 dwmalone Exp $
.\"
.TH TRACEROUTE 8 "21 September 2000"
.UC 6
@@ -24,7 +24,7 @@
.na
.B traceroute
[
-.B \-deFISdnrvx
+.B \-dDeFISnrvx
] [
.B \-f
.I first_ttl
@@ -112,6 +112,18 @@
.B \-d
Enable socket level debugging.
.TP
+.B \-D
+When an ICMP response to our probe datagram is received,
+print the differences between the transmitted packet and
+the packet quoted by the ICMP response.
+A key showing the location of fields within the transmitted packet is printed,
+followed by the original packet in hex,
+followed by the quoted packet in hex.
+Bytes that are unchanged in the quoted packet are shown as underscores.
+Note,
+the IP checksum and the TTL of the quoted packet are not expected to match.
+By default, only one probe per hop is sent with this option.
+.TP
.B \-g
Specify a loose source route gateway (8 maximum).
.TP
@@ -163,7 +175,11 @@
to pick an unused port range.
.TP
.B \-q
-Set the number of probes per hop (default is 3).
+Set the number of probes per hop (default is 3,
+unless
+.B -D
+is specified,
+when it is 1).
.TP
.B \-r
Bypass the normal routing tables and send directly to a host on an attached
==== //depot/projects/ia64/contrib/traceroute/traceroute.c#10 (text+ko) ====
@@ -28,7 +28,7 @@
"@(#)$Id: traceroute.c,v 1.68 2000/12/14 08:04:33 leres Exp $ (LBL)";
#endif
static const char rcsid[] =
- "$FreeBSD: src/contrib/traceroute/traceroute.c,v 1.30 2006/06/13 14:59:07 dwmalone Exp $";
+ "$FreeBSD: src/contrib/traceroute/traceroute.c,v 1.32 2006/10/15 17:44:49 dwmalone Exp $";
#endif
/*
@@ -316,6 +316,9 @@
struct ip *outip; /* last output ip packet */
u_char *outp; /* last output inner protocol packet */
+struct ip *hip = NULL; /* Quoted IP header */
+int hiplen = 0;
+
/* loose source route gateway list (including room for final destination) */
u_int32_t gwlist[NGATEWAYS + 1];
@@ -337,7 +340,7 @@
char *device;
static const char devnull[] = "/dev/null";
-int nprobes = 3;
+int nprobes = -1;
int max_ttl;
int first_ttl = 1;
u_short ident;
@@ -354,6 +357,7 @@
#endif
int optlen; /* length of ip options */
int fixedPort = 0; /* Use fixed destination port for TCP and UDP */
+int printdiff = 0; /* Print the difference between sent and quoted */
extern int optind;
extern int opterr;
@@ -380,6 +384,7 @@
void tvsub(struct timeval *, struct timeval *);
void usage(void);
int wait_for_reply(int, struct sockaddr_in *, const struct timeval *);
+void pkt_compare(const u_char *, int, const u_char *, int);
#ifndef HAVE_USLEEP
int usleep(u_int);
#endif
@@ -398,6 +403,7 @@
/* Descriptor structure for each outgoing protocol we support */
struct outproto {
char *name; /* name of protocol */
+ const char *key; /* An ascii key for the bytes of the header */
u_char num; /* IP protocol number */
u_short hdrlen; /* max size of protocol header */
u_short port; /* default base protocol-specific "port" */
@@ -412,6 +418,7 @@
struct outproto protos[] = {
{
"udp",
+ "spt dpt len sum",
IPPROTO_UDP,
sizeof(struct udphdr),
32768 + 666,
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list