Date: Sat, 28 Feb 2009 18:00:54 +0000 (UTC) From: John Birrell <jb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r189191 - in projects/jbuild/sys: . boot boot/common boot/ficl/mips boot/forth boot/i386/btx/btx boot/i386/libi386 boot/i386/loader boot/i386/pxeldr boot/ia64/common boot/ia64/efi boot/... Message-ID: <200902281800.n1SI0sMv017662@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jb Date: Sat Feb 28 18:00:53 2009 New Revision: 189191 URL: http://svn.freebsd.org/changeset/base/189191 Log: MFC Added: projects/jbuild/sys/boot/ficl/mips/ - copied from r189173, head/sys/boot/ficl/mips/ projects/jbuild/sys/bsm/audit_domain.h - copied unchanged from r189173, head/sys/bsm/audit_domain.h projects/jbuild/sys/bsm/audit_errno.h - copied unchanged from r189173, head/sys/bsm/audit_errno.h projects/jbuild/sys/bsm/audit_socket_type.h - copied unchanged from r189173, head/sys/bsm/audit_socket_type.h projects/jbuild/sys/geom/part/g_part_ebr.c - copied unchanged from r189173, head/sys/geom/part/g_part_ebr.c projects/jbuild/sys/libkern/memmove.c - copied unchanged from r189173, head/sys/libkern/memmove.c projects/jbuild/sys/mips/mips/elf64_machdep.c - copied unchanged from r189173, head/sys/mips/mips/elf64_machdep.c projects/jbuild/sys/modules/geom/geom_part/geom_part_ebr/ - copied from r189173, head/sys/modules/geom/geom_part/geom_part_ebr/ projects/jbuild/sys/modules/sound/driver/ai2s/ - copied from r189173, head/sys/modules/sound/driver/ai2s/ projects/jbuild/sys/modules/sound/driver/davbus/ - copied from r189173, head/sys/modules/sound/driver/davbus/ projects/jbuild/sys/net80211/ieee80211_tdma.c - copied unchanged from r189173, head/sys/net80211/ieee80211_tdma.c projects/jbuild/sys/net80211/ieee80211_tdma.h - copied unchanged from r189173, head/sys/net80211/ieee80211_tdma.h projects/jbuild/sys/netinet/libalias/alias_sctp.c - copied unchanged from r189173, head/sys/netinet/libalias/alias_sctp.c projects/jbuild/sys/netinet/libalias/alias_sctp.h - copied unchanged from r189173, head/sys/netinet/libalias/alias_sctp.h projects/jbuild/sys/pc98/cbus/sctermvar.h - copied unchanged from r189173, head/sys/pc98/cbus/sctermvar.h projects/jbuild/sys/powerpc/include/altivec.h - copied unchanged from r189173, head/sys/powerpc/include/altivec.h projects/jbuild/sys/powerpc/powermac/kiic.c - copied unchanged from r189173, head/sys/powerpc/powermac/kiic.c projects/jbuild/sys/powerpc/powerpc/altivec.c - copied unchanged from r189173, head/sys/powerpc/powerpc/altivec.c projects/jbuild/sys/security/audit/audit_bsm_domain.c - copied unchanged from r189173, head/sys/security/audit/audit_bsm_domain.c projects/jbuild/sys/security/audit/audit_bsm_errno.c - copied unchanged from r189173, head/sys/security/audit/audit_bsm_errno.c projects/jbuild/sys/security/audit/audit_bsm_socket_type.c - copied unchanged from r189173, head/sys/security/audit/audit_bsm_socket_type.c Replaced: projects/jbuild/sys/modules/usb/ - copied from r189173, head/sys/modules/usb/ projects/jbuild/sys/modules/usb/Makefile - copied unchanged from r189173, head/sys/modules/usb/Makefile Deleted: projects/jbuild/sys/boot/common/load.c projects/jbuild/sys/modules/aue/ projects/jbuild/sys/modules/axe/ projects/jbuild/sys/modules/cdce/ projects/jbuild/sys/modules/cue/ projects/jbuild/sys/modules/ehci/ projects/jbuild/sys/modules/kue/ projects/jbuild/sys/modules/ohci/ projects/jbuild/sys/modules/rue/ projects/jbuild/sys/modules/rum/ projects/jbuild/sys/modules/slhci/ projects/jbuild/sys/modules/sound/driver/au88x0/ projects/jbuild/sys/modules/u3g/ projects/jbuild/sys/modules/uark/ projects/jbuild/sys/modules/ubsa/ projects/jbuild/sys/modules/ucom/ projects/jbuild/sys/modules/udav/ projects/jbuild/sys/modules/udbp/ projects/jbuild/sys/modules/ufm/ projects/jbuild/sys/modules/ufoma/ projects/jbuild/sys/modules/uftdi/ projects/jbuild/sys/modules/ugen/ projects/jbuild/sys/modules/uhci/ projects/jbuild/sys/modules/uhid/ projects/jbuild/sys/modules/uipaq/ projects/jbuild/sys/modules/ukbd/ projects/jbuild/sys/modules/ulpt/ projects/jbuild/sys/modules/umass/ projects/jbuild/sys/modules/umct/ projects/jbuild/sys/modules/umodem/ projects/jbuild/sys/modules/ums/ projects/jbuild/sys/modules/upgt/ projects/jbuild/sys/modules/uplcom/ projects/jbuild/sys/modules/ural/ projects/jbuild/sys/modules/urio/ projects/jbuild/sys/modules/usb2/ projects/jbuild/sys/modules/uscanner/ projects/jbuild/sys/modules/uslcom/ projects/jbuild/sys/modules/uvisor/ projects/jbuild/sys/modules/uvscom/ projects/jbuild/sys/modules/zyd/ projects/jbuild/sys/pccard/ projects/jbuild/sys/powerpc/booke/support.S Modified: projects/jbuild/sys/ (props changed) projects/jbuild/sys/Makefile projects/jbuild/sys/boot/Makefile projects/jbuild/sys/boot/Makefile.inc projects/jbuild/sys/boot/common/loader.8 projects/jbuild/sys/boot/common/module.c projects/jbuild/sys/boot/forth/loader.4th projects/jbuild/sys/boot/forth/loader.conf projects/jbuild/sys/boot/forth/pnp.4th projects/jbuild/sys/boot/forth/support.4th projects/jbuild/sys/boot/i386/btx/btx/btx.S projects/jbuild/sys/boot/i386/libi386/bootinfo64.c projects/jbuild/sys/boot/i386/loader/Makefile projects/jbuild/sys/boot/i386/pxeldr/pxeboot.8 projects/jbuild/sys/boot/ia64/common/Makefile projects/jbuild/sys/boot/ia64/efi/Makefile projects/jbuild/sys/boot/ia64/ski/Makefile projects/jbuild/sys/boot/pc98/loader/Makefile projects/jbuild/sys/boot/powerpc/ofw/Makefile projects/jbuild/sys/boot/sparc64/loader/Makefile projects/jbuild/sys/boot/sparc64/loader/main.c projects/jbuild/sys/bsm/audit.h projects/jbuild/sys/bsm/audit_internal.h projects/jbuild/sys/bsm/audit_kevents.h projects/jbuild/sys/bsm/audit_record.h projects/jbuild/sys/cam/cam_periph.c projects/jbuild/sys/cam/cam_xpt.c projects/jbuild/sys/cam/cam_xpt_sim.h projects/jbuild/sys/cam/scsi/scsi_all.c projects/jbuild/sys/cam/scsi/scsi_cd.c projects/jbuild/sys/cam/scsi/scsi_ch.c projects/jbuild/sys/cam/scsi/scsi_da.c projects/jbuild/sys/cam/scsi/scsi_low.c projects/jbuild/sys/cam/scsi/scsi_pass.c projects/jbuild/sys/cam/scsi/scsi_pt.c projects/jbuild/sys/cam/scsi/scsi_sa.c projects/jbuild/sys/cam/scsi/scsi_ses.c projects/jbuild/sys/cam/scsi/scsi_sg.c projects/jbuild/sys/cddl/compat/opensolaris/sys/sysmacros.h projects/jbuild/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c projects/jbuild/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c projects/jbuild/sys/compat/linprocfs/linprocfs.c projects/jbuild/sys/compat/linux/linux_file.c projects/jbuild/sys/compat/linux/linux_getcwd.c projects/jbuild/sys/compat/linux/linux_ioctl.c projects/jbuild/sys/compat/linux/linux_stats.c projects/jbuild/sys/compat/ndis/kern_ndis.c projects/jbuild/sys/compat/ndis/kern_windrv.c projects/jbuild/sys/compat/ndis/subr_hal.c projects/jbuild/sys/compat/ndis/subr_ndis.c projects/jbuild/sys/compat/ndis/subr_ntoskrnl.c projects/jbuild/sys/compat/ndis/subr_usbd.c projects/jbuild/sys/compat/ndis/winx32_wrap.S projects/jbuild/sys/compat/svr4/svr4_misc.c projects/jbuild/sys/compat/svr4/svr4_sockio.c projects/jbuild/sys/compat/svr4/svr4_types.h projects/jbuild/sys/conf/Makefile.arm projects/jbuild/sys/conf/NOTES projects/jbuild/sys/conf/files projects/jbuild/sys/conf/files.amd64 projects/jbuild/sys/conf/files.i386 projects/jbuild/sys/conf/files.ia64 projects/jbuild/sys/conf/files.mips projects/jbuild/sys/conf/files.pc98 projects/jbuild/sys/conf/files.powerpc projects/jbuild/sys/conf/files.sparc64 projects/jbuild/sys/conf/files.sun4v projects/jbuild/sys/conf/kern.mk projects/jbuild/sys/conf/kern.post.mk projects/jbuild/sys/conf/kern.pre.mk projects/jbuild/sys/conf/kmod.mk projects/jbuild/sys/conf/newvers.sh projects/jbuild/sys/conf/options projects/jbuild/sys/conf/options.amd64 projects/jbuild/sys/conf/options.i386 projects/jbuild/sys/conf/options.ia64 projects/jbuild/sys/conf/options.mips projects/jbuild/sys/conf/options.pc98 projects/jbuild/sys/contrib/altq/altq/altq_subr.c projects/jbuild/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c projects/jbuild/sys/contrib/pf/ (props changed) projects/jbuild/sys/contrib/pf/net/pf_if.c projects/jbuild/sys/contrib/pf/net/pf_ioctl.c projects/jbuild/sys/crypto/via/padlock.c projects/jbuild/sys/crypto/via/padlock_hash.c projects/jbuild/sys/fs/cd9660/cd9660_lookup.c projects/jbuild/sys/fs/cd9660/cd9660_node.c projects/jbuild/sys/fs/cd9660/cd9660_node.h projects/jbuild/sys/fs/cd9660/cd9660_rrip.c projects/jbuild/sys/fs/cd9660/cd9660_vfsops.c projects/jbuild/sys/fs/cd9660/cd9660_vnops.c projects/jbuild/sys/fs/coda/coda_vfsops.c projects/jbuild/sys/fs/coda/coda_vnops.c projects/jbuild/sys/fs/devfs/devfs_devs.c projects/jbuild/sys/fs/devfs/devfs_vnops.c projects/jbuild/sys/fs/fifofs/fifo_vnops.c projects/jbuild/sys/fs/hpfs/hpfs_vfsops.c projects/jbuild/sys/fs/msdosfs/denode.h projects/jbuild/sys/fs/msdosfs/msdosfs_conv.c projects/jbuild/sys/fs/msdosfs/msdosfs_vfsops.c projects/jbuild/sys/fs/msdosfs/msdosfs_vnops.c projects/jbuild/sys/fs/msdosfs/msdosfsmount.h projects/jbuild/sys/fs/nullfs/null_vnops.c projects/jbuild/sys/fs/nwfs/nwfs_subr.c projects/jbuild/sys/fs/nwfs/nwfs_vnops.c projects/jbuild/sys/fs/procfs/procfs.c projects/jbuild/sys/fs/pseudofs/pseudofs_vncache.c projects/jbuild/sys/fs/pseudofs/pseudofs_vnops.c projects/jbuild/sys/fs/smbfs/smbfs_vnops.c projects/jbuild/sys/fs/tmpfs/tmpfs.h projects/jbuild/sys/fs/tmpfs/tmpfs_subr.c projects/jbuild/sys/fs/tmpfs/tmpfs_vnops.c projects/jbuild/sys/fs/udf/ecma167-udf.h projects/jbuild/sys/fs/udf/udf.h projects/jbuild/sys/fs/udf/udf_vfsops.c projects/jbuild/sys/fs/udf/udf_vnops.c projects/jbuild/sys/geom/geom.h projects/jbuild/sys/geom/geom_dev.c projects/jbuild/sys/geom/geom_subr.c projects/jbuild/sys/geom/geom_vfs.c projects/jbuild/sys/geom/label/g_label_msdosfs.c projects/jbuild/sys/geom/part/g_part.c projects/jbuild/sys/geom/part/g_part.h projects/jbuild/sys/geom/part/g_part_apm.c projects/jbuild/sys/geom/part/g_part_bsd.c projects/jbuild/sys/geom/part/g_part_gpt.c projects/jbuild/sys/geom/part/g_part_if.m projects/jbuild/sys/geom/part/g_part_mbr.c projects/jbuild/sys/geom/part/g_part_pc98.c projects/jbuild/sys/geom/part/g_part_vtoc8.c projects/jbuild/sys/gnu/fs/ext2fs/ext2_bitops.h projects/jbuild/sys/gnu/fs/ext2fs/ext2_fs.h projects/jbuild/sys/gnu/fs/ext2fs/ext2_fs_sb.h projects/jbuild/sys/gnu/fs/ext2fs/ext2_inode.c projects/jbuild/sys/gnu/fs/ext2fs/ext2_linux_ialloc.c projects/jbuild/sys/gnu/fs/ext2fs/ext2_vfsops.c projects/jbuild/sys/gnu/fs/xfs/FreeBSD/xfs_compat.h projects/jbuild/sys/i386/acpica/acpi_wakeup.c projects/jbuild/sys/i386/conf/DEFAULTS projects/jbuild/sys/i386/conf/GENERIC projects/jbuild/sys/i386/conf/NOTES projects/jbuild/sys/i386/conf/XBOX projects/jbuild/sys/i386/cpufreq/est.c projects/jbuild/sys/i386/cpufreq/smist.c projects/jbuild/sys/i386/i386/busdma_machdep.c projects/jbuild/sys/i386/i386/i686_mem.c projects/jbuild/sys/i386/i386/identcpu.c projects/jbuild/sys/i386/i386/initcpu.c projects/jbuild/sys/i386/i386/io_apic.c projects/jbuild/sys/i386/i386/local_apic.c projects/jbuild/sys/i386/i386/locore.s projects/jbuild/sys/i386/i386/mp_machdep.c projects/jbuild/sys/i386/i386/msi.c projects/jbuild/sys/i386/i386/pmap.c projects/jbuild/sys/i386/i386/swtch.s projects/jbuild/sys/i386/i386/vm86.c projects/jbuild/sys/i386/i386/vm_machdep.c projects/jbuild/sys/i386/ibcs2/ibcs2_misc.c projects/jbuild/sys/i386/ibcs2/ibcs2_sysi86.c projects/jbuild/sys/i386/include/apicvar.h projects/jbuild/sys/i386/include/cpufunc.h projects/jbuild/sys/i386/include/intr_machdep.h projects/jbuild/sys/i386/isa/npx.c projects/jbuild/sys/i386/linux/linux_locore.s projects/jbuild/sys/i386/linux/linux_machdep.c projects/jbuild/sys/i386/svr4/svr4_locore.s projects/jbuild/sys/i386/xen/clock.c projects/jbuild/sys/i386/xen/mp_machdep.c projects/jbuild/sys/i386/xen/pmap.c projects/jbuild/sys/i386/xen/xen_machdep.c projects/jbuild/sys/ia64/conf/GENERIC projects/jbuild/sys/ia64/conf/NOTES projects/jbuild/sys/ia64/ia64/busdma_machdep.c projects/jbuild/sys/ia64/ia64/mca.c projects/jbuild/sys/ia64/ia64/mp_machdep.c projects/jbuild/sys/ia64/ia64/pmap.c projects/jbuild/sys/ia64/include/mca.h projects/jbuild/sys/kern/imgact_elf.c projects/jbuild/sys/kern/kern_clock.c projects/jbuild/sys/kern/kern_condvar.c projects/jbuild/sys/kern/kern_cons.c projects/jbuild/sys/kern/kern_descrip.c projects/jbuild/sys/kern/kern_exec.c projects/jbuild/sys/kern/kern_exit.c projects/jbuild/sys/kern/kern_jail.c projects/jbuild/sys/kern/kern_linker.c projects/jbuild/sys/kern/kern_lock.c projects/jbuild/sys/kern/kern_malloc.c projects/jbuild/sys/kern/kern_mbuf.c projects/jbuild/sys/kern/kern_mib.c projects/jbuild/sys/kern/kern_osd.c projects/jbuild/sys/kern/kern_poll.c projects/jbuild/sys/kern/kern_priv.c projects/jbuild/sys/kern/kern_proc.c projects/jbuild/sys/kern/kern_rwlock.c projects/jbuild/sys/kern/kern_sig.c projects/jbuild/sys/kern/kern_synch.c projects/jbuild/sys/kern/kern_sysctl.c projects/jbuild/sys/kern/kern_thr.c projects/jbuild/sys/kern/kern_time.c projects/jbuild/sys/kern/kern_timeout.c projects/jbuild/sys/kern/kern_uuid.c projects/jbuild/sys/kern/link_elf.c projects/jbuild/sys/kern/link_elf_obj.c projects/jbuild/sys/kern/sched_4bsd.c projects/jbuild/sys/kern/sched_ule.c projects/jbuild/sys/kern/subr_autoconf.c projects/jbuild/sys/kern/subr_bus.c projects/jbuild/sys/kern/subr_clist.c projects/jbuild/sys/kern/subr_devstat.c projects/jbuild/sys/kern/subr_disk.c projects/jbuild/sys/kern/subr_firmware.c projects/jbuild/sys/kern/subr_kobj.c projects/jbuild/sys/kern/subr_param.c projects/jbuild/sys/kern/subr_pcpu.c projects/jbuild/sys/kern/subr_prf.c projects/jbuild/sys/kern/subr_prof.c projects/jbuild/sys/kern/subr_rman.c projects/jbuild/sys/kern/subr_rtc.c projects/jbuild/sys/kern/subr_smp.c projects/jbuild/sys/kern/subr_taskqueue.c projects/jbuild/sys/kern/subr_witness.c projects/jbuild/sys/kern/sys_generic.c projects/jbuild/sys/kern/sysv_sem.c projects/jbuild/sys/kern/tty.c projects/jbuild/sys/kern/tty_info.c projects/jbuild/sys/kern/tty_inq.c projects/jbuild/sys/kern/tty_outq.c projects/jbuild/sys/kern/tty_pts.c projects/jbuild/sys/kern/tty_pty.c projects/jbuild/sys/kern/tty_ttydisc.c projects/jbuild/sys/kern/uipc_cow.c projects/jbuild/sys/kern/uipc_debug.c projects/jbuild/sys/kern/uipc_domain.c projects/jbuild/sys/kern/uipc_mbuf.c projects/jbuild/sys/kern/uipc_socket.c projects/jbuild/sys/kern/uipc_usrreq.c projects/jbuild/sys/kern/vfs_aio.c projects/jbuild/sys/kern/vfs_bio.c projects/jbuild/sys/kern/vfs_cache.c projects/jbuild/sys/kern/vfs_extattr.c projects/jbuild/sys/kern/vfs_init.c projects/jbuild/sys/kern/vfs_mount.c projects/jbuild/sys/kern/vfs_subr.c projects/jbuild/sys/kern/vfs_syscalls.c projects/jbuild/sys/kern/vfs_vnops.c projects/jbuild/sys/kern/vnode_if.src projects/jbuild/sys/libkern/crc32.c projects/jbuild/sys/libkern/strtouq.c projects/jbuild/sys/mips/idt/idtpci.c projects/jbuild/sys/mips/include/fpu.h projects/jbuild/sys/mips/include/frame.h projects/jbuild/sys/mips/include/pmap.h projects/jbuild/sys/mips/malta/gt_pci.c projects/jbuild/sys/mips/mips/busdma_machdep.c projects/jbuild/sys/mips/mips/cpu.c projects/jbuild/sys/mips/mips/in_cksum.c projects/jbuild/sys/mips/mips/machdep.c projects/jbuild/sys/mips/mips/nexus.c projects/jbuild/sys/mips/mips/pmap.c projects/jbuild/sys/modules/Makefile projects/jbuild/sys/modules/acpi/acpi/Makefile projects/jbuild/sys/modules/agp/Makefile projects/jbuild/sys/modules/ata/atausb/Makefile projects/jbuild/sys/modules/dtrace/dtrace/Makefile projects/jbuild/sys/modules/geom/geom_part/Makefile projects/jbuild/sys/modules/iwnfw/Makefile projects/jbuild/sys/modules/libalias/libalias/Makefile projects/jbuild/sys/modules/linux/Makefile projects/jbuild/sys/modules/netgraph/bluetooth/ubt/Makefile projects/jbuild/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile projects/jbuild/sys/modules/sound/driver/Makefile projects/jbuild/sys/modules/sound/driver/uaudio/Makefile projects/jbuild/sys/modules/svr4/Makefile projects/jbuild/sys/net/bridgestp.c projects/jbuild/sys/net/if.c projects/jbuild/sys/net/if.h projects/jbuild/sys/net/if_bridge.c projects/jbuild/sys/net/if_ef.c projects/jbuild/sys/net/if_ethersubr.c projects/jbuild/sys/net/if_llatbl.c projects/jbuild/sys/net/if_loop.c projects/jbuild/sys/net/if_mib.c projects/jbuild/sys/net/if_spppsubr.c projects/jbuild/sys/net/if_vlan.c projects/jbuild/sys/net/raw_cb.c projects/jbuild/sys/net/raw_usrreq.c projects/jbuild/sys/net/route.c projects/jbuild/sys/net/route.h projects/jbuild/sys/net/rtsock.c projects/jbuild/sys/net/vnet.h projects/jbuild/sys/net80211/_ieee80211.h projects/jbuild/sys/net80211/ieee80211.c projects/jbuild/sys/net80211/ieee80211.h projects/jbuild/sys/net80211/ieee80211_adhoc.c projects/jbuild/sys/net80211/ieee80211_crypto.h projects/jbuild/sys/net80211/ieee80211_ddb.c projects/jbuild/sys/net80211/ieee80211_freebsd.c projects/jbuild/sys/net80211/ieee80211_freebsd.h projects/jbuild/sys/net80211/ieee80211_hostap.c projects/jbuild/sys/net80211/ieee80211_ht.h projects/jbuild/sys/net80211/ieee80211_input.c projects/jbuild/sys/net80211/ieee80211_input.h projects/jbuild/sys/net80211/ieee80211_ioctl.c projects/jbuild/sys/net80211/ieee80211_ioctl.h projects/jbuild/sys/net80211/ieee80211_node.c projects/jbuild/sys/net80211/ieee80211_node.h projects/jbuild/sys/net80211/ieee80211_output.c projects/jbuild/sys/net80211/ieee80211_phy.c projects/jbuild/sys/net80211/ieee80211_proto.c projects/jbuild/sys/net80211/ieee80211_proto.h projects/jbuild/sys/net80211/ieee80211_regdomain.c projects/jbuild/sys/net80211/ieee80211_regdomain.h projects/jbuild/sys/net80211/ieee80211_scan.c projects/jbuild/sys/net80211/ieee80211_scan.h projects/jbuild/sys/net80211/ieee80211_scan_sta.c projects/jbuild/sys/net80211/ieee80211_var.h projects/jbuild/sys/net80211/ieee80211_wds.c projects/jbuild/sys/netatalk/ddp_usrreq.c projects/jbuild/sys/netgraph/atm/ng_atm.c projects/jbuild/sys/netgraph/atm/uni/ng_uni_cust.h projects/jbuild/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c projects/jbuild/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c projects/jbuild/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c projects/jbuild/sys/netgraph/ng_deflate.c projects/jbuild/sys/netgraph/ng_ether.c projects/jbuild/sys/netgraph/ng_gif.c projects/jbuild/sys/netgraph/ng_iface.c projects/jbuild/sys/netgraph/ng_iface.h projects/jbuild/sys/netgraph/ng_l2tp.c projects/jbuild/sys/netgraph/ng_mppc.c projects/jbuild/sys/netgraph/ng_ppp.c projects/jbuild/sys/netgraph/ng_pred1.c projects/jbuild/sys/netgraph/ng_vjc.c projects/jbuild/sys/netinet/if_ether.c projects/jbuild/sys/netinet/if_ether.h projects/jbuild/sys/netinet/igmp.c projects/jbuild/sys/netinet/in.c projects/jbuild/sys/netinet/in.h projects/jbuild/sys/netinet/in_mcast.c projects/jbuild/sys/netinet/in_pcb.c projects/jbuild/sys/netinet/in_pcb.h projects/jbuild/sys/netinet/in_proto.c projects/jbuild/sys/netinet/in_rmx.c projects/jbuild/sys/netinet/in_systm.h projects/jbuild/sys/netinet/ip.h projects/jbuild/sys/netinet/ip_divert.c projects/jbuild/sys/netinet/ip_dummynet.c projects/jbuild/sys/netinet/ip_fw.h projects/jbuild/sys/netinet/ip_fw2.c projects/jbuild/sys/netinet/ip_fw_nat.c projects/jbuild/sys/netinet/ip_fw_pfil.c projects/jbuild/sys/netinet/ip_icmp.c projects/jbuild/sys/netinet/ip_icmp.h projects/jbuild/sys/netinet/ip_input.c projects/jbuild/sys/netinet/ip_ipsec.c projects/jbuild/sys/netinet/ip_options.c projects/jbuild/sys/netinet/ip_output.c projects/jbuild/sys/netinet/libalias/alias.c projects/jbuild/sys/netinet/libalias/alias_db.c projects/jbuild/sys/netinet/libalias/alias_ftp.c projects/jbuild/sys/netinet/libalias/alias_irc.c projects/jbuild/sys/netinet/libalias/alias_local.h projects/jbuild/sys/netinet/libalias/alias_nbt.c projects/jbuild/sys/netinet/raw_ip.c projects/jbuild/sys/netinet/sctp_auth.c projects/jbuild/sys/netinet/sctp_constants.h projects/jbuild/sys/netinet/sctp_crc32.c projects/jbuild/sys/netinet/sctp_crc32.h projects/jbuild/sys/netinet/sctp_header.h projects/jbuild/sys/netinet/sctp_input.c projects/jbuild/sys/netinet/sctp_os_bsd.h projects/jbuild/sys/netinet/sctp_output.c projects/jbuild/sys/netinet/sctp_output.h projects/jbuild/sys/netinet/sctp_pcb.c projects/jbuild/sys/netinet/sctp_pcb.h projects/jbuild/sys/netinet/sctp_structs.h projects/jbuild/sys/netinet/sctp_sysctl.c projects/jbuild/sys/netinet/sctp_uio.h projects/jbuild/sys/netinet/sctp_usrreq.c projects/jbuild/sys/netinet/sctputil.c projects/jbuild/sys/netinet/sctputil.h projects/jbuild/sys/netinet/tcp_debug.h projects/jbuild/sys/netinet/tcp_input.c projects/jbuild/sys/netinet/tcp_subr.c projects/jbuild/sys/netinet/tcp_syncache.c projects/jbuild/sys/netinet/tcp_timer.c projects/jbuild/sys/netinet/tcp_usrreq.c projects/jbuild/sys/netinet/tcp_var.h projects/jbuild/sys/netinet/udp_usrreq.c projects/jbuild/sys/netinet/udp_var.h projects/jbuild/sys/netinet/vinet.h projects/jbuild/sys/netinet6/frag6.c projects/jbuild/sys/netinet6/icmp6.c projects/jbuild/sys/netinet6/in6.c projects/jbuild/sys/netinet6/in6_gif.c projects/jbuild/sys/netinet6/in6_ifattach.c projects/jbuild/sys/netinet6/in6_pcb.c projects/jbuild/sys/netinet6/in6_proto.c projects/jbuild/sys/netinet6/in6_rmx.c projects/jbuild/sys/netinet6/in6_src.c projects/jbuild/sys/netinet6/ip6_forward.c projects/jbuild/sys/netinet6/ip6_input.c projects/jbuild/sys/netinet6/ip6_ipsec.c projects/jbuild/sys/netinet6/ip6_mroute.c projects/jbuild/sys/netinet6/ip6_output.c projects/jbuild/sys/netinet6/ip6_var.h projects/jbuild/sys/netinet6/ip6protosw.h projects/jbuild/sys/netinet6/nd6.c projects/jbuild/sys/netinet6/nd6_nbr.c projects/jbuild/sys/netinet6/nd6_rtr.c projects/jbuild/sys/netinet6/raw_ip6.c projects/jbuild/sys/netinet6/scope6.c projects/jbuild/sys/netinet6/sctp6_usrreq.c projects/jbuild/sys/netinet6/udp6_usrreq.c projects/jbuild/sys/netinet6/vinet6.h projects/jbuild/sys/netipsec/ipsec.c projects/jbuild/sys/netipsec/ipsec.h projects/jbuild/sys/netipsec/ipsec6.h projects/jbuild/sys/netipsec/ipsec_mbuf.c projects/jbuild/sys/netipsec/ipsec_output.c projects/jbuild/sys/netipsec/key.c projects/jbuild/sys/netipsec/key_debug.c projects/jbuild/sys/netipsec/keysock.c projects/jbuild/sys/netipsec/xform_ipip.c projects/jbuild/sys/nfs4client/nfs4_subs.c projects/jbuild/sys/nfsclient/bootp_subr.c projects/jbuild/sys/nfsclient/nfs_diskless.c projects/jbuild/sys/nfsclient/nfs_vfsops.c projects/jbuild/sys/nfsclient/nfs_vnops.c projects/jbuild/sys/nfsclient/nfsnode.h projects/jbuild/sys/nfsserver/nfs_serv.c projects/jbuild/sys/nfsserver/nfs_srvsubs.c projects/jbuild/sys/nfsserver/nfs_syscalls.c projects/jbuild/sys/opencrypto/cryptosoft.c projects/jbuild/sys/pc98/cbus/scterm-sck.c projects/jbuild/sys/pc98/conf/GENERIC projects/jbuild/sys/pc98/conf/NOTES projects/jbuild/sys/pci/if_rl.c projects/jbuild/sys/pci/if_rlreg.h projects/jbuild/sys/powerpc/aim/machdep.c projects/jbuild/sys/powerpc/aim/swtch.S projects/jbuild/sys/powerpc/aim/trap.c projects/jbuild/sys/powerpc/aim/trap_subr.S projects/jbuild/sys/powerpc/booke/locore.S projects/jbuild/sys/powerpc/booke/machdep.c projects/jbuild/sys/powerpc/booke/pmap.c projects/jbuild/sys/powerpc/booke/swtch.S projects/jbuild/sys/powerpc/booke/trap.c projects/jbuild/sys/powerpc/booke/trap_subr.S projects/jbuild/sys/powerpc/conf/GENERIC projects/jbuild/sys/powerpc/conf/MPC85XX projects/jbuild/sys/powerpc/conf/NOTES projects/jbuild/sys/powerpc/include/frame.h projects/jbuild/sys/powerpc/include/pcb.h projects/jbuild/sys/powerpc/include/pcpu.h projects/jbuild/sys/powerpc/include/pmap.h projects/jbuild/sys/powerpc/include/pte.h projects/jbuild/sys/powerpc/include/tlb.h projects/jbuild/sys/powerpc/powermac/ata_macio.c projects/jbuild/sys/powerpc/powermac/grackle.c projects/jbuild/sys/powerpc/powermac/gracklevar.h projects/jbuild/sys/powerpc/powermac/macgpio.c projects/jbuild/sys/powerpc/powermac/macio.c projects/jbuild/sys/powerpc/powermac/uninorth.c projects/jbuild/sys/powerpc/powermac/uninorthvar.h projects/jbuild/sys/powerpc/powerpc/genassym.c projects/jbuild/sys/powerpc/powerpc/intr_machdep.c projects/jbuild/sys/rpc/clnt_rc.c projects/jbuild/sys/security/audit/audit.h projects/jbuild/sys/security/audit/audit_bsm.c projects/jbuild/sys/security/audit/audit_bsm_klib.c projects/jbuild/sys/security/audit/audit_bsm_token.c projects/jbuild/sys/security/audit/audit_pipe.c projects/jbuild/sys/security/audit/audit_private.h projects/jbuild/sys/security/mac/mac_audit.c projects/jbuild/sys/security/mac/mac_framework.c projects/jbuild/sys/security/mac/mac_inet6.c projects/jbuild/sys/security/mac/mac_internal.h projects/jbuild/sys/security/mac/mac_policy.h projects/jbuild/sys/security/mac/mac_priv.c projects/jbuild/sys/security/mac/mac_process.c projects/jbuild/sys/security/mac_biba/mac_biba.c projects/jbuild/sys/security/mac_bsdextended/mac_bsdextended.c projects/jbuild/sys/security/mac_ifoff/mac_ifoff.c projects/jbuild/sys/security/mac_lomac/mac_lomac.c projects/jbuild/sys/security/mac_mls/mac_mls.c projects/jbuild/sys/security/mac_none/mac_none.c projects/jbuild/sys/security/mac_partition/mac_partition.c projects/jbuild/sys/security/mac_portacl/mac_portacl.c projects/jbuild/sys/security/mac_seeotheruids/mac_seeotheruids.c projects/jbuild/sys/security/mac_stub/mac_stub.c projects/jbuild/sys/security/mac_test/mac_test.c projects/jbuild/sys/sparc64/conf/GENERIC projects/jbuild/sys/sparc64/include/bus_private.h projects/jbuild/sys/sparc64/include/tlb.h projects/jbuild/sys/sparc64/include/vmparam.h projects/jbuild/sys/sparc64/sparc64/iommu.c projects/jbuild/sys/sparc64/sparc64/machdep.c projects/jbuild/sys/sparc64/sparc64/pmap.c projects/jbuild/sys/sun4v/conf/GENERIC projects/jbuild/sys/sun4v/include/pcpu.h projects/jbuild/sys/sun4v/include/vmparam.h projects/jbuild/sys/ufs/ffs/ffs_alloc.c projects/jbuild/sys/ufs/ffs/ffs_balloc.c projects/jbuild/sys/ufs/ffs/ffs_extern.h projects/jbuild/sys/ufs/ffs/ffs_inode.c projects/jbuild/sys/ufs/ffs/ffs_vfsops.c projects/jbuild/sys/ufs/ffs/ffs_vnops.c projects/jbuild/sys/ufs/ufs/ufs_dirhash.c projects/jbuild/sys/ufs/ufs/ufs_extattr.c projects/jbuild/sys/ufs/ufs/ufs_lookup.c projects/jbuild/sys/ufs/ufs/ufs_vnops.c projects/jbuild/sys/vm/swap_pager.c projects/jbuild/sys/vm/uma.h projects/jbuild/sys/vm/uma_core.c projects/jbuild/sys/vm/uma_dbg.c projects/jbuild/sys/vm/uma_int.h projects/jbuild/sys/vm/vm_fault.c projects/jbuild/sys/vm/vm_kern.c projects/jbuild/sys/vm/vm_map.c projects/jbuild/sys/vm/vm_map.h projects/jbuild/sys/vm/vm_meter.c projects/jbuild/sys/vm/vm_mmap.c projects/jbuild/sys/vm/vm_object.c projects/jbuild/sys/vm/vm_object.h projects/jbuild/sys/vm/vm_page.c projects/jbuild/sys/vm/vm_page.h projects/jbuild/sys/vm/vm_pager.c projects/jbuild/sys/vm/vnode_pager.c projects/jbuild/sys/vm/vnode_pager.h projects/jbuild/sys/xdr/xdr_mem.c Modified: projects/jbuild/sys/Makefile ============================================================================== --- projects/jbuild/sys/Makefile Sat Feb 28 17:59:41 2009 (r189190) +++ projects/jbuild/sys/Makefile Sat Feb 28 18:00:53 2009 (r189191) @@ -12,7 +12,7 @@ CSCOPEDIRS= boot bsm cam cddl compat con geom gnu isa kern libkern modules net net80211 netatalk \ netgraph netinet netinet6 netipsec netipx netnatm netncp \ netsmb nfs nfs4client nfsclient nfsserver nlm opencrypto \ - pccard pci rpc security sys ufs vm xdr ${CSCOPE_ARCHDIR} + pci rpc security sys ufs vm xdr ${CSCOPE_ARCHDIR} .if defined(ALL_ARCH) CSCOPE_ARCHDIR ?= amd64 arm i386 ia64 mips pc98 powerpc sparc64 sun4v .else Modified: projects/jbuild/sys/boot/Makefile ============================================================================== --- projects/jbuild/sys/boot/Makefile Sat Feb 28 17:59:41 2009 (r189190) +++ projects/jbuild/sys/boot/Makefile Sat Feb 28 18:00:53 2009 (r189191) @@ -2,10 +2,6 @@ .include <bsd.own.mk> -.if ${MACHINE_ARCH} == "mips" -MK_FORTH=no # not yet -.endif - .if ${MK_FORTH} != "no" # Build the add-in FORTH interpreter. SUBDIR+= ficl Modified: projects/jbuild/sys/boot/Makefile.inc ============================================================================== --- projects/jbuild/sys/boot/Makefile.inc Sat Feb 28 17:59:41 2009 (r189190) +++ projects/jbuild/sys/boot/Makefile.inc Sat Feb 28 18:00:53 2009 (r189191) @@ -1,3 +1,3 @@ # $FreeBSD$ -WITHOUT_SSP= +SSP_CFLAGS= Modified: projects/jbuild/sys/boot/common/loader.8 ============================================================================== --- projects/jbuild/sys/boot/common/loader.8 Sat Feb 28 17:59:41 2009 (r189190) +++ projects/jbuild/sys/boot/common/loader.8 Sat Feb 28 18:00:53 2009 (r189191) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd November 8, 2007 +.Dd February 15, 2009 .Dt LOADER 8 .Os .Sh NAME @@ -215,6 +215,17 @@ Any arguments passed after the name of t will be passed as arguments to that file. Currently, argument passing does not work for the kernel. .Pp +.It Ic load_geli Xo +.Op Fl n Ar keyno +.Ar prov Ar file +.Xc +Loads a +.Xr geli 8 +encryption keyfile for the given provider name. +The key index can be specified via +.Ar keyno +or will default to zero. +.Pp .It Ic ls Xo .Op Fl l .Op Ar path Modified: projects/jbuild/sys/boot/common/module.c ============================================================================== --- projects/jbuild/sys/boot/common/module.c Sat Feb 28 17:59:41 2009 (r189190) +++ projects/jbuild/sys/boot/common/module.c Sat Feb 28 18:00:53 2009 (r189191) @@ -154,6 +154,44 @@ command_load(int argc, char *argv[]) return (error == 0 ? CMD_OK : CMD_ERROR); } +COMMAND_SET(load_geli, "load_geli", "load a geli key", command_load_geli); + +static int +command_load_geli(int argc, char *argv[]) +{ + char typestr[80]; + char *cp; + int ch, num; + + if (argc < 3) { + command_errmsg = "usage is [-n key#] <prov> <file>"; + return(CMD_ERROR); + } + + num = 0; + optind = 1; + optreset = 1; + while ((ch = getopt(argc, argv, "n:")) != -1) { + switch(ch) { + case 'n': + num = strtol(optarg, &cp, 0); + if (cp == optarg) { + sprintf(command_errbuf, "bad key index '%s'", optarg); + return(CMD_ERROR); + } + break; + case '?': + default: + /* getopt has already reported an error */ + return(CMD_OK); + } + } + argv += (optind - 1); + argc -= (optind - 1); + sprintf(typestr, "%s:geli_keyfile%d", argv[1], num); + return(file_loadraw(typestr, argv[2])); +} + COMMAND_SET(unload, "unload", "unload all modules", command_unload); static int Modified: projects/jbuild/sys/boot/forth/loader.4th ============================================================================== --- projects/jbuild/sys/boot/forth/loader.4th Sat Feb 28 17:59:41 2009 (r189190) +++ projects/jbuild/sys/boot/forth/loader.4th Sat Feb 28 18:00:53 2009 (r189191) @@ -93,6 +93,7 @@ only forth definitions also support-func \ \ If a password was defined, execute autoboot and ask for \ password if autoboot returns. +\ Do not exit unless the right password is given. : check-password password .addr @ if @@ -150,8 +151,7 @@ only forth definitions also support-func \ line, if interpreted, or given on the stack, if compiled in. : (read-conf) ( addr len -- ) - conf_files .addr @ ?dup if free abort" Fatal error freeing memory" then - strdup conf_files .len ! conf_files .addr ! + conf_files string= include_conf_files \ Will recurse on new loader_conf_files definitions ; @@ -165,110 +165,26 @@ only forth definitions also support-func then ; immediate -\ ***** enable-module -\ -\ Turn a module loading on. +\ show, enable, disable, toggle module loading. They all take module from +\ the next word -: enable-module ( <module> -- ) - bl parse module_options @ >r - begin - r@ - while - 2dup - r@ module.name dup .addr @ swap .len @ - compare 0= if - 2drop - r@ module.name dup .addr @ swap .len @ type - true r> module.flag ! - ." will be loaded." cr - exit - then - r> module.next @ >r - repeat - r> drop - type ." wasn't found." cr +: set-module-flag ( module_addr val -- ) \ set and print flag + over module.flag ! + dup module.name strtype + module.flag @ if ." will be loaded" else ." will not be loaded" then cr ; -\ ***** disable-module -\ -\ Turn a module loading off. - -: disable-module ( <module> -- ) - bl parse module_options @ >r - begin - r@ - while - 2dup - r@ module.name dup .addr @ swap .len @ - compare 0= if - 2drop - r@ module.name dup .addr @ swap .len @ type - false r> module.flag ! - ." will not be loaded." cr - exit - then - r> module.next @ >r - repeat - r> drop - type ." wasn't found." cr -; +: enable-module find-module ?dup if true set-module-flag then ; -\ ***** toggle-module -\ -\ Turn a module loading on/off. +: disable-module find-module ?dup if false set-module-flag then ; -: toggle-module ( <module> -- ) - bl parse module_options @ >r - begin - r@ - while - 2dup - r@ module.name dup .addr @ swap .len @ - compare 0= if - 2drop - r@ module.name dup .addr @ swap .len @ type - r@ module.flag @ 0= dup r> module.flag ! - if - ." will be loaded." cr - else - ." will not be loaded." cr - then - exit - then - r> module.next @ >r - repeat - r> drop - type ." wasn't found." cr -; +: toggle-module find-module ?dup if dup module.flag @ 0= set-module-flag then ; \ ***** show-module \ \ Show loading information about a module. -: show-module ( <module> -- ) - bl parse module_options @ >r - begin - r@ - while - 2dup - r@ module.name dup .addr @ swap .len @ - compare 0= if - 2drop - ." Name: " r@ module.name dup .addr @ swap .len @ type cr - ." Path: " r@ module.loadname dup .addr @ swap .len @ type cr - ." Type: " r@ module.type dup .addr @ swap .len @ type cr - ." Flags: " r@ module.args dup .addr @ swap .len @ type cr - ." Before load: " r@ module.beforeload dup .addr @ swap .len @ type cr - ." After load: " r@ module.afterload dup .addr @ swap .len @ type cr - ." Error: " r@ module.loaderror dup .addr @ swap .len @ type cr - ." Status: " r> module.flag @ if ." Load" else ." Don't load" then cr - exit - then - r> module.next @ >r - repeat - r> drop - type ." wasn't found." cr -; +: show-module ( <module> -- ) find-module ?dup if show-one-module then ; \ Words to be used inside configuration files Modified: projects/jbuild/sys/boot/forth/loader.conf ============================================================================== --- projects/jbuild/sys/boot/forth/loader.conf Sat Feb 28 17:59:41 2009 (r189190) +++ projects/jbuild/sys/boot/forth/loader.conf Sat Feb 28 18:00:53 2009 (r189191) @@ -278,6 +278,7 @@ if_vge_load="NO" # VIA VT6122 PCI Gigab if_udav_load="NO" # Davicom DM9601 USB Ethernet if_upgt_load="NO" # Conexant/Intersil PrismGT USB wireless if_ural_load="NO" # Ralink Technology USB wireless +if_urtw_load="NO" # Realtek 8187L USB wireless if_vr_load="NO" # VIA Rhine I and Rhine II if_vx_load="NO" # 3Com 3C590 family if_wb_load="NO" # Winbond W89C840F Modified: projects/jbuild/sys/boot/forth/pnp.4th ============================================================================== --- projects/jbuild/sys/boot/forth/pnp.4th Sat Feb 28 17:59:41 2009 (r189190) +++ projects/jbuild/sys/boot/forth/pnp.4th Sat Feb 28 18:00:53 2009 (r189191) @@ -24,6 +24,39 @@ \ \ $FreeBSD$ + +\ The following pnp code is used in pnp.4th and pnp.c +structure: STAILQ_HEAD + ptr stqh_first \ type* + ptr stqh_last \ type** +;structure + +structure: STAILQ_ENTRY + ptr stqe_next \ type* +;structure + +structure: pnphandler + ptr pnph.name + ptr pnph.enumerate +;structure + +structure: pnpident + ptr pnpid.ident \ char* + sizeof STAILQ_ENTRY cells member: pnpid.link \ pnpident +;structure + +structure: pnpinfo \ sync with sys/boot/config/bootstrap.h + ptr pnpi.desc + int pnpi.revision + ptr pnpi.module \ (char*) module args + int pnpi.argc + ptr pnpi.argv + ptr pnpi.handler \ pnphandler + sizeof STAILQ_HEAD member: pnpi.ident \ pnpident + sizeof STAILQ_ENTRY member: pnpi.link \ pnpinfo +;structure +\ end of pnp support + pnpdevices drop : enumerate Modified: projects/jbuild/sys/boot/forth/support.4th ============================================================================== --- projects/jbuild/sys/boot/forth/support.4th Sat Feb 28 17:59:41 2009 (r189190) +++ projects/jbuild/sys/boot/forth/support.4th Sat Feb 28 18:00:53 2009 (r189191) @@ -26,7 +26,6 @@ \ Loader.rc support functions: \ -\ initialize_support ( -- ) initialize global variables \ initialize ( addr len -- ) as above, plus load_conf_files \ load_conf ( addr len -- ) load conf file given \ include_conf_files ( -- ) load all conf files in load_conf_files @@ -61,24 +60,23 @@ \ value any_conf_read? indicates if a conf file was succesfully read \ \ Other exported words: -\ +\ note, strlen is internal \ strdup ( addr len -- addr' len) similar to strdup(3) \ strcat ( addr len addr' len' -- addr len+len' ) similar to strcat(3) -\ strlen ( addr -- len ) similar to strlen(3) \ s' ( | string' -- addr len | ) similar to s" \ rudimentary structure support \ Exception values -1 constant syntax_error -2 constant out_of_memory -3 constant free_error -4 constant set_error -5 constant read_error -6 constant open_error -7 constant exec_error -8 constant before_load_error -9 constant after_load_error +1 constant ESYNTAX +2 constant ENOMEM +3 constant EFREE +4 constant ESETERROR \ error setting environment variable +5 constant EREAD \ error reading +6 constant EOPEN +7 constant EEXEC \ XXX never catched +8 constant EBEFORELOAD +9 constant EAFTERLOAD \ I/O constants @@ -132,7 +130,8 @@ structure: module ptr module.next ;structure -\ Internal loader structures +\ Internal loader structures (preloaded_file, kernel_module, file_metadata) +\ must be in sync with the C struct in sys/boot/common/bootstrap.h structure: preloaded_file ptr pf.name ptr pf.type @@ -159,51 +158,7 @@ structure: file_metadata 0 member: md.data \ variable size ;structure -structure: config_resource - ptr cf.name - int cf.type -0 constant RES_INT -1 constant RES_STRING -2 constant RES_LONG - 2 cells member: u -;structure - -structure: config_device - ptr cd.name - int cd.unit - int cd.resource_count - ptr cd.resources \ config_resource -;structure - -structure: STAILQ_HEAD - ptr stqh_first \ type* - ptr stqh_last \ type** -;structure - -structure: STAILQ_ENTRY - ptr stqe_next \ type* -;structure - -structure: pnphandler - ptr pnph.name - ptr pnph.enumerate -;structure - -structure: pnpident - ptr pnpid.ident \ char* - sizeof STAILQ_ENTRY cells member: pnpid.link \ pnpident -;structure - -structure: pnpinfo - ptr pnpi.desc - int pnpi.revision - ptr pnpi.module \ (char*) module args - int pnpi.argc - ptr pnpi.argv - ptr pnpi.handler \ pnphandler - sizeof STAILQ_HEAD member: pnpi.ident \ pnpident - sizeof STAILQ_ENTRY member: pnpi.link \ pnpinfo -;structure +\ end of structures \ Global variables @@ -216,11 +171,9 @@ create last_module_option sizeof module. 0 value nextboot? \ Support string functions - -: strdup ( addr len -- addr' len ) - >r r@ allocate if out_of_memory throw then - tuck r@ move - r> +: strdup { addr len -- addr' len' } + len allocate if ENOMEM throw then + addr over len move len ; : strcat { addr len addr' len' -- addr len+len' } @@ -228,29 +181,27 @@ create last_module_option sizeof module. addr len len' + ; -: strlen ( addr -- len ) - 0 >r +: strchr { addr len c -- addr' len' } begin - dup c@ while - 1+ r> 1+ >r repeat - drop r> + len + while + addr c@ c = if addr len exit then + addr 1 + to addr + len 1 - to len + repeat + 0 0 ; -: s' +: s' \ same as s", allows " in the string [char] ' parse - state @ if - postpone sliteral - then + state @ if postpone sliteral then ; immediate : 2>r postpone >r postpone >r ; immediate : 2r> postpone r> postpone r> ; immediate : 2r@ postpone 2r> postpone 2dup postpone 2>r ; immediate -: getenv? - getenv - -1 = if false else drop true then -; +: getenv? getenv -1 = if false else drop true then ; \ Private definitions @@ -271,27 +222,27 @@ only forth also support-functions defini \ Standard suffixes -: load_module_suffix s" _load" ; -: module_loadname_suffix s" _name" ; -: module_type_suffix s" _type" ; -: module_args_suffix s" _flags" ; -: module_beforeload_suffix s" _before" ; -: module_afterload_suffix s" _after" ; -: module_loaderror_suffix s" _error" ; +: load_module_suffix s" _load" ; +: module_loadname_suffix s" _name" ; +: module_type_suffix s" _type" ; +: module_args_suffix s" _flags" ; +: module_beforeload_suffix s" _before" ; +: module_afterload_suffix s" _after" ; +: module_loaderror_suffix s" _error" ; \ Support operators : >= < 0= ; : <= > 0= ; -\ Assorted support funcitons +\ Assorted support functions -: free-memory free if free_error throw then ; +: free-memory free if EFREE throw then ; : strget { var -- addr len } var .addr @ var .len @ ; \ assign addr len to variable. -: strset { addr len var -- } addr var .addr ! len var .len ! ; +: strset { addr len var -- } addr var .addr ! len var .len ! ; \ free memory and reset fields : strfree { var -- } var .addr @ ?dup if free-memory 0 0 var strset then ; @@ -299,6 +250,18 @@ only forth also support-functions defini \ free old content, make a copy of the string and assign to variable : string= { addr len var -- } var strfree addr len strdup var strset ; +: strtype ( str -- ) strget type ; + +\ assign a reference to what is on the stack +: strref { addr len var -- addr len } + addr var .addr ! len var .len ! addr len +; + +\ unquote a string +: unquote ( addr len -- addr len ) + over c@ [char] " = if 2 chars - swap char+ swap then +; + \ Assignment data temporary storage string name_buffer @@ -366,16 +329,16 @@ line-reading definitions line_buffer .len @ if line_buffer .addr @ line_buffer .len @ r@ + - resize if out_of_memory throw then + resize if ENOMEM throw then else - r@ allocate if out_of_memory throw then + r@ allocate if ENOMEM throw then then line_buffer .addr ! r> ; : append_to_line_buffer ( addr len -- ) - line_buffer .addr @ line_buffer .len @ + line_buffer strget 2swap strcat line_buffer .len ! drop @@ -395,23 +358,15 @@ line-reading definitions : refill_buffer 0 to read_buffer_ptr read_buffer .addr @ 0= if - read_buffer_size allocate if out_of_memory throw then + read_buffer_size allocate if ENOMEM throw then read_buffer .addr ! then fd @ read_buffer .addr @ read_buffer_size fread - dup -1 = if read_error throw then + dup -1 = if EREAD throw then dup 0= if true to end_of_file? then read_buffer .len ! ; -: reset_line_buffer - line_buffer .addr @ ?dup if - free-memory - then - 0 line_buffer .addr ! - 0 line_buffer .len ! -; - support-functions definitions : reset_line_reading @@ -419,7 +374,7 @@ support-functions definitions ; : read_line - reset_line_buffer + line_buffer strfree skip_newlines begin read_from_buffer @@ -459,9 +414,9 @@ also parser definitions also 0 value parsing_function 0 value end_of_line -: end_of_line? - line_pointer end_of_line = -; +: end_of_line? line_pointer end_of_line = ; + +\ classifiers for various character classes in the input line : letter? line_pointer c@ >r @@ -480,70 +435,46 @@ also parser definitions also or ; -: quote? - line_pointer c@ [char] " = -; +: quote? line_pointer c@ [char] " = ; -: assignment_sign? - line_pointer c@ [char] = = -; +: assignment_sign? line_pointer c@ [char] = = ; -: comment? - line_pointer c@ [char] # = -; +: comment? line_pointer c@ [char] # = ; -: space? - line_pointer c@ bl = - line_pointer c@ tab = or -; +: space? line_pointer c@ bl = line_pointer c@ tab = or ; -: backslash? - line_pointer c@ [char] \ = -; +: backslash? line_pointer c@ [char] \ = ; -: underscore? - line_pointer c@ [char] _ = -; +: underscore? line_pointer c@ [char] _ = ; -: dot? - line_pointer c@ [char] . = -; +: dot? line_pointer c@ [char] . = ; -: skip_character - line_pointer char+ to line_pointer -; +\ manipulation of input line +: skip_character line_pointer char+ to line_pointer ; -: skip_to_end_of_line - end_of_line to line_pointer -; +: skip_to_end_of_line end_of_line to line_pointer ; : eat_space begin - space? + end_of_line? if 0 else space? then while skip_character - end_of_line? if exit then repeat ; : parse_name ( -- addr len ) line_pointer begin - letter? digit? underscore? dot? or or or + end_of_line? if 0 else letter? digit? underscore? dot? or or or then while skip_character - end_of_line? if - line_pointer over - - strdup - exit - then repeat line_pointer over - strdup ; : remove_backslashes { addr len | addr' len' -- addr' len' } - len allocate if out_of_memory throw then + len allocate if ENOMEM throw then to addr' addr >r begin @@ -561,16 +492,16 @@ also parser definitions also : parse_quote ( -- addr len ) line_pointer skip_character - end_of_line? if syntax_error throw then + end_of_line? if ESYNTAX throw then begin quote? 0= while backslash? if skip_character - end_of_line? if syntax_error throw then + end_of_line? if ESYNTAX throw then then skip_character - end_of_line? if syntax_error throw then + end_of_line? if ESYNTAX throw then repeat skip_character line_pointer over - @@ -579,8 +510,7 @@ also parser definitions also : read_name parse_name ( -- addr len ) - name_buffer .len ! - name_buffer .addr ! + name_buffer strset ; : read_value @@ -589,8 +519,7 @@ also parser definitions also else parse_name ( -- addr len ) then - value_buffer .len ! - value_buffer .addr ! + value_buffer strset ; : comment @@ -600,7 +529,7 @@ also parser definitions also : white_space_4 eat_space comment? if ['] comment to parsing_function exit then - end_of_line? 0= if syntax_error throw then + end_of_line? 0= if ESYNTAX throw then ; : variable_value @@ -613,7 +542,7 @@ also parser definitions also letter? digit? quote? or or if ['] variable_value to parsing_function exit then - syntax_error throw + ESYNTAX throw ; : assignment_sign @@ -624,7 +553,7 @@ also parser definitions also : white_space_2 eat_space assignment_sign? if ['] assignment_sign to parsing_function exit then - syntax_error throw + ESYNTAX throw ; : variable_name @@ -636,13 +565,13 @@ also parser definitions also eat_space letter? if ['] variable_name to parsing_function exit then comment? if ['] comment to parsing_function exit then - end_of_line? 0= if syntax_error throw then + end_of_line? 0= if ESYNTAX throw then ; file-processing definitions : get_assignment - line_buffer .addr @ line_buffer .len @ + to end_of_line + line_buffer strget + to end_of_line line_buffer .addr @ to line_pointer ['] white_space_1 to parsing_function begin @@ -653,7 +582,7 @@ file-processing definitions parsing_function ['] comment = parsing_function ['] white_space_1 = parsing_function ['] white_space_4 = - or or 0= if syntax_error throw then + or or 0= if ESYNTAX throw then ; only forth also support-functions also file-processing definitions also @@ -661,7 +590,7 @@ only forth also support-functions also f \ Process line : assignment_type? ( addr len -- flag ) - name_buffer .addr @ name_buffer .len @ + name_buffer strget compare 0= ; @@ -671,69 +600,56 @@ only forth also support-functions also f over compare 0= ; -: loader_conf_files? - s" loader_conf_files" assignment_type? -; +: loader_conf_files? s" loader_conf_files" assignment_type? ; -: nextboot_flag? - s" nextboot_enable" assignment_type? -; +: nextboot_flag? s" nextboot_enable" assignment_type? ; -: nextboot_conf? - s" nextboot_conf" assignment_type? -; +: nextboot_conf? s" nextboot_conf" assignment_type? ; -: verbose_flag? - s" verbose_loading" assignment_type? -; +: verbose_flag? s" verbose_loading" assignment_type? ; -: execute? - s" exec" assignment_type? -; +: execute? s" exec" assignment_type? ; -: password? - s" password" assignment_type? -; +: password? s" password" assignment_type? ; -: module_load? - load_module_suffix suffix_type? -; +: module_load? load_module_suffix suffix_type? ; -: module_loadname? - module_loadname_suffix suffix_type? -; +: module_loadname? module_loadname_suffix suffix_type? ; -: module_type? - module_type_suffix suffix_type? -; +: module_type? module_type_suffix suffix_type? ; -: module_args? - module_args_suffix suffix_type? -; +: module_args? module_args_suffix suffix_type? ; -: module_beforeload? - module_beforeload_suffix suffix_type? -; +: module_beforeload? module_beforeload_suffix suffix_type? ; -: module_afterload? - module_afterload_suffix suffix_type? -; +: module_afterload? module_afterload_suffix suffix_type? ; -: module_loaderror? - module_loaderror_suffix suffix_type? -; +: module_loaderror? module_loaderror_suffix suffix_type? ; -: set_nextboot_conf - nextboot_conf_file .addr @ ?dup if - free-memory - then - value_buffer .addr @ c@ [char] " = if - value_buffer .addr @ char+ value_buffer .len @ 2 chars - +\ build a 'set' statement and execute it +: set_environment_variable + name_buffer .len @ value_buffer .len @ + 5 chars + \ size of result string + allocate if ENOMEM throw then + dup 0 \ start with an empty string and append the pieces + s" set " strcat + name_buffer strget strcat + s" =" strcat + value_buffer strget strcat + ['] evaluate catch if + 2drop free drop + ESETERROR throw else - value_buffer .addr @ value_buffer .len @ + free-memory then - strdup - nextboot_conf_file .len ! nextboot_conf_file .addr ! +; + +: set_conf_files + set_environment_variable + s" loader_conf_files" getenv conf_files string= +; + +: set_nextboot_conf \ XXX maybe do as set_conf_files ? + value_buffer strget unquote nextboot_conf_file string= ; : append_to_module_options_list ( addr -- ) @@ -746,35 +662,32 @@ only forth also support-functions also f then ; -: set_module_name ( addr -- ) - name_buffer .addr @ name_buffer .len @ - strdup - >r over module.name .addr ! - r> swap module.name .len ! +: set_module_name { addr -- } \ check leaks + name_buffer strget addr module.name string= ; : yes_value? - value_buffer .addr @ value_buffer .len @ + value_buffer strget \ XXX could use unquote 2dup s' "YES"' compare >r 2dup s' "yes"' compare >r 2dup s" YES" compare >r s" yes" compare r> r> r> and and and 0= ; -: find_module_option ( -- addr | 0 ) +: find_module_option ( -- addr | 0 ) \ return ptr to entry matching name_buffer module_options @ begin dup while - dup module.name dup .addr @ swap .len @ - name_buffer .addr @ name_buffer .len @ + dup module.name strget + name_buffer strget compare 0= if exit then module.next @ repeat ; : new_module_option ( -- addr ) - sizeof module allocate if out_of_memory throw then + sizeof module allocate if ENOMEM throw then dup sizeof module erase dup append_to_module_options_list dup set_module_name @@ -792,103 +705,38 @@ only forth also support-functions also f : set_module_args name_buffer .len @ module_args_suffix nip - name_buffer .len ! - get_module_option module.args - dup .addr @ ?dup if free-memory then - value_buffer .addr @ value_buffer .len @ - over c@ [char] " = if - 2 chars - swap char+ swap - then - strdup - >r over .addr ! - r> swap .len ! + value_buffer strget unquote + get_module_option module.args string= ; : set_module_loadname name_buffer .len @ module_loadname_suffix nip - name_buffer .len ! - get_module_option module.loadname - dup .addr @ ?dup if free-memory then - value_buffer .addr @ value_buffer .len @ - over c@ [char] " = if - 2 chars - swap char+ swap - then - strdup - >r over .addr ! - r> swap .len ! + value_buffer strget unquote + get_module_option module.loadname string= ; : set_module_type name_buffer .len @ module_type_suffix nip - name_buffer .len ! - get_module_option module.type - dup .addr @ ?dup if free-memory then - value_buffer .addr @ value_buffer .len @ - over c@ [char] " = if - 2 chars - swap char+ swap - then - strdup - >r over .addr ! - r> swap .len ! + value_buffer strget unquote + get_module_option module.type string= ; : set_module_beforeload name_buffer .len @ module_beforeload_suffix nip - name_buffer .len ! - get_module_option module.beforeload - dup .addr @ ?dup if free-memory then - value_buffer .addr @ value_buffer .len @ - over c@ [char] " = if - 2 chars - swap char+ swap - then - strdup - >r over .addr ! - r> swap .len ! + value_buffer strget unquote + get_module_option module.beforeload string= ; : set_module_afterload name_buffer .len @ module_afterload_suffix nip - name_buffer .len ! - get_module_option module.afterload - dup .addr @ ?dup if free-memory then - value_buffer .addr @ value_buffer .len @ - over c@ [char] " = if - 2 chars - swap char+ swap - then - strdup - >r over .addr ! - r> swap .len ! + value_buffer strget unquote + get_module_option module.afterload string= ; : set_module_loaderror *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200902281800.n1SI0sMv017662>