PERFORCE change 165097 for review
Alexander Motin
mav at FreeBSD.org
Wed Jun 24 20:32:02 UTC 2009
http://perforce.freebsd.org/chv.cgi?CH=165097
Change 165097 by mav at mav_mavbook on 2009/06/24 20:31:12
IFC
Affected files ...
.. //depot/projects/scottl-camlock/src/MAINTAINERS#4 integrate
.. //depot/projects/scottl-camlock/src/ObsoleteFiles.inc#6 integrate
.. //depot/projects/scottl-camlock/src/bin/chflags/chflags.c#3 integrate
.. //depot/projects/scottl-camlock/src/bin/chmod/chmod.c#2 integrate
.. //depot/projects/scottl-camlock/src/bin/df/df.c#5 integrate
.. //depot/projects/scottl-camlock/src/bin/hostname/hostname.c#2 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/eval.c#4 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/histedit.c#3 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/miscbltin.c#4 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/parser.c#4 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/var.c#4 integrate
.. //depot/projects/scottl-camlock/src/contrib/tcsh/sh.func.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/tcsh/tcsh.man#2 integrate
.. //depot/projects/scottl-camlock/src/etc/login.conf#3 integrate
.. //depot/projects/scottl-camlock/src/gnu/usr.bin/groff/tmac/mdoc.local#3 integrate
.. //depot/projects/scottl-camlock/src/include/stdio.h#4 integrate
.. //depot/projects/scottl-camlock/src/lib/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/db/btree/bt_split.c#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/db/mpool/mpool.c#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/gen/fmtcheck.c#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/stdtime/localtime.c#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/sys/getrlimit.2#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/sys/jail.2#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libcompat/4.3/cfree.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libcompat/4.3/regex.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libcompat/4.4/cuserid.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libjail/Makefile#1 branch
.. //depot/projects/scottl-camlock/src/lib/libjail/jail.3#1 branch
.. //depot/projects/scottl-camlock/src/lib/libjail/jail.c#1 branch
.. //depot/projects/scottl-camlock/src/lib/libjail/jail.h#1 branch
.. //depot/projects/scottl-camlock/src/lib/libjail/jail_getid.c#1 branch
.. //depot/projects/scottl-camlock/src/lib/libutil/humanize_number.c#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libutil/kinfo_getvmmap.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libutil/login_class.c#3 integrate
.. //depot/projects/scottl-camlock/src/rescue/rescue/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/sbin/ifconfig/Makefile#5 integrate
.. //depot/projects/scottl-camlock/src/sbin/ifconfig/af_atalk.c#2 integrate
.. //depot/projects/scottl-camlock/src/sbin/ifconfig/af_inet.c#3 integrate
.. //depot/projects/scottl-camlock/src/sbin/ifconfig/af_inet6.c#2 integrate
.. //depot/projects/scottl-camlock/src/sbin/ifconfig/ifclone.c#3 integrate
.. //depot/projects/scottl-camlock/src/sbin/ifconfig/ifconfig.8#5 integrate
.. //depot/projects/scottl-camlock/src/sbin/ifconfig/ifconfig.c#3 integrate
.. //depot/projects/scottl-camlock/src/sbin/ifconfig/ifconfig.h#3 integrate
.. //depot/projects/scottl-camlock/src/sbin/ifconfig/ifgif.c#2 integrate
.. //depot/projects/scottl-camlock/src/sbin/ifconfig/ifgre.c#2 integrate
.. //depot/projects/scottl-camlock/src/sbin/ifconfig/ifmac.c#2 integrate
.. //depot/projects/scottl-camlock/src/sbin/ifconfig/ifmedia.c#3 integrate
.. //depot/projects/scottl-camlock/src/sbin/ifconfig/ifvlan.c#3 integrate
.. //depot/projects/scottl-camlock/src/sbin/kldload/kldload.8#3 integrate
.. //depot/projects/scottl-camlock/src/sbin/mount_nfs/mount_nfs.c#4 integrate
.. //depot/projects/scottl-camlock/src/sbin/umount/umount.c#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/ata.4#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/gem.4#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/pcm.4#5 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/usb.4#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man7/tuning.7#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/Makefile#5 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/stack.9#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/usbdi.9#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/vm_map.9#2 integrate
.. //depot/projects/scottl-camlock/src/share/mk/bsd.libnames.mk#4 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/local_apic.c#19 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/machdep.c#22 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/mp_machdep.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/isa/clock.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/arm/elf_machdep.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/at91/at91_machdep.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/conf/DB-78XXX#3 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/conf/DB-88F5XXX#3 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/conf/DB-88F6XXX#3 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/mv/discovery/discovery.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/mv/files.mv#2 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/mv/kirkwood/kirkwood.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/mv/mv_machdep.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/mv/mv_sata.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/mv/mvreg.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/mv/orion/orion.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/sa11x0/assabet_machdep.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/i80321/ep80219_machdep.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/i80321/iq31244_machdep.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/i8134x/crb_machdep.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/avila_ata.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/avila_machdep.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/cambria_exp_space.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/ixp425.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/pxa/pxa_machdep.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/dev/dtrace/amd64/dtrace_isa.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/dev/dtrace/amd64/dtrace_subr.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/syscalls.master#22 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/linprocfs/linprocfs.c#24 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_ioctl.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_sockio.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/files#35 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/altq/altq/altq_subr.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/ngatm/netnatm/sig/sig_uni.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/pf/net/pf_if.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/pf/net/pf_ioctl.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/rdma/rdma_addr.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/rdma/rdma_cma.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.h#15 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-dma.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-pci.h#18 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-sata.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-acard.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-acerlabs.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-adaptec.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-amd.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-ati.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-cenatek.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-cypress.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-cyrix.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-highpoint.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-intel.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-ite.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-jmicron.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-marvell.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-micron.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-national.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-netcell.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-nvidia.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-promise.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-serverworks.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-siliconimage.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-sis.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-via.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/bce/if_bce.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/bce/if_bcereg.h#10 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/drm/drmP.h#11 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/drm/drm_drv.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/drm/drm_irq.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/drm/drm_sysctl.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/drm/i915_drv.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_82540.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_82541.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_82571.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_82575.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_82575.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_api.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_defines.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_hw.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_ich8lan.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_ich8lan.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_mac.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_osdep.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_phy.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_phy.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_regs.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/if_em.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/if_em.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/if_igb.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/if_igb.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/fdc/fdc.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/gem/if_gem.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/gem/if_gem_pci.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/gem/if_gem_sbus.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/gem/if_gemreg.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/gem/if_gemvar.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ixgbe/ixgbe.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ixgbe/ixgbe.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ixgbe/ixgbe_82598.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ixgbe/ixgbe_82599.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ixgbe/ixgbe_api.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ixgbe/ixgbe_api.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ixgbe/ixgbe_common.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ixgbe/ixgbe_osdep.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ixgbe/ixgbe_phy.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ixgbe/ixgbe_phy.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ixgbe/ixgbe_type.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/md/md.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mfi/mfi.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mxge/eth_z8e.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mxge/ethp_z8e.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mxge/if_mxge.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mxge/if_mxge_var.h#12 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mxge/mxge_lro.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mxge/rss_eth_z8e.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mxge/rss_ethp_z8e.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/hda/hdac.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/feeder_rate.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/procfs/procfs_map.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/tmpfs/tmpfs_subr.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/geom/geom_redboot.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/elf_machdep.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/local_apic.c#20 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/machdep.c#22 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/mp_machdep.c#19 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/isa/clock.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/xen/mp_machdep.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/ia64/elf_machdep.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/ia64/machdep.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/ia64/mp_machdep.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_descrip.c#23 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_fork.c#21 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_jail.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_poll.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_resource.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_uuid.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_vimage.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/link_elf.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/link_elf_obj.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/makesyscalls.sh#9 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/sched_ule.c#21 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/subr_pcpu.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/subr_stack.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/sys_process.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/syscalls.master#18 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/sysv_msg.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/sysv_sem.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/sysv_shm.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/tty.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/uipc_shm.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/elf_machdep.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/mp_machdep.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/pmap.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/gem/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/igb/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/ixgbe/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/mxge/mxge/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/sys/net/bridgestp.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if.c#26 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_ef.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_ethersubr.c#21 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_fddisubr.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_mib.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_spppsubr.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_stf.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_vlan.c#19 integrate
.. //depot/projects/scottl-camlock/src/sys/net/raw_cb.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/net/raw_usrreq.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/net/route.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/net/rtsock.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_ddb.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/netatalk/aarp.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/netatalk/at_control.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/netatalk/at_extern.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/netatalk/at_rmx.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/netgraph/atm/ng_atm.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/netgraph/atm/uni/ng_uni.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/netgraph/ng_ether.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/if_ether.c#19 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/igmp.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/in.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/in_mcast.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/in_pcb.c#23 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/in_pcb.h#17 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/in_rmx.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/in_var.h#12 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ip_carp.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ip_divert.c#19 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ip_icmp.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ip_input.c#20 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ip_mroute.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ip_options.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ip_output.c#20 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/tcp_hostcache.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/tcp_input.c#27 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/tcp_offload.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/tcp_usrreq.c#23 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/frag6.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/icmp6.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/in6.c#20 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/in6_ifattach.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/in6_pcb.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/in6_pcb.h#8 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/in6_src.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/in6_var.h#13 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/ip6_input.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/ip6_mroute.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/ip6_output.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/ip6_var.h#12 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/mld6.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/nd6.c#19 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/nd6_nbr.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/nd6_rtr.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/raw_ip6.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/scope6.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/udp6_usrreq.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/netipx/ipx.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/netipx/ipx_input.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/netipx/ipx_pcb.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_diskless.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/pc98/pc98/machdep.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/aim/mmu_oea.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/aim/mmu_oea64.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/booke/pmap.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/mpc85xx/ds1553_bus_lbc.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/elf_machdep.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/mp_machdep.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/rpc/rpcsec_gss/rpcsec_gss.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/security/mac_biba/mac_biba.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/security/mac_lomac/mac_lomac.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/include/pcpu.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/elf_machdep.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/machdep.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/mp_machdep.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/pmap.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/sun4v/include/pcpu.h#9 integrate
.. //depot/projects/scottl-camlock/src/sys/sun4v/sun4v/machdep.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/sun4v/sun4v/mp_machdep.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/sun4v/sun4v/pmap.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/jail.h#11 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/linker.h#10 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/pcpu.h#13 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/priv.h#14 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/resource.h#8 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/resourcevar.h#9 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/stack.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/sysctl.h#16 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/tty.h#9 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/default_pager.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/device_pager.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/phys_pager.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/swap_pager.c#20 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/vm.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/vm_phys.c#5 integrate
.. //depot/projects/scottl-camlock/src/tools/build/mk/OptionalObsoleteFiles.inc#4 integrate
.. //depot/projects/scottl-camlock/src/tools/regression/bin/sh/execution/fork2.0#1 branch
.. //depot/projects/scottl-camlock/src/tools/tools/ath/athpoke/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/tools/tools/ath/athpoke/athpoke.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/fstat/fstat.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/hexdump/parse.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/keylogout/keylogout.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/killall/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/killall/killall.c#4 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/limits/limits.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/make/arch.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/makewhatis/makewhatis.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/nfsstat/nfsstat.c#4 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/showmount/showmount.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/usbhidctl/usbhid.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/amd/include/config.h#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/jail/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/jail/jail.8#5 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/jail/jail.c#5 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/jexec/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/jexec/jexec.c#5 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/jls/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/jls/jls.c#5 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/lpr/common_source/displayq.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/mountd/mountd.c#6 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/nfsd/nfsd.c#4 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/rpc.lockd/kern.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/rpc.umntall/mounttab.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/rpc.umntall/mounttab.h#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/rpc.umntall/rpc.umntall.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/sysinstall/devices.c#4 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/sysinstall/ufs.c#2 integrate
Differences ...
==== //depot/projects/scottl-camlock/src/MAINTAINERS#4 (text+ko) ====
@@ -1,4 +1,4 @@
-$FreeBSD: src/MAINTAINERS,v 1.152 2009/03/20 18:51:13 rnoland Exp $
+$FreeBSD: src/MAINTAINERS,v 1.153 2009/06/24 17:23:10 imp Exp $
Please note that the content of this file is strictly advisory.
No locks listed here are valid. The only strict review requirements
@@ -124,7 +124,6 @@
usr.sbin/bluetooth emax Pre-commit review preferred.
gnu/usr.bin/send-pr bugmaster Pre-commit review requested.
BSD.{local,x11*}.dist portmgr Pre-commit review requested, since these files interface with ports.
-usb core Please contact core@ before any major changes
ncurses rafan Heads-up appreciated, try not to break it.
Following are the entries from the Makefiles, and a few other sources.
==== //depot/projects/scottl-camlock/src/ObsoleteFiles.inc#6 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.196 2009/06/05 15:31:38 ed Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.197 2009/06/24 17:01:17 thompsa Exp $
#
# This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
# directories (OLD_DIRS) which should get removed at an update. Recently
@@ -14,6 +14,53 @@
# The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
#
+# 20090624: update usbdi(9)
+OLD_FILES+=usr/share/man/man9/usbd_abort_default_pipe.9
+OLD_FILES+=usr/share/man/man9/usbd_abort_pipe.9
+OLD_FILES+=usr/share/man/man9/usbd_alloc_buffer.9
+OLD_FILES+=usr/share/man/man9/usbd_alloc_xfer.9
+OLD_FILES+=usr/share/man/man9/usbd_clear_endpoint_stall.9
+OLD_FILES+=usr/share/man/man9/usbd_clear_endpoint_stall_async.9
+OLD_FILES+=usr/share/man/man9/usbd_clear_endpoint_toggle.9
+OLD_FILES+=usr/share/man/man9/usbd_close_pipe.9
+OLD_FILES+=usr/share/man/man9/usbd_device2interface_handle.9
+OLD_FILES+=usr/share/man/man9/usbd_do_request_async.9
+OLD_FILES+=usr/share/man/man9/usbd_do_request_flags_pipe.9
+OLD_FILES+=usr/share/man/man9/usbd_endpoint_count.9
+OLD_FILES+=usr/share/man/man9/usbd_find_edesc.9
+OLD_FILES+=usr/share/man/man9/usbd_find_idesc.9
+OLD_FILES+=usr/share/man/man9/usbd_free_buffer.9
+OLD_FILES+=usr/share/man/man9/usbd_free_xfer.9
+OLD_FILES+=usr/share/man/man9/usbd_get_buffer.9
+OLD_FILES+=usr/share/man/man9/usbd_get_config.9
+OLD_FILES+=usr/share/man/man9/usbd_get_config_desc.9
+OLD_FILES+=usr/share/man/man9/usbd_get_config_desc_full.9
+OLD_FILES+=usr/share/man/man9/usbd_get_config_descriptor.9
+OLD_FILES+=usr/share/man/man9/usbd_get_device_descriptor.9
+OLD_FILES+=usr/share/man/man9/usbd_get_endpoint_descriptor.9
+OLD_FILES+=usr/share/man/man9/usbd_get_interface_altindex.9
+OLD_FILES+=usr/share/man/man9/usbd_get_interface_descriptor.9
+OLD_FILES+=usr/share/man/man9/usbd_get_no_alts.9
+OLD_FILES+=usr/share/man/man9/usbd_get_quirks.9
+OLD_FILES+=usr/share/man/man9/usbd_get_speed.9
+OLD_FILES+=usr/share/man/man9/usbd_get_string.9
+OLD_FILES+=usr/share/man/man9/usbd_get_string_desc.9
+OLD_FILES+=usr/share/man/man9/usbd_get_xfer_status.9
+OLD_FILES+=usr/share/man/man9/usbd_interface2device_handle.9
+OLD_FILES+=usr/share/man/man9/usbd_interface2endpoint_descriptor.9
+OLD_FILES+=usr/share/man/man9/usbd_interface_count.9
+OLD_FILES+=usr/share/man/man9/usbd_open_pipe.9
+OLD_FILES+=usr/share/man/man9/usbd_open_pipe_intr.9
+OLD_FILES+=usr/share/man/man9/usbd_pipe2device_handle.9
+OLD_FILES+=usr/share/man/man9/usbd_set_config_index.9
+OLD_FILES+=usr/share/man/man9/usbd_set_config_no.9
+OLD_FILES+=usr/share/man/man9/usbd_set_interface.9
+OLD_FILES+=usr/share/man/man9/usbd_setup_default_xfer.9
+OLD_FILES+=usr/share/man/man9/usbd_setup_isoc_xfer.9
+OLD_FILES+=usr/share/man/man9/usbd_setup_xfer.9
+OLD_FILES+=usr/share/man/man9/usbd_sync_transfer.9
+OLD_FILES+=usr/share/man/man9/usbd_transfer.9
+OLD_FILES+=usr/share/man/man9/usb_find_desc.9
# 20090605: removal of clists
OLD_FILES+=usr/include/sys/clist.h
# 20090602: removal of window(1)
==== //depot/projects/scottl-camlock/src/bin/chflags/chflags.c#3 (text+ko) ====
@@ -40,7 +40,7 @@
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/chflags/chflags.c,v 1.25 2009/05/24 15:27:25 jilles Exp $");
+__FBSDID("$FreeBSD: src/bin/chflags/chflags.c,v 1.26 2009/06/23 23:30:56 delphij Exp $");
#include <sys/types.h>
#include <sys/stat.h>
@@ -53,7 +53,7 @@
#include <string.h>
#include <unistd.h>
-void usage(void);
+static void usage(void);
int
main(int argc, char *argv[])
@@ -196,7 +196,7 @@
exit(rval);
}
-void
+static void
usage(void)
{
(void)fprintf(stderr,
==== //depot/projects/scottl-camlock/src/bin/chmod/chmod.c#2 (text+ko) ====
@@ -39,7 +39,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/chmod/chmod.c,v 1.33 2005/01/10 08:39:20 imp Exp $");
+__FBSDID("$FreeBSD: src/bin/chmod/chmod.c,v 1.34 2009/06/23 23:30:56 delphij Exp $");
#include <sys/types.h>
#include <sys/stat.h>
@@ -53,7 +53,7 @@
#include <string.h>
#include <unistd.h>
-void usage(void);
+static void usage(void);
int
main(int argc, char *argv[])
@@ -212,7 +212,7 @@
exit(rval);
}
-void
+static void
usage(void)
{
(void)fprintf(stderr,
==== //depot/projects/scottl-camlock/src/bin/df/df.c#5 (text+ko) ====
@@ -44,7 +44,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.73 2009/06/07 09:06:21 simon Exp $");
+__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.74 2009/06/23 23:30:56 delphij Exp $");
#include <sys/param.h>
#include <sys/stat.h>
@@ -476,7 +476,7 @@
(void)printf("\n");
}
-void
+static void
addstat(struct statfs *totalfsp, struct statfs *statfsp)
{
uint64_t bsize;
==== //depot/projects/scottl-camlock/src/bin/hostname/hostname.c#2 (text+ko) ====
@@ -39,7 +39,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/hostname/hostname.c,v 1.19 2006/12/08 07:47:08 kientzle Exp $");
+__FBSDID("$FreeBSD: src/bin/hostname/hostname.c,v 1.20 2009/06/23 23:30:56 delphij Exp $");
#include <sys/param.h>
@@ -49,7 +49,7 @@
#include <string.h>
#include <unistd.h>
-void usage(void);
+static void usage(void);
int
main(int argc, char *argv[])
@@ -96,7 +96,7 @@
exit(0);
}
-void
+static void
usage(void)
{
==== //depot/projects/scottl-camlock/src/bin/sh/eval.c#4 (text+ko) ====
@@ -36,7 +36,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.61 2009/06/13 21:17:45 jilles Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.64 2009/06/23 22:53:34 jilles Exp $");
#include <paths.h>
#include <signal.h>
@@ -401,8 +401,8 @@
int backgnd = (n->type == NBACKGND);
expredir(n->nredir.redirect);
- jp = makejob(n, 1);
- if (forkshell(jp, n, backgnd) == 0) {
+ if ((!backgnd && flags & EV_EXIT && !have_traps()) ||
+ forkshell(jp = makejob(n, 1), n, backgnd) == 0) {
if (backgnd)
flags &=~ EV_TESTED;
redirect(n->nredir.redirect, 0);
@@ -589,22 +589,14 @@
struct cmdentry cmdentry;
struct job *jp;
struct jmploc jmploc;
- struct jmploc *volatile savehandler;
- char *volatile savecmdname;
- volatile struct shparam saveparam;
- struct localvar *volatile savelocalvars;
+ struct jmploc *savehandler;
+ char *savecmdname;
+ struct shparam saveparam;
+ struct localvar *savelocalvars;
volatile int e;
char *lastarg;
int realstatus;
int do_clearcmdentry;
-#ifdef __GNUC__
- /* Avoid longjmp clobbering */
- (void) &argv;
- (void) &argc;
- (void) &lastarg;
- (void) &flags;
- (void) &do_clearcmdentry;
-#endif
/* First expand the arguments. */
TRACE(("evalcommand(%p, %d) called\n", (void *)cmd, flags));
@@ -650,17 +642,32 @@
/* Print the command if xflag is set. */
if (xflag) {
char sep = 0;
+ const char *p;
out2str(ps4val());
for (sp = varlist.list ; sp ; sp = sp->next) {
if (sep != 0)
outc(' ', &errout);
- out2str(sp->text);
+ p = sp->text;
+ while (*p != '=' && *p != '\0')
+ out2c(*p++);
+ if (*p != '\0') {
+ out2c(*p++);
+ out2qstr(p);
+ }
sep = ' ';
}
for (sp = arglist.list ; sp ; sp = sp->next) {
if (sep != 0)
outc(' ', &errout);
- out2str(sp->text);
+ /* Disambiguate command looking like assignment. */
+ if (sp == arglist.list &&
+ strchr(sp->text, '=') != NULL &&
+ strchr(sp->text, '\'') == NULL) {
+ out2c('\'');
+ out2str(sp->text);
+ out2c('\'');
+ } else
+ out2qstr(sp->text);
sep = ' ';
}
outc('\n', &errout);
@@ -779,9 +786,10 @@
savelocalvars = localvars;
localvars = NULL;
INTON;
+ savehandler = handler;
if (setjmp(jmploc.loc)) {
if (exception == EXSHELLPROC)
- freeparam((struct shparam *)&saveparam);
+ freeparam(&saveparam);
else {
freeparam(&shellparam);
shellparam = saveparam;
@@ -791,7 +799,6 @@
handler = savehandler;
longjmp(handler->loc, 1);
}
- savehandler = handler;
handler = &jmploc;
for (sp = varlist.list ; sp ; sp = sp->next)
mklocal(sp->text);
@@ -830,12 +837,12 @@
savecmdname = commandname;
cmdenviron = varlist.list;
e = -1;
+ savehandler = handler;
if (setjmp(jmploc.loc)) {
e = exception;
exitstatus = (e == EXINT)? SIGINT+128 : 2;
goto cmddone;
}
- savehandler = handler;
handler = &jmploc;
redirect(cmd->ncmd.redirect, mode);
if (cmdentry.special)
==== //depot/projects/scottl-camlock/src/bin/sh/histedit.c#3 (text+ko) ====
@@ -36,7 +36,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/histedit.c,v 1.30 2009/05/31 12:36:14 stefanf Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/histedit.c,v 1.31 2009/06/23 20:45:12 jilles Exp $");
#include <sys/param.h>
#include <limits.h>
@@ -173,25 +173,11 @@
char *pat = NULL, *repl;
static int active = 0;
struct jmploc jmploc;
- struct jmploc *volatile savehandler;
- char editfile[PATH_MAX];
+ struct jmploc *savehandler;
+ char editfilestr[PATH_MAX];
+ char *volatile editfile;
FILE *efp;
int oldhistnum;
-#ifdef __GNUC__
- /* Avoid longjmp clobbering */
- (void) &editor;
- (void) &lflg;
- (void) &nflg;
- (void) &rflg;
- (void) &sflg;
- (void) &firststr;
- (void) &laststr;
- (void) &pat;
- (void) &repl;
- (void) &efp;
- (void) &argc;
- (void) &argv;
-#endif
if (hist == NULL)
error("history not active");
@@ -232,19 +218,19 @@
*/
if (lflg == 0 || editor || sflg) {
lflg = 0; /* ignore */
- editfile[0] = '\0';
+ editfile = NULL;
/*
* Catch interrupts to reset active counter and
* cleanup temp files.
*/
+ savehandler = handler;
if (setjmp(jmploc.loc)) {
active = 0;
- if (*editfile)
+ if (editfile)
unlink(editfile);
handler = savehandler;
longjmp(handler->loc, 1);
}
- savehandler = handler;
handler = &jmploc;
if (++active > MAXHISTLOOPS) {
active = 0;
@@ -318,9 +304,10 @@
if (editor) {
int fd;
INTOFF; /* easier */
- sprintf(editfile, "%s/_shXXXXXX", _PATH_TMP);
- if ((fd = mkstemp(editfile)) < 0)
+ sprintf(editfilestr, "%s/_shXXXXXX", _PATH_TMP);
+ if ((fd = mkstemp(editfilestr)) < 0)
error("can't create temporary file %s", editfile);
+ editfile = editfilestr;
if ((efp = fdopen(fd, "w")) == NULL) {
close(fd);
error("can't allocate stdio buffer for temp");
==== //depot/projects/scottl-camlock/src/bin/sh/miscbltin.c#4 (text+ko) ====
@@ -36,7 +36,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/miscbltin.c,v 1.40 2009/05/31 19:37:06 jilles Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/miscbltin.c,v 1.41 2009/06/23 20:57:27 kib Exp $");
/*
* Miscellaneous builtins.
@@ -403,7 +403,7 @@
struct rlimit limit;
what = 'f';
- while ((optc = nextopt("HSatfdsmcnuvlbp")) != '\0')
+ while ((optc = nextopt("HSatfdsmcnuvlbpw")) != '\0')
switch (optc) {
case 'H':
how = HARD;
==== //depot/projects/scottl-camlock/src/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.62 2009/06/01 11:02:09 rse Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.63 2009/06/23 20:45:12 jilles Exp $");
#include <stdlib.h>
#include <unistd.h>
@@ -898,19 +898,6 @@
int oldstyle;
char const *prevsyntax; /* syntax before arithmetic */
int synentry;
-#ifdef __GNUC__
- /* Avoid longjmp clobbering */
- (void) &out;
- (void) "ef;
- (void) &dblquote;
- (void) &varnest;
- (void) &arinest;
- (void) &parenlevel;
- (void) &oldstyle;
- (void) &prevsyntax;
- (void) &syntax;
- (void) &synentry;
-#endif
startlinno = plinno;
dblquote = 0;
@@ -1320,13 +1307,9 @@
union node *n;
char *volatile str;
struct jmploc jmploc;
- struct jmploc *volatile savehandler;
+ struct jmploc *const savehandler = handler;
int savelen;
int saveprompt;
-#ifdef __GNUC__
- /* Avoid longjmp clobbering */
- (void) &saveprompt;
-#endif
savepbq = parsebackquote;
if (setjmp(jmploc.loc)) {
@@ -1343,7 +1326,6 @@
str = ckmalloc(savelen);
memcpy(str, stackblock(), savelen);
}
- savehandler = handler;
handler = &jmploc;
INTON;
if (oldstyle) {
==== //depot/projects/scottl-camlock/src/bin/sh/var.c#4 (text+ko) ====
@@ -36,7 +36,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/var.c,v 1.38 2009/06/01 11:02:09 rse Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/var.c,v 1.39 2009/06/23 20:45:12 jilles Exp $");
#include <unistd.h>
#include <stdlib.h>
@@ -193,12 +193,8 @@
setvarsafe(char *name, char *val, int flags)
{
struct jmploc jmploc;
- struct jmploc *volatile savehandler = handler;
+ struct jmploc *const savehandler = handler;
int err = 0;
-#ifdef __GNUC__
- /* Avoid longjmp clobbering */
- (void) &err;
-#endif
if (setjmp(jmploc.loc))
err = 1;
==== //depot/projects/scottl-camlock/src/contrib/tcsh/sh.func.c#2 (text+ko) ====
@@ -1796,6 +1796,10 @@
{ RLIMIT_SBSIZE, "sbsize", 1, "" },
# endif /* RLIMIT_SBSIZE */
+# ifdef RLIMIT_SWAP
+ { RLIMIT_SWAP, "swaplimit", 1024, "kbytes" },
+# endif /* RLIMIT_SWAP */
+
{ -1, NULL, 0, NULL }
};
==== //depot/projects/scottl-camlock/src/contrib/tcsh/tcsh.man#2 (text+ko) ====
@@ -2921,6 +2921,9 @@
.TP
\fIsbsize\fR
the maximum size of socket buffer usage for this user
+.TP
+\fIswaplimit\fR
+the maximum amount of swap space reserved or used for this user
.PP
\fImaximum-use\fR may be given as a (floating point or
integer) number followed by a scale factor. For all limits
==== //depot/projects/scottl-camlock/src/etc/login.conf#3 (text+ko) ====
@@ -7,7 +7,7 @@
# This file controls resource limits, accounting limits and
# default user environment settings.
#
-# $FreeBSD: src/etc/login.conf,v 1.52 2008/08/20 08:31:58 ed Exp $
+# $FreeBSD: src/etc/login.conf,v 1.53 2009/06/23 20:57:27 kib Exp $
#
# Default settings effectively disable resource limits, see the
@@ -40,6 +40,7 @@
:maxproc=unlimited:\
:sbsize=unlimited:\
:vmemoryuse=unlimited:\
+ :swapuse=unlimited:\
:pseudoterminals=unlimited:\
:priority=0:\
:ignoretime@:\
==== //depot/projects/scottl-camlock/src/gnu/usr.bin/groff/tmac/mdoc.local#3 (text+ko) ====
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.67 2009/02/28 05:47:41 das Exp $
+.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.68 2009/06/24 18:18:35 jamie Exp $
.\"
.\" %beginstrip%
.
@@ -47,6 +47,7 @@
.ds doc-str-Lb-libfetch File Transfer Library (libfetch, \-lfetch)
.ds doc-str-Lb-libgeom Userland API Library for kernel GEOM subsystem (libgeom, \-lgeom)
.ds doc-str-Lb-libipx IPX Address Conversion Support Library (libipx, \-lipx)
+.ds doc-str-Lb-libjail Jail Library (libjail, \-ljail)
.ds doc-str-Lb-libkiconv Kernel side iconv library (libkiconv, \-lkiconv)
.ds doc-str-Lb-libkse N:M Threading Library (libkse, \-lkse)
.ds doc-str-Lb-libmd Message Digest (MD4, MD5, etc.) Support Library (libmd, \-lmd)
==== //depot/projects/scottl-camlock/src/include/stdio.h#4 (text+ko) ====
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)stdio.h 8.5 (Berkeley) 4/29/95
- * $FreeBSD: src/include/stdio.h,v 1.78 2009/03/25 08:07:52 das Exp $
+ * $FreeBSD: src/include/stdio.h,v 1.79 2009/06/23 23:53:35 delphij Exp $
*/
#ifndef _STDIO_H_
@@ -394,7 +394,7 @@
char *ctermid_r(char *);
void fcloseall(void);
char *fgetln(FILE *, size_t *);
-__const char *fmtcheck(const char *, const char *) __format_arg(2);
+const char *fmtcheck(const char *, const char *) __format_arg(2);
int fpurge(FILE *);
void setbuffer(FILE *, char *, int);
int setlinebuf(FILE *);
==== //depot/projects/scottl-camlock/src/lib/Makefile#3 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/Makefile,v 1.236 2009/03/09 17:38:14 thompsa Exp $
+# $FreeBSD: src/lib/Makefile,v 1.237 2009/06/24 18:18:35 jamie Exp $
.include <bsd.own.mk>
@@ -35,8 +35,8 @@
libcalendar libcam libcompat libdevinfo libdevstat libdisk \
libdwarf libedit libexpat libfetch libftpio libgeom ${_libgpib} \
${_libgssapi} ${_librpcsec_gss} libipsec \
- ${_libipx} libkiconv libmagic libmemstat ${_libmilter} ${_libmp} \
- ${_libncp} ${_libngatm} libopie libpam libpcap \
+ ${_libipx} libjail libkiconv libmagic libmemstat ${_libmilter} \
+ ${_libmp} ${_libncp} ${_libngatm} libopie libpam libpcap \
${_libpmc} libproc librt ${_libsdp} ${_libsm} ${_libsmb} \
${_libsmdb} \
${_libsmutil} libstand ${_libtelnet} ${_libthr} libthread_db libufs \
==== //depot/projects/scottl-camlock/src/lib/libc/db/btree/bt_split.c#3 (text+ko) ====
@@ -31,10 +31,10 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)bt_split.c 8.9 (Berkeley) 7/26/94";
+static char sccsid[] = "@(#)bt_split.c 8.10 (Berkeley) 1/9/95";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_split.c,v 1.12 2009/03/28 05:45:29 delphij Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_split.c,v 1.14 2009/06/24 01:15:10 delphij Exp $");
#include <sys/types.h>
@@ -644,8 +644,8 @@
* where we decide to try and copy too much onto the left page.
* Make sure that doesn't happen.
*/
- if ((skip <= off && used + nbytes + sizeof(indx_t) >= full)
- || nxt == top - 1) {
+ if ((skip <= off && used + nbytes + sizeof(indx_t) >= full) ||
+ nxt == top - 1) {
--off;
break;
}
==== //depot/projects/scottl-camlock/src/lib/libc/db/mpool/mpool.c#3 (text+ko) ====
@@ -28,10 +28,10 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)mpool.c 8.5 (Berkeley) 7/26/94";
+static char sccsid[] = "@(#)mpool.c 8.7 (Berkeley) 11/2/95";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/db/mpool/mpool.c,v 1.18 2009/03/28 07:44:08 delphij Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/db/mpool/mpool.c,v 1.19 2009/06/24 01:15:10 delphij Exp $");
#include "namespace.h"
#include <sys/param.h>
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list