svn commit: r225905 - in projects/zfsd/head: . bin/ls bin/ps cddl/contrib/opensolaris/lib/libzfs/common contrib/llvm contrib/llvm/lib/Support contrib/llvm/tools/clang contrib/openresolv contrib/smb...

Alexander Motin mav at FreeBSD.org
Sat Oct 1 16:08:04 UTC 2011 

Author: mav
Date: Sat Oct  1 16:08:03 2011
New Revision: 225905
URL: http://svn.freebsd.org/changeset/base/225905

Log:
  MFC

Added:
  projects/zfsd/head/contrib/llvm/LICENSE.TXT
     - copied unchanged from r225904, head/contrib/llvm/LICENSE.TXT
  projects/zfsd/head/contrib/llvm/lib/Support/COPYRIGHT.regex
     - copied unchanged from r225904, head/contrib/llvm/lib/Support/COPYRIGHT.regex
  projects/zfsd/head/contrib/llvm/tools/clang/LICENSE.TXT
     - copied unchanged from r225904, head/contrib/llvm/tools/clang/LICENSE.TXT
  projects/zfsd/head/share/doc/llvm/
     - copied from r225904, head/share/doc/llvm/
  projects/zfsd/head/share/man/man4/mod_cc.4
     - copied unchanged from r225904, head/share/man/man4/mod_cc.4
  projects/zfsd/head/share/man/man9/mod_cc.9
     - copied unchanged from r225904, head/share/man/man9/mod_cc.9
  projects/zfsd/head/sys/kern/subr_syscall.c
     - copied unchanged from r225904, head/sys/kern/subr_syscall.c
  projects/zfsd/head/tools/tools/zfsboottest/
     - copied from r225904, head/tools/tools/zfsboottest/
Deleted:
  projects/zfsd/head/share/man/man4/cc.4
  projects/zfsd/head/share/man/man9/cc.9
  projects/zfsd/head/sys/boot/zfs/zfstest.c
