PERFORCE change 138946 for review
John Birrell
jb at FreeBSD.org
Sat Mar 29 16:43:26 PDT 2008
http://perforce.freebsd.org/chv.cgi?CH=138946
Change 138946 by jb at jb_freebsd1 on 2008/03/29 23:42:30
IF7
Affected files ...
.. //depot/projects/dtrace7/src/Makefile#3 integrate
.. //depot/projects/dtrace7/src/Makefile.inc1#5 integrate
.. //depot/projects/dtrace7/src/ObsoleteFiles.inc#6 integrate
.. //depot/projects/dtrace7/src/UPDATING#3 integrate
.. //depot/projects/dtrace7/src/bin/Makefile#2 integrate
.. //depot/projects/dtrace7/src/bin/chflags/chflags.1#2 integrate
.. //depot/projects/dtrace7/src/bin/chflags/chflags.c#2 integrate
.. //depot/projects/dtrace7/src/bin/realpath/realpath.1#2 integrate
.. //depot/projects/dtrace7/src/bin/realpath/realpath.c#2 integrate
.. //depot/projects/dtrace7/src/bin/uuidgen/Makefile#1 branch
.. //depot/projects/dtrace7/src/bin/uuidgen/uuidgen.1#1 branch
.. //depot/projects/dtrace7/src/bin/uuidgen/uuidgen.c#1 branch
.. //depot/projects/dtrace7/src/contrib/bsnmp/snmpd/main.c#2 integrate
.. //depot/projects/dtrace7/src/contrib/file/Magdir/bFLT#2 delete
.. //depot/projects/dtrace7/src/contrib/file/Magdir/chi#2 delete
.. //depot/projects/dtrace7/src/contrib/file/Magdir/cvs#2 delete
.. //depot/projects/dtrace7/src/contrib/file/Magdir/hdf#2 delete
.. //depot/projects/dtrace7/src/contrib/file/Magdir/impulse#2 delete
.. //depot/projects/dtrace7/src/contrib/file/Magdir/wordperfect#2 delete
.. //depot/projects/dtrace7/src/contrib/file/acconfig.h#2 delete
.. //depot/projects/dtrace7/src/contrib/file/magic.c#3 integrate
.. //depot/projects/dtrace7/src/contrib/file/missing#2 delete
.. //depot/projects/dtrace7/src/contrib/file/stamp-h.in#2 delete
.. //depot/projects/dtrace7/src/contrib/gcc/config/sparc/freebsd.h#2 integrate
.. //depot/projects/dtrace7/src/contrib/pf/man/pf.conf.5#2 integrate
.. //depot/projects/dtrace7/src/contrib/tcpdump/print-802_11.c#2 integrate
.. //depot/projects/dtrace7/src/contrib/top/top.c#2 integrate
.. //depot/projects/dtrace7/src/crypto/openssl/crypto/engine/eng_cryptodev.c#2 integrate
.. //depot/projects/dtrace7/src/etc/defaults/rc.conf#5 integrate
.. //depot/projects/dtrace7/src/etc/mail/access.sample#2 integrate
.. //depot/projects/dtrace7/src/etc/namedb/named.root#2 integrate
.. //depot/projects/dtrace7/src/etc/periodic/security/100.chksetuid#3 integrate
.. //depot/projects/dtrace7/src/etc/periodic/security/410.logincheck#2 integrate
.. //depot/projects/dtrace7/src/etc/rc.d/dhclient#3 integrate
.. //depot/projects/dtrace7/src/etc/rc.d/mountcritlocal#3 integrate
.. //depot/projects/dtrace7/src/etc/rc.d/mountlate#2 integrate
.. //depot/projects/dtrace7/src/etc/rc.firewall#3 integrate
.. //depot/projects/dtrace7/src/etc/sendmail/freebsd.mc#3 integrate
.. //depot/projects/dtrace7/src/gnu/usr.bin/diff/Makefile#2 integrate
.. //depot/projects/dtrace7/src/gnu/usr.bin/gdb/kgdb/Makefile#2 integrate
.. //depot/projects/dtrace7/src/gnu/usr.bin/gdb/kgdb/kgdb.h#3 integrate
.. //depot/projects/dtrace7/src/gnu/usr.bin/gdb/kgdb/kld.c#1 branch
.. //depot/projects/dtrace7/src/gnu/usr.bin/gdb/kgdb/kthr.c#3 integrate
.. //depot/projects/dtrace7/src/gnu/usr.bin/gdb/kgdb/main.c#2 integrate
.. //depot/projects/dtrace7/src/gnu/usr.bin/gdb/kgdb/trgt.c#2 integrate
.. //depot/projects/dtrace7/src/gnu/usr.bin/gdb/kgdb/trgt_i386.c#3 integrate
.. //depot/projects/dtrace7/src/gnu/usr.bin/sort/Makefile#2 integrate
.. //depot/projects/dtrace7/src/include/stdio.h#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/Makefile#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/archive.h.in#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/archive_endian.h#1 branch
.. //depot/projects/dtrace7/src/lib/libarchive/archive_entry.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/archive_entry.h#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/archive_entry_link_resolver.c#1 branch
.. //depot/projects/dtrace7/src/lib/libarchive/archive_entry_private.h#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/archive_entry_strmode.c#1 branch
.. //depot/projects/dtrace7/src/lib/libarchive/archive_platform.h#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/archive_read.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/archive_read_extract.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/archive_read_open_filename.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/archive_read_private.h#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/archive_read_support_compression_bzip2.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/archive_read_support_compression_gzip.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/archive_read_support_compression_none.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/archive_read_support_format_all.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/archive_read_support_format_ar.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/archive_read_support_format_cpio.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/archive_read_support_format_iso9660.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/archive_read_support_format_mtree.c#1 branch
.. //depot/projects/dtrace7/src/lib/libarchive/archive_read_support_format_tar.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/archive_read_support_format_zip.c#3 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/archive_util.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/archive_write_disk.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/archive_write_open_filename.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/archive_write_set_compression_bzip2.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/archive_write_set_compression_gzip.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/archive_write_set_compression_none.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/archive_write_set_format_ar.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/archive_write_set_format_cpio.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/archive_write_set_format_cpio_newc.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/archive_write_set_format_pax.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/archive_write_set_format_ustar.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/config_freebsd.h#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/cpio.5#1 branch
.. //depot/projects/dtrace7/src/lib/libarchive/filter_fork.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/libarchive-formats.5#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/libarchive_internals.3#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/test/Makefile#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/test/README#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/test/main.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/test/read_open_memory.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/test/test.h#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/test/test_compat_gtar.c#1 branch
.. //depot/projects/dtrace7/src/lib/libarchive/test/test_compat_gtar_1.tgz.uu#1 branch
.. //depot/projects/dtrace7/src/lib/libarchive/test/test_compat_tar_hardlink.c#1 branch
.. //depot/projects/dtrace7/src/lib/libarchive/test/test_compat_tar_hardlink_1.tar.uu#1 branch
.. //depot/projects/dtrace7/src/lib/libarchive/test/test_compat_zip.c#1 branch
.. //depot/projects/dtrace7/src/lib/libarchive/test/test_compat_zip_1.zip.uu#1 branch
.. //depot/projects/dtrace7/src/lib/libarchive/test/test_empty_write.c#1 branch
.. //depot/projects/dtrace7/src/lib/libarchive/test/test_entry_strmode.c#1 branch
.. //depot/projects/dtrace7/src/lib/libarchive/test/test_read_format_cpio_odc.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/test/test_read_format_gtar_sparse.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/test/test_read_format_gtar_sparse_1_13.tgz.uu#1 branch
.. //depot/projects/dtrace7/src/lib/libarchive/test/test_read_format_gtar_sparse_1_17.tgz.uu#1 branch
.. //depot/projects/dtrace7/src/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix00.tgz.uu#1 branch
.. //depot/projects/dtrace7/src/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix01.tgz.uu#1 branch
.. //depot/projects/dtrace7/src/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix10.tgz.uu#1 branch
.. //depot/projects/dtrace7/src/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix10_modified.tar.uu#1 branch
.. //depot/projects/dtrace7/src/lib/libarchive/test/test_read_format_isorr_bz2.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/test/test_read_format_mtree.c#1 branch
.. //depot/projects/dtrace7/src/lib/libarchive/test/test_read_format_tar.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/test/test_read_format_zip.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/test/test_read_pax_truncated.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/test/test_tar_filenames.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/test/test_tar_large.c#1 branch
.. //depot/projects/dtrace7/src/lib/libarchive/test/test_write_disk.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/test/test_write_disk_hardlink.c#1 branch
.. //depot/projects/dtrace7/src/lib/libarchive/test/test_write_disk_perms.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/test/test_write_format_cpio.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libarchive/test/test_write_format_cpio_newc.c#1 branch
.. //depot/projects/dtrace7/src/lib/libarchive/test/test_write_format_cpio_odc.c#1 branch
.. //depot/projects/dtrace7/src/lib/libc/gen/Makefile.inc#2 integrate
.. //depot/projects/dtrace7/src/lib/libc/gen/Symbol.map#2 integrate
.. //depot/projects/dtrace7/src/lib/libc/gen/sem_timedwait.3#1 branch
.. //depot/projects/dtrace7/src/lib/libc/gen/sysconf.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libc/locale/setrunelocale.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libc/resolv/res_comp.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libc/stdio/fdopen.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libc/stdio/fopen.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libc/stdio/freopen.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libc/stdlib/getenv.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libc/stdlib/malloc.3#2 integrate
.. //depot/projects/dtrace7/src/lib/libc/stdlib/malloc.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libc/sys/Makefile.inc#2 integrate
.. //depot/projects/dtrace7/src/lib/libc/sys/access.2#2 integrate
.. //depot/projects/dtrace7/src/lib/libc/sys/clock_gettime.2#2 integrate
.. //depot/projects/dtrace7/src/lib/libc/sys/kldunload.2#2 integrate
.. //depot/projects/dtrace7/src/lib/libc/sys/mq_close.2#2 integrate
.. //depot/projects/dtrace7/src/lib/libc/sys/mq_getattr.2#2 integrate
.. //depot/projects/dtrace7/src/lib/libc/sys/mq_notify.2#2 integrate
.. //depot/projects/dtrace7/src/lib/libc/sys/mq_open.2#2 integrate
.. //depot/projects/dtrace7/src/lib/libc/sys/mq_receive.2#2 integrate
.. //depot/projects/dtrace7/src/lib/libc/sys/mq_send.2#2 integrate
.. //depot/projects/dtrace7/src/lib/libc/sys/mq_setattr.2#2 integrate
.. //depot/projects/dtrace7/src/lib/libdisk/disk.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libelf/elf.3#3 integrate
.. //depot/projects/dtrace7/src/lib/libelf/gelf_fsize.3#3 integrate
.. //depot/projects/dtrace7/src/lib/libelf/libelf_data.c#4 integrate
.. //depot/projects/dtrace7/src/lib/libfetch/common.c#3 integrate
.. //depot/projects/dtrace7/src/lib/libfetch/fetch.3#3 integrate
.. //depot/projects/dtrace7/src/lib/libfetch/ftp.c#3 integrate
.. //depot/projects/dtrace7/src/lib/libfetch/http.c#3 integrate
.. //depot/projects/dtrace7/src/lib/libkse/kse.map#2 integrate
.. //depot/projects/dtrace7/src/lib/libkse/sys/lock.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libkse/sys/lock.h#2 integrate
.. //depot/projects/dtrace7/src/lib/libkse/thread/thr_cond.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libkse/thread/thr_init.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libkse/thread/thr_kern.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libkse/thread/thr_mutex.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libkse/thread/thr_rtld.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libkvm/kvm.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libmilter/Makefile#2 integrate
.. //depot/projects/dtrace7/src/lib/libsdp/sdp.h#2 integrate
.. //depot/projects/dtrace7/src/lib/libthr/arch/amd64/Makefile.inc#2 integrate
.. //depot/projects/dtrace7/src/lib/libthr/arch/arm/Makefile.inc#2 integrate
.. //depot/projects/dtrace7/src/lib/libthr/arch/arm/include/pthread_md.h#2 integrate
.. //depot/projects/dtrace7/src/lib/libthr/arch/i386/Makefile.inc#2 integrate
.. //depot/projects/dtrace7/src/lib/libthr/arch/ia64/Makefile.inc#2 integrate
.. //depot/projects/dtrace7/src/lib/libthr/arch/powerpc/Makefile.inc#2 integrate
.. //depot/projects/dtrace7/src/lib/libthr/arch/sparc64/Makefile.inc#2 integrate
.. //depot/projects/dtrace7/src/lib/libthr/arch/sparc64/include/pthread_md.h#2 integrate
.. //depot/projects/dtrace7/src/lib/libthr/pthread.map#2 integrate
.. //depot/projects/dtrace7/src/lib/libthr/thread/thr_mutex.c#3 integrate
.. //depot/projects/dtrace7/src/lib/libthr/thread/thr_once.c#2 integrate
.. //depot/projects/dtrace7/src/lib/ncurses/ncurses/Makefile#2 integrate
.. //depot/projects/dtrace7/src/release/doc/en_US.ISO8859-1/errata/article.sgml#2 integrate
.. //depot/projects/dtrace7/src/release/doc/en_US.ISO8859-1/hardware/article.sgml#3 integrate
.. //depot/projects/dtrace7/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#5 integrate
.. //depot/projects/dtrace7/src/release/doc/en_US.ISO8859-1/share/sgml/release.dsl#2 integrate
.. //depot/projects/dtrace7/src/release/doc/share/misc/dev.archlist.txt#3 integrate
.. //depot/projects/dtrace7/src/release/doc/share/sgml/release.ent#4 integrate
.. //depot/projects/dtrace7/src/release/doc/zh_CN.GB2312/errata/article.sgml#2 integrate
.. //depot/projects/dtrace7/src/release/fixit.profile#4 integrate
.. //depot/projects/dtrace7/src/sbin/bsdlabel/bsdlabel.8#2 integrate
.. //depot/projects/dtrace7/src/sbin/dhclient/dhclient-script#2 integrate
.. //depot/projects/dtrace7/src/sbin/ffsinfo/ffsinfo.c#2 integrate
.. //depot/projects/dtrace7/src/sbin/geom/class/multipath/gmultipath.8#2 integrate
.. //depot/projects/dtrace7/src/sbin/geom/core/geom.8#2 integrate
.. //depot/projects/dtrace7/src/sbin/geom/core/geom.c#2 integrate
.. //depot/projects/dtrace7/src/sbin/gpt/gpt.8#3 integrate
.. //depot/projects/dtrace7/src/sbin/gpt/gpt.c#3 integrate
.. //depot/projects/dtrace7/src/sbin/gpt/migrate.c#2 integrate
.. //depot/projects/dtrace7/src/sbin/gpt/show.c#3 integrate
.. //depot/projects/dtrace7/src/sbin/ifconfig/ifieee80211.c#2 integrate
.. //depot/projects/dtrace7/src/sbin/init/init.c#2 integrate
.. //depot/projects/dtrace7/src/sbin/ipfw/ipfw.8#3 integrate
.. //depot/projects/dtrace7/src/sbin/ipfw/ipfw2.c#3 integrate
.. //depot/projects/dtrace7/src/sbin/iscontrol/misc.c#2 integrate
.. //depot/projects/dtrace7/src/sbin/md5/md5.c#2 integrate
.. //depot/projects/dtrace7/src/sbin/natd/natd.8#2 integrate
.. //depot/projects/dtrace7/src/sbin/newfs/newfs.8#2 integrate
.. //depot/projects/dtrace7/src/sbin/route/route.8#2 integrate
.. //depot/projects/dtrace7/src/sbin/route/route.c#3 integrate
.. //depot/projects/dtrace7/src/sbin/setkey/parse.y#2 integrate
.. //depot/projects/dtrace7/src/secure/usr.bin/ssh/Makefile#2 integrate
.. //depot/projects/dtrace7/src/secure/usr.sbin/sshd/Makefile#2 integrate
.. //depot/projects/dtrace7/src/share/colldef/el_GR.ISO8859-7.src#2 integrate
.. //depot/projects/dtrace7/src/share/examples/cvsup/cvs-supfile#2 integrate
.. //depot/projects/dtrace7/src/share/man/man3/Makefile#2 integrate
.. //depot/projects/dtrace7/src/share/man/man3/queue.3#2 integrate
.. //depot/projects/dtrace7/src/share/man/man3/tree.3#2 integrate
.. //depot/projects/dtrace7/src/share/man/man4/Makefile#5 integrate
.. //depot/projects/dtrace7/src/share/man/man4/axe.4#2 integrate
.. //depot/projects/dtrace7/src/share/man/man4/ciss.4#2 integrate
.. //depot/projects/dtrace7/src/share/man/man4/ddb.4#2 integrate
.. //depot/projects/dtrace7/src/share/man/man4/fwohci.4#2 integrate
.. //depot/projects/dtrace7/src/share/man/man4/hptiop.4#2 integrate
.. //depot/projects/dtrace7/src/share/man/man4/hptrr.4#2 integrate
.. //depot/projects/dtrace7/src/share/man/man4/man4.i386/ar.4#2 integrate
.. //depot/projects/dtrace7/src/share/man/man4/man4.i386/linux.4#2 integrate
.. //depot/projects/dtrace7/src/share/man/man4/man4.i386/pnp.4#2 integrate
.. //depot/projects/dtrace7/src/share/man/man4/man4.i386/scd.4#2 integrate
.. //depot/projects/dtrace7/src/share/man/man4/man4.i386/streams.4#2 integrate
.. //depot/projects/dtrace7/src/share/man/man4/man4.i386/svr4.4#2 integrate
.. //depot/projects/dtrace7/src/share/man/man4/msk.4#3 integrate
.. //depot/projects/dtrace7/src/share/man/man4/mxge.4#3 integrate
.. //depot/projects/dtrace7/src/share/man/man4/ng_nat.4#2 integrate
.. //depot/projects/dtrace7/src/share/man/man4/ng_pppoe.4#2 integrate
.. //depot/projects/dtrace7/src/share/man/man4/nve.4#2 integrate
.. //depot/projects/dtrace7/src/share/man/man4/puc.4#2 integrate
.. //depot/projects/dtrace7/src/share/man/man4/rr232x.4#2 delete
.. //depot/projects/dtrace7/src/share/man/man4/ucycom.4#2 integrate
.. //depot/projects/dtrace7/src/share/man/man5/hosts.equiv.5#2 integrate
.. //depot/projects/dtrace7/src/share/man/man5/rc.conf.5#3 integrate
.. //depot/projects/dtrace7/src/share/man/man9/Makefile#3 integrate
.. //depot/projects/dtrace7/src/share/man/man9/ieee80211_radiotap.9#2 integrate
.. //depot/projects/dtrace7/src/share/man/man9/style.9#2 integrate
.. //depot/projects/dtrace7/src/share/mk/bsd.cpu.mk#3 integrate
.. //depot/projects/dtrace7/src/share/termcap/termcap.src#2 integrate
.. //depot/projects/dtrace7/src/share/zoneinfo/asia#3 integrate
.. //depot/projects/dtrace7/src/share/zoneinfo/backward#3 integrate
.. //depot/projects/dtrace7/src/share/zoneinfo/leapseconds#2 integrate
.. //depot/projects/dtrace7/src/share/zoneinfo/northamerica#3 integrate
.. //depot/projects/dtrace7/src/share/zoneinfo/southamerica#3 integrate
.. //depot/projects/dtrace7/src/share/zoneinfo/zone.tab#3 integrate
.. //depot/projects/dtrace7/src/sys/amd64/acpica/madt.c#2 integrate
.. //depot/projects/dtrace7/src/sys/amd64/amd64/amd64_mem.c#2 integrate
.. //depot/projects/dtrace7/src/sys/amd64/amd64/busdma_machdep.c#2 integrate
.. //depot/projects/dtrace7/src/sys/amd64/amd64/intr_machdep.c#3 integrate
.. //depot/projects/dtrace7/src/sys/amd64/amd64/machdep.c#4 integrate
.. //depot/projects/dtrace7/src/sys/amd64/amd64/mem.c#2 integrate
.. //depot/projects/dtrace7/src/sys/amd64/amd64/nexus.c#2 integrate
.. //depot/projects/dtrace7/src/sys/amd64/conf/GENERIC#6 integrate
.. //depot/projects/dtrace7/src/sys/amd64/conf/NOTES#4 integrate
.. //depot/projects/dtrace7/src/sys/amd64/ia32/ia32_signal.c#2 integrate
.. //depot/projects/dtrace7/src/sys/amd64/include/pc/bios.h#2 integrate
.. //depot/projects/dtrace7/src/sys/amd64/include/proc.h#2 integrate
.. //depot/projects/dtrace7/src/sys/amd64/include/specialreg.h#2 integrate
.. //depot/projects/dtrace7/src/sys/amd64/isa/clock.c#2 integrate
.. //depot/projects/dtrace7/src/sys/amd64/linux32/linux32_machdep.c#2 integrate
.. //depot/projects/dtrace7/src/sys/amd64/linux32/linux32_sysvec.c#2 integrate
.. //depot/projects/dtrace7/src/sys/arm/arm/busdma_machdep.c#2 integrate
.. //depot/projects/dtrace7/src/sys/arm/arm/uio_machdep.c#2 integrate
.. //depot/projects/dtrace7/src/sys/arm/include/_bus.h#2 integrate
.. //depot/projects/dtrace7/src/sys/arm/xscale/ixp425/if_npe.c#2 integrate
.. //depot/projects/dtrace7/src/sys/arm/xscale/ixp425/ixp425.c#2 integrate
.. //depot/projects/dtrace7/src/sys/boot/i386/boot2/boot2.c#2 integrate
.. //depot/projects/dtrace7/src/sys/boot/i386/btx/btx/Makefile#2 integrate
.. //depot/projects/dtrace7/src/sys/boot/i386/btx/btx/btx.S#2 integrate
.. //depot/projects/dtrace7/src/sys/boot/i386/gptboot/gptboot.c#2 integrate
.. //depot/projects/dtrace7/src/sys/boot/i386/libi386/biosdisk.c#3 integrate
.. //depot/projects/dtrace7/src/sys/boot/i386/libi386/biosmem.c#2 integrate
.. //depot/projects/dtrace7/src/sys/boot/i386/libi386/biossmap.c#2 integrate
.. //depot/projects/dtrace7/src/sys/cam/cam_xpt.c#2 integrate
.. //depot/projects/dtrace7/src/sys/cam/scsi/scsi_da.c#2 integrate
.. //depot/projects/dtrace7/src/sys/compat/linux/linux_futex.c#2 integrate
.. //depot/projects/dtrace7/src/sys/compat/linux/linux_futex.h#2 integrate
.. //depot/projects/dtrace7/src/sys/compat/linux/linux_misc.c#2 integrate
.. //depot/projects/dtrace7/src/sys/compat/linux/linux_misc.h#2 integrate
.. //depot/projects/dtrace7/src/sys/conf/NOTES#3 integrate
.. //depot/projects/dtrace7/src/sys/conf/files#6 integrate
.. //depot/projects/dtrace7/src/sys/conf/files.amd64#4 integrate
.. //depot/projects/dtrace7/src/sys/conf/files.i386#4 integrate
.. //depot/projects/dtrace7/src/sys/conf/files.sparc64#2 integrate
.. //depot/projects/dtrace7/src/sys/conf/kmod.mk#2 integrate
.. //depot/projects/dtrace7/src/sys/conf/newvers.sh#5 integrate
.. //depot/projects/dtrace7/src/sys/conf/options#3 integrate
.. //depot/projects/dtrace7/src/sys/ddb/db_capture.c#1 branch
.. //depot/projects/dtrace7/src/sys/ddb/db_command.c#2 integrate
.. //depot/projects/dtrace7/src/sys/ddb/db_input.c#2 integrate
.. //depot/projects/dtrace7/src/sys/ddb/db_main.c#2 integrate
.. //depot/projects/dtrace7/src/sys/ddb/db_output.c#2 integrate
.. //depot/projects/dtrace7/src/sys/ddb/ddb.h#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/aac/aac.c#4 integrate
.. //depot/projects/dtrace7/src/sys/dev/acpica/acpi.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/acpica/acpi_cpu.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/acpica/acpi_thermal.c#3 integrate
.. //depot/projects/dtrace7/src/sys/dev/aic7xxx/aic79xx_osm.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/ath/if_ath.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/bce/if_bce.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/bfe/if_bfe.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/bfe/if_bfereg.h#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/bge/if_bge.c#4 integrate
.. //depot/projects/dtrace7/src/sys/dev/bge/if_bgereg.h#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/ciss/ciss.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/coretemp/coretemp.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/cxgb/cxgb_main.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/cxgb/sys/mvec.h#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/cxgb/sys/uipc_mvec.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/dc/dcphy.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/dc/if_dc.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/drm/drm_pciids.h#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/drm/i915_dma.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/gem/if_gem.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/gem/if_gem_pci.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/gem/if_gemreg.h#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/gem/if_gemvar.h#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/hptiop/hptiop.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/hptiop/hptiop.h#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/hptrr/amd64-elf.hptrr_lib.o.uu#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/hptrr/array.h#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/hptrr/him.h#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/hptrr/himfuncs.h#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/hptrr/hptintf.h#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/hptrr/hptrr_config.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/hptrr/hptrr_config.h#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/hptrr/hptrr_os_bsd.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/hptrr/hptrr_osm_bsd.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/hptrr/i386-elf.hptrr_lib.o.uu#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/hptrr/ldm.h#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/hptrr/list.h#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/hptrr/os_bsd.h#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/hptrr/osm.h#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/ichwd/ichwd.c#3 integrate
.. //depot/projects/dtrace7/src/sys/dev/ichwd/ichwd.h#3 integrate
.. //depot/projects/dtrace7/src/sys/dev/if_ndis/if_ndis.c#3 integrate
.. //depot/projects/dtrace7/src/sys/dev/lge/if_lge.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/md/md.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/mfi/mfi.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/mfi/mfireg.h#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/mii/amphy.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/mii/brgphy.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/mii/e1000phy.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/mii/miidevs#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/mii/nsphy.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/mii/nsphyter.c#1 branch
.. //depot/projects/dtrace7/src/sys/dev/mii/nsphyterreg.h#1 branch
.. //depot/projects/dtrace7/src/sys/dev/mii/rlphy.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/mii/tdkphy.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/mii/ukphy_subr.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/msk/if_msk.c#3 integrate
.. //depot/projects/dtrace7/src/sys/dev/msk/if_mskreg.h#3 integrate
.. //depot/projects/dtrace7/src/sys/dev/mxge/if_mxge.c#3 integrate
.. //depot/projects/dtrace7/src/sys/dev/mxge/if_mxge_var.h#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/mxge/mxge_lro.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/mxge/mxge_mcp.h#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/mxge/mxge_rss_eth_z8e.c#1 branch
.. //depot/projects/dtrace7/src/sys/dev/mxge/mxge_rss_ethp_z8e.c#1 branch
.. //depot/projects/dtrace7/src/sys/dev/mxge/rss_eth_z8e.h#1 branch
.. //depot/projects/dtrace7/src/sys/dev/mxge/rss_ethp_z8e.h#1 branch
.. //depot/projects/dtrace7/src/sys/dev/nfe/if_nfe.c#4 integrate
.. //depot/projects/dtrace7/src/sys/dev/nge/if_nge.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/nve/if_nve.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/pci/pci.c#3 integrate
.. //depot/projects/dtrace7/src/sys/dev/puc/pucdata.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/ral/rt2560.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/ral/rt2560reg.h#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/ral/rt2560var.h#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/re/if_re.c#5 integrate
.. //depot/projects/dtrace7/src/sys/dev/rr232x/LICENSE#2 delete
.. //depot/projects/dtrace7/src/sys/dev/rr232x/README#2 delete
.. //depot/projects/dtrace7/src/sys/dev/rr232x/amd64-elf.rr232x_lib.o.uu#2 delete
.. //depot/projects/dtrace7/src/sys/dev/rr232x/array.h#2 delete
.. //depot/projects/dtrace7/src/sys/dev/rr232x/him.h#2 delete
.. //depot/projects/dtrace7/src/sys/dev/rr232x/himfuncs.h#2 delete
.. //depot/projects/dtrace7/src/sys/dev/rr232x/hptintf.h#2 delete
.. //depot/projects/dtrace7/src/sys/dev/rr232x/i386-elf.rr232x_lib.o.uu#2 delete
.. //depot/projects/dtrace7/src/sys/dev/rr232x/ldm.h#2 delete
.. //depot/projects/dtrace7/src/sys/dev/rr232x/list.h#2 delete
.. //depot/projects/dtrace7/src/sys/dev/rr232x/os_bsd.c#2 delete
.. //depot/projects/dtrace7/src/sys/dev/rr232x/os_bsd.h#2 delete
.. //depot/projects/dtrace7/src/sys/dev/rr232x/osm.h#2 delete
.. //depot/projects/dtrace7/src/sys/dev/rr232x/osm_bsd.c#2 delete
.. //depot/projects/dtrace7/src/sys/dev/rr232x/rr232x_config.c#2 delete
.. //depot/projects/dtrace7/src/sys/dev/rr232x/rr232x_config.h#2 delete
.. //depot/projects/dtrace7/src/sys/dev/sk/if_sk.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/stge/if_stge.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/syscons/syscons.h#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/tdfx/tdfx_pci.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/ti/if_ti.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/twe/twe.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/txp/if_txp.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/usb/ehci_pci.c#3 integrate
.. //depot/projects/dtrace7/src/sys/dev/usb/if_rum.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/usb/ucom.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/usb/umass.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/usb/ums.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/usb/usbdevs#4 integrate
.. //depot/projects/dtrace7/src/sys/dev/usb/uscanner.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/vge/if_vge.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/vx/if_vx_pci.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/wpi/if_wpi.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/wpi/if_wpireg.h#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/wpi/if_wpivar.h#2 integrate
.. //depot/projects/dtrace7/src/sys/fs/coda/TODO#2 integrate
.. //depot/projects/dtrace7/src/sys/fs/coda/cnode.h#3 integrate
.. //depot/projects/dtrace7/src/sys/fs/coda/coda_fbsd.c#2 integrate
.. //depot/projects/dtrace7/src/sys/fs/coda/coda_io.h#2 integrate
.. //depot/projects/dtrace7/src/sys/fs/coda/coda_kernel.h#2 delete
.. //depot/projects/dtrace7/src/sys/fs/coda/coda_namecache.c#2 delete
.. //depot/projects/dtrace7/src/sys/fs/coda/coda_namecache.h#3 delete
.. //depot/projects/dtrace7/src/sys/fs/coda/coda_opstats.h#2 integrate
.. //depot/projects/dtrace7/src/sys/fs/coda/coda_pioctl.h#2 integrate
.. //depot/projects/dtrace7/src/sys/fs/coda/coda_psdev.c#3 integrate
.. //depot/projects/dtrace7/src/sys/fs/coda/coda_psdev.h#2 integrate
.. //depot/projects/dtrace7/src/sys/fs/coda/coda_subr.c#2 integrate
.. //depot/projects/dtrace7/src/sys/fs/coda/coda_subr.h#2 integrate
.. //depot/projects/dtrace7/src/sys/fs/coda/coda_venus.c#2 integrate
.. //depot/projects/dtrace7/src/sys/fs/coda/coda_venus.h#2 integrate
.. //depot/projects/dtrace7/src/sys/fs/coda/coda_vfsops.c#3 integrate
.. //depot/projects/dtrace7/src/sys/fs/coda/coda_vfsops.h#2 integrate
.. //depot/projects/dtrace7/src/sys/fs/coda/coda_vnops.c#3 integrate
.. //depot/projects/dtrace7/src/sys/fs/coda/coda_vnops.h#2 integrate
.. //depot/projects/dtrace7/src/sys/fs/devfs/devfs_rule.c#2 integrate
.. //depot/projects/dtrace7/src/sys/fs/msdosfs/msdosfs_vfsops.c#2 integrate
.. //depot/projects/dtrace7/src/sys/fs/ntfs/ntfs_subr.c#2 integrate
.. //depot/projects/dtrace7/src/sys/fs/udf/udf_vfsops.c#3 integrate
.. //depot/projects/dtrace7/src/sys/geom/geom_bsd_enc.c#2 integrate
.. //depot/projects/dtrace7/src/sys/geom/part/g_part.c#3 integrate
.. //depot/projects/dtrace7/src/sys/geom/part/g_part.h#3 integrate
.. //depot/projects/dtrace7/src/sys/geom/part/g_part_bsd.c#1 branch
.. //depot/projects/dtrace7/src/sys/geom/part/g_part_mbr.c#2 integrate
.. //depot/projects/dtrace7/src/sys/geom/part/g_part_vtoc8.c#1 branch
.. //depot/projects/dtrace7/src/sys/geom/vinum/geom_vinum_drive.c#2 integrate
.. //depot/projects/dtrace7/src/sys/i386/acpica/madt.c#2 integrate
.. //depot/projects/dtrace7/src/sys/i386/conf/GENERIC#3 integrate
.. //depot/projects/dtrace7/src/sys/i386/conf/NOTES#4 integrate
.. //depot/projects/dtrace7/src/sys/i386/cpufreq/est.c#2 integrate
.. //depot/projects/dtrace7/src/sys/i386/i386/busdma_machdep.c#2 integrate
.. //depot/projects/dtrace7/src/sys/i386/i386/i686_mem.c#2 integrate
.. //depot/projects/dtrace7/src/sys/i386/i386/identcpu.c#2 integrate
.. //depot/projects/dtrace7/src/sys/i386/i386/initcpu.c#2 integrate
.. //depot/projects/dtrace7/src/sys/i386/i386/intr_machdep.c#3 integrate
.. //depot/projects/dtrace7/src/sys/i386/i386/k6_mem.c#2 integrate
.. //depot/projects/dtrace7/src/sys/i386/i386/machdep.c#3 integrate
.. //depot/projects/dtrace7/src/sys/i386/include/pc/bios.h#2 integrate
.. //depot/projects/dtrace7/src/sys/i386/include/proc.h#2 integrate
.. //depot/projects/dtrace7/src/sys/i386/include/specialreg.h#2 integrate
.. //depot/projects/dtrace7/src/sys/i386/isa/clock.c#2 integrate
.. //depot/projects/dtrace7/src/sys/i386/linux/linux_machdep.c#3 integrate
.. //depot/projects/dtrace7/src/sys/i386/linux/linux_sysvec.c#2 integrate
.. //depot/projects/dtrace7/src/sys/i386/svr4/svr4_machdep.c#2 integrate
.. //depot/projects/dtrace7/src/sys/ia64/ia64/busdma_machdep.c#2 integrate
.. //depot/projects/dtrace7/src/sys/ia64/ia64/machdep.c#3 integrate
.. //depot/projects/dtrace7/src/sys/ia64/ia64/pmap.c#3 integrate
.. //depot/projects/dtrace7/src/sys/kern/kern_conf.c#3 integrate
.. //depot/projects/dtrace7/src/sys/kern/kern_descrip.c#2 integrate
.. //depot/projects/dtrace7/src/sys/kern/kern_fork.c#4 integrate
.. //depot/projects/dtrace7/src/sys/kern/kern_jail.c#2 integrate
.. //depot/projects/dtrace7/src/sys/kern/kern_mib.c#3 integrate
.. //depot/projects/dtrace7/src/sys/kern/kern_mutex.c#3 integrate
.. //depot/projects/dtrace7/src/sys/kern/kern_rwlock.c#3 integrate
.. //depot/projects/dtrace7/src/sys/kern/kern_sig.c#3 integrate
.. //depot/projects/dtrace7/src/sys/kern/link_elf.c#3 integrate
.. //depot/projects/dtrace7/src/sys/kern/link_elf_obj.c#3 integrate
.. //depot/projects/dtrace7/src/sys/kern/subr_autoconf.c#2 integrate
.. //depot/projects/dtrace7/src/sys/kern/subr_bus.c#2 integrate
.. //depot/projects/dtrace7/src/sys/kern/subr_sleepqueue.c#3 integrate
.. //depot/projects/dtrace7/src/sys/kern/tty_pts.c#2 integrate
.. //depot/projects/dtrace7/src/sys/kern/uipc_debug.c#2 integrate
.. //depot/projects/dtrace7/src/sys/kern/uipc_mbuf.c#2 integrate
.. //depot/projects/dtrace7/src/sys/kern/uipc_sockbuf.c#2 integrate
.. //depot/projects/dtrace7/src/sys/kern/uipc_socket.c#2 integrate
.. //depot/projects/dtrace7/src/sys/kern/uipc_syscalls.c#2 integrate
.. //depot/projects/dtrace7/src/sys/kern/uipc_usrreq.c#3 integrate
.. //depot/projects/dtrace7/src/sys/modules/Makefile#6 integrate
.. //depot/projects/dtrace7/src/sys/modules/coda/Makefile#2 integrate
.. //depot/projects/dtrace7/src/sys/modules/coda5/Makefile#2 integrate
.. //depot/projects/dtrace7/src/sys/modules/ipfw_nat/Makefile#1 branch
.. //depot/projects/dtrace7/src/sys/modules/mii/Makefile#2 integrate
.. //depot/projects/dtrace7/src/sys/modules/mxge/Makefile#2 integrate
.. //depot/projects/dtrace7/src/sys/modules/mxge/mxge_rss_eth_z8e/Makefile#1 branch
.. //depot/projects/dtrace7/src/sys/modules/mxge/mxge_rss_ethp_z8e/Makefile#1 branch
.. //depot/projects/dtrace7/src/sys/modules/rr232x/Makefile#2 delete
.. //depot/projects/dtrace7/src/sys/net/netisr.h#2 integrate
.. //depot/projects/dtrace7/src/sys/net/route.c#3 integrate
.. //depot/projects/dtrace7/src/sys/net80211/ieee80211_ht.c#3 integrate
.. //depot/projects/dtrace7/src/sys/net80211/ieee80211_ht.h#2 integrate
.. //depot/projects/dtrace7/src/sys/net80211/ieee80211_input.c#2 integrate
.. //depot/projects/dtrace7/src/sys/netgraph/netflow/ng_netflow.c#2 integrate
.. //depot/projects/dtrace7/src/sys/netgraph/netgraph.h#3 integrate
.. //depot/projects/dtrace7/src/sys/netgraph/ng_base.c#3 integrate
.. //depot/projects/dtrace7/src/sys/netgraph/ng_bpf.c#2 integrate
.. //depot/projects/dtrace7/src/sys/netgraph/ng_car.c#2 integrate
.. //depot/projects/dtrace7/src/sys/netgraph/ng_car.h#2 integrate
.. //depot/projects/dtrace7/src/sys/netgraph/ng_iface.c#2 integrate
.. //depot/projects/dtrace7/src/sys/netgraph/ng_ksocket.c#2 integrate
.. //depot/projects/dtrace7/src/sys/netgraph/ng_l2tp.c#3 integrate
.. //depot/projects/dtrace7/src/sys/netgraph/ng_nat.c#2 integrate
.. //depot/projects/dtrace7/src/sys/netgraph/ng_nat.h#2 integrate
.. //depot/projects/dtrace7/src/sys/netgraph/ng_ppp.c#4 integrate
.. //depot/projects/dtrace7/src/sys/netgraph/ng_pppoe.c#3 integrate
.. //depot/projects/dtrace7/src/sys/netgraph/ng_socket.c#2 integrate
.. //depot/projects/dtrace7/src/sys/netgraph/ng_tee.c#2 integrate
.. //depot/projects/dtrace7/src/sys/netinet/in.c#2 integrate
.. //depot/projects/dtrace7/src/sys/netinet/in_pcb.c#3 integrate
.. //depot/projects/dtrace7/src/sys/netinet/ip_fw.h#3 integrate
.. //depot/projects/dtrace7/src/sys/netinet/ip_fw2.c#3 integrate
.. //depot/projects/dtrace7/src/sys/netinet/ip_fw_nat.c#1 branch
.. //depot/projects/dtrace7/src/sys/netinet/ip_ipsec.c#2 integrate
.. //depot/projects/dtrace7/src/sys/netinet/ip_options.c#2 integrate
.. //depot/projects/dtrace7/src/sys/netinet/ip_output.c#2 integrate
.. //depot/projects/dtrace7/src/sys/netinet/libalias/alias_irc.c#2 integrate
.. //depot/projects/dtrace7/src/sys/netinet/sctp_auth.c#2 integrate
.. //depot/projects/dtrace7/src/sys/netinet/sctp_bsd_addr.c#3 integrate
.. //depot/projects/dtrace7/src/sys/netinet/sctp_indata.c#3 integrate
.. //depot/projects/dtrace7/src/sys/netinet/sctp_input.c#2 integrate
.. //depot/projects/dtrace7/src/sys/netinet/sctp_output.c#3 integrate
.. //depot/projects/dtrace7/src/sys/netinet/sctp_pcb.c#2 integrate
.. //depot/projects/dtrace7/src/sys/netinet/sctp_peeloff.c#2 integrate
.. //depot/projects/dtrace7/src/sys/netinet/sctp_usrreq.c#3 integrate
.. //depot/projects/dtrace7/src/sys/netinet/sctputil.c#4 integrate
.. //depot/projects/dtrace7/src/sys/netinet/tcp_input.c#2 integrate
.. //depot/projects/dtrace7/src/sys/netinet/tcp_output.c#4 integrate
.. //depot/projects/dtrace7/src/sys/netinet/tcp_usrreq.c#3 integrate
.. //depot/projects/dtrace7/src/sys/netinet/tcp_var.h#3 integrate
.. //depot/projects/dtrace7/src/sys/netinet6/in6.c#2 integrate
.. //depot/projects/dtrace7/src/sys/netinet6/in6_src.c#2 integrate
.. //depot/projects/dtrace7/src/sys/netinet6/ip6_ipsec.c#2 integrate
.. //depot/projects/dtrace7/src/sys/netinet6/ip6_ipsec.h#2 integrate
.. //depot/projects/dtrace7/src/sys/netinet6/ip6_output.c#3 integrate
.. //depot/projects/dtrace7/src/sys/netinet6/ip6_var.h#2 integrate
.. //depot/projects/dtrace7/src/sys/netinet6/raw_ip6.c#2 integrate
.. //depot/projects/dtrace7/src/sys/netinet6/udp6_usrreq.c#2 integrate
.. //depot/projects/dtrace7/src/sys/netipsec/ipsec.c#2 integrate
.. //depot/projects/dtrace7/src/sys/netipsec/ipsec.h#2 integrate
.. //depot/projects/dtrace7/src/sys/netipsec/ipsec6.h#2 integrate
.. //depot/projects/dtrace7/src/sys/netipsec/ipsec_output.c#2 integrate
.. //depot/projects/dtrace7/src/sys/netipsec/key.c#2 integrate
.. //depot/projects/dtrace7/src/sys/netipsec/key_debug.c#2 integrate
.. //depot/projects/dtrace7/src/sys/netsmb/smb_conn.h#2 integrate
.. //depot/projects/dtrace7/src/sys/netsmb/smb_iod.c#2 integrate
.. //depot/projects/dtrace7/src/sys/nfsclient/nfs_socket.c#3 integrate
.. //depot/projects/dtrace7/src/sys/nfsclient/nfs_subs.c#2 integrate
.. //depot/projects/dtrace7/src/sys/nfsclient/nfsm_subs.h#2 integrate
.. //depot/projects/dtrace7/src/sys/nfsserver/nfs_serv.c#2 integrate
.. //depot/projects/dtrace7/src/sys/nfsserver/nfs_srvsubs.c#3 integrate
.. //depot/projects/dtrace7/src/sys/pc98/pc98/machdep.c#3 integrate
.. //depot/projects/dtrace7/src/sys/pci/agp_i810.c#3 integrate
.. //depot/projects/dtrace7/src/sys/pci/agp_nvidia.c#2 integrate
.. //depot/projects/dtrace7/src/sys/pci/if_rl.c#3 integrate
.. //depot/projects/dtrace7/src/sys/pci/if_sf.c#2 integrate
.. //depot/projects/dtrace7/src/sys/pci/if_ste.c#2 integrate
.. //depot/projects/dtrace7/src/sys/pci/if_vr.c#2 integrate
.. //depot/projects/dtrace7/src/sys/pci/if_xl.c#2 integrate
.. //depot/projects/dtrace7/src/sys/powerpc/conf/GENERIC#2 integrate
.. //depot/projects/dtrace7/src/sys/security/audit/audit_bsm.c#2 integrate
.. //depot/projects/dtrace7/src/sys/security/audit/audit_syscalls.c#2 integrate
.. //depot/projects/dtrace7/src/sys/security/audit/audit_worker.c#2 integrate
.. //depot/projects/dtrace7/src/sys/security/mac_mls/mac_mls.c#2 integrate
.. //depot/projects/dtrace7/src/sys/sparc64/include/md_var.h#2 integrate
.. //depot/projects/dtrace7/src/sys/sparc64/sparc64/ata_machdep.c#1 branch
.. //depot/projects/dtrace7/src/sys/sparc64/sparc64/iommu.c#2 integrate
.. //depot/projects/dtrace7/src/sys/sys/aac_ioctl.h#2 integrate
.. //depot/projects/dtrace7/src/sys/sys/bus.h#2 integrate
.. //depot/projects/dtrace7/src/sys/sys/conf.h#3 integrate
.. //depot/projects/dtrace7/src/sys/sys/disklabel.h#2 integrate
.. //depot/projects/dtrace7/src/sys/sys/kernel.h#5 integrate
.. //depot/projects/dtrace7/src/sys/sys/mbuf.h#2 integrate
.. //depot/projects/dtrace7/src/sys/sys/param.h#5 integrate
.. //depot/projects/dtrace7/src/sys/sys/priv.h#2 integrate
.. //depot/projects/dtrace7/src/sys/sys/socketvar.h#2 integrate
.. //depot/projects/dtrace7/src/sys/sys/tree.h#2 integrate
.. //depot/projects/dtrace7/src/sys/sys/vtoc.h#1 branch
.. //depot/projects/dtrace7/src/sys/ufs/ffs/ffs_alloc.c#3 integrate
.. //depot/projects/dtrace7/src/sys/ufs/ffs/ffs_balloc.c#3 integrate
.. //depot/projects/dtrace7/src/sys/ufs/ffs/ffs_inode.c#2 integrate
.. //depot/projects/dtrace7/src/sys/ufs/ffs/ffs_snapshot.c#2 integrate
.. //depot/projects/dtrace7/src/sys/ufs/ffs/ffs_softdep.c#2 integrate
.. //depot/projects/dtrace7/src/sys/ufs/ffs/ffs_vfsops.c#2 integrate
.. //depot/projects/dtrace7/src/sys/ufs/ffs/ffs_vnops.c#2 integrate
.. //depot/projects/dtrace7/src/sys/ufs/ufs/ufs_bmap.c#2 integrate
.. //depot/projects/dtrace7/src/sys/ufs/ufs/ufs_extattr.c#2 integrate
.. //depot/projects/dtrace7/src/sys/ufs/ufs/ufs_lookup.c#2 integrate
.. //depot/projects/dtrace7/src/sys/ufs/ufs/ufs_vnops.c#2 integrate
.. //depot/projects/dtrace7/src/sys/vm/vm_mmap.c#2 integrate
.. //depot/projects/dtrace7/src/tools/tools/editing/freebsd.vim#1 branch
.. //depot/projects/dtrace7/src/tools/tools/tinybsd/tinybsd#2 integrate
.. //depot/projects/dtrace7/src/usr.bin/Makefile#2 integrate
.. //depot/projects/dtrace7/src/usr.bin/awk/Makefile#3 integrate
.. //depot/projects/dtrace7/src/usr.bin/gzip/gzip.c#2 integrate
.. //depot/projects/dtrace7/src/usr.bin/logger/logger.c#2 integrate
.. //depot/projects/dtrace7/src/usr.bin/make/Makefile#2 integrate
.. //depot/projects/dtrace7/src/usr.bin/make/job.c#2 integrate
.. //depot/projects/dtrace7/src/usr.bin/netstat/atalk.c#2 integrate
.. //depot/projects/dtrace7/src/usr.bin/netstat/bpf.c#2 integrate
.. //depot/projects/dtrace7/src/usr.bin/netstat/if.c#2 integrate
.. //depot/projects/dtrace7/src/usr.bin/netstat/inet.c#3 integrate
.. //depot/projects/dtrace7/src/usr.bin/netstat/inet6.c#2 integrate
.. //depot/projects/dtrace7/src/usr.bin/netstat/ipsec.c#2 integrate
.. //depot/projects/dtrace7/src/usr.bin/netstat/ipx.c#2 integrate
.. //depot/projects/dtrace7/src/usr.bin/netstat/main.c#2 integrate
.. //depot/projects/dtrace7/src/usr.bin/netstat/mbuf.c#2 integrate
.. //depot/projects/dtrace7/src/usr.bin/netstat/mcast.c#2 integrate
.. //depot/projects/dtrace7/src/usr.bin/netstat/mroute.c#2 integrate
.. //depot/projects/dtrace7/src/usr.bin/netstat/mroute6.c#2 integrate
.. //depot/projects/dtrace7/src/usr.bin/netstat/netgraph.c#2 integrate
.. //depot/projects/dtrace7/src/usr.bin/netstat/netstat.h#2 integrate
.. //depot/projects/dtrace7/src/usr.bin/netstat/pfkey.c#2 integrate
.. //depot/projects/dtrace7/src/usr.bin/netstat/route.c#2 integrate
.. //depot/projects/dtrace7/src/usr.bin/netstat/sctp.c#2 integrate
.. //depot/projects/dtrace7/src/usr.bin/netstat/unix.c#2 integrate
.. //depot/projects/dtrace7/src/usr.bin/tar/COPYING#2 integrate
.. //depot/projects/dtrace7/src/usr.bin/tar/Makefile#2 integrate
.. //depot/projects/dtrace7/src/usr.bin/tar/bsdtar.1#2 integrate
.. //depot/projects/dtrace7/src/usr.bin/tar/bsdtar.c#2 integrate
.. //depot/projects/dtrace7/src/usr.bin/tar/bsdtar_platform.h#2 integrate
.. //depot/projects/dtrace7/src/usr.bin/tar/config_freebsd.h#2 integrate
.. //depot/projects/dtrace7/src/usr.bin/top/machine.c#2 integrate
.. //depot/projects/dtrace7/src/usr.bin/uniq/uniq.c#2 integrate
.. //depot/projects/dtrace7/src/usr.bin/uuidgen/Makefile#2 delete
.. //depot/projects/dtrace7/src/usr.bin/uuidgen/uuidgen.1#2 delete
.. //depot/projects/dtrace7/src/usr.bin/uuidgen/uuidgen.c#2 delete
.. //depot/projects/dtrace7/src/usr.sbin/adduser/adduser.8#2 integrate
.. //depot/projects/dtrace7/src/usr.sbin/adduser/adduser.sh#2 integrate
.. //depot/projects/dtrace7/src/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.8#2 integrate
.. //depot/projects/dtrace7/src/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.c#2 integrate
.. //depot/projects/dtrace7/src/usr.sbin/bluetooth/sdpd/Makefile#2 integrate
.. //depot/projects/dtrace7/src/usr.sbin/bluetooth/sdpd/gn.c#1 branch
.. //depot/projects/dtrace7/src/usr.sbin/bluetooth/sdpd/lan.c#2 integrate
.. //depot/projects/dtrace7/src/usr.sbin/bluetooth/sdpd/nap.c#1 branch
.. //depot/projects/dtrace7/src/usr.sbin/bluetooth/sdpd/panu.c#1 branch
.. //depot/projects/dtrace7/src/usr.sbin/bluetooth/sdpd/profile.c#2 integrate
.. //depot/projects/dtrace7/src/usr.sbin/bluetooth/sdpd/profile.h#2 integrate
.. //depot/projects/dtrace7/src/usr.sbin/bootparamd/bootparamd/bootparamd.c#2 integrate
.. //depot/projects/dtrace7/src/usr.sbin/bootparamd/bootparamd/main.c#2 integrate
.. //depot/projects/dtrace7/src/usr.sbin/bootparamd/callbootd/callbootd.c#2 integrate
.. //depot/projects/dtrace7/src/usr.sbin/mixer/mixer.8#2 integrate
.. //depot/projects/dtrace7/src/usr.sbin/mixer/mixer.c#2 integrate
.. //depot/projects/dtrace7/src/usr.sbin/mountd/mountd.8#2 integrate
.. //depot/projects/dtrace7/src/usr.sbin/mountd/mountd.c#2 integrate
.. //depot/projects/dtrace7/src/usr.sbin/moused/moused.c#2 integrate
.. //depot/projects/dtrace7/src/usr.sbin/newsyslog/newsyslog.c#2 integrate
.. //depot/projects/dtrace7/src/usr.sbin/pkg_install/add/main.c#2 integrate
.. //depot/projects/dtrace7/src/usr.sbin/pkg_install/add/pkg_add.1#2 integrate
.. //depot/projects/dtrace7/src/usr.sbin/portsnap/phttpget/phttpget.c#2 integrate
.. //depot/projects/dtrace7/src/usr.sbin/pw/pw.8#3 integrate
.. //depot/projects/dtrace7/src/usr.sbin/pw/pw.c#2 integrate
.. //depot/projects/dtrace7/src/usr.sbin/pw/pw_group.c#2 integrate
.. //depot/projects/dtrace7/src/usr.sbin/rpc.lockd/lockd.c#2 integrate
.. //depot/projects/dtrace7/src/usr.sbin/rpc.lockd/rpc.lockd.8#2 integrate
.. //depot/projects/dtrace7/src/usr.sbin/sade/sade.8#2 integrate
.. //depot/projects/dtrace7/src/usr.sbin/sysinstall/disks.c#2 integrate
.. //depot/projects/dtrace7/src/usr.sbin/sysinstall/media.c#2 integrate
.. //depot/projects/dtrace7/src/usr.sbin/sysinstall/system.c#2 integrate
.. //depot/projects/dtrace7/src/usr.sbin/syslogd/syslogd.c#2 integrate
.. //depot/projects/dtrace7/src/usr.sbin/timed/timed/timed.8#2 integrate
.. //depot/projects/dtrace7/src/usr.sbin/watch/watch.c#2 integrate
.. //depot/projects/dtrace7/src/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.8#2 integrate
Differences ...
==== //depot/projects/dtrace7/src/Makefile#3 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile,v 1.341.2.1 2007/11/22 01:33:08 delphij Exp $
+# $FreeBSD: src/Makefile,v 1.341.2.2 2008/02/12 20:17:53 jhb Exp $
#
# The user-driven targets are:
#
@@ -75,6 +75,8 @@
# developer convenience only. They are intentionally not documented and
# completely subject to change without notice.
#
+# For more information, see the build(7) manual page.
+#
TGTS= all all-man buildenv buildenvvars buildkernel buildworld \
check-old check-old-dirs check-old-files check-old-libs \
checkdpadd clean cleandepend cleandir \
==== //depot/projects/dtrace7/src/Makefile.inc1#5 (text+ko) ====
@@ -1,4 +1,5 @@
-# $FreeBSD: src/Makefile.inc1,v 1.596 2008/01/23 22:21:36 ru Exp $
+#
+# $FreeBSD: src/Makefile.inc1,v 1.588.2.4 2008/02/24 14:31:41 remko Exp $
#
# Make command line options:
# -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -327,8 +328,9 @@
.endif
.else
rm -rf ${WORLDTMP}/legacy/usr/include
-# XXX - These two can depend on any header file.
+# XXX - These three can depend on any header file.
rm -f ${OBJTREE}${.CURDIR}/usr.bin/kdump/ioctl.c
+ rm -f ${OBJTREE}${.CURDIR}/usr.bin/kdump/kdump_subr.c
rm -f ${OBJTREE}${.CURDIR}/usr.bin/truss/ioctl.c
.endif
.for _dir in \
==== //depot/projects/dtrace7/src/ObsoleteFiles.inc#6 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.112.2.8 2008/01/30 17:58:15 brueffer Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.112.2.11 2008/03/29 13:53:07 remko Exp $
#
# This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
# directories (OLD_DIRS) which should get removed at an update. Recently
@@ -1028,6 +1028,9 @@
OLD_FILES+=usr/sbin/ntptimeset
OLD_FILES+=usr/share/man/man8/kernbb.8.gz
OLD_FILES+=usr/share/man/man8/ntp-genkeys.8.gz
+# 20040627: usbdevs.h and usbdevs_data.h removal
+OLD_FILES+=usr/include/dev/usb/usbdevs.h
+OLD_FILES+=usr/include/dev/usb/usbdevs_data.h
# 200406XX
OLD_FILES+=usr/bin/gasp
OLD_FILES+=usr/bin/gdbreplay
@@ -3476,8 +3479,6 @@
OLD_FILES+=usr/bin/hesinfo
OLD_FILES+=usr/include/c++/3.4/ext/demangle.h
OLD_FILES+=usr/include/cam/cam_extend.h
-OLD_FILES+=usr/include/dev/usb/usbdevs.h
-OLD_FILES+=usr/include/dev/usb/usbdevs_data.h
OLD_FILES+=usr/include/dev/wi/wi_hostap.h
OLD_FILES+=usr/include/disktab.h
OLD_FILES+=usr/include/g++/FlexLexer.h
==== //depot/projects/dtrace7/src/UPDATING#3 (text+ko) ====
@@ -8,6 +8,12 @@
/usr/ports/UPDATING. Please read that file before running
portupgrade.
+20080226:
+ FreeBSD 7.0-RELEASE
+
+20080208:
+ Note the addition of m_collapse for compacting mbuf chains.
+
20071126:
The AT keyboard emulation of sunkbd(4) has been turned on
by default. In order to make the special symbols of the Sun
@@ -919,4 +925,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: src/UPDATING,v 1.507.2.3 2007/11/26 20:07:19 marius Exp $
+$FreeBSD: src/UPDATING,v 1.507.2.5 2008/02/24 05:16:55 kensmith Exp $
==== //depot/projects/dtrace7/src/bin/Makefile#2 (text+ko) ====
@@ -1,5 +1,5 @@
# From: @(#)Makefile 8.1 (Berkeley) 5/31/93
-# $FreeBSD: src/bin/Makefile,v 1.26 2006/03/17 18:54:20 ru Exp $
+# $FreeBSD: src/bin/Makefile,v 1.26.2.1 2008/03/16 07:04:03 obrien Exp $
.include <bsd.own.mk>
@@ -37,7 +37,8 @@
sleep \
stty \
sync \
- test
+ test \
+ uuidgen
.if ${MK_RCMDS} != "no"
_rcp= rcp
==== //depot/projects/dtrace7/src/bin/chflags/chflags.1#2 (text+ko) ====
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)chflags.1 8.4 (Berkeley) 5/2/95
-.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.29 2007/05/28 04:23:09 pjd Exp $
+.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.29.2.1 2008/03/16 18:54:53 rwatson Exp $
.\"
.Dd March 3, 2006
.Dt CHFLAGS 1
@@ -40,7 +40,7 @@
.Nd change file flags
.Sh SYNOPSIS
.Nm
-.Op Fl h
+.Op Fl fhv
.Oo
.Fl R
.Op Fl H | Fl L | Fl P
@@ -57,6 +57,12 @@
.Pp
The options are as follows:
.Bl -tag -width indent
+.It Fl f
+Do not display a diagnostic message if
+.Nm
+could not modify the flags for
+.Va file ,
+nor modify the exit status to reflect such failures.
.It Fl H
If the
.Fl R
@@ -79,6 +85,14 @@
.It Fl R
Change the file flags for the file hierarchies rooted
in the files instead of just the files themselves.
+.It Fl v
+Cause
+.Nm
+to be verbose, showing filenames as the flags are modified.
+If the
+.Fl v
+option is specified more than once, the old and new flags of the file
+will also be printed, in octal notation.
.El
.Pp
The flags are specified as an octal number or a comma separated list
==== //depot/projects/dtrace7/src/bin/chflags/chflags.c#2 (text+ko) ====
@@ -40,7 +40,7 @@
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/chflags/chflags.c,v 1.23 2005/05/14 23:23:10 dd Exp $");
+__FBSDID("$FreeBSD: src/bin/chflags/chflags.c,v 1.23.10.1 2008/03/16 18:54:53 rwatson Exp $");
#include <sys/types.h>
#include <sys/stat.h>
@@ -60,14 +60,15 @@
{
FTS *ftsp;
FTSENT *p;
- u_long clear, set;
+ u_long clear, newflags, set;
long val;
- int Hflag, Lflag, Rflag, hflag, ch, fts_options, oct, rval;
+ int Hflag, Lflag, Rflag, fflag, hflag, vflag;
+ int ch, fts_options, oct, rval;
char *flags, *ep;
int (*change_flags)(const char *, unsigned long);
- Hflag = Lflag = Rflag = hflag = 0;
- while ((ch = getopt(argc, argv, "HLPRh")) != -1)
+ Hflag = Lflag = Rflag = fflag = hflag = vflag = 0;
+ while ((ch = getopt(argc, argv, "HLPRfhv")) != -1)
switch (ch) {
case 'H':
Hflag = 1;
@@ -83,9 +84,15 @@
case 'R':
Rflag = 1;
break;
+ case 'f':
+ fflag = 1;
+ break;
case 'h':
hflag = 1;
break;
+ case 'v':
+ vflag++;
+ break;
case '?':
default:
usage();
@@ -166,18 +173,23 @@
default:
break;
}
- if (oct) {
- if (!(*change_flags)(p->fts_accpath, set))
- continue;
- } else {
- p->fts_statp->st_flags |= set;
- p->fts_statp->st_flags &= clear;
- if (!(*change_flags)(p->fts_accpath,
- (u_long)p->fts_statp->st_flags))
- continue;
+ if (oct)
+ newflags = set;
+ else
+ newflags = (p->fts_statp->st_flags | set) & clear;
+ if (newflags == p->fts_statp->st_flags)
+ continue;
+ if ((*change_flags)(p->fts_accpath, newflags) && !fflag) {
+ warn("%s", p->fts_path);
+ rval = 1;
+ } else if (vflag) {
+ (void)printf("%s", p->fts_path);
+ if (vflag > 1)
+ (void)printf(": 0%lo -> 0%lo",
+ (u_long)p->fts_statp->st_flags,
+ newflags);
+ (void)printf("\n");
}
- warn("%s", p->fts_path);
- rval = 1;
}
if (errno)
err(1, "fts_read");
@@ -188,6 +200,6 @@
usage(void)
{
(void)fprintf(stderr,
- "usage: chflags [-h] [-R [-H | -L | -P]] flags file ...\n");
+ "usage: chflags [-fhv] [-R [-H | -L | -P]] flags file ...\n");
exit(1);
}
==== //depot/projects/dtrace7/src/bin/realpath/realpath.1#2 (text+ko) ====
@@ -31,7 +31,7 @@
.\"
.\" @(#)pwd.1 8.2 (Berkeley) 4/28/95
.\" From: src/bin/pwd/pwd.1,v 1.11 2000/11/20 11:39:39 ru Exp
-.\" $FreeBSD: src/bin/realpath/realpath.1,v 1.10 2005/01/16 16:41:58 ru Exp $
+.\" $FreeBSD: src/bin/realpath/realpath.1,v 1.10.10.1 2008/03/16 18:55:56 rwatson Exp $
.\"
.Dd November 24, 2000
.Dt REALPATH 1
@@ -41,7 +41,9 @@
.Nd return resolved physical path
.Sh SYNOPSIS
.Nm
+.Op Fl q
.Ar path
+.Op Ar ...
.Sh DESCRIPTION
The
.Nm
@@ -55,6 +57,12 @@
.Pa /../
in
.Ar path .
+.Pp
+If
+.Fl q
+is specified, warnings will not be printed when
+.Xr realpath 3
+fails.
.Sh EXIT STATUS
.Ex -std
.Sh SEE ALSO
==== //depot/projects/dtrace7/src/bin/realpath/realpath.c#2 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/realpath/realpath.c,v 1.6 2004/04/06 20:06:50 markm Exp $");
+__FBSDID("$FreeBSD: src/bin/realpath/realpath.c,v 1.6.18.1 2008/03/16 18:55:56 rwatson Exp $");
#include <sys/param.h>
@@ -44,20 +44,39 @@
{
char buf[PATH_MAX];
char *p;
+ int ch, i, qflag, rval;
- if (argc == 2) {
- if ((p = realpath(argv[1], buf)) == NULL)
- err(1, "%s", buf);
- } else
+ qflag = 0;
+ while ((ch = getopt(argc, argv, "q")) != -1) {
+ switch (ch) {
+ case 'q':
+ qflag = 1;
+ break;
+ case '?':
+ default:
+ usage();
+ }
+ }
+ argc -= optind;
+ argv += optind;
+ if (argc < 1)
usage();
- (void)printf("%s\n", p);
- exit(0);
+ rval = 0;
+ for (i = 0; i < argc; i++) {
+ if ((p = realpath(argv[i], buf)) == NULL) {
+ if (!qflag)
+ warn("%s", argv[i]);
+ rval = 1;
+ } else
+ (void)printf("%s\n", p);
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list