Date: Sat, 17 Nov 2012 11:55:20 +0000 (UTC) From: Alexander Motin <mav@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r243182 - in projects/calloutng: . bin/df bin/ls bin/mv bin/sh cddl/contrib/opensolaris/cmd/zpool cddl/contrib/opensolaris/cmd/ztest cddl/contrib/opensolaris/lib/libdtrace/powerpc cddl/... Message-ID: <201211171155.qAHBtKtb094373@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mav Date: Sat Nov 17 11:55:19 2012 New Revision: 243182 URL: http://svnweb.freebsd.org/changeset/base/243182 Log: MFC Added: projects/calloutng/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7 - copied unchanged from r243181, head/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7 projects/calloutng/cddl/contrib/opensolaris/lib/libdtrace/powerpc/ - copied from r243181, head/cddl/contrib/opensolaris/lib/libdtrace/powerpc/ projects/calloutng/contrib/atf/FREEBSD-Xlist - copied unchanged from r243181, head/contrib/atf/FREEBSD-Xlist projects/calloutng/contrib/atf/FREEBSD-upgrade - copied unchanged from r243181, head/contrib/atf/FREEBSD-upgrade projects/calloutng/contrib/bmake/unit-tests/order - copied unchanged from r243181, head/contrib/bmake/unit-tests/order projects/calloutng/lib/libc/gen/waitid.c - copied unchanged from r243181, head/lib/libc/gen/waitid.c projects/calloutng/lib/libcrypt/tests/ - copied from r243181, head/lib/libcrypt/tests/ projects/calloutng/share/mk/atf.test.mk - copied unchanged from r243181, head/share/mk/atf.test.mk projects/calloutng/share/mk/bsd.test.mk - copied unchanged from r243181, head/share/mk/bsd.test.mk projects/calloutng/sys/boot/forth/menusets.4th - copied unchanged from r243181, head/sys/boot/forth/menusets.4th projects/calloutng/sys/boot/forth/menusets.4th.8 - copied unchanged from r243181, head/sys/boot/forth/menusets.4th.8 projects/calloutng/sys/cddl/contrib/opensolaris/uts/powerpc/ - copied from r243181, head/sys/cddl/contrib/opensolaris/uts/powerpc/ projects/calloutng/sys/cddl/dev/dtrace/powerpc/ - copied from r243181, head/sys/cddl/dev/dtrace/powerpc/ projects/calloutng/sys/dev/ath/if_ath_alq.c - copied unchanged from r243181, head/sys/dev/ath/if_ath_alq.c projects/calloutng/sys/dev/ath/if_ath_alq.h - copied unchanged from r243181, head/sys/dev/ath/if_ath_alq.h projects/calloutng/sys/mips/cavium/octeon_pci_console.c - copied unchanged from r243181, head/sys/mips/cavium/octeon_pci_console.c projects/calloutng/tools/regression/bin/sh/builtins/alias3.0 - copied unchanged from r243181, head/tools/regression/bin/sh/builtins/alias3.0 projects/calloutng/tools/regression/bin/sh/builtins/alias3.0.stdout - copied unchanged from r243181, head/tools/regression/bin/sh/builtins/alias3.0.stdout projects/calloutng/tools/regression/bin/sh/parser/alias10.0 - copied unchanged from r243181, head/tools/regression/bin/sh/parser/alias10.0 projects/calloutng/tools/regression/bin/sh/parser/alias9.0 - copied unchanged from r243181, head/tools/regression/bin/sh/parser/alias9.0 projects/calloutng/tools/tools/ath/athalq/ - copied from r243181, head/tools/tools/ath/athalq/ Deleted: projects/calloutng/cddl/contrib/opensolaris/cmd/zpool/zpool-features.5 Modified: projects/calloutng/Makefile.inc1 projects/calloutng/ObsoleteFiles.inc projects/calloutng/bin/df/df.1 projects/calloutng/bin/df/df.c projects/calloutng/bin/ls/cmp.c projects/calloutng/bin/ls/extern.h projects/calloutng/bin/ls/ls.1 projects/calloutng/bin/ls/ls.c projects/calloutng/bin/ls/ls.h projects/calloutng/bin/ls/print.c projects/calloutng/bin/ls/util.c projects/calloutng/bin/mv/mv.c projects/calloutng/bin/sh/alias.c projects/calloutng/bin/sh/input.c projects/calloutng/bin/sh/input.h projects/calloutng/cddl/contrib/opensolaris/cmd/zpool/zpool.8 projects/calloutng/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c projects/calloutng/cddl/contrib/opensolaris/cmd/ztest/ztest.c projects/calloutng/cddl/lib/Makefile projects/calloutng/cddl/lib/libdtrace/Makefile projects/calloutng/cddl/sbin/zpool/Makefile projects/calloutng/cddl/usr.sbin/Makefile projects/calloutng/contrib/atf/atf-c/macros.h projects/calloutng/contrib/atf/atf-run/requirements_test.cpp projects/calloutng/contrib/atf/atf-sh/atf_check_test.sh projects/calloutng/contrib/atf/doc/atf-test-case.4 projects/calloutng/contrib/bmake/ChangeLog projects/calloutng/contrib/bmake/FILES projects/calloutng/contrib/bmake/Makefile.in projects/calloutng/contrib/bmake/cond.c projects/calloutng/contrib/bmake/make.c projects/calloutng/contrib/bmake/unit-tests/Makefile.in projects/calloutng/contrib/bmake/unit-tests/test.exp projects/calloutng/contrib/gdb/gdb/c-valprint.c projects/calloutng/contrib/gdb/gdb/cp-valprint.c projects/calloutng/contrib/gdb/gdb/dwarf2loc.c projects/calloutng/contrib/gdb/gdb/f-valprint.c projects/calloutng/contrib/gdb/gdb/frame.c projects/calloutng/contrib/gdb/gdb/jv-valprint.c projects/calloutng/contrib/gdb/gdb/p-valprint.c projects/calloutng/contrib/gdb/gdb/scm-valprint.c projects/calloutng/contrib/gdb/gdb/stack.c projects/calloutng/contrib/gdb/gdb/valprint.c projects/calloutng/contrib/gdb/gdb/value.h projects/calloutng/contrib/gdb/gdb/varobj.c projects/calloutng/contrib/jemalloc/ChangeLog projects/calloutng/contrib/jemalloc/FREEBSD-diffs projects/calloutng/contrib/jemalloc/VERSION projects/calloutng/contrib/jemalloc/doc/jemalloc.3 projects/calloutng/contrib/jemalloc/include/jemalloc/internal/arena.h projects/calloutng/contrib/jemalloc/include/jemalloc/internal/chunk.h projects/calloutng/contrib/jemalloc/include/jemalloc/internal/chunk_dss.h projects/calloutng/contrib/jemalloc/include/jemalloc/internal/chunk_mmap.h projects/calloutng/contrib/jemalloc/include/jemalloc/internal/ctl.h projects/calloutng/contrib/jemalloc/include/jemalloc/internal/extent.h projects/calloutng/contrib/jemalloc/include/jemalloc/internal/huge.h projects/calloutng/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal.h projects/calloutng/contrib/jemalloc/include/jemalloc/internal/private_namespace.h projects/calloutng/contrib/jemalloc/include/jemalloc/internal/prof.h projects/calloutng/contrib/jemalloc/include/jemalloc/internal/rtree.h projects/calloutng/contrib/jemalloc/include/jemalloc/jemalloc.h projects/calloutng/contrib/jemalloc/include/jemalloc/jemalloc_defs.h projects/calloutng/contrib/jemalloc/src/arena.c projects/calloutng/contrib/jemalloc/src/base.c projects/calloutng/contrib/jemalloc/src/chunk.c projects/calloutng/contrib/jemalloc/src/chunk_dss.c projects/calloutng/contrib/jemalloc/src/chunk_mmap.c projects/calloutng/contrib/jemalloc/src/ctl.c projects/calloutng/contrib/jemalloc/src/huge.c projects/calloutng/contrib/jemalloc/src/jemalloc.c projects/calloutng/contrib/jemalloc/src/mutex.c projects/calloutng/contrib/jemalloc/src/prof.c projects/calloutng/contrib/jemalloc/src/rtree.c projects/calloutng/contrib/jemalloc/src/stats.c projects/calloutng/contrib/jemalloc/src/tcache.c projects/calloutng/contrib/jemalloc/src/util.c projects/calloutng/contrib/libc++/include/__config projects/calloutng/contrib/libc++/include/__functional_base projects/calloutng/contrib/libc++/include/__functional_base_03 projects/calloutng/contrib/libc++/include/__locale projects/calloutng/contrib/libc++/include/__mutex_base projects/calloutng/contrib/libc++/include/algorithm projects/calloutng/contrib/libc++/include/cmath projects/calloutng/contrib/libc++/include/complex projects/calloutng/contrib/libc++/include/condition_variable projects/calloutng/contrib/libc++/include/cstddef projects/calloutng/contrib/libc++/include/ext/__hash projects/calloutng/contrib/libc++/include/future projects/calloutng/contrib/libc++/include/ios projects/calloutng/contrib/libc++/include/istream projects/calloutng/contrib/libc++/include/iterator projects/calloutng/contrib/libc++/include/locale projects/calloutng/contrib/libc++/include/memory projects/calloutng/contrib/libc++/include/ostream projects/calloutng/contrib/libc++/include/random projects/calloutng/contrib/libc++/include/streambuf projects/calloutng/contrib/libc++/include/string projects/calloutng/contrib/libc++/include/system_error projects/calloutng/contrib/libc++/include/tuple projects/calloutng/contrib/libc++/include/type_traits projects/calloutng/contrib/libc++/include/utility projects/calloutng/contrib/libc++/include/valarray projects/calloutng/contrib/libc++/include/vector projects/calloutng/contrib/libc++/src/memory.cpp projects/calloutng/contrib/llvm/lib/Target/X86/X86Subtarget.cpp projects/calloutng/contrib/top/commands.c projects/calloutng/contrib/tzdata/africa projects/calloutng/contrib/tzdata/asia projects/calloutng/contrib/tzdata/australasia projects/calloutng/contrib/tzdata/europe projects/calloutng/contrib/tzdata/northamerica projects/calloutng/contrib/tzdata/southamerica projects/calloutng/crypto/heimdal/lib/sl/slc-lex.l projects/calloutng/etc/Makefile projects/calloutng/etc/atf/FreeBSD.conf projects/calloutng/etc/atf/common.conf projects/calloutng/etc/pccard_ether projects/calloutng/etc/rc.d/jail projects/calloutng/games/fortune/datfiles/fortunes projects/calloutng/games/fortune/fortune/fortune.c projects/calloutng/include/xlocale/_ctype.h projects/calloutng/lib/Makefile projects/calloutng/lib/atf/libatf-c++/Makefile projects/calloutng/lib/libc/gen/Makefile.inc projects/calloutng/lib/libc/gen/Symbol.map projects/calloutng/lib/libc/gen/getbsize.3 projects/calloutng/lib/libc/gen/isnan.c projects/calloutng/lib/libc/include/namespace.h projects/calloutng/lib/libc/include/un-namespace.h projects/calloutng/lib/libc/net/getnetent.3 projects/calloutng/lib/libc/net/getprotoent.3 projects/calloutng/lib/libc/net/getservent.3 projects/calloutng/lib/libc/stdio/printf.3 projects/calloutng/lib/libc/sys/Makefile.inc projects/calloutng/lib/libc/sys/Symbol.map projects/calloutng/lib/libc/sys/rtprio.2 projects/calloutng/lib/libc/sys/sendfile.2 projects/calloutng/lib/libc/sys/wait.2 projects/calloutng/lib/libfetch/http.c projects/calloutng/lib/libproc/proc_bkpt.c projects/calloutng/lib/libproc/proc_regs.c projects/calloutng/lib/msun/src/k_rem_pio2.c projects/calloutng/lib/msun/src/s_isnan.c projects/calloutng/release/Makefile projects/calloutng/release/doc/share/xml/release.ent projects/calloutng/sbin/fsck_ffs/suj.c projects/calloutng/sbin/ifconfig/ifconfig.8 projects/calloutng/sbin/route/route.c projects/calloutng/sbin/umount/umount.c projects/calloutng/secure/usr.bin/bdes/bdes.1 projects/calloutng/share/man/man4/icmp6.4 projects/calloutng/share/man/man4/ipsec.4 projects/calloutng/share/man/man4/lagg.4 projects/calloutng/share/man/man4/ng_UI.4 projects/calloutng/share/man/man4/ng_async.4 projects/calloutng/share/man/man4/ng_atmllc.4 projects/calloutng/share/man/man4/ng_bluetooth.4 projects/calloutng/share/man/man4/ng_bpf.4 projects/calloutng/share/man/man4/ng_bridge.4 projects/calloutng/share/man/man4/ng_bt3c.4 projects/calloutng/share/man/man4/ng_btsocket.4 projects/calloutng/share/man/man4/ng_car.4 projects/calloutng/share/man/man4/ng_ccatm.4 projects/calloutng/share/man/man4/ng_cisco.4 projects/calloutng/share/man/man4/ng_deflate.4 projects/calloutng/share/man/man4/ng_eiface.4 projects/calloutng/share/man/man4/ng_etf.4 projects/calloutng/share/man/man4/ng_ether.4 projects/calloutng/share/man/man4/ng_fec.4 projects/calloutng/share/man/man4/ng_frame_relay.4 projects/calloutng/share/man/man4/ng_gif.4 projects/calloutng/share/man/man4/ng_gif_demux.4 projects/calloutng/share/man/man4/ng_h4.4 projects/calloutng/share/man/man4/ng_hci.4 projects/calloutng/share/man/man4/ng_hole.4 projects/calloutng/share/man/man4/ng_hub.4 projects/calloutng/share/man/man4/ng_iface.4 projects/calloutng/share/man/man4/ng_ksocket.4 projects/calloutng/share/man/man4/ng_l2cap.4 projects/calloutng/share/man/man4/ng_l2tp.4 projects/calloutng/share/man/man4/ng_lmi.4 projects/calloutng/share/man/man4/ng_mppc.4 projects/calloutng/share/man/man4/ng_nat.4 projects/calloutng/share/man/man4/ng_netflow.4 projects/calloutng/share/man/man4/ng_one2many.4 projects/calloutng/share/man/man4/ng_patch.4 projects/calloutng/share/man/man4/ng_ppp.4 projects/calloutng/share/man/man4/ng_pppoe.4 projects/calloutng/share/man/man4/ng_pptpgre.4 projects/calloutng/share/man/man4/ng_pred1.4 projects/calloutng/share/man/man4/ng_rfc1490.4 projects/calloutng/share/man/man4/ng_source.4 projects/calloutng/share/man/man4/ng_split.4 projects/calloutng/share/man/man4/ng_sppp.4 projects/calloutng/share/man/man4/ng_sscfu.4 projects/calloutng/share/man/man4/ng_sscop.4 projects/calloutng/share/man/man4/ng_tag.4 projects/calloutng/share/man/man4/ng_tcpmss.4 projects/calloutng/share/man/man4/ng_tee.4 projects/calloutng/share/man/man4/ng_tty.4 projects/calloutng/share/man/man4/ng_ubt.4 projects/calloutng/share/man/man4/ng_uni.4 projects/calloutng/share/man/man4/ng_vjc.4 projects/calloutng/share/man/man4/ng_vlan.4 projects/calloutng/share/man/man4/unix.4 projects/calloutng/share/man/man7/environ.7 projects/calloutng/share/man/man7/tuning.7 projects/calloutng/share/man/man9/firmware.9 projects/calloutng/share/man/man9/malloc.9 projects/calloutng/share/man/man9/mbuf.9 projects/calloutng/share/man/man9/mi_switch.9 projects/calloutng/share/man/man9/pfil.9 projects/calloutng/share/misc/flowers (contents, props changed) projects/calloutng/share/mk/Makefile projects/calloutng/share/mk/bsd.progs.mk projects/calloutng/share/mk/bsd.subdir.mk projects/calloutng/share/termcap/termcap.src projects/calloutng/sys/amd64/amd64/identcpu.c projects/calloutng/sys/amd64/amd64/minidump_machdep.c projects/calloutng/sys/amd64/amd64/uma_machdep.c projects/calloutng/sys/arm/arm/busdma_machdep-v6.c projects/calloutng/sys/arm/arm/cpufunc.c projects/calloutng/sys/arm/arm/cpufunc_asm_armv7.S projects/calloutng/sys/arm/arm/machdep.c projects/calloutng/sys/arm/arm/pmap-v6.c projects/calloutng/sys/arm/arm/pmap.c projects/calloutng/sys/arm/arm/vm_machdep.c projects/calloutng/sys/arm/at91/at91_machdep.c projects/calloutng/sys/arm/lpc/lpc_gpio.c projects/calloutng/sys/boot/common/Makefile.inc projects/calloutng/sys/boot/forth/loader.4th projects/calloutng/sys/boot/forth/menu-commands.4th projects/calloutng/sys/boot/forth/menu.4th projects/calloutng/sys/boot/i386/boot2/sio.S projects/calloutng/sys/boot/i386/common/edd.h projects/calloutng/sys/boot/i386/loader/Makefile projects/calloutng/sys/boot/ia64/common/Makefile projects/calloutng/sys/boot/pc98/Makefile.inc projects/calloutng/sys/boot/pc98/boot2/Makefile projects/calloutng/sys/boot/pc98/boot2/boot2.c projects/calloutng/sys/boot/pc98/btx/btx/btx.S projects/calloutng/sys/boot/pc98/cdboot/Makefile projects/calloutng/sys/boot/pc98/libpc98/comconsole.c projects/calloutng/sys/boot/pc98/loader/Makefile projects/calloutng/sys/boot/powerpc/ofw/Makefile projects/calloutng/sys/boot/powerpc/ps3/Makefile projects/calloutng/sys/boot/sparc64/loader/Makefile projects/calloutng/sys/boot/userboot/test/test.c projects/calloutng/sys/boot/userboot/userboot.h projects/calloutng/sys/boot/userboot/userboot/main.c projects/calloutng/sys/bsm/audit_kevents.h projects/calloutng/sys/cam/scsi/scsi_enc_ses.c projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/sys/procset.h projects/calloutng/sys/cddl/dev/lockstat/lockstat.c projects/calloutng/sys/cddl/dev/profile/profile.c projects/calloutng/sys/compat/freebsd32/freebsd32.h projects/calloutng/sys/compat/freebsd32/freebsd32_misc.c projects/calloutng/sys/compat/freebsd32/freebsd32_proto.h projects/calloutng/sys/compat/freebsd32/freebsd32_syscall.h projects/calloutng/sys/compat/freebsd32/freebsd32_syscalls.c projects/calloutng/sys/compat/freebsd32/freebsd32_sysent.c projects/calloutng/sys/compat/freebsd32/freebsd32_systrace_args.c projects/calloutng/sys/compat/freebsd32/syscalls.master projects/calloutng/sys/conf/Makefile.pc98 projects/calloutng/sys/conf/files projects/calloutng/sys/conf/files.mips projects/calloutng/sys/conf/kern.pre.mk projects/calloutng/sys/contrib/octeon-sdk/octeon-pci-console.c projects/calloutng/sys/dev/aac/aac_debug.c projects/calloutng/sys/dev/acpica/acpivar.h projects/calloutng/sys/dev/adb/adb_mouse.c projects/calloutng/sys/dev/agp/agp.c projects/calloutng/sys/dev/agp/agp_ali.c projects/calloutng/sys/dev/agp/agp_amd.c projects/calloutng/sys/dev/agp/agp_amd64.c projects/calloutng/sys/dev/agp/agp_apple.c projects/calloutng/sys/dev/agp/agp_ati.c projects/calloutng/sys/dev/agp/agp_i810.c projects/calloutng/sys/dev/agp/agp_intel.c projects/calloutng/sys/dev/agp/agp_nvidia.c projects/calloutng/sys/dev/agp/agp_sis.c projects/calloutng/sys/dev/agp/agp_via.c projects/calloutng/sys/dev/ahci/ahciem.c projects/calloutng/sys/dev/aic7xxx/aicasm/aicasm_gram.y projects/calloutng/sys/dev/asmc/asmc.c projects/calloutng/sys/dev/ath/ath_hal/ah.h projects/calloutng/sys/dev/ath/ath_hal/ah_debug.h projects/calloutng/sys/dev/ath/ath_hal/ah_internal.h projects/calloutng/sys/dev/ath/ath_hal/ar5210/ar5210_xmit.c projects/calloutng/sys/dev/ath/ath_hal/ar5210/ar5210desc.h projects/calloutng/sys/dev/ath/ath_hal/ar5212/ar5212_recv.c projects/calloutng/sys/dev/ath/ath_hal/ar5212/ar5212_xmit.c projects/calloutng/sys/dev/ath/ath_hal/ar5212/ar5212desc.h projects/calloutng/sys/dev/ath/ath_hal/ar5416/ar5416desc.h projects/calloutng/sys/dev/ath/if_ath.c projects/calloutng/sys/dev/ath/if_ath_rx.c projects/calloutng/sys/dev/ath/if_ath_rx_edma.c projects/calloutng/sys/dev/ath/if_ath_sysctl.c projects/calloutng/sys/dev/ath/if_ath_tx.c projects/calloutng/sys/dev/ath/if_ath_tx.h projects/calloutng/sys/dev/ath/if_ath_tx_edma.c projects/calloutng/sys/dev/ath/if_athvar.h projects/calloutng/sys/dev/bktr/bktr_audio.c projects/calloutng/sys/dev/ct/bshw_machdep.c projects/calloutng/sys/dev/ct/ct.c projects/calloutng/sys/dev/ct/ct_isa.c projects/calloutng/sys/dev/ct/ct_machdep.h projects/calloutng/sys/dev/cxgbe/tom/t4_cpl_io.c projects/calloutng/sys/dev/cxgbe/tom/t4_listen.c projects/calloutng/sys/dev/drm/via_dma.c projects/calloutng/sys/dev/drm/via_dmablit.c projects/calloutng/sys/dev/etherswitch/arswitch/arswitch.c projects/calloutng/sys/dev/iicbus/iic.c projects/calloutng/sys/dev/md/md.c projects/calloutng/sys/dev/mfi/mfi.c projects/calloutng/sys/dev/mfi/mfi_cam.c projects/calloutng/sys/dev/mfi/mfi_disk.c projects/calloutng/sys/dev/mfi/mfi_syspd.c projects/calloutng/sys/dev/mfi/mfi_tbolt.c projects/calloutng/sys/dev/mfi/mfivar.h projects/calloutng/sys/dev/mn/if_mn.c projects/calloutng/sys/dev/nve/if_nve.c projects/calloutng/sys/dev/nxge/xgehal/xgehal-device.c projects/calloutng/sys/dev/puc/pucdata.c projects/calloutng/sys/dev/sio/sio_isa.c projects/calloutng/sys/dev/snc/dp83932.c projects/calloutng/sys/dev/snc/dp83932subr.c projects/calloutng/sys/dev/snc/if_snc.c projects/calloutng/sys/dev/snc/if_snc_cbus.c projects/calloutng/sys/dev/sound/pci/emu10kx.c projects/calloutng/sys/dev/sound/pci/hda/hdaa.c projects/calloutng/sys/dev/sound/pcm/channel.c projects/calloutng/sys/dev/sound/pcm/feeder_matrix.c projects/calloutng/sys/dev/sound/pcm/matrix.h projects/calloutng/sys/dev/sound/pcm/matrix_map.h projects/calloutng/sys/dev/twa/tw_cl_misc.c projects/calloutng/sys/dev/uart/uart_bus_isa.c projects/calloutng/sys/dev/usb/controller/dwc_otg.c projects/calloutng/sys/dev/usb/controller/dwc_otg.h projects/calloutng/sys/dev/usb/controller/dwc_otgreg.h projects/calloutng/sys/dev/usb/net/if_udav.c projects/calloutng/sys/dev/usb/serial/u3g.c projects/calloutng/sys/dev/usb/serial/usb_serial.c projects/calloutng/sys/dev/usb/usbdevs projects/calloutng/sys/dev/xen/netback/netback_unit_tests.c projects/calloutng/sys/fs/cd9660/cd9660_vfsops.c projects/calloutng/sys/fs/devfs/devfs_devs.c projects/calloutng/sys/fs/devfs/devfs_vfsops.c projects/calloutng/sys/fs/ext2fs/ext2_vfsops.c projects/calloutng/sys/fs/fdescfs/fdesc_vfsops.c projects/calloutng/sys/fs/fuse/fuse_file.c projects/calloutng/sys/fs/fuse/fuse_internal.c projects/calloutng/sys/fs/fuse/fuse_internal.h projects/calloutng/sys/fs/fuse/fuse_io.c projects/calloutng/sys/fs/fuse/fuse_node.c projects/calloutng/sys/fs/fuse/fuse_node.h projects/calloutng/sys/fs/fuse/fuse_vfsops.c projects/calloutng/sys/fs/fuse/fuse_vnops.c projects/calloutng/sys/fs/msdosfs/msdosfs_vfsops.c projects/calloutng/sys/fs/nandfs/nandfs_vfsops.c projects/calloutng/sys/fs/nfsclient/nfs_clport.c projects/calloutng/sys/fs/nfsclient/nfs_clvfsops.c projects/calloutng/sys/fs/nullfs/null_vfsops.c projects/calloutng/sys/fs/pseudofs/pseudofs.c projects/calloutng/sys/fs/smbfs/smbfs_node.c projects/calloutng/sys/fs/smbfs/smbfs_vnops.c projects/calloutng/sys/fs/tmpfs/tmpfs_vfsops.c projects/calloutng/sys/fs/udf/udf_vfsops.c projects/calloutng/sys/fs/unionfs/union_vfsops.c projects/calloutng/sys/fs/unionfs/union_vnops.c projects/calloutng/sys/gnu/fs/reiserfs/reiserfs_vfsops.c projects/calloutng/sys/i386/include/vmparam.h projects/calloutng/sys/i386/xen/clock.c projects/calloutng/sys/ia64/ia64/uma_machdep.c projects/calloutng/sys/kern/init_sysent.c projects/calloutng/sys/kern/kern_exit.c projects/calloutng/sys/kern/kern_ktr.c projects/calloutng/sys/kern/kern_malloc.c projects/calloutng/sys/kern/kern_mbuf.c projects/calloutng/sys/kern/kern_proc.c projects/calloutng/sys/kern/kern_prot.c projects/calloutng/sys/kern/kern_racct.c projects/calloutng/sys/kern/sched_ule.c projects/calloutng/sys/kern/subr_lock.c projects/calloutng/sys/kern/subr_param.c projects/calloutng/sys/kern/subr_smp.c projects/calloutng/sys/kern/sys_procdesc.c projects/calloutng/sys/kern/syscalls.c projects/calloutng/sys/kern/syscalls.master projects/calloutng/sys/kern/systrace_args.c projects/calloutng/sys/kern/tty.c projects/calloutng/sys/kern/uipc_mqueue.c projects/calloutng/sys/kern/uipc_usrreq.c projects/calloutng/sys/kern/vfs_subr.c projects/calloutng/sys/mips/atheros/files.ar71xx projects/calloutng/sys/mips/cavium/files.octeon1 projects/calloutng/sys/mips/conf/AP91.hints projects/calloutng/sys/mips/conf/AP93.hints projects/calloutng/sys/mips/conf/AP96.hints projects/calloutng/sys/mips/conf/AR71XX_BASE projects/calloutng/sys/mips/conf/AR724X_BASE projects/calloutng/sys/mips/conf/AR91XX_BASE projects/calloutng/sys/mips/conf/OCTEON1 projects/calloutng/sys/mips/conf/PB92 projects/calloutng/sys/mips/conf/RSPRO.hints projects/calloutng/sys/mips/include/pmap.h projects/calloutng/sys/mips/mips/pmap.c projects/calloutng/sys/mips/mips/uma_machdep.c projects/calloutng/sys/modules/Makefile projects/calloutng/sys/modules/agp/Makefile projects/calloutng/sys/modules/dtrace/Makefile projects/calloutng/sys/modules/nxge/Makefile projects/calloutng/sys/net/bpf.c projects/calloutng/sys/netinet/sctp_constants.h projects/calloutng/sys/netinet/sctp_indata.c projects/calloutng/sys/netinet/sctp_input.c projects/calloutng/sys/netinet/sctp_output.c projects/calloutng/sys/netinet/sctp_pcb.c projects/calloutng/sys/netinet/sctp_structs.h projects/calloutng/sys/netinet/sctp_timer.c projects/calloutng/sys/netinet/sctputil.c projects/calloutng/sys/netinet/tcp_output.c projects/calloutng/sys/netinet/tcp_subr.c projects/calloutng/sys/netinet/tcp_timewait.c projects/calloutng/sys/netinet6/icmp6.c projects/calloutng/sys/netinet6/in6_src.c projects/calloutng/sys/netinet6/ip6_input.c projects/calloutng/sys/netinet6/nd6.c projects/calloutng/sys/netinet6/nd6_rtr.c projects/calloutng/sys/netinet6/scope6.c projects/calloutng/sys/netpfil/ipfw/ip_fw_dynamic.c projects/calloutng/sys/netpfil/pf/if_pfsync.c projects/calloutng/sys/nfsclient/nfs_vfsops.c projects/calloutng/sys/ofed/drivers/infiniband/core/cma.c projects/calloutng/sys/ofed/drivers/infiniband/core/ud_header.c projects/calloutng/sys/ofed/drivers/infiniband/ulp/sdp/sdp_rx.c projects/calloutng/sys/ofed/include/linux/cdev.h projects/calloutng/sys/ofed/include/linux/pci.h projects/calloutng/sys/pc98/include/bus.h projects/calloutng/sys/pc98/pc98/machdep.c projects/calloutng/sys/powerpc/aim/locore32.S projects/calloutng/sys/powerpc/aim/locore64.S projects/calloutng/sys/powerpc/aim/mmu_oea64.c projects/calloutng/sys/powerpc/aim/slb.c projects/calloutng/sys/powerpc/aim/trap.c projects/calloutng/sys/powerpc/aim/trap_subr32.S projects/calloutng/sys/powerpc/aim/trap_subr64.S projects/calloutng/sys/powerpc/aim/uma_machdep.c projects/calloutng/sys/powerpc/conf/GENERIC projects/calloutng/sys/powerpc/include/bat.h projects/calloutng/sys/sparc64/include/ktr.h projects/calloutng/sys/sparc64/sparc64/pmap.c projects/calloutng/sys/sparc64/sparc64/vm_machdep.c projects/calloutng/sys/sys/_mutex.h projects/calloutng/sys/sys/_rwlock.h projects/calloutng/sys/sys/ktr.h projects/calloutng/sys/sys/lock.h projects/calloutng/sys/sys/mount.h projects/calloutng/sys/sys/param.h projects/calloutng/sys/sys/proc.h projects/calloutng/sys/sys/resource.h projects/calloutng/sys/sys/smp.h projects/calloutng/sys/sys/syscall.h projects/calloutng/sys/sys/syscall.mk projects/calloutng/sys/sys/syscallsubr.h projects/calloutng/sys/sys/sysproto.h projects/calloutng/sys/sys/vmmeter.h projects/calloutng/sys/sys/wait.h projects/calloutng/sys/ufs/ffs/ffs_softdep.c projects/calloutng/sys/ufs/ffs/ffs_vfsops.c projects/calloutng/sys/vm/device_pager.c projects/calloutng/sys/vm/sg_pager.c projects/calloutng/sys/vm/vm_fault.c projects/calloutng/sys/vm/vm_kern.c projects/calloutng/sys/vm/vm_map.c projects/calloutng/sys/vm/vm_page.c projects/calloutng/sys/vm/vm_page.h projects/calloutng/sys/vm/vm_pageout.c projects/calloutng/sys/vm/vm_phys.h projects/calloutng/tools/build/mk/OptionalObsoleteFiles.inc projects/calloutng/usr.bin/bc/bc.y projects/calloutng/usr.bin/bmake/Makefile projects/calloutng/usr.bin/bmake/Makefile.inc projects/calloutng/usr.bin/bmake/unit-tests/Makefile projects/calloutng/usr.bin/calendar/calendars/calendar.history projects/calloutng/usr.bin/chpass/chpass.c projects/calloutng/usr.bin/clang/clang/Makefile projects/calloutng/usr.bin/fetch/fetch.c projects/calloutng/usr.bin/ktrdump/ktrdump.c projects/calloutng/usr.bin/locale/locale.1 projects/calloutng/usr.bin/locale/locale.c projects/calloutng/usr.bin/ministat/ministat.1 projects/calloutng/usr.bin/ministat/ministat.c projects/calloutng/usr.bin/mkcsmapper/Makefile.inc projects/calloutng/usr.bin/ssh-copy-id/ssh-copy-id.1 projects/calloutng/usr.bin/ssh-copy-id/ssh-copy-id.sh projects/calloutng/usr.bin/top/machine.c projects/calloutng/usr.sbin/bsdconfig/bsdconfig projects/calloutng/usr.sbin/bsdconfig/console/console projects/calloutng/usr.sbin/bsdconfig/console/font projects/calloutng/usr.sbin/bsdconfig/console/keymap projects/calloutng/usr.sbin/bsdconfig/console/repeat projects/calloutng/usr.sbin/bsdconfig/console/saver projects/calloutng/usr.sbin/bsdconfig/console/screenmap projects/calloutng/usr.sbin/bsdconfig/console/ttys projects/calloutng/usr.sbin/bsdconfig/diskmgmt/diskmgmt projects/calloutng/usr.sbin/bsdconfig/docsinstall/docsinstall projects/calloutng/usr.sbin/bsdconfig/dot/dot projects/calloutng/usr.sbin/bsdconfig/mouse/disable projects/calloutng/usr.sbin/bsdconfig/mouse/enable projects/calloutng/usr.sbin/bsdconfig/mouse/flags projects/calloutng/usr.sbin/bsdconfig/mouse/mouse projects/calloutng/usr.sbin/bsdconfig/mouse/port projects/calloutng/usr.sbin/bsdconfig/mouse/type projects/calloutng/usr.sbin/bsdconfig/networking/defaultrouter projects/calloutng/usr.sbin/bsdconfig/networking/devices projects/calloutng/usr.sbin/bsdconfig/networking/hostname projects/calloutng/usr.sbin/bsdconfig/networking/nameservers projects/calloutng/usr.sbin/bsdconfig/networking/networking projects/calloutng/usr.sbin/bsdconfig/password/password projects/calloutng/usr.sbin/bsdconfig/security/kern_securelevel projects/calloutng/usr.sbin/bsdconfig/security/security projects/calloutng/usr.sbin/bsdconfig/share/common.subr projects/calloutng/usr.sbin/bsdconfig/startup/misc projects/calloutng/usr.sbin/bsdconfig/startup/rcadd projects/calloutng/usr.sbin/bsdconfig/startup/rcconf projects/calloutng/usr.sbin/bsdconfig/startup/rcdelete projects/calloutng/usr.sbin/bsdconfig/startup/rcedit projects/calloutng/usr.sbin/bsdconfig/startup/rcvar projects/calloutng/usr.sbin/bsdconfig/startup/startup projects/calloutng/usr.sbin/bsdconfig/timezone/timezone projects/calloutng/usr.sbin/bsdconfig/ttys/ttys projects/calloutng/usr.sbin/bsdconfig/usermgmt/groupadd projects/calloutng/usr.sbin/bsdconfig/usermgmt/groupdel projects/calloutng/usr.sbin/bsdconfig/usermgmt/groupedit projects/calloutng/usr.sbin/bsdconfig/usermgmt/groupinput projects/calloutng/usr.sbin/bsdconfig/usermgmt/useradd projects/calloutng/usr.sbin/bsdconfig/usermgmt/userdel projects/calloutng/usr.sbin/bsdconfig/usermgmt/useredit projects/calloutng/usr.sbin/bsdconfig/usermgmt/userinput projects/calloutng/usr.sbin/bsdconfig/usermgmt/usermgmt projects/calloutng/usr.sbin/chkgrp/chkgrp.8 projects/calloutng/usr.sbin/chkgrp/chkgrp.c projects/calloutng/usr.sbin/ndiscvt/ndiscvt.c projects/calloutng/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.8 Directory Properties: projects/calloutng/ (props changed) projects/calloutng/cddl/contrib/opensolaris/ (props changed) projects/calloutng/contrib/atf/ (props changed) projects/calloutng/contrib/bmake/ (props changed) projects/calloutng/contrib/gdb/ (props changed) projects/calloutng/contrib/libc++/ (props changed) projects/calloutng/contrib/llvm/ (props changed) projects/calloutng/contrib/top/ (props changed) projects/calloutng/contrib/tzdata/ (props changed) projects/calloutng/crypto/heimdal/ (props changed) projects/calloutng/lib/libc/ (props changed) projects/calloutng/sbin/ (props changed) projects/calloutng/share/man/man4/ (props changed) projects/calloutng/sys/ (props changed) projects/calloutng/sys/boot/ (props changed) projects/calloutng/sys/boot/powerpc/ofw/ (props changed) projects/calloutng/sys/cddl/contrib/opensolaris/ (props changed) projects/calloutng/sys/conf/ (props changed) projects/calloutng/sys/contrib/octeon-sdk/ (props changed) projects/calloutng/usr.bin/calendar/ (props changed) projects/calloutng/usr.sbin/ndiscvt/ (props changed) Modified: projects/calloutng/Makefile.inc1 ============================================================================== --- projects/calloutng/Makefile.inc1 Sat Nov 17 06:33:13 2012 (r243181) +++ projects/calloutng/Makefile.inc1 Sat Nov 17 11:55:19 2012 (r243182) @@ -1138,7 +1138,7 @@ _aicasm= sys/modules/aic7xxx/aicasm _share= share/syscons/scrnmaps .endif -.if ${MK_GCC} != "no" && ${MK_CLANG_IS_CC} == "no" +.if ${MK_GCC} != "no" && (${MK_CLANG_IS_CC} == "no" || ${TARGET} == "pc98") _gcc_tools= gnu/usr.bin/cc/cc_tools .endif @@ -1200,7 +1200,7 @@ _clang= usr.bin/clang _clang_libs= lib/clang .endif -.if ${MK_GCC} != "no" && ${MK_CLANG_IS_CC} == "no" +.if ${MK_GCC} != "no" && (${MK_CLANG_IS_CC} == "no" || ${TARGET} == "pc98") _cc= gnu/usr.bin/cc .endif Modified: projects/calloutng/ObsoleteFiles.inc ============================================================================== --- projects/calloutng/ObsoleteFiles.inc Sat Nov 17 06:33:13 2012 (r243181) +++ projects/calloutng/ObsoleteFiles.inc Sat Nov 17 11:55:19 2012 (r243182) @@ -38,6 +38,12 @@ # xargs -n1 | sort | uniq -d; # done +# 20121114: zpool-features manual page moved from section 5 to 7 +OLD_FILES+=usr/share/man/man5/zpool-features.5.gz +# 20121022: remove harp, hfa and idt man page +OLD_FILES+=share/man/man4/harp.4 +OLD_FILES+=share/man/man4/hfa.4 +OLD_FILES+=share/man/man4/idt.4 # 20121022: VFS_LOCK_GIANT elimination OLD_FILES+=usr/share/man/man9/VFS_LOCK_GIANT.9.gz OLD_FILES+=usr/share/man/man9/VFS_UNLOCK_GIANT.9.gz Modified: projects/calloutng/bin/df/df.1 ============================================================================== --- projects/calloutng/bin/df/df.1 Sat Nov 17 06:33:13 2012 (r243181) +++ projects/calloutng/bin/df/df.1 Sat Nov 17 11:55:19 2012 (r243182) @@ -29,7 +29,7 @@ .\" @(#)df.1 8.3 (Berkeley) 5/8/95 .\" $FreeBSD$ .\" -.Dd March 3, 2012 +.Dd November 16, 2012 .Dt DF 1 .Os .Sh NAME @@ -50,7 +50,8 @@ displays statistics about the amount of or on the file system of which .Ar file is a part. -Values are displayed in 512-byte per block counts. +By default block counts are displayed with an assumed block size of +512 bytes. If neither a file or a file system operand is specified, statistics for all mounted file systems are displayed (subject to the @@ -65,48 +66,54 @@ Show all mount points, including those t flag. This is implied for file systems specified on the command line. .It Fl b -Use 512-byte blocks rather than the default. -Note that -this overrides the +Explicitly use 512 byte blocks, overriding any .Ev BLOCKSIZE specification from the environment. +This is the same as the +.Fl P +option. +The +.Fl k +option overrides this option. .It Fl c Display a grand total. .It Fl g -Use 1073741824-byte (1-Gbyte) blocks rather than the default. -Note that -this overrides the +Use 1073741824 byte (1 Gibibyte) blocks rather than the default. +This overrides any .Ev BLOCKSIZE specification from the environment. .It Fl H .Dq Human-readable output. -Use unit suffixes: Byte, Kilobyte, Megabyte, -Gigabyte, Terabyte and Petabyte in order to reduce the number of -digits to four or fewer using base 10 for sizes. +Use unit suffixes: Byte, Kibibyte, Mebibyte, Gibibyte, Tebibyte and +Pebibyte (based on powers of 1024) in order to reduce the number of +digits to four or fewer. .It Fl h .Dq Human-readable output. Use unit suffixes: Byte, Kilobyte, Megabyte, -Gigabyte, Terabyte and Petabyte in order to reduce the number of -digits to four or fewer using base 2 for sizes. -Inodes statistics, if enabled with -.Fl i , -are always printed in base 10. +Gigabyte, Terabyte and Petabyte (based on powers of 1000) in order to +reduce the number of +digits to four or fewer. .It Fl i -Include statistics on the number of free inodes. +Include statistics on the number of free and used inodes. +In conjunction with the +.Fl h +or +.Fl H +options, the number of inodes is scaled by powers of 1000. .It Fl k -Use 1024-byte (1-Kbyte) blocks rather than the default. -Note that -this overrides the +Use 1024 byte (1 Kibibyte) blocks rather than the default. +This overrides the +.Fl P +option and any .Ev BLOCKSIZE specification from the environment. .It Fl l Only display information about locally-mounted file systems. .It Fl m -Use 1048576-byte (1-Mbyte) blocks rather than the default. -Note that -this overrides the +Use 1048576 byte (1 Mebibyte) blocks rather than the default. +This overrides any .Ev BLOCKSIZE specification from the environment. .It Fl n @@ -119,10 +126,15 @@ When this option is specified, will not request new statistics from the file systems, but will respond with the possibly stale statistics that were previously obtained. .It Fl P -Use POSIX compliant output of 512-byte blocks rather than the default. -Note that this overrides the +Explicitly use 512 byte blocks, overriding any .Ev BLOCKSIZE specification from the environment. +This is the same as the +.Fl b +option. +The +.Fl k +option overrides this option. .It Fl t Only print out statistics for file systems of the specified types. More than one type may be specified in a comma separated list. @@ -148,26 +160,53 @@ command can be used to find out the type that are available on the system. .It Fl T Include file system type. +.It Fl , +(Comma) Print sizes grouped and separated by thousands using the +non-monetary separator returned by +.Xr localeconv 3 , +typically a comma or period. +If no locale is set, or the locale does not have a non-monetary separator, this +option has no effect. .El .Sh ENVIRONMENT .Bl -tag -width BLOCKSIZE .It Ev BLOCKSIZE -If the environment variable -.Ev BLOCKSIZE -is set, the block counts will be displayed in units of that size block. +Specifies the units in which to report block counts. +This uses +.Xr getbsize 3 , +which allows units of bytes or numbers scaled with the letters +.Em k +(for multiples of 1024 bytes), +.Em m +(for multiples of 1048576 bytes) or +.Em g +(for gibibytes). +The allowed range is 512 bytes to 1 GB. +If the value is outside, it will be set to the appropriate limit. .El .Sh SEE ALSO .Xr lsvfs 1 , -.Xr pstat 1 , .Xr quota 1 , -.Xr swapinfo 1 , .Xr fstatfs 2 , .Xr getfsstat 2 , .Xr statfs 2 , +.Xr getbsize 3 , .Xr getmntinfo 3 , +.Xr localeconv 3 , .Xr fstab 5 , .Xr mount 8 , -.Xr quot 8 +.Xr quot 8 . +.Sh STANDARDS +With the exception of most options, +the +.Nm +utility conforms to +.St -p1003.1-2004 , +which defines only the +.Fl k , P +and +.Fl t +options. .Sh HISTORY A .Nm @@ -180,3 +219,13 @@ flag is ignored if a file or file system Also, if a mount point is not accessible by the user, it is possible that the file system information could be stale. +.Pp +The +.Fl b +and +.Fl P +options are identical. +The former comes from the BSD tradition, and the latter is required +for +.St -p1003.1-2004 +conformity. Modified: projects/calloutng/bin/df/df.c ============================================================================== --- projects/calloutng/bin/df/df.c Sat Nov 17 06:33:13 2012 (r243181) +++ projects/calloutng/bin/df/df.c Sat Nov 17 11:55:19 2012 (r243182) @@ -53,6 +53,7 @@ __FBSDID("$FreeBSD$"); #include <ufs/ufs/ufsmount.h> #include <err.h> #include <libutil.h> +#include <locale.h> #include <stdint.h> #include <stdio.h> #include <stdlib.h> @@ -95,6 +96,7 @@ imax(int a, int b) } static int aflag = 0, cflag, hflag, iflag, kflag, lflag = 0, nflag, Tflag; +static int thousands; static struct ufs_args mdev; int @@ -111,12 +113,12 @@ main(int argc, char *argv[]) int ch, rv; fstype = "ufs"; - + (void)setlocale(LC_ALL, ""); memset(&totalbuf, 0, sizeof(totalbuf)); totalbuf.f_bsize = DEV_BSIZE; strlcpy(totalbuf.f_mntfromname, "total", MNAMELEN); vfslist = NULL; - while ((ch = getopt(argc, argv, "abcgHhiklmnPt:T")) != -1) + while ((ch = getopt(argc, argv, "abcgHhiklmnPt:T,")) != -1) switch (ch) { case 'a': aflag = 1; @@ -180,6 +182,9 @@ main(int argc, char *argv[]) case 'T': Tflag = 1; break; + case ',': + thousands = 1; + break; case '?': default: usage(); @@ -388,16 +393,11 @@ prthumanvalinode(int64_t bytes) /* * Convert statfs returned file system size into BLOCKSIZE units. - * Attempts to avoid overflow for large file systems. */ static intmax_t fsbtoblk(int64_t num, uint64_t fsbs, u_long bs) { - - if (fsbs != 0 && fsbs < bs) - return (num / (intmax_t)(bs / fsbs)); - else - return (num * (intmax_t)(fsbs / bs)); + return (num * (intmax_t) fsbs / bs); } /* @@ -410,10 +410,18 @@ prtstat(struct statfs *sfsp, struct maxw static int headerlen, timesthrough = 0; static const char *header; int64_t used, availblks, inodes; + const char *format; if (++timesthrough == 1) { mwp->mntfrom = imax(mwp->mntfrom, (int)strlen("Filesystem")); mwp->fstype = imax(mwp->fstype, (int)strlen("Type")); + if (thousands) { /* make space for commas */ + mwp->total += (mwp->total - 1) / 3; + mwp->used += (mwp->used - 1) / 3; + mwp->avail += (mwp->avail - 1) / 3; + mwp->iused += (mwp->iused - 1) / 3; + mwp->ifree += (mwp->ifree - 1) / 3; + } if (hflag) { header = " Size"; mwp->total = mwp->used = mwp->avail = @@ -428,7 +436,7 @@ prtstat(struct statfs *sfsp, struct maxw (void)printf("%-*s", mwp->mntfrom, "Filesystem"); if (Tflag) (void)printf(" %-*s", mwp->fstype, "Type"); - (void)printf(" %-*s %*s %*s Capacity", mwp->total, header, + (void)printf(" %*s %*s %*s Capacity", mwp->total, header, mwp->used, "Used", mwp->avail, "Avail"); if (iflag) { mwp->iused = imax(hflag ? 0 : mwp->iused, @@ -440,6 +448,12 @@ prtstat(struct statfs *sfsp, struct maxw } (void)printf(" Mounted on\n"); } + /* Check for 0 block size. Can this happen? */ + if (sfsp->f_bsize == 0) { + warnx ("File system %s does not have a block size, assuming 512.", + sfsp->f_mntonname); + sfsp->f_bsize = 512; + } (void)printf("%-*s", mwp->mntfrom, sfsp->f_mntfromname); if (Tflag) (void)printf(" %-*s", mwp->fstype, sfsp->f_fstypename); @@ -448,7 +462,11 @@ prtstat(struct statfs *sfsp, struct maxw if (hflag) { prthuman(sfsp, used); } else { - (void)printf(" %*jd %*jd %*jd", + if (thousands) + format = " %*j'd %*j'd %*j'd"; + else + format = " %*jd %*jd %*jd"; + (void)printf(format, mwp->total, fsbtoblk(sfsp->f_blocks, sfsp->f_bsize, blocksize), mwp->used, fsbtoblk(used, sfsp->f_bsize, blocksize), @@ -465,7 +483,11 @@ prtstat(struct statfs *sfsp, struct maxw prthumanvalinode(used); prthumanvalinode(sfsp->f_ffree); } else { - (void)printf(" %*jd %*jd", mwp->iused, (intmax_t)used, + if (thousands) + format = " %*j'd %*j'd"; + else + format = " %*jd %*jd"; + (void)printf(format, mwp->iused, (intmax_t)used, mwp->ifree, (intmax_t)sfsp->f_ffree); } (void)printf(" %4.0f%% ", inodes == 0 ? 100.0 : @@ -542,7 +564,7 @@ usage(void) { (void)fprintf(stderr, -"usage: df [-b | -g | -H | -h | -k | -m | -P] [-acilnT] [-t type] [file | filesystem ...]\n"); +"usage: df [-b | -g | -H | -h | -k | -m | -P] [-acilnT] [-t type] [-,] [file | filesystem ...]\n"); exit(EX_USAGE); } Modified: projects/calloutng/bin/ls/cmp.c ============================================================================== --- projects/calloutng/bin/ls/cmp.c Sat Nov 17 06:33:13 2012 (r243181) +++ projects/calloutng/bin/ls/cmp.c Sat Nov 17 11:55:19 2012 (r243182) @@ -78,7 +78,10 @@ modcmp(const FTSENT *a, const FTSENT *b) 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)); + if (f_samesort) + return (strcoll(b->fts_name, a->fts_name)); + else + return (strcoll(a->fts_name, b->fts_name)); } int @@ -104,7 +107,10 @@ acccmp(const FTSENT *a, const FTSENT *b) 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)); + if (f_samesort) + return (strcoll(b->fts_name, a->fts_name)); + else + return (strcoll(a->fts_name, b->fts_name)); } int @@ -130,7 +136,10 @@ birthcmp(const FTSENT *a, const FTSENT * 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)); + if (f_samesort) + return (strcoll(b->fts_name, a->fts_name)); + else + return (strcoll(a->fts_name, b->fts_name)); } int @@ -156,7 +165,10 @@ statcmp(const FTSENT *a, const FTSENT *b 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)); + if (f_samesort) + return (strcoll(b->fts_name, a->fts_name)); + else + return (strcoll(a->fts_name, b->fts_name)); } int Modified: projects/calloutng/bin/ls/extern.h ============================================================================== --- projects/calloutng/bin/ls/extern.h Sat Nov 17 06:33:13 2012 (r243181) +++ projects/calloutng/bin/ls/extern.h Sat Nov 17 11:55:19 2012 (r243182) @@ -55,12 +55,12 @@ int prn_octal(const char *); int prn_printable(const char *); #ifdef COLORLS void parsecolors(const char *cs); -void colorquit(int); +void colorquit(int); -extern char *ansi_fgcol; -extern char *ansi_bgcol; -extern char *ansi_coloff; -extern char *attrs_off; -extern char *enter_bold; +extern char *ansi_fgcol; +extern char *ansi_bgcol; +extern char *ansi_coloff; +extern char *attrs_off; +extern char *enter_bold; #endif extern int termwidth; Modified: projects/calloutng/bin/ls/ls.1 ============================================================================== --- projects/calloutng/bin/ls/ls.1 Sat Nov 17 06:33:13 2012 (r243181) +++ projects/calloutng/bin/ls/ls.1 Sat Nov 17 11:55:19 2012 (r243182) @@ -32,7 +32,7 @@ .\" @(#)ls.1 8.7 (Berkeley) 7/29/94 .\" $FreeBSD$ .\" -.Dd September 28, 2011 +.Dd November 8, 2012 .Dt LS 1 .Os .Sh NAME @@ -40,7 +40,7 @@ .Nd list directory contents .Sh SYNOPSIS .Nm -.Op Fl ABCFGHILPRSTUWZabcdfghiklmnopqrstuwx1 +.Op Fl ABCFGHILPRSTUWZabcdfghiklmnopqrstuwxy1, .Op Fl D Ar format .Op Ar .Sh DESCRIPTION @@ -130,6 +130,8 @@ This option is equivalent to defining .Ev CLICOLOR in the environment. (See below.) +This functionality can be compiled out by removing the definition of +.Ev COLORLS . .It Fl H Symbolic links on the command line are followed. This option is assumed if @@ -249,12 +251,35 @@ subsection below, except (if the long fo the directory totals are not output when the output is in a single column, even if multi-column output is requested. .It Fl t -Sort by time modified (most recently modified -first) before sorting the operands in lexicographical -order. +Sort by descending time modified (most recently modified first). If two files +have the same modification timestamp, sort their names in ascending +lexicographical order. +The +.Fl r +option reverses both of these sort orders. +.Pp +Note that these sort orders are contradictory: the time sequence is in +descending order, the lexicographical sort is in ascending order. +This behavior is mandated by +.St -p1003.2 . +This feature can cause problems listing files stored with sequential names on +FAT file systems, such as from digital cameras, where it is possible to have +more than one image with the same timestamp. +In such a case, the photos cannot be listed in the sequence in which +they were taken. +To ensure the same sort order for time and for lexicographical sorting, set the +environment variable +.Ev LS_SAMESORT +or use the +.Fl y +option. +This causes +.Nm +to reverse the lexicographal sort order when sorting files with the +same modification timestamp. .It Fl u Use time of last access, -instead of last modification +instead of time of last modification of the file for sorting .Pq Fl t or printing @@ -268,6 +293,15 @@ The same as .Fl C , except that the multi-column output is produced with entries sorted across, rather than down, the columns. +.It Fl y +When the +.Fl t +option is set, sort the alphabetical output in the same order as the time output. +This has the same effect as setting +.Ev LS_SAMESORT . +See the description of the +.Fl t +option for more details. .It Fl 1 (The numeric digit .Dq one . ) @@ -275,6 +309,15 @@ Force output to be one entry per line. This is the default when output is not to a terminal. +.It Fl , +(Comma) When the +.Fl l +option is set, print file sizes grouped and separated by thousands using the +non-monetary separator returned by +.Xr localeconv 3 , +typically a comma or period. +If no locale is set, or the locale does not have a non-monetary separator, this +option has no effect. .El .Pp The @@ -529,7 +572,7 @@ variable is defined. .It Ev CLICOLOR_FORCE Color sequences are normally disabled if the output is not directed to a terminal. -This can be overridden by setting this flag. +This can be overridden by setting this variable. The .Ev TERM variable still needs to reference a color capable terminal however @@ -655,6 +698,14 @@ Not all columns have changeable widths. The fields are, in order: inode, block count, number of links, user name, group name, flags, file size, file name. +.It Ev LS_SAMESORT +If this variable is set, the +.Fl t +option sorts the names of files with the same modification timestamp in the same +sense as the time sort. +See the description of the +.Fl t +option for more details. .It Ev TERM The .Ev CLICOLOR @@ -678,6 +729,7 @@ specification. .Xr getfacl 1 , .Xr sort 1 , .Xr xterm 1 , +.Xr localeconv 3 , .Xr strftime 3 , .Xr strmode 3 , .Xr termcap 5 , @@ -716,3 +768,9 @@ option description might be a feature th based on the fact that single-column output usually goes to something other than a terminal. It is debatable whether this is a design bug. +.Pp +.St -p1003.2 +mandates opposite sort orders for files with the same timestamp when +sorting with the +.Fl t +option. Modified: projects/calloutng/bin/ls/ls.c ============================================================================== --- projects/calloutng/bin/ls/ls.c Sat Nov 17 06:33:13 2012 (r243181) +++ projects/calloutng/bin/ls/ls.c Sat Nov 17 11:55:19 2012 (r243182) @@ -109,10 +109,11 @@ int termwidth = 80; /* default terminal int f_humanval; /* show human-readable file sizes */ int f_inode; /* print inode */ static int f_kblocks; /* print size in kilobytes */ + int f_label; /* show MAC label */ static int f_listdir; /* list actual directory, not contents */ static int f_listdot; /* list files beginning with . */ -static int f_noautodot; /* do not automatically enable -A for root */ int f_longform; /* long listing format */ +static int f_noautodot; /* do not automatically enable -A for root */ static int f_nofollow; /* don't follow symbolic link arguments */ int f_nonprint; /* show unprintables as ? */ static int f_nosort; /* don't sort output */ @@ -122,19 +123,21 @@ static int f_numericonly; /* don't conve int f_octal_escape; /* like f_octal but use C escapes if possible */ static int f_recursive; /* ls subdirectories also */ static int f_reversesort; /* reverse whatever sort is used */ - int f_sectime; /* print the real time for all files */ + int f_samesort; /* sort time and name in same direction */ + int f_sectime; /* print full time information */ static int f_singlecol; /* use single column output */ int f_size; /* list size in short listing */ +static int f_sizesort; int f_slash; /* similar to f_type, but only for dirs */ int f_sortacross; /* sort across rows, not down columns */ int f_statustime; /* use time of last mode change */ static int f_stream; /* stream the output, separate with commas */ + int f_thousands; /* show file sizes with thousands separators */ + char *f_timeformat; /* user-specified time format */ static int f_timesort; /* sort by time vice name */ - char *f_timeformat; /* user-specified time format */ -static int f_sizesort; int f_type; /* add type character for non-regular files */ static int f_whiteout; /* show whiteout entries */ - int f_label; /* show MAC label */ + #ifdef COLORLS int f_color; /* add type in color for non-regular files */ @@ -180,8 +183,10 @@ main(int argc, char *argv[]) } fts_options = FTS_PHYSICAL; - while ((ch = getopt(argc, argv, - "1ABCD:FGHILPRSTUWZabcdfghiklmnopqrstuwx")) != -1) { + if (getenv("LS_SAMESORT")) + f_samesort = 1; + while ((ch = getopt(argc, argv, + "1ABCD:FGHILPRSTUWXZabcdfghiklmnopqrstuwxy,")) != -1) { switch (ch) { /* * The -1, -C, -x and -l options all override each other so @@ -192,17 +197,9 @@ main(int argc, char *argv[]) f_longform = 0; f_stream = 0; break; - case 'B': - f_nonprint = 0; - f_octal = 1; - f_octal_escape = 0; - break; case 'C': f_sortacross = f_longform = f_singlecol = 0; break; - case 'D': - f_timeformat = optarg; - break; case 'l': f_longform = 1; f_singlecol = 0; @@ -229,16 +226,46 @@ main(int argc, char *argv[]) f_accesstime = 0; f_statustime = 0; break; + case 'a': + fts_options |= FTS_SEEDOT; + /* FALLTHROUGH */ + case 'A': + f_listdot = 1; + break; + /* The -t and -S options override each other. */ + case 'S': + f_sizesort = 1; + f_timesort = 0; + break; + case 't': + f_timesort = 1; + f_sizesort = 0; + break; + /* Other flags. Please keep alphabetic. */ + case ',': + f_thousands = 1; + break; + case 'B': + f_nonprint = 0; + f_octal = 1; + f_octal_escape = 0; + break; + case 'D': + f_timeformat = optarg; + break; case 'F': f_type = 1; f_slash = 0; break; + case 'G': + setenv("CLICOLOR", "", 1); + break; case 'H': fts_options |= FTS_COMFOLLOW; f_nofollow = 0; break; - case 'G': - setenv("CLICOLOR", "", 1); + case 'I': + f_noautodot = 1; break; case 'L': fts_options &= ~FTS_PHYSICAL; @@ -254,14 +281,19 @@ main(int argc, char *argv[]) case 'R': f_recursive = 1; break; - case 'a': - fts_options |= FTS_SEEDOT; - /* FALLTHROUGH */ - case 'A': - f_listdot = 1; + case 'T': + f_sectime = 1; break; - case 'I': - f_noautodot = 1; + case 'W': + f_whiteout = 1; + break; + case 'Z': + f_label = 1; + break; + case 'b': + f_nonprint = 0; + f_octal = 0; + f_octal_escape = 1; break; /* The -d option turns off the -R option. */ case 'd': @@ -309,33 +341,13 @@ main(int argc, char *argv[]) case 's': f_size = 1; break; - case 'T': - f_sectime = 1; - break; - /* The -t and -S options override each other. */ - case 't': - f_timesort = 1; - f_sizesort = 0; - break; - case 'S': - f_sizesort = 1; - f_timesort = 0; - break; - case 'W': - f_whiteout = 1; - break; - case 'b': - f_nonprint = 0; - f_octal = 0; - f_octal_escape = 1; - break; case 'w': f_nonprint = 0; f_octal = 0; f_octal_escape = 0; break; - case 'Z': - f_label = 1; + case 'y': + f_samesort = 1; break; default: case '?': @@ -849,6 +861,8 @@ label_out: d.s_size = sizelen; d.s_user = maxuser; } + if (f_thousands) /* make space for commas */ + d.s_size += (d.s_size - 1) / 3; printfcn(&d); output = 1; Modified: projects/calloutng/bin/ls/ls.h ============================================================================== --- projects/calloutng/bin/ls/ls.h Sat Nov 17 06:33:13 2012 (r243181) +++ projects/calloutng/bin/ls/ls.h Sat Nov 17 11:55:19 2012 (r243182) @@ -49,12 +49,14 @@ extern int f_longform; /* long listing extern int f_octal; /* print unprintables in octal */ extern int f_octal_escape; /* like f_octal but use C escapes if possible */ extern int f_nonprint; /* show unprintables as ? */ +extern int f_samesort; /* sort time and name in same direction */ extern int f_sectime; /* print the real time for all files */ extern int f_size; /* list size in short listing */ extern int f_slash; /* append a '/' if the file is a directory */ extern int f_sortacross; /* sort across rows, not down columns */ extern int f_statustime; /* use time of last mode change */ -extern char *f_timeformat; /* user-specified time format */ +extern int f_thousands; /* show file sizes with thousands separators */ +extern char *f_timeformat; /* user-specified time format */ extern int f_notabs; /* don't use tab-separated multi-col output */ extern int f_type; /* add type character for non-regular files */ #ifdef COLORLS Modified: projects/calloutng/bin/ls/print.c ============================================================================== --- projects/calloutng/bin/ls/print.c Sat Nov 17 06:33:13 2012 (r243181) +++ projects/calloutng/bin/ls/print.c Sat Nov 17 11:55:19 2012 (r243182) @@ -606,6 +606,10 @@ printsize(size_t width, off_t bytes) humanize_number(buf, sizeof(buf), (int64_t)bytes, "", HN_AUTOSCALE, HN_B | HN_NOSPACE | HN_DECIMAL); (void)printf("%*s ", (u_int)width, buf); + } else if (f_thousands) { /* with commas */ + /* This format assignment needed to work round gcc bug. */ + const char *format = "%*j'd "; + (void)printf(format, (u_int)width, bytes); } else (void)printf("%*jd ", (u_int)width, bytes); } Modified: projects/calloutng/bin/ls/util.c ============================================================================== --- projects/calloutng/bin/ls/util.c Sat Nov 17 06:33:13 2012 (r243181) +++ projects/calloutng/bin/ls/util.c Sat Nov 17 11:55:19 2012 (r243182) @@ -132,7 +132,7 @@ prn_printable(const char *s) * to fix this as an efficient fix would involve a lookup table. Same goes * for the rather inelegant code in prn_octal. * - * DES 1998/04/23 + * DES 1998/04/23 */ size_t @@ -175,7 +175,7 @@ prn_octal(const char *s) size_t clen; unsigned char ch; int goodchar, i, len, prtlen; - + memset(&mbs, 0, sizeof(mbs)); len = 0; while ((clen = mbrtowc(&wc, s, MB_LEN_MAX, &mbs)) != 0) { @@ -200,9 +200,9 @@ prn_octal(const char *s) for (i = 0; i < prtlen; i++) { ch = (unsigned char)s[i]; putchar('\\'); - putchar('0' + (ch >> 6)); - putchar('0' + ((ch >> 3) & 7)); - putchar('0' + (ch & 7)); + putchar('0' + (ch >> 6)); + putchar('0' + ((ch >> 3) & 7)); + putchar('0' + (ch & 7)); len += 4; } } @@ -222,9 +222,9 @@ usage(void) { (void)fprintf(stderr, #ifdef COLORLS - "usage: ls [-ABCFGHILPRSTUWZabcdfghiklmnopqrstuwx1] [-D format]" + "usage: ls [-ABCFGHILPRSTUWZabcdfghiklmnopqrstuwxy1,] [-D format]" #else - "usage: ls [-ABCFHILPRSTUWZabcdfghiklmnopqrstuwx1] [-D format]" + "usage: ls [-ABCFHILPRSTUWZabcdfghiklmnopqrstuwxy1,] [-D format]" #endif " [file ...]\n"); exit(1); Modified: projects/calloutng/bin/mv/mv.c ============================================================================== --- projects/calloutng/bin/mv/mv.c Sat Nov 17 06:33:13 2012 (r243181) +++ projects/calloutng/bin/mv/mv.c Sat Nov 17 11:55:19 2012 (r243182) @@ -199,7 +199,7 @@ do_move(const char *from, const char *to } else if (iflg) { (void)fprintf(stderr, "overwrite %s? %s", to, YESNO); ask = 1; - } else if (access(to, W_OK) && !stat(to, &sb)) { + } else if (access(to, W_OK) && !stat(to, &sb) && isatty(STDIN_FILENO)) { strmode(sb.st_mode, modep); (void)fprintf(stderr, "override %s%s%s/%s for %s? %s", modep + 1, modep[9] == ' ' ? "" : " ", Modified: projects/calloutng/bin/sh/alias.c ============================================================================== --- projects/calloutng/bin/sh/alias.c Sat Nov 17 06:33:13 2012 (r243181) +++ projects/calloutng/bin/sh/alias.c Sat Nov 17 11:55:19 2012 (r243182) @@ -68,7 +68,18 @@ setalias(const char *name, const char *v if (equal(name, ap->name)) { INTOFF; ckfree(ap->val); + /* See HACK below. */ +#ifdef notyet ap->val = savestr(val); +#else + { + size_t len = strlen(val); + ap->val = ckmalloc(len + 2); + memcpy(ap->val, val, len); + ap->val[len] = ' '; + ap->val[len+1] = '\0'; + } +#endif INTON; return; } Modified: projects/calloutng/bin/sh/input.c ============================================================================== --- projects/calloutng/bin/sh/input.c Sat Nov 17 06:33:13 2012 (r243181) +++ projects/calloutng/bin/sh/input.c Sat Nov 17 11:55:19 2012 (r243182) @@ -99,7 +99,6 @@ char *parsenextc; /* copy of parsefile- MKINIT struct parsefile basepf; /* top level input file */ char basebuf[BUFSIZ + 1]; /* buffer for top level input file */ static struct parsefile *parsefile = &basepf; /* current input file */ -int init_editline = 0; /* editline library initialized? */ int whichprompt; /* 1 == PS1, 2 == PS2 */ EditLine *el; /* cookie for editline package */ @@ -350,7 +349,7 @@ pungetc(void) * We handle aliases this way. */ void -pushstring(char *s, int len, void *ap) +pushstring(char *s, int len, struct alias *ap) { struct strpush *sp; @@ -365,9 +364,9 @@ pushstring(char *s, int len, void *ap) sp->prevstring = parsenextc; sp->prevnleft = parsenleft; sp->prevlleft = parselleft; - sp->ap = (struct alias *)ap; + sp->ap = ap; if (ap) - ((struct alias *)ap)->flag |= ALIASINUSE; + ap->flag |= ALIASINUSE; parsenextc = s; parsenleft = len; INTON; Modified: projects/calloutng/bin/sh/input.h ============================================================================== --- projects/calloutng/bin/sh/input.h Sat Nov 17 06:33:13 2012 (r243181) +++ projects/calloutng/bin/sh/input.h Sat Nov 17 11:55:19 2012 (r243182) @@ -43,8 +43,8 @@ extern int plinno; extern int parsenleft; /* number of characters left in input buffer */ extern char *parsenextc; /* next character in input buffer */ -extern int init_editline; /* 0 == not setup, 1 == OK, -1 == failed */ +struct alias; struct parsefile; char *pfgets(char *, int); @@ -52,7 +52,7 @@ int pgetc(void); int preadbuffer(void); int preadateof(void); void pungetc(void); -void pushstring(char *, int, void *); +void pushstring(char *, int, struct alias *); void setinputfile(const char *, int); void setinputfd(int, int); void setinputstring(char *, int); Copied: projects/calloutng/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7 (from r243181, head/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/calloutng/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7 Sat Nov 17 11:55:19 2012 (r243182, copy of r243181, head/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7) @@ -0,0 +1,206 @@ +'\" te +.\" Copyright (c) 2012, Martin Matuska <mm@FreeBSD.org>. +.\" 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] +.\" +.\" Copyright (c) 2012 by Delphix. All rights reserved. +.\" +.\" $FreeBSD$ +.\" +.Dd Aug 28, 2012 +.Dt ZPOOL-FEATURES 7 +.Os +.Sh NAME +.Nm zpool-features +.Nd ZFS pool feature descriptions +.Sh DESCRIPTION +ZFS pool on\-disk format versions are specified via "features" which replace +the old on\-disk format numbers (the last supported on\-disk format number is +28). +To enable a feature on a pool use the +.Cm upgrade +subcommand of the +.Xr zpool 8 +command, or set the +.Sy feature@feature_name +property to +.Ar enabled . +.Pp +The pool format does not affect file system version compatibility or the ability +to send file systems between pools. +.Pp +Since most features can be enabled independently of each other the on\-disk +format of the pool is specified by the set of all features marked as +.Sy active +on the pool. If the pool was created by another software version this set may +include unsupported features. +.Ss Identifying features +Every feature has a guid of the form +.Sy com.example:feature_name . +The reverse DNS name ensures that the feature's guid is unique across all ZFS +implementations. When unsupported features are encountered on a pool they will +be identified by their guids. +Refer to the documentation for the ZFS implementation that created the pool +for information about those features. +.Pp +Each supported feature also has a short name. +By convention a feature's short name is the portion of its guid which follows +the ':' (e.g. +.Sy com.example:feature_name +would have the short name +.Sy feature_name ), +however a feature's short name may differ across ZFS implementations if +following the convention would result in name conflicts. +.Ss Feature states +Features can be in one of three states: *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201211171155.qAHBtKtb094373>