PERFORCE change 176233 for review
Alexander Motin
mav at FreeBSD.org
Mon Mar 29 12:59:57 UTC 2010
http://p4web.freebsd.org/chv.cgi?CH=176233
Change 176233 by mav at mav_mavbook on 2010/03/29 12:59:49
IFC
Affected files ...
.. //depot/projects/scottl-camlock/src/MAINTAINERS#10 integrate
.. //depot/projects/scottl-camlock/src/Makefile.inc1#17 integrate
.. //depot/projects/scottl-camlock/src/ObsoleteFiles.inc#26 integrate
.. //depot/projects/scottl-camlock/src/bin/cp/utils.c#6 integrate
.. //depot/projects/scottl-camlock/src/bin/ls/cmp.c#2 integrate
.. //depot/projects/scottl-camlock/src/bin/rcp/rcp.c#3 integrate
.. //depot/projects/scottl-camlock/src/bin/test/test.c#3 integrate
.. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/zfs/zfs.8#3 integrate
.. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/zpool/zpool.8#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/bsnmp/gensnmpdef/gensnmpdef.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/bsnmp/snmpd/config.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/cpio/ABOUT-NLS#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/AUTHORS#2 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/COPYING#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/ChangeLog#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/FREEBSD-upgrade#2 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/INSTALL#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/NEWS#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/README#2 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/THANKS#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/TODO#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/doc/cpio.1#2 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/doc/cpio.texi#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/doc/version.texi#2 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/alloca_.h#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/argp-ba.c#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/argp-eexst.c#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/argp-fmtstream.c#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/argp-fmtstream.h#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/argp-fs-xinl.c#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/argp-help.c#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/argp-namefrob.h#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/argp-parse.c#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/argp-pin.c#2 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/argp-pv.c#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/argp-pvh.c#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/argp-xinl.c#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/argp.h#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/basename.c#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/dirname.c#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/dirname.h#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/error.c#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/error.h#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/exitfail.c#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/exitfail.h#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/fatal.c#2 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/full-write.c#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/full-write.h#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/getopt.c#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/getopt1.c#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/getopt_.h#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/getopt_int.h#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/gettext.h#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/hash.c#2 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/hash.h#2 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/intprops.h#2 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/inttostr.c#2 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/inttostr.h#2 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/mempcpy.c#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/paxerror.c#2 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/paxexit.c#2 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/paxlib.h#2 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/paxnames.c#2 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/quote.c#2 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/quote.h#2 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/quotearg.c#2 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/quotearg.h#2 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/rmt-command.h#2 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/rmt.h#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/rtapelib.c#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/safe-read.c#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/safe-read.h#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/safe-write.c#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/safe-write.h#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/savedir.c#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/savedir.h#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/strchrnul.c#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/stripslash.c#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/strndup.c#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/strnlen.c#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/system-ioctl.h#2 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/system.h#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/umaxtostr.c#2 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/unlocked-io.h#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/utimens.c#2 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/utimens.h#2 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/xalloc-die.c#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/xalloc.h#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/xmalloc.c#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/xstrndup.c#2 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/lib/xstrndup.h#2 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/src/copyin.c#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/src/copyout.c#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/src/copypass.c#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/src/cpio.h#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/src/cpiohdr.h#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/src/defer.c#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/src/defer.h#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/src/dstring.c#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/src/dstring.h#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/src/extern.h#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/src/filemode.c#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/src/filetypes.h#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/src/global.c#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/src/idcache.c#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/src/main.c#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/src/makepath.c#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/src/safe-stat.h#2 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/src/tar.c#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/src/tar.h#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/src/tarhdr.h#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/src/userspec.c#3 delete
.. //depot/projects/scottl-camlock/src/contrib/cpio/src/util.c#3 delete
.. //depot/projects/scottl-camlock/src/contrib/netcat/FREEBSD-upgrade#3 integrate
.. //depot/projects/scottl-camlock/src/contrib/netcat/FREEBSD-vendor#5 integrate
.. //depot/projects/scottl-camlock/src/contrib/netcat/nc.1#7 integrate
.. //depot/projects/scottl-camlock/src/contrib/netcat/netcat.c#6 integrate
.. //depot/projects/scottl-camlock/src/contrib/openpam/include/security/pam_appl.h#3 integrate
.. //depot/projects/scottl-camlock/src/contrib/tzdata/antarctica#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/tzdata/asia#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/tzdata/australasia#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/tzdata/zone.tab#2 integrate
.. //depot/projects/scottl-camlock/src/etc/defaults/periodic.conf#5 integrate
.. //depot/projects/scottl-camlock/src/gnu/usr.bin/Makefile#5 integrate
.. //depot/projects/scottl-camlock/src/gnu/usr.bin/cpio/Makefile#3 delete
.. //depot/projects/scottl-camlock/src/gnu/usr.bin/cpio/config.h#3 delete
.. //depot/projects/scottl-camlock/src/gnu/usr.bin/cpio/doc/Makefile#2 delete
.. //depot/projects/scottl-camlock/src/gnu/usr.bin/diff/context.c.diff#2 integrate
.. //depot/projects/scottl-camlock/src/gnu/usr.bin/diff/diff.c.diff#2 integrate
.. //depot/projects/scottl-camlock/src/gnu/usr.bin/gdb/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/gnu/usr.bin/gdb/Makefile.inc#2 integrate
.. //depot/projects/scottl-camlock/src/gnu/usr.bin/gdb/kgdb/trgt_ia64.c#3 integrate
.. //depot/projects/scottl-camlock/src/include/dlfcn.h#5 integrate
.. //depot/projects/scottl-camlock/src/lib/csu/i386-elf/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/gen/dlfcn.c#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/gen/dlopen.3#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/gen/opendir.c#6 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/posix1e/acl_to_text_nfs4.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/sparc64/fpu/fpu.c#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/sparc64/fpu/fpu_div.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/sparc64/fpu/fpu_explode.c#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/sparc64/fpu/fpu_extern.h#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/sparc64/fpu/fpu_implode.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/sys/mmap.2#6 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/sys/open.2#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/sys/stat.2#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libpmc/pmc.xscale.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libusbhid/data.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libusbhid/descr.c#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libusbhid/parse.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libusbhid/usage.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libusbhid/usbhid.h#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libusbhid/usbvar.h#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/ChangeLog#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/FAQ#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/README#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/Symbol.map#1 branch
.. //depot/projects/scottl-camlock/src/lib/libz/Versions.def#1 branch
.. //depot/projects/scottl-camlock/src/lib/libz/adler32.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/algorithm.txt#2 delete
.. //depot/projects/scottl-camlock/src/lib/libz/compress.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/contrib/README.contrib#1 branch
.. //depot/projects/scottl-camlock/src/lib/libz/contrib/asm686/README.686#1 branch
.. //depot/projects/scottl-camlock/src/lib/libz/contrib/asm686/match.S#1 branch
.. //depot/projects/scottl-camlock/src/lib/libz/contrib/gcc_gvmat64/gvmat64.S#1 branch
.. //depot/projects/scottl-camlock/src/lib/libz/crc32.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/deflate.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/deflate.h#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/doc/algorithm.txt#1 branch
.. //depot/projects/scottl-camlock/src/lib/libz/doc/rfc1950.txt#1 branch
.. //depot/projects/scottl-camlock/src/lib/libz/doc/rfc1951.txt#1 branch
.. //depot/projects/scottl-camlock/src/lib/libz/doc/rfc1952.txt#1 branch
.. //depot/projects/scottl-camlock/src/lib/libz/doc/txtvsbin.txt#1 branch
.. //depot/projects/scottl-camlock/src/lib/libz/example.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/gzclose.c#1 branch
.. //depot/projects/scottl-camlock/src/lib/libz/gzguts.h#1 branch
.. //depot/projects/scottl-camlock/src/lib/libz/gzio.c#2 delete
.. //depot/projects/scottl-camlock/src/lib/libz/gzlib.c#1 branch
.. //depot/projects/scottl-camlock/src/lib/libz/gzread.c#1 branch
.. //depot/projects/scottl-camlock/src/lib/libz/gzwrite.c#1 branch
.. //depot/projects/scottl-camlock/src/lib/libz/infback.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/inffast.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/inflate.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/inflate.h#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/inftrees.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/inftrees.h#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/minigzip.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/trees.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/uncompr.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/zconf.h#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/zlib.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/zlib.h#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/zutil.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/zutil.h#2 integrate
.. //depot/projects/scottl-camlock/src/libexec/ftpd/popen.c#2 integrate
.. //depot/projects/scottl-camlock/src/libexec/rtld-elf/rtld.c#11 integrate
.. //depot/projects/scottl-camlock/src/sbin/geom/class/multipath/geom_multipath.c#4 integrate
.. //depot/projects/scottl-camlock/src/sbin/hastd/primary.c#2 integrate
.. //depot/projects/scottl-camlock/src/sbin/ifconfig/ifieee80211.c#11 integrate
.. //depot/projects/scottl-camlock/src/sbin/ipfw/ipfw.8#10 integrate
.. //depot/projects/scottl-camlock/src/sbin/ipfw/ipfw2.c#7 integrate
.. //depot/projects/scottl-camlock/src/sbin/setkey/setkey.8#4 integrate
.. //depot/projects/scottl-camlock/src/share/man/man3/pthread_affinity_np.3#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/ath.4#5 integrate
.. //depot/projects/scottl-camlock/src/share/man/man5/src.conf.5#6 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/uio.9#3 integrate
.. //depot/projects/scottl-camlock/src/share/misc/bsd-family-tree#8 integrate
.. //depot/projects/scottl-camlock/src/share/mk/bsd.own.mk#6 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/machdep.c#35 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/mca.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/pmap.c#41 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/ia32/ia32_signal.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/include/specialreg.h#16 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux.h#14 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_sysvec.c#20 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/arm/machdep.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/arm/pmap.c#28 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/cambria_fled.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/i386/boot2/boot2.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/i386/gptboot/gptboot.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/i386/zfsboot/zfsboot.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32.h#9 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_misc.c#24 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/ia32/ia32_signal.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/linprocfs/linprocfs.c#29 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_file.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_ioctl.c#25 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_stats.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_stat.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/x86bios/x86bios.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/NOTES#53 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/files#68 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/kern.post.mk#16 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/kmod.mk#20 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/options#41 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#106 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-raid.c#19 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/bge/if_bge.c#40 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/bktr/ioctl_bt848.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/bktr/ioctl_meteor.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/fb/vesa.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/fb/vga.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/hwpmc/hwpmc_logging.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/isp/isp.c#25 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_freebsd.c#33 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_freebsd.h#24 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_library.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/isp/ispvar.h#16 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ixgbe/LICENSE#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ixgbe/ixgbe.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ixgbe/ixgbe.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ixgbe/ixgbe_82598.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ixgbe/ixgbe_82599.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ixgbe/ixgbe_api.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ixgbe/ixgbe_api.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ixgbe/ixgbe_common.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ixgbe/ixgbe_phy.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ixgbe/ixgbe_phy.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ixgbe/ixgbe_type.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ofw/ofw_standard.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ppc/ppc_pci.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/hda/hdac.c#26 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/dsp.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/syscons/scvgarndr.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ehci_pci.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ohci_pci.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/input/ukbd.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/quirk/usb_quirk.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_compat_linux.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usbdevs#46 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nfs/nfs_commonport.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nfsserver/nfs_nfsdport.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/geom/geom_dump.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/geom/geom_io.c#20 integrate
.. //depot/projects/scottl-camlock/src/sys/geom/multipath/g_multipath.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/machdep.c#33 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/mca.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/pmap.c#45 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/trap.c#23 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/ibcs2/ibcs2_stat.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/include/md_var.h#10 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/include/specialreg.h#19 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/linux/linux.h#16 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/linux/linux_sysvec.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/conf/GENERIC#24 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/ia32/ia32_signal.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/ia64/autoconf.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/ia64/clock.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/ia64/db_machdep.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/ia64/exception.S#10 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/ia64/highfp.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/ia64/interrupt.c#20 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/ia64/machdep.c#29 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/ia64/mp_machdep.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/ia64/nexus.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/ia64/pmap.c#24 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/ia64/sapic.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/ia64/trap.c#19 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/include/acpica_machdep.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/include/cpufunc.h#8 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/include/frame.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/include/intr.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/include/nexusvar.h#2 delete
.. //depot/projects/scottl-camlock/src/sys/ia64/include/pcb.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/include/pcpu.h#8 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/pci/pci_cfgreg.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/imgact_elf.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_exec.c#24 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_rwlock.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/sys_pipe.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/tty_pts.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/uipc_mqueue.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/uipc_sem.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/uipc_shm.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/vfs_lookup.c#23 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/vfs_syscalls.c#33 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/vfs_vnops.c#25 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/include/cpufunc.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/pm_machdep.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/support.S#4 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/tick.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/sibyte/sb_asm.S#6 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/sibyte/sb_scd.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/Makefile#47 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/dummynet/Makefile#6 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/ixgbe/Makefile#5 integrate
.. //depot/projects/scottl-camlock/src/sys/net/flowtable.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_media.h#14 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_vlan.c#29 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211.c#25 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_hostap.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_ht.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_var.h#21 integrate
.. //depot/projects/scottl-camlock/src/sys/netgraph/netflow/ng_netflow.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ip_input.c#30 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/dn_sched.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/dn_sched_prio.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_dn_io.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw_private.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw_sockopt.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw_table.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/test/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctp_indata.c#19 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctp_input.c#20 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctp_output.c#23 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctp_pcb.c#21 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctp_pcb.h#11 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctp_sysctl.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctp_uio.h#18 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctputil.c#22 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctputil.h#13 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/tcp_timer.c#23 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/nd6.c#30 integrate
.. //depot/projects/scottl-camlock/src/sys/netipsec/key.c#20 integrate
.. //depot/projects/scottl-camlock/src/sys/nfsserver/nfs_srvsubs.c#21 integrate
.. //depot/projects/scottl-camlock/src/sys/pc98/pc98/machdep.c#20 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/aim/machdep.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/aim/mmu_oea64.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/aim/nexus.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/aim/ofw_machdep.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/booke/interrupt.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/booke/machdep.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/booke/trap_subr.S#4 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/mpc85xx/ocpbus.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/mpc85xx/ocpbus.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/mpc85xx/pci_ocp.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/ofw/ofw_real.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/ofw/ofw_syscons.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/powermac/cuda.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/powermac/cudavar.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/powermac/pmu.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/powermac/smu.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/cpu.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/rpc/svc.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/include/wstate.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/exception.S#8 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/locore.S#5 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/machdep.c#24 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/pmap.c#23 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/support.S#6 integrate
.. //depot/projects/scottl-camlock/src/sys/sun4v/sun4v/machdep.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/_timespec.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/imgact.h#9 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/param.h#42 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/stat.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/sysent.h#13 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/timespec.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/uma_int.h#9 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/vm_mmap.c#20 integrate
.. //depot/projects/scottl-camlock/src/tools/build/mk/OptionalObsoleteFiles.inc#11 integrate
.. //depot/projects/scottl-camlock/src/tools/build/options/WITH_GNU_CPIO#2 delete
.. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/ncal/regress.sh#2 integrate
.. //depot/projects/scottl-camlock/src/tools/tools/nanobsd/Files/root/updatep1#2 integrate
.. //depot/projects/scottl-camlock/src/tools/tools/nanobsd/Files/root/updatep2#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/biff/biff.1#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/calendar/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/calendar/calendar.1#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/calendar/calendar.c#4 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/calendar/calendar.h#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/calendar/calendars/calendar.dutch#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/calendar/dates.c#1 branch
.. //depot/projects/scottl-camlock/src/usr.bin/calendar/day.c#4 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/calendar/events.c#1 branch
.. //depot/projects/scottl-camlock/src/usr.bin/calendar/io.c#4 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/calendar/locale.c#1 branch
.. //depot/projects/scottl-camlock/src/usr.bin/calendar/ostern.c#4 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/calendar/parsedata.c#1 branch
.. //depot/projects/scottl-camlock/src/usr.bin/calendar/paskha.c#4 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/calendar/pathnames.h#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/calendar/pom.c#1 branch
.. //depot/projects/scottl-camlock/src/usr.bin/calendar/sunpos.c#1 branch
.. //depot/projects/scottl-camlock/src/usr.bin/compress/compress.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/cpio/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/gzip/gzip.c#6 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/kdump/kdump.c#8 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/mail/util.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/minigzip/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/ncal/ncal.1#4 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/ncal/ncal.c#6 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/touch/touch.c#4 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/bsnmpd/modules/snmp_pf/BEGEMOT-PF-MIB.txt#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/bsnmpd/modules/snmp_pf/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c#5 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/bsnmpd/modules/snmp_pf/pf_tree.def#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/mtree/compare.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/mtree/create.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pmcstat/pmcpl_calltree.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pmcstat/pmcstat_log.c#6 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/sysinstall/sysinstall.8#5 integrate
Differences ...
==== //depot/projects/scottl-camlock/src/MAINTAINERS#10 (text+ko) ====
@@ -1,4 +1,4 @@
-$FreeBSD: src/MAINTAINERS,v 1.158 2010/03/20 11:05:11 gavin Exp $
+$FreeBSD: src/MAINTAINERS,v 1.160 2010/03/26 12:59:15 des Exp $
Please note that the content of this file is strictly advisory.
No locks listed here are valid. The only strict review requirements
@@ -36,8 +36,6 @@
cdboot jhb Pre-commit review requested.
pxeboot jhb Pre-commit review requested.
witness jhb Pre-commit review requested.
-twe aradford at amcc.com Pre-commit review requested
-twa aradford at amcc.com Pre-commit review requested
CAM gibbs,
ken Pre-commit review requested. send to scsi at freebsd.org
devstat(9) ken Pre-commit review requested.
@@ -59,15 +57,12 @@
fetch des Advance notification requested.
libpam des Pre-commit review requested.
openssh des Pre-commit review requested.
-pseudofs des Advance notification requested.
-procfs des Advance notification requested.
-linprocfs des Advance notification requested.
+pseudofs des Pre-commit review requested.
+procfs des Pre-commit review requested.
+linprocfs des Pre-commit review requested.
lpr gad Pre-commit review requested, particularly for
lpd/recvjob.c and lpd/printjob.c.
newsyslog(8) gad Heads-up appreciated. I'm going thru the PR's for it.
-pkill gad Heads-up appreciated.
-ps gad I am working on a number of changes to this. Would
- like advance notice of major changes planned to it.
cvs peter Heads-up appreciated, try not to break it.
nvi peter Try not to break it.
libz peter Try not to break it.
@@ -76,9 +71,6 @@
offer a pre-commit review for anything non-trivial.
ipfw ipfw Pre-commit review preferred. send to ipfw at freebsd.org
drm rnoland Just keep me informed of changes, try not to break it.
-libufs jmallett Willing to handle problems, help with work.
-fdc(4) joerg Just keep me informed of changes, try not to break it.
-sppp(4) joerg Just keep me informed of changes, try not to break it.
unifdef(1) fanf Pre-commit review requested.
ntp roberto Pre-commit review requested.
inetd dwmalone Recommends pre-commit review.
==== //depot/projects/scottl-camlock/src/Makefile.inc1#17 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile.inc1,v 1.641 2010/03/07 14:55:43 antoine Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.642 2010/03/24 18:40:57 delphij Exp $
#
# Make command line options:
# -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -283,6 +283,7 @@
VERSION="${VERSION}" \
MACHINE=i386 \
MACHINE_ARCH=i386 \
+ MACHINE_CPU="i686 mmx sse sse2" \
INSTALL="sh ${.CURDIR}/tools/install.sh" \
PATH=${TMPPATH} \
CC="${CC} ${LIB32FLAGS}" \
==== //depot/projects/scottl-camlock/src/ObsoleteFiles.inc#26 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.229 2010/03/14 10:18:58 ed Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.232 2010/03/27 03:17:39 marcel 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,19 @@
# The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
#
+# 20100326: [ia64] removed <machine/nexusvar.h>
+.if ${TARGET_ARCH} == "ia64"
+OLD_FILES+=usr/include/machine/nexusvar.h
+.endif
+# 20100326: gcpio removal
+OLD_FILES+=usr/bin/gcpio
+OLD_FILES+=usr/share/info/cpio.info.gz
+OLD_FILES+=usr/share/man/man1/gcpio.1.gz
+# 20100322: libz update
+OLD_LIBS+=lib/libz.so.5
+.if ${TARGET_ARCH} == "amd64"
+OLD_LIBS+=usr/lib32/libz.so.5
+.endif
# 20100314: removal of regexp.h
OLD_FILES+=usr/include/regexp.h
OLD_FILES+=usr/share/man/man3/regexp.3.gz
==== //depot/projects/scottl-camlock/src/bin/cp/utils.c#6 (text+ko) ====
@@ -33,7 +33,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.60 2010/01/17 09:37:31 gavin Exp $");
+__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.61 2010/03/28 13:16:08 ed Exp $");
#include <sys/types.h>
#include <sys/acl.h>
@@ -323,8 +323,8 @@
fs->st_mode &= S_ISUID | S_ISGID | S_ISVTX |
S_IRWXU | S_IRWXG | S_IRWXO;
- TIMESPEC_TO_TIMEVAL(&tv[0], &fs->st_atimespec);
- TIMESPEC_TO_TIMEVAL(&tv[1], &fs->st_mtimespec);
+ TIMESPEC_TO_TIMEVAL(&tv[0], &fs->st_atim);
+ TIMESPEC_TO_TIMEVAL(&tv[1], &fs->st_mtim);
if (islink ? lutimes(to.p_path, tv) : utimes(to.p_path, tv)) {
warn("%sutimes: %s", islink ? "l" : "", to.p_path);
rval = 1;
==== //depot/projects/scottl-camlock/src/bin/ls/cmp.c#2 (text+ko) ====
@@ -36,7 +36,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/ls/cmp.c,v 1.18 2006/03/24 16:38:02 jhb Exp $");
+__FBSDID("$FreeBSD: src/bin/ls/cmp.c,v 1.19 2010/03/28 13:16:08 ed Exp $");
#include <sys/types.h>
@@ -66,17 +66,17 @@
modcmp(const FTSENT *a, const FTSENT *b)
{
- if (b->fts_statp->st_mtimespec.tv_sec >
- a->fts_statp->st_mtimespec.tv_sec)
+ if (b->fts_statp->st_mtim.tv_sec >
+ a->fts_statp->st_mtim.tv_sec)
return (1);
- if (b->fts_statp->st_mtimespec.tv_sec <
- a->fts_statp->st_mtimespec.tv_sec)
+ if (b->fts_statp->st_mtim.tv_sec <
+ a->fts_statp->st_mtim.tv_sec)
return (-1);
- if (b->fts_statp->st_mtimespec.tv_nsec >
- a->fts_statp->st_mtimespec.tv_nsec)
+ if (b->fts_statp->st_mtim.tv_nsec >
+ a->fts_statp->st_mtim.tv_nsec)
return (1);
- if (b->fts_statp->st_mtimespec.tv_nsec <
- a->fts_statp->st_mtimespec.tv_nsec)
+ if (b->fts_statp->st_mtim.tv_nsec <
+ a->fts_statp->st_mtim.tv_nsec)
return (-1);
return (strcoll(a->fts_name, b->fts_name));
}
@@ -92,17 +92,17 @@
acccmp(const FTSENT *a, const FTSENT *b)
{
- if (b->fts_statp->st_atimespec.tv_sec >
- a->fts_statp->st_atimespec.tv_sec)
+ if (b->fts_statp->st_atim.tv_sec >
+ a->fts_statp->st_atim.tv_sec)
return (1);
- if (b->fts_statp->st_atimespec.tv_sec <
- a->fts_statp->st_atimespec.tv_sec)
+ if (b->fts_statp->st_atim.tv_sec <
+ a->fts_statp->st_atim.tv_sec)
return (-1);
- if (b->fts_statp->st_atimespec.tv_nsec >
- a->fts_statp->st_atimespec.tv_nsec)
+ if (b->fts_statp->st_atim.tv_nsec >
+ a->fts_statp->st_atim.tv_nsec)
return (1);
- if (b->fts_statp->st_atimespec.tv_nsec <
- a->fts_statp->st_atimespec.tv_nsec)
+ if (b->fts_statp->st_atim.tv_nsec <
+ a->fts_statp->st_atim.tv_nsec)
return (-1);
return (strcoll(a->fts_name, b->fts_name));
}
@@ -118,17 +118,17 @@
birthcmp(const FTSENT *a, const FTSENT *b)
{
- if (b->fts_statp->st_birthtimespec.tv_sec >
- a->fts_statp->st_birthtimespec.tv_sec)
+ if (b->fts_statp->st_birthtim.tv_sec >
+ a->fts_statp->st_birthtim.tv_sec)
return (1);
- if (b->fts_statp->st_birthtimespec.tv_sec <
- a->fts_statp->st_birthtimespec.tv_sec)
+ if (b->fts_statp->st_birthtim.tv_sec <
+ a->fts_statp->st_birthtim.tv_sec)
return (-1);
- if (b->fts_statp->st_birthtimespec.tv_nsec >
- a->fts_statp->st_birthtimespec.tv_nsec)
+ if (b->fts_statp->st_birthtim.tv_nsec >
+ a->fts_statp->st_birthtim.tv_nsec)
return (1);
- if (b->fts_statp->st_birthtimespec.tv_nsec <
- a->fts_statp->st_birthtimespec.tv_nsec)
+ if (b->fts_statp->st_birthtim.tv_nsec <
+ a->fts_statp->st_birthtim.tv_nsec)
return (-1);
return (strcoll(a->fts_name, b->fts_name));
}
@@ -144,17 +144,17 @@
statcmp(const FTSENT *a, const FTSENT *b)
{
- if (b->fts_statp->st_ctimespec.tv_sec >
- a->fts_statp->st_ctimespec.tv_sec)
+ if (b->fts_statp->st_ctim.tv_sec >
+ a->fts_statp->st_ctim.tv_sec)
return (1);
- if (b->fts_statp->st_ctimespec.tv_sec <
- a->fts_statp->st_ctimespec.tv_sec)
+ if (b->fts_statp->st_ctim.tv_sec <
+ a->fts_statp->st_ctim.tv_sec)
return (-1);
- if (b->fts_statp->st_ctimespec.tv_nsec >
- a->fts_statp->st_ctimespec.tv_nsec)
+ if (b->fts_statp->st_ctim.tv_nsec >
+ a->fts_statp->st_ctim.tv_nsec)
return (1);
- if (b->fts_statp->st_ctimespec.tv_nsec <
- a->fts_statp->st_ctimespec.tv_nsec)
+ if (b->fts_statp->st_ctim.tv_nsec <
+ a->fts_statp->st_ctim.tv_nsec)
return (-1);
return (strcoll(a->fts_name, b->fts_name));
}
==== //depot/projects/scottl-camlock/src/bin/rcp/rcp.c#3 (text+ko) ====
@@ -46,7 +46,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/rcp/rcp.c,v 1.47 2008/10/28 17:15:46 rdivacky Exp $");
+__FBSDID("$FreeBSD: src/bin/rcp/rcp.c,v 1.48 2010/03/28 13:16:08 ed Exp $");
#include <sys/param.h>
#include <sys/stat.h>
@@ -390,8 +390,8 @@
* versions expecting microseconds.
*/
(void)snprintf(buf, sizeof(buf), "T%ld 0 %ld 0\n",
- (long)stb.st_mtimespec.tv_sec,
- (long)stb.st_atimespec.tv_sec);
+ (long)stb.st_mtim.tv_sec,
+ (long)stb.st_atim.tv_sec);
(void)write(rem, buf, strlen(buf));
if (response() < 0)
goto next;
@@ -454,8 +454,8 @@
last++;
if (pflag) {
(void)snprintf(path, sizeof(path), "T%ld 0 %ld 0\n",
- (long)statp->st_mtimespec.tv_sec,
- (long)statp->st_atimespec.tv_sec);
+ (long)statp->st_mtim.tv_sec,
+ (long)statp->st_atim.tv_sec);
(void)write(rem, path, strlen(path));
if (response() < 0) {
closedir(dirp);
==== //depot/projects/scottl-camlock/src/bin/test/test.c#3 (text+ko) ====
@@ -11,7 +11,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/test/test.c,v 1.54 2009/05/26 22:33:10 jilles Exp $");
+__FBSDID("$FreeBSD: src/bin/test/test.c,v 1.55 2010/03/28 13:16:08 ed Exp $");
#include <sys/types.h>
#include <sys/stat.h>
@@ -572,12 +572,12 @@
if (stat(f1, &b1) != 0 || stat(f2, &b2) != 0)
return 0;
- if (b1.st_mtimespec.tv_sec > b2.st_mtimespec.tv_sec)
+ if (b1.st_mtim.tv_sec > b2.st_mtim.tv_sec)
return 1;
- if (b1.st_mtimespec.tv_sec < b2.st_mtimespec.tv_sec)
+ if (b1.st_mtim.tv_sec < b2.st_mtim.tv_sec)
return 0;
- return (b1.st_mtimespec.tv_nsec > b2.st_mtimespec.tv_nsec);
+ return (b1.st_mtim.tv_nsec > b2.st_mtim.tv_nsec);
}
static int
==== //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/zfs/zfs.8#3 (text+ko) ====
@@ -1,24 +1,9 @@
'\" te
-.\" CDDL HEADER START
-.\"
-.\" The contents of this file are subject to the terms of the
-.\" Common Development and Distribution License (the "License").
-.\" You may not use this file except in compliance with the License.
-.\"
-.\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-.\" or http://www.opensolaris.org/os/licensing.
-.\" See the License for the specific language governing permissions
-.\" and limitations under the License.
-.\"
-.\" When distributing Covered Code, include this CDDL HEADER in each
-.\" file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-.\" If applicable, add the following below this CDDL HEADER, with the
-.\" fields enclosed by brackets "[]" replaced with your own identifying
-.\" information: Portions Copyright [yyyy] [name of copyright owner]
-.\"
-.\" CDDL HEADER END
-.\" Copyright (c) 2007 Sun Microsystems, Inc. All Rights Reserved.
-.TH zfs 1M "8 Apr 2008" "SunOS 5.11" "System Administration Commands"
+.\" Copyright (c) 2009 Sun Microsystems, Inc. All Rights Reserved.
+.\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License.
+.\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing. See the License for the specific language governing permissions and limitations under the License.
+.\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
+.TH zfs 1M "14 Feb 2009" "SunOS 5.11" "System Administration Commands"
.SH NAME
zfs \- configures ZFS file systems
.SH SYNOPSIS
@@ -44,7 +29,8 @@
.LP
.nf
-\fBzfs\fR \fBsnapshot\fR [\fB-r\fR] \fIfilesystem at snapname\fR|\fIvolume at snapname\fR
+\fBzfs\fR \fBsnapshot\fR [\fB-r\fR] [\fB-o\fR \fIproperty\fR=\fIvalue\fR]...
+ \fIfilesystem at snapname\fR|\fIvolume at snapname\fR
.fi
.LP
@@ -54,7 +40,7 @@
.LP
.nf
-\fBzfs\fR \fBclone\fR [\fB-p\fR] \fIsnapshot\fR \fIfilesystem\fR|\fIvolume\fR
+\fBzfs\fR \fBclone\fR [\fB-p\fR] [\fB-o\fR \fIproperty\fR=\fIvalue\fR] ... \fIsnapshot\fR \fIfilesystem\fR|\fIvolume\fR
.fi
.LP
@@ -65,7 +51,7 @@
.LP
.nf
\fBzfs\fR \fBrename\fR \fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR
- \fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR
+ \fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR
.fi
.LP
@@ -81,23 +67,23 @@
.LP
.nf
\fBzfs\fR \fBlist\fR [\fB-rH\fR] [\fB-o\fR \fIproperty\fR[,...]] [\fB-t\fR \fItype\fR[,...]]
- [\fB-s\fR \fIproperty\fR] ... [\fB-S\fR \fIproperty\fR ... [\fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR] ...
+ [\fB-s\fR \fIproperty\fR] ... [\fB-S\fR \fIproperty\fR] ... [\fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR] ...
.fi
.LP
.nf
-\fBzfs\fR \fBset\fR \fIproperty\fR=\fIvalue\fR \fIfilesystem\fR|\fIvolume\fR ...
+\fBzfs\fR \fBset\fR \fIproperty\fR=\fIvalue\fR \fIfilesystem\fR|\fIvolume\fR|snapshot ...
.fi
.LP
.nf
\fBzfs\fR \fBget\fR [\fB-rHp\fR] [\fB-o\fR \fIfield\fR[,...]] [\fB-s\fR \fIsource\fR[,...]] "\fIall\fR" | \fIproperty\fR[,...]
- \fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR ...
+ \fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR ...
.fi
.LP
.nf
-\fBzfs\fR \fBinherit\fR [\fB-r\fR] \fIproperty\fR \fIfilesystem\fR|\fIvolume\fR ...
+\fBzfs\fR \fBinherit\fR [\fB-r\fR] \fIproperty\fR \fIfilesystem\fR|\fIvolume|snapshot\fR ...
.fi
.LP
@@ -132,12 +118,12 @@
.LP
.nf
-\fBzfs\fR \fBunshare\fR \fB-a\fR \fIfilesystem\fR|\fImountpoint\fR
+\fBzfs\fR \fBunshare\fR \fB-a\fR \fIfilesystem\fR|\fImountpoint\fR
.fi
.LP
.nf
-\fBzfs\fR \fBsend\fR [\fB-vR\fR] [\fB-\fR[\fB-iI\fR] \fIsnapshot\fR] \fIsnapshot\fR
+\fBzfs\fR \fBsend\fR [\fB-vR\fR] [\fB-\fR[\fBiI\fR] \fIsnapshot\fR] \fIsnapshot\fR
.fi
.LP
@@ -153,7 +139,7 @@
.LP
.nf
\fBzfs\fR \fBallow\fR [\fB-ldug\fR] "\fIeveryone\fR"|\fIuser\fR|\fIgroup\fR[,...] \fIperm\fR|\fI at setname\fR[,...]
- \fIfilesystem\fR|\fIvolume\fR
+ \fIfilesystem\fR|\fIvolume\fR
.fi
.LP
@@ -174,7 +160,7 @@
.LP
.nf
\fBzfs\fR \fBunallow\fR [\fB-rldug\fR] "\fIeveryone\fR"|\fIuser\fR|\fIgroup\fR[,...] [\fIperm\fR|@\fIsetname\fR[,... ]]
- \fIfilesystem\fR|\fIvolume\fR
+ \fIfilesystem\fR|\fIvolume\fR
.fi
.LP
@@ -192,20 +178,10 @@
\fBzfs\fR \fBunallow\fR [\fB-r\fR] \fB-s\fR @setname [\fIperm\fR|@\fIsetname\fR[,... ]] \fIfilesystem\fR|\fIvolume\fR
.fi
-.LP
-.nf
-\fBzfs\fR \fBjail\fR \fBjailid\fR \fB\fIfilesystem\fR\fR
-.fi
-.LP
-.nf
-\fBzfs\fR \fBunjail\fR \fBjailid\fR \fB\fIfilesystem\fR\fR
-.fi
-
.SH DESCRIPTION
.sp
.LP
-The \fBzfs\fR command configures \fBZFS\fR datasets within a \fBZFS\fR storage pool, as described in \fBzpool\fR(1M). A
-dataset is identified by a unique path within the \fBZFS\fR namespace. For example:
+The \fBzfs\fR command configures \fBZFS\fR datasets within a \fBZFS\fR storage pool, as described in \fBzpool\fR(1M). A dataset is identified by a unique path within the \fBZFS\fR namespace. For example:
.sp
.in +2
.nf
@@ -226,9 +202,9 @@
.na
\fB\fIfile system\fR\fR
.ad
-.RS 15n
-.rt
-A standard \fBPOSIX\fR file system. \fBZFS\fR file systems can be mounted within the standard file system namespace and behave like any other file system.
+.sp .6
+.RS 4n
+A \fBZFS\fR dataset of type "filesystem" that can be mounted within the standard system namespace and behaves like other file systems. While \fBZFS\fR file systems are designed to be \fBPOSIX\fR compliant, known issues exist that prevent compliance in some cases. Applications that depend on standards conformance might fail due to nonstandard behavior when checking file system free space.
.RE
.sp
@@ -237,8 +213,8 @@
.na
\fB\fIvolume\fR\fR
.ad
-.RS 15n
-.rt
+.sp .6
+.RS 4n
A logical volume exported as a raw or block device. This type of dataset should only be used under special circumstances. File systems are typically used in most environments. Volumes cannot be used in a non-global zone.
.RE
@@ -248,8 +224,8 @@
.na
\fB\fIsnapshot\fR\fR
.ad
-.RS 15n
-.rt
+.sp .6
+.RS 4n
A read-only version of a file system or volume at a given point in time. It is specified as \fIfilesystem at name\fR or \fIvolume at name\fR.
.RE
@@ -272,20 +248,17 @@
Snapshots can have arbitrary names. Snapshots of volumes can be cloned or rolled back, but cannot be accessed independently.
.sp
.LP
-File system snapshots can be accessed under the ".zfs/snapshot" directory in the root of the file system. Snapshots are automatically mounted on demand and may be unmounted at regular intervals. The visibility of the ".zfs" directory can be controlled by the "snapdir"
-property.
+File system snapshots can be accessed under the ".zfs/snapshot" directory in the root of the file system. Snapshots are automatically mounted on demand and may be unmounted at regular intervals. The visibility of the ".zfs" directory can be controlled by the "snapdir" property.
.SS "Clones"
.sp
.LP
A clone is a writable volume or file system whose initial contents are the same as another dataset. As with snapshots, creating a clone is nearly instantaneous, and initially consumes no additional space.
.sp
.LP
-Clones can only be created from a snapshot. When a snapshot is cloned, it creates an implicit dependency between the parent and child. Even though the clone is created somewhere else in the dataset hierarchy, the original snapshot cannot be destroyed as long as a clone exists. The "origin"
-property exposes this dependency, and the \fBdestroy\fR command lists any such dependencies, if they exist.
+Clones can only be created from a snapshot. When a snapshot is cloned, it creates an implicit dependency between the parent and child. Even though the clone is created somewhere else in the dataset hierarchy, the original snapshot cannot be destroyed as long as a clone exists. The "origin" property exposes this dependency, and the \fBdestroy\fR command lists any such dependencies, if they exist.
.sp
.LP
-The clone parent-child dependency relationship can be reversed by using the "\fBpromote\fR" subcommand. This causes the "origin" file system to become a clone of the specified file system, which makes it possible to destroy the file system that the clone
-was created from.
+The clone parent-child dependency relationship can be reversed by using the "\fBpromote\fR" subcommand. This causes the "origin" file system to become a clone of the specified file system, which makes it possible to destroy the file system that the clone was created from.
.SS "Mount Points"
.sp
.LP
@@ -301,8 +274,7 @@
A file system mountpoint property of "none" prevents the file system from being mounted.
.sp
.LP
-If needed, \fBZFS\fR file systems can also be managed with traditional tools (\fBmount\fR, \fBumount\fR, \fB/etc/vfstab\fR). If a file system's mount point is set to "legacy", \fBZFS\fR makes no attempt to manage
-the file system, and the administrator is responsible for mounting and unmounting the file system.
+If needed, \fBZFS\fR file systems can also be managed with traditional tools (\fBmount\fR, \fBumount\fR, \fB/etc/vfstab\fR). If a file system's mount point is set to "legacy", \fBZFS\fR makes no attempt to manage the file system, and the administrator is responsible for mounting and unmounting the file system.
.SS "Zones"
.sp
.LP
@@ -312,8 +284,7 @@
The physical properties of an added file system are controlled by the global administrator. However, the zone administrator can create, modify, or destroy files within the added file system, depending on how the file system is mounted.
.sp
.LP
-A dataset can also be delegated to a non-global zone by using zonecfg's "\fBadd dataset\fR" subcommand. You cannot delegate a dataset to one zone and the children of the same dataset to another zone. The zone administrator can change properties of the dataset or
-any of its children. However, the "quota" property is controlled by the global administrator.
+A dataset can also be delegated to a non-global zone by using zonecfg's "\fBadd dataset\fR" subcommand. You cannot delegate a dataset to one zone and the children of the same dataset to another zone. The zone administrator can change properties of the dataset or any of its children. However, the "quota" property is controlled by the global administrator.
.sp
.LP
A \fBZFS\fR volume can be added as a device to a non-global zone by using zonecfg's "\fBadd device\fR" subcommand. However, its physical properties can only be modified by the global administrator.
@@ -329,15 +300,13 @@
.SS "Native Properties"
.sp
.LP
-Properties are divided into two types, native properties and user defined properties. Native properties either export internal statistics or control \fBZFS\fR behavior. In addition, native properties are either editable or read-only. User properties have no effect on \fBZFS\fR behavior,
-but you can use them to annotate datasets in a way that is meaningful in your environment. For more information about user properties, see the "User Properties" section.
+Properties are divided into two types, native properties and user defined properties. Native properties either export internal statistics or control \fBZFS\fR behavior. In addition, native properties are either editable or read-only. User properties have no effect on \fBZFS\fR behavior, but you can use them to annotate datasets in a way that is meaningful in your environment. For more information about user properties, see the "User Properties" section.
.sp
.LP
-Every dataset has a set of properties that export statistics about the dataset as well as control various behavior. Properties are inherited from the parent unless overridden by the child. Snapshot properties can not be edited; they always inherit their inheritable properties. Properties
-that are not applicable to snapshots are not displayed.
+Every dataset has a set of properties that export statistics about the dataset as well as control various behavior. Properties are inherited from the parent unless overridden by the child. Some properties only apply to certain types of datasets (file systems, volumes or snapshots).
.sp
.LP
-The values of numeric properties can be specified using the following human-readable suffixes (for example, "k", "KB", "M", "Gb", etc, up to Z for zettabyte). The following are all valid (and equal) specifications:
+The values of numeric properties can be specified using human-readable suffixes (for example, "k", "KB", "M", "Gb", etc, up to Z for zettabyte). The following are all valid (and equal) specifications:
.sp
.in +2
.nf
@@ -360,8 +329,7 @@
.ad
.sp .6
.RS 4n
-The amount of space available to the dataset and all its children, assuming that there is no other activity in the pool. Because space is shared within a pool, availability can be limited by any number of factors, including physical pool size, quotas, reservations, or other datasets
-within the pool.
+The amount of space available to the dataset and all its children, assuming that there is no other activity in the pool. Because space is shared within a pool, availability can be limited by any number of factors, including physical pool size, quotas, reservations, or other datasets within the pool.
.sp
This property can also be referred to by its shortened column name, "avail".
.RE
@@ -418,8 +386,7 @@
.ad
.sp .6
.RS 4n
-The amount of data that is accessible by this dataset, which may or may not be shared with other datasets in the pool. When a snapshot or clone is created, it initially references the same amount of space as the file system or snapshot it was created from, since its contents are
-identical.
+The amount of data that is accessible by this dataset, which may or may not be shared with other datasets in the pool. When a snapshot or clone is created, it initially references the same amount of space as the file system or snapshot it was created from, since its contents are identical.
.sp
This property can also be referred to by its shortened column name, "refer".
.RE
@@ -432,7 +399,7 @@
.ad
.sp .6
.RS 4n
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list