Date: Thu, 26 Nov 2009 19:01:20 +0000 (UTC) From: Ed Schouten <ed@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r199841 - in user/ed/newcons: . bin bin/ps bin/pwait bin/sh contrib/ipfilter/man crypto/openssh games/factor include lib/libc/compat-43 lib/libc/gen lib/libc/include lib/libc/locale lib... Message-ID: <200911261901.nAQJ1K1W090411@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ed Date: Thu Nov 26 19:01:19 2009 New Revision: 199841 URL: http://svn.freebsd.org/changeset/base/199841 Log: MFC this branch, so I can run this on my MacBook. This means I can finally hack while on the road... Added: user/ed/newcons/bin/pwait/ - copied from r199839, head/bin/pwait/ user/ed/newcons/lib/libc/gen/_once_stub.c - copied unchanged from r199839, head/lib/libc/gen/_once_stub.c user/ed/newcons/share/man/man4/ada.4 - copied unchanged from r199839, head/share/man/man4/ada.4 user/ed/newcons/share/man/man4/atp.4 - copied unchanged from r199839, head/share/man/man4/atp.4 user/ed/newcons/sys/boot/i386/zfsloader/ - copied from r199839, head/sys/boot/i386/zfsloader/ user/ed/newcons/sys/contrib/dev/acpica/namespace/nsrepair2.c - copied unchanged from r199839, head/sys/contrib/dev/acpica/namespace/nsrepair2.c user/ed/newcons/tools/regression/bin/sh/builtins/cd2.0 - copied unchanged from r199839, head/tools/regression/bin/sh/builtins/cd2.0 user/ed/newcons/tools/regression/bin/sh/builtins/fc1.0 - copied unchanged from r199839, head/tools/regression/bin/sh/builtins/fc1.0 user/ed/newcons/tools/regression/bin/sh/builtins/trap3.0 - copied unchanged from r199839, head/tools/regression/bin/sh/builtins/trap3.0 user/ed/newcons/tools/regression/bin/sh/parser/for1.0 - copied unchanged from r199839, head/tools/regression/bin/sh/parser/for1.0 user/ed/newcons/tools/regression/bpf/bpf_filter/tests/test0084.h - copied unchanged from r199839, head/tools/regression/bpf/bpf_filter/tests/test0084.h user/ed/newcons/tools/tools/nanobsd/pcengines/ - copied from r199839, head/tools/tools/nanobsd/pcengines/ Deleted: user/ed/newcons/sys/dev/ata/ata-usb.c user/ed/newcons/sys/modules/ata/atausb/ Modified: user/ed/newcons/ObsoleteFiles.inc user/ed/newcons/UPDATING user/ed/newcons/bin/Makefile user/ed/newcons/bin/ps/keyword.c user/ed/newcons/bin/sh/cd.c user/ed/newcons/bin/sh/error.c user/ed/newcons/bin/sh/error.h user/ed/newcons/bin/sh/eval.c user/ed/newcons/bin/sh/histedit.c user/ed/newcons/bin/sh/input.c user/ed/newcons/bin/sh/input.h user/ed/newcons/bin/sh/jobs.c user/ed/newcons/bin/sh/main.c user/ed/newcons/bin/sh/output.c user/ed/newcons/bin/sh/output.h user/ed/newcons/bin/sh/parser.c user/ed/newcons/bin/sh/redir.c user/ed/newcons/bin/sh/trap.c user/ed/newcons/bin/sh/var.c user/ed/newcons/contrib/ipfilter/man/ipf.8 user/ed/newcons/crypto/openssh/sshd.c user/ed/newcons/games/factor/factor.c user/ed/newcons/include/signal.h user/ed/newcons/lib/libc/compat-43/Makefile.inc user/ed/newcons/lib/libc/compat-43/Symbol.map user/ed/newcons/lib/libc/compat-43/sigcompat.c user/ed/newcons/lib/libc/compat-43/sigpause.2 user/ed/newcons/lib/libc/gen/Makefile.inc user/ed/newcons/lib/libc/gen/getcap.c user/ed/newcons/lib/libc/gen/getusershell.c user/ed/newcons/lib/libc/gen/tzset.3 user/ed/newcons/lib/libc/gen/wordexp.c user/ed/newcons/lib/libc/include/libc_private.h user/ed/newcons/lib/libc/locale/nl_langinfo.3 user/ed/newcons/lib/libc/nls/hu_HU.ISO8859-2.msg user/ed/newcons/lib/libc/nls/ko_KR.UTF-8.msg (contents, props changed) user/ed/newcons/lib/libc/nls/ko_KR.eucKR.msg (contents, props changed) user/ed/newcons/lib/libc/posix1e/acl_from_text.c user/ed/newcons/lib/libc/rpc/clnt_raw.c user/ed/newcons/lib/libc/rpc/getnetconfig.c user/ed/newcons/lib/libc/rpc/getrpcent.c user/ed/newcons/lib/libc/rpc/key_call.c user/ed/newcons/lib/libc/rpc/svc_raw.c user/ed/newcons/lib/libc/stdio/fgetws.c user/ed/newcons/lib/libc/stdio/fvwrite.c user/ed/newcons/lib/libc/stdio/vfwprintf.c user/ed/newcons/lib/libc/stdio/xprintf_time.c user/ed/newcons/lib/libc/stdlib/malloc.c user/ed/newcons/lib/libc/stdtime/localtime.c user/ed/newcons/lib/libc/sys/vfork.2 user/ed/newcons/lib/libc/yp/yplib.c user/ed/newcons/lib/libdevinfo/devinfo.h user/ed/newcons/lib/libfetch/ftp.c user/ed/newcons/lib/librt/Makefile user/ed/newcons/lib/librt/mq.c user/ed/newcons/lib/librt/sigev_thread.c user/ed/newcons/lib/libtacplus/taclib.c user/ed/newcons/lib/libthr/Makefile user/ed/newcons/lib/libusb/libusb10.c user/ed/newcons/lib/libusb/libusb10.h user/ed/newcons/lib/libusb/libusb20.3 user/ed/newcons/lib/libusb/libusb20.c user/ed/newcons/lib/libusb/libusb20.h user/ed/newcons/lib/libutil/pw_util.c user/ed/newcons/libexec/rtld-elf/rtld.c user/ed/newcons/libexec/rtld-elf/rtld.h user/ed/newcons/sbin/atacontrol/atacontrol.c user/ed/newcons/sbin/camcontrol/camcontrol.8 user/ed/newcons/sbin/camcontrol/camcontrol.c user/ed/newcons/sbin/fsck/fsck.c user/ed/newcons/sbin/ifconfig/ifconfig.c user/ed/newcons/sbin/ipfw/dummynet.c user/ed/newcons/sbin/mount_cd9660/mount_cd9660.c user/ed/newcons/share/man/man3/queue.3 user/ed/newcons/share/man/man4/Makefile user/ed/newcons/share/man/man4/ata.4 user/ed/newcons/share/man/man4/mfi.4 user/ed/newcons/share/man/man4/wi.4 user/ed/newcons/share/man/man5/rc.conf.5 user/ed/newcons/share/man/man8/Makefile user/ed/newcons/share/man/man8/rc.8 user/ed/newcons/share/misc/committers-ports.dot user/ed/newcons/share/timedef/ja_JP.SJIS.src user/ed/newcons/share/timedef/ja_JP.UTF-8.src user/ed/newcons/share/timedef/ja_JP.eucJP.src user/ed/newcons/share/zoneinfo/antarctica user/ed/newcons/share/zoneinfo/australasia user/ed/newcons/share/zoneinfo/etcetera user/ed/newcons/sys/amd64/amd64/bpf_jit_machdep.c user/ed/newcons/sys/amd64/amd64/bpf_jit_machdep.h user/ed/newcons/sys/amd64/include/param.h user/ed/newcons/sys/arm/at91/if_ate.c user/ed/newcons/sys/boot/Makefile user/ed/newcons/sys/boot/i386/Makefile user/ed/newcons/sys/boot/i386/libi386/elf32_freebsd.c user/ed/newcons/sys/boot/i386/libi386/elf64_freebsd.c user/ed/newcons/sys/boot/i386/loader/Makefile user/ed/newcons/sys/boot/i386/zfsboot/zfsboot.c user/ed/newcons/sys/boot/i386/zfsboot/zfsldr.S user/ed/newcons/sys/boot/uboot/common/metadata.c user/ed/newcons/sys/cam/ata/ata_all.c user/ed/newcons/sys/cam/ata/ata_all.h user/ed/newcons/sys/cam/ata/ata_pmp.c user/ed/newcons/sys/cam/ata/ata_xpt.c user/ed/newcons/sys/cam/cam_ccb.h user/ed/newcons/sys/cam/cam_periph.c user/ed/newcons/sys/cam/cam_queue.c user/ed/newcons/sys/cam/cam_queue.h user/ed/newcons/sys/cam/cam_xpt.c user/ed/newcons/sys/cam/scsi/scsi_cd.c user/ed/newcons/sys/cam/scsi/scsi_ch.c user/ed/newcons/sys/conf/files user/ed/newcons/sys/contrib/dev/acpica/changes.txt user/ed/newcons/sys/contrib/dev/acpica/compiler/aslcompile.c user/ed/newcons/sys/contrib/dev/acpica/compiler/aslerror.c user/ed/newcons/sys/contrib/dev/acpica/compiler/asllookup.c user/ed/newcons/sys/contrib/dev/acpica/compiler/asloperands.c user/ed/newcons/sys/contrib/dev/acpica/compiler/asltransform.c user/ed/newcons/sys/contrib/dev/acpica/compiler/asltypes.h user/ed/newcons/sys/contrib/dev/acpica/debugger/dbcmds.c user/ed/newcons/sys/contrib/dev/acpica/debugger/dbexec.c user/ed/newcons/sys/contrib/dev/acpica/debugger/dbstats.c user/ed/newcons/sys/contrib/dev/acpica/dispatcher/dsinit.c user/ed/newcons/sys/contrib/dev/acpica/dispatcher/dsmthdat.c user/ed/newcons/sys/contrib/dev/acpica/dispatcher/dsobject.c user/ed/newcons/sys/contrib/dev/acpica/events/evgpeblk.c user/ed/newcons/sys/contrib/dev/acpica/events/evregion.c user/ed/newcons/sys/contrib/dev/acpica/executer/exconfig.c user/ed/newcons/sys/contrib/dev/acpica/executer/exconvrt.c user/ed/newcons/sys/contrib/dev/acpica/executer/exfield.c user/ed/newcons/sys/contrib/dev/acpica/executer/exoparg1.c user/ed/newcons/sys/contrib/dev/acpica/executer/exoparg6.c user/ed/newcons/sys/contrib/dev/acpica/executer/exregion.c user/ed/newcons/sys/contrib/dev/acpica/include/acconfig.h user/ed/newcons/sys/contrib/dev/acpica/include/acmacros.h user/ed/newcons/sys/contrib/dev/acpica/include/acnamesp.h user/ed/newcons/sys/contrib/dev/acpica/include/acpixf.h user/ed/newcons/sys/contrib/dev/acpica/include/acutils.h user/ed/newcons/sys/contrib/dev/acpica/namespace/nsdump.c user/ed/newcons/sys/contrib/dev/acpica/namespace/nsdumpdv.c user/ed/newcons/sys/contrib/dev/acpica/namespace/nseval.c user/ed/newcons/sys/contrib/dev/acpica/namespace/nsinit.c user/ed/newcons/sys/contrib/dev/acpica/namespace/nspredef.c user/ed/newcons/sys/contrib/dev/acpica/namespace/nsrepair.c user/ed/newcons/sys/contrib/dev/acpica/namespace/nswalk.c user/ed/newcons/sys/contrib/dev/acpica/namespace/nsxfeval.c user/ed/newcons/sys/contrib/dev/acpica/parser/psloop.c user/ed/newcons/sys/contrib/dev/acpica/parser/psparse.c user/ed/newcons/sys/contrib/dev/acpica/parser/psxface.c user/ed/newcons/sys/contrib/dev/acpica/utilities/utmisc.c user/ed/newcons/sys/contrib/dev/acpica/utilities/utobject.c user/ed/newcons/sys/ddb/db_command.c user/ed/newcons/sys/dev/acpica/acpi.c user/ed/newcons/sys/dev/acpica/acpi_dock.c user/ed/newcons/sys/dev/acpica/acpi_pci.c user/ed/newcons/sys/dev/acpica/acpi_video.c user/ed/newcons/sys/dev/ahci/ahci.c user/ed/newcons/sys/dev/ahci/ahci.h user/ed/newcons/sys/dev/aic7xxx/ahd_pci.c user/ed/newcons/sys/dev/aic7xxx/aic79xx.c user/ed/newcons/sys/dev/aic7xxx/aic79xx.h user/ed/newcons/sys/dev/aic7xxx/aic79xx_osm.c user/ed/newcons/sys/dev/aic7xxx/aic79xx_osm.h user/ed/newcons/sys/dev/an/if_an.c user/ed/newcons/sys/dev/an/if_an_isa.c user/ed/newcons/sys/dev/an/if_an_pccard.c user/ed/newcons/sys/dev/an/if_an_pci.c user/ed/newcons/sys/dev/an/if_anreg.h user/ed/newcons/sys/dev/ata/ata-all.c user/ed/newcons/sys/dev/ata/ata-disk.c user/ed/newcons/sys/dev/ata/ata-pci.c user/ed/newcons/sys/dev/ata/ata-pci.h user/ed/newcons/sys/dev/ata/chipsets/ata-ahci.c user/ed/newcons/sys/dev/ata/chipsets/ata-intel.c user/ed/newcons/sys/dev/ata/chipsets/ata-jmicron.c user/ed/newcons/sys/dev/ata/chipsets/ata-marvell.c user/ed/newcons/sys/dev/ath/ath_hal/ah_regdomain.c user/ed/newcons/sys/dev/bge/if_bge.c user/ed/newcons/sys/dev/bge/if_bgereg.h user/ed/newcons/sys/dev/ce/if_ce.c user/ed/newcons/sys/dev/cm/smc90cx6.c user/ed/newcons/sys/dev/cm/smc90cx6var.h user/ed/newcons/sys/dev/cp/if_cp.c user/ed/newcons/sys/dev/ctau/if_ct.c user/ed/newcons/sys/dev/cx/if_cx.c user/ed/newcons/sys/dev/de/if_de.c user/ed/newcons/sys/dev/de/if_devar.h user/ed/newcons/sys/dev/ed/if_ed.c user/ed/newcons/sys/dev/ed/if_ed_pccard.c user/ed/newcons/sys/dev/ed/if_edvar.h user/ed/newcons/sys/dev/ep/if_ep.c user/ed/newcons/sys/dev/ep/if_epvar.h user/ed/newcons/sys/dev/et/if_et.c user/ed/newcons/sys/dev/et/if_etreg.h user/ed/newcons/sys/dev/et/if_etvar.h user/ed/newcons/sys/dev/fatm/if_fatm.c user/ed/newcons/sys/dev/fatm/if_fatmvar.h user/ed/newcons/sys/dev/fe/if_fe_pccard.c user/ed/newcons/sys/dev/hwpmc/hwpmc_logging.c user/ed/newcons/sys/dev/ixgb/if_ixgb.c user/ed/newcons/sys/dev/ixgb/if_ixgb.h user/ed/newcons/sys/dev/lge/if_lge.c user/ed/newcons/sys/dev/lge/if_lgereg.h user/ed/newcons/sys/dev/lmc/if_lmc.c user/ed/newcons/sys/dev/lmc/if_lmc.h user/ed/newcons/sys/dev/malo/if_malo.c user/ed/newcons/sys/dev/malo/if_malo.h user/ed/newcons/sys/dev/msk/if_msk.c user/ed/newcons/sys/dev/mwl/if_mwl.c user/ed/newcons/sys/dev/mwl/if_mwlvar.h user/ed/newcons/sys/dev/my/if_my.c user/ed/newcons/sys/dev/my/if_myreg.h user/ed/newcons/sys/dev/nve/if_nve.c user/ed/newcons/sys/dev/nve/if_nvereg.h user/ed/newcons/sys/dev/nxge/if_nxge.c user/ed/newcons/sys/dev/pci/pci.c user/ed/newcons/sys/dev/pcn/if_pcn.c user/ed/newcons/sys/dev/pcn/if_pcnreg.h user/ed/newcons/sys/dev/pdq/if_fea.c user/ed/newcons/sys/dev/pdq/if_fpa.c user/ed/newcons/sys/dev/pdq/pdq_freebsd.h user/ed/newcons/sys/dev/pdq/pdq_ifsubr.c user/ed/newcons/sys/dev/re/if_re.c user/ed/newcons/sys/dev/siis/siis.c user/ed/newcons/sys/dev/siis/siis.h user/ed/newcons/sys/dev/sn/if_sn.c user/ed/newcons/sys/dev/sn/if_sn_pccard.c user/ed/newcons/sys/dev/sn/if_snvar.h user/ed/newcons/sys/dev/sound/pci/hda/hdac.c user/ed/newcons/sys/dev/sound/usb/uaudio.c user/ed/newcons/sys/dev/ste/if_ste.c user/ed/newcons/sys/dev/ste/if_stereg.h user/ed/newcons/sys/dev/syscons/scvidctl.c user/ed/newcons/sys/dev/ti/if_ti.c user/ed/newcons/sys/dev/ti/if_tireg.h user/ed/newcons/sys/dev/tl/if_tl.c user/ed/newcons/sys/dev/tl/if_tlreg.h user/ed/newcons/sys/dev/tsec/if_tsec.c user/ed/newcons/sys/dev/usb/controller/at91dci.c user/ed/newcons/sys/dev/usb/controller/atmegadci.c user/ed/newcons/sys/dev/usb/controller/avr32dci.c user/ed/newcons/sys/dev/usb/controller/ehci.c user/ed/newcons/sys/dev/usb/controller/musb_otg.c user/ed/newcons/sys/dev/usb/controller/musb_otg.h user/ed/newcons/sys/dev/usb/controller/ohci.c user/ed/newcons/sys/dev/usb/controller/uhci.c user/ed/newcons/sys/dev/usb/controller/uhci_pci.c user/ed/newcons/sys/dev/usb/controller/uhcireg.h user/ed/newcons/sys/dev/usb/controller/usb_controller.c user/ed/newcons/sys/dev/usb/controller/uss820dci.c user/ed/newcons/sys/dev/usb/input/atp.c user/ed/newcons/sys/dev/usb/input/ukbd.c user/ed/newcons/sys/dev/usb/net/if_aue.c user/ed/newcons/sys/dev/usb/net/if_axe.c user/ed/newcons/sys/dev/usb/net/if_cdce.c user/ed/newcons/sys/dev/usb/net/if_cue.c user/ed/newcons/sys/dev/usb/net/if_kue.c user/ed/newcons/sys/dev/usb/net/if_rue.c user/ed/newcons/sys/dev/usb/net/if_udav.c user/ed/newcons/sys/dev/usb/serial/u3g.c user/ed/newcons/sys/dev/usb/serial/uark.c user/ed/newcons/sys/dev/usb/serial/ubser.c user/ed/newcons/sys/dev/usb/serial/ucycom.c user/ed/newcons/sys/dev/usb/serial/ufoma.c user/ed/newcons/sys/dev/usb/serial/uftdi.c user/ed/newcons/sys/dev/usb/serial/ugensa.c user/ed/newcons/sys/dev/usb/serial/umct.c user/ed/newcons/sys/dev/usb/serial/umodem.c user/ed/newcons/sys/dev/usb/serial/uplcom.c user/ed/newcons/sys/dev/usb/storage/umass.c user/ed/newcons/sys/dev/usb/template/usb_template.c user/ed/newcons/sys/dev/usb/usb_busdma.c user/ed/newcons/sys/dev/usb/usb_core.h user/ed/newcons/sys/dev/usb/usb_debug.c user/ed/newcons/sys/dev/usb/usb_debug.h user/ed/newcons/sys/dev/usb/usb_dev.c user/ed/newcons/sys/dev/usb/usb_device.c user/ed/newcons/sys/dev/usb/usb_generic.c user/ed/newcons/sys/dev/usb/usb_hid.c user/ed/newcons/sys/dev/usb/usb_hub.c user/ed/newcons/sys/dev/usb/usb_hub.h user/ed/newcons/sys/dev/usb/usb_msctest.c user/ed/newcons/sys/dev/usb/usb_process.c user/ed/newcons/sys/dev/usb/usb_request.c user/ed/newcons/sys/dev/usb/usb_transfer.c user/ed/newcons/sys/dev/usb/usbdevs user/ed/newcons/sys/dev/usb/usbdi.h user/ed/newcons/sys/dev/usb/wlan/if_upgt.c user/ed/newcons/sys/dev/vge/if_vge.c user/ed/newcons/sys/dev/vge/if_vgevar.h user/ed/newcons/sys/dev/vx/if_vx.c user/ed/newcons/sys/dev/vx/if_vxvar.h user/ed/newcons/sys/dev/wb/if_wb.c user/ed/newcons/sys/dev/wb/if_wbreg.h user/ed/newcons/sys/dev/wl/if_wl.c user/ed/newcons/sys/dev/xen/blkfront/blkfront.c user/ed/newcons/sys/dev/xen/console/console.c user/ed/newcons/sys/dev/xen/netfront/netfront.c user/ed/newcons/sys/fs/nfs/nfs_var.h user/ed/newcons/sys/fs/nfsserver/nfs_nfsdport.c user/ed/newcons/sys/fs/nfsserver/nfs_nfsdserv.c user/ed/newcons/sys/i386/cpufreq/est.c user/ed/newcons/sys/i386/i386/bpf_jit_machdep.c user/ed/newcons/sys/i386/i386/bpf_jit_machdep.h user/ed/newcons/sys/i386/xen/pmap.c user/ed/newcons/sys/ia64/ia64/db_machdep.c user/ed/newcons/sys/ia64/ia64/exception.S user/ed/newcons/sys/ia64/ia64/interrupt.c user/ed/newcons/sys/ia64/ia64/trap.c user/ed/newcons/sys/ia64/include/param.h user/ed/newcons/sys/kern/kern_descrip.c user/ed/newcons/sys/kern/kern_linker.c user/ed/newcons/sys/kern/kern_sig.c user/ed/newcons/sys/kern/sched_ule.c user/ed/newcons/sys/kern/sys_process.c user/ed/newcons/sys/kern/tty.c user/ed/newcons/sys/kern/vfs_subr.c user/ed/newcons/sys/mips/adm5120/if_admsw.c user/ed/newcons/sys/mips/adm5120/if_admswvar.h user/ed/newcons/sys/modules/acpi/acpi/Makefile user/ed/newcons/sys/net/bpf_jitter.c user/ed/newcons/sys/net/bpf_jitter.h user/ed/newcons/sys/net/route.c user/ed/newcons/sys/netinet/in_mcast.c user/ed/newcons/sys/netinet/raw_ip.c user/ed/newcons/sys/netinet/sctp_asconf.c user/ed/newcons/sys/netinet/sctp_auth.c user/ed/newcons/sys/netinet/sctp_constants.h user/ed/newcons/sys/netinet/sctp_input.c user/ed/newcons/sys/netinet/sctp_os_bsd.h user/ed/newcons/sys/netinet/sctp_output.c user/ed/newcons/sys/netinet/sctp_pcb.c user/ed/newcons/sys/netinet/sctp_structs.h user/ed/newcons/sys/netinet/sctp_usrreq.c user/ed/newcons/sys/netinet/sctputil.c user/ed/newcons/sys/netinet6/in6_mcast.c user/ed/newcons/sys/netinet6/raw_ip6.c user/ed/newcons/sys/netipsec/key.c user/ed/newcons/sys/nfsserver/nfs_fha.c user/ed/newcons/sys/pc98/conf/NOTES user/ed/newcons/sys/powerpc/aim/trap.c user/ed/newcons/sys/powerpc/mpc85xx/pci_ocp.c user/ed/newcons/sys/powerpc/powerpc/cpu.c user/ed/newcons/sys/sparc64/sparc64/machdep.c user/ed/newcons/sys/sys/ata.h user/ed/newcons/sys/sys/elf_common.h user/ed/newcons/sys/sys/param.h user/ed/newcons/sys/sys/signal.h user/ed/newcons/sys/sys/signalvar.h user/ed/newcons/sys/vm/vm.h user/ed/newcons/sys/vm/vm_extern.h user/ed/newcons/sys/vm/vm_fault.c user/ed/newcons/sys/vm/vm_map.c user/ed/newcons/sys/vm/vm_map.h user/ed/newcons/tools/regression/bin/sh/builtins/cd1.0 user/ed/newcons/tools/regression/bpf/bpf_filter/Makefile user/ed/newcons/tools/regression/bpf/bpf_filter/bpf_test.c user/ed/newcons/tools/regression/bpf/bpf_filter/tests/test0075.h user/ed/newcons/tools/regression/bpf/bpf_filter/tests/test0076.h user/ed/newcons/tools/regression/bpf/bpf_filter/tests/test0077.h user/ed/newcons/tools/regression/bpf/bpf_filter/tests/test0078.h user/ed/newcons/tools/regression/bpf/bpf_filter/tests/test0080.h user/ed/newcons/tools/tools/ncpus/acpi.c user/ed/newcons/tools/tools/tinybsd/tinybsd user/ed/newcons/usr.bin/gcore/Makefile user/ed/newcons/usr.bin/gcore/elfcore.c user/ed/newcons/usr.bin/gcore/gcore.1 user/ed/newcons/usr.bin/gcore/gcore.c user/ed/newcons/usr.bin/gzip/unbzip2.c user/ed/newcons/usr.bin/kdump/kdump.c user/ed/newcons/usr.bin/make/arch.c user/ed/newcons/usr.bin/make/dir.c user/ed/newcons/usr.bin/make/job.c user/ed/newcons/usr.bin/netstat/if.c user/ed/newcons/usr.bin/perror/perror.c user/ed/newcons/usr.bin/unifdef/unifdef.1 user/ed/newcons/usr.bin/unifdef/unifdef.c user/ed/newcons/usr.bin/unifdef/unifdefall.sh user/ed/newcons/usr.bin/w/w.c user/ed/newcons/usr.sbin/acpi/acpidb/Makefile user/ed/newcons/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_device_tbl.c user/ed/newcons/usr.sbin/cron/cron/cron.c user/ed/newcons/usr.sbin/devinfo/devinfo.c user/ed/newcons/usr.sbin/fifolog/fifolog_writer/fifolog_writer.c user/ed/newcons/usr.sbin/inetd/inetd.c user/ed/newcons/usr.sbin/jail/jail.8 user/ed/newcons/usr.sbin/syslogd/syslogd.c Directory Properties: user/ed/newcons/ (props changed) user/ed/newcons/share/zoneinfo/ (props changed) user/ed/newcons/sys/contrib/dev/acpica/ (props changed) Modified: user/ed/newcons/ObsoleteFiles.inc ============================================================================== --- user/ed/newcons/ObsoleteFiles.inc Thu Nov 26 18:14:03 2009 (r199840) +++ user/ed/newcons/ObsoleteFiles.inc Thu Nov 26 19:01:19 2009 (r199841) @@ -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 Modified: user/ed/newcons/UPDATING ============================================================================== --- user/ed/newcons/UPDATING Thu Nov 26 18:14:03 2009 (r199840) +++ user/ed/newcons/UPDATING Thu Nov 26 19:01:19 2009 (r199841) @@ -42,6 +42,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 9. 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" Modified: user/ed/newcons/bin/Makefile ============================================================================== --- user/ed/newcons/bin/Makefile Thu Nov 26 18:14:03 2009 (r199840) +++ user/ed/newcons/bin/Makefile Thu Nov 26 19:01:19 2009 (r199841) @@ -27,6 +27,7 @@ SUBDIR= cat \ pax \ pkill \ ps \ + pwait \ pwd \ ${_rcp} \ realpath \ Modified: user/ed/newcons/bin/ps/keyword.c ============================================================================== --- user/ed/newcons/bin/ps/keyword.c Thu Nov 26 18:14:03 2009 (r199840) +++ user/ed/newcons/bin/ps/keyword.c Thu Nov 26 19:01:19 2009 (r199841) @@ -330,6 +330,7 @@ findvar(char *p, int user, char **header errx(1, "malloc failed"); snprintf(realfmt, rflen, "%s=%s", v->alias, hp); parsefmt(realfmt, user); + free(realfmt); } return ((VAR *)NULL); } Modified: user/ed/newcons/bin/sh/cd.c ============================================================================== --- user/ed/newcons/bin/sh/cd.c Thu Nov 26 18:14:03 2009 (r199840) +++ user/ed/newcons/bin/sh/cd.c Thu Nov 26 19:01:19 2009 (r199841) @@ -70,7 +70,7 @@ STATIC int docd(char *, int, int); 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 @@ findcwd(char *dir) * 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 @@ updatepwd(char *dir) 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 @@ pwdcmd(int argc, char **argv) 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 @@ pwdcmd(int argc, char **argv) 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; - - if (pwd && *pwd == '/' && stat(".", &stdot) != -1 && - stat(pwd, &stpwd) != -1 && - stdot.st_dev == stpwd.st_dev && - stdot.st_ino == stpwd.st_ino) { + struct stat stdot, stpwd; + char *pwd; + int i; + + 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; } Modified: user/ed/newcons/bin/sh/error.c ============================================================================== --- user/ed/newcons/bin/sh/error.c Thu Nov 26 18:14:03 2009 (r199840) +++ user/ed/newcons/bin/sh/error.c Thu Nov 26 19:01:19 2009 (r199841) @@ -73,11 +73,15 @@ static void exverror(int, const char *, * 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 @@ onint(void) 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) Modified: user/ed/newcons/bin/sh/error.h ============================================================================== --- user/ed/newcons/bin/sh/error.h Thu Nov 26 18:14:03 2009 (r199840) +++ user/ed/newcons/bin/sh/error.h Thu Nov 26 19:01:19 2009 (r199841) @@ -72,6 +72,8 @@ extern volatile sig_atomic_t intpending; #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 Modified: user/ed/newcons/bin/sh/eval.c ============================================================================== --- user/ed/newcons/bin/sh/eval.c Thu Nov 26 18:14:03 2009 (r199840) +++ user/ed/newcons/bin/sh/eval.c Thu Nov 26 19:01:19 2009 (r199841) @@ -593,6 +593,7 @@ evalcommand(union node *cmd, int flags, char *savecmdname; struct shparam saveparam; struct localvar *savelocalvars; + struct parsefile *savetopfile; volatile int e; char *lastarg; int realstatus; @@ -781,7 +782,6 @@ evalcommand(union node *cmd, int flags, savelocalvars = localvars; localvars = NULL; reffunc(cmdentry.u.func); - INTON; savehandler = handler; if (setjmp(jmploc.loc)) { if (exception == EXSHELLPROC) @@ -797,6 +797,7 @@ evalcommand(union node *cmd, int flags, longjmp(handler->loc, 1); } handler = &jmploc; + INTON; for (sp = varlist.list ; sp ; sp = sp->next) mklocal(sp->text); funcnest++; @@ -833,6 +834,7 @@ evalcommand(union node *cmd, int flags, mode |= REDIR_BACKQ; } savecmdname = commandname; + savetopfile = getcurrentfile(); cmdenviron = varlist.list; e = -1; savehandler = handler; @@ -867,6 +869,7 @@ cmddone: if ((e != EXERROR && e != EXEXEC) || cmdentry.special) exraise(e); + popfilesupto(savetopfile); FORCEINTON; } if (cmdentry.u.index != EXECCMD) Modified: user/ed/newcons/bin/sh/histedit.c ============================================================================== --- user/ed/newcons/bin/sh/histedit.c Thu Nov 26 18:14:03 2009 (r199840) +++ user/ed/newcons/bin/sh/histedit.c Thu Nov 26 19:01:19 2009 (r199841) @@ -92,7 +92,7 @@ histedit(void) 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 @@ histedit(void) 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 @@ histcmd(int argc, char **argv) if (sflg) { if (displayhist) { out2str(s); + flushout(out2); } evalstring(s, 0); if (displayhist && hist) { Modified: user/ed/newcons/bin/sh/input.c ============================================================================== --- user/ed/newcons/bin/sh/input.c Thu Nov 26 18:14:03 2009 (r199840) +++ user/ed/newcons/bin/sh/input.c Thu Nov 26 19:01:19 2009 (r199841) @@ -215,7 +215,7 @@ retry: 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 @@ pushstring(char *s, int len, void *ap) 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 @@ popstring(void) 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 @@ popfile(void) /* + * 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. */ Modified: user/ed/newcons/bin/sh/input.h ============================================================================== --- user/ed/newcons/bin/sh/input.h Thu Nov 26 18:14:03 2009 (r199840) +++ user/ed/newcons/bin/sh/input.h Thu Nov 26 19:01:19 2009 (r199841) @@ -45,6 +45,8 @@ extern int parsenleft; /* number of cha 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 setinputfile(char *, int); 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); Modified: user/ed/newcons/bin/sh/jobs.c ============================================================================== --- user/ed/newcons/bin/sh/jobs.c Thu Nov 26 18:14:03 2009 (r199840) +++ user/ed/newcons/bin/sh/jobs.c Thu Nov 26 19:01:19 2009 (r199841) @@ -146,7 +146,7 @@ setjobctl(int on) 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 @@ stoppedjobs(void) 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); } Modified: user/ed/newcons/bin/sh/main.c ============================================================================== --- user/ed/newcons/bin/sh/main.c Thu Nov 26 18:14:03 2009 (r199840) +++ user/ed/newcons/bin/sh/main.c Thu Nov 26 19:01:19 2009 (r199841) @@ -154,7 +154,7 @@ main(int argc, char *argv[]) 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 @@ cmdloop(int top) 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) { Modified: user/ed/newcons/bin/sh/output.c ============================================================================== --- user/ed/newcons/bin/sh/output.c Thu Nov 26 18:14:03 2009 (r199840) +++ user/ed/newcons/bin/sh/output.c Thu Nov 26 19:01:19 2009 (r199841) @@ -71,7 +71,7 @@ __FBSDID("$FreeBSD$"); 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 @@ outstr(const char *p, struct output *fil { while (*p) outc(*p++, file); - if (file == out2) - flushout(file); } /* Like outstr(), but quote for re-input into the shell. */ @@ -255,7 +253,7 @@ out1fmt(const char *fmt, ...) } void -dprintf(const char *fmt, ...) +out2fmt_flush(const char *fmt, ...) { va_list ap; Modified: user/ed/newcons/bin/sh/output.h ============================================================================== --- user/ed/newcons/bin/sh/output.h Thu Nov 26 18:14:03 2009 (r199840) +++ user/ed/newcons/bin/sh/output.h Thu Nov 26 19:01:19 2009 (r199841) @@ -65,7 +65,7 @@ void flushout(struct output *); 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); Modified: user/ed/newcons/bin/sh/parser.c ============================================================================== --- user/ed/newcons/bin/sh/parser.c Thu Nov 26 18:14:03 2009 (r199840) +++ user/ed/newcons/bin/sh/parser.c Thu Nov 26 19:01:19 2009 (r199841) @@ -364,7 +364,9 @@ TRACE(("expecting DO got %s %s\n", tokna n1 = (union node *)stalloc(sizeof (struct nfor)); n1->type = NFOR; n1->nfor.var = wordtext; - if (readtoken() == TWORD && ! quoteflag && equal(wordtext, "in")) { + while (readtoken() == TNL) + ; + if (lasttoken == TWORD && ! quoteflag && equal(wordtext, "in")) { app = ≈ while (readtoken() == TWORD) { n2 = (union node *)stalloc(sizeof (struct narg)); @@ -1310,6 +1312,7 @@ parsebackq: { int saveprompt; const int bq_startlinno = plinno; + str = NULL; if (setjmp(jmploc.loc)) { if (str) ckfree(str); @@ -1321,7 +1324,6 @@ parsebackq: { longjmp(handler->loc, 1); } INTOFF; - str = NULL; savelen = out - stackblock(); if (savelen > 0) { str = ckmalloc(savelen); @@ -1561,7 +1563,10 @@ setprompt(int which) #ifndef NO_HISTORY if (!el) #endif + { out2str(getprompt(NULL)); + flushout(out2); + } } /* Modified: user/ed/newcons/bin/sh/redir.c ============================================================================== --- user/ed/newcons/bin/sh/redir.c Thu Nov 26 18:14:03 2009 (r199840) +++ user/ed/newcons/bin/sh/redir.c Thu Nov 26 19:01:19 2009 (r199841) @@ -166,8 +166,11 @@ openredirect(union node *redir, char mem /* * 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; Modified: user/ed/newcons/bin/sh/trap.c ============================================================================== --- user/ed/newcons/bin/sh/trap.c Thu Nov 26 18:14:03 2009 (r199840) +++ user/ed/newcons/bin/sh/trap.c Thu Nov 26 19:01:19 2009 (r199841) @@ -149,6 +149,7 @@ trapcmd(int argc, char **argv) { char *action; int signo; + int errors = 0; if (argc <= 1) { for (signo = 0 ; signo < sys_nsig ; signo++) { @@ -183,8 +184,10 @@ trapcmd(int argc, char **argv) } } 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 @@ trapcmd(int argc, char **argv) INTON; argv++; } - return 0; + return errors; } Modified: user/ed/newcons/bin/sh/var.c ============================================================================== --- user/ed/newcons/bin/sh/var.c Thu Nov 26 18:14:03 2009 (r199840) +++ user/ed/newcons/bin/sh/var.c Thu Nov 26 19:01:19 2009 (r199841) @@ -195,7 +195,9 @@ setvarsafe(char *name, char *val, int fl 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 @@ setvarsafe(char *name, char *val, int fl setvar(name, val, flags); } handler = savehandler; + SETINTON(inton); return err; } Modified: user/ed/newcons/contrib/ipfilter/man/ipf.8 ============================================================================== --- user/ed/newcons/contrib/ipfilter/man/ipf.8 Thu Nov 26 18:14:03 2009 (r199840) +++ user/ed/newcons/contrib/ipfilter/man/ipf.8 Thu Nov 26 19:01:19 2009 (r199841) @@ -46,7 +46,7 @@ supports \fBlanguage\fI. At present, th \fBC\fB (-cc) for which two files - \fBip_rules.c\fP and \fBip_rules.h\fP are generated in the \fBCURRENT DIRECTORY\fP when \fBipf\fP is being run. These files can be used with the -\fBIPFILTER_COMPILED\fP kernel option to build filter rules staticly into +\fBIPFILTER_COMPILED\fP kernel option to build filter rules staticlly into the kernel. .TP .B \-d Modified: user/ed/newcons/crypto/openssh/sshd.c ============================================================================== --- user/ed/newcons/crypto/openssh/sshd.c Thu Nov 26 18:14:03 2009 (r199840) +++ user/ed/newcons/crypto/openssh/sshd.c Thu Nov 26 19:01:19 2009 (r199841) @@ -47,6 +47,7 @@ __RCSID("$FreeBSD$"); #include <sys/types.h> #include <sys/ioctl.h> +#include <sys/mman.h> #include <sys/socket.h> #ifdef HAVE_SYS_STAT_H # include <sys/stat.h> @@ -1293,6 +1294,10 @@ main(int ac, char **av) /* Initialize configuration options to their default values. */ initialize_server_options(&options); + /* Avoid killing the process in high-pressure swapping environments. */ + if (madvise(NULL, 0, MADV_PROTECT) != 0) + debug("madvise(): %.200s", strerror(errno)); + /* Parse command-line arguments. */ while ((opt = getopt(ac, av, "f:p:b:k:h:g:u:o:C:dDeiqrtQRT46")) != -1) { switch (opt) { Modified: user/ed/newcons/games/factor/factor.c ============================================================================== --- user/ed/newcons/games/factor/factor.c Thu Nov 26 18:14:03 2009 (r199840) +++ user/ed/newcons/games/factor/factor.c Thu Nov 26 19:01:19 2009 (r199841) @@ -13,11 +13,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -35,18 +31,20 @@ */ #ifndef lint -static const char copyright[] = -"@(#) Copyright (c) 1989, 1993\n\ - The Regents of the University of California. All rights reserved.\n"; -#endif /* not lint */ - -#ifndef lint -#if 0 -static char sccsid[] = "@(#)factor.c 8.4 (Berkeley) 5/4/95"; -__RCSID("$NetBSD: factor.c,v 1.13 2002/06/18 23:07:36 simonb Exp $"); +#include <sys/cdefs.h> +#ifdef __COPYRIGHT +__COPYRIGHT("@(#) Copyright (c) 1989, 1993\ + The Regents of the University of California. All rights reserved."); +#endif +#ifdef __SCCSID +__SCCSID("@(#)factor.c 8.4 (Berkeley) 5/4/95"); +#endif +#ifdef __RCSID +__RCSID("$NetBSD: factor.c,v 1.19 2009/08/12 05:54:31 dholland Exp $"); +#endif +#ifdef __FBSDID +__FBSDID("$FreeBSD$"); #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ /* @@ -63,7 +61,7 @@ static const char rcsid[] = * * number: factor1 factor1 factor2 factor3 factor3 factor3 ... * - * where factor1 < factor2 < factor3 < ... + * where factor1 <= factor2 <= factor3 <= ... * * If no args are given, the list of numbers are read from stdin. */ @@ -214,7 +212,9 @@ pr_fact(BIGNUM *val) bnfact = BN_new(); BN_set_word(bnfact, *(fact - 1)); BN_sqr(bnfact, bnfact, ctx); - if (BN_cmp(bnfact, val) > 0) + if (BN_cmp(bnfact, val) > 0 || + BN_is_prime(val, PRIME_CHECKS, + NULL, NULL, NULL) == 1) pr_print(val); else pollard_pminus1(val); @@ -257,22 +257,28 @@ usage(void) #ifdef HAVE_OPENSSL -/* pollard rho, algorithm from Jim Gillogly, May 2000 */ +/* pollard p-1, algorithm from Jim Gillogly, May 2000 */ static void pollard_pminus1(BIGNUM *val) { - BIGNUM *base, *num, *i, *x; + BIGNUM *base, *rbase, *num, *i, *x; base = BN_new(); + rbase = BN_new(); num = BN_new(); i = BN_new(); x = BN_new(); + BN_set_word(rbase, 1); +newbase: + BN_add_word(rbase, 1); BN_set_word(i, 2); - BN_set_word(base, 2); + BN_copy(base, rbase); for (;;) { BN_mod_exp(base, base, i, val, ctx); + if (BN_is_one(base)) + goto newbase; BN_copy(x, base); BN_sub_word(x, 1); Modified: user/ed/newcons/include/signal.h ============================================================================== --- user/ed/newcons/include/signal.h Thu Nov 26 18:14:03 2009 (r199840) +++ user/ed/newcons/include/signal.h Thu Nov 26 19:01:19 2009 (r199841) @@ -99,7 +99,12 @@ int sigwaitinfo(const sigset_t * __restr #if __XSI_VISIBLE int killpg(__pid_t, int); int sigaltstack(const stack_t * __restrict, stack_t * __restrict); -int sigpause(int); +int sighold(int sig); +int sigignore(int sig); +int sigpause(int sigmask); +int sigrelse(int sig); +void (*sigset(int sig, void (*disp)(int)))(int); +int xsi_sigpause(int sig); #endif #if __XSI_VISIBLE >= 600 Modified: user/ed/newcons/lib/libc/compat-43/Makefile.inc ============================================================================== --- user/ed/newcons/lib/libc/compat-43/Makefile.inc Thu Nov 26 18:14:03 2009 (r199840) +++ user/ed/newcons/lib/libc/compat-43/Makefile.inc Thu Nov 26 19:01:19 2009 (r199841) @@ -13,6 +13,11 @@ MAN+= creat.2 killpg.2 sigpause.2 sigset MAN+= gethostid.3 setruid.3 MLINKS+=gethostid.3 sethostid.3 +MLINKS+=sigpause.2 sighold.2 +MLINKS+=sigpause.2 sigignore.2 +MLINKS+=sigpause.2 sigrelse.2 +MLINKS+=sigpause.2 sigset.2 +MLINKS+=sigpause.2 xsi_sigpause.2 MLINKS+=setruid.3 setrgid.3 MLINKS+=sigsetmask.2 sigblock.2 Modified: user/ed/newcons/lib/libc/compat-43/Symbol.map ============================================================================== --- user/ed/newcons/lib/libc/compat-43/Symbol.map Thu Nov 26 18:14:03 2009 (r199840) +++ user/ed/newcons/lib/libc/compat-43/Symbol.map Thu Nov 26 19:01:19 2009 (r199841) @@ -17,6 +17,14 @@ FBSD_1.0 { sigvec; }; +FBSD_1.2 { + sighold; + sigignore; + sigrelse; + sigset; + xsi_sigpause; +}; + FBSDprivate_1.0 { __creat; _creat; Modified: user/ed/newcons/lib/libc/compat-43/sigcompat.c ============================================================================== --- user/ed/newcons/lib/libc/compat-43/sigcompat.c Thu Nov 26 18:14:03 2009 (r199840) +++ user/ed/newcons/lib/libc/compat-43/sigcompat.c Thu Nov 26 19:01:19 2009 (r199841) @@ -36,6 +36,7 @@ __FBSDID("$FreeBSD$"); #include "namespace.h" #include <sys/param.h> #include <signal.h> +#include <string.h> #include "un-namespace.h" #include "libc_private.h" @@ -97,8 +98,7 @@ sigblock(mask) } int -sigpause(mask) - int mask; +sigpause(int mask) { sigset_t set; @@ -106,3 +106,84 @@ sigpause(mask) set.__bits[0] = mask; return (_sigsuspend(&set)); } + +int +xsi_sigpause(int sig) +{ + sigset_t set; + + sigemptyset(&set); + sigaddset(&set, sig); + return (_sigsuspend(&set)); +} + +int +sighold(int sig) +{ + sigset_t set; + + sigemptyset(&set); + sigaddset(&set, sig); + return (_sigprocmask(SIG_BLOCK, &set, NULL)); +} + +int +sigignore(int sig) +{ + struct sigaction sa; + + bzero(&sa, sizeof(sa)); + sa.sa_handler = SIG_IGN; + return (_sigaction(sig, &sa, NULL)); +} + +int +sigrelse(int sig) +{ + sigset_t set; + + sigemptyset(&set); + sigaddset(&set, sig); + return (_sigprocmask(SIG_UNBLOCK, &set, NULL)); +} + +void +(*sigset(int sig, void (*disp)(int)))(int) +{ + sigset_t set, pset; + struct sigaction sa, psa; + int error; + + sigemptyset(&set); + sigaddset(&set, sig); + error = _sigprocmask(SIG_BLOCK, NULL, &pset); + if (error == -1) + return (SIG_ERR); + if ((__sighandler_t *)disp == SIG_HOLD) { + error = _sigprocmask(SIG_BLOCK, &set, &pset); + if (error == -1) + return (SIG_ERR); + if (sigismember(&pset, sig)) + return (SIG_HOLD); + else { + error = _sigaction(sig, NULL, &psa); + if (error == -1) + return (SIG_ERR); + return (psa.sa_handler); + } + } else { + error = _sigprocmask(SIG_UNBLOCK, &set, &pset); + if (error == -1) + return (SIG_ERR); + } + + bzero(&sa, sizeof(sa)); + sa.sa_handler = disp; + error = _sigaction(sig, &sa, &psa); + if (error == -1) + return (SIG_ERR); + if (sigismember(&pset, sig)) + return (SIG_HOLD); + else + return (psa.sa_handler); +} Modified: user/ed/newcons/lib/libc/compat-43/sigpause.2 ============================================================================== --- user/ed/newcons/lib/libc/compat-43/sigpause.2 Thu Nov 26 18:14:03 2009 (r199840) +++ user/ed/newcons/lib/libc/compat-43/sigpause.2 Thu Nov 26 19:01:19 2009 (r199841) @@ -28,21 +28,118 @@ .\" @(#)sigpause.2 8.1 (Berkeley) 6/2/93 .\" $FreeBSD$ .\" +.\" Part of the content of the man page was derived from +.\" The Open Group Base Specifications Issue 7 +.\" IEEE Std 1003.1-2008 +.\" .Dd June 2, 1993 .Dt SIGPAUSE 2 .Os .Sh NAME -.Nm sigpause -.Nd atomically release blocked signals and wait for interrupt +.Nm sighold , +.Nm sigignore , +.Nm sigpause , +.Nm sigrelse , +.Nm sigset +.Nd legacy interface for signal management .Sh LIBRARY .Lb libc .Sh SYNOPSIS .In signal.h .Ft int +.Fn sighold "int sig" +.Ft int +.Fn sigignore "int sig" +.Ft int +.Fn xsi_sigpause "int sigmask" +.Ft int +.Fn sigrelse "int sig" +.Ft void (*)(int) +.Fn sigset "int" "void (*disp)(int)" +.Ft int .Fn sigpause "int sigmask" .Sh DESCRIPTION .Sy This interface is made obsolete by -.Xr sigsuspend 2 . +.Xr sigsuspend 2 +.Sy and +.Xr sigaction 2 +.Pp +The +.Fn sigset +function modifies signal dispositions. +The +.Fa sig +argument specifies the signal, which may be any signal except +.Dv SIGKILL +and +.Dv SIGSTOP . +The +.Fa disp +argument specifies the signal's disposition, +which may be +.Dv SIG_DFL , +.Dv SIG_IGN , +or the address of a signal handler. +If +.Fn sigset +is used, and +.Fa disp +is the address of a signal handler, the +system adds +.Fa sig +to the signal mask of the calling process before executing the signal +handler; when the signal handler returns, the system restores the +signal mask of the calling process to its state prior to the delivery +of the signal. +In addition, if +.Fn sigset +is used, and +.Fa disp +is equal to +.Dv SIG_HOLD , +.Fa sig +is added to the signal +mask of the calling process and +.Fa sig 's +disposition remains unchanged. +If +.Fn sigset +is used, and +.Fa disp +is not equal to +.Dv SIG_HOLD , +.Fa sig +is removed from the signal mask of the calling process. +.Pp +The +.Fn sighold +function adds +.Fa sig +to the signal mask of the calling process. +.Pp +The +.Fn sigrelse +function removes +.Fa sig +from the signal mask of the calling process. +.Pp +The +.Fn sigignore +function sets the disposition of +.Fa sig +to +.Dv SIG_IGN . +.Pp +The +.Fn xsi_sigpause +function removes +.Fa sig +from the signal mask of the calling process and suspend the calling process +until a signal is received. +The +.Fn xsi_sigpause +function restores the signal mask of the process to its original state before +returning. .Pp The .Fn sigpause @@ -57,13 +154,47 @@ The argument is usually 0 to indicate that no signals are to be blocked. +.Sh RETURN VALUES The .Fn sigpause -function -always terminates by being interrupted, returning -1 with +and +.Fn xsi_sigpause +functions +always terminate by being interrupted, returning -1 with .Va errno set to -.Er EINTR +.Er EINTR . +.Pp +Upon successful completion, +.Fn sigset +returns +.Dv SIG_HOLD +if the signal had been blocked and the signal's previous disposition if +it had not been blocked. +Otherwise, +.Dv SIG_ERR is returned and +.Va errno +set to indicate the error. +.Pp +For all other functions, upon successful completion, 0 is returned. +Otherwise, -1 is returned and +.Va errno +is set to indicate the error: +.Bl -tag -width Er +.It Bq Er EINVAL +The +.Fa sig +argument +is not a valid signal number. +.It Bq Er EINVAL +For +.Fn sigset +and +.Fn sigignore +functions, an attempt was made to catch or ignore +.Dv SIGKILL +or +.Dv SIGSTOP . .Sh SEE ALSO .Xr kill 2 , .Xr sigaction 2 , @@ -85,9 +216,26 @@ and was copied from there into the .Pq Tn XSI option of .St -p1003.1-2001 . +.Fx +implements it under the name *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200911261901.nAQJ1K1W090411>