Date: Sat, 31 Aug 2013 17:22:44 +0000 (UTC) From: Alexander Motin <mav@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r255102 - in projects/camlock: . bin/ps bin/sh cddl/contrib/opensolaris/tools/ctf/cvt cddl/lib/libdtrace cddl/lib/libzpool cddl/usr.bin/ztest cddl/usr.sbin/zdb contrib/gcc/config/arm co... Message-ID: <201308311722.r7VHMitj013616@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mav Date: Sat Aug 31 17:22:43 2013 New Revision: 255102 URL: http://svnweb.freebsd.org/changeset/base/255102 Log: MFC @ r255101 Added: projects/camlock/cddl/lib/libdtrace/ip.d - copied unchanged from r255101, head/cddl/lib/libdtrace/ip.d projects/camlock/cddl/lib/libdtrace/tcp.d - copied unchanged from r255101, head/cddl/lib/libdtrace/tcp.d projects/camlock/cddl/lib/libdtrace/udp.d - copied unchanged from r255101, head/cddl/lib/libdtrace/udp.d projects/camlock/etc/periodic/monthly/450.status-security - copied unchanged from r255101, head/etc/periodic/monthly/450.status-security projects/camlock/etc/periodic/weekly/450.status-security - copied unchanged from r255101, head/etc/periodic/weekly/450.status-security projects/camlock/share/man/man4/procdesc.4 - copied unchanged from r255101, head/share/man/man4/procdesc.4 projects/camlock/sys/contrib/dev/drm2/ - copied from r255101, head/sys/contrib/dev/drm2/ projects/camlock/sys/contrib/dev/iwn/iwlwifi-2000-18.168.6.1.fw.uu - copied unchanged from r255101, head/sys/contrib/dev/iwn/iwlwifi-2000-18.168.6.1.fw.uu projects/camlock/sys/dev/drm2/ati_pcigart.c - copied unchanged from r255101, head/sys/dev/drm2/ati_pcigart.c projects/camlock/sys/dev/drm2/drm_buffer.c - copied unchanged from r255101, head/sys/dev/drm2/drm_buffer.c projects/camlock/sys/dev/drm2/drm_buffer.h - copied unchanged from r255101, head/sys/dev/drm2/drm_buffer.h projects/camlock/sys/dev/drm2/drm_core.h - copied unchanged from r255101, head/sys/dev/drm2/drm_core.h projects/camlock/sys/dev/drm2/drm_dp_helper.c - copied unchanged from r255101, head/sys/dev/drm2/drm_dp_helper.c projects/camlock/sys/dev/drm2/drm_fixed.h - copied unchanged from r255101, head/sys/dev/drm2/drm_fixed.h projects/camlock/sys/dev/drm2/drm_os_freebsd.h - copied unchanged from r255101, head/sys/dev/drm2/drm_os_freebsd.h projects/camlock/sys/dev/drm2/radeon/ - copied from r255101, head/sys/dev/drm2/radeon/ projects/camlock/sys/dev/xen/timer/ - copied from r255101, head/sys/dev/xen/timer/ projects/camlock/sys/mips/conf/PICOSTATION_M2HP - copied unchanged from r255101, head/sys/mips/conf/PICOSTATION_M2HP projects/camlock/sys/mips/conf/PICOSTATION_M2HP.hints - copied unchanged from r255101, head/sys/mips/conf/PICOSTATION_M2HP.hints projects/camlock/sys/mips/malta/gt_pci_bus_space.c - copied unchanged from r255101, head/sys/mips/malta/gt_pci_bus_space.c projects/camlock/sys/mips/malta/gt_pci_bus_space.h - copied unchanged from r255101, head/sys/mips/malta/gt_pci_bus_space.h projects/camlock/sys/modules/drm2/radeonkms/ - copied from r255101, head/sys/modules/drm2/radeonkms/ projects/camlock/sys/modules/drm2/radeonkmsfw/ - copied from r255101, head/sys/modules/drm2/radeonkmsfw/ projects/camlock/sys/modules/iwnfw/iwn2000/ - copied from r255101, head/sys/modules/iwnfw/iwn2000/ projects/camlock/sys/netinet/in_kdtrace.c - copied unchanged from r255101, head/sys/netinet/in_kdtrace.c projects/camlock/sys/netinet/in_kdtrace.h - copied unchanged from r255101, head/sys/netinet/in_kdtrace.h projects/camlock/sys/sys/_unrhdr.h - copied unchanged from r255101, head/sys/sys/_unrhdr.h projects/camlock/sys/x86/xen/ - copied from r255101, head/sys/x86/xen/ projects/camlock/sys/xen/evtchn/evtchnvar.h - copied unchanged from r255101, head/sys/xen/evtchn/evtchnvar.h projects/camlock/sys/xen/xen-os.h - copied unchanged from r255101, head/sys/xen/xen-os.h projects/camlock/tools/build/options/WITHOUT_ICONV - copied unchanged from r255101, head/tools/build/options/WITHOUT_ICONV projects/camlock/tools/build/options/WITH_LIBICONV_COMPAT - copied unchanged from r255101, head/tools/build/options/WITH_LIBICONV_COMPAT projects/camlock/tools/build/options/WITH_USB_GADGET_EXAMPLES - copied unchanged from r255101, head/tools/build/options/WITH_USB_GADGET_EXAMPLES projects/camlock/tools/regression/bin/sh/builtins/alias4.0 - copied unchanged from r255101, head/tools/regression/bin/sh/builtins/alias4.0 projects/camlock/tools/regression/bin/sh/builtins/type3.0 - copied unchanged from r255101, head/tools/regression/bin/sh/builtins/type3.0 projects/camlock/tools/regression/bin/sh/expansion/arith13.0 - copied unchanged from r255101, head/tools/regression/bin/sh/expansion/arith13.0 projects/camlock/tools/regression/bin/sh/parser/empty-cmd1.0 - copied unchanged from r255101, head/tools/regression/bin/sh/parser/empty-cmd1.0 projects/camlock/tools/regression/file/fcntlflags/ - copied from r255101, head/tools/regression/file/fcntlflags/ projects/camlock/tools/tools/drm/ - copied from r255101, head/tools/tools/drm/ Deleted: projects/camlock/sys/dev/xen/xenpci/evtchn.c projects/camlock/sys/i386/include/xen/xen_clock_util.h projects/camlock/sys/i386/xen/xen_clock_util.c projects/camlock/sys/i386/xen/xen_rtc.c projects/camlock/sys/xen/evtchn/evtchn.c projects/camlock/tools/build/options/WITH_BSDCONFIG projects/camlock/tools/build/options/WITH_GNU_PATCH projects/camlock/tools/build/options/WITH_ICONV Modified: projects/camlock/Makefile.inc1 projects/camlock/ObsoleteFiles.inc projects/camlock/UPDATING projects/camlock/bin/ps/keyword.c projects/camlock/bin/ps/ps.1 projects/camlock/bin/sh/alias.c projects/camlock/bin/sh/arith_yylex.c projects/camlock/bin/sh/exec.c projects/camlock/bin/sh/parser.c projects/camlock/bin/sh/parser.h projects/camlock/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c projects/camlock/cddl/lib/libdtrace/Makefile projects/camlock/cddl/lib/libzpool/Makefile projects/camlock/cddl/usr.bin/ztest/Makefile projects/camlock/cddl/usr.sbin/zdb/Makefile projects/camlock/contrib/gcc/config/arm/libunwind.S projects/camlock/contrib/gcc/config/arm/unwind-arm.c projects/camlock/contrib/gcc/config/arm/unwind-arm.h projects/camlock/contrib/libcxxrt/exception.cc projects/camlock/contrib/libexecinfo/backtrace.3 projects/camlock/contrib/libexecinfo/backtrace.c projects/camlock/contrib/libexecinfo/symtab.c projects/camlock/contrib/llvm/include/llvm/MC/MCInstPrinter.h projects/camlock/contrib/llvm/lib/MC/MCInstPrinter.cpp projects/camlock/contrib/llvm/lib/Target/X86/InstPrinter/X86ATTInstPrinter.cpp projects/camlock/contrib/llvm/lib/Target/X86/InstPrinter/X86IntelInstPrinter.cpp projects/camlock/contrib/llvm/lib/Transforms/InstCombine/InstCombineSimplifyDemanded.cpp projects/camlock/contrib/llvm/tools/lldb/source/Expression/IRForTarget.cpp projects/camlock/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp projects/camlock/contrib/llvm/tools/lldb/source/lldb.cpp projects/camlock/contrib/pam_modules/pam_passwdqc/pam_passwdqc.c projects/camlock/etc/defaults/periodic.conf projects/camlock/etc/mtree/BSD.usr.dist projects/camlock/etc/periodic/monthly/Makefile projects/camlock/etc/periodic/security/100.chksetuid projects/camlock/etc/periodic/security/110.neggrpperm projects/camlock/etc/periodic/security/200.chkmounts projects/camlock/etc/periodic/security/300.chkuid0 projects/camlock/etc/periodic/security/400.passwdless projects/camlock/etc/periodic/security/410.logincheck projects/camlock/etc/periodic/security/460.chkportsum projects/camlock/etc/periodic/security/500.ipfwdenied projects/camlock/etc/periodic/security/510.ipfdenied projects/camlock/etc/periodic/security/520.pfdenied projects/camlock/etc/periodic/security/550.ipfwlimit projects/camlock/etc/periodic/security/610.ipf6denied projects/camlock/etc/periodic/security/700.kernelmsg projects/camlock/etc/periodic/security/800.loginfail projects/camlock/etc/periodic/security/900.tcpwrap projects/camlock/etc/periodic/security/security.functions projects/camlock/etc/periodic/weekly/Makefile projects/camlock/etc/rc.d/savecore projects/camlock/gnu/usr.bin/patch/Makefile projects/camlock/lib/libc/gen/wordexp.c projects/camlock/lib/libc/sys/pdfork.2 projects/camlock/lib/libcompiler_rt/Makefile projects/camlock/lib/libpam/modules/pam_passwdqc/Makefile projects/camlock/lib/libutil/expand_number.c projects/camlock/lib/libutil/login_auth.c projects/camlock/lib/libutil/login_cap.c projects/camlock/lib/libutil/pidfile.c projects/camlock/lib/libutil/quotafile.c projects/camlock/lib/libutil/uucplock.c projects/camlock/lib/msun/src/s_erf.c projects/camlock/lib/msun/src/s_erff.c projects/camlock/release/scripts/mm-mtree.sh projects/camlock/sbin/camcontrol/camcontrol.c projects/camlock/sbin/etherswitchcfg/etherswitchcfg.8 projects/camlock/share/man/man4/Makefile projects/camlock/share/man/man4/capsicum.4 projects/camlock/share/man/man4/cd.4 projects/camlock/share/man/man4/sysmouse.4 projects/camlock/share/man/man4/vmx.4 projects/camlock/share/man/man5/periodic.conf.5 projects/camlock/share/man/man5/src.conf.5 projects/camlock/share/man/man9/EVENTHANDLER.9 projects/camlock/share/man/man9/Makefile projects/camlock/share/man/man9/pfil.9 projects/camlock/share/man/man9/timeout.9 projects/camlock/share/misc/committers-src.dot projects/camlock/share/mk/bsd.own.mk projects/camlock/share/mk/sys.mk projects/camlock/sys/amd64/amd64/apic_vector.S projects/camlock/sys/amd64/amd64/cpu_switch.S projects/camlock/sys/amd64/amd64/genassym.c projects/camlock/sys/amd64/amd64/machdep.c projects/camlock/sys/amd64/amd64/mp_machdep.c projects/camlock/sys/amd64/amd64/pmap.c projects/camlock/sys/amd64/amd64/vm_machdep.c projects/camlock/sys/amd64/include/apicvar.h projects/camlock/sys/amd64/include/cpufunc.h projects/camlock/sys/amd64/include/intr_machdep.h projects/camlock/sys/amd64/include/pcpu.h projects/camlock/sys/amd64/include/pmap.h projects/camlock/sys/amd64/include/smp.h projects/camlock/sys/amd64/include/xen/hypercall.h projects/camlock/sys/amd64/include/xen/xen-os.h projects/camlock/sys/amd64/vmm/vmm_instruction_emul.c projects/camlock/sys/arm/arm/irq_dispatch.S projects/camlock/sys/arm/arm/machdep.c projects/camlock/sys/arm/arm/pmap-v6.c projects/camlock/sys/arm/arm/pmap.c projects/camlock/sys/arm/arm/stdatomic.c projects/camlock/sys/arm/arm/swtch.S projects/camlock/sys/arm/conf/VERSATILEPB projects/camlock/sys/arm/include/param.h projects/camlock/sys/arm/include/pmap.h projects/camlock/sys/arm/include/pte.h projects/camlock/sys/arm/include/vmparam.h projects/camlock/sys/boot/forth/beastie.4th projects/camlock/sys/boot/forth/version.4th projects/camlock/sys/boot/forth/version.4th.8 projects/camlock/sys/cam/scsi/scsi_all.c projects/camlock/sys/cam/scsi/scsi_ch.c projects/camlock/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c projects/camlock/sys/cddl/dev/dtrace/dtrace_load.c projects/camlock/sys/cddl/dev/dtrace/dtrace_unload.c projects/camlock/sys/cddl/dev/dtrace/powerpc/dtrace_isa.c projects/camlock/sys/cddl/dev/dtrace/powerpc/dtrace_subr.c projects/camlock/sys/cddl/dev/fbt/fbt_powerpc.c projects/camlock/sys/cddl/dev/sdt/sdt.c projects/camlock/sys/compat/freebsd32/freebsd32.h projects/camlock/sys/compat/ndis/kern_ndis.c projects/camlock/sys/compat/ndis/ndis_var.h projects/camlock/sys/conf/Makefile.amd64 projects/camlock/sys/conf/files projects/camlock/sys/conf/files.amd64 projects/camlock/sys/conf/files.i386 projects/camlock/sys/dev/acpica/acpi_thermal.c projects/camlock/sys/dev/ahci/ahci.c projects/camlock/sys/dev/amdtemp/amdtemp.c projects/camlock/sys/dev/ath/if_ath.c projects/camlock/sys/dev/cas/if_cas.c projects/camlock/sys/dev/cxgb/cxgb_sge.c projects/camlock/sys/dev/cxgbe/adapter.h projects/camlock/sys/dev/cxgbe/offload.h projects/camlock/sys/dev/cxgbe/osdep.h projects/camlock/sys/dev/cxgbe/t4_main.c projects/camlock/sys/dev/cxgbe/t4_sge.c projects/camlock/sys/dev/cxgbe/t4_tracer.c projects/camlock/sys/dev/cxgbe/tom/t4_cpl_io.c projects/camlock/sys/dev/cxgbe/tom/t4_tom.c projects/camlock/sys/dev/drm2/drmP.h projects/camlock/sys/dev/drm2/drm_atomic.h projects/camlock/sys/dev/drm2/drm_context.c projects/camlock/sys/dev/drm2/drm_crtc.c projects/camlock/sys/dev/drm2/drm_crtc.h projects/camlock/sys/dev/drm2/drm_crtc_helper.h projects/camlock/sys/dev/drm2/drm_dp_helper.h projects/camlock/sys/dev/drm2/drm_dp_iic_helper.c projects/camlock/sys/dev/drm2/drm_drv.c projects/camlock/sys/dev/drm2/drm_edid.c projects/camlock/sys/dev/drm2/drm_gem.c projects/camlock/sys/dev/drm2/drm_gem_names.c projects/camlock/sys/dev/drm2/drm_ioctl.c projects/camlock/sys/dev/drm2/drm_irq.c projects/camlock/sys/dev/drm2/drm_linux_list.h projects/camlock/sys/dev/drm2/drm_pci.c projects/camlock/sys/dev/drm2/drm_pciids.h projects/camlock/sys/dev/drm2/drm_sysctl.c projects/camlock/sys/dev/drm2/i915/i915_gem.c projects/camlock/sys/dev/drm2/i915/i915_gem_execbuffer.c projects/camlock/sys/dev/drm2/i915/intel_crt.c projects/camlock/sys/dev/drm2/i915/intel_display.c projects/camlock/sys/dev/drm2/i915/intel_dp.c projects/camlock/sys/dev/drm2/i915/intel_drv.h projects/camlock/sys/dev/drm2/i915/intel_hdmi.c projects/camlock/sys/dev/drm2/i915/intel_lvds.c projects/camlock/sys/dev/drm2/i915/intel_panel.c projects/camlock/sys/dev/drm2/i915/intel_sdvo.c projects/camlock/sys/dev/drm2/i915/intel_tv.c projects/camlock/sys/dev/drm2/ttm/ttm_bo.c projects/camlock/sys/dev/drm2/ttm/ttm_bo_driver.h projects/camlock/sys/dev/drm2/ttm/ttm_bo_util.c projects/camlock/sys/dev/drm2/ttm/ttm_bo_vm.c projects/camlock/sys/dev/drm2/ttm/ttm_execbuf_util.c projects/camlock/sys/dev/drm2/ttm/ttm_page_alloc.c projects/camlock/sys/dev/drm2/ttm/ttm_tt.c projects/camlock/sys/dev/e1000/if_igb.c projects/camlock/sys/dev/fb/vesa.c projects/camlock/sys/dev/fdc/fdc.c projects/camlock/sys/dev/flash/mx25l.c projects/camlock/sys/dev/gpio/gpiobus.c projects/camlock/sys/dev/hatm/if_hatm_intr.c projects/camlock/sys/dev/hwpmc/hwpmc_core.c projects/camlock/sys/dev/hwpmc/hwpmc_mod.c projects/camlock/sys/dev/hwpmc/pmc_events.h projects/camlock/sys/dev/if_ndis/if_ndis.c projects/camlock/sys/dev/iscsi_initiator/isc_soc.c projects/camlock/sys/dev/iwn/if_iwn.c projects/camlock/sys/dev/ixgbe/ixgbe.c projects/camlock/sys/dev/ixgbe/ixv.c projects/camlock/sys/dev/jme/if_jme.c projects/camlock/sys/dev/lge/if_lge.c projects/camlock/sys/dev/md/md.c projects/camlock/sys/dev/mwl/if_mwl.c projects/camlock/sys/dev/nfe/if_nfe.c projects/camlock/sys/dev/patm/if_patm.c projects/camlock/sys/dev/patm/if_patm_tx.c projects/camlock/sys/dev/pci/pcivar.h projects/camlock/sys/dev/pci/vga_pci.c projects/camlock/sys/dev/qlxgb/qla_hw.c projects/camlock/sys/dev/qlxgbe/ql_misc.c projects/camlock/sys/dev/qlxgbe/ql_os.c projects/camlock/sys/dev/sfxge/sfxge_rx.c projects/camlock/sys/dev/uart/uart_dev_ns8250.c projects/camlock/sys/dev/usb/controller/dwc_otg.c projects/camlock/sys/dev/usb/controller/musb_otg.c projects/camlock/sys/dev/usb/usbdevs projects/camlock/sys/dev/vmware/vmxnet3/if_vmx.c projects/camlock/sys/dev/vmware/vmxnet3/if_vmxvar.h projects/camlock/sys/dev/wb/if_wb.c projects/camlock/sys/dev/xen/balloon/balloon.c projects/camlock/sys/dev/xen/blkback/blkback.c projects/camlock/sys/dev/xen/blkfront/blkfront.c projects/camlock/sys/dev/xen/blkfront/block.h projects/camlock/sys/dev/xen/console/console.c projects/camlock/sys/dev/xen/console/xencons_ring.c projects/camlock/sys/dev/xen/control/control.c projects/camlock/sys/dev/xen/netback/netback.c projects/camlock/sys/dev/xen/netfront/netfront.c projects/camlock/sys/dev/xen/xenpci/xenpci.c projects/camlock/sys/dev/xen/xenpci/xenpcivar.h projects/camlock/sys/fs/nfs/nfs.h projects/camlock/sys/fs/tmpfs/tmpfs_subr.c projects/camlock/sys/i386/i386/apic_vector.s projects/camlock/sys/i386/i386/machdep.c projects/camlock/sys/i386/i386/mp_machdep.c projects/camlock/sys/i386/i386/pmap.c projects/camlock/sys/i386/include/apicvar.h projects/camlock/sys/i386/include/intr_machdep.h projects/camlock/sys/i386/include/pcpu.h projects/camlock/sys/i386/include/pmap.h projects/camlock/sys/i386/include/xen/xen-os.h projects/camlock/sys/i386/include/xen/xenfunc.h projects/camlock/sys/i386/include/xen/xenvar.h projects/camlock/sys/i386/isa/npx.c projects/camlock/sys/i386/xen/clock.c projects/camlock/sys/i386/xen/exception.s projects/camlock/sys/i386/xen/mp_machdep.c projects/camlock/sys/i386/xen/mptable.c projects/camlock/sys/i386/xen/pmap.c projects/camlock/sys/i386/xen/xen_machdep.c projects/camlock/sys/ia64/ia64/pmap.c projects/camlock/sys/kern/kern_event.c projects/camlock/sys/kern/kern_linker.c projects/camlock/sys/kern/kern_mbuf.c projects/camlock/sys/kern/kern_physio.c projects/camlock/sys/kern/kern_proc.c projects/camlock/sys/kern/kern_synch.c projects/camlock/sys/kern/link_elf.c projects/camlock/sys/kern/subr_mbpool.c projects/camlock/sys/kern/subr_unit.c projects/camlock/sys/kern/uipc_cow.c projects/camlock/sys/kern/uipc_mbuf.c projects/camlock/sys/kern/uipc_socket.c projects/camlock/sys/kern/uipc_syscalls.c projects/camlock/sys/kern/vfs_cluster.c projects/camlock/sys/mips/atheros/ar71xx_spi.c projects/camlock/sys/mips/atheros/if_arge.c projects/camlock/sys/mips/conf/MALTA projects/camlock/sys/mips/conf/MALTA64 projects/camlock/sys/mips/conf/ROUTERSTATION.hints projects/camlock/sys/mips/malta/files.malta projects/camlock/sys/mips/malta/gt_pci.c projects/camlock/sys/mips/malta/malta_machdep.c projects/camlock/sys/mips/malta/yamon.c projects/camlock/sys/mips/mips/pmap.c projects/camlock/sys/modules/drm2/Makefile projects/camlock/sys/modules/drm2/drm2/Makefile projects/camlock/sys/modules/ip6_mroute_mod/Makefile projects/camlock/sys/modules/linux/Makefile projects/camlock/sys/modules/vmware/vmxnet3/Makefile projects/camlock/sys/net/if.h projects/camlock/sys/net/if_fddisubr.c projects/camlock/sys/net/if_iso88025subr.c projects/camlock/sys/net/if_lagg.c projects/camlock/sys/net/if_lagg.h projects/camlock/sys/net/if_llatbl.h projects/camlock/sys/net/if_pfsync.h projects/camlock/sys/net80211/ieee80211_output.c projects/camlock/sys/net80211/ieee80211_proto.h projects/camlock/sys/net80211/ieee80211_superg.c projects/camlock/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c projects/camlock/sys/netinet/icmp_var.h projects/camlock/sys/netinet/igmp.c projects/camlock/sys/netinet/igmp_var.h projects/camlock/sys/netinet/in.h projects/camlock/sys/netinet/ip_fastfwd.c projects/camlock/sys/netinet/ip_input.c projects/camlock/sys/netinet/ip_output.c projects/camlock/sys/netinet/pim_var.h projects/camlock/sys/netinet/sctp_input.c projects/camlock/sys/netinet/tcp_input.c projects/camlock/sys/netinet/tcp_lro.c projects/camlock/sys/netinet/tcp_lro.h projects/camlock/sys/netinet/tcp_output.c projects/camlock/sys/netinet/tcp_subr.c projects/camlock/sys/netinet/tcp_syncache.c projects/camlock/sys/netinet/tcp_usrreq.c projects/camlock/sys/netinet/tcp_var.h projects/camlock/sys/netinet/udp_usrreq.c projects/camlock/sys/netinet/udp_var.h projects/camlock/sys/netinet6/ip6_input.c projects/camlock/sys/netinet6/ip6_mroute.c projects/camlock/sys/netinet6/ip6_output.c projects/camlock/sys/netinet6/mld6.c projects/camlock/sys/netinet6/nd6.c projects/camlock/sys/netinet6/pim6_var.h projects/camlock/sys/netinet6/sctp6_usrreq.c projects/camlock/sys/netinet6/send.c projects/camlock/sys/netinet6/udp6_usrreq.c projects/camlock/sys/netipsec/ipsec.h projects/camlock/sys/netipsec/key_var.h projects/camlock/sys/ofed/drivers/net/mlx4/en_frag.c projects/camlock/sys/powerpc/powermac/atibl.c projects/camlock/sys/powerpc/powermac/nvbl.c projects/camlock/sys/powerpc/powerpc/mmu_if.m projects/camlock/sys/powerpc/powerpc/pmap_dispatch.c projects/camlock/sys/sparc64/sparc64/pmap.c projects/camlock/sys/sys/bitset.h projects/camlock/sys/sys/cpuset.h projects/camlock/sys/sys/eventhandler.h projects/camlock/sys/sys/fcntl.h projects/camlock/sys/sys/kernel.h projects/camlock/sys/sys/mbpool.h projects/camlock/sys/sys/mbuf.h projects/camlock/sys/sys/param.h projects/camlock/sys/sys/pmckern.h projects/camlock/sys/sys/sf_buf.h projects/camlock/sys/sys/socket.h projects/camlock/sys/sys/sysctl.h projects/camlock/sys/sys/systm.h projects/camlock/sys/sys/user.h projects/camlock/sys/ufs/ffs/ffs_alloc.c projects/camlock/sys/ufs/ufs/ufs_dirhash.c projects/camlock/sys/vm/pmap.h projects/camlock/sys/vm/uma_core.c projects/camlock/sys/vm/vm_map.c projects/camlock/sys/vm/vm_page.c projects/camlock/sys/x86/include/segments.h projects/camlock/sys/x86/x86/local_apic.c projects/camlock/sys/xen/evtchn.h projects/camlock/sys/xen/evtchn/evtchn_dev.c projects/camlock/sys/xen/features.c projects/camlock/sys/xen/gnttab.c projects/camlock/sys/xen/gnttab.h projects/camlock/sys/xen/hvm.h projects/camlock/sys/xen/interface/event_channel.h projects/camlock/sys/xen/xen_intr.h projects/camlock/sys/xen/xenbus/xenbus.c projects/camlock/sys/xen/xenbus/xenbus_if.m projects/camlock/sys/xen/xenbus/xenbusb_front.c projects/camlock/sys/xen/xenbus/xenbusvar.h projects/camlock/sys/xen/xenstore/xenstore.c projects/camlock/sys/xen/xenstore/xenstore_dev.c projects/camlock/sys/xen/xenstore/xenstorevar.h projects/camlock/tools/tools/README projects/camlock/usr.bin/brandelf/brandelf.1 projects/camlock/usr.bin/dig/Makefile projects/camlock/usr.bin/host/Makefile projects/camlock/usr.bin/kdump/kdump.c projects/camlock/usr.bin/kdump/mksubr projects/camlock/usr.bin/nslookup/Makefile projects/camlock/usr.bin/patch/Makefile projects/camlock/usr.sbin/bhyve/pci_emul.c projects/camlock/usr.sbin/bhyve/pci_virtio_block.c projects/camlock/usr.sbin/crashinfo/crashinfo.sh projects/camlock/usr.sbin/mfiutil/mfi_drive.c projects/camlock/usr.sbin/mfiutil/mfiutil.8 projects/camlock/usr.sbin/mfiutil/mfiutil.c projects/camlock/usr.sbin/periodic/periodic.sh projects/camlock/usr.sbin/rtadvd/config.c Directory Properties: projects/camlock/ (props changed) projects/camlock/cddl/ (props changed) projects/camlock/cddl/contrib/opensolaris/ (props changed) projects/camlock/contrib/gcc/ (props changed) projects/camlock/contrib/libcxxrt/ (props changed) projects/camlock/contrib/libexecinfo/ (props changed) projects/camlock/contrib/llvm/ (props changed) projects/camlock/lib/libc/ (props changed) projects/camlock/lib/libutil/ (props changed) projects/camlock/sbin/ (props changed) projects/camlock/share/man/man4/ (props changed) projects/camlock/sys/ (props changed) projects/camlock/sys/amd64/include/xen/ (props changed) projects/camlock/sys/amd64/vmm/ (props changed) projects/camlock/sys/boot/ (props changed) projects/camlock/sys/cddl/contrib/opensolaris/ (props changed) projects/camlock/sys/conf/ (props changed) projects/camlock/usr.sbin/bhyve/ (props changed) projects/camlock/usr.sbin/rtadvd/ (props changed) Modified: projects/camlock/Makefile.inc1 ============================================================================== --- projects/camlock/Makefile.inc1 Sat Aug 31 16:56:59 2013 (r255101) +++ projects/camlock/Makefile.inc1 Sat Aug 31 17:22:43 2013 (r255102) @@ -265,7 +265,7 @@ WMAKEENV= ${CROSSENV} \ PATH=${TMPPATH} # make hierarchy -HMAKE= PATH=${TMPPATH} ${MAKE} LOCAL_MTREE=${LOCAL_MTREE} +HMAKE= PATH=${TMPPATH} ${MAKE} LOCAL_MTREE=${LOCAL_MTREE:Q} .if defined(NO_ROOT) HMAKE+= PATH=${TMPPATH} METALOG=${METALOG} -DNO_ROOT .endif @@ -814,7 +814,7 @@ distributeworld installworld: installche cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH} ${MAKE} \ METALOG=${METALOG} ${IMAKE_INSTALL} ${IMAKE_MTREE} \ DISTBASE=/base DESTDIR=${DESTDIR}/${DISTDIR}/base \ - LOCAL_MTREE=${LOCAL_MTREE} distrib-dirs + LOCAL_MTREE=${LOCAL_MTREE:Q} distrib-dirs .endif ${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//}; \ ${IMAKEENV} rm -rf ${INSTALLTMP} @@ -888,7 +888,7 @@ reinstall: @echo ">>> Making hierarchy" @echo "--------------------------------------------------------------" ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 \ - LOCAL_MTREE=${LOCAL_MTREE} hierarchy + LOCAL_MTREE=${LOCAL_MTREE:Q} hierarchy @echo @echo "--------------------------------------------------------------" @echo ">>> Installing everything" Modified: projects/camlock/ObsoleteFiles.inc ============================================================================== --- projects/camlock/ObsoleteFiles.inc Sat Aug 31 16:56:59 2013 (r255101) +++ projects/camlock/ObsoleteFiles.inc Sat Aug 31 17:22:43 2013 (r255102) @@ -38,6 +38,17 @@ # xargs -n1 | sort | uniq -d; # done +# 20130829: bsdpatch is patch unconditionally +OLD_FILES+=usr/bin/bsdpatch +OLD_FILES+=usr/share/man/man1/bsdpatch.1.gz +# 20130822: bind 9.9.3-P2 import +OLD_LIBS+=usr/lib/liblwres.so.80 +# 20130814: vm_page_busy(9) +OLD_FILES+=usr/share/man/man9/vm_page_flash.9.gz +OLD_FILES+=usr/share/man/man9/vm_page_io.9.gz +OLD_FILES+=usr/share/man/man9/vm_page_io_finish.9.gz +OLD_FILES+=usr/share/man/man9/vm_page_io_start.9.gz +OLD_FILES+=usr/share/man/man9/vm_page_wakeup.9.gz # 20130710: libkvm version bump OLD_LIBS+=lib/libkvm.so.5 OLD_LIBS+=usr/lib32/libkvm.so.5 @@ -114,6 +125,7 @@ OLD_FILES+=usr/include/clang/3.2/xmmintr OLD_FILES+=usr/include/clang/3.2/xopintrin.h OLD_DIRS+=usr/include/clang/3.2 # 20130404: legacy ATA stack removed +OLD_FILES+=etc/periodic/daily/405.status-ata-raid OLD_FILES+=rescue/atacontrol OLD_FILES+=sbin/atacontrol OLD_FILES+=usr/share/man/man8/atacontrol.8.gz Modified: projects/camlock/UPDATING ============================================================================== --- projects/camlock/UPDATING Sat Aug 31 16:56:59 2013 (r255101) +++ projects/camlock/UPDATING Sat Aug 31 17:22:43 2013 (r255102) @@ -31,6 +31,19 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20130827: + Thomas Dickey (vendor author thereof) reports that dialog(1) since + 2011/10/18 has a bug in handling --hline. Testers and I noticed the + --hline is not ignored but displayed as a NULL string, regardless of + value. This will cause confusion in some bsdconfig dialogs where the + --hline is used to inform users which keybindings to use. This will + likewise affect any other persons relying on --hline. It also looks + rather strange seeing "[]" at the bottom of dialog(1) widgets when + passing --hline "anything". Thomas said he will have a look in a few + weeks. NOTE: The "[]" brackets appear with the left-edge where it + would normally appear given the width of text to display, but the + displayed text is not there (part of the bug). + 20130821: The PADLOCK_RNG and RDRAND_RNG kernel options are now devices. Thus "device padlock_rng" and "device rdrand_rng" should be Modified: projects/camlock/bin/ps/keyword.c ============================================================================== --- projects/camlock/bin/ps/keyword.c Sat Aug 31 16:56:59 2013 (r255101) +++ projects/camlock/bin/ps/keyword.c Sat Aug 31 17:22:43 2013 (r255102) @@ -87,6 +87,7 @@ static VAR var[] = { {"etimes", "ELAPSED", NULL, USER, elapseds, 0, CHAR, NULL, 0}, {"euid", "", "uid", 0, NULL, 0, CHAR, NULL, 0}, {"f", "F", NULL, 0, kvar, KOFF(ki_flag), INT, "x", 0}, + {"fib", "FIB", NULL, 0, kvar, KOFF(ki_fibnum), INT, "d", 0}, {"flags", "", "f", 0, NULL, 0, CHAR, NULL, 0}, {"gid", "GID", NULL, 0, kvar, KOFF(ki_groups), UINT, UIDFMT, 0}, {"group", "GROUP", NULL, LJUST, egroupname, 0, CHAR, NULL, 0}, Modified: projects/camlock/bin/ps/ps.1 ============================================================================== --- projects/camlock/bin/ps/ps.1 Sat Aug 31 16:56:59 2013 (r255101) +++ projects/camlock/bin/ps/ps.1 Sat Aug 31 17:22:43 2013 (r255102) @@ -512,6 +512,9 @@ elapsed running time, format minutes:seconds. .It Cm etimes elapsed running time, in decimal integer seconds +.It Cm fib +default FIB number, see +.Xr setfib 1 .It Cm flags the process flags, in hexadecimal (alias .Cm f ) Modified: projects/camlock/bin/sh/alias.c ============================================================================== --- projects/camlock/bin/sh/alias.c Sat Aug 31 16:56:59 2013 (r255101) +++ projects/camlock/bin/sh/alias.c Sat Aug 31 17:22:43 2013 (r255102) @@ -237,17 +237,19 @@ printaliases(void) } int -aliascmd(int argc, char **argv) +aliascmd(int argc __unused, char **argv __unused) { char *n, *v; int ret = 0; struct alias *ap; - if (argc == 1) { + nextopt(""); + + if (*argptr == NULL) { printaliases(); return (0); } - while ((n = *++argv) != NULL) { + while ((n = *argptr++) != NULL) { if ((v = strchr(n+1, '=')) == NULL) /* n+1: funny ksh stuff */ if ((ap = lookupalias(n, 0)) == NULL) { warning("%s: not found", n); Modified: projects/camlock/bin/sh/arith_yylex.c ============================================================================== --- projects/camlock/bin/sh/arith_yylex.c Sat Aug 31 16:56:59 2013 (r255101) +++ projects/camlock/bin/sh/arith_yylex.c Sat Aug 31 17:22:43 2013 (r255102) @@ -218,9 +218,13 @@ checkeqcur: value += ARITH_REM - '%'; goto checkeq; case '+': + if (buf[1] == '+') + return ARITH_BAD; value += ARITH_ADD - '+'; goto checkeq; case '-': + if (buf[1] == '-') + return ARITH_BAD; value += ARITH_SUB - '-'; goto checkeq; case '~': Modified: projects/camlock/bin/sh/exec.c ============================================================================== --- projects/camlock/bin/sh/exec.c Sat Aug 31 16:56:59 2013 (r255101) +++ projects/camlock/bin/sh/exec.c Sat Aug 31 17:22:43 2013 (r255102) @@ -762,5 +762,7 @@ typecmd_impl(int argc, char **argv, int int typecmd(int argc, char **argv) { + if (argc > 2 && strcmp(argv[1], "--") == 0) + argc--, argv++; return typecmd_impl(argc, argv, TYPECMD_TYPE, bltinlookup("PATH", 1)); } Modified: projects/camlock/bin/sh/parser.c ============================================================================== --- projects/camlock/bin/sh/parser.c Sat Aug 31 16:56:59 2013 (r255101) +++ projects/camlock/bin/sh/parser.c Sat Aug 31 17:22:43 2013 (r255102) @@ -96,7 +96,7 @@ static struct heredoc *heredoclist; /* l static int doprompt; /* if set, prompt the user */ static int needprompt; /* true if interactive and at start of line */ static int lasttoken; /* last token read */ -int tokpushback; /* last token pushed back */ +static int tokpushback; /* last token pushed back */ static char *wordtext; /* text of last word returned by readtoken */ static int checkkwd; static struct nodelist *backquotelist; @@ -108,12 +108,13 @@ static int funclinno; /* line # where t static struct parser_temp *parser_temp; -static union node *list(int, int); +static union node *list(int); static union node *andor(void); static union node *pipeline(void); static union node *command(void); static union node *simplecmd(union node **, union node *); static union node *makename(void); +static union node *makebinary(int type, union node *n1, union node *n2); static void parsefname(void); static void parseheredoc(void); static int peektoken(void); @@ -121,6 +122,7 @@ static int readtoken(void); static int xxreadtoken(void); static int readtoken1(int, const char *, const char *, int); static int noexpand(char *); +static void consumetoken(int); static void synexpect(int) __dead2; static void synerror(const char *) __dead2; static void setprompt(int); @@ -223,18 +225,18 @@ parsecmd(int interact) if (t == TNL) return NULL; tokpushback++; - return list(1, 1); + return list(1); } static union node * -list(int nlflag, int erflag) +list(int nlflag) { union node *ntop, *n1, *n2, *n3; int tok; checkkwd = CHKNL | CHKKWD | CHKALIAS; - if (!nlflag && !erflag && tokendlist[peektoken()]) + if (!nlflag && tokendlist[peektoken()]) return NULL; ntop = n1 = NULL; for (;;) { @@ -256,17 +258,11 @@ list(int nlflag, int erflag) if (ntop == NULL) ntop = n2; else if (n1 == NULL) { - n1 = (union node *)stalloc(sizeof (struct nbinary)); - n1->type = NSEMI; - n1->nbinary.ch1 = ntop; - n1->nbinary.ch2 = n2; + n1 = makebinary(NSEMI, ntop, n2); ntop = n1; } else { - n3 = (union node *)stalloc(sizeof (struct nbinary)); - n3->type = NSEMI; - n3->nbinary.ch1 = n1->nbinary.ch2; - n3->nbinary.ch2 = n2; + n3 = makebinary(NSEMI, n1->nbinary.ch2, n2); n1->nbinary.ch2 = n3; n1 = n3; } @@ -287,8 +283,7 @@ list(int nlflag, int erflag) tokpushback++; } checkkwd = CHKNL | CHKKWD | CHKALIAS; - if (!nlflag && (erflag ? peektoken() == TEOF : - tokendlist[peektoken()])) + if (!nlflag && tokendlist[peektoken()]) return ntop; break; case TEOF: @@ -298,7 +293,7 @@ list(int nlflag, int erflag) pungetc(); /* push back EOF on input */ return ntop; default: - if (nlflag || erflag) + if (nlflag) synexpect(-1); tokpushback++; return ntop; @@ -311,10 +306,10 @@ list(int nlflag, int erflag) static union node * andor(void) { - union node *n1, *n2, *n3; + union node *n; int t; - n1 = pipeline(); + n = pipeline(); for (;;) { if ((t = readtoken()) == TAND) { t = NAND; @@ -322,14 +317,9 @@ andor(void) t = NOR; } else { tokpushback++; - return n1; + return n; } - n2 = pipeline(); - n3 = (union node *)stalloc(sizeof (struct nbinary)); - n3->type = t; - n3->nbinary.ch1 = n1; - n3->nbinary.ch2 = n2; - n1 = n3; + n = makebinary(t, n, pipeline()); } } @@ -411,49 +401,39 @@ command(void) case TIF: n1 = (union node *)stalloc(sizeof (struct nif)); n1->type = NIF; - if ((n1->nif.test = list(0, 0)) == NULL) + if ((n1->nif.test = list(0)) == NULL) synexpect(-1); - if (readtoken() != TTHEN) - synexpect(TTHEN); - n1->nif.ifpart = list(0, 0); + consumetoken(TTHEN); + n1->nif.ifpart = list(0); n2 = n1; while (readtoken() == TELIF) { n2->nif.elsepart = (union node *)stalloc(sizeof (struct nif)); n2 = n2->nif.elsepart; n2->type = NIF; - if ((n2->nif.test = list(0, 0)) == NULL) + if ((n2->nif.test = list(0)) == NULL) synexpect(-1); - if (readtoken() != TTHEN) - synexpect(TTHEN); - n2->nif.ifpart = list(0, 0); + consumetoken(TTHEN); + n2->nif.ifpart = list(0); } if (lasttoken == TELSE) - n2->nif.elsepart = list(0, 0); + n2->nif.elsepart = list(0); else { n2->nif.elsepart = NULL; tokpushback++; } - if (readtoken() != TFI) - synexpect(TFI); + consumetoken(TFI); checkkwd = CHKKWD | CHKALIAS; break; case TWHILE: - case TUNTIL: { - int got; - n1 = (union node *)stalloc(sizeof (struct nbinary)); - n1->type = (lasttoken == TWHILE)? NWHILE : NUNTIL; - if ((n1->nbinary.ch1 = list(0, 0)) == NULL) + case TUNTIL: + t = lasttoken; + if ((n1 = list(0)) == NULL) synexpect(-1); - if ((got=readtoken()) != TDO) { -TRACE(("expecting DO got %s %s\n", tokname[got], got == TWORD ? wordtext : "")); - synexpect(TDO); - } - n1->nbinary.ch2 = list(0, 0); - if (readtoken() != TDONE) - synexpect(TDONE); + consumetoken(TDO); + n1 = makebinary((t == TWHILE)? NWHILE : NUNTIL, n1, list(0)); + consumetoken(TDONE); checkkwd = CHKKWD | CHKALIAS; break; - } case TFOR: if (readtoken() != TWORD || quoteflag || ! goodname(wordtext)) synerror("Bad for loop variable"); @@ -465,10 +445,7 @@ TRACE(("expecting DO got %s %s\n", tokna if (lasttoken == TWORD && ! quoteflag && equal(wordtext, "in")) { app = ≈ while (readtoken() == TWORD) { - n2 = (union node *)stalloc(sizeof (struct narg)); - n2->type = NARG; - n2->narg.text = wordtext; - n2->narg.backquote = backquotelist; + n2 = makename(); *app = n2; app = &n2->narg.next; } @@ -500,21 +477,15 @@ TRACE(("expecting DO got %s %s\n", tokna t = TEND; else synexpect(-1); - n1->nfor.body = list(0, 0); - if (readtoken() != t) - synexpect(t); + n1->nfor.body = list(0); + consumetoken(t); checkkwd = CHKKWD | CHKALIAS; break; case TCASE: n1 = (union node *)stalloc(sizeof (struct ncase)); n1->type = NCASE; - if (readtoken() != TWORD) - synexpect(TWORD); - n1->ncase.expr = n2 = (union node *)stalloc(sizeof (struct narg)); - n2->type = NARG; - n2->narg.text = wordtext; - n2->narg.backquote = backquotelist; - n2->narg.next = NULL; + consumetoken(TWORD); + n1->ncase.expr = makename(); while (readtoken() == TNL); if (lasttoken != TWORD || ! equal(wordtext, "in")) synerror("expecting \"in\""); @@ -527,10 +498,7 @@ TRACE(("expecting DO got %s %s\n", tokna if (lasttoken == TLP) readtoken(); for (;;) { - *app = ap = (union node *)stalloc(sizeof (struct narg)); - ap->type = NARG; - ap->narg.text = wordtext; - ap->narg.backquote = backquotelist; + *app = ap = makename(); checkkwd = CHKNL | CHKKWD; if (readtoken() != TPIPE) break; @@ -540,7 +508,7 @@ TRACE(("expecting DO got %s %s\n", tokna ap->narg.next = NULL; if (lasttoken != TRP) synexpect(TRP); - cp->nclist.body = list(0, 0); + cp->nclist.body = list(0); checkkwd = CHKNL | CHKKWD | CHKALIAS; if ((t = readtoken()) != TESAC) { @@ -560,20 +528,18 @@ TRACE(("expecting DO got %s %s\n", tokna case TLP: n1 = (union node *)stalloc(sizeof (struct nredir)); n1->type = NSUBSHELL; - n1->nredir.n = list(0, 0); + n1->nredir.n = list(0); n1->nredir.redirect = NULL; - if (readtoken() != TRP) - synexpect(TRP); + consumetoken(TRP); checkkwd = CHKKWD | CHKALIAS; is_subshell = 1; break; case TBEGIN: - n1 = list(0, 0); - if (readtoken() != TEND) - synexpect(TEND); + n1 = list(0); + consumetoken(TEND); checkkwd = CHKKWD | CHKALIAS; break; - /* Handle an empty command like other simple commands. */ + /* A simple command must have at least one redirection or word. */ case TBACKGND: case TSEMI: case TAND: @@ -581,16 +547,12 @@ TRACE(("expecting DO got %s %s\n", tokna case TPIPE: case TENDCASE: case TFALLTHRU: - /* - * An empty command before a ; doesn't make much sense, and - * should certainly be disallowed in the case of `if ;'. - */ + case TEOF: + case TNL: + case TRP: if (!redir) synexpect(-1); - case TNL: - case TEOF: case TWORD: - case TRP: tokpushback++; n1 = simplecmd(rpp, redir); return n1; @@ -648,10 +610,7 @@ simplecmd(union node **rpp, union node * for (;;) { checkkwd = savecheckkwd; if (readtoken() == TWORD) { - n = (union node *)stalloc(sizeof (struct narg)); - n->type = NARG; - n->narg.text = wordtext; - n->narg.backquote = backquotelist; + n = makename(); *app = n; app = &n->narg.next; if (savecheckkwd != 0 && !isassignment(wordtext)) @@ -663,8 +622,7 @@ simplecmd(union node **rpp, union node * } else if (lasttoken == TLP && app == &args->narg.next && rpp == orig_rpp) { /* We have a function */ - if (readtoken() != TRP) - synexpect(TRP); + consumetoken(TRP); funclinno = plinno; /* * - Require plain text. @@ -712,6 +670,18 @@ makename(void) return n; } +static union node * +makebinary(int type, union node *n1, union node *n2) +{ + union node *n; + + n = (union node *)stalloc(sizeof (struct nbinary)); + n->type = type; + n->nbinary.ch1 = n1; + n->nbinary.ch2 = n2; + return (n); +} + void fixredir(union node *n, const char *text, int err) { @@ -738,8 +708,7 @@ parsefname(void) { union node *n = redirnode; - if (readtoken() != TWORD) - synexpect(-1); + consumetoken(TWORD); if (n->type == NHERE) { struct heredoc *here = heredoc; struct heredoc *p; @@ -790,11 +759,7 @@ parseheredoc(void) } readtoken1(pgetc(), here->here->type == NHERE? SQSYNTAX : DQSYNTAX, here->eofmark, here->striptabs); - n = (union node *)stalloc(sizeof (struct narg)); - n->narg.type = NARG; - n->narg.next = NULL; - n->narg.text = wordtext; - n->narg.backquote = backquotelist; + n = makename(); here->here->nhere.doc = n; } } @@ -1094,14 +1059,14 @@ done: doprompt = 0; } - n = list(0, oldstyle); + n = list(0); - if (oldstyle) + if (oldstyle) { + if (peektoken() != TEOF) + synexpect(-1); doprompt = saveprompt; - else { - if (readtoken() != TRP) - synexpect(TRP); - } + } else + consumetoken(TRP); (*nlpp)->n = n; if (oldstyle) { @@ -1884,6 +1849,14 @@ isassignment(const char *p) } +static void +consumetoken(int token) +{ + if (readtoken() != token) + synexpect(token); +} + + /* * Called when an unexpected token is read during the parse. The argument * is the token that is expected, or -1 if more than one type of token can Modified: projects/camlock/bin/sh/parser.h ============================================================================== --- projects/camlock/bin/sh/parser.h Sat Aug 31 16:56:59 2013 (r255101) +++ projects/camlock/bin/sh/parser.h Sat Aug 31 17:22:43 2013 (r255102) @@ -68,11 +68,9 @@ /* * NEOF is returned by parsecmd when it encounters an end of file. It - * must be distinct from NULL, so we use the address of a variable that - * happens to be handy. + * must be distinct from NULL. */ -extern int tokpushback; -#define NEOF ((union node *)&tokpushback) +#define NEOF ((union node *)-1) extern int whichprompt; /* 1 == PS1, 2 == PS2 */ extern const char *const parsekwd[]; Modified: projects/camlock/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c ============================================================================== --- projects/camlock/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c Sat Aug 31 16:56:59 2013 (r255101) +++ projects/camlock/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c Sat Aug 31 17:22:43 2013 (r255102) @@ -23,8 +23,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * DWARF to tdata conversion * @@ -1796,6 +1794,59 @@ die_resolve(dwarf_t *dw) } while (dw->dw_nunres != 0); } +/* + * Any object containing a function or object symbol at any scope should also + * contain DWARF data. + */ +static boolean_t +should_have_dwarf(Elf *elf) +{ + Elf_Scn *scn = NULL; + Elf_Data *data = NULL; + GElf_Shdr shdr; + GElf_Sym sym; + uint32_t symdx = 0; + size_t nsyms = 0; + boolean_t found = B_FALSE; + + while ((scn = elf_nextscn(elf, scn)) != NULL) { + gelf_getshdr(scn, &shdr); + + if (shdr.sh_type == SHT_SYMTAB) { + found = B_TRUE; + break; + } + } + + if (!found) + terminate("cannot convert stripped objects\n"); + + data = elf_getdata(scn, NULL); + nsyms = shdr.sh_size / shdr.sh_entsize; + + for (symdx = 0; symdx < nsyms; symdx++) { + gelf_getsym(data, symdx, &sym); + + if ((GELF_ST_TYPE(sym.st_info) == STT_FUNC) || + (GELF_ST_TYPE(sym.st_info) == STT_TLS) || + (GELF_ST_TYPE(sym.st_info) == STT_OBJECT)) { + char *name; + + name = elf_strptr(elf, shdr.sh_link, sym.st_name); + + /* Studio emits these local symbols regardless */ + if ((strcmp(name, "Bbss.bss") != 0) && + (strcmp(name, "Ttbss.bss") != 0) && + (strcmp(name, "Ddata.data") != 0) && + (strcmp(name, "Ttdata.data") != 0) && + (strcmp(name, "Drodata.rodata") != 0)) + return (B_TRUE); + } + } + + return (B_FALSE); +} + /*ARGSUSED*/ int dw_read(tdata_t *td, Elf *elf, char *filename __unused) @@ -1820,8 +1871,12 @@ dw_read(tdata_t *td, Elf *elf, char *fil if ((rc = dwarf_elf_init(elf, DW_DLC_READ, &dw.dw_dw, &dw.dw_err)) == DW_DLV_NO_ENTRY) { - errno = ENOENT; - return (-1); + if (should_have_dwarf(elf)) { + errno = ENOENT; + return (-1); + } else { + return (0); + } } else if (rc != DW_DLV_OK) { if (dwarf_errno(&dw.dw_err) == DW_DLE_DEBUG_INFO_NULL) { /* @@ -1839,9 +1894,14 @@ dw_read(tdata_t *td, Elf *elf, char *fil &addrsz, &nxthdr, &dw.dw_err)) != DW_DLV_OK) terminate("rc = %d %s\n", rc, dwarf_errmsg(&dw.dw_err)); - if ((cu = die_sibling(&dw, NULL)) == NULL) + if ((cu = die_sibling(&dw, NULL)) == NULL || + (((child = die_child(&dw, cu)) == NULL) && + should_have_dwarf(elf))) { terminate("file does not contain dwarf type data " "(try compiling with -g)\n"); + } else if (child == NULL) { + return (0); + } dw.dw_maxoff = nxthdr - 1; Modified: projects/camlock/cddl/lib/libdtrace/Makefile ============================================================================== --- projects/camlock/cddl/lib/libdtrace/Makefile Sat Aug 31 16:56:59 2013 (r255101) +++ projects/camlock/cddl/lib/libdtrace/Makefile Sat Aug 31 17:22:43 2013 (r255102) @@ -48,8 +48,11 @@ SRCS= dt_aggregate.c \ DSRCS= errno.d \ io.d \ + ip.d \ psinfo.d \ signal.d \ + tcp.d \ + udp.d \ unistd.d WARNS?= 1 Copied: projects/camlock/cddl/lib/libdtrace/ip.d (from r255101, head/cddl/lib/libdtrace/ip.d) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/camlock/cddl/lib/libdtrace/ip.d Sat Aug 31 17:22:43 2013 (r255102, copy of r255101, head/cddl/lib/libdtrace/ip.d) @@ -0,0 +1,285 @@ +/* + * CDDL HEADER START + * + * The contents of this file are subject to the terms of the + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. + * + * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE + * or http://www.opensolaris.org/os/licensing. + * See the License for the specific language governing permissions + * and limitations under the License. + * + * When distributing Covered Code, include this CDDL HEADER in each + * file and include the License file at usr/src/OPENSOLARIS.LICENSE. + * If applicable, add the following below this CDDL HEADER, with the + * fields enclosed by brackets "[]" replaced with your own identifying + * information: Portions Copyright [yyyy] [name of copyright owner] + * + * CDDL HEADER END + * + * $FreeBSD$ + */ +/* + * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013 Mark Johnston <markj@freebsd.org> + */ + +#pragma D depends_on provider ip + +/* + * pktinfo is where packet ID info can be made available for deeper + * analysis if packet IDs become supported by the kernel in the future. + * The pkt_addr member is currently always NULL. + */ +typedef struct pktinfo { + uintptr_t pkt_addr; +} pktinfo_t; + +/* + * csinfo is where connection state info is made available. + */ +typedef uint32_t zoneid_t; +typedef struct csinfo { + uintptr_t cs_addr; + uint64_t cs_cid; + pid_t cs_pid; + zoneid_t cs_zoneid; +} csinfo_t; + +/* + * ipinfo contains common IP info for both IPv4 and IPv6. + */ +typedef struct ipinfo { + uint8_t ip_ver; /* IP version (4, 6) */ + uint32_t ip_plength; /* payload length */ + string ip_saddr; /* source address */ + string ip_daddr; /* destination address */ +} ipinfo_t; + +/* + * ifinfo contains network interface info. + */ +typedef struct ifinfo { + string if_name; /* interface name */ + int8_t if_local; /* is delivered locally */ + /*netstackid_t if_ipstack;*/ /* ipstack ID */ + uintptr_t if_addr; /* pointer to raw ill_t */ +} ifinfo_t; + +typedef uint32_t ipaddr_t; +typedef struct { + uint8_t ipha_version_and_hdr_length; + uint8_t ipha_type_of_service; + uint16_t ipha_length; + uint16_t ipha_ident; + uint16_t ipha_fragment_offset_and_flags; + uint8_t ipha_ttl; + uint8_t ipha_protocol; + uint16_t ipha_hdr_checksum; + ipaddr_t ipha_src; + ipaddr_t ipha_dst; +} ipha_t; + +/* + * ipv4info is a translated version of the IPv4 header (with raw pointer). + * These values are NULL if the packet is not IPv4. + */ +typedef struct ipv4info { + uint8_t ipv4_ver; /* IP version (4) */ + uint8_t ipv4_ihl; /* header length, bytes */ + uint8_t ipv4_tos; /* type of service field */ + uint16_t ipv4_length; /* length (header + payload) */ + uint16_t ipv4_ident; /* identification */ + uint8_t ipv4_flags; /* IP flags */ + uint16_t ipv4_offset; /* fragment offset */ + uint8_t ipv4_ttl; /* time to live */ + uint8_t ipv4_protocol; /* next level protocol */ + string ipv4_protostr; /* next level protocol, as a string */ + uint16_t ipv4_checksum; /* header checksum */ + ipaddr_t ipv4_src; /* source address */ + ipaddr_t ipv4_dst; /* destination address */ + string ipv4_saddr; /* source address, string */ + string ipv4_daddr; /* destination address, string */ + ipha_t *ipv4_hdr; /* pointer to raw header */ +} ipv4info_t; + +/* + * ipv6info is a translated version of the IPv6 header (with raw pointer). + * These values are NULL if the packet is not IPv6. + */ +typedef struct in6_addr in6_addr_t; +typedef struct ip6_hdr ip6_t; +typedef struct ipv6info { + uint8_t ipv6_ver; /* IP version (6) */ + uint8_t ipv6_tclass; /* traffic class */ + uint32_t ipv6_flow; /* flow label */ + uint16_t ipv6_plen; /* payload length */ + uint8_t ipv6_nexthdr; /* next header protocol */ + string ipv6_nextstr; /* next header protocol, as a string */ + uint8_t ipv6_hlim; /* hop limit */ + in6_addr_t *ipv6_src; /* source address */ + in6_addr_t *ipv6_dst; /* destination address */ + string ipv6_saddr; /* source address, string */ + string ipv6_daddr; /* destination address, string */ + ip6_t *ipv6_hdr; /* pointer to raw header */ +} ipv6info_t; + +#pragma D binding "1.0" IPPROTO_IP +inline short IPPROTO_IP = 0; +#pragma D binding "1.0" IPPROTO_ICMP +inline short IPPROTO_ICMP = 1; +#pragma D binding "1.0" IPPROTO_IGMP +inline short IPPROTO_IGMP = 2; +#pragma D binding "1.0" IPPROTO_IPV4 +inline short IPPROTO_IPV4 = 4; +#pragma D binding "1.0" IPPROTO_TCP +inline short IPPROTO_TCP = 6; +#pragma D binding "1.0" IPPROTO_UDP +inline short IPPROTO_UDP = 17; +#pragma D binding "1.0" IPPROTO_IPV6 +inline short IPPROTO_IPV6 = 41; +#pragma D binding "1.0" IPPROTO_ROUTING +inline short IPPROTO_ROUTING = 43; +#pragma D binding "1.0" IPPROTO_FRAGMENT +inline short IPPROTO_FRAGMENT = 44; +#pragma D binding "1.0" IPPROTO_RSVP +inline short IPPROTO_RSVP = 46; +#pragma D binding "1.0" IPPROTO_GRE +inline short IPPROTO_GRE = 47; +#pragma D binding "1.0" IPPROTO_ESP +inline short IPPROTO_ESP = 50; +#pragma D binding "1.0" IPPROTO_AH +inline short IPPROTO_AH = 51; +#pragma D binding "1.0" IPPROTO_MOBILE +inline short IPPROTO_MOBILE = 55; +#pragma D binding "1.0" IPPROTO_ICMPV6 +inline short IPPROTO_ICMPV6 = 58; +#pragma D binding "1.0" IPPROTO_DSTOPTS +inline short IPPROTO_DSTOPTS = 60; +#pragma D binding "1.0" IPPROTO_ETHERIP +inline short IPPROTO_ETHERIP = 97; +#pragma D binding "1.0" IPPROTO_PIM +inline short IPPROTO_PIM = 103; +#pragma D binding "1.0" IPPROTO_IPCOMP +inline short IPPROTO_IPCOMP = 108; +#pragma D binding "1.0" IPPROTO_SCTP +inline short IPPROTO_SCTP = 132; +#pragma D binding "1.0" IPPROTO_RAW +inline short IPPROTO_RAW = 255; + +inline uint8_t INP_IPV4 = 0x01; +inline uint8_t INP_IPV6 = 0x02; + +#pragma D binding "1.0" protocols +inline string protocols[int proto] = + proto == IPPROTO_IP ? "IP" : + proto == IPPROTO_ICMP ? "ICMP" : + proto == IPPROTO_IGMP ? "IGMP" : + proto == IPPROTO_IPV4 ? "IPV4" : + proto == IPPROTO_TCP ? "TCP" : + proto == IPPROTO_UDP ? "UDP" : + proto == IPPROTO_IPV6 ? "IPV6" : + proto == IPPROTO_ROUTING ? "ROUTING" : + proto == IPPROTO_FRAGMENT ? "FRAGMENT" : + proto == IPPROTO_RSVP ? "RSVP" : + proto == IPPROTO_GRE ? "GRE" : + proto == IPPROTO_ESP ? "ESP" : + proto == IPPROTO_AH ? "AH" : + proto == IPPROTO_MOBILE ? "MOBILE" : + proto == IPPROTO_ICMPV6 ? "ICMPV6" : + proto == IPPROTO_DSTOPTS ? "DSTOPTS" : + proto == IPPROTO_ETHERIP ? "ETHERIP" : + proto == IPPROTO_PIM ? "PIM" : + proto == IPPROTO_IPCOMP ? "IPCOMP" : + proto == IPPROTO_SCTP ? "SCTP" : + proto == IPPROTO_RAW ? "RAW" : + "<unknown>"; + +/* + * This field is always NULL according to the current definition of the ip + * probes. + */ +#pragma D binding "1.0" translator +translator pktinfo_t < void *p > { + pkt_addr = NULL; +}; + +#pragma D binding "1.0" translator +translator csinfo_t < void *p > { + cs_addr = NULL; + cs_cid = (uint64_t)p; + cs_pid = 0; + cs_zoneid = 0; +}; + +#pragma D binding "1.0" translator +translator csinfo_t < struct inpcb *p > { + cs_addr = NULL; + cs_cid = (uint64_t)p; + cs_pid = 0; /* XXX */ + cs_zoneid = 0; +}; + +#pragma D binding "1.0" translator +translator ipinfo_t < uint8_t *p > { + ip_ver = p == NULL ? 0 : ((struct ip *)p)->ip_v; + ip_plength = p == NULL ? 0 : + ((struct ip *)p)->ip_v == 4 ? + ntohs(((struct ip *)p)->ip_len) - (((struct ip *)p)->ip_hl << 2): + ntohs(((struct ip6_hdr *)p)->ip6_ctlun.ip6_un1.ip6_un1_plen); + ip_saddr = p == NULL ? 0 : + ((struct ip *)p)->ip_v == 4 ? + inet_ntoa(&((struct ip *)p)->ip_src.s_addr) : + inet_ntoa6(&((struct ip6_hdr *)p)->ip6_src); + ip_daddr = p == NULL ? 0 : + ((struct ip *)p)->ip_v == 4 ? + inet_ntoa(&((struct ip *)p)->ip_dst.s_addr) : + inet_ntoa6(&((struct ip6_hdr *)p)->ip6_dst); +}; + +#pragma D binding "1.0" IFF_LOOPBACK +inline int IFF_LOOPBACK = 0x8; + +#pragma D binding "1.0" translator +translator ifinfo_t < struct ifnet *p > { + if_name = p->if_xname; + if_local = (p->if_flags & IFF_LOOPBACK) == 0 ? 0 : 1; + if_addr = (uintptr_t)p; +}; + +#pragma D binding "1.0" translator +translator ipv4info_t < struct ip *p > { + ipv4_ver = p == NULL ? 0 : p->ip_v; + ipv4_ihl = p == NULL ? 0 : p->ip_hl; + ipv4_tos = p == NULL ? 0 : p->ip_tos; + ipv4_length = p == NULL ? 0 : ntohs(p->ip_len); + ipv4_ident = p == NULL ? 0 : ntohs(p->ip_id); + ipv4_flags = p == NULL ? 0 : (p->ip_off & 0xe000); + ipv4_offset = p == NULL ? 0 : p->ip_off; + ipv4_ttl = p == NULL ? 0 : p->ip_ttl; + ipv4_protocol = p == NULL ? 0 : p->ip_p; + ipv4_protostr = p == NULL ? "<null>" : protocols[p->ip_p]; + ipv4_checksum = p == NULL ? 0 : ntohs(p->ip_sum); + ipv4_src = p == NULL ? 0 : (ipaddr_t)ntohl(p->ip_src.s_addr); + ipv4_dst = p == NULL ? 0 : (ipaddr_t)ntohl(p->ip_dst.s_addr); + ipv4_saddr = p == NULL ? 0 : inet_ntoa(&p->ip_src.s_addr); + ipv4_daddr = p == NULL ? 0 : inet_ntoa(&p->ip_dst.s_addr); + ipv4_hdr = (ipha_t *)p; +}; + +#pragma D binding "1.0" translator +translator ipv6info_t < struct ip6_hdr *p > { + ipv6_ver = p == NULL ? 0 : (ntohl(p->ip6_ctlun.ip6_un1.ip6_un1_flow) & 0xf0000000) >> 28; + ipv6_tclass = p == NULL ? 0 : (ntohl(p->ip6_ctlun.ip6_un1.ip6_un1_flow) & 0x0ff00000) >> 20; + ipv6_flow = p == NULL ? 0 : ntohl(p->ip6_ctlun.ip6_un1.ip6_un1_flow) & 0x000fffff; + ipv6_plen = p == NULL ? 0 : ntohs(p->ip6_ctlun.ip6_un1.ip6_un1_plen); + ipv6_nexthdr = p == NULL ? 0 : p->ip6_ctlun.ip6_un1.ip6_un1_nxt; + ipv6_nextstr = p == NULL ? "<null>" : protocols[p->ip6_ctlun.ip6_un1.ip6_un1_nxt]; + ipv6_hlim = p == NULL ? 0 : p->ip6_ctlun.ip6_un1.ip6_un1_hlim; + ipv6_src = p == NULL ? 0 : (in6_addr_t *)&p->ip6_src; + ipv6_dst = p == NULL ? 0 : (in6_addr_t *)&p->ip6_dst; + ipv6_saddr = p == NULL ? 0 : inet_ntoa6(&p->ip6_src); + ipv6_daddr = p == NULL ? 0 : inet_ntoa6(&p->ip6_dst); + ipv6_hdr = (ip6_t *)p; +}; Copied: projects/camlock/cddl/lib/libdtrace/tcp.d (from r255101, head/cddl/lib/libdtrace/tcp.d) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/camlock/cddl/lib/libdtrace/tcp.d Sat Aug 31 17:22:43 2013 (r255102, copy of r255101, head/cddl/lib/libdtrace/tcp.d) @@ -0,0 +1,203 @@ +/* + * CDDL HEADER START + * + * The contents of this file are subject to the terms of the + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. + * + * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE + * or http://www.opensolaris.org/os/licensing. + * See the License for the specific language governing permissions + * and limitations under the License. + * + * When distributing Covered Code, include this CDDL HEADER in each + * file and include the License file at usr/src/OPENSOLARIS.LICENSE. + * If applicable, add the following below this CDDL HEADER, with the + * fields enclosed by brackets "[]" replaced with your own identifying + * information: Portions Copyright [yyyy] [name of copyright owner] + * + * CDDL HEADER END + * + * $FreeBSD$ + */ +/* + * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013 Mark Johnston <markj@freebsd.org> + */ + +#pragma D depends_on library ip.d +#pragma D depends_on provider tcp + +/* *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201308311722.r7VHMitj013616>