Modified:
  projects/zfsd/head/Makefile.inc1
  projects/zfsd/head/ObsoleteFiles.inc
  projects/zfsd/head/UPDATING
  projects/zfsd/head/bin/ls/ls.1
  projects/zfsd/head/bin/ls/ls.c
  projects/zfsd/head/bin/ls/ls.h
  projects/zfsd/head/bin/ls/print.c
  projects/zfsd/head/bin/ps/extern.h
  projects/zfsd/head/bin/ps/keyword.c
  projects/zfsd/head/bin/ps/print.c
  projects/zfsd/head/bin/ps/ps.c
  projects/zfsd/head/bin/ps/ps.h
  projects/zfsd/head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c
  projects/zfsd/head/contrib/openresolv/dnsmasq.in
  projects/zfsd/head/contrib/openresolv/libc.in
  projects/zfsd/head/contrib/openresolv/named.in
  projects/zfsd/head/contrib/openresolv/pdnsd.in
  projects/zfsd/head/contrib/openresolv/resolvconf.in
  projects/zfsd/head/contrib/openresolv/unbound.in
  projects/zfsd/head/contrib/smbfs/mount_smbfs/mount_smbfs.8
  projects/zfsd/head/contrib/tzcode/stdtime/localtime.c
  projects/zfsd/head/crypto/openssh/auth-pam.c   (contents, props changed)
  projects/zfsd/head/crypto/openssh/ssh_namespace.h
  projects/zfsd/head/crypto/openssl/ssl/s3_lib.c
  projects/zfsd/head/crypto/openssl/ssl/s3_srvr.c
  projects/zfsd/head/etc/defaults/devfs.rules
  projects/zfsd/head/etc/defaults/rc.conf
  projects/zfsd/head/etc/devd.conf
  projects/zfsd/head/etc/mtree/BSD.include.dist
  projects/zfsd/head/etc/mtree/BSD.usr.dist
  projects/zfsd/head/etc/network.subr
  projects/zfsd/head/etc/pf.os
  projects/zfsd/head/etc/rc.d/NETWORKING
  projects/zfsd/head/etc/rc.d/bridge
  projects/zfsd/head/etc/rc.d/netoptions
  projects/zfsd/head/etc/rc.d/resolv
  projects/zfsd/head/gnu/usr.bin/groff/tmac/mdoc.local
  projects/zfsd/head/include/Makefile
  projects/zfsd/head/include/iso646.h
  projects/zfsd/head/kerberos5/lib/libasn1/Makefile
  projects/zfsd/head/kerberos5/lib/libgssapi_krb5/Makefile
  projects/zfsd/head/kerberos5/lib/libgssapi_ntlm/Makefile
  projects/zfsd/head/kerberos5/lib/libgssapi_spnego/Makefile
  projects/zfsd/head/kerberos5/lib/libhdb/Makefile
  projects/zfsd/head/kerberos5/lib/libheimntlm/Makefile
  projects/zfsd/head/kerberos5/lib/libhx509/Makefile
  projects/zfsd/head/kerberos5/lib/libkadm5clnt/Makefile
  projects/zfsd/head/kerberos5/lib/libkadm5srv/Makefile
  projects/zfsd/head/kerberos5/lib/libkafs5/Makefile
  projects/zfsd/head/kerberos5/lib/libkrb5/Makefile
  projects/zfsd/head/kerberos5/lib/libroken/Makefile
  projects/zfsd/head/lib/libarchive/archive_read_support_format_cpio.c
  projects/zfsd/head/lib/libarchive/archive_write_set_format_cpio.c
  projects/zfsd/head/lib/libc/gen/ctermid.3
  projects/zfsd/head/lib/libc/gen/ctermid.c
  projects/zfsd/head/lib/libc/gen/devname.c
  projects/zfsd/head/lib/libc/iconv/citrus_none.c
  projects/zfsd/head/lib/libc/locale/isspace.3
  projects/zfsd/head/lib/libfetch/common.c
  projects/zfsd/head/lib/libfetch/common.h
  projects/zfsd/head/lib/libfetch/fetch.3
  projects/zfsd/head/lib/libfetch/fetch.c
  projects/zfsd/head/lib/libfetch/fetch.h
  projects/zfsd/head/lib/libfetch/file.c
  projects/zfsd/head/lib/libfetch/ftp.c
  projects/zfsd/head/lib/libfetch/http.c
  projects/zfsd/head/lib/libusb/Makefile
  projects/zfsd/head/lib/libusb/libusb.3
  projects/zfsd/head/lib/libusb/libusb.h
  projects/zfsd/head/lib/libusb/libusb10.c
  projects/zfsd/head/lib/libusb/libusb20.3
  projects/zfsd/head/lib/libusb/libusb20.c
  projects/zfsd/head/lib/libusb/libusb20.h
  projects/zfsd/head/lib/libusbhid/data.c
  projects/zfsd/head/lib/libusbhid/parse.c
  projects/zfsd/head/lib/libusbhid/usbhid.3
  projects/zfsd/head/lib/libusbhid/usbhid.h
  projects/zfsd/head/libexec/rtld-elf/map_object.c
  projects/zfsd/head/libexec/rtld-elf/rtld.c
  projects/zfsd/head/release/Makefile.sysinstall
  projects/zfsd/head/release/rc.local
  projects/zfsd/head/sbin/fsdb/fsdbutil.c
  projects/zfsd/head/sbin/geom/class/part/geom_part.c
  projects/zfsd/head/sbin/hastctl/hastctl.c
  projects/zfsd/head/sbin/hastd/activemap.c
  projects/zfsd/head/sbin/hastd/control.c
  projects/zfsd/head/sbin/hastd/ebuf.c
  projects/zfsd/head/sbin/hastd/event.c
  projects/zfsd/head/sbin/hastd/hast.conf.5
  projects/zfsd/head/sbin/hastd/hast.h
  projects/zfsd/head/sbin/hastd/hast_proto.c
  projects/zfsd/head/sbin/hastd/hastd.c
  projects/zfsd/head/sbin/hastd/hooks.c
  projects/zfsd/head/sbin/hastd/metadata.c
  projects/zfsd/head/sbin/hastd/nv.c
  projects/zfsd/head/sbin/hastd/parse.y
  projects/zfsd/head/sbin/hastd/pjdlog.c
  projects/zfsd/head/sbin/hastd/primary.c
  projects/zfsd/head/sbin/hastd/proto_tcp.c
  projects/zfsd/head/sbin/hastd/rangelock.c
  projects/zfsd/head/sbin/hastd/secondary.c
  projects/zfsd/head/sbin/hastd/subr.c
  projects/zfsd/head/sbin/hastd/synch.h
  projects/zfsd/head/sbin/hastd/token.l
  projects/zfsd/head/sbin/ifconfig/ifconfig.8
  projects/zfsd/head/sbin/mdmfs/mdmfs.c
  projects/zfsd/head/share/doc/Makefile
  projects/zfsd/head/share/examples/cvsup/stable-supfile
  projects/zfsd/head/share/man/man4/Makefile
  projects/zfsd/head/share/man/man4/cc_chd.4
  projects/zfsd/head/share/man/man4/cc_cubic.4
  projects/zfsd/head/share/man/man4/cc_hd.4
  projects/zfsd/head/share/man/man4/cc_htcp.4
  projects/zfsd/head/share/man/man4/cc_newreno.4
  projects/zfsd/head/share/man/man4/cc_vegas.4
  projects/zfsd/head/share/man/man4/h_ertt.4
  projects/zfsd/head/share/man/man4/smp.4
  projects/zfsd/head/share/man/man4/tcp.4
  projects/zfsd/head/share/man/man5/rc.conf.5
  projects/zfsd/head/share/man/man7/build.7
  projects/zfsd/head/share/man/man9/Makefile
  projects/zfsd/head/share/man/man9/ifnet.9
  projects/zfsd/head/share/man/man9/taskqueue.9
  projects/zfsd/head/share/misc/committers-ports.dot
  projects/zfsd/head/share/misc/committers-src.dot
  projects/zfsd/head/share/syscons/keymaps/INDEX.keymaps
  projects/zfsd/head/sys/amd64/amd64/exception.S
  projects/zfsd/head/sys/amd64/amd64/genassym.c
  projects/zfsd/head/sys/amd64/amd64/machdep.c
  projects/zfsd/head/sys/amd64/amd64/trap.c
  projects/zfsd/head/sys/amd64/conf/GENERIC
  projects/zfsd/head/sys/amd64/ia32/ia32_syscall.c
  projects/zfsd/head/sys/amd64/include/md_var.h
  projects/zfsd/head/sys/amd64/linux32/linux32_machdep.c
  projects/zfsd/head/sys/amd64/linux32/linux32_sysent.c
  projects/zfsd/head/sys/arm/arm/machdep.c
  projects/zfsd/head/sys/arm/at91/at91_mci.c
  projects/zfsd/head/sys/arm/at91/at91_pio.c
  projects/zfsd/head/sys/arm/at91/at91_rtc.c
  projects/zfsd/head/sys/arm/at91/at91_spi.c
  projects/zfsd/head/sys/arm/at91/at91_ssc.c
  projects/zfsd/head/sys/arm/at91/at91_twi.c
  projects/zfsd/head/sys/arm/at91/uart_dev_at91usart.c
  projects/zfsd/head/sys/arm/conf/HL200
  projects/zfsd/head/sys/arm/conf/HL201
  projects/zfsd/head/sys/arm/conf/KB920X
  projects/zfsd/head/sys/arm/conf/QILA9G20
  projects/zfsd/head/sys/arm/conf/SAM9G20EK
  projects/zfsd/head/sys/arm/econa/if_ece.c
  projects/zfsd/head/sys/boot/i386/gptboot/Makefile
  projects/zfsd/head/sys/boot/i386/gptzfsboot/Makefile
  projects/zfsd/head/sys/boot/i386/zfsboot/Makefile
  projects/zfsd/head/sys/cddl/boot/zfs/zfssubr.c
  projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
  projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/sparc/dtrace/fasttrap_isa.c
  projects/zfsd/head/sys/compat/freebsd32/freebsd32_ioctl.c
  projects/zfsd/head/sys/compat/freebsd32/freebsd32_misc.c
  projects/zfsd/head/sys/compat/freebsd32/freebsd32_proto.h
  projects/zfsd/head/sys/compat/freebsd32/freebsd32_syscall.h
  projects/zfsd/head/sys/compat/freebsd32/freebsd32_syscalls.c
  projects/zfsd/head/sys/compat/freebsd32/freebsd32_sysent.c
  projects/zfsd/head/sys/compat/freebsd32/freebsd32_util.h
  projects/zfsd/head/sys/compat/linux/linux_emul.c
  projects/zfsd/head/sys/compat/linux/linux_file.c
  projects/zfsd/head/sys/compat/linux/linux_ioctl.c
  projects/zfsd/head/sys/compat/linux/linux_ipc.c
  projects/zfsd/head/sys/compat/linux/linux_misc.c
  projects/zfsd/head/sys/compat/linux/linux_signal.c
  projects/zfsd/head/sys/compat/linux/linux_socket.c
  projects/zfsd/head/sys/compat/linux/linux_uid16.c
  projects/zfsd/head/sys/compat/svr4/svr4_fcntl.c
  projects/zfsd/head/sys/compat/svr4/svr4_filio.c
  projects/zfsd/head/sys/compat/svr4/svr4_ipc.c
  projects/zfsd/head/sys/compat/svr4/svr4_misc.c
  projects/zfsd/head/sys/compat/svr4/svr4_signal.c
  projects/zfsd/head/sys/compat/svr4/svr4_socket.c
  projects/zfsd/head/sys/compat/svr4/svr4_stat.c
  projects/zfsd/head/sys/compat/svr4/svr4_stream.c
  projects/zfsd/head/sys/compat/svr4/svr4_sysent.c
  projects/zfsd/head/sys/conf/NOTES
  projects/zfsd/head/sys/conf/newvers.sh
  projects/zfsd/head/sys/conf/options
  projects/zfsd/head/sys/dev/acpica/acpi.c
  projects/zfsd/head/sys/dev/ahci/ahci.c
  projects/zfsd/head/sys/dev/ath/ah_osdep.c
  projects/zfsd/head/sys/dev/ath/ath_hal/ah.c
  projects/zfsd/head/sys/dev/ath/ath_hal/ah.h
  projects/zfsd/head/sys/dev/ath/ath_hal/ah_internal.h
  projects/zfsd/head/sys/dev/ath/ath_hal/ah_regdomain.c
  projects/zfsd/head/sys/dev/ath/ath_hal/ar5210/ar5210.h
  projects/zfsd/head/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c
  projects/zfsd/head/sys/dev/ath/ath_hal/ar5210/ar5210_beacon.c
  projects/zfsd/head/sys/dev/ath/ath_hal/ar5211/ar5211.h
  projects/zfsd/head/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c
  projects/zfsd/head/sys/dev/ath/ath_hal/ar5211/ar5211_beacon.c
  projects/zfsd/head/sys/dev/ath/ath_hal/ar5212/ar5112.c
  projects/zfsd/head/sys/dev/ath/ath_hal/ar5212/ar5212.h
  projects/zfsd/head/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c
  projects/zfsd/head/sys/dev/ath/ath_hal/ar5212/ar5212_beacon.c
  projects/zfsd/head/sys/dev/ath/ath_hal/ar5212/ar5212_xmit.c
  projects/zfsd/head/sys/dev/ath/ath_hal/ar5312/ar5312_attach.c
  projects/zfsd/head/sys/dev/ath/ath_hal/ar5416/ar5416.h
  projects/zfsd/head/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c
  projects/zfsd/head/sys/dev/ath/ath_hal/ar5416/ar5416_beacon.c
  projects/zfsd/head/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c
  projects/zfsd/head/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c
  projects/zfsd/head/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c
  projects/zfsd/head/sys/dev/ath/ath_hal/ar9001/ar9130_attach.c
  projects/zfsd/head/sys/dev/ath/ath_hal/ar9001/ar9160_attach.c
  projects/zfsd/head/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c
  projects/zfsd/head/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c
  projects/zfsd/head/sys/dev/ath/ath_hal/ar9002/ar9287_attach.c
  projects/zfsd/head/sys/dev/ath/ath_rate/sample/sample.h
  projects/zfsd/head/sys/dev/ath/if_ath.c
  projects/zfsd/head/sys/dev/ath/if_athvar.h
  projects/zfsd/head/sys/dev/bktr/bktr_core.c
  projects/zfsd/head/sys/dev/bxe/if_bxe.c
  projects/zfsd/head/sys/dev/cardbus/cardbus_cis.c
  projects/zfsd/head/sys/dev/coretemp/coretemp.c
  projects/zfsd/head/sys/dev/e1000/if_lem.c
  projects/zfsd/head/sys/dev/hwpmc/hwpmc_logging.c
  projects/zfsd/head/sys/dev/hwpmc/hwpmc_mod.c
  projects/zfsd/head/sys/dev/iscsi/initiator/isc_soc.c
  projects/zfsd/head/sys/dev/iwn/if_iwn.c
  projects/zfsd/head/sys/dev/mfi/mfi.c
  projects/zfsd/head/sys/dev/mfi/mfivar.h
  projects/zfsd/head/sys/dev/puc/pucdata.c
  projects/zfsd/head/sys/dev/sound/midi/midi.c
  projects/zfsd/head/sys/dev/sound/pcm/dsp.c
  projects/zfsd/head/sys/dev/syscons/scmouse.c
  projects/zfsd/head/sys/dev/syscons/syscons.c
  projects/zfsd/head/sys/dev/usb/input/uhid.c
  projects/zfsd/head/sys/dev/usb/quirk/usb_quirk.c
  projects/zfsd/head/sys/dev/usb/usb_dev.c
  projects/zfsd/head/sys/dev/usb/usb_device.c
  projects/zfsd/head/sys/dev/usb/usb_dynamic.c
  projects/zfsd/head/sys/dev/usb/usb_dynamic.h
  projects/zfsd/head/sys/dev/usb/usb_msctest.c
  projects/zfsd/head/sys/dev/usb/usb_transfer.c
  projects/zfsd/head/sys/dev/usb/usbdevs
  projects/zfsd/head/sys/dev/usb/usbdi.h
  projects/zfsd/head/sys/dev/xen/blkfront/blkfront.c
  projects/zfsd/head/sys/dev/xen/blkfront/block.h
  projects/zfsd/head/sys/dev/xen/control/control.c
  projects/zfsd/head/sys/dev/xen/netfront/netfront.c
  projects/zfsd/head/sys/fs/nfsserver/nfs_nfsdport.c
  projects/zfsd/head/sys/fs/procfs/procfs_ctl.c
  projects/zfsd/head/sys/fs/procfs/procfs_ioctl.c
  projects/zfsd/head/sys/i386/conf/GENERIC
  projects/zfsd/head/sys/i386/i386/machdep.c
  projects/zfsd/head/sys/i386/i386/trap.c
  projects/zfsd/head/sys/i386/ibcs2/ibcs2_ioctl.c
  projects/zfsd/head/sys/i386/ibcs2/ibcs2_ipc.c
  projects/zfsd/head/sys/i386/ibcs2/ibcs2_isc_sysent.c
  projects/zfsd/head/sys/i386/ibcs2/ibcs2_misc.c
  projects/zfsd/head/sys/i386/ibcs2/ibcs2_other.c
  projects/zfsd/head/sys/i386/ibcs2/ibcs2_signal.c
  projects/zfsd/head/sys/i386/ibcs2/ibcs2_socksys.c
  projects/zfsd/head/sys/i386/ibcs2/ibcs2_sysent.c
  projects/zfsd/head/sys/i386/ibcs2/ibcs2_xenix.c
  projects/zfsd/head/sys/i386/ibcs2/ibcs2_xenix.h
  projects/zfsd/head/sys/i386/ibcs2/ibcs2_xenix_sysent.c
  projects/zfsd/head/sys/i386/linux/linux_machdep.c
  projects/zfsd/head/sys/i386/linux/linux_sysent.c
  projects/zfsd/head/sys/ia64/ia32/ia32_signal.c
  projects/zfsd/head/sys/ia64/ia32/ia32_trap.c
  projects/zfsd/head/sys/ia64/ia64/machdep.c
  projects/zfsd/head/sys/ia64/ia64/pmap.c
  projects/zfsd/head/sys/ia64/ia64/trap.c
  projects/zfsd/head/sys/kern/init_main.c
  projects/zfsd/head/sys/kern/init_sysent.c
  projects/zfsd/head/sys/kern/kern_acct.c
  projects/zfsd/head/sys/kern/kern_clock.c
  projects/zfsd/head/sys/kern/kern_context.c
  projects/zfsd/head/sys/kern/kern_cpuset.c
  projects/zfsd/head/sys/kern/kern_descrip.c
  projects/zfsd/head/sys/kern/kern_environment.c
  projects/zfsd/head/sys/kern/kern_event.c
  projects/zfsd/head/sys/kern/kern_exec.c
  projects/zfsd/head/sys/kern/kern_exit.c
  projects/zfsd/head/sys/kern/kern_fork.c
  projects/zfsd/head/sys/kern/kern_jail.c
  projects/zfsd/head/sys/kern/kern_ktrace.c
  projects/zfsd/head/sys/kern/kern_linker.c
  projects/zfsd/head/sys/kern/kern_loginclass.c
  projects/zfsd/head/sys/kern/kern_module.c
  projects/zfsd/head/sys/kern/kern_ntptime.c
  projects/zfsd/head/sys/kern/kern_proc.c
  projects/zfsd/head/sys/kern/kern_prot.c
  projects/zfsd/head/sys/kern/kern_rctl.c
  projects/zfsd/head/sys/kern/kern_resource.c
  projects/zfsd/head/sys/kern/kern_shutdown.c
  projects/zfsd/head/sys/kern/kern_sig.c
  projects/zfsd/head/sys/kern/kern_synch.c
  projects/zfsd/head/sys/kern/kern_sysctl.c
  projects/zfsd/head/sys/kern/kern_thr.c
  projects/zfsd/head/sys/kern/kern_time.c
  projects/zfsd/head/sys/kern/kern_umtx.c
  projects/zfsd/head/sys/kern/kern_uuid.c
  projects/zfsd/head/sys/kern/makesyscalls.sh
  projects/zfsd/head/sys/kern/p1003_1b.c
  projects/zfsd/head/sys/kern/subr_bus.c
  projects/zfsd/head/sys/kern/subr_kdb.c
  projects/zfsd/head/sys/kern/subr_prof.c
  projects/zfsd/head/sys/kern/subr_taskqueue.c
  projects/zfsd/head/sys/kern/subr_trap.c
  projects/zfsd/head/sys/kern/sys_capability.c
  projects/zfsd/head/sys/kern/sys_generic.c
  projects/zfsd/head/sys/kern/sys_pipe.c
  projects/zfsd/head/sys/kern/sys_procdesc.c
  projects/zfsd/head/sys/kern/sys_process.c
  projects/zfsd/head/sys/kern/sysv_msg.c
  projects/zfsd/head/sys/kern/sysv_sem.c
  projects/zfsd/head/sys/kern/sysv_shm.c
  projects/zfsd/head/sys/kern/tty.c
  projects/zfsd/head/sys/kern/tty_pts.c
  projects/zfsd/head/sys/kern/uipc_mqueue.c
  projects/zfsd/head/sys/kern/uipc_sem.c
  projects/zfsd/head/sys/kern/uipc_shm.c
  projects/zfsd/head/sys/kern/uipc_syscalls.c
  projects/zfsd/head/sys/kern/uipc_usrreq.c
  projects/zfsd/head/sys/kern/vfs_acl.c
  projects/zfsd/head/sys/kern/vfs_aio.c
  projects/zfsd/head/sys/kern/vfs_bio.c
  projects/zfsd/head/sys/kern/vfs_cache.c
  projects/zfsd/head/sys/kern/vfs_extattr.c
  projects/zfsd/head/sys/kern/vfs_init.c
  projects/zfsd/head/sys/kern/vfs_mount.c
  projects/zfsd/head/sys/kern/vfs_syscalls.c
  projects/zfsd/head/sys/kern/vfs_vnops.c
  projects/zfsd/head/sys/kgssapi/gss_impl.c
  projects/zfsd/head/sys/mips/conf/OCTEON1
  projects/zfsd/head/sys/mips/mips/machdep.c
  projects/zfsd/head/sys/mips/mips/pm_machdep.c
  projects/zfsd/head/sys/modules/Makefile
  projects/zfsd/head/sys/modules/ipfw/Makefile
  projects/zfsd/head/sys/modules/netgraph/ipfw/Makefile
  projects/zfsd/head/sys/net/if_llatbl.h
  projects/zfsd/head/sys/net/radix.h
  projects/zfsd/head/sys/net/raw_cb.h
  projects/zfsd/head/sys/net/raw_usrreq.c
  projects/zfsd/head/sys/net/route.c
  projects/zfsd/head/sys/net/route.h
  projects/zfsd/head/sys/net/rtsock.c
  projects/zfsd/head/sys/netgraph/ng_ipfw.c
  projects/zfsd/head/sys/netinet/ipfw/ip_fw2.c
  projects/zfsd/head/sys/netinet/ipfw/ip_fw_dynamic.c
  projects/zfsd/head/sys/netinet/ipfw/ip_fw_log.c
  projects/zfsd/head/sys/netinet/ipfw/ip_fw_pfil.c
  projects/zfsd/head/sys/netinet/ipfw/ip_fw_sockopt.c
  projects/zfsd/head/sys/netinet/ipfw/ip_fw_table.c
  projects/zfsd/head/sys/netinet/sctp.h
  projects/zfsd/head/sys/netinet/sctp_asconf.c
  projects/zfsd/head/sys/netinet/sctp_bsd_addr.c
  projects/zfsd/head/sys/netinet/sctp_constants.h
  projects/zfsd/head/sys/netinet/sctp_output.c
  projects/zfsd/head/sys/netinet/sctp_pcb.c
  projects/zfsd/head/sys/netinet/sctp_pcb.h
  projects/zfsd/head/sys/netinet/sctp_structs.h
  projects/zfsd/head/sys/netinet/sctp_usrreq.c
  projects/zfsd/head/sys/netinet/sctputil.c
  projects/zfsd/head/sys/netinet6/in6.h
  projects/zfsd/head/sys/netinet6/in6_proto.c
  projects/zfsd/head/sys/netinet6/ip6_output.c
  projects/zfsd/head/sys/netinet6/ip6_var.h
  projects/zfsd/head/sys/netinet6/nd6.c
  projects/zfsd/head/sys/netinet6/nd6_rtr.c
  projects/zfsd/head/sys/nfs/nfs_nfssvc.c
  projects/zfsd/head/sys/nlm/nlm_prot_impl.c
  projects/zfsd/head/sys/pc98/conf/GENERIC
  projects/zfsd/head/sys/pc98/pc98/machdep.c
  projects/zfsd/head/sys/powerpc/aim/trap.c
  projects/zfsd/head/sys/powerpc/booke/pmap.c
  projects/zfsd/head/sys/powerpc/booke/trap.c
  projects/zfsd/head/sys/powerpc/powerpc/cpu.c
  projects/zfsd/head/sys/powerpc/powerpc/exec_machdep.c
  projects/zfsd/head/sys/security/audit/audit_syscalls.c
  projects/zfsd/head/sys/security/mac/mac_syscalls.c
  projects/zfsd/head/sys/sparc64/conf/GENERIC
  projects/zfsd/head/sys/sparc64/include/asmacros.h
  projects/zfsd/head/sys/sparc64/include/atomic.h
  projects/zfsd/head/sys/sparc64/pci/schizo.c
  projects/zfsd/head/sys/sparc64/sparc64/exception.S
  projects/zfsd/head/sys/sparc64/sparc64/genassym.c
  projects/zfsd/head/sys/sparc64/sparc64/machdep.c
  projects/zfsd/head/sys/sparc64/sparc64/pmap.c
  projects/zfsd/head/sys/sparc64/sparc64/trap.c
  projects/zfsd/head/sys/sys/buf.h
  projects/zfsd/head/sys/sys/param.h
  projects/zfsd/head/sys/sys/posix4.h
  projects/zfsd/head/sys/sys/proc.h
  projects/zfsd/head/sys/sys/signalvar.h
  projects/zfsd/head/sys/sys/sysent.h
  projects/zfsd/head/sys/sys/sysproto.h
  projects/zfsd/head/sys/ufs/ffs/ffs_snapshot.c
  projects/zfsd/head/sys/ufs/ffs/ffs_softdep.c
  projects/zfsd/head/sys/vm/swap_pager.c
  projects/zfsd/head/sys/vm/vm_fault.c
  projects/zfsd/head/sys/vm/vm_mmap.c
  projects/zfsd/head/sys/vm/vm_page.c
  projects/zfsd/head/sys/vm/vm_page.h
  projects/zfsd/head/sys/vm/vm_unix.c
  projects/zfsd/head/sys/xen/xenbus/xenbusb.c
  projects/zfsd/head/sys/xen/xenbus/xenbusb_back.c
  projects/zfsd/head/sys/xen/xenbus/xenbusb_front.c
  projects/zfsd/head/sys/xen/xenstore/xenstore.c
  projects/zfsd/head/tools/make_libdeps.sh
  projects/zfsd/head/usr.bin/calendar/calendars/calendar.freebsd
  projects/zfsd/head/usr.bin/compress/zopen.c
  projects/zfsd/head/usr.bin/csup/auth.c
  projects/zfsd/head/usr.bin/csup/diff.c
  projects/zfsd/head/usr.bin/fetch/fetch.1
  projects/zfsd/head/usr.bin/fetch/fetch.c
  projects/zfsd/head/usr.bin/find/find.1
  projects/zfsd/head/usr.bin/find/ls.c
  projects/zfsd/head/usr.bin/fstat/fstat.1
  projects/zfsd/head/usr.bin/fstat/fstat.c
  projects/zfsd/head/usr.bin/gzip/zuncompress.c
  projects/zfsd/head/usr.bin/script/script.1
  projects/zfsd/head/usr.bin/script/script.c
  projects/zfsd/head/usr.bin/units/units.1
  projects/zfsd/head/usr.bin/usbhidaction/usbhidaction.1
  projects/zfsd/head/usr.bin/usbhidaction/usbhidaction.c
  projects/zfsd/head/usr.bin/usbhidctl/usbhid.c
  projects/zfsd/head/usr.bin/usbhidctl/usbhidctl.1
  projects/zfsd/head/usr.sbin/bsdinstall/partedit/gpart_ops.c
  projects/zfsd/head/usr.sbin/bsdinstall/scripts/auto
  projects/zfsd/head/usr.sbin/bsdinstall/scripts/mirrorselect
  projects/zfsd/head/usr.sbin/bsdinstall/scripts/netconfig_ipv4
  projects/zfsd/head/usr.sbin/bsdinstall/scripts/wlanconfig
  projects/zfsd/head/usr.sbin/mfiutil/mfi_show.c
  projects/zfsd/head/usr.sbin/pc-sysinstall/backend-partmanager/create-part.sh
  projects/zfsd/head/usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh
  projects/zfsd/head/usr.sbin/pc-sysinstall/backend/functions-disk.sh
  projects/zfsd/head/usr.sbin/pc-sysinstall/backend/functions-extractimage.sh
  projects/zfsd/head/usr.sbin/pc-sysinstall/backend/functions-ftp.sh
  projects/zfsd/head/usr.sbin/pc-sysinstall/backend/functions-localize.sh
  projects/zfsd/head/usr.sbin/pc-sysinstall/backend/functions-newfs.sh
  projects/zfsd/head/usr.sbin/pc-sysinstall/backend/functions-parse.sh
  projects/zfsd/head/usr.sbin/pc-sysinstall/backend/functions-unmount.sh
  projects/zfsd/head/usr.sbin/pc-sysinstall/backend/functions.sh
  projects/zfsd/head/usr.sbin/pc-sysinstall/backend/parseconfig.sh
  projects/zfsd/head/usr.sbin/pc-sysinstall/examples/README
  projects/zfsd/head/usr.sbin/pkg_install/add/main.c
  projects/zfsd/head/usr.sbin/pkg_install/delete/perform.c
  projects/zfsd/head/usr.sbin/pstat/pstat.c
  projects/zfsd/head/usr.sbin/rtadvctl/rtadvctl.c
  projects/zfsd/head/usr.sbin/rtadvd/control.c
  projects/zfsd/head/usr.sbin/rtadvd/control.h
  projects/zfsd/head/usr.sbin/rtadvd/control_client.c
  projects/zfsd/head/usr.sbin/rtadvd/control_client.h
  projects/zfsd/head/usr.sbin/rtadvd/control_server.c
  projects/zfsd/head/usr.sbin/rtadvd/control_server.h
  projects/zfsd/head/usr.sbin/rtadvd/rtadvd.c
  projects/zfsd/head/usr.sbin/rtsold/rtsol.c
  projects/zfsd/head/usr.sbin/rtsold/rtsold.8
  projects/zfsd/head/usr.sbin/rtsold/rtsold.c
  projects/zfsd/head/usr.sbin/rtsold/rtsold.h
