Date: Mon, 25 Jan 2010 20:48:07 GMT From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 173695 for review Message-ID: <201001252048.o0PKm74E019376@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/chv.cgi?CH=173695 Change 173695 by peter@peter_daintree on 2010/01/25 20:47:09 IFC @173693 Affected files ... .. //depot/projects/hammer/Makefile#58 integrate .. //depot/projects/hammer/Makefile.inc1#151 integrate .. //depot/projects/hammer/ObsoleteFiles.inc#77 integrate .. //depot/projects/hammer/UPDATING#142 integrate .. //depot/projects/hammer/bin/cp/cp.1#12 integrate .. //depot/projects/hammer/bin/cp/cp.c#16 integrate .. //depot/projects/hammer/bin/cp/utils.c#18 integrate .. //depot/projects/hammer/bin/date/date.1#16 integrate .. //depot/projects/hammer/bin/ls/ls.c#20 integrate .. //depot/projects/hammer/bin/ls/ls.h#8 integrate .. //depot/projects/hammer/bin/ls/print.c#20 integrate .. //depot/projects/hammer/bin/pkill/Makefile#2 integrate .. //depot/projects/hammer/contrib/bind9/CHANGES#19 integrate .. //depot/projects/hammer/contrib/bind9/FAQ#10 integrate .. //depot/projects/hammer/contrib/bind9/FAQ.xml#8 integrate .. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-signzone.8#9 integrate .. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-signzone.html#9 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/query.c#9 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.pdf#9 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/man.dnssec-signzone.html#7 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/man.named-checkconf.html#7 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/man.named-checkzone.html#7 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/man.named.html#7 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/man.nsupdate.html#3 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/man.rndc-confgen.html#7 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/man.rndc.conf.html#7 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/man.rndc.html#7 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/db.h#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/ncache.h#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/types.h#6 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rbtdb.c#9 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/resolver.c#15 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/validator.c#12 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres.html#6 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_buffer.html#6 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_config.html#6 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_context.html#6 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_gabn.html#6 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html#6 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html#6 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_gethostent.html#6 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_getipnode.html#6 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html#6 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html#6 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_gnba.html#6 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_hstrerror.html#6 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_inetntop.html#6 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_noop.html#6 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_packet.html#6 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_resutil.html#6 integrate .. //depot/projects/hammer/contrib/bind9/version#19 integrate .. //depot/projects/hammer/contrib/groff/font/devutf8/R.proto#6 integrate .. //depot/projects/hammer/contrib/groff/tmac/an-old.tmac#5 integrate .. //depot/projects/hammer/contrib/groff/tmac/doc-common#16 integrate .. //depot/projects/hammer/contrib/groff/tmac/doc-old.tmac#3 integrate .. //depot/projects/hammer/contrib/groff/tmac/doc-syms#11 integrate .. //depot/projects/hammer/contrib/groff/tmac/doc.tmac#12 integrate .. //depot/projects/hammer/contrib/groff/tmac/groff_mdoc.man#14 integrate .. //depot/projects/hammer/contrib/netcat/nc.1#12 integrate .. //depot/projects/hammer/contrib/netcat/netcat.c#9 integrate .. //depot/projects/hammer/contrib/smbfs/smbutil/view.c#4 integrate .. //depot/projects/hammer/crypto/openssh/loginrec.c#17 integrate .. //depot/projects/hammer/etc/defaults/rc.conf#103 integrate .. //depot/projects/hammer/etc/devd/Makefile#3 integrate .. //depot/projects/hammer/etc/devd/uath.conf#1 branch .. //depot/projects/hammer/etc/mtree/BSD.include.dist#58 integrate .. //depot/projects/hammer/etc/mtree/BSD.usr.dist#49 integrate .. //depot/projects/hammer/etc/namedb/named.conf#17 integrate .. //depot/projects/hammer/etc/rc.d/devfs#13 integrate .. //depot/projects/hammer/etc/rc.firewall#15 integrate .. //depot/projects/hammer/gnu/lib/libstdc++/Makefile#32 integrate .. //depot/projects/hammer/gnu/lib/libsupc++/Makefile#9 integrate .. //depot/projects/hammer/gnu/usr.bin/Makefile#22 integrate .. //depot/projects/hammer/gnu/usr.bin/groff/tmac/mdoc.local#37 integrate .. //depot/projects/hammer/include/Makefile#85 integrate .. //depot/projects/hammer/include/unistd.h#32 integrate .. //depot/projects/hammer/lib/Makefile#80 integrate .. //depot/projects/hammer/lib/bind/dns/code.h#8 integrate .. //depot/projects/hammer/lib/bind/dns/dns/enumclass.h#8 integrate .. //depot/projects/hammer/lib/bind/dns/dns/enumtype.h#8 integrate .. //depot/projects/hammer/lib/bind/dns/dns/rdatastruct.h#8 integrate .. //depot/projects/hammer/lib/libarchive/archive_entry_link_resolver.c#6 integrate .. //depot/projects/hammer/lib/libarchive/archive_read.c#31 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_disk_entry_from_file.c#4 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_iso9660.c#25 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_format_zip.c#2 integrate .. //depot/projects/hammer/lib/libc/gen/Makefile.inc#46 integrate .. //depot/projects/hammer/lib/libc/gen/Symbol.map#20 integrate .. //depot/projects/hammer/lib/libc/gen/getttyent.3#5 integrate .. //depot/projects/hammer/lib/libc/gen/getutxent.3#2 integrate .. //depot/projects/hammer/lib/libc/gen/getutxent.c#2 integrate .. //depot/projects/hammer/lib/libc/gen/opendir.c#9 integrate .. //depot/projects/hammer/lib/libc/gen/pututxline.c#2 integrate .. //depot/projects/hammer/lib/libc/gen/scandir.3#5 integrate .. //depot/projects/hammer/lib/libc/gen/scandir.c#5 integrate .. //depot/projects/hammer/lib/libc/gen/sem.c#7 integrate .. //depot/projects/hammer/lib/libc/gen/sem_new.c#3 integrate .. //depot/projects/hammer/lib/libc/gen/ttyname.3#8 integrate .. //depot/projects/hammer/lib/libc/gen/ttyslot.c#4 integrate .. //depot/projects/hammer/lib/libc/gen/uname.c#3 integrate .. //depot/projects/hammer/lib/libc/gen/utxdb.c#2 integrate .. //depot/projects/hammer/lib/libc/gen/utxdb.h#2 integrate .. //depot/projects/hammer/lib/libc/nls/gl_ES.ISO8859-1.msg#2 integrate .. //depot/projects/hammer/lib/libc/string/strsignal.c#5 integrate .. //depot/projects/hammer/lib/libc/sys/wait.2#12 integrate .. //depot/projects/hammer/lib/libfetch/Makefile#20 integrate .. //depot/projects/hammer/lib/libfetch/http.c#19 integrate .. //depot/projects/hammer/lib/libgeom/geom_util.c#4 integrate .. //depot/projects/hammer/lib/libgeom/geom_xml2tree.c#7 integrate .. //depot/projects/hammer/lib/libgeom/libgeom.3#10 integrate .. //depot/projects/hammer/lib/libgeom/libgeom.h#8 integrate .. //depot/projects/hammer/lib/libpam/modules/pam_krb5/Makefile#9 integrate .. //depot/projects/hammer/lib/libpam/modules/pam_lastlog/Makefile#4 integrate .. //depot/projects/hammer/lib/libpam/modules/pam_lastlog/pam_lastlog.8#4 integrate .. //depot/projects/hammer/lib/libpam/modules/pam_lastlog/pam_lastlog.c#12 integrate .. //depot/projects/hammer/lib/libstand/bzipfs.c#6 integrate .. //depot/projects/hammer/lib/libtacplus/taclib.c#5 integrate .. //depot/projects/hammer/lib/libutil/login_tty.c#6 integrate .. //depot/projects/hammer/libexec/comsat/comsat.8#5 integrate .. //depot/projects/hammer/libexec/ftpd/ftpd.8#16 integrate .. //depot/projects/hammer/libexec/ftpd/ftpd.c#35 integrate .. //depot/projects/hammer/libexec/ftpd/logwtmp.c#5 integrate .. //depot/projects/hammer/libexec/getty/ttys.5#6 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/article.sgml#20 integrate .. //depot/projects/hammer/release/i386/fixit_crunch.conf#12 integrate .. //depot/projects/hammer/release/pc98/fixit-small_crunch.conf#12 integrate .. //depot/projects/hammer/release/pc98/fixit_crunch.conf#12 integrate .. //depot/projects/hammer/release/picobsd/bridge/crunch.conf#15 integrate .. //depot/projects/hammer/release/picobsd/qemu/crunch.conf#2 integrate .. //depot/projects/hammer/rescue/rescue/Makefile#47 integrate .. //depot/projects/hammer/sbin/adjkerntz/Makefile#3 integrate .. //depot/projects/hammer/sbin/camcontrol/camcontrol.8#13 integrate .. //depot/projects/hammer/sbin/camcontrol/camcontrol.c#16 integrate .. //depot/projects/hammer/sbin/geom/class/Makefile#13 integrate .. //depot/projects/hammer/sbin/geom/class/mountver/Makefile#1 branch .. //depot/projects/hammer/sbin/geom/class/mountver/geom_mountver.c#1 branch .. //depot/projects/hammer/sbin/geom/class/mountver/gmountver.8#1 branch .. //depot/projects/hammer/sbin/geom/core/geom.8#18 integrate .. //depot/projects/hammer/sbin/geom/core/geom.c#26 integrate .. //depot/projects/hammer/sbin/ifconfig/Makefile#16 integrate .. //depot/projects/hammer/sbin/ifconfig/af_inet.c#6 integrate .. //depot/projects/hammer/sbin/init/init.8#17 integrate .. //depot/projects/hammer/sbin/kldconfig/Makefile#3 integrate .. //depot/projects/hammer/sbin/kldload/Makefile#3 integrate .. //depot/projects/hammer/sbin/kldstat/Makefile#3 integrate .. //depot/projects/hammer/sbin/mdconfig/Makefile#5 integrate .. //depot/projects/hammer/sbin/mdconfig/mdconfig.c#29 integrate .. //depot/projects/hammer/sbin/mount_nfs/mount_nfs.8#19 integrate .. //depot/projects/hammer/sbin/natd/Makefile#3 integrate .. //depot/projects/hammer/sbin/natd/natd.c#16 integrate .. //depot/projects/hammer/sbin/newfs/Makefile#4 integrate .. //depot/projects/hammer/sbin/reboot/reboot.8#8 integrate .. //depot/projects/hammer/sbin/setkey/setkey.8#7 integrate .. //depot/projects/hammer/sbin/swapon/Makefile#5 integrate .. //depot/projects/hammer/sbin/tunefs/Makefile#4 integrate .. //depot/projects/hammer/share/doc/usd/05.dc/Makefile#1 branch .. //depot/projects/hammer/share/doc/usd/06.bc/Makefile#1 branch .. //depot/projects/hammer/share/doc/usd/Makefile#4 integrate .. //depot/projects/hammer/share/examples/kld/cdev/test/Makefile#4 integrate .. //depot/projects/hammer/share/examples/kld/cdev/test/testcdev.c#3 integrate .. //depot/projects/hammer/share/examples/kld/firmware/fwconsumer/fw_consumer.c#2 integrate .. //depot/projects/hammer/share/examples/kld/syscall/test/Makefile#5 integrate .. //depot/projects/hammer/share/examples/kld/syscall/test/call.c#2 integrate .. //depot/projects/hammer/share/man/man3/pthread_join.3#5 integrate .. //depot/projects/hammer/share/man/man3/sysexits.3#8 integrate .. //depot/projects/hammer/share/man/man4/Makefile#127 integrate .. //depot/projects/hammer/share/man/man4/acpi.4#42 integrate .. //depot/projects/hammer/share/man/man4/acpi_asus.4#3 integrate .. //depot/projects/hammer/share/man/man4/aue.4#13 integrate .. //depot/projects/hammer/share/man/man4/axe.4#14 integrate .. //depot/projects/hammer/share/man/man4/cdce.4#7 integrate .. //depot/projects/hammer/share/man/man4/dc.4#21 integrate .. //depot/projects/hammer/share/man/man4/epair.4#3 integrate .. //depot/projects/hammer/share/man/man4/gif.4#9 integrate .. //depot/projects/hammer/share/man/man4/gpib.4#1 branch .. //depot/projects/hammer/share/man/man4/hme.4#10 integrate .. //depot/projects/hammer/share/man/man4/ipwfw.4#1 branch .. //depot/projects/hammer/share/man/man4/iwifw.4#1 branch .. //depot/projects/hammer/share/man/man4/lge.4#7 integrate .. //depot/projects/hammer/share/man/man4/mac.4#8 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/vpd.4#4 integrate .. //depot/projects/hammer/share/man/man4/man4.sparc64/ebus.4#3 integrate .. //depot/projects/hammer/share/man/man4/mpt.4#13 integrate .. //depot/projects/hammer/share/man/man4/ndis.4#3 integrate .. //depot/projects/hammer/share/man/man4/nge.4#12 integrate .. //depot/projects/hammer/share/man/man4/pcii.4#1 branch .. //depot/projects/hammer/share/man/man4/pcm.4#24 integrate .. //depot/projects/hammer/share/man/man4/pcn.4#10 integrate .. //depot/projects/hammer/share/man/man4/psm.4#13 integrate .. //depot/projects/hammer/share/man/man4/pts.4#5 integrate .. //depot/projects/hammer/share/man/man4/ral.4#15 integrate .. //depot/projects/hammer/share/man/man4/re.4#21 integrate .. //depot/projects/hammer/share/man/man4/rl.4#20 integrate .. //depot/projects/hammer/share/man/man4/rue.4#11 integrate .. //depot/projects/hammer/share/man/man4/rum.4#8 integrate .. //depot/projects/hammer/share/man/man4/sf.4#9 integrate .. //depot/projects/hammer/share/man/man4/siba.4#1 branch .. //depot/projects/hammer/share/man/man4/sis.4#12 integrate .. //depot/projects/hammer/share/man/man4/sk.4#15 integrate .. //depot/projects/hammer/share/man/man4/smbus.4#3 integrate .. //depot/projects/hammer/share/man/man4/snd_hda.4#18 integrate .. //depot/projects/hammer/share/man/man4/snd_uaudio.4#3 integrate .. //depot/projects/hammer/share/man/man4/ste.4#14 integrate .. //depot/projects/hammer/share/man/man4/sysmouse.4#8 integrate .. //depot/projects/hammer/share/man/man4/targ.4#5 integrate .. //depot/projects/hammer/share/man/man4/tnt4882.4#1 branch .. //depot/projects/hammer/share/man/man4/udav.4#8 integrate .. //depot/projects/hammer/share/man/man4/uhso.4#2 integrate .. //depot/projects/hammer/share/man/man4/ural.4#15 integrate .. //depot/projects/hammer/share/man/man4/urio.4#7 integrate .. //depot/projects/hammer/share/man/man4/urtw.4#5 integrate .. //depot/projects/hammer/share/man/man4/vr.4#16 integrate .. //depot/projects/hammer/share/man/man4/wi.4#35 integrate .. //depot/projects/hammer/share/man/man4/wlan.4#16 integrate .. //depot/projects/hammer/share/man/man5/src.conf.5#24 integrate .. //depot/projects/hammer/share/man/man7/hier.7#39 integrate .. //depot/projects/hammer/share/man/man7/release.7#32 integrate .. //depot/projects/hammer/share/man/man9/Makefile#100 integrate .. //depot/projects/hammer/share/man/man9/ifnet.9#26 integrate .. //depot/projects/hammer/share/man/man9/kthread.9#11 integrate .. //depot/projects/hammer/share/man/man9/mac.9#12 integrate .. //depot/projects/hammer/share/man/man9/namei.9#9 integrate .. //depot/projects/hammer/share/man/man9/pci.9#10 integrate .. //depot/projects/hammer/share/man/man9/sysctl.9#4 integrate .. //depot/projects/hammer/share/mk/bsd.dep.mk#13 integrate .. //depot/projects/hammer/share/mk/bsd.lib.mk#37 integrate .. //depot/projects/hammer/share/mk/bsd.own.mk#32 integrate .. //depot/projects/hammer/share/mk/bsd.sys.mk#22 integrate .. //depot/projects/hammer/share/mk/sys.mk#31 integrate .. //depot/projects/hammer/share/security/lomac-policy.contexts#2 integrate .. //depot/projects/hammer/share/zoneinfo/asia#27 integrate .. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#91 integrate .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#181 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#196 integrate .. //depot/projects/hammer/sys/amd64/amd64/trap.c#114 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC#127 integrate .. //depot/projects/hammer/sys/amd64/conf/XENHVM#4 integrate .. //depot/projects/hammer/sys/amd64/ia32/ia32_reg.c#13 integrate .. //depot/projects/hammer/sys/amd64/ia32/ia32_syscall.c#18 integrate .. //depot/projects/hammer/sys/amd64/include/apicvar.h#53 integrate .. //depot/projects/hammer/sys/amd64/isa/clock.c#74 integrate .. //depot/projects/hammer/sys/arm/arm/busdma_machdep.c#34 integrate .. //depot/projects/hammer/sys/arm/conf/CRB#9 integrate .. //depot/projects/hammer/sys/arm/conf/EP80219#10 integrate .. //depot/projects/hammer/sys/arm/conf/GUMSTIX#5 integrate .. //depot/projects/hammer/sys/arm/conf/IQ31244#20 integrate .. //depot/projects/hammer/sys/arm/conf/SIMICS#17 integrate .. //depot/projects/hammer/sys/arm/conf/SKYEYE#10 integrate .. //depot/projects/hammer/sys/boot/forth/loader.conf#52 integrate .. //depot/projects/hammer/sys/boot/ia64/efi/main.c#4 integrate .. //depot/projects/hammer/sys/boot/ia64/efi/version#4 integrate .. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/time.h#3 integrate .. //depot/projects/hammer/sys/compat/linux/linux_ioctl.c#46 integrate .. //depot/projects/hammer/sys/compat/linux/linux_ioctl.h#16 integrate .. //depot/projects/hammer/sys/compat/linux/linux_misc.c#64 integrate .. //depot/projects/hammer/sys/compat/linux/linux_uid16.c#17 integrate .. //depot/projects/hammer/sys/conf/NOTES#170 integrate .. //depot/projects/hammer/sys/conf/files#208 integrate .. //depot/projects/hammer/sys/conf/files.pc98#79 integrate .. //depot/projects/hammer/sys/conf/kern.mk#31 integrate .. //depot/projects/hammer/sys/conf/ldscript.mips#5 integrate .. //depot/projects/hammer/sys/conf/options.i386#57 integrate .. //depot/projects/hammer/sys/conf/options.pc98#51 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/changes.txt#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/common/adfile.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/common/adisasm.c#11 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/common/adwalk.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/common/dmextern.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/common/dmrestag.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/common/dmtable.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/common/dmtbdump.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/common/dmtbinfo.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/common/getopt.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslanalyze.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslcodegen.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslcompile.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslcompiler.h#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslcompiler.l#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslcompiler.y#11 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/asldefine.h#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslerror.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslfiles.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslfold.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslglobal.h#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/asllength.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/asllisting.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslload.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/asllookup.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslmain.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslmap.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslopcodes.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/asloperands.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslopt.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslresource.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslrestype1.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslrestype2.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslstartup.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslstubs.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/asltransform.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/asltree.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/asltypes.h#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslutils.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/debugger/dbcmds.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/debugger/dbdisply.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/debugger/dbexec.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/debugger/dbfileio.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/debugger/dbhistry.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/debugger/dbinput.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/debugger/dbstats.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/debugger/dbutils.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/debugger/dbxface.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/disassembler/dmbuffer.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/disassembler/dmnames.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/disassembler/dmobject.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/disassembler/dmopcode.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/disassembler/dmresrc.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/disassembler/dmresrcl.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/disassembler/dmresrcs.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/disassembler/dmutils.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/disassembler/dmwalk.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dispatcher/dsfield.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dispatcher/dsinit.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dispatcher/dsmethod.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dispatcher/dsmthdat.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dispatcher/dsobject.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dispatcher/dsopcode.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dispatcher/dsutils.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dispatcher/dswexec.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dispatcher/dswload.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dispatcher/dswscope.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dispatcher/dswstate.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/events/evevent.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/events/evgpe.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/events/evgpeblk.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/events/evmisc.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/events/evregion.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/events/evrgnini.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/events/evsci.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/events/evxface.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/events/evxfevnt.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/events/evxfregn.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/executer/exconfig.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/executer/exconvrt.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/executer/excreate.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/executer/exdump.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/executer/exfield.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/executer/exfldio.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/executer/exmisc.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/executer/exmutex.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/executer/exnames.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/executer/exoparg1.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/executer/exoparg2.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/executer/exoparg3.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/executer/exoparg6.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/executer/exprep.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/executer/exregion.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/executer/exresnte.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/executer/exresolv.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/executer/exresop.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/executer/exstore.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/executer/exstoren.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/executer/exstorob.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/executer/exsystem.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/executer/exutils.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/hardware/hwacpi.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/hardware/hwgpe.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/hardware/hwregs.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/hardware/hwsleep.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/hardware/hwtimer.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/hardware/hwvalid.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/hardware/hwxface.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/acapps.h#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/accommon.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/acconfig.h#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/acdebug.h#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/acdisasm.h#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/acdispat.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/acevents.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/acexcep.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/acglobal.h#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/achware.h#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/acinterp.h#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/aclocal.h#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/acmacros.h#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/acnames.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/acnamesp.h#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/acobject.h#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/acopcode.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/acoutput.h#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/acparser.h#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/acpi.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/acpiosxf.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/acpixf.h#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/acpredef.h#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/acresrc.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/acrestyp.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/acstruct.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/actables.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/actbl.h#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/actbl1.h#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/actbl2.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/actypes.h#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/acutils.h#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/amlcode.h#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/amlresrc.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/platform/acenv.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/platform/acfreebsd.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/platform/acgcc.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/namespace/nsaccess.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/namespace/nsalloc.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/namespace/nsdump.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/namespace/nsdumpdv.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/namespace/nseval.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/namespace/nsinit.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/namespace/nsload.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/namespace/nsnames.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/namespace/nsobject.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/namespace/nsparse.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/namespace/nspredef.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/namespace/nsrepair.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/namespace/nsrepair2.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/namespace/nssearch.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/namespace/nsutils.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/namespace/nswalk.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/namespace/nsxfeval.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/namespace/nsxfname.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/namespace/nsxfobj.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/osunixxf.c#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/parser/psargs.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/parser/psloop.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/parser/psopcode.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/parser/psparse.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/parser/psscope.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/parser/pstree.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/parser/psutils.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/parser/pswalk.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/parser/psxface.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/resources/rsaddr.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/resources/rscalc.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/resources/rscreate.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/resources/rsdump.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/resources/rsinfo.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/resources/rsio.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/resources/rsirq.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/resources/rslist.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/resources/rsmemory.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/resources/rsmisc.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/resources/rsutils.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/resources/rsxface.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/tables/tbfadt.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/tables/tbfind.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/tables/tbinstal.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/tables/tbutils.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/tables/tbxface.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/tables/tbxfroot.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/tools/acpiexec/aecommon.h#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utilities/utalloc.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utilities/utcache.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utilities/utcopy.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utilities/utdebug.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utilities/utdelete.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utilities/uteval.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utilities/utglobal.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utilities/utids.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utilities/utinit.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utilities/utlock.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utilities/utmath.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utilities/utmisc.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utilities/utmutex.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utilities/utobject.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utilities/utresrc.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utilities/utstate.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utilities/uttrack.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utilities/utxface.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/uath/ar5523.bin.uu#2 integrate .. //depot/projects/hammer/sys/dev/acpi_support/acpi_ibm.c#19 integrate .. //depot/projects/hammer/sys/dev/acpi_support/acpi_panasonic.c#10 integrate .. //depot/projects/hammer/sys/dev/acpi_support/acpi_wmi.c#2 integrate .. //depot/projects/hammer/sys/dev/acpica/Osd/OsdHardware.c#20 integrate .. //depot/projects/hammer/sys/dev/acpica/Osd/OsdSchedule.c#23 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_ec.c#46 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_if.m#10 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_package.c#10 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_powerres.c#18 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_smbat.c#7 integrate .. //depot/projects/hammer/sys/dev/acpica/acpivar.h#61 integrate .. //depot/projects/hammer/sys/dev/ata/ata_if.m#7 integrate .. //depot/projects/hammer/sys/dev/bce/if_bce.c#24 integrate .. //depot/projects/hammer/sys/dev/bce/if_bcereg.h#18 integrate .. //depot/projects/hammer/sys/dev/bge/if_bge.c#95 integrate .. //depot/projects/hammer/sys/dev/bge/if_bgereg.h#49 integrate .. //depot/projects/hammer/sys/dev/cs/if_cs.c#25 integrate .. //depot/projects/hammer/sys/dev/cs/if_csreg.h#6 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_adapter.h#27 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_main.c#39 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_sge.c#34 integrate .. //depot/projects/hammer/sys/dev/ichwd/ichwd.c#19 integrate .. //depot/projects/hammer/sys/dev/ichwd/ichwd.h#9 integrate .. //depot/projects/hammer/sys/dev/ieee488/pcii.c#7 integrate .. //depot/projects/hammer/sys/dev/ieee488/tnt4882.c#4 integrate .. //depot/projects/hammer/sys/dev/ieee488/upd7210.c#9 integrate .. //depot/projects/hammer/sys/dev/ieee488/upd7210.h#6 integrate .. //depot/projects/hammer/sys/dev/isp/isp.c#33 integrate .. //depot/projects/hammer/sys/dev/iwn/if_iwn.c#12 integrate .. //depot/projects/hammer/sys/dev/iwn/if_iwnreg.h#4 integrate .. //depot/projects/hammer/sys/dev/mii/brgphy.c#38 integrate .. //depot/projects/hammer/sys/dev/mii/miidevs#33 integrate .. //depot/projects/hammer/sys/dev/msk/if_msk.c#22 integrate .. //depot/projects/hammer/sys/dev/sound/pci/hda/hdac.c#38 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/sndstat.c#18 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/sndstat.h#2 integrate .. //depot/projects/hammer/sys/dev/usb/net/uhso.c#2 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#128 integrate .. //depot/projects/hammer/sys/dev/usb/wlan/if_uath.c#6 integrate .. //depot/projects/hammer/sys/fs/cd9660/cd9660_vfsops.c#13 integrate .. //depot/projects/hammer/sys/fs/cd9660/cd9660_vnops.c#10 integrate .. //depot/projects/hammer/sys/fs/ext2fs/ext2_alloc.c#1 branch .. //depot/projects/hammer/sys/fs/ext2fs/ext2_balloc.c#1 branch .. //depot/projects/hammer/sys/fs/ext2fs/ext2_bmap.c#1 branch .. //depot/projects/hammer/sys/fs/ext2fs/ext2_dinode.h#1 branch .. //depot/projects/hammer/sys/fs/ext2fs/ext2_dir.h#1 branch .. //depot/projects/hammer/sys/fs/ext2fs/ext2_extern.h#1 branch .. //depot/projects/hammer/sys/fs/ext2fs/ext2_inode.c#1 branch .. //depot/projects/hammer/sys/fs/ext2fs/ext2_inode_cnv.c#1 branch .. //depot/projects/hammer/sys/fs/ext2fs/ext2_lookup.c#1 branch .. //depot/projects/hammer/sys/fs/ext2fs/ext2_mount.h#1 branch .. //depot/projects/hammer/sys/fs/ext2fs/ext2_readwrite.c#1 branch .. //depot/projects/hammer/sys/fs/ext2fs/ext2_subr.c#1 branch .. //depot/projects/hammer/sys/fs/ext2fs/ext2_vfsops.c#1 branch .. //depot/projects/hammer/sys/fs/ext2fs/ext2_vnops.c#1 branch .. //depot/projects/hammer/sys/fs/ext2fs/ext2fs.h#1 branch .. //depot/projects/hammer/sys/fs/ext2fs/fs.h#1 branch .. //depot/projects/hammer/sys/fs/ext2fs/inode.h#1 branch .. //depot/projects/hammer/sys/fs/pseudofs/pseudofs_vnops.c#37 integrate .. //depot/projects/hammer/sys/fs/tmpfs/tmpfs_subr.c#17 integrate .. //depot/projects/hammer/sys/fs/tmpfs/tmpfs_vfsops.c#18 integrate .. //depot/projects/hammer/sys/geom/eli/g_eli_key.c#4 integrate .. //depot/projects/hammer/sys/geom/geom_dump.c#18 integrate .. //depot/projects/hammer/sys/geom/mountver/g_mountver.c#1 branch .. //depot/projects/hammer/sys/geom/mountver/g_mountver.h#1 branch .. //depot/projects/hammer/sys/geom/part/g_part_bsd.c#13 integrate .. //depot/projects/hammer/sys/geom/part/g_part_vtoc8.c#8 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum.c#21 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_create.c#4 integrate .. //depot/projects/hammer/sys/gnu/fs/ext2fs/COPYRIGHT.INFO#2 delete .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_alloc.c#6 delete .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_balloc.c#4 delete .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_bitops.h#4 delete .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_bmap.c#4 delete .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_extern.h#2 delete .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_fs.h#5 delete .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_fs_sb.h#5 delete .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_inode.c#8 delete .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_inode_cnv.c#4 delete .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_linux_balloc.c#3 delete .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_linux_ialloc.c#5 delete .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_lookup.c#9 delete .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_mount.h#2 delete .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_readwrite.c#2 delete .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_subr.c#3 delete .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_vfsops.c#25 delete .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_vnops.c#17 delete .. //depot/projects/hammer/sys/gnu/fs/ext2fs/fs.h#5 delete .. //depot/projects/hammer/sys/gnu/fs/ext2fs/i386-bitops.h#3 delete .. //depot/projects/hammer/sys/gnu/fs/ext2fs/inode.h#3 delete .. //depot/projects/hammer/sys/gnu/fs/reiserfs/reiserfs_fs.h#5 integrate .. //depot/projects/hammer/sys/i386/conf/GENERIC#86 integrate .. //depot/projects/hammer/sys/i386/i386/local_apic.c#48 integrate .. //depot/projects/hammer/sys/i386/i386/pmap.c#127 integrate .. //depot/projects/hammer/sys/i386/i386/trap.c#70 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_misc.c#25 integrate .. //depot/projects/hammer/sys/i386/include/apicvar.h#30 integrate .. //depot/projects/hammer/sys/i386/include/pmap.h#44 integrate .. //depot/projects/hammer/sys/i386/isa/clock.c#49 integrate .. //depot/projects/hammer/sys/i386/xen/pmap.c#13 integrate .. //depot/projects/hammer/sys/ia64/ia64/efi.c#5 integrate .. //depot/projects/hammer/sys/ia64/ia64/iodev_machdep.c#2 integrate .. //depot/projects/hammer/sys/ia64/ia64/machdep.c#79 integrate .. //depot/projects/hammer/sys/ia64/include/efi.h#4 integrate .. //depot/projects/hammer/sys/ia64/include/iodev.h#2 integrate .. //depot/projects/hammer/sys/kern/kern_jail.c#51 integrate .. //depot/projects/hammer/sys/kern/kern_kthread.c#21 integrate .. //depot/projects/hammer/sys/kern/kern_mutex.c#60 integrate .. //depot/projects/hammer/sys/kern/kern_prot.c#40 integrate .. //depot/projects/hammer/sys/kern/kern_sig.c#101 integrate .. //depot/projects/hammer/sys/kern/sched_4bsd.c#68 integrate .. //depot/projects/hammer/sys/kern/sched_ule.c#109 integrate .. //depot/projects/hammer/sys/kern/sys_process.c#51 integrate .. //depot/projects/hammer/sys/kern/tty_inq.c#4 integrate .. //depot/projects/hammer/sys/kern/tty_pts.c#25 integrate .. //depot/projects/hammer/sys/kern/vfs_subr.c#148 integrate .. //depot/projects/hammer/sys/mips/adm5120/adm5120_machdep.c#4 integrate .. //depot/projects/hammer/sys/mips/alchemy/alchemy_machdep.c#2 integrate .. //depot/projects/hammer/sys/mips/atheros/ar71xx_machdep.c#2 integrate .. //depot/projects/hammer/sys/mips/atheros/ar71xx_spi.c#2 integrate .. //depot/projects/hammer/sys/mips/atheros/ar71xxreg.h#2 integrate .. //depot/projects/hammer/sys/mips/atheros/files.ar71xx#2 integrate .. //depot/projects/hammer/sys/mips/atheros/pcf2123_rtc.c#1 branch .. //depot/projects/hammer/sys/mips/atheros/pcf2123reg.h#1 branch .. //depot/projects/hammer/sys/mips/cavium/dev/rgmii/octeon_fpa.c#2 integrate .. //depot/projects/hammer/sys/mips/cavium/obio.c#2 integrate .. //depot/projects/hammer/sys/mips/cavium/octeon_machdep.c#2 integrate .. //depot/projects/hammer/sys/mips/cavium/octeon_pcmap_regs.h#2 integrate .. //depot/projects/hammer/sys/mips/cavium/octeonreg.h#2 delete .. //depot/projects/hammer/sys/mips/cavium/uart_bus_octeonusart.c#2 integrate .. //depot/projects/hammer/sys/mips/cavium/uart_cpu_octeonusart.c#2 integrate .. //depot/projects/hammer/sys/mips/conf/AR71XX.hints#2 integrate .. //depot/projects/hammer/sys/mips/conf/OCTEON1-32#2 integrate .. //depot/projects/hammer/sys/mips/conf/OCTEON1.hints#2 integrate .. //depot/projects/hammer/sys/mips/conf/QEMU#5 integrate .. //depot/projects/hammer/sys/mips/idt/idt_machdep.c#3 integrate .. //depot/projects/hammer/sys/mips/include/cpu.h#3 integrate .. //depot/projects/hammer/sys/mips/include/elf.h#7 integrate .. //depot/projects/hammer/sys/mips/include/md_var.h#3 integrate .. //depot/projects/hammer/sys/mips/include/trap.h#3 integrate .. //depot/projects/hammer/sys/mips/malta/malta_machdep.c#4 integrate .. //depot/projects/hammer/sys/mips/mips/db_trace.c#3 integrate .. //depot/projects/hammer/sys/mips/mips/elf_trampoline.c#2 integrate .. //depot/projects/hammer/sys/mips/mips/exception.S#3 integrate .. //depot/projects/hammer/sys/mips/mips/locore.S#3 integrate .. //depot/projects/hammer/sys/mips/mips/machdep.c#10 integrate .. //depot/projects/hammer/sys/mips/mips/swtch.S#3 integrate .. //depot/projects/hammer/sys/mips/mips/tick.c#4 integrate .. //depot/projects/hammer/sys/mips/rmi/xlr_machdep.c#2 integrate .. //depot/projects/hammer/sys/mips/sentry5/s5_machdep.c#5 integrate .. //depot/projects/hammer/sys/mips/sibyte/sb_machdep.c#2 integrate .. //depot/projects/hammer/sys/modules/Makefile#149 integrate .. //depot/projects/hammer/sys/modules/ext2fs/Makefile#4 integrate .. //depot/projects/hammer/sys/modules/geom/Makefile#19 integrate .. //depot/projects/hammer/sys/modules/geom/geom_mountver/Makefile#1 branch .. //depot/projects/hammer/sys/net/if.c#96 integrate .. //depot/projects/hammer/sys/net/if_bridge.c#55 integrate .. //depot/projects/hammer/sys/net/if_lagg.c#23 integrate .. //depot/projects/hammer/sys/net/if_var.h#64 integrate .. //depot/projects/hammer/sys/net/if_vlan.c#55 integrate .. //depot/projects/hammer/sys/net80211/ieee80211.c#45 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_freebsd.c#26 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_ioctl.c#49 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_mesh.c#4 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_sta.c#11 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_var.h#47 integrate .. //depot/projects/hammer/sys/netgraph/ng_eiface.c#35 integrate .. //depot/projects/hammer/sys/netgraph/ng_ether.c#39 integrate .. //depot/projects/hammer/sys/netgraph/ng_fec.c#25 integrate .. //depot/projects/hammer/sys/netinet/in_pcb.c#74 integrate .. //depot/projects/hammer/sys/netinet/ipfw/ip_fw2.c#8 integrate .. //depot/projects/hammer/sys/netinet/sctp_auth.c#17 integrate .. //depot/projects/hammer/sys/netinet/sctp_auth.h#7 integrate .. //depot/projects/hammer/sys/netinet/sctp_constants.h#25 integrate .. //depot/projects/hammer/sys/netinet/sctp_header.h#9 integrate .. //depot/projects/hammer/sys/netinet/sctp_indata.c#32 integrate .. //depot/projects/hammer/sys/netinet/sctp_indata.h#7 integrate .. //depot/projects/hammer/sys/netinet/sctp_input.c#30 integrate .. //depot/projects/hammer/sys/netinet/sctp_os_bsd.h#27 integrate .. //depot/projects/hammer/sys/netinet/sctp_output.c#36 integrate .. //depot/projects/hammer/sys/netinet/sctp_pcb.c#35 integrate .. //depot/projects/hammer/sys/netinet/sctp_structs.h#22 integrate .. //depot/projects/hammer/sys/netinet/sctp_sysctl.c#20 integrate .. //depot/projects/hammer/sys/netinet/sctp_uio.h#21 integrate .. //depot/projects/hammer/sys/netinet/sctp_usrreq.c#32 integrate .. //depot/projects/hammer/sys/netinet/sctputil.c#41 integrate .. //depot/projects/hammer/sys/netinet/tcp_var.h#64 integrate .. //depot/projects/hammer/sys/netinet6/in6_pcb.c#50 integrate .. //depot/projects/hammer/sys/netinet6/in6_proto.c#32 integrate .. //depot/projects/hammer/sys/netinet6/in6_src.c#40 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_vfsops.c#72 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_vnops.c#78 integrate .. //depot/projects/hammer/sys/nfsclient/nfsmount.h#17 integrate .. //depot/projects/hammer/sys/nfsclient/nfsnode.h#26 integrate .. //depot/projects/hammer/sys/pc98/cbus/clock.c#19 integrate .. //depot/projects/hammer/sys/pc98/conf/DEFAULTS#12 integrate .. //depot/projects/hammer/sys/pc98/conf/GENERIC#68 integrate .. //depot/projects/hammer/sys/pci/nfsmb.c#8 integrate .. //depot/projects/hammer/sys/powerpc/conf/GENERIC#55 integrate .. //depot/projects/hammer/sys/sparc64/conf/GENERIC#77 integrate .. //depot/projects/hammer/sys/sparc64/conf/NOTES#25 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/trap.c#32 integrate .. //depot/projects/hammer/sys/sys/cdefs.h#30 integrate .. //depot/projects/hammer/sys/sys/jail.h#23 integrate .. //depot/projects/hammer/sys/sys/kthread.h#5 integrate .. //depot/projects/hammer/sys/sys/param.h#138 integrate .. //depot/projects/hammer/sys/sys/proc.h#137 integrate .. //depot/projects/hammer/sys/sys/signalvar.h#25 integrate .. //depot/projects/hammer/sys/sys/vnode.h#95 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_acl.c#11 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_vnops.c#67 integrate .. //depot/projects/hammer/sys/vm/vm_pageout.c#57 integrate .. //depot/projects/hammer/sys/vm/vnode_pager.c#54 integrate .. //depot/projects/hammer/tools/build/mk/OptionalObsoleteFiles.inc#17 integrate .. //depot/projects/hammer/tools/make_libdeps.sh#9 integrate .. //depot/projects/hammer/usr.bin/Makefile#71 integrate .. //depot/projects/hammer/usr.bin/at/at.man#6 integrate .. //depot/projects/hammer/usr.bin/bc/Makefile#1 branch .. //depot/projects/hammer/usr.bin/bc/USD.doc/bc#1 branch .. //depot/projects/hammer/usr.bin/bc/bc.1#1 branch .. //depot/projects/hammer/usr.bin/bc/bc.library#1 branch .. //depot/projects/hammer/usr.bin/bc/bc.y#1 branch .. //depot/projects/hammer/usr.bin/bc/extern.h#1 branch .. //depot/projects/hammer/usr.bin/bc/pathnames.h#1 branch .. //depot/projects/hammer/usr.bin/bc/scan.l#1 branch .. //depot/projects/hammer/usr.bin/brandelf/brandelf.1#4 integrate .. //depot/projects/hammer/usr.bin/chpass/chpass.1#8 integrate .. //depot/projects/hammer/usr.bin/dc/Makefile#1 branch .. //depot/projects/hammer/usr.bin/dc/USD.doc/dc#1 branch .. //depot/projects/hammer/usr.bin/dc/bcode.c#1 branch .. //depot/projects/hammer/usr.bin/dc/bcode.h#1 branch .. //depot/projects/hammer/usr.bin/dc/dc.1#1 branch .. //depot/projects/hammer/usr.bin/dc/dc.c#1 branch .. //depot/projects/hammer/usr.bin/dc/extern.h#1 branch .. //depot/projects/hammer/usr.bin/dc/inout.c#1 branch .. //depot/projects/hammer/usr.bin/dc/mem.c#1 branch .. //depot/projects/hammer/usr.bin/dc/stack.c#1 branch .. //depot/projects/hammer/usr.bin/elfdump/elfdump.1#4 integrate .. //depot/projects/hammer/usr.bin/finger/finger.1#8 integrate .. //depot/projects/hammer/usr.bin/getent/getent.c#4 integrate .. //depot/projects/hammer/usr.bin/last/last.1#5 integrate .. //depot/projects/hammer/usr.bin/last/last.c#8 integrate .. //depot/projects/hammer/usr.bin/locale/Makefile#4 integrate .. //depot/projects/hammer/usr.bin/ncplist/ncplist.1#3 integrate .. //depot/projects/hammer/usr.bin/talk/talk.1#8 integrate .. //depot/projects/hammer/usr.bin/unifdef/unifdef.1#9 integrate .. //depot/projects/hammer/usr.bin/unifdef/unifdef.c#11 integrate .. //depot/projects/hammer/usr.bin/unifdef/unifdefall.sh#4 integrate .. //depot/projects/hammer/usr.bin/users/users.1#2 integrate .. //depot/projects/hammer/usr.bin/w/w.1#5 integrate .. //depot/projects/hammer/usr.bin/who/who.1#5 integrate .. //depot/projects/hammer/usr.bin/whois/whois.1#9 integrate .. //depot/projects/hammer/usr.bin/whois/whois.c#16 integrate .. //depot/projects/hammer/usr.bin/wtmpcvt/Makefile#1 branch .. //depot/projects/hammer/usr.bin/wtmpcvt/wtmpcvt.1#1 branch .. //depot/projects/hammer/usr.bin/wtmpcvt/wtmpcvt.c#1 branch .. //depot/projects/hammer/usr.sbin/Makefile#106 integrate .. //depot/projects/hammer/usr.sbin/ac/ac.8#4 integrate .. //depot/projects/hammer/usr.sbin/acpi/acpidb/acpidb.c#7 integrate .. //depot/projects/hammer/usr.sbin/adduser/adduser.sh#15 integrate .. //depot/projects/hammer/usr.sbin/burncd/burncd.c#13 integrate .. //depot/projects/hammer/usr.sbin/ctm/ctm_smail/ctm_smail.c#3 integrate .. //depot/projects/hammer/usr.sbin/extattr/rmextattr.c#5 integrate .. //depot/projects/hammer/usr.sbin/faithd/faithd.8#6 integrate .. //depot/projects/hammer/usr.sbin/jail/jail.8#40 integrate .. //depot/projects/hammer/usr.sbin/lastlogin/lastlogin.8#3 integrate .. //depot/projects/hammer/usr.sbin/lastlogin/lastlogin.c#5 integrate .. //depot/projects/hammer/usr.sbin/mergemaster/mergemaster.8#16 integrate .. //depot/projects/hammer/usr.sbin/mergemaster/mergemaster.sh#24 integrate .. //depot/projects/hammer/usr.sbin/newsyslog/newsyslog.8#16 integrate .. //depot/projects/hammer/usr.sbin/newsyslog/newsyslog.c#28 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/lib/lib.h#25 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/updating/main.c#4 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/updating/pkg_updating.1#5 integrate .. //depot/projects/hammer/usr.sbin/ppp/Makefile#13 integrate .. //depot/projects/hammer/usr.sbin/rwhod/rwhod.8#7 integrate .. //depot/projects/hammer/usr.sbin/smbmsg/smbmsg.8#5 integrate .. //depot/projects/hammer/usr.sbin/ypserv/yp_main.c#8 integrate Differences ... ==== //depot/projects/hammer/Makefile#58 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.361 2010/01/11 17:58:15 bz Exp $ +# $FreeBSD: src/Makefile,v 1.363 2010/01/19 15:34:16 ed Exp $ # # The user-driven targets are: # ==== //depot/projects/hammer/Makefile.inc1#151 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.636 2009/12/31 00:07:26 ed Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.639 2010/01/23 19:29:42 antoine Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -1122,7 +1122,7 @@ lib/libkiconv lib/libkvm lib/libmd \ lib/ncurses/ncurses lib/ncurses/ncursesw \ lib/libopie lib/libpam ${_lib_libthr} \ - lib/libradius lib/libsbuf lib/libtacplus lib/libulog \ + lib/libradius lib/libsbuf lib/libtacplus \ lib/libutil ${_lib_libypclnt} lib/libz lib/msun \ ${_secure_lib_libcrypto} ${_secure_lib_libssh} \ ${_secure_lib_libssl} lib/libdwarf lib/libproc @@ -1145,14 +1145,16 @@ _secure_lib_libcrypto= secure/lib/libcrypto _secure_lib_libssl= secure/lib/libssl lib/libradius__L secure/lib/libssl__L: secure/lib/libcrypto__L -.if ${MK_OPENSSH} != "no" -_secure_lib_libssh= secure/lib/libssh -secure/lib/libssh__L: lib/libz__L secure/lib/libcrypto__L lib/libcrypt__L .if ${MK_KERBEROS} != "no" kerberos5/lib/libgssapi_krb5__L: lib/libgssapi__L kerberos5/lib/libkrb5__L \ kerberos5/lib/libhx509__L kerberos5/lib/libasn1__L lib/libcom_err__L \ lib/libmd__L kerberos5/lib/libroken__L secure/lib/libcrypto__L \ lib/libcrypt__L +.endif +.if ${MK_OPENSSH} != "no" +_secure_lib_libssh= secure/lib/libssh +secure/lib/libssh__L: lib/libz__L secure/lib/libcrypto__L lib/libcrypt__L +.if ${MK_KERBEROS_SUPPORT} != "no" secure/lib/libssh__L: lib/libgssapi__L kerberos5/lib/libgssapi_krb5__L .endif .endif @@ -1160,6 +1162,10 @@ _secure_lib= secure/lib .endif +.if ${MK_GSSAPI} != "no" +_lib_libgssapi= lib/libgssapi +.endif + .if ${MK_IPX} != "no" _lib_libipx= lib/libipx .endif @@ -1172,7 +1178,6 @@ _kerberos5_lib_libroken= kerberos5/lib/libroken _kerberos5_lib_libheimntlm= kerberos5/lib/libheimntlm _kerberos5_lib_libgssapi_krb5= kerberos5/lib/libgssapi_krb5 -_lib_libgssapi= lib/libgssapi .endif .if ${MK_NIS} != "no" @@ -1275,7 +1280,7 @@ fi; \ done # Remove catpages without corresponding manpages. - @3<&0; \ + @exec 3<&0; \ find ${DESTDIR}/usr/share/man/cat* ! -type d | \ sed -ep -e's:${DESTDIR}/usr/share/man/cat:${DESTDIR}/usr/share/man/man:' | \ while read catpage; do \ ==== //depot/projects/hammer/ObsoleteFiles.inc#77 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.221 2010/01/13 19:03:48 ed Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.224 2010/01/22 23:19:48 delphij Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,18 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20100122: move BSDL bc/dc USD documents to /usr/share/doc/usd +OLD_FILES+=usr/share/doc/papers/bc.ascii.gz +OLD_FILES+=usr/share/doc/papers/dc.ascii.gz +# 20100120: replacing GNU bc/dc with BSDL versions +OLD_FILES+=usr/share/examples/bc/ckbook.b +OLD_FILES+=usr/share/examples/bc/pi.b +OLD_FILES+=usr/share/examples/bc/primes.b +OLD_FILES+=usr/share/examples/bc/twins.b +OLD_FILES+=usr/share/info/dc.info.gz +OLD_DIRS+=usr/share/examples/bc +# 20100114: removal of ttyslot(3) +OLD_FILES+=usr/share/man/man3/ttyslot.3.gz # 20100113: remove utmp.h, replace it by utmpx.h OLD_FILES+=usr/share/man/man3/login.3.gz OLD_FILES+=usr/share/man/man3/logout.3.gz ==== //depot/projects/hammer/UPDATING#142 (text+ko) ==== @@ -37,7 +37,9 @@ After the system has been upgraded, it is safe to remove the old log files (/var/run/utmp, /var/log/lastlog and /var/log/wtmp*), - assuming their contents is of no importance anymore. + assuming their contents is of no importance anymore. Old wtmp + databases can only be used by last(1) and ac(8) after they have + been converted to the new format using wtmpcvt(1). 20100108: Introduce the kernel thread "deadlock resolver" (which can be enabled @@ -1111,4 +1113,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.652 2010/01/13 19:25:03 ed Exp $ +$FreeBSD: src/UPDATING,v 1.653 2010/01/14 20:58:45 ed Exp $ ==== //depot/projects/hammer/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.40 2008/03/10 19:58:41 jhb Exp $ +.\" $FreeBSD: src/bin/cp/cp.1,v 1.41 2010/01/17 09:37:31 gavin Exp $ .\" -.Dd October 27, 2006 +.Dd January 17, 2010 .Dt CP 1 .Os .Sh NAME @@ -45,7 +45,7 @@ .Op Fl H | Fl L | Fl P .Oc .Op Fl f | i | n -.Op Fl alpv +.Op Fl alpvx .Ar source_file target_file .Nm .Oo @@ -53,7 +53,7 @@ .Op Fl H | Fl L | Fl P .Oc .Op Fl f | i | n -.Op Fl alpv +.Op Fl alpvx .Ar source_file ... target_directory .Sh DESCRIPTION In the first synopsis form, the @@ -183,6 +183,8 @@ Cause .Nm to be verbose, showing files as they are copied. +.It Fl x +File system mount points are not traversed. .El .Pp For each destination file that already exists, its contents are ==== //depot/projects/hammer/bin/cp/cp.c#16 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.60 2008/03/10 19:58:41 jhb Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.61 2010/01/17 09:37:31 gavin Exp $"); /* * Cp copies source files to target files. @@ -101,8 +101,9 @@ int Hflag, Lflag, Pflag, ch, fts_options, r, have_trailing_slash; char *target; + fts_options = FTS_NOCHDIR | FTS_PHYSICAL; Hflag = Lflag = Pflag = 0; - while ((ch = getopt(argc, argv, "HLPRafilnprv")) != -1) + while ((ch = getopt(argc, argv, "HLPRafilnprvx")) != -1) switch (ch) { case 'H': Hflag = 1; @@ -150,6 +151,9 @@ case 'v': vflag = 1; break; + case 'x': + fts_options |= FTS_XDEV; + break; default: usage(); break; @@ -160,7 +164,6 @@ if (argc < 2) usage(); - fts_options = FTS_NOCHDIR | FTS_PHYSICAL; if (Rflag && rflag) errx(1, "the -R and -r options may not be specified together"); if (rflag) ==== //depot/projects/hammer/bin/cp/utils.c#18 (text+ko) ==== @@ -33,7 +33,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.59 2009/09/02 08:08:57 trasz Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.60 2010/01/17 09:37:31 gavin Exp $"); #include <sys/types.h> #include <sys/acl.h> @@ -518,8 +518,8 @@ { (void)fprintf(stderr, "%s\n%s\n", -"usage: cp [-R [-H | -L | -P]] [-f | -i | -n] [-alpv] source_file target_file", -" cp [-R [-H | -L | -P]] [-f | -i | -n] [-alpv] source_file ... " +"usage: cp [-R [-H | -L | -P]] [-f | -i | -n] [-alpvx] source_file target_file", +" cp [-R [-H | -L | -P]] [-f | -i | -n] [-alpvx] source_file ... " "target_directory"); exit(EX_USAGE); } ==== //depot/projects/hammer/bin/date/date.1#16 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)date.1 8.3 (Berkeley) 4/28/95 >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201001252048.o0PKm74E019376>