PERFORCE change 170975 for review
Alexander Motin
mav at FreeBSD.org
Tue Nov 24 08:40:17 UTC 2009
http://p4web.freebsd.org/chv.cgi?CH=170975
Change 170975 by mav at mav_mavbook on 2009/11/24 08:39:25
IFC
Affected files ...
.. //depot/projects/scottl-camlock/src/ObsoleteFiles.inc#19 integrate
.. //depot/projects/scottl-camlock/src/UPDATING#23 integrate
.. //depot/projects/scottl-camlock/src/bin/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/bin/ps/keyword.c#4 integrate
.. //depot/projects/scottl-camlock/src/bin/pwait/Makefile#1 branch
.. //depot/projects/scottl-camlock/src/bin/pwait/pwait.1#1 branch
.. //depot/projects/scottl-camlock/src/bin/pwait/pwait.c#1 branch
.. //depot/projects/scottl-camlock/src/bin/sh/cd.c#3 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/error.c#2 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/error.h#2 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/eval.c#7 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/histedit.c#4 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/input.c#4 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/input.h#3 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/jobs.c#2 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/main.c#3 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/output.c#3 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/output.h#2 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/parser.c#8 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/redir.c#3 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/trap.c#4 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/var.c#5 integrate
.. //depot/projects/scottl-camlock/src/contrib/ipfilter/man/ipf.8#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/gen/Makefile.inc#7 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/gen/_once_stub.c#1 branch
.. //depot/projects/scottl-camlock/src/lib/libc/gen/_pthread_stubs.c#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/gen/tzset.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/include/libc_private.h#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/nls/hu_HU.ISO8859-2.msg#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/stdtime/localtime.c#5 integrate
.. //depot/projects/scottl-camlock/src/lib/librt/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/lib/librt/mq.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/librt/sigev_thread.c#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libusb/libusb10.c#5 integrate
.. //depot/projects/scottl-camlock/src/lib/libusb/libusb10.h#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libusb/libusb20.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libusb/libusb20.c#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libusb/libusb20.h#3 integrate
.. //depot/projects/scottl-camlock/src/sbin/atacontrol/atacontrol.c#3 integrate
.. //depot/projects/scottl-camlock/src/sbin/fsck/fsck.c#3 integrate
.. //depot/projects/scottl-camlock/src/sbin/ipfw/dummynet.c#4 integrate
.. //depot/projects/scottl-camlock/src/sbin/mount_cd9660/mount_cd9660.c#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man3/queue.3#4 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/Makefile#15 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/ada.4#1 branch
.. //depot/projects/scottl-camlock/src/share/man/man4/ata.4#5 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/wi.4#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man8/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man8/rc.8#3 integrate
.. //depot/projects/scottl-camlock/src/share/misc/committers-ports.dot#7 integrate
.. //depot/projects/scottl-camlock/src/share/zoneinfo/antarctica#5 integrate
.. //depot/projects/scottl-camlock/src/share/zoneinfo/australasia#7 integrate
.. //depot/projects/scottl-camlock/src/share/zoneinfo/etcetera#3 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/bpf_jit_machdep.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/bpf_jit_machdep.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/at91/if_ate.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/Makefile#12 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/i386/Makefile#5 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/i386/loader/Makefile#9 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/i386/zfsboot/zfsboot.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/i386/zfsboot/zfsldr.S#2 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/i386/zfsloader/Makefile#1 branch
.. //depot/projects/scottl-camlock/src/sys/boot/uboot/common/metadata.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/files#56 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/changes.txt#4 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslcompile.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslerror.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/asllookup.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/asloperands.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/asltransform.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/asltypes.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/debugger/dbcmds.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/debugger/dbexec.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/debugger/dbstats.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dispatcher/dsinit.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dispatcher/dsmthdat.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dispatcher/dsobject.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/events/evgpeblk.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/events/evregion.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/executer/exconfig.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/executer/exconvrt.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/executer/exfield.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/executer/exoparg1.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/executer/exoparg6.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/executer/exregion.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acconfig.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acmacros.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acnamesp.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acpixf.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acutils.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/namespace/nsdump.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/namespace/nsdumpdv.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/namespace/nseval.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/namespace/nsinit.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/namespace/nspredef.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/namespace/nsrepair.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/namespace/nsrepair2.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/namespace/nswalk.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/namespace/nsxfeval.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/parser/psloop.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/parser/psparse.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/parser/psxface.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utilities/utmisc.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utilities/utobject.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/ddb/db_command.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi.c#28 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_dock.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_pci.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_video.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#84 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-intel.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ah_regdomain.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/bge/if_bge.c#28 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/bge/if_bgereg.h#20 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ce/if_ce.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/cm/smc90cx6.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/cm/smc90cx6var.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/cp/if_cp.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ctau/if_ct.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/cx/if_cx.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/de/if_de.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/de/if_devar.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ed/if_ed.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ed/if_ed_pccard.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ed/if_edvar.h#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ep/if_ep.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ep/if_epvar.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/et/if_et.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/et/if_etreg.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/et/if_etvar.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/fatm/if_fatm.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/fatm/if_fatmvar.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ixgb/if_ixgb.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ixgb/if_ixgb.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/lge/if_lge.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/lge/if_lgereg.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/lmc/if_lmc.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/lmc/if_lmc.h#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/malo/if_malo.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/malo/if_malo.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/msk/if_msk.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mwl/if_mwl.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mwl/if_mwlvar.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/my/if_my.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/my/if_myreg.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/nve/if_nve.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/nve/if_nvereg.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/nxge/if_nxge.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/pcn/if_pcn.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/pcn/if_pcnreg.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/pdq/if_fea.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/pdq/if_fpa.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/pdq/pdq_freebsd.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/pdq/pdq_ifsubr.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/re/if_re.c#28 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sn/if_sn.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sn/if_sn_pccard.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sn/if_snvar.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/usb/uaudio.c#25 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ste/if_ste.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ste/if_stereg.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/syscons/scvidctl.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ti/if_ti.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ti/if_tireg.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/tl/if_tl.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/tl/if_tlreg.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/tsec/if_tsec.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/at91dci.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/atmegadci.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/avr32dci.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ehci.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/musb_otg.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/musb_otg.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ohci.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/uhci.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/uss820dci.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/input/atp.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/input/ukbd.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/storage/umass.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_core.h#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_debug.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_dev.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_device.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_generic.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_hub.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_hub.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_process.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_transfer.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usbdi.h#14 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/vge/if_vge.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/vge/if_vgevar.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/vx/if_vx.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/vx/if_vxvar.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/wb/if_wb.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/wb/if_wbreg.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/wl/if_wl.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/xen/blkfront/blkfront.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/xen/console/console.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/xen/netfront/netfront.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nfs/nfs_var.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nfsserver/nfs_nfsdport.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nfsserver/nfs_nfsdserv.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/bpf_jit_machdep.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/bpf_jit_machdep.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/xen/pmap.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/ia64/db_machdep.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/ia64/exception.S#6 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/ia64/interrupt.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/ia64/trap.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/include/param.h#12 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_descrip.c#26 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_linker.c#27 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_sig.c#28 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/tty.c#23 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/vfs_subr.c#27 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/acpi/acpi/Makefile#15 integrate
.. //depot/projects/scottl-camlock/src/sys/net/bpf_jitter.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/net/bpf_jitter.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/net/route.c#21 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/in_mcast.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctp_asconf.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctp_auth.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctp_constants.h#10 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctp_input.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctp_os_bsd.h#16 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctp_output.c#20 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctp_pcb.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctp_structs.h#13 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctp_usrreq.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctputil.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/in6_mcast.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/raw_ip6.c#20 integrate
.. //depot/projects/scottl-camlock/src/sys/netipsec/key.c#19 integrate
.. //depot/projects/scottl-camlock/src/sys/pc98/conf/NOTES#17 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/aim/trap.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/mpc85xx/pci_ocp.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/cpu.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/machdep.c#20 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/param.h#34 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/signal.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/signalvar.h#14 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/vm_extern.h#17 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/vm_fault.c#27 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/vm_map.c#26 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/vm_map.h#11 integrate
.. //depot/projects/scottl-camlock/src/tools/regression/bin/sh/builtins/cd1.0#2 integrate
.. //depot/projects/scottl-camlock/src/tools/regression/bin/sh/builtins/cd2.0#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/bin/sh/builtins/fc1.0#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/bin/sh/builtins/trap3.0#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/bpf/bpf_filter/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/tools/regression/bpf/bpf_filter/bpf_test.c#2 integrate
.. //depot/projects/scottl-camlock/src/tools/regression/bpf/bpf_filter/tests/test0075.h#2 integrate
.. //depot/projects/scottl-camlock/src/tools/regression/bpf/bpf_filter/tests/test0076.h#2 integrate
.. //depot/projects/scottl-camlock/src/tools/regression/bpf/bpf_filter/tests/test0077.h#2 integrate
.. //depot/projects/scottl-camlock/src/tools/regression/bpf/bpf_filter/tests/test0078.h#2 integrate
.. //depot/projects/scottl-camlock/src/tools/regression/bpf/bpf_filter/tests/test0080.h#2 integrate
.. //depot/projects/scottl-camlock/src/tools/regression/bpf/bpf_filter/tests/test0084.h#1 branch
.. //depot/projects/scottl-camlock/src/tools/tools/nanobsd/pcengines/ALIX_DSK#1 branch
.. //depot/projects/scottl-camlock/src/tools/tools/nanobsd/pcengines/ALIX_NFS#1 branch
.. //depot/projects/scottl-camlock/src/tools/tools/nanobsd/pcengines/Files/etc/rc.conf#1 branch
.. //depot/projects/scottl-camlock/src/tools/tools/nanobsd/pcengines/Files/etc/ttys#1 branch
.. //depot/projects/scottl-camlock/src/tools/tools/nanobsd/pcengines/Files/root/.cshrc#1 branch
.. //depot/projects/scottl-camlock/src/tools/tools/nanobsd/pcengines/Files/root/.k5login#1 branch
.. //depot/projects/scottl-camlock/src/tools/tools/nanobsd/pcengines/Files/root/.login#1 branch
.. //depot/projects/scottl-camlock/src/tools/tools/nanobsd/pcengines/Files/root/change_password#1 branch
.. //depot/projects/scottl-camlock/src/tools/tools/nanobsd/pcengines/Files/root/save_cfg#1 branch
.. //depot/projects/scottl-camlock/src/tools/tools/nanobsd/pcengines/Files/root/save_sshkeys#1 branch
.. //depot/projects/scottl-camlock/src/tools/tools/nanobsd/pcengines/Files/root/updatep1#1 branch
.. //depot/projects/scottl-camlock/src/tools/tools/nanobsd/pcengines/Files/root/updatep2#1 branch
.. //depot/projects/scottl-camlock/src/tools/tools/nanobsd/pcengines/Files/usr/ports/.keepme#1 branch
.. //depot/projects/scottl-camlock/src/tools/tools/nanobsd/pcengines/alix_dsk.conf#1 branch
.. //depot/projects/scottl-camlock/src/tools/tools/nanobsd/pcengines/alix_nfs.conf#1 branch
.. //depot/projects/scottl-camlock/src/tools/tools/nanobsd/pcengines/build.sh#1 branch
.. //depot/projects/scottl-camlock/src/tools/tools/nanobsd/pcengines/common.conf#1 branch
.. //depot/projects/scottl-camlock/src/tools/tools/nanobsd/pcengines/test.sh#1 branch
.. //depot/projects/scottl-camlock/src/usr.bin/gzip/unbzip2.c#4 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/make/arch.c#4 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/make/dir.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/make/job.c#5 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/perror/perror.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/w/w.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/acpi/acpidb/Makefile#5 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/fifolog/fifolog_writer/fifolog_writer.c#2 integrate
Differences ...
==== //depot/projects/scottl-camlock/src/ObsoleteFiles.inc#19 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.212 2009/10/28 11:14:32 kib Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.213 2009/11/18 00:56:05 delphij 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,8 @@
# The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
#
+# 20091117: removal of rc.early(8) link
+OLD_FILES+=usr/share/man/man8/rc.early.8.gz
# 20091027: pselect.3 implemented as syscall
OLD_FILES+=usr/share/man/man3/pselect.3.gz
# 20091005: fusword.9 and susword.9 removed
==== //depot/projects/scottl-camlock/src/UPDATING#23 (text+ko) ====
@@ -42,6 +42,10 @@
Applications that require wireless scan results (e.g. ifconfig(8))
from net80211 need to be recompiled.
+ Applications such as wpa_supplicant(8) may require a full world
+ build without using NO_CLEAN in order to get synchronized with the
+ new structure.
+
20091025:
The iwn(4) driver has been updated to support the 5000 and 5150 series.
There's one kernel module for each firmware. Adding "device iwnfw"
@@ -1072,4 +1076,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: src/UPDATING,v 1.647 2009/11/13 11:28:54 ed Exp $
+$FreeBSD: src/UPDATING,v 1.648 2009/11/21 01:43:22 dougb Exp $
==== //depot/projects/scottl-camlock/src/bin/Makefile#3 (text+ko) ====
@@ -1,5 +1,5 @@
# From: @(#)Makefile 8.1 (Berkeley) 5/31/93
-# $FreeBSD: src/bin/Makefile,v 1.28 2008/08/31 14:27:59 yar Exp $
+# $FreeBSD: src/bin/Makefile,v 1.29 2009/11/17 22:47:20 jilles Exp $
.include <bsd.own.mk>
@@ -27,6 +27,7 @@
pax \
pkill \
ps \
+ pwait \
pwd \
${_rcp} \
realpath \
==== //depot/projects/scottl-camlock/src/bin/ps/keyword.c#4 (text+ko) ====
@@ -33,7 +33,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.80 2009/11/03 09:28:45 delphij Exp $");
+__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.81 2009/11/17 07:29:35 netchild Exp $");
#include <sys/param.h>
#include <sys/time.h>
@@ -330,6 +330,7 @@
errx(1, "malloc failed");
snprintf(realfmt, rflen, "%s=%s", v->alias, hp);
parsefmt(realfmt, user);
+ free(realfmt);
}
return ((VAR *)NULL);
}
==== //depot/projects/scottl-camlock/src/bin/sh/cd.c#3 (text+ko) ====
@@ -36,7 +36,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/cd.c,v 1.36 2008/02/24 16:50:55 stefanf Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/cd.c,v 1.37 2009/11/21 14:53:22 stefanf Exp $");
#include <sys/types.h>
#include <sys/stat.h>
@@ -70,7 +70,7 @@
STATIC char *getcomponent(void);
STATIC char *findcwd(char *);
STATIC void updatepwd(char *);
-STATIC char *getpwd2(char *, size_t);
+STATIC char *getpwd2(void);
STATIC char *curdir = NULL; /* current working directory */
STATIC char *prevdir; /* previous working directory */
@@ -263,10 +263,8 @@
* any more because we traversed a symbolic link or something
* we couldn't stat().
*/
- if (dir == NULL || curdir == NULL) {
- p = stalloc(PATH_MAX);
- return getpwd2(p, PATH_MAX);
- }
+ if (dir == NULL || curdir == NULL)
+ return getpwd2();
cdcomppath = stalloc(strlen(dir) + 1);
scopy(dir, cdcomppath);
STARTSTACKSTR(new);
@@ -313,7 +311,7 @@
int
pwdcmd(int argc, char **argv)
{
- char buf[PATH_MAX];
+ char *p;
int ch, phys;
optreset = 1; optind = 1; opterr = 0; /* initialize getopt */
@@ -341,9 +339,9 @@
out1str(curdir);
out1c('\n');
} else {
- if (getcwd(buf, sizeof(buf)) == NULL)
+ if ((p = getpwd2()) == NULL)
error(".: %s", strerror(errno));
- out1str(buf);
+ out1str(p);
out1c('\n');
}
@@ -356,36 +354,45 @@
char *
getpwd(void)
{
- char buf[PATH_MAX];
char *p;
if (curdir)
return curdir;
- p = getpwd2(buf, sizeof(buf));
+ p = getpwd2();
if (p != NULL)
curdir = savestr(p);
return curdir;
}
+#define MAXPWD 256
+
/*
* Return the current directory.
*/
STATIC char *
-getpwd2(char *buf, size_t size)
+getpwd2(void)
{
- if (getcwd(buf, size) == NULL) {
- char *pwd = getenv("PWD");
- struct stat stdot, stpwd;
+ struct stat stdot, stpwd;
+ char *pwd;
+ int i;
- if (pwd && *pwd == '/' && stat(".", &stdot) != -1 &&
- stat(pwd, &stpwd) != -1 &&
- stdot.st_dev == stpwd.st_dev &&
- stdot.st_ino == stpwd.st_ino) {
+ for (i = MAXPWD;; i *= 2) {
+ pwd = stalloc(i);
+ if (getcwd(pwd, i) != NULL)
return pwd;
- }
- return NULL;
+ stunalloc(pwd);
+ if (errno != ERANGE)
+ break;
+ }
+
+ pwd = getenv("PWD");
+ if (pwd && *pwd == '/' && stat(".", &stdot) != -1 &&
+ stat(pwd, &stpwd) != -1 &&
+ stdot.st_dev == stpwd.st_dev &&
+ stdot.st_ino == stpwd.st_ino) {
+ return pwd;
}
- return buf;
+ return NULL;
}
==== //depot/projects/scottl-camlock/src/bin/sh/error.c#2 (text+ko) ====
@@ -36,7 +36,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/error.c,v 1.26 2006/02/04 14:37:50 schweikh Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/error.c,v 1.27 2009/11/22 18:23:30 jilles Exp $");
/*
* Errors and exceptions.
@@ -73,11 +73,15 @@
* Called to raise an exception. Since C doesn't include exceptions, we
* just do a longjmp to the exception handler. The type of exception is
* stored in the global variable "exception".
+ *
+ * Interrupts are disabled; they should be reenabled when the exception is
+ * caught.
*/
void
exraise(int e)
{
+ INTOFF;
if (handler == NULL)
abort();
exception = e;
@@ -138,8 +142,15 @@
static void
exverror(int cond, const char *msg, va_list ap)
{
- CLEAR_PENDING_INT;
- INTOFF;
+ /*
+ * An interrupt trumps an error. Certain places catch error
+ * exceptions or transform them to a plain nonzero exit code
+ * in child processes, and if an error exception can be handled,
+ * an interrupt can be handled as well.
+ *
+ * exraise() will disable interrupts for the exception handler.
+ */
+ FORCEINTON;
#ifdef DEBUG
if (msg)
==== //depot/projects/scottl-camlock/src/bin/sh/error.h#2 (text+ko) ====
@@ -30,7 +30,7 @@
* SUCH DAMAGE.
*
* @(#)error.h 8.2 (Berkeley) 5/4/95
- * $FreeBSD: src/bin/sh/error.h,v 1.17 2004/04/06 20:06:51 markm Exp $
+ * $FreeBSD: src/bin/sh/error.h,v 1.18 2009/11/22 18:23:30 jilles Exp $
*/
/*
@@ -72,6 +72,8 @@
#define INTOFF suppressint++
#define INTON { if (--suppressint == 0 && intpending) onint(); }
+#define is_int_on() suppressint
+#define SETINTON(s) suppressint = (s)
#define FORCEINTON {suppressint = 0; if (intpending) onint();}
#define CLEAR_PENDING_INT intpending = 0
#define int_pending() intpending
==== //depot/projects/scottl-camlock/src/bin/sh/eval.c#7 (text+ko) ====
@@ -36,7 +36,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.67 2009/10/06 22:00:14 jilles Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.69 2009/11/22 18:23:30 jilles Exp $");
#include <paths.h>
#include <signal.h>
@@ -593,6 +593,7 @@
char *savecmdname;
struct shparam saveparam;
struct localvar *savelocalvars;
+ struct parsefile *savetopfile;
volatile int e;
char *lastarg;
int realstatus;
@@ -781,7 +782,6 @@
savelocalvars = localvars;
localvars = NULL;
reffunc(cmdentry.u.func);
- INTON;
savehandler = handler;
if (setjmp(jmploc.loc)) {
if (exception == EXSHELLPROC)
@@ -797,6 +797,7 @@
longjmp(handler->loc, 1);
}
handler = &jmploc;
+ INTON;
for (sp = varlist.list ; sp ; sp = sp->next)
mklocal(sp->text);
funcnest++;
@@ -833,6 +834,7 @@
mode |= REDIR_BACKQ;
}
savecmdname = commandname;
+ savetopfile = getcurrentfile();
cmdenviron = varlist.list;
e = -1;
savehandler = handler;
@@ -867,6 +869,7 @@
if ((e != EXERROR && e != EXEXEC)
|| cmdentry.special)
exraise(e);
+ popfilesupto(savetopfile);
FORCEINTON;
}
if (cmdentry.u.index != EXECCMD)
==== //depot/projects/scottl-camlock/src/bin/sh/histedit.c#4 (text+ko) ====
@@ -36,7 +36,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/histedit.c,v 1.31 2009/06/23 20:45:12 jilles Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/histedit.c,v 1.32 2009/11/21 14:28:32 jilles Exp $");
#include <sys/param.h>
#include <limits.h>
@@ -92,7 +92,7 @@
if (hist != NULL)
sethistsize(histsizeval());
else
- out2str("sh: can't initialize history\n");
+ out2fmt_flush("sh: can't initialize history\n");
}
if (editing && !el && isatty(0)) { /* && isatty(2) ??? */
/*
@@ -114,7 +114,7 @@
el_set(el, EL_PROMPT, getprompt);
} else {
bad:
- out2str("sh: can't initialize editing\n");
+ out2fmt_flush("sh: can't initialize editing\n");
}
INTON;
} else if (!editing && el) {
@@ -336,6 +336,7 @@
if (sflg) {
if (displayhist) {
out2str(s);
+ flushout(out2);
}
evalstring(s, 0);
if (displayhist && hist) {
==== //depot/projects/scottl-camlock/src/bin/sh/input.c#4 (text+ko) ====
@@ -36,7 +36,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/input.c,v 1.25 2009/06/17 21:58:32 jilles Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/input.c,v 1.27 2009/11/22 14:04:20 jilles Exp $");
#include <stdio.h> /* defines BUFSIZ */
#include <fcntl.h>
@@ -215,7 +215,7 @@
if (flags >= 0 && flags & O_NONBLOCK) {
flags &=~ O_NONBLOCK;
if (fcntl(0, F_SETFL, flags) >= 0) {
- out2str("sh: turning off NDELAY mode\n");
+ out2fmt_flush("sh: turning off NDELAY mode\n");
goto retry;
}
}
@@ -359,7 +359,7 @@
struct strpush *sp;
INTOFF;
-/*dprintf("*** calling pushstring: %s, %d\n", s, len);*/
+/*out2fmt_flush("*** calling pushstring: %s, %d\n", s, len);*/
if (parsefile->strpush) {
sp = ckmalloc(sizeof (struct strpush));
sp->prev = parsefile->strpush;
@@ -386,7 +386,7 @@
parsenextc = sp->prevstring;
parsenleft = sp->prevnleft;
parselleft = sp->prevlleft;
-/*dprintf("*** calling popstring: restoring to '%s'\n", parsenextc);*/
+/*out2fmt_flush("*** calling popstring: restoring to '%s'\n", parsenextc);*/
if (sp->ap)
sp->ap->flag &= ~ALIASINUSE;
parsefile->strpush = sp->prev;
@@ -509,6 +509,32 @@
/*
+ * Return current file (to go back to it later using popfilesupto()).
+ */
+
+struct parsefile *
+getcurrentfile(void)
+{
+ return parsefile;
+}
+
+
+/*
+ * Pop files until the given file is on top again. Useful for regular
+ * builtins that read shell commands from files or strings.
+ * If the given file is not an active file, an error is raised.
+ */
+
+void
+popfilesupto(struct parsefile *file)
+{
+ while (parsefile != file && parsefile != &basepf)
+ popfile();
+ if (parsefile != file)
+ error("popfilesupto() misused");
+}
+
+/*
* Return to top level.
*/
==== //depot/projects/scottl-camlock/src/bin/sh/input.h#3 (text+ko) ====
@@ -30,7 +30,7 @@
* SUCH DAMAGE.
*
* @(#)input.h 8.2 (Berkeley) 5/4/95
- * $FreeBSD: src/bin/sh/input.h,v 1.10 2009/06/13 21:17:45 jilles Exp $
+ * $FreeBSD: src/bin/sh/input.h,v 1.11 2009/11/22 14:04:20 jilles Exp $
*/
/* PEOF (the end of file marker) is defined in syntax.h */
@@ -45,6 +45,8 @@
extern char *parsenextc; /* next character in input buffer */
extern int init_editline; /* 0 == not setup, 1 == OK, -1 == failed */
+struct parsefile;
+
char *pfgets(char *, int);
int pgetc(void);
int preadbuffer(void);
@@ -56,6 +58,8 @@
void setinputfd(int, int);
void setinputstring(char *, int);
void popfile(void);
+struct parsefile *getcurrentfile(void);
+void popfilesupto(struct parsefile *);
void popallfiles(void);
void closescript(void);
==== //depot/projects/scottl-camlock/src/bin/sh/jobs.c#2 (text+ko) ====
@@ -36,7 +36,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.72 2006/10/07 16:51:16 stefanf Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.73 2009/11/21 14:28:32 jilles Exp $");
#include <fcntl.h>
#include <signal.h>
@@ -146,7 +146,7 @@
do { /* while we are in the background */
initialpgrp = tcgetpgrp(ttyfd);
if (initialpgrp < 0) {
-out: out2str("sh: can't access tty; job control turned off\n");
+out: out2fmt_flush("sh: can't access tty; job control turned off\n");
mflag = 0;
return;
}
@@ -1046,7 +1046,7 @@
if (jp->used == 0)
continue;
if (jp->state == JOBSTOPPED) {
- out2str("You have stopped jobs.\n");
+ out2fmt_flush("You have stopped jobs.\n");
job_warning = 2;
return (1);
}
==== //depot/projects/scottl-camlock/src/bin/sh/main.c#3 (text+ko) ====
@@ -42,7 +42,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/main.c,v 1.31 2009/06/13 21:17:45 jilles Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/main.c,v 1.32 2009/11/21 14:28:32 jilles Exp $");
#include <stdio.h>
#include <signal.h>
@@ -154,7 +154,7 @@
setstackmark(&smark);
procargs(argc, argv);
if (getpwd() == NULL && iflag)
- out2str("sh: cannot determine working directory\n");
+ out2fmt_flush("sh: cannot determine working directory\n");
if (getpwd() != NULL)
setvar ("PWD", getpwd(), VEXPORT);
if (argv[0] && argv[0][0] == '-') {
@@ -223,7 +223,7 @@
if (!stoppedjobs()) {
if (!Iflag)
break;
- out2str("\nUse \"exit\" to leave shell.\n");
+ out2fmt_flush("\nUse \"exit\" to leave shell.\n");
}
numeof++;
} else if (n != NULL && nflag == 0) {
==== //depot/projects/scottl-camlock/src/bin/sh/output.c#3 (text+ko) ====
@@ -36,7 +36,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/output.c,v 1.21 2009/06/19 22:09:55 jilles Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/output.c,v 1.22 2009/11/21 14:28:32 jilles Exp $");
/*
* Shell output routines. We use our own output routines because:
@@ -71,7 +71,7 @@
static int doformat_wr(void *, const char *, int);
struct output output = {NULL, 0, NULL, OUTBUFSIZ, 1, 0};
-struct output errout = {NULL, 0, NULL, 100, 2, 0};
+struct output errout = {NULL, 0, NULL, 256, 2, 0};
struct output memout = {NULL, 0, NULL, 0, MEM_OUT, 0};
struct output *out1 = &output;
struct output *out2 = &errout;
@@ -124,8 +124,6 @@
{
while (*p)
outc(*p++, file);
- if (file == out2)
- flushout(file);
}
/* Like outstr(), but quote for re-input into the shell. */
@@ -255,7 +253,7 @@
}
void
-dprintf(const char *fmt, ...)
+out2fmt_flush(const char *fmt, ...)
{
va_list ap;
==== //depot/projects/scottl-camlock/src/bin/sh/output.h#2 (text+ko) ====
@@ -30,7 +30,7 @@
* SUCH DAMAGE.
*
* @(#)output.h 8.2 (Berkeley) 5/4/95
- * $FreeBSD: src/bin/sh/output.h,v 1.13 2004/04/06 20:06:51 markm Exp $
+ * $FreeBSD: src/bin/sh/output.h,v 1.14 2009/11/21 14:28:32 jilles Exp $
*/
#ifndef OUTPUT_INCL
@@ -65,7 +65,7 @@
void freestdout(void);
void outfmt(struct output *, const char *, ...) __printflike(2, 3);
void out1fmt(const char *, ...) __printflike(1, 2);
-void dprintf(const char *, ...) __printflike(1, 2);
+void out2fmt_flush(const char *, ...) __printflike(1, 2);
void fmtstr(char *, int, const char *, ...) __printflike(3, 4);
void doformat(struct output *, const char *, va_list) __printflike(2, 0);
int xwrite(int, char *, int);
==== //depot/projects/scottl-camlock/src/bin/sh/parser.c#8 (text+ko) ====
@@ -36,7 +36,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.66 2009/11/14 22:08:32 jilles Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.68 2009/11/22 18:23:30 jilles Exp $");
#include <stdlib.h>
#include <unistd.h>
@@ -1312,6 +1312,7 @@
int saveprompt;
const int bq_startlinno = plinno;
+ str = NULL;
if (setjmp(jmploc.loc)) {
if (str)
ckfree(str);
@@ -1323,7 +1324,6 @@
longjmp(handler->loc, 1);
}
INTOFF;
- str = NULL;
savelen = out - stackblock();
if (savelen > 0) {
str = ckmalloc(savelen);
@@ -1563,7 +1563,10 @@
#ifndef NO_HISTORY
if (!el)
#endif
+ {
out2str(getprompt(NULL));
+ flushout(out2);
+ }
}
/*
==== //depot/projects/scottl-camlock/src/bin/sh/redir.c#3 (text+ko) ====
@@ -36,7 +36,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/redir.c,v 1.27 2009/06/20 20:44:27 jilles Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/redir.c,v 1.28 2009/11/22 18:23:30 jilles Exp $");
#include <sys/types.h>
#include <sys/stat.h>
@@ -166,8 +166,11 @@
/*
* We suppress interrupts so that we won't leave open file
- * descriptors around. This may not be such a good idea because
- * an open of a device or a fifo can block indefinitely.
+ * descriptors around. Because the signal handler remains
+ * installed and we do not use system call restart, interrupts
+ * will still abort blocking opens such as fifos (they will fail
+ * with EINTR). There is, however, a race condition if an interrupt
+ * arrives after INTOFF and before open blocks.
*/
INTOFF;
memory[fd] = 0;
==== //depot/projects/scottl-camlock/src/bin/sh/trap.c#4 (text+ko) ====
@@ -36,7 +36,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/trap.c,v 1.35 2009/11/11 23:13:24 jilles Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/trap.c,v 1.36 2009/11/21 20:44:34 jilles Exp $");
#include <signal.h>
#include <unistd.h>
@@ -149,6 +149,7 @@
{
char *action;
int signo;
+ int errors = 0;
if (argc <= 1) {
for (signo = 0 ; signo < sys_nsig ; signo++) {
@@ -183,8 +184,10 @@
}
}
while (*argv) {
- if ((signo = sigstring_to_signum(*argv)) == -1)
- error("bad signal %s", *argv);
+ if ((signo = sigstring_to_signum(*argv)) == -1) {
+ out2fmt_flush("trap: bad signal %s\n", *argv);
+ errors = 1;
+ }
INTOFF;
if (action)
action = savestr(action);
@@ -196,7 +199,7 @@
INTON;
argv++;
}
- return 0;
+ return errors;
}
==== //depot/projects/scottl-camlock/src/bin/sh/var.c#5 (text+ko) ====
@@ -36,7 +36,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/var.c,v 1.39 2009/06/23 20:45:12 jilles Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/var.c,v 1.40 2009/11/22 18:23:30 jilles Exp $");
#include <unistd.h>
#include <stdlib.h>
@@ -195,7 +195,9 @@
struct jmploc jmploc;
struct jmploc *const savehandler = handler;
int err = 0;
+ int inton;
+ inton = is_int_on();
if (setjmp(jmploc.loc))
err = 1;
else {
@@ -203,6 +205,7 @@
setvar(name, val, flags);
}
handler = savehandler;
+ SETINTON(inton);
return err;
}
==== //depot/projects/scottl-camlock/src/contrib/ipfilter/man/ipf.8#3 (text+ko) ====
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list