Directory Properties:
  projects/zfsd/head/   (props changed)
  projects/zfsd/head/cddl/contrib/opensolaris/   (props changed)
  projects/zfsd/head/contrib/bind9/   (props changed)
  projects/zfsd/head/contrib/binutils/   (props changed)
  projects/zfsd/head/contrib/bzip2/   (props changed)
  projects/zfsd/head/contrib/compiler-rt/   (props changed)
  projects/zfsd/head/contrib/dialog/   (props changed)
  projects/zfsd/head/contrib/ee/   (props changed)
  projects/zfsd/head/contrib/expat/   (props changed)
  projects/zfsd/head/contrib/file/   (props changed)
  projects/zfsd/head/contrib/gcc/   (props changed)
  projects/zfsd/head/contrib/gdb/   (props changed)
  projects/zfsd/head/contrib/gdtoa/   (props changed)
  projects/zfsd/head/contrib/gnu-sort/   (props changed)
  projects/zfsd/head/contrib/groff/   (props changed)
  projects/zfsd/head/contrib/less/   (props changed)
  projects/zfsd/head/contrib/libpcap/   (props changed)
  projects/zfsd/head/contrib/libstdc++/   (props changed)
  projects/zfsd/head/contrib/llvm/   (props changed)
  projects/zfsd/head/contrib/llvm/tools/clang/   (props changed)
  projects/zfsd/head/contrib/ncurses/   (props changed)
  projects/zfsd/head/contrib/netcat/   (props changed)
  projects/zfsd/head/contrib/ntp/   (props changed)
  projects/zfsd/head/contrib/one-true-awk/   (props changed)
  projects/zfsd/head/contrib/openbsm/   (props changed)
  projects/zfsd/head/contrib/openpam/   (props changed)
  projects/zfsd/head/contrib/openresolv/   (props changed)
  projects/zfsd/head/contrib/pf/   (props changed)
  projects/zfsd/head/contrib/sendmail/   (props changed)
  projects/zfsd/head/contrib/tcpdump/   (props changed)
  projects/zfsd/head/contrib/tcsh/   (props changed)
  projects/zfsd/head/contrib/tnftp/   (props changed)
  projects/zfsd/head/contrib/top/   (props changed)
  projects/zfsd/head/contrib/top/install-sh   (props changed)
  projects/zfsd/head/contrib/tzcode/stdtime/   (props changed)
  projects/zfsd/head/contrib/tzcode/zic/   (props changed)
  projects/zfsd/head/contrib/tzdata/   (props changed)
  projects/zfsd/head/contrib/wpa/   (props changed)
  projects/zfsd/head/contrib/xz/   (props changed)
  projects/zfsd/head/crypto/heimdal/   (props changed)
  projects/zfsd/head/crypto/openssh/   (props changed)
  projects/zfsd/head/crypto/openssl/   (props changed)
  projects/zfsd/head/gnu/lib/   (props changed)
  projects/zfsd/head/gnu/usr.bin/binutils/   (props changed)
  projects/zfsd/head/gnu/usr.bin/cc/cc_tools/   (props changed)
  projects/zfsd/head/gnu/usr.bin/gdb/   (props changed)
  projects/zfsd/head/lib/libc/   (props changed)
  projects/zfsd/head/lib/libc/stdtime/   (props changed)
  projects/zfsd/head/lib/libutil/   (props changed)
  projects/zfsd/head/lib/libz/   (props changed)
  projects/zfsd/head/sbin/   (props changed)
  projects/zfsd/head/sbin/ipfw/   (props changed)
  projects/zfsd/head/share/mk/bsd.arch.inc.mk   (props changed)
  projects/zfsd/head/share/zoneinfo/   (props changed)
  projects/zfsd/head/sys/   (props changed)
  projects/zfsd/head/sys/amd64/include/xen/   (props changed)
  projects/zfsd/head/sys/boot/   (props changed)
  projects/zfsd/head/sys/boot/i386/efi/   (props changed)
  projects/zfsd/head/sys/boot/ia64/efi/   (props changed)
  projects/zfsd/head/sys/boot/ia64/ski/   (props changed)
  projects/zfsd/head/sys/boot/powerpc/boot1.chrp/   (props changed)
  projects/zfsd/head/sys/boot/powerpc/ofw/   (props changed)
  projects/zfsd/head/sys/cddl/contrib/opensolaris/   (props changed)
  projects/zfsd/head/sys/conf/   (props changed)
  projects/zfsd/head/sys/contrib/dev/acpica/   (props changed)
  projects/zfsd/head/sys/contrib/octeon-sdk/   (props changed)
  projects/zfsd/head/sys/contrib/pf/   (props changed)
  projects/zfsd/head/sys/contrib/x86emu/   (props changed)
  projects/zfsd/head/usr.bin/calendar/   (props changed)
  projects/zfsd/head/usr.bin/csup/   (props changed)
  projects/zfsd/head/usr.bin/procstat/   (props changed)
  projects/zfsd/head/usr.sbin/ndiscvt/   (props changed)
  projects/zfsd/head/usr.sbin/rtadvctl/   (props changed)
  projects/zfsd/head/usr.sbin/rtadvd/   (props changed)
  projects/zfsd/head/usr.sbin/rtsold/   (props changed)
  projects/zfsd/head/usr.sbin/zic/   (props changed)

Modified: projects/zfsd/head/Makefile.inc1
==============================================================================
--- projects/zfsd/head/Makefile.inc1	Sat Oct  1 15:10:33 2011	(r225904)
+++ projects/zfsd/head/Makefile.inc1	Sat Oct  1 16:08:03 2011	(r225905)
@@ -1218,7 +1218,8 @@ _startup_libs+=	lib/libc
 
 gnu/lib/libgcc__L: lib/libc__L
 
-_prebuild_libs=	${_kerberos5_lib_libasn1} ${_kerberos5_lib_libheimntlm} \
+_prebuild_libs=	${_kerberos5_lib_libasn1} ${_kerberos5_lib_libhdb} \
+		${_kerberos5_lib_libheimntlm} \
 		${_kerberos5_lib_libhx509} ${_kerberos5_lib_libkrb5} \
 		${_kerberos5_lib_libroken} \
 		lib/libbz2 lib/libcom_err lib/libcrypt \
@@ -1268,6 +1269,19 @@ secure/lib/libssh__L: lib/libgssapi__L k
 _secure_lib=	secure/lib
 .endif
 
+.if ${MK_KERBEROS} != "no"
+kerberos5/lib/libasn1__L: lib/libcom_err__L kerberos5/lib/libroken__L
+kerberos5/lib/libhdb__L: kerberos5/lib/libasn1__L lib/libcom_err__L \
+    kerberos5/lib/libkrb5__L kerberos5/lib/libroken__L
+kerberos5/lib/libheimntlm__L: secure/lib/libcrypto__L kerberos5/lib/libkrb5__L
+kerberos5/lib/libhx509__L: kerberos5/lib/libasn1__L lib/libcom_err__L \
+    secure/lib/libcrypto__L kerberos5/lib/libroken__L
+kerberos5/lib/libkrb5__L: kerberos5/lib/libasn1__L lib/libcom_err__L \
+    lib/libcrypt__L secure/lib/libcrypto__L kerberos5/lib/libhx509__L \
+    kerberos5/lib/libroken__L
+kerberos5/lib/libroken__L: lib/libcrypt__L
+.endif
+
 .if ${MK_GSSAPI} != "no"
 _lib_libgssapi=	lib/libgssapi
 .endif
@@ -1279,6 +1293,7 @@ _lib_libipx=	lib/libipx
 .if ${MK_KERBEROS} != "no"
 _kerberos5_lib=	kerberos5/lib
 _kerberos5_lib_libasn1= kerberos5/lib/libasn1
+_kerberos5_lib_libhdb= kerberos5/lib/libhdb
 _kerberos5_lib_libkrb5= kerberos5/lib/libkrb5
 _kerberos5_lib_libhx509= kerberos5/lib/libhx509
 _kerberos5_lib_libroken= kerberos5/lib/libroken

Modified: projects/zfsd/head/ObsoleteFiles.inc
==============================================================================
--- projects/zfsd/head/ObsoleteFiles.inc	Sat Oct  1 15:10:33 2011	(r225904)
+++ projects/zfsd/head/ObsoleteFiles.inc	Sat Oct  1 16:08:03 2011	(r225905)
@@ -38,6 +38,9 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20110915: rename congestion control manpages
+OLD_FILES+=usr/share/man/man4/cc.4.gz
+OLD_FILES+=usr/share/man/man9/cc.9.gz
 # 20110831: atomic page flags operations
 OLD_FILES+=usr/share/man/man9/vm_page_flag.9.gz
 OLD_FILES+=usr/share/man/man9/vm_page_flag_clear.9.gz
@@ -61,6 +64,11 @@ OLD_LIBS+=usr/lib32/libopie.so.6
 OLD_LIBS+=usr/lib32/librtld_db.so.1
 OLD_LIBS+=usr/lib32/libtacplus.so.4
 .endif
+# 20110718: no longer useful in the age of rc.d
+OLD_FILES+=usr/sbin/named.reconfig
+OLD_FILES+=usr/sbin/named.reload
+# 20110716: bind 9.8.0 import
+OLD_LIBS+=usr/lib/liblwres.so.50
 # 20110709: vm_map_clean.9 -> vm_map_sync.9
 OLD_FILES+=usr/share/man/man9/vm_map_clean.9.gz
 # 20110709: Catch up with removal of these functions.
@@ -84,8 +92,17 @@ OLD_FILES+=usr/lib/libpkg.a
 OLD_FILES+=usr/lib/libpkg.so
 OLD_LIBS+=usr/lib/libpkg.so.0
 OLD_FILES+=usr/lib/libpkg_p.a
+.if ${TARGET_ARCH} == "amd64"
+OLD_FILES+=usr/lib32/libpkg.a
+OLD_FILES+=usr/lib32/libpkg.so
+OLD_LIBS+=usr/lib32/libpkg.so.0
+OLD_FILES+=usr/lib32/libpkg_p.a
+.endif
 # 20110517: libsbuf version bump
 OLD_LIBS+=lib/libsbuf.so.5
+.if ${TARGET_ARCH} == "amd64"
+OLD_LIBS+=usr/lib32/libsbuf.so.5
+.endif
 # 20110502: new clang import which bumps version from 2.9 to 3.0
 OLD_FILES+=usr/include/clang/2.9/emmintrin.h
 OLD_FILES+=usr/include/clang/2.9/mm_malloc.h
@@ -114,6 +131,12 @@ OLD_FILES+=usr/lib/libobjc_p.a
 OLD_FILES+=usr/libexec/cc1obj
 OLD_LIBS+=usr/lib/libobjc.so.4
 OLD_DIRS+=usr/include/objc
+.if ${TARGET_ARCH} == "amd64"
+OLD_FILES+=usr/lib32/libobjc.a
+OLD_FILES+=usr/lib32/libobjc.so
+OLD_FILES+=usr/lib32/libobjc_p.a
+OLD_LIBS+=usr/lib32/libobjc.so.4
+.endif
 # 20110331: firmware.img created at build time
 OLD_FILES+=usr/share/examples/kld/firmware/fwimage/firmware.img
 # 20110224: sticky.8 -> sticky.7

Modified: projects/zfsd/head/UPDATING
==============================================================================
--- projects/zfsd/head/UPDATING	Sat Oct  1 15:10:33 2011	(r225904)
+++ projects/zfsd/head/UPDATING	Sat Oct  1 16:08:03 2011	(r225905)
@@ -9,8 +9,8 @@ handbook.
 Items affecting the ports and packages system can be found in
 /usr/ports/UPDATING.  Please read that file before running portupgrade.
 
-NOTE TO PEOPLE WHO THINK THAT FreeBSD 9.x IS SLOW:
-	FreeBSD 9.x has many debugging features turned on, in both the kernel
+NOTE TO PEOPLE WHO THINK THAT FreeBSD 10.x IS SLOW:
+	FreeBSD 10.x has many debugging features turned on, in both the kernel
 	and userland.  These features attempt to detect incorrect use of
 	system primitives, and encourage loud failure through extra sanity
 	checking and fail stop semantics.  They also substantially impact
@@ -22,6 +22,22 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 9.
 	machines to maximize performance.  (To disable malloc debugging, run
 	ln -s aj /etc/malloc.conf.)
 
+20110923:
+	The stable/9 branch created in subversion.  This corresponds to the
+	RELENG_9 branch in CVS.
+
+20110913:
+	This commit modifies vfs_register() so that it uses a hash
+	calculation to set vfc_typenum, which is enabled by default.
+	The first time a system is booted after this change, the
+	vfc_typenum values will change for all file systems. The
+	main effect of this is a change to the NFS server file handles
+	for file systems that use vfc_typenum in their fsid, such as ZFS.
+	It will, however, prevent vfc_typenum from changing when file
+	systems are loaded in a different order for subsequent reboots.
+	To disable this, you can set vfs.typenumhash=0 in /boot/loader.conf
+	until you are ready to remount all NFS clients after a reboot.
+
 20110828:
 	Bump the shared library version numbers for libraries that
 	do not use symbol versioning, have changed the ABI compared

Modified: projects/zfsd/head/bin/ls/ls.1
==============================================================================
--- projects/zfsd/head/bin/ls/ls.1	Sat Oct  1 15:10:33 2011	(r225904)
+++ projects/zfsd/head/bin/ls/ls.1	Sat Oct  1 16:08:03 2011	(r225905)
@@ -32,7 +32,7 @@
 .\"     @(#)ls.1	8.7 (Berkeley) 7/29/94
 .\" $FreeBSD$
 .\"
-.Dd April 4, 2008
+.Dd September 28, 2011
 .Dt LS 1
 .Os
 .Sh NAME
@@ -357,8 +357,7 @@ option is given,
 the numeric ID's are displayed.
 .Pp
 If the file is a character special or block special file,
-the major and minor device numbers for the file are displayed
-in the size field.
+the device number for the file is displayed in the size field.
 If the file is a symbolic link the pathname of the
 linked-to file is preceded by
 .Dq Li -> .

Modified: projects/zfsd/head/bin/ls/ls.c
==============================================================================
--- projects/zfsd/head/bin/ls/ls.c	Sat Oct  1 15:10:33 2011	(r225904)
+++ projects/zfsd/head/bin/ls/ls.c	Sat Oct  1 16:08:03 2011	(r225905)
@@ -563,7 +563,7 @@ display(const FTSENT *p, FTSENT *list, i
 	long maxblock;
 	u_long btotal, labelstrlen, maxinode, maxlen, maxnlink;
 	u_long maxlabelstr;
-	u_int devstrlen;
+	u_int sizelen;
 	int maxflags;
 	gid_t maxgroup;
 	uid_t maxuser;
@@ -572,7 +572,6 @@ display(const FTSENT *p, FTSENT *list, i
 	int entries, needstats;
 	const char *user, *group;
 	char *flags, *labelstr = NULL;
-	char buf[STRBUF_SIZEOF(u_quad_t) + 1];
 	char ngroup[STRBUF_SIZEOF(uid_t) + 1];
 	char nuser[STRBUF_SIZEOF(gid_t) + 1];
 
@@ -656,7 +655,8 @@ display(const FTSENT *p, FTSENT *list, i
 		MAKENINES(maxsize);
 		free(jinitmax);
 	}
-	devstrlen = 0;
+	d.s_size = 0;
+	sizelen = 0;
 	flags = NULL;
 	for (cur = list, entries = 0; cur; cur = cur->fts_link) {
 		if (cur->fts_info == FTS_ERR || cur->fts_info == FTS_NS) {
@@ -796,14 +796,12 @@ label_out:
 				np->group = &np->data[ulen + 1];
 				(void)strcpy(np->group, group);
 
-				if ((S_ISCHR(sp->st_mode) ||
-				    S_ISBLK(sp->st_mode)) &&
-				    devstrlen < DEVSTR_HEX_LEN) {
-					if (minor(sp->st_rdev) > 255 ||
-					    minor(sp->st_rdev) < 0)
-						devstrlen = DEVSTR_HEX_LEN;
-					else
-						devstrlen = DEVSTR_LEN;
+				if (S_ISCHR(sp->st_mode) ||
+				    S_ISBLK(sp->st_mode)) {
+					sizelen = snprintf(NULL, 0,
+					    "%#jx", (uintmax_t)sp->st_rdev);
+					if (d.s_size < sizelen)
+						d.s_size = sizelen;
 				}
 
 				if (f_flags) {
@@ -837,23 +835,16 @@ label_out:
 	d.maxlen = maxlen;
 	if (needstats) {
 		d.btotal = btotal;
-		(void)snprintf(buf, sizeof(buf), "%lu", maxblock);
-		d.s_block = strlen(buf);
+		d.s_block = snprintf(NULL, 0, "%lu", maxblock);
 		d.s_flags = maxflags;
 		d.s_label = maxlabelstr;
 		d.s_group = maxgroup;
-		(void)snprintf(buf, sizeof(buf), "%lu", maxinode);
-		d.s_inode = strlen(buf);
-		(void)snprintf(buf, sizeof(buf), "%lu", maxnlink);
-		d.s_nlink = strlen(buf);
-		if (f_humanval)
-			d.s_size = HUMANVALSTR_LEN;
-		else {
-			(void)snprintf(buf, sizeof(buf), "%ju", maxsize);
-			d.s_size = strlen(buf);
-		}
-		if (d.s_size < devstrlen)
-			d.s_size = devstrlen;
+		d.s_inode = snprintf(NULL, 0, "%lu", maxinode);
+		d.s_nlink = snprintf(NULL, 0, "%lu", maxnlink);
+		sizelen = f_humanval ? HUMANVALSTR_LEN :
+		    snprintf(NULL, 0, "%ju", maxsize);
+		if (d.s_size < sizelen)
+			d.s_size = sizelen;
 		d.s_user = maxuser;
 	}
 	printfcn(&d);

Modified: projects/zfsd/head/bin/ls/ls.h
==============================================================================
--- projects/zfsd/head/bin/ls/ls.h	Sat Oct  1 15:10:33 2011	(r225904)
+++ projects/zfsd/head/bin/ls/ls.h	Sat Oct  1 16:08:03 2011	(r225905)
@@ -36,8 +36,6 @@
 #define NO_PRINT	1
 
 #define HUMANVALSTR_LEN	5
-#define DEVSTR_LEN	8
-#define DEVSTR_HEX_LEN	15
 
 extern long blocksize;		/* block size units */
 

Modified: projects/zfsd/head/bin/ls/print.c
==============================================================================
--- projects/zfsd/head/bin/ls/print.c	Sat Oct  1 15:10:33 2011	(r225904)
+++ projects/zfsd/head/bin/ls/print.c	Sat Oct  1 16:08:03 2011	(r225905)
@@ -48,6 +48,7 @@ __FBSDID("$FreeBSD$");
 #include <langinfo.h>
 #include <libutil.h>
 #include <stdio.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
@@ -351,16 +352,8 @@ printaname(const FTSENT *p, u_long inode
 static void
 printdev(size_t width, dev_t dev)
 {
-	char buf[DEVSTR_HEX_LEN + 1];
 
-	if (minor(dev) > 255 || minor(dev) < 0)
-		(void)snprintf(buf, sizeof(buf), "%3d, 0x%08x",
-		    major(dev), (u_int)minor(dev));
-	else
-		(void)snprintf(buf, sizeof(buf), "%3d, %3d",
-		    major(dev), minor(dev));
-
-	(void)printf("%*s ", (u_int)width, buf);
+	(void)printf("%#*jx ", (u_int)width, (uintmax_t)dev);
 }
 
 static void

Modified: projects/zfsd/head/bin/ps/extern.h
==============================================================================
--- projects/zfsd/head/bin/ps/extern.h	Sat Oct  1 15:10:33 2011	(r225904)
+++ projects/zfsd/head/bin/ps/extern.h	Sat Oct  1 16:08:03 2011	(r225905)
@@ -39,63 +39,52 @@ extern fixpt_t ccpu;
 extern int cflag, eval, fscale, nlistread, rawcpu;
 extern unsigned long mempages;
 extern time_t now;
-extern int showthreads, sumrusage, termwidth, totwidth;
+extern int showthreads, sumrusage, termwidth;
 extern STAILQ_HEAD(velisthead, varent) varlist;
 
 __BEGIN_DECLS
-void	 arguments(KINFO *, VARENT *);
-void	 command(KINFO *, VARENT *);
-void	 cputime(KINFO *, VARENT *);
+char	 *arguments(KINFO *, VARENT *);
+char	 *command(KINFO *, VARENT *);
+char	 *cputime(KINFO *, VARENT *);
 int	 donlist(void);
-void	 elapsed(KINFO *, VARENT *);
-void	 elapseds(KINFO *, VARENT *);
-void	 emulname(KINFO *, VARENT *);
+char	 *elapsed(KINFO *, VARENT *);
+char	 *elapseds(KINFO *, VARENT *);
+char	 *emulname(KINFO *, VARENT *);
 VARENT	*find_varentry(VAR *);
 const	 char *fmt_argv(char **, char *, size_t);
 double	 getpcpu(const KINFO *);
-void	 kvar(KINFO *, VARENT *);
-void	 label(KINFO *, VARENT *);
-void	 loginclass(KINFO *, VARENT *);
-void	 logname(KINFO *, VARENT *);
-void	 longtname(KINFO *, VARENT *);
-void	 lstarted(KINFO *, VARENT *);
-void	 maxrss(KINFO *, VARENT *);
-void	 lockname(KINFO *, VARENT *);
-void	 mwchan(KINFO *, VARENT *);
-void	 nwchan(KINFO *, VARENT *);
-void	 pagein(KINFO *, VARENT *);
+char	 *kvar(KINFO *, VARENT *);
+char	 *label(KINFO *, VARENT *);
+char	 *loginclass(KINFO *, VARENT *);
+char	 *logname(KINFO *, VARENT *);
+char	 *longtname(KINFO *, VARENT *);
+char	 *lstarted(KINFO *, VARENT *);
+char	 *maxrss(KINFO *, VARENT *);
+char	 *lockname(KINFO *, VARENT *);
+char	 *mwchan(KINFO *, VARENT *);
+char	 *nwchan(KINFO *, VARENT *);
+char	 *pagein(KINFO *, VARENT *);
 void	 parsefmt(const char *, int);
-void	 pcpu(KINFO *, VARENT *);
-void	 pmem(KINFO *, VARENT *);
-void	 pri(KINFO *, VARENT *);
+char	 *pcpu(KINFO *, VARENT *);
+char	 *pmem(KINFO *, VARENT *);
+char	 *pri(KINFO *, VARENT *);
 void	 printheader(void);
-void	 priorityr(KINFO *, VARENT *);
-void	 egroupname(KINFO *, VARENT *);
-void	 rgroupname(KINFO *, VARENT *);
-void	 runame(KINFO *, VARENT *);
-void	 rvar(KINFO *, VARENT *);
-int	 s_comm(KINFO *);
-int	 s_cputime(KINFO *);
-int	 s_label(KINFO *);
-int	 s_loginclass(KINFO *);
-int	 s_logname(KINFO *);
-int	 s_egroupname(KINFO *);
-int	 s_rgroupname(KINFO *);
-int	 s_runame(KINFO *);
-int	 s_systime(KINFO *);
-int	 s_uname(KINFO *);
-int	 s_usertime(KINFO *);
+char	 *priorityr(KINFO *, VARENT *);
+char	 *egroupname(KINFO *, VARENT *);
+char	 *rgroupname(KINFO *, VARENT *);
+char	 *runame(KINFO *, VARENT *);
+char	 *rvar(KINFO *, VARENT *);
 void	 showkey(void);
-void	 started(KINFO *, VARENT *);
-void	 state(KINFO *, VARENT *);
-void	 systime(KINFO *, VARENT *);
-void	 tdev(KINFO *, VARENT *);
-void	 tdnam(KINFO *, VARENT *);
-void	 tname(KINFO *, VARENT *);
-void	 ucomm(KINFO *, VARENT *);
-void	 uname(KINFO *, VARENT *);
-void	 upr(KINFO *, VARENT *);
-void	 usertime(KINFO *, VARENT *);
-void	 vsize(KINFO *, VARENT *);
-void	 wchan(KINFO *, VARENT *);
+char	 *started(KINFO *, VARENT *);
+char	 *state(KINFO *, VARENT *);
+char	 *systime(KINFO *, VARENT *);
+char	 *tdev(KINFO *, VARENT *);
+char	 *tdnam(KINFO *, VARENT *);
+char	 *tname(KINFO *, VARENT *);
+char	 *ucomm(KINFO *, VARENT *);
+char	 *uname(KINFO *, VARENT *);
+char	 *upr(KINFO *, VARENT *);
+char	 *usertime(KINFO *, VARENT *);
+char	 *vsize(KINFO *, VARENT *);
+char	 *wchan(KINFO *, VARENT *);
 __END_DECLS

Modified: projects/zfsd/head/bin/ps/keyword.c
==============================================================================
--- projects/zfsd/head/bin/ps/keyword.c	Sat Oct  1 15:10:33 2011	(r225904)
+++ projects/zfsd/head/bin/ps/keyword.c	Sat Oct  1 16:08:03 2011	(r225905)
@@ -57,178 +57,116 @@ static int  vcmp(const void *, const voi
 #define	KOFF(x)	offsetof(struct kinfo_proc, x)
 #define	ROFF(x)	offsetof(struct rusage, x)
 
-#define	EMULLEN	13		/* enough for "FreeBSD ELF32" */
 #define	LWPFMT	"d"
-#define	LWPLEN	6
 #define	NLWPFMT	"d"
-#define	NLWPLEN	4
 #define	UIDFMT	"u"
-#define	UIDLEN	5
 #define	PIDFMT	"d"
-#define	PIDLEN	5
-#define USERLEN (MAXLOGNAME - 1)
 
 /* PLEASE KEEP THE TABLE BELOW SORTED ALPHABETICALLY!!! */
 static VAR var[] = {
-	{"%cpu", "%CPU", NULL, 0, pcpu, NULL, 5, 0, CHAR, NULL, 0},
-	{"%mem", "%MEM", NULL, 0, pmem, NULL, 4, 0, CHAR, NULL, 0},
-	{"acflag", "ACFLG", NULL, 0, kvar, NULL, 3, KOFF(ki_acflag), USHORT,
-		"x", 0},
-	{"acflg", "", "acflag", 0, NULL, NULL, 0, 0, CHAR, NULL, 0},
-	{"args", "COMMAND", NULL, COMM|LJUST|USER, arguments, NULL, 16, 0,
+	{"%cpu", "%CPU", NULL, 0, pcpu, 0, CHAR, NULL, 0},
+	{"%mem", "%MEM", NULL, 0, pmem, 0, CHAR, NULL, 0},
+	{"acflag", "ACFLG", NULL, 0, kvar, KOFF(ki_acflag), USHORT, "x", 0},
+	{"acflg", "", "acflag", 0, NULL, 0, CHAR, NULL, 0},
+	{"args", "COMMAND", NULL, COMM|LJUST|USER, arguments, 0,
 		CHAR, NULL, 0},
-	{"blocked", "", "sigmask", 0, NULL, NULL, 0, 0, CHAR, NULL, 0},
-	{"caught", "", "sigcatch", 0, NULL, NULL, 0, 0, CHAR, NULL, 0},
-	{"class", "CLASS", NULL, LJUST, loginclass, s_loginclass,
-		MAXLOGNAME-1, 0, CHAR, NULL, 0},
-	{"comm", "COMMAND", NULL, LJUST, ucomm, s_comm,
-		COMMLEN + TDNAMLEN + 1, 0, CHAR, NULL, 0},
-	{"command", "COMMAND", NULL, COMM|LJUST|USER, command, NULL, 16, 0,
+	{"blocked", "", "sigmask", 0, NULL, 0, CHAR, NULL, 0},
+	{"caught", "", "sigcatch", 0, NULL, 0, CHAR, NULL, 0},
+	{"class", "CLASS", NULL, LJUST, loginclass, 0, CHAR, NULL, 0},
+	{"comm", "COMMAND", NULL, LJUST, ucomm, 0, CHAR, NULL, 0},
+	{"command", "COMMAND", NULL, COMM|LJUST|USER, command, 0,
 		CHAR, NULL, 0},
-	{"cpu", "CPU", NULL, 0, kvar, NULL, 3, KOFF(ki_estcpu), UINT, "d",
-		0},
-	{"cputime", "", "time", 0, NULL, NULL, 0, 0, CHAR, NULL, 0},
-	{"egid", "", "gid", 0, NULL, NULL, 0, 0, CHAR, NULL, 0},
-	{"egroup", "", "group", 0, NULL, NULL, 0, 0, CHAR, NULL, 0},
-	{"emul", "EMUL", NULL, LJUST, emulname, NULL, EMULLEN, 0, CHAR,
-		NULL, 0},
-	{"etime", "ELAPSED", NULL, USER, elapsed, NULL, 12, 0, CHAR, NULL, 0},
-	{"etimes", "ELAPSED", NULL, USER, elapseds, NULL, 12, 0, CHAR, NULL, 0},
-	{"euid", "", "uid", 0, NULL, NULL, 0, 0, CHAR, NULL, 0},
-	{"f", "F", NULL, 0, kvar, NULL, 8, KOFF(ki_flag), INT, "x", 0},
-	{"flags", "", "f", 0, NULL, NULL, 0, 0, CHAR, NULL, 0},
-	{"gid", "GID", NULL, 0, kvar, NULL, UIDLEN, KOFF(ki_groups),
-		UINT, UIDFMT, 0},
-	{"group", "GROUP", NULL, LJUST, egroupname, s_egroupname,
-	    USERLEN, 0, CHAR, NULL, 0},
-	{"ignored", "", "sigignore", 0, NULL, NULL, 0, 0, CHAR, NULL, 0},
-	{"inblk", "INBLK", NULL, USER, rvar, NULL, 4, ROFF(ru_inblock), LONG,
-		"ld", 0},
-	{"inblock", "", "inblk", 0, NULL, NULL, 0, 0, CHAR, NULL, 0},
-	{"jid", "JID", NULL, 0, kvar, NULL, 6, KOFF(ki_jid), INT, "d", 0},
-	{"jobc", "JOBC", NULL, 0, kvar, NULL, 4, KOFF(ki_jobc), SHORT, "d",
-		0},
-	{"ktrace", "KTRACE", NULL, 0, kvar, NULL, 8, KOFF(ki_traceflag), INT,
-		"x", 0},
-	{"label", "LABEL", NULL, LJUST, label, s_label, SHRT_MAX, 0, CHAR,
-	    NULL, 0},
-	{"lim", "LIM", NULL, 0, maxrss, NULL, 5, 0, CHAR, NULL, 0},
-	{"lockname", "LOCK", NULL, LJUST, lockname, NULL, 6, 0, CHAR, NULL,
-		0},
-	{"login", "LOGIN", NULL, LJUST, logname, s_logname, MAXLOGNAME-1,
-		0, CHAR, NULL, 0},
-	{"logname", "", "login", 0, NULL, NULL, 0, 0, CHAR, NULL, 0},
-	{"lstart", "STARTED", NULL, LJUST|USER, lstarted, NULL, 28, 0, CHAR,
-		NULL, 0},
-	{"lwp", "LWP", NULL, 0, kvar, NULL, LWPLEN, KOFF(ki_tid), UINT,
-		LWPFMT, 0},
-	{"majflt", "MAJFLT", NULL, USER, rvar, NULL, 4, ROFF(ru_majflt),
-		LONG, "ld", 0},
-	{"minflt", "MINFLT", NULL, USER, rvar, NULL, 4, ROFF(ru_minflt),
-		LONG, "ld", 0},
-	{"msgrcv", "MSGRCV", NULL, USER, rvar, NULL, 4, ROFF(ru_msgrcv),
-		LONG, "ld", 0},
-	{"msgsnd", "MSGSND", NULL, USER, rvar, NULL, 4, ROFF(ru_msgsnd),
-		LONG, "ld", 0},
-	{"mwchan", "MWCHAN", NULL, LJUST, mwchan, NULL, 6, 0, CHAR, NULL, 0},
-	{"ni", "", "nice", 0, NULL, NULL, 0, 0, CHAR, NULL, 0},
-	{"nice", "NI", NULL, 0, kvar, NULL, 2, KOFF(ki_nice), CHAR, "d",
-		0},
-	{"nivcsw", "NIVCSW", NULL, USER, rvar, NULL, 5, ROFF(ru_nivcsw),
-		LONG, "ld", 0},
-	{"nlwp", "NLWP", NULL, 0, kvar, NULL, NLWPLEN, KOFF(ki_numthreads),
-		UINT, NLWPFMT, 0},
-	{"nsignals", "", "nsigs", 0, NULL, NULL, 0, 0, CHAR, NULL, 0},
-	{"nsigs", "NSIGS", NULL, USER, rvar, NULL, 4, ROFF(ru_nsignals),
-		LONG, "ld", 0},
-	{"nswap", "NSWAP", NULL, USER, rvar, NULL, 4, ROFF(ru_nswap),
-		LONG, "ld", 0},
-	{"nvcsw", "NVCSW", NULL, USER, rvar, NULL, 5, ROFF(ru_nvcsw),
-		LONG, "ld", 0},
-	{"nwchan", "NWCHAN", NULL, LJUST, nwchan, NULL, sizeof(void *) * 2, 0,
-		CHAR, NULL, 0},
-	{"oublk", "OUBLK", NULL, USER, rvar, NULL, 4, ROFF(ru_oublock),
-		LONG, "ld", 0},
-	{"oublock", "", "oublk", 0, NULL, NULL, 0, 0, CHAR, NULL, 0},
-	{"paddr", "PADDR", NULL, 0, kvar, NULL, sizeof(void *) * 2,
-		KOFF(ki_paddr), KPTR, "lx", 0},
-	{"pagein", "PAGEIN", NULL, USER, pagein, NULL, 6, 0, CHAR, NULL, 0},
-	{"pcpu", "", "%cpu", 0, NULL, NULL, 0, 0, CHAR, NULL, 0},
-	{"pending", "", "sig", 0, NULL, NULL, 0, 0, CHAR, NULL, 0},
-	{"pgid", "PGID", NULL, 0, kvar, NULL, PIDLEN, KOFF(ki_pgid), UINT,
-		PIDFMT, 0},
-	{"pid", "PID", NULL, 0, kvar, NULL, PIDLEN, KOFF(ki_pid), UINT,
-		PIDFMT, 0},
-	{"pmem", "", "%mem", 0, NULL, NULL, 0, 0, CHAR, NULL, 0},
-	{"ppid", "PPID", NULL, 0, kvar, NULL, PIDLEN, KOFF(ki_ppid), UINT,
-		PIDFMT, 0},
-	{"pri", "PRI", NULL, 0, pri, NULL, 3, 0, CHAR, NULL, 0},
-	{"re", "RE", NULL, INF127, kvar, NULL, 3, KOFF(ki_swtime), UINT, "d",
-		0},
-	{"rgid", "RGID", NULL, 0, kvar, NULL, UIDLEN, KOFF(ki_rgid),
-		UINT, UIDFMT, 0},
-	{"rgroup", "RGROUP", NULL, LJUST, rgroupname, s_rgroupname,
-		USERLEN, 0, CHAR, NULL, 0},
-	{"rss", "RSS", NULL, 0, kvar, NULL, 6, KOFF(ki_rssize), PGTOK, "ld", 0},
-	{"rtprio", "RTPRIO", NULL, 0, priorityr, NULL, 7, KOFF(ki_pri), CHAR,
-		NULL, 0},
-	{"ruid", "RUID", NULL, 0, kvar, NULL, UIDLEN, KOFF(ki_ruid),
-		UINT, UIDFMT, 0},
-	{"ruser", "RUSER", NULL, LJUST, runame, s_runame, USERLEN,
-		0, CHAR, NULL, 0},
-	{"sid", "SID", NULL, 0, kvar, NULL, PIDLEN, KOFF(ki_sid), UINT,
-		PIDFMT, 0},
-	{"sig", "PENDING", NULL, 0, kvar, NULL, 8, KOFF(ki_siglist), INT,
-		"x", 0},
-	{"sigcatch", "CAUGHT", NULL, 0, kvar, NULL, 8, KOFF(ki_sigcatch),
-		UINT, "x", 0},
-	{"sigignore", "IGNORED", NULL, 0, kvar, NULL, 8, KOFF(ki_sigignore),
+	{"cpu", "CPU", NULL, 0, kvar, KOFF(ki_estcpu), UINT, "d", 0},
+	{"cputime", "", "time", 0, NULL, 0, CHAR, NULL, 0},
+	{"egid", "", "gid", 0, NULL, 0, CHAR, NULL, 0},
+	{"egroup", "", "group", 0, NULL, 0, CHAR, NULL, 0},
+	{"emul", "EMUL", NULL, LJUST, emulname, 0, CHAR, NULL, 0},
+	{"etime", "ELAPSED", NULL, USER, elapsed, 0, CHAR, NULL, 0},
+	{"etimes", "ELAPSED", NULL, USER, elapseds, 0, CHAR, NULL, 0},
+	{"euid", "", "uid", 0, NULL, 0, CHAR, NULL, 0},
+	{"f", "F", NULL, 0, kvar, KOFF(ki_flag), INT, "x", 0},
+	{"flags", "", "f", 0, NULL, 0, CHAR, NULL, 0},
+	{"gid", "GID", NULL, 0, kvar, KOFF(ki_groups), UINT, UIDFMT, 0},
+	{"group", "GROUP", NULL, LJUST, egroupname, 0, CHAR, NULL, 0},
+	{"ignored", "", "sigignore", 0, NULL, 0, CHAR, NULL, 0},
+	{"inblk", "INBLK", NULL, USER, rvar, ROFF(ru_inblock), LONG, "ld", 0},
+	{"inblock", "", "inblk", 0, NULL, 0, CHAR, NULL, 0},
+	{"jid", "JID", NULL, 0, kvar, KOFF(ki_jid), INT, "d", 0},
+	{"jobc", "JOBC", NULL, 0, kvar, KOFF(ki_jobc), SHORT, "d", 0},
+	{"ktrace", "KTRACE", NULL, 0, kvar, KOFF(ki_traceflag), INT, "x", 0},
+	{"label", "LABEL", NULL, LJUST, label, 0, CHAR, NULL, 0},
+	{"lim", "LIM", NULL, 0, maxrss, 0, CHAR, NULL, 0},
+	{"lockname", "LOCK", NULL, LJUST, lockname, 0, CHAR, NULL, 0},
+	{"login", "LOGIN", NULL, LJUST, logname, 0, CHAR, NULL, 0},
+	{"logname", "", "login", 0, NULL, 0, CHAR, NULL, 0},
+	{"lstart", "STARTED", NULL, LJUST|USER, lstarted, 0, CHAR, NULL, 0},
+	{"lwp", "LWP", NULL, 0, kvar, KOFF(ki_tid), UINT, LWPFMT, 0},
+	{"majflt", "MAJFLT", NULL, USER, rvar, ROFF(ru_majflt), LONG, "ld", 0},
+	{"minflt", "MINFLT", NULL, USER, rvar, ROFF(ru_minflt), LONG, "ld", 0},
+	{"msgrcv", "MSGRCV", NULL, USER, rvar, ROFF(ru_msgrcv), LONG, "ld", 0},
+	{"msgsnd", "MSGSND", NULL, USER, rvar, ROFF(ru_msgsnd), LONG, "ld", 0},
+	{"mwchan", "MWCHAN", NULL, LJUST, mwchan, 0, CHAR, NULL, 0},
+	{"ni", "", "nice", 0, NULL, 0, CHAR, NULL, 0},
+	{"nice", "NI", NULL, 0, kvar, KOFF(ki_nice), CHAR, "d", 0},
+	{"nivcsw", "NIVCSW", NULL, USER, rvar, ROFF(ru_nivcsw), LONG, "ld", 0},
+	{"nlwp", "NLWP", NULL, 0, kvar, KOFF(ki_numthreads), UINT, NLWPFMT, 0},
+	{"nsignals", "", "nsigs", 0, NULL, 0, CHAR, NULL, 0},
+	{"nsigs", "NSIGS", NULL, USER, rvar, ROFF(ru_nsignals), LONG, "ld", 0},
+	{"nswap", "NSWAP", NULL, USER, rvar, ROFF(ru_nswap), LONG, "ld", 0},
+	{"nvcsw", "NVCSW", NULL, USER, rvar, ROFF(ru_nvcsw), LONG, "ld", 0},
+	{"nwchan", "NWCHAN", NULL, LJUST, nwchan, 0, CHAR, NULL, 0},
+	{"oublk", "OUBLK", NULL, USER, rvar, ROFF(ru_oublock), LONG, "ld", 0},
+	{"oublock", "", "oublk", 0, NULL, 0, CHAR, NULL, 0},
+	{"paddr", "PADDR", NULL, 0, kvar, KOFF(ki_paddr), KPTR, "lx", 0},
+	{"pagein", "PAGEIN", NULL, USER, pagein, 0, CHAR, NULL, 0},
+	{"pcpu", "", "%cpu", 0, NULL, 0, CHAR, NULL, 0},
+	{"pending", "", "sig", 0, NULL, 0, CHAR, NULL, 0},
+	{"pgid", "PGID", NULL, 0, kvar, KOFF(ki_pgid), UINT, PIDFMT, 0},
+	{"pid", "PID", NULL, 0, kvar, KOFF(ki_pid), UINT, PIDFMT, 0},
+	{"pmem", "", "%mem", 0, NULL, 0, CHAR, NULL, 0},
+	{"ppid", "PPID", NULL, 0, kvar, KOFF(ki_ppid), UINT, PIDFMT, 0},
+	{"pri", "PRI", NULL, 0, pri, 0, CHAR, NULL, 0},
+	{"re", "RE", NULL, INF127, kvar, KOFF(ki_swtime), UINT, "d", 0},
+	{"rgid", "RGID", NULL, 0, kvar, KOFF(ki_rgid), UINT, UIDFMT, 0},
+	{"rgroup", "RGROUP", NULL, LJUST, rgroupname, 0, CHAR, NULL, 0},
+	{"rss", "RSS", NULL, 0, kvar, KOFF(ki_rssize), PGTOK, "ld", 0},
+	{"rtprio", "RTPRIO", NULL, 0, priorityr, KOFF(ki_pri), CHAR, NULL, 0},
+	{"ruid", "RUID", NULL, 0, kvar, KOFF(ki_ruid), UINT, UIDFMT, 0},
+	{"ruser", "RUSER", NULL, LJUST, runame, 0, CHAR, NULL, 0},
+	{"sid", "SID", NULL, 0, kvar, KOFF(ki_sid), UINT, PIDFMT, 0},
+	{"sig", "PENDING", NULL, 0, kvar, KOFF(ki_siglist), INT, "x", 0},
+	{"sigcatch", "CAUGHT", NULL, 0, kvar, KOFF(ki_sigcatch), UINT, "x", 0},
+	{"sigignore", "IGNORED", NULL, 0, kvar, KOFF(ki_sigignore),
 		UINT, "x", 0},
-	{"sigmask", "BLOCKED", NULL, 0, kvar, NULL, 8, KOFF(ki_sigmask),
-		UINT, "x", 0},
-	{"sl", "SL", NULL, INF127, kvar, NULL, 3, KOFF(ki_slptime), UINT, "d",
-		0},
-	{"start", "STARTED", NULL, LJUST|USER, started, NULL, 7, 0, CHAR, NULL,
-		0},
-	{"stat", "", "state", 0, NULL, NULL, 0, 0, CHAR, NULL, 0},
-	{"state", "STAT", NULL, 0, state, NULL, 4, 0, CHAR, NULL, 0},
-	{"svgid", "SVGID", NULL, 0, kvar, NULL, UIDLEN, KOFF(ki_svgid),
-		UINT, UIDFMT, 0},
-	{"svuid", "SVUID", NULL, 0, kvar, NULL, UIDLEN, KOFF(ki_svuid),
-		UINT, UIDFMT, 0},
-	{"systime", "SYSTIME", NULL, USER, systime, s_systime, 15, 0, CHAR,
-		NULL, 0},
-	{"tdaddr", "TDADDR", NULL, 0, kvar, NULL, sizeof(void *) * 2,
-		KOFF(ki_tdaddr), KPTR, "lx", 0},
-	{"tdev", "TDEV", NULL, 0, tdev, NULL, 5, 0, CHAR, NULL, 0},
-	{"tdnam", "TDNAM", NULL, LJUST, tdnam, NULL, COMMLEN, 0, CHAR, NULL, 0},
-	{"time", "TIME", NULL, USER, cputime, s_cputime, 15, 0, CHAR,
-		NULL, 0},
-	{"tpgid", "TPGID", NULL, 0, kvar, NULL, 4, KOFF(ki_tpgid), UINT,
-		PIDFMT, 0},
-	{"tsid", "TSID", NULL, 0, kvar, NULL, PIDLEN, KOFF(ki_tsid), UINT,
-		PIDFMT, 0},
-	{"tsiz", "TSIZ", NULL, 0, kvar, NULL, 4, KOFF(ki_tsize), PGTOK, "ld", 0},
-	{"tt", "TT ", NULL, 0, tname, NULL, 4, 0, CHAR, NULL, 0},
-	{"tty", "TTY", NULL, LJUST, longtname, NULL, 8, 0, CHAR, NULL, 0},
-	{"ucomm", "UCOMM", NULL, LJUST, ucomm, s_comm,
-		COMMLEN + TDNAMLEN + 1, 0, CHAR, NULL, 0},
-	{"uid", "UID", NULL, 0, kvar, NULL, UIDLEN, KOFF(ki_uid), UINT,
-		UIDFMT, 0},
-	{"upr", "UPR", NULL, 0, upr, NULL, 3, 0, CHAR, NULL, 0},
-	{"uprocp", "UPROCP", NULL, 0, kvar, NULL, sizeof(void *) * 2,
-		KOFF(ki_paddr), KPTR, "lx", 0},
-	{"user", "USER", NULL, LJUST, uname, s_uname, USERLEN, 0, CHAR,
-		NULL, 0},
-	{"usertime", "USERTIME", NULL, USER, usertime, s_usertime, 15, 0,
-		CHAR, NULL, 0},
-	{"usrpri", "", "upr", 0, NULL, NULL, 0, 0, CHAR, NULL, 0},
-	{"vsize", "", "vsz", 0, NULL, NULL, 0, 0, CHAR, NULL, 0},
-	{"vsz", "VSZ", NULL, 0, vsize, NULL, 6, 0, CHAR, NULL, 0},
-	{"wchan", "WCHAN", NULL, LJUST, wchan, NULL, 6, 0, CHAR, NULL, 0},
-	{"xstat", "XSTAT", NULL, 0, kvar, NULL, 4, KOFF(ki_xstat), USHORT,
-		"x", 0},
-	{"", NULL, NULL, 0, NULL, NULL, 0, 0, CHAR, NULL, 0},
+	{"sigmask", "BLOCKED", NULL, 0, kvar, KOFF(ki_sigmask), UINT, "x", 0},
+	{"sl", "SL", NULL, INF127, kvar, KOFF(ki_slptime), UINT, "d", 0},
+	{"start", "STARTED", NULL, LJUST|USER, started, 0, CHAR, NULL, 0},
+	{"stat", "", "state", 0, NULL, 0, CHAR, NULL, 0},
+	{"state", "STAT", NULL, LJUST, state, 0, CHAR, NULL, 0},
+	{"svgid", "SVGID", NULL, 0, kvar, KOFF(ki_svgid), UINT, UIDFMT, 0},
+	{"svuid", "SVUID", NULL, 0, kvar, KOFF(ki_svuid), UINT, UIDFMT, 0},
+	{"systime", "SYSTIME", NULL, USER, systime, 0, CHAR, NULL, 0},
+	{"tdaddr", "TDADDR", NULL, 0, kvar, KOFF(ki_tdaddr), KPTR, "lx", 0},
+	{"tdev", "TDEV", NULL, 0, tdev, 0, CHAR, NULL, 0},
+	{"tdnam", "TDNAM", NULL, LJUST, tdnam, 0, CHAR, NULL, 0},
+	{"time", "TIME", NULL, USER, cputime, 0, CHAR, NULL, 0},
+	{"tpgid", "TPGID", NULL, 0, kvar, KOFF(ki_tpgid), UINT, PIDFMT, 0},
+	{"tsid", "TSID", NULL, 0, kvar, KOFF(ki_tsid), UINT, PIDFMT, 0},
+	{"tsiz", "TSIZ", NULL, 0, kvar, KOFF(ki_tsize), PGTOK, "ld", 0},
+	{"tt", "TT ", NULL, 0, tname, 0, CHAR, NULL, 0},
+	{"tty", "TTY", NULL, LJUST, longtname, 0, CHAR, NULL, 0},
+	{"ucomm", "UCOMM", NULL, LJUST, ucomm, 0, CHAR, NULL, 0},
+	{"uid", "UID", NULL, 0, kvar, KOFF(ki_uid), UINT, UIDFMT, 0},
+	{"upr", "UPR", NULL, 0, upr, 0, CHAR, NULL, 0},
+	{"uprocp", "UPROCP", NULL, 0, kvar, KOFF(ki_paddr), KPTR, "lx", 0},
+	{"user", "USER", NULL, LJUST, uname, 0, CHAR, NULL, 0},
+	{"usertime", "USERTIME", NULL, USER, usertime, 0, CHAR, NULL, 0},
+	{"usrpri", "", "upr", 0, NULL, 0, CHAR, NULL, 0},
+	{"vsize", "", "vsz", 0, NULL, 0, CHAR, NULL, 0},
+	{"vsz", "VSZ", NULL, 0, vsize, 0, CHAR, NULL, 0},
+	{"wchan", "WCHAN", NULL, LJUST, wchan, 0, CHAR, NULL, 0},
+	{"xstat", "XSTAT", NULL, 0, kvar, KOFF(ki_xstat), USHORT, "x", 0},
+	{"", NULL, NULL, 0, NULL, 0, CHAR, NULL, 0},
 };
 
 void

Modified: projects/zfsd/head/bin/ps/print.c
==============================================================================
--- projects/zfsd/head/bin/ps/print.c	Sat Oct  1 15:10:33 2011	(r225904)
+++ projects/zfsd/head/bin/ps/print.c	Sat Oct  1 16:08:03 2011	(r225905)
@@ -64,6 +64,9 @@ __FBSDID("$FreeBSD$");
 
 #include "ps.h"
 
+#define	COMMAND_WIDTH	16
+#define	ARGUMENTS_WIDTH	16
+
 #define	ps_pgtok(a)	(((a) * getpagesize()) / 1024)
 
 void
@@ -93,53 +96,42 @@ printheader(void)
 	(void)putchar('\n');
 }
 
-void
+char *
 arguments(KINFO *k, VARENT *ve)
 {
 	VAR *v;
-	int left;
-	char *cp, *vis_args;
+	char *vis_args;
 
 	v = ve->var;
 	if ((vis_args = malloc(strlen(k->ki_args) * 4 + 1)) == NULL)
 		errx(1, "malloc failed");
 	strvis(vis_args, k->ki_args, VIS_TAB | VIS_NL | VIS_NOSLASH);
-	if (STAILQ_NEXT(ve, next_ve) == NULL) {
-		/* last field */
-		if (termwidth == UNLIMITED) {
-			(void)printf("%s", vis_args);
-		} else {
-			left = termwidth - (totwidth - v->width);
-			if (left < 1) /* already wrapped, just use std width */
-				left = v->width;
-			for (cp = vis_args; --left >= 0 && *cp != '\0';)
-				(void)putchar(*cp++);
-		}
-	} else {
-		(void)printf("%-*.*s", v->width, v->width, vis_args);
-	}
-	free(vis_args);
+
+	if (STAILQ_NEXT(ve, next_ve) != NULL && strlen(vis_args) > ARGUMENTS_WIDTH)
+		vis_args[ARGUMENTS_WIDTH] = '\0';
+
+	return (vis_args);
 }
 
-void
+char *
 command(KINFO *k, VARENT *ve)
 {
 	VAR *v;
-	int left;
-	char *cp, *vis_env, *vis_args;
+	char *vis_args, *vis_env, *str;
 
 	v = ve->var;
 	if (cflag) {
 		/* If it is the last field, then don't pad */
 		if (STAILQ_NEXT(ve, next_ve) == NULL) {
-			if (k->ki_d.prefix)
-				(void)printf("%s", k->ki_d.prefix);
-			(void)printf("%s", k->ki_p->ki_comm);
-			if (showthreads && k->ki_p->ki_numthreads > 1)
-				(void)printf("/%s", k->ki_p->ki_tdname);
+			asprintf(&str, "%s%s%s%s",
+			    k->ki_d.prefix ? k->ki_d.prefix : "",
+			    k->ki_p->ki_comm,
+			    (showthreads && k->ki_p->ki_numthreads > 1) ? "/" : "",
+			    (showthreads && k->ki_p->ki_numthreads > 1) ? k->ki_p->ki_tdname : "");
 		} else
-			(void)printf("%-*s", v->width, k->ki_p->ki_comm);
-		return;
+			str = strdup(k->ki_p->ki_comm);
+
+		return (str);
 	}
 	if ((vis_args = malloc(strlen(k->ki_args) * 4 + 1)) == NULL)
 		errx(1, "malloc failed");
@@ -157,89 +149,84 @@ command(KINFO *k, VARENT *ve)
 		} else
 			vis_env = NULL;
 
-		if (termwidth == UNLIMITED) {
-			if (k->ki_d.prefix)
-				(void)printf("%s", k->ki_d.prefix);
-			if (vis_env)
-				(void)printf("%s ", vis_env);
-			(void)printf("%s", vis_args);
-		} else {
-			left = termwidth - (totwidth - v->width);
-			if (left < 1) /* already wrapped, just use std width */
-				left = v->width;
-			if ((cp = k->ki_d.prefix) != NULL)
-				while (--left >= 0 && *cp)
-					(void)putchar(*cp++);
-			if ((cp = vis_env) != NULL) {
-				while (--left >= 0 && *cp)
-					(void)putchar(*cp++);
-				if (--left >= 0)
-					putchar(' ');
-			}
-			for (cp = vis_args; --left >= 0 && *cp != '\0';)
-				(void)putchar(*cp++);
-		}
+		asprintf(&str, "%s%s%s%s",
+		    k->ki_d.prefix ? k->ki_d.prefix : "",
+		    vis_env ? vis_env : "",
+		    vis_env ? " " : "",
+		    vis_args);
+
 		if (vis_env != NULL)
 			free(vis_env);
-	} else
+		free(vis_args);
+	} else {
 		/* ki_d.prefix & ki_env aren't shown for interim fields */
-		(void)printf("%-*.*s", v->width, v->width, vis_args);
-	free(vis_args);
+		str = vis_args;
+
+		if (strlen(str) > COMMAND_WIDTH)
+			str[COMMAND_WIDTH] = '\0';
+	}
+
+	return (str);
 }
 
-void
+char *
 ucomm(KINFO *k, VARENT *ve)
 {
-	char tmpbuff[COMMLEN + TDNAMLEN + 2];
 	VAR *v;
+	char *str;
 
 	v = ve->var;
 	if (STAILQ_NEXT(ve, next_ve) == NULL) {	/* last field, don't pad */
-		if (k->ki_d.prefix)
-			(void)printf("%s", k->ki_d.prefix);
-		(void)printf("%s", k->ki_p->ki_comm);
-		if (showthreads && k->ki_p->ki_numthreads > 1)
-			printf("/%s", k->ki_p->ki_tdname);
+		asprintf(&str, "%s%s%s%s",
+		    k->ki_d.prefix ? k->ki_d.prefix : "",
+		    k->ki_p->ki_comm,
+		    (showthreads && k->ki_p->ki_numthreads > 1) ? "/" : "",
+		    (showthreads && k->ki_p->ki_numthreads > 1) ? k->ki_p->ki_tdname : "");
 	} else {
-		bzero(tmpbuff, sizeof(tmpbuff));
 		if (showthreads && k->ki_p->ki_numthreads > 1)
-			sprintf(tmpbuff, "%s/%s", k->ki_p->ki_comm,
-			    k->ki_p->ki_tdname);
+			asprintf(&str, "%s/%s", k->ki_p->ki_comm, k->ki_p->ki_tdname);
 		else
-			sprintf(tmpbuff, "%s", k->ki_p->ki_comm);
-		(void)printf("%-*s", v->width, tmpbuff);
+			str = strdup(k->ki_p->ki_comm);
 	}
+	return (str);
 }
 
-void
+char *
 tdnam(KINFO *k, VARENT *ve)
 {
 	VAR *v;
+	char *str;
 
 	v = ve->var;
 	if (showthreads && k->ki_p->ki_numthreads > 1)
-		(void)printf("%-*s", v->width, k->ki_p->ki_tdname);
+		str = strdup(k->ki_p->ki_tdname);
 	else
-		(void)printf("%-*s", v->width, "      ");
+		str = strdup("      ");
+
+	return (str);
 }
 
-void
+char *
 logname(KINFO *k, VARENT *ve)
 {
 	VAR *v;
-	char *s;
 
 	v = ve->var;
-	(void)printf("%-*s", v->width, (s = k->ki_p->ki_login, *s) ? s : "-");
+	if (*k->ki_p->ki_login == '\0')
+		return (NULL);
+	return (strdup(k->ki_p->ki_login));
 }
 
-void
+char *
 state(KINFO *k, VARENT *ve)
 {
 	int flag, tdflags;
-	char *cp;
+	char *cp, *buf;
 	VAR *v;
-	char buf[16];
+
+	buf = malloc(16);
+	if (buf == NULL)
+		errx(1, "malloc failed");
 
 	v = ve->var;
 	flag = k->ki_p->ki_flag;
@@ -301,278 +288,270 @@ state(KINFO *k, VARENT *ve)
 	if (flag & P_JAILED)
 		*cp++ = 'J';
 	*cp = '\0';
-	(void)printf("%-*s", v->width, buf);
+	return (buf);
 }
 
 #define	scalepri(x)	((x) - PZERO)
 
-void
+char *
 pri(KINFO *k, VARENT *ve)
 {
 	VAR *v;
+	char *str;
 
 	v = ve->var;
-	(void)printf("%*d", v->width, scalepri(k->ki_p->ki_pri.pri_level));
+	asprintf(&str, "%d", scalepri(k->ki_p->ki_pri.pri_level));
+	return (str);
 }
 
-void
+char *
 upr(KINFO *k, VARENT *ve)
 {
 	VAR *v;
+	char *str;
 
 	v = ve->var;
-	(void)printf("%*d", v->width, scalepri(k->ki_p->ki_pri.pri_user));
+	asprintf(&str, "%d", scalepri(k->ki_p->ki_pri.pri_user));
+	return (str);
 }
 #undef scalepri
 
-void
+char *
 uname(KINFO *k, VARENT *ve)
 {
 	VAR *v;
 
 	v = ve->var;
-	(void)printf("%-*s", v->width, user_from_uid(k->ki_p->ki_uid, 0));
-}
-
-int
-s_uname(KINFO *k)
-{
-	return (strlen(user_from_uid(k->ki_p->ki_uid, 0)));
+	return (strdup(user_from_uid(k->ki_p->ki_uid, 0)));
 }
 
-void
+char *
 egroupname(KINFO *k, VARENT *ve)
 {
 	VAR *v;
 
 	v = ve->var;
-	(void)printf("%-*s", v->width,
-	    group_from_gid(k->ki_p->ki_groups[0], 0));
-}
-
-int
-s_egroupname(KINFO *k)
-{
-	return (strlen(group_from_gid(k->ki_p->ki_groups[0], 0)));
+	return (strdup(group_from_gid(k->ki_p->ki_groups[0], 0)));
 }
 
-void
+char *
 rgroupname(KINFO *k, VARENT *ve)
 {
 	VAR *v;
 
 	v = ve->var;
-	(void)printf("%-*s", v->width, group_from_gid(k->ki_p->ki_rgid, 0));
-}
-
-int
-s_rgroupname(KINFO *k)
-{
-	return (strlen(group_from_gid(k->ki_p->ki_rgid, 0)));
+	return (strdup(group_from_gid(k->ki_p->ki_rgid, 0)));
 }
 
-void
+char *
 runame(KINFO *k, VARENT *ve)
 {
 	VAR *v;
 
 	v = ve->var;
-	(void)printf("%-*s", v->width, user_from_uid(k->ki_p->ki_ruid, 0));
+	return (strdup(user_from_uid(k->ki_p->ki_ruid, 0)));
 }
 
-int
-s_runame(KINFO *k)
-{
-	return (strlen(user_from_uid(k->ki_p->ki_ruid, 0)));
-}
-
-
-void
+char *
 tdev(KINFO *k, VARENT *ve)
 {
 	VAR *v;
 	dev_t dev;
-	char buff[16];
+	char *str;
 
 	v = ve->var;
 	dev = k->ki_p->ki_tdev;
 	if (dev == NODEV)
-		(void)printf("%*s", v->width, "??");
-	else {
-		(void)snprintf(buff, sizeof(buff),
-		    "%d/%d", major(dev), minor(dev));
-		(void)printf("%*s", v->width, buff);
-	}
+		str = strdup("??");
+	else
+		asprintf(&str, "%#jx", (uintmax_t)dev);
+

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

More information about the svn-src-projects mailing list