Date: Thu, 22 May 2008 16:20:47 GMT From: Paolo Pisati <piso@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 142055 for review Message-ID: <200805221620.m4MGKl1A047598@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=142055 Change 142055 by piso@piso_ferret on 2008/05/22 16:19:50 IFC@142051 Affected files ... .. //depot/projects/soc2005/libalias/bin/sh/expand.c#4 integrate .. //depot/projects/soc2005/libalias/bin/sh/parser.c#4 integrate .. //depot/projects/soc2005/libalias/bin/sh/parser.h#3 integrate .. //depot/projects/soc2005/libalias/cddl/compat/opensolaris/include/dtrace.h#1 branch .. //depot/projects/soc2005/libalias/cddl/compat/opensolaris/include/libproc.h#1 branch .. //depot/projects/soc2005/libalias/cddl/lib/Makefile#6 integrate .. //depot/projects/soc2005/libalias/cddl/lib/drti/Makefile#1 branch .. //depot/projects/soc2005/libalias/cddl/lib/libctf/Makefile#1 branch .. //depot/projects/soc2005/libalias/cddl/lib/libdtrace/Makefile#1 branch .. //depot/projects/soc2005/libalias/cddl/lib/libdtrace/errno.d#1 branch .. //depot/projects/soc2005/libalias/cddl/lib/libdtrace/net.d#1 branch .. //depot/projects/soc2005/libalias/cddl/lib/libdtrace/nfs.d#1 branch .. //depot/projects/soc2005/libalias/cddl/lib/libdtrace/psinfo.d#1 branch .. //depot/projects/soc2005/libalias/cddl/lib/libdtrace/sched.d#1 branch .. //depot/projects/soc2005/libalias/cddl/lib/libdtrace/signal.d#1 branch .. //depot/projects/soc2005/libalias/cddl/lib/libdtrace/unistd.d#1 branch .. //depot/projects/soc2005/libalias/cddl/usr.bin/Makefile#6 integrate .. //depot/projects/soc2005/libalias/cddl/usr.bin/ctfconvert/Makefile#1 branch .. //depot/projects/soc2005/libalias/cddl/usr.bin/ctfdump/Makefile#1 branch .. //depot/projects/soc2005/libalias/cddl/usr.bin/ctfmerge/Makefile#1 branch .. //depot/projects/soc2005/libalias/cddl/usr.bin/sgsmsg/Makefile#1 branch .. //depot/projects/soc2005/libalias/etc/portsnap.conf#2 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/netif#8 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/routing#3 integrate .. //depot/projects/soc2005/libalias/gnu/usr.bin/gdb/kgdb/trgt_mips.c#1 branch .. //depot/projects/soc2005/libalias/include/gssapi/gssapi.h#3 integrate .. //depot/projects/soc2005/libalias/lib/Makefile#11 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_read_support_format_mtree.c#3 integrate .. //depot/projects/soc2005/libalias/lib/libc/stdtime/strftime.3#4 integrate .. //depot/projects/soc2005/libalias/lib/libdwarf/Makefile#1 branch .. //depot/projects/soc2005/libalias/lib/libdwarf/_libdwarf.h#1 branch .. //depot/projects/soc2005/libalias/lib/libdwarf/dwarf.h#1 branch .. //depot/projects/soc2005/libalias/lib/libdwarf/dwarf_abbrev.c#1 branch .. //depot/projects/soc2005/libalias/lib/libdwarf/dwarf_attr.c#1 branch .. //depot/projects/soc2005/libalias/lib/libdwarf/dwarf_attrval.c#1 branch .. //depot/projects/soc2005/libalias/lib/libdwarf/dwarf_cu.c#1 branch .. //depot/projects/soc2005/libalias/lib/libdwarf/dwarf_dealloc.c#1 branch .. //depot/projects/soc2005/libalias/lib/libdwarf/dwarf_die.c#1 branch .. //depot/projects/soc2005/libalias/lib/libdwarf/dwarf_dump.c#1 branch .. //depot/projects/soc2005/libalias/lib/libdwarf/dwarf_errmsg.c#1 branch .. //depot/projects/soc2005/libalias/lib/libdwarf/dwarf_errno.c#1 branch .. //depot/projects/soc2005/libalias/lib/libdwarf/dwarf_finish.c#1 branch .. //depot/projects/soc2005/libalias/lib/libdwarf/dwarf_form.c#1 branch .. //depot/projects/soc2005/libalias/lib/libdwarf/dwarf_init.c#1 branch .. //depot/projects/soc2005/libalias/lib/libdwarf/dwarf_loc.c#1 branch .. //depot/projects/soc2005/libalias/lib/libdwarf/libdwarf.h#1 branch .. //depot/projects/soc2005/libalias/lib/libgeom/geom_util.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libgeom/libgeom.3#3 integrate .. //depot/projects/soc2005/libalias/lib/libpam/modules/pam_ksu/Makefile#2 integrate .. //depot/projects/soc2005/libalias/lib/libproc/Makefile#1 branch .. //depot/projects/soc2005/libalias/lib/libproc/_libproc.h#1 branch .. //depot/projects/soc2005/libalias/lib/libproc/libproc.h#1 branch .. //depot/projects/soc2005/libalias/lib/libproc/proc_create.c#1 branch .. //depot/projects/soc2005/libalias/lib/libproc/proc_sym.c#1 branch .. //depot/projects/soc2005/libalias/lib/libproc/proc_util.c#1 branch .. //depot/projects/soc2005/libalias/sbin/swapon/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sbin/swapon/swapon.8#2 integrate .. //depot/projects/soc2005/libalias/sbin/swapon/swapon.c#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/Makefile#21 integrate .. //depot/projects/soc2005/libalias/share/man/man4/age.4#1 branch .. //depot/projects/soc2005/libalias/share/man/man4/altq.4#9 integrate .. //depot/projects/soc2005/libalias/share/man/man4/man4.i386/acpi_sony.4#3 integrate .. //depot/projects/soc2005/libalias/share/man/man4/miibus.4#6 integrate .. //depot/projects/soc2005/libalias/share/man/man4/vlan.4#8 integrate .. //depot/projects/soc2005/libalias/share/man/man5/portsnap.conf.5#3 integrate .. //depot/projects/soc2005/libalias/share/misc/committers-src.dot#7 integrate .. //depot/projects/soc2005/libalias/share/mk/bsd.lib.mk#9 integrate .. //depot/projects/soc2005/libalias/share/mk/bsd.libnames.mk#9 integrate .. //depot/projects/soc2005/libalias/share/mk/bsd.prog.mk#4 integrate .. //depot/projects/soc2005/libalias/share/mk/sys.mk#7 integrate .. //depot/projects/soc2005/libalias/share/timedef/hu_HU.ISO8859-2.src#3 integrate .. //depot/projects/soc2005/libalias/share/timedef/hu_HU.UTF-8.src#3 integrate .. //depot/projects/soc2005/libalias/sys/Makefile#9 integrate .. //depot/projects/soc2005/libalias/sys/amd64/amd64/genassym.c#10 integrate .. //depot/projects/soc2005/libalias/sys/amd64/amd64/pmap.c#22 integrate .. //depot/projects/soc2005/libalias/sys/amd64/conf/GENERIC#16 integrate .. //depot/projects/soc2005/libalias/sys/arm/arm/pmap.c#13 integrate .. //depot/projects/soc2005/libalias/sys/boot/forth/loader.conf#14 integrate .. //depot/projects/soc2005/libalias/sys/cddl/compat/opensolaris/sys/atomic.h#2 integrate .. //depot/projects/soc2005/libalias/sys/cddl/compat/opensolaris/sys/cmn_err.h#2 integrate .. //depot/projects/soc2005/libalias/sys/cddl/compat/opensolaris/sys/cpuvar.h#3 integrate .. //depot/projects/soc2005/libalias/sys/cddl/compat/opensolaris/sys/cpuvar_defs.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/compat/opensolaris/sys/cyclic.h#2 integrate .. //depot/projects/soc2005/libalias/sys/cddl/compat/opensolaris/sys/cyclic_impl.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/compat/opensolaris/sys/feature_tests.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/compat/opensolaris/sys/kmem.h#2 integrate .. //depot/projects/soc2005/libalias/sys/cddl/compat/opensolaris/sys/lock.h#2 integrate .. //depot/projects/soc2005/libalias/sys/cddl/compat/opensolaris/sys/pcpu.h#2 integrate .. //depot/projects/soc2005/libalias/sys/cddl/compat/opensolaris/sys/sema.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/ctf/ctf_mod.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/ctf/ctf_subr.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/dtrace/lockstat.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/dtrace/profile.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/dtrace/sdt_subr.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/dtrace/systrace.c#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/sys/cmn_err.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/sys/cpupart.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/sys/cpuvar.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/sys/ctf.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/sys/ctf_api.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/sys/debug.h#2 integrate .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace_impl.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/sys/fasttrap.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h#2 integrate .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/intel/sys/fasttrap_isa.h#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/sparc/sys/fasttrap_isa.h#1 branch .. //depot/projects/soc2005/libalias/sys/conf/NOTES#34 integrate .. //depot/projects/soc2005/libalias/sys/conf/files#40 integrate .. //depot/projects/soc2005/libalias/sys/conf/options#32 integrate .. //depot/projects/soc2005/libalias/sys/dev/acpi_support/acpi_ibm.c#7 integrate .. //depot/projects/soc2005/libalias/sys/dev/acpi_support/acpi_sony.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/age/if_age.c#1 branch .. //depot/projects/soc2005/libalias/sys/dev/age/if_agereg.h#1 branch .. //depot/projects/soc2005/libalias/sys/dev/age/if_agevar.h#1 branch .. //depot/projects/soc2005/libalias/sys/dev/ciss/ciss.c#10 integrate .. //depot/projects/soc2005/libalias/sys/dev/em/if_em.c#22 integrate .. //depot/projects/soc2005/libalias/sys/dev/ixgbe/LICENSE#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/ixgbe/README#1 branch .. //depot/projects/soc2005/libalias/sys/dev/ixgbe/ixgbe.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/ixgbe/ixgbe.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/ixgbe/ixgbe_82598.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/ixgbe/ixgbe_api.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/ixgbe/ixgbe_api.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/ixgbe/ixgbe_common.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/ixgbe/ixgbe_common.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/ixgbe/ixgbe_osdep.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/ixgbe/ixgbe_phy.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/ixgbe/ixgbe_phy.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/ixgbe/ixgbe_type.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/ixgbe/tcp_lro.c#1 branch .. //depot/projects/soc2005/libalias/sys/dev/ixgbe/tcp_lro.h#1 branch .. //depot/projects/soc2005/libalias/sys/dev/mii/atphy.c#1 branch .. //depot/projects/soc2005/libalias/sys/dev/mii/atphyreg.h#1 branch .. //depot/projects/soc2005/libalias/sys/dev/mii/miidevs#17 integrate .. //depot/projects/soc2005/libalias/sys/dev/puc/pucdata.c#6 integrate .. //depot/projects/soc2005/libalias/sys/dev/sound/midi/sequencer.c#8 integrate .. //depot/projects/soc2005/libalias/sys/dev/sound/pci/hda/hdac.c#18 integrate .. //depot/projects/soc2005/libalias/sys/dev/sym/sym_defs.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/sym/sym_fw.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/sym/sym_fw1.h#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/sym/sym_fw2.h#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/sym/sym_hipd.c#8 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/umass.c#12 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/usb.c#6 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/usbdevs#20 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/uscanner.c#9 integrate .. //depot/projects/soc2005/libalias/sys/dev/wpi/if_wpi.c#5 integrate .. //depot/projects/soc2005/libalias/sys/dev/wpi/if_wpivar.h#4 integrate .. //depot/projects/soc2005/libalias/sys/fs/devfs/devfs_int.h#4 integrate .. //depot/projects/soc2005/libalias/sys/fs/devfs/devfs_vnops.c#12 integrate .. //depot/projects/soc2005/libalias/sys/fs/ntfs/ntfs_subr.c#4 integrate .. //depot/projects/soc2005/libalias/sys/fs/udf/udf_vnops.c#8 integrate .. //depot/projects/soc2005/libalias/sys/geom/geom_subr.c#6 integrate .. //depot/projects/soc2005/libalias/sys/geom/vinum/geom_vinum_share.c#3 integrate .. //depot/projects/soc2005/libalias/sys/i386/conf/GENERIC#15 integrate .. //depot/projects/soc2005/libalias/sys/i386/i386/genassym.c#8 integrate .. //depot/projects/soc2005/libalias/sys/i386/i386/pmap.c#18 integrate .. //depot/projects/soc2005/libalias/sys/ia64/ia64/machdep.c#17 integrate .. //depot/projects/soc2005/libalias/sys/ia64/ia64/pmap.c#13 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_conf.c#11 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_descrip.c#16 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_dtrace.c#1 branch .. //depot/projects/soc2005/libalias/sys/kern/kern_sdt.c#1 branch .. //depot/projects/soc2005/libalias/sys/kern/kern_sx.c#10 integrate .. //depot/projects/soc2005/libalias/sys/kern/subr_bus.c#12 integrate .. //depot/projects/soc2005/libalias/sys/kern/subr_lock.c#8 integrate .. //depot/projects/soc2005/libalias/sys/kern/subr_witness.c#18 integrate .. //depot/projects/soc2005/libalias/sys/kern/uipc_sem.c#8 integrate .. //depot/projects/soc2005/libalias/sys/kern/uipc_sockbuf.c#8 integrate .. //depot/projects/soc2005/libalias/sys/kern/uipc_syscalls.c#16 integrate .. //depot/projects/soc2005/libalias/sys/kern/vfs_subr.c#23 integrate .. //depot/projects/soc2005/libalias/sys/mips/mips/pmap.c#3 integrate .. //depot/projects/soc2005/libalias/sys/modules/Makefile#26 integrate .. //depot/projects/soc2005/libalias/sys/modules/age/Makefile#1 branch .. //depot/projects/soc2005/libalias/sys/modules/cyclic/Makefile#1 branch .. //depot/projects/soc2005/libalias/sys/modules/dtrace/Makefile#1 branch .. //depot/projects/soc2005/libalias/sys/modules/dtrace/Makefile.inc#1 branch .. //depot/projects/soc2005/libalias/sys/modules/dtrace/dtmalloc/Makefile#1 branch .. //depot/projects/soc2005/libalias/sys/modules/dtrace/dtrace/Makefile#1 branch .. //depot/projects/soc2005/libalias/sys/modules/dtrace/dtrace_test/Makefile#1 branch .. //depot/projects/soc2005/libalias/sys/modules/dtrace/dtraceall/Makefile#1 branch .. //depot/projects/soc2005/libalias/sys/modules/dtrace/dtraceall/dtraceall.c#1 branch .. //depot/projects/soc2005/libalias/sys/modules/dtrace/fasttrap/Makefile#1 branch .. //depot/projects/soc2005/libalias/sys/modules/dtrace/fbt/Makefile#1 branch .. //depot/projects/soc2005/libalias/sys/modules/dtrace/lockstat/Makefile#1 branch .. //depot/projects/soc2005/libalias/sys/modules/dtrace/profile/Makefile#1 branch .. //depot/projects/soc2005/libalias/sys/modules/dtrace/prototype/Makefile#1 branch .. //depot/projects/soc2005/libalias/sys/modules/dtrace/sdt/Makefile#1 branch .. //depot/projects/soc2005/libalias/sys/modules/dtrace/systrace/Makefile#1 branch .. //depot/projects/soc2005/libalias/sys/modules/ixgbe/Makefile#3 integrate .. //depot/projects/soc2005/libalias/sys/modules/mii/Makefile#5 integrate .. //depot/projects/soc2005/libalias/sys/modules/opensolaris/Makefile#1 branch .. //depot/projects/soc2005/libalias/sys/net/ethernet.h#7 integrate .. //depot/projects/soc2005/libalias/sys/net/if.c#15 integrate .. //depot/projects/soc2005/libalias/sys/netinet/ip_dummynet.c#6 integrate .. //depot/projects/soc2005/libalias/sys/netinet/raw_ip.c#13 integrate .. //depot/projects/soc2005/libalias/sys/netinet/sctp.h#7 integrate .. //depot/projects/soc2005/libalias/sys/netinet/sctp_asconf.c#10 integrate .. //depot/projects/soc2005/libalias/sys/netinet/sctp_asconf.h#7 integrate .. //depot/projects/soc2005/libalias/sys/netinet/sctp_cc_functions.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet/sctp_constants.h#10 integrate .. //depot/projects/soc2005/libalias/sys/netinet/sctp_indata.c#12 integrate .. //depot/projects/soc2005/libalias/sys/netinet/sctp_input.c#12 integrate .. //depot/projects/soc2005/libalias/sys/netinet/sctp_input.h#5 integrate .. //depot/projects/soc2005/libalias/sys/netinet/sctp_lock_bsd.h#7 integrate .. //depot/projects/soc2005/libalias/sys/netinet/sctp_os_bsd.h#10 integrate .. //depot/projects/soc2005/libalias/sys/netinet/sctp_output.c#12 integrate .. //depot/projects/soc2005/libalias/sys/netinet/sctp_output.h#6 integrate .. //depot/projects/soc2005/libalias/sys/netinet/sctp_pcb.c#12 integrate .. //depot/projects/soc2005/libalias/sys/netinet/sctp_pcb.h#11 integrate .. //depot/projects/soc2005/libalias/sys/netinet/sctp_structs.h#11 integrate .. //depot/projects/soc2005/libalias/sys/netinet/sctp_sysctl.c#5 integrate .. //depot/projects/soc2005/libalias/sys/netinet/sctp_sysctl.h#4 integrate .. //depot/projects/soc2005/libalias/sys/netinet/sctp_timer.c#9 integrate .. //depot/projects/soc2005/libalias/sys/netinet/sctp_uio.h#9 integrate .. //depot/projects/soc2005/libalias/sys/netinet/sctp_usrreq.c#12 integrate .. //depot/projects/soc2005/libalias/sys/netinet/sctp_var.h#10 integrate .. //depot/projects/soc2005/libalias/sys/netinet/sctputil.c#13 integrate .. //depot/projects/soc2005/libalias/sys/netinet/sctputil.h#10 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/sctp6_usrreq.c#12 integrate .. //depot/projects/soc2005/libalias/sys/netipsec/ipsec.h#5 integrate .. //depot/projects/soc2005/libalias/sys/netipsec/ipsec_osdep.h#6 delete .. //depot/projects/soc2005/libalias/sys/nfsclient/bootp_subr.c#8 integrate .. //depot/projects/soc2005/libalias/sys/pc98/conf/GENERIC#14 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/booke/pmap.c#3 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/conf/GENERIC#15 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/powerpc/genassym.c#7 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/powerpc/mmu_if.m#5 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/powerpc/pmap_dispatch.c#7 integrate .. //depot/projects/soc2005/libalias/sys/security/audit/audit_worker.c#11 integrate .. //depot/projects/soc2005/libalias/sys/sparc64/conf/GENERIC#14 integrate .. //depot/projects/soc2005/libalias/sys/sparc64/sparc64/pmap.c#10 integrate .. //depot/projects/soc2005/libalias/sys/sun4v/conf/GENERIC#11 integrate .. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/pmap.c#12 integrate .. //depot/projects/soc2005/libalias/sys/sys/_lock.h#4 integrate .. //depot/projects/soc2005/libalias/sys/sys/_lockmgr.h#2 integrate .. //depot/projects/soc2005/libalias/sys/sys/_mutex.h#4 integrate .. //depot/projects/soc2005/libalias/sys/sys/_rwlock.h#4 integrate .. //depot/projects/soc2005/libalias/sys/sys/_sx.h#2 integrate .. //depot/projects/soc2005/libalias/sys/sys/conf.h#8 integrate .. //depot/projects/soc2005/libalias/sys/sys/dtrace_bsd.h#1 branch .. //depot/projects/soc2005/libalias/sys/sys/file.h#4 integrate .. //depot/projects/soc2005/libalias/sys/sys/kernel.h#10 integrate .. //depot/projects/soc2005/libalias/sys/sys/lock.h#7 integrate .. //depot/projects/soc2005/libalias/sys/sys/lockmgr.h#10 integrate .. //depot/projects/soc2005/libalias/sys/sys/mutex.h#10 integrate .. //depot/projects/soc2005/libalias/sys/sys/proc.h#22 integrate .. //depot/projects/soc2005/libalias/sys/sys/rwlock.h#10 integrate .. //depot/projects/soc2005/libalias/sys/sys/sdt.h#1 branch .. //depot/projects/soc2005/libalias/sys/sys/socketvar.h#9 integrate .. //depot/projects/soc2005/libalias/sys/sys/systm.h#18 integrate .. //depot/projects/soc2005/libalias/sys/sys/time.h#7 integrate .. //depot/projects/soc2005/libalias/sys/ufs/ufs/ufs_lookup.c#8 integrate .. //depot/projects/soc2005/libalias/sys/vm/device_pager.c#5 integrate .. //depot/projects/soc2005/libalias/sys/vm/pmap.h#6 integrate .. //depot/projects/soc2005/libalias/sys/vm/vm_mmap.c#9 integrate .. //depot/projects/soc2005/libalias/sys/vm/vm_object.c#14 integrate .. //depot/projects/soc2005/libalias/sys/vm/vm_object.h#5 integrate .. //depot/projects/soc2005/libalias/sys/vm/vm_page.c#18 integrate .. //depot/projects/soc2005/libalias/sys/vm/vnode_pager.c#8 integrate .. //depot/projects/soc2005/libalias/tools/regression/aio/aiop/aiop.c#2 integrate .. //depot/projects/soc2005/libalias/tools/regression/bin/sh/builtins/lineno.0#1 branch .. //depot/projects/soc2005/libalias/tools/regression/bin/sh/builtins/lineno.0.stdout#1 branch .. //depot/projects/soc2005/libalias/tools/regression/doat/Makefile#1 branch .. //depot/projects/soc2005/libalias/tools/regression/doat/README#1 branch .. //depot/projects/soc2005/libalias/tools/regression/doat/doat.c#1 branch .. //depot/projects/soc2005/libalias/tools/test/README#2 integrate .. //depot/projects/soc2005/libalias/tools/test/dtrace/Makefile#1 branch .. //depot/projects/soc2005/libalias/tools/tools/net80211/wlanwatch/wlanwatch.c#6 integrate .. //depot/projects/soc2005/libalias/usr.bin/calendar/calendars/calendar.freebsd#18 integrate .. //depot/projects/soc2005/libalias/usr.bin/cksum/cksum.c#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/getopt/README#2 delete .. //depot/projects/soc2005/libalias/usr.bin/getopt/getopt.c#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/netstat/inet.c#8 integrate .. //depot/projects/soc2005/libalias/usr.bin/netstat/main.c#6 integrate .. //depot/projects/soc2005/libalias/usr.bin/netstat/netstat.1#4 integrate .. //depot/projects/soc2005/libalias/usr.bin/netstat/netstat.h#6 integrate .. //depot/projects/soc2005/libalias/usr.bin/sockstat/sockstat.1#3 integrate .. //depot/projects/soc2005/libalias/usr.bin/sockstat/sockstat.c#5 integrate .. //depot/projects/soc2005/libalias/usr.bin/tar/Makefile#8 integrate .. //depot/projects/soc2005/libalias/usr.bin/tar/bsdtar.1#7 integrate .. //depot/projects/soc2005/libalias/usr.bin/tar/bsdtar.c#11 integrate .. //depot/projects/soc2005/libalias/usr.bin/tar/bsdtar.h#8 integrate .. //depot/projects/soc2005/libalias/usr.bin/tar/read.c#10 integrate .. //depot/projects/soc2005/libalias/usr.bin/tar/siginfo.c#1 branch .. //depot/projects/soc2005/libalias/usr.bin/tar/write.c#12 integrate .. //depot/projects/soc2005/libalias/usr.bin/truss/Makefile#4 integrate .. //depot/projects/soc2005/libalias/usr.bin/truss/amd64-fbsd32.c#1 branch .. //depot/projects/soc2005/libalias/usr.bin/truss/amd64-linux32.c#1 branch .. //depot/projects/soc2005/libalias/usr.bin/truss/amd64linux32.conf#1 branch .. //depot/projects/soc2005/libalias/usr.bin/truss/extern.h#3 integrate .. //depot/projects/soc2005/libalias/usr.bin/truss/fbsd32.conf#1 branch .. //depot/projects/soc2005/libalias/usr.bin/truss/main.c#4 integrate .. //depot/projects/soc2005/libalias/usr.sbin/acpi/iasl/iasl.8#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/moused/moused.8#4 integrate .. //depot/projects/soc2005/libalias/usr.sbin/moused/moused.c#6 integrate .. //depot/projects/soc2005/libalias/usr.sbin/portsnap/portsnap/portsnap.sh#4 integrate .. //depot/projects/soc2005/libalias/usr.sbin/sysinstall/devices.c#8 integrate .. //depot/projects/soc2005/libalias/usr.sbin/wlandebug/wlandebug.8#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/wlandebug/wlandebug.c#3 integrate Differences ... ==== //depot/projects/soc2005/libalias/bin/sh/expand.c#4 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.52 2008/04/28 07:26:34 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.53 2008/05/15 19:55:27 stefanf Exp $"); #include <sys/types.h> #include <sys/time.h> @@ -638,7 +638,13 @@ special = 1; p = strchr(p, '=') + 1; again: /* jump here after setting a variable with ${var=text} */ - if (special) { + if (varflags & VSLINENO) { + set = 1; + special = 0; + val = var; + p[-1] = '\0'; /* temporarily overwrite '=' to have \0 + terminated string */ + } else if (special) { set = varisset(var, varflags & VSNUL); val = NULL; } else { @@ -768,6 +774,7 @@ default: abort(); } + p[-1] = '='; /* recover overwritten '=' */ if (subtype != VSNORMAL) { /* skip to end of alternative */ int nesting = 1; ==== //depot/projects/soc2005/libalias/bin/sh/parser.c#4 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.58 2006/11/05 18:36:05 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.59 2008/05/15 19:55:27 stefanf Exp $"); #include <stdlib.h> #include <unistd.h> @@ -94,6 +94,7 @@ STATIC struct heredoc *heredoc; STATIC int quoteflag; /* set if (part of) last token was quoted */ STATIC int startlinno; /* line # where last token started */ +STATIC int funclinno; /* line # where the current function started */ /* XXX When 'noaliases' is set to one, no alias expansion takes place. */ static int noaliases = 0; @@ -567,12 +568,14 @@ /* We have a function */ if (readtoken() != TRP) synexpect(TRP); + funclinno = plinno; #ifdef notdef if (! goodname(n->narg.text)) synerror("Bad function name"); #endif n->type = NDEFUN; n->narg.next = command(); + funclinno = 0; goto checkneg; } else { tokpushback++; @@ -1176,12 +1179,15 @@ */ parsesub: { + char buf[10]; int subtype; int typeloc; int flags; char *p; static const char types[] = "}-+?="; - int bracketed_name = 0; /* used to handle ${[0-9]*} variables */ + int bracketed_name = 0; /* used to handle ${[0-9]*} variables */ + int i; + int linno; c = pgetc(); if (c != '(' && c != '{' && (is_eof(c) || !is_name(c)) && @@ -1200,6 +1206,7 @@ typeloc = out - stackblock(); USTPUTC(VSNORMAL, out); subtype = VSNORMAL; + flags = 0; if (c == '{') { bracketed_name = 1; c = pgetc(); @@ -1213,10 +1220,23 @@ subtype = 0; } if (!is_eof(c) && is_name(c)) { + p = out; do { STPUTC(c, out); c = pgetc(); } while (!is_eof(c) && is_in_name(c)); + if (out - p == 6 && strncmp(p, "LINENO", 6) == 0) { + /* Replace the variable name with the + * current line number. */ + linno = plinno; + if (funclinno != 0) + linno -= funclinno - 1; + snprintf(buf, sizeof(buf), "%d", linno); + STADJUST(-6, out); + for (i = 0; buf[i] != '\0'; i++) + STPUTC(buf[i], out); + flags |= VSLINENO; + } } else if (is_digit(c)) { if (bracketed_name) { do { @@ -1239,11 +1259,10 @@ c = pgetc(); } } - flags = 0; if (subtype == 0) { switch (c) { case ':': - flags = VSNUL; + flags |= VSNUL; c = pgetc(); /*FALLTHROUGH*/ default: ==== //depot/projects/soc2005/libalias/bin/sh/parser.h#3 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * @(#)parser.h 8.3 (Berkeley) 5/4/95 - * $FreeBSD: src/bin/sh/parser.h,v 1.11 2006/11/05 18:36:05 stefanf Exp $ + * $FreeBSD: src/bin/sh/parser.h,v 1.12 2008/05/15 19:55:27 stefanf Exp $ */ /* control characters in argument strings */ @@ -45,9 +45,11 @@ #define CTLQUOTEMARK '\210' /* variable substitution byte (follows CTLVAR) */ -#define VSTYPE 0x0f /* type of variable substitution */ -#define VSNUL 0x10 /* colon--treat the empty string as unset */ -#define VSQUOTE 0x80 /* inside double quotes--suppress splitting */ +#define VSTYPE 0x0f /* type of variable substitution */ +#define VSNUL 0x10 /* colon--treat the empty string as unset */ +#define VSLINENO 0x20 /* expansion of $LINENO, the line number \ + follows immediately */ +#define VSQUOTE 0x80 /* inside double quotes--suppress splitting */ /* values of VSTYPE field */ #define VSNORMAL 0x1 /* normal variable: $var or ${var} */ ==== //depot/projects/soc2005/libalias/cddl/lib/Makefile#6 (text+ko) ==== @@ -1,8 +1,11 @@ -# $FreeBSD: src/cddl/lib/Makefile,v 1.8 2008/03/29 17:44:40 ru Exp $ +# $FreeBSD: src/cddl/lib/Makefile,v 1.9 2008/05/22 04:26:42 jb Exp $ .include <bsd.own.mk> -SUBDIR= libavl \ +SUBDIR= drti \ + libavl \ + libctf \ + libdtrace \ libnvpair \ libumem \ libuutil \ ==== //depot/projects/soc2005/libalias/cddl/usr.bin/Makefile#6 (text+ko) ==== @@ -1,8 +1,13 @@ -# $FreeBSD: src/cddl/usr.bin/Makefile,v 1.8 2008/03/29 17:44:40 ru Exp $ +# $FreeBSD: src/cddl/usr.bin/Makefile,v 1.9 2008/05/22 08:04:48 jb Exp $ .include <bsd.own.mk> -SUBDIR= ${_ztest} +SUBDIR= \ + ctfconvert \ + ctfdump \ + ctfmerge \ + sgsmsg \ + ${_ztest} .if ${MK_ZFS} != "no" .if ${MK_LIBTHR} != "no" ==== //depot/projects/soc2005/libalias/etc/portsnap.conf#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/portsnap.conf,v 1.3 2006/01/18 03:40:57 cperciva Exp $ +# $FreeBSD: src/etc/portsnap.conf,v 1.4 2008/05/17 16:26:27 cperciva Exp $ # Default directory where compressed snapshots are stored. # WORKDIR=/var/db/portsnap @@ -28,3 +28,8 @@ # # REFUSE arabic chinese french german hebrew hungarian japanese # REFUSE korean polish portuguese russian ukrainian vietnamese + +# List of INDEX files to build and the DESCRIBE file to use for each +INDEX INDEX-5 DESCRIBE.5 +INDEX INDEX-6 DESCRIBE.6 +INDEX INDEX-7 DESCRIBE.7 ==== //depot/projects/soc2005/libalias/etc/rc.d/netif#8 (text+ko) ==== @@ -22,7 +22,7 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/netif,v 1.27 2008/05/15 01:06:10 brooks Exp $ +# $FreeBSD: src/etc/rc.d/netif,v 1.28 2008/05/18 02:57:54 brooks Exp $ # # PROVIDE: netif @@ -70,29 +70,6 @@ # Configure the interface(s). network_common ifn_start - if [ -z "$cmdifn" ]; then - dhcp_interfaces=`list_net_interfaces dhcp` - if [ -n "${dhcp_interfaces}" ]; then - delay=${if_up_delay} - while [ ${delay} -gt 0 ]; do - defif=`get_default_if -inet` - if [ -n "${defif}" ]; then - if [ ${delay} -ne ${if_up_delay} ]; then - echo "($defif)" - fi - break - fi - if [ ${delay} -eq ${if_up_delay} ]; then - echo -n "Waiting for an interface to come up: " - else - echo -n . - fi - sleep 1 - delay=`expr $delay - 1` - done - fi - fi - if [ -f /etc/rc.d/ipfilter ] ; then # Resync ipfilter /etc/rc.d/ipfilter quietresync ==== //depot/projects/soc2005/libalias/etc/rc.d/routing#3 (text+ko) ==== @@ -2,14 +2,15 @@ # # Configure routing and miscellaneous network tunables # -# $FreeBSD: src/etc/rc.d/routing,v 1.143 2007/05/02 15:49:30 mtm Exp $ +# $FreeBSD: src/etc/rc.d/routing,v 1.144 2008/05/18 02:57:54 brooks Exp $ # # PROVIDE: routing -# REQUIRE: netif ppp +# REQUIRE: devd netif ppp # KEYWORD: nojail . /etc/rc.subr +. /etc/network.subr name="routing" start_cmd="routing_start" @@ -22,6 +23,31 @@ { static_start options_start + + # Return without waiting if we don't have dhcp interfaces. + # Once we can test that the link is actually up, we should + # remove this test and always wait. + dhcp_interfaces=`list_net_interfaces dhcp` + [ -z "`list_net_interfaces dhcp`" ] && return + + # Wait for a default route + delay=${if_up_delay} + while [ ${delay} -gt 0 ]; do + defif=`get_default_if -inet` + if [ -n "${defif}" ]; then + if [ ${delay} -ne ${if_up_delay} ]; then + echo "($defif)" + fi + break + fi + if [ ${delay} -eq ${if_up_delay} ]; then + echo -n "Waiting ${delay}s for an interface to come up: " + else + echo -n . + fi + sleep 1 + delay=`expr $delay - 1` + done } routing_stop() ==== //depot/projects/soc2005/libalias/include/gssapi/gssapi.h#3 (text+ko) ==== @@ -25,7 +25,7 @@ * HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. * - * $FreeBSD: src/include/gssapi/gssapi.h,v 1.2 2008/05/07 13:53:02 dfr Exp $ + * $FreeBSD: src/include/gssapi/gssapi.h,v 1.4 2008/05/16 02:06:10 dfr Exp $ */ #ifndef _GSSAPI_GSSAPI_H_ @@ -89,6 +89,7 @@ */ typedef gss_uint32 OM_uint32; +typedef uint64_t OM_uint64; typedef struct gss_OID_desc_struct { OM_uint32 length; @@ -419,6 +420,8 @@ #define GSS_S_GAP_TOKEN \ (1ul << (GSS_C_SUPPLEMENTARY_OFFSET + 4)) +__BEGIN_DECLS + /* * Finally, function prototypes for the GSS-API routines. */ @@ -834,4 +837,6 @@ gss_buffer_t /* buffer for result */ ); +__END_DECLS + #endif /* _GSSAPI_GSSAPI_H_ */ ==== //depot/projects/soc2005/libalias/lib/Makefile#11 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.229 2008/03/12 09:49:39 jeff Exp $ +# $FreeBSD: src/lib/Makefile,v 1.230 2008/05/22 04:22:43 jb Exp $ .include <bsd.own.mk> @@ -30,11 +30,11 @@ ${_libypclnt} libalias libarchive ${_libatm} \ libbegemot ${_libbluetooth} libbsnmp libbz2 \ libcalendar libcam libcompat libdevinfo libdevstat libdisk \ - libedit libexpat libfetch libftpio libgeom ${_libgpib} \ + libdwarf libedit libexpat libfetch libftpio libgeom ${_libgpib} \ ${_libgssapi} libipsec \ ${_libipx} libkiconv libmagic libmemstat ${_libmilter} ${_libmp} \ ${_libncp} ${_libngatm} libopie libpam libpcap \ - libpmc librt ${_libsdp} ${_libsm} ${_libsmb} \ + libpmc libproc librt ${_libsdp} ${_libsm} ${_libsmb} \ ${_libsmdb} \ ${_libsmutil} libstand libtelnet ${_libthr} libthread_db libufs \ libugidfw ${_libusbhid} ${_libvgl} libwrap liby libz ${_bind} ==== //depot/projects/soc2005/libalias/lib/libarchive/archive_read_support_format_mtree.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_mtree.c,v 1.4 2008/03/15 11:02:47 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_mtree.c,v 1.5 2008/05/19 18:06:48 cperciva Exp $"); #ifdef HAVE_SYS_STAT_H #include <sys/stat.h> @@ -596,6 +596,7 @@ archive_set_error(&a->archive, ENOMEM, "Can't allocate memory"); } + return (ARCHIVE_FATAL); } *buff = mtree->buff; ==== //depot/projects/soc2005/libalias/lib/libc/stdtime/strftime.3#4 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)strftime.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/stdtime/strftime.3,v 1.39 2007/01/09 00:28:11 imp Exp $ +.\" $FreeBSD: src/lib/libc/stdtime/strftime.3,v 1.40 2008/05/16 04:33:04 grog Exp $ .\" .Dd November 4, 2004 .Dt STRFTIME 3 @@ -154,9 +154,9 @@ .Cm %E* . .It Cm %p is replaced by national representation of either -"ante meridiem" +"ante meridiem" (a.m.) or -"post meridiem" +"post meridiem" (p.m.) as appropriate. .It Cm \&%R is equivalent to ==== //depot/projects/soc2005/libalias/lib/libgeom/geom_util.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libgeom/geom_util.c,v 1.1 2007/05/06 01:17:46 pjd Exp $"); +__FBSDID("$FreeBSD: src/lib/libgeom/geom_util.c,v 1.2 2008/05/20 11:45:05 pjd Exp $"); #include <sys/param.h> #include <sys/disk.h> @@ -46,7 +46,7 @@ * Open the given provider and at least check if this is a block device. */ int -g_open(const char *name, int write) +g_open(const char *name, int dowrite) { char path[MAXPATHLEN]; int fd; @@ -56,7 +56,7 @@ else snprintf(path, sizeof(path), "%s%s", _PATH_DEV, name); - fd = open(path, write ? O_RDWR : O_RDONLY); + fd = open(path, dowrite ? O_RDWR : O_RDONLY); if (fd == -1) return (-1); /* Let try to get sectorsize, which will prove it is a GEOM provider. */ @@ -183,7 +183,7 @@ * Find provider name by the given ID. */ int -g_open_by_ident(const char *ident, int write, char *name, size_t size) +g_open_by_ident(const char *ident, int dowrite, char *name, size_t size) { char lident[DISK_IDENT_SIZE]; struct gmesh mesh; @@ -204,7 +204,7 @@ LIST_FOREACH(mp, &mesh.lg_class, lg_class) { LIST_FOREACH(gp, &mp->lg_geom, lg_geom) { LIST_FOREACH(pp, &gp->lg_provider, lg_provider) { - fd = g_open(pp->lg_name, write); + fd = g_open(pp->lg_name, dowrite); if (fd == -1) continue; if (g_get_ident(fd, lident, ==== //depot/projects/soc2005/libalias/lib/libgeom/libgeom.3#3 (text+ko) ==== @@ -26,7 +26,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libgeom/libgeom.3,v 1.8 2007/05/06 01:17:46 pjd Exp $ +.\" $FreeBSD: src/lib/libgeom/libgeom.3,v 1.9 2008/05/20 11:45:05 pjd Exp $ .\" .Dd May 6, 2007 .Dt LIBGEOM 3 @@ -92,7 +92,7 @@ .Fn gctl_dump "struct gctl_req *req" "FILE *f" .Ss "Utility Functions" .Ft int -.Fn g_open "const char *name" "int write" +.Fn g_open "const char *name" "int dowrite" .Ft int .Fn g_close "int fd" .Ft off_t @@ -108,7 +108,7 @@ .Ft int .Fn g_get_name "const char *ident" "char *name" "size_t size" .Ft int -.Fn g_open_by_ident "const char *ident" "int write" "char *name" "size_t size" +.Fn g_open_by_ident "const char *ident" "int dowrite" "char *name" "size_t size" .Sh DESCRIPTION The .Nm geom @@ -271,7 +271,7 @@ function opens the given provider and returns file descriptor number, which can be used with other functions. The -.Fa write +.Fa dowrite argument indicates if operations that modify the provider (like .Fn g_flush or ==== //depot/projects/soc2005/libalias/lib/libpam/modules/pam_ksu/Makefile#2 (text+ko) ==== @@ -22,13 +22,13 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/lib/libpam/modules/pam_ksu/Makefile,v 1.6 2004/08/06 07:27:04 cperciva Exp $ +# $FreeBSD: src/lib/libpam/modules/pam_ksu/Makefile,v 1.7 2008/05/15 15:28:18 dfr Exp $ LIB= pam_ksu SRCS= pam_ksu.c MAN= pam_ksu.8 -DPADD= ${LIBKRB5} ${LIBASN1} ${LIBROKEN} ${LIBCOM_ERR} ${LIBCRYPT} ${LIBCRYPTO} -LDADD= -lkrb5 -lasn1 -lroken -lcom_err -lcrypt -lcrypto +DPADD= ${LIBKRB5} ${LIBHX509} ${LIBASN1} ${LIBROKEN} ${LIBCOM_ERR} ${LIBCRYPT} ${LIBCRYPTO} +LDADD= -lkrb5 -lhx509 -lasn1 -lroken -lcom_err -lcrypt -lcrypto .include <bsd.lib.mk> ==== //depot/projects/soc2005/libalias/sbin/swapon/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/5/93 -# $FreeBSD: src/sbin/swapon/Makefile,v 1.8 2002/12/28 23:39:47 dillon Exp $ +# $FreeBSD: src/sbin/swapon/Makefile,v 1.9 2008/05/20 12:24:31 pjd Exp $ PROG= swapon MAN= swapon.8 @@ -8,4 +8,7 @@ MLINKS= swapon.8 swapoff.8 MLINKS+=swapon.8 swapctl.8 +DPADD= ${LIBUTIL} +LDADD= -lutil + .include <bsd.prog.mk> ==== //depot/projects/soc2005/libalias/sbin/swapon/swapon.8#2 (text+ko) ==== @@ -26,9 +26,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)swapon.8 8.1 (Berkeley) 6/5/93 -.\" $FreeBSD: src/sbin/swapon/swapon.8,v 1.29 2005/02/10 09:19:34 ru Exp $ +.\" $FreeBSD: src/sbin/swapon/swapon.8,v 1.30 2008/05/20 12:24:31 pjd Exp $ .\" -.Dd December 28, 2002 +.Dd April 29, 2008 .Dt SWAPON 8 .Os .Sh NAME @@ -38,7 +38,7 @@ .Nm swapon Fl a | Ar .Nm swapoff Fl a | Ar .Nm swapctl -.Op Fl AhklsU +.Op Fl AghklmsU .Oo .Fl a Ar | @@ -130,9 +130,13 @@ utility has the following options for listing swap: .Bl -tag -width indent .It Fl h -Output values in megabytes. +Output values in human-readable form. +.It Fl g +Output values in gigabytes. .It Fl k Output values in kilobytes. +.It Fl m +Output values in megabytes. .It Fl l List the devices making up system swap. .It Fl s ==== //depot/projects/soc2005/libalias/sbin/swapon/swapon.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sbin/swapon/swapon.c,v 1.22 2005/02/10 09:19:34 ru Exp $"); +__FBSDID("$FreeBSD: src/sbin/swapon/swapon.c,v 1.23 2008/05/20 12:24:31 pjd Exp $"); #include <sys/stat.h> #include <sys/param.h> @@ -54,6 +54,7 @@ #include <string.h> #include <unistd.h> #include <fcntl.h> +#include <libutil.h> static void usage(void); static int swap_on_off(char *name, int ignoreebusy); @@ -79,7 +80,7 @@ orig_prog = which_prog; doall = 0; - while ((ch = getopt(argc, argv, "AadlhksU")) != -1) { + while ((ch = getopt(argc, argv, "AadghklmsU")) != -1) { switch(ch) { case 'A': if (which_prog == SWAPCTL) { @@ -101,17 +102,23 @@ else usage(); break; - case 's': - sflag = 1; + case 'g': + hflag = 'G'; + break; + case 'h': + hflag = 'H'; + break; + case 'k': + hflag = 'K'; break; case 'l': lflag = 1; break; - case 'h': + case 'm': hflag = 'M'; break; - case 'k': - hflag = 'K'; + case 's': + sflag = 1; break; case 'U': if (which_prog == SWAPCTL) { @@ -199,13 +206,29 @@ fprintf(stderr, "-a | file ...\n"); break; case SWAPCTL: - fprintf(stderr, "[-AhklsU] [-a file ... | -d file ...]\n"); + fprintf(stderr, "[-AghklmsU] [-a file ... | -d file ...]\n"); break; } exit(1); } static void +sizetobuf(char *buf, size_t bufsize, int hflag, long long val, int hlen, + long blocksize) +{ + + if (hflag == 'H') { + char tmp[16]; + + humanize_number(tmp, 5, (int64_t)val, "", HN_AUTOSCALE, + HN_B | HN_NOSPACE | HN_DECIMAL); + snprintf(buf, bufsize, "%*s", hlen, tmp); + } else { + snprintf(buf, bufsize, "%*lld", hlen, val / blocksize); + } +} + +static void swaplist(int lflag, int sflag, int hflag) { size_t mibsize, size; @@ -216,19 +239,33 @@ long long used = 0; long long tmp_total; long long tmp_used; + char buf[32]; pagesize = getpagesize(); switch(hflag) { + case 'G': + blocksize = 1024 * 1024 * 1024; + strlcpy(buf, "1GB-blocks", sizeof(buf)); + hlen = 10; + break; + case 'H': + blocksize = -1; + strlcpy(buf, "Bytes", sizeof(buf)); + hlen = 10; + break; case 'K': blocksize = 1024; + strlcpy(buf, "1kB-blocks", sizeof(buf)); hlen = 10; break; case 'M': >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200805221620.m4MGKl1A047598>