Date: Thu, 6 Jun 2002 13:12:47 -0700 (PDT) From: Julian Elischer <julian@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 12454 for review Message-ID: <200206062012.g56KClC19632@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12454 Change 12454 by julian@julian_ref on 2002/06/06 13:12:14 IFC .. not tested Affected files ... ... //depot/projects/kse/bin/ps/fmt.c#5 integrate ... //depot/projects/kse/bin/ps/keyword.c#6 integrate ... //depot/projects/kse/bin/ps/print.c#10 integrate ... //depot/projects/kse/bin/ps/ps.1#8 integrate ... //depot/projects/kse/bin/ps/ps.c#8 integrate ... //depot/projects/kse/sys/alpha/include/elf.h#3 integrate ... //depot/projects/kse/sys/alpha/linux/linux_dummy.c#5 integrate ... //depot/projects/kse/sys/alpha/linux/linux_sysvec.c#6 integrate ... //depot/projects/kse/sys/alpha/osf1/imgact_osf1.c#5 integrate ... //depot/projects/kse/sys/alpha/osf1/osf1.h#2 integrate ... //depot/projects/kse/sys/alpha/osf1/osf1_signal.c#7 integrate ... //depot/projects/kse/sys/alpha/osf1/osf1_sysvec.c#3 integrate ... //depot/projects/kse/sys/alpha/osf1/osf1_util.h#4 integrate ... //depot/projects/kse/sys/boot/common/ufsread.c#1 branch ... //depot/projects/kse/sys/boot/forth/loader.4th.8#4 integrate ... //depot/projects/kse/sys/boot/i386/boot2/Makefile#3 integrate ... //depot/projects/kse/sys/boot/i386/boot2/boot2.c#10 integrate ... //depot/projects/kse/sys/boot/sparc64/boot1/Makefile#5 integrate ... //depot/projects/kse/sys/boot/sparc64/boot1/boot1.c#4 integrate ... //depot/projects/kse/sys/cam/scsi/scsi_all.c#9 integrate ... //depot/projects/kse/sys/cam/scsi/scsi_all.h#3 integrate ... //depot/projects/kse/sys/cam/scsi/scsi_iu.h#1 branch ... //depot/projects/kse/sys/cam/scsi/scsi_message.h#2 integrate ... //depot/projects/kse/sys/compat/linux/linux_file.c#13 integrate ... //depot/projects/kse/sys/compat/linux/linux_ioctl.c#14 integrate ... //depot/projects/kse/sys/compat/linux/linux_ipc.c#9 integrate ... //depot/projects/kse/sys/compat/linux/linux_misc.c#16 integrate ... //depot/projects/kse/sys/compat/linux/linux_signal.c#6 integrate ... //depot/projects/kse/sys/compat/linux/linux_socket.c#7 integrate ... //depot/projects/kse/sys/compat/linux/linux_socket.h#2 integrate ... //depot/projects/kse/sys/compat/linux/linux_stats.c#8 integrate ... //depot/projects/kse/sys/compat/svr4/imgact_svr4.c#5 integrate ... //depot/projects/kse/sys/compat/svr4/svr4_exec.h#5 integrate ... //depot/projects/kse/sys/compat/svr4/svr4_filio.c#7 integrate ... //depot/projects/kse/sys/compat/svr4/svr4_ioctl.c#7 integrate ... //depot/projects/kse/sys/conf/NOTES#6 integrate ... //depot/projects/kse/sys/conf/files#35 integrate ... //depot/projects/kse/sys/conf/files.i386#22 integrate ... //depot/projects/kse/sys/conf/files.pc98#24 integrate ... //depot/projects/kse/sys/conf/options#17 integrate ... //depot/projects/kse/sys/ddb/ddb.h#3 integrate ... //depot/projects/kse/sys/dev/aic7xxx/ahd_pci.c#1 branch ... //depot/projects/kse/sys/dev/aic7xxx/aic79xx.c#1 branch ... //depot/projects/kse/sys/dev/aic7xxx/aic79xx.h#1 branch ... //depot/projects/kse/sys/dev/aic7xxx/aic79xx.reg#1 branch ... //depot/projects/kse/sys/dev/aic7xxx/aic79xx.seq#1 branch ... //depot/projects/kse/sys/dev/aic7xxx/aic79xx_inline.h#1 branch ... //depot/projects/kse/sys/dev/aic7xxx/aic79xx_osm.c#1 branch ... //depot/projects/kse/sys/dev/aic7xxx/aic79xx_osm.h#1 branch ... //depot/projects/kse/sys/dev/aic7xxx/aic79xx_pci.c#1 branch ... //depot/projects/kse/sys/dev/aic7xxx/aicasm/aicasm.c#3 integrate ... //depot/projects/kse/sys/dev/aic7xxx/aicasm/aicasm.h#3 integrate ... //depot/projects/kse/sys/dev/aic7xxx/aicasm/aicasm_gram.y#3 integrate ... //depot/projects/kse/sys/dev/aic7xxx/aicasm/aicasm_insformat.h#3 integrate ... //depot/projects/kse/sys/dev/aic7xxx/aicasm/aicasm_scan.l#3 integrate ... //depot/projects/kse/sys/dev/aic7xxx/aicasm/aicasm_symbol.c#3 integrate ... //depot/projects/kse/sys/dev/aic7xxx/aicasm/aicasm_symbol.h#4 integrate ... //depot/projects/kse/sys/dev/awi/awi.c#6 integrate ... //depot/projects/kse/sys/dev/awi/awivar.h#3 integrate ... //depot/projects/kse/sys/dev/cardbus/cardbus.c#8 integrate ... //depot/projects/kse/sys/dev/cardbus/cardbus_cis.c#6 integrate ... //depot/projects/kse/sys/dev/ct/ct_machdep.h#3 integrate ... //depot/projects/kse/sys/dev/drm/drm_dma.h#2 integrate ... //depot/projects/kse/sys/dev/drm/drm_os_freebsd.h#3 integrate ... //depot/projects/kse/sys/dev/drm/drm_scatter.h#2 integrate ... //depot/projects/kse/sys/dev/drm/gamma_drv.h#2 integrate ... //depot/projects/kse/sys/dev/drm/mga_dma.c#2 integrate ... //depot/projects/kse/sys/dev/drm/mga_drv.h#2 integrate ... //depot/projects/kse/sys/dev/drm/mga_state.c#2 integrate ... //depot/projects/kse/sys/dev/drm/r128_cce.c#2 integrate ... //depot/projects/kse/sys/dev/drm/r128_drv.h#2 integrate ... //depot/projects/kse/sys/dev/drm/r128_state.c#2 integrate ... //depot/projects/kse/sys/dev/drm/radeon_cp.c#2 integrate ... //depot/projects/kse/sys/dev/drm/radeon_drv.h#2 integrate ... //depot/projects/kse/sys/dev/drm/radeon_state.c#2 integrate ... //depot/projects/kse/sys/dev/em/README#1 branch ... //depot/projects/kse/sys/dev/em/if_em.c#7 integrate ... //depot/projects/kse/sys/dev/em/if_em.h#5 integrate ... //depot/projects/kse/sys/dev/em/if_em_hw.c#1 branch ... //depot/projects/kse/sys/dev/em/if_em_hw.h#1 branch ... //depot/projects/kse/sys/dev/em/if_em_osdep.h#4 integrate ... //depot/projects/kse/sys/dev/ep/if_ep_pccard.c#3 integrate ... //depot/projects/kse/sys/dev/exca/exca.c#3 integrate ... //depot/projects/kse/sys/dev/fxp/if_fxp.c#13 integrate ... //depot/projects/kse/sys/dev/hea/eni.c#5 integrate ... //depot/projects/kse/sys/dev/hea/eni.h#2 integrate ... //depot/projects/kse/sys/dev/hea/eni_buffer.c#5 integrate ... //depot/projects/kse/sys/dev/hea/hea_freebsd.c#1 branch ... //depot/projects/kse/sys/dev/hea/hea_freebsd.h#1 branch ... //depot/projects/kse/sys/dev/hea/hea_pci.c#1 branch ... //depot/projects/kse/sys/dev/hme/if_hmereg.h#2 integrate ... //depot/projects/kse/sys/dev/joy/joy.c#3 integrate ... //depot/projects/kse/sys/dev/joy/joy_isa.c#2 integrate ... //depot/projects/kse/sys/dev/joy/joy_pccard.c#2 integrate ... //depot/projects/kse/sys/dev/joy/joyvar.h#2 integrate ... //depot/projects/kse/sys/dev/lmc/if_lmc.c#4 integrate ... //depot/projects/kse/sys/dev/lmc/if_lmc_common.c#2 integrate ... //depot/projects/kse/sys/dev/lmc/if_lmc_fbsd3.c#2 integrate ... //depot/projects/kse/sys/dev/lmc/if_lmc_media.c#2 integrate ... //depot/projects/kse/sys/dev/lmc/if_lmcioctl.h#2 integrate ... //depot/projects/kse/sys/dev/lmc/if_lmcvar.h#2 integrate ... //depot/projects/kse/sys/dev/md/md.c#19 integrate ... //depot/projects/kse/sys/dev/my/if_my.c#4 integrate ... //depot/projects/kse/sys/dev/ncv/ncr53c500var.h#4 integrate ... //depot/projects/kse/sys/dev/nsp/nspvar.h#4 integrate ... //depot/projects/kse/sys/dev/pccard/card_if.m#4 integrate ... //depot/projects/kse/sys/dev/pccard/pccard.c#11 integrate ... //depot/projects/kse/sys/dev/pccard/pccard_common.c#1 branch ... //depot/projects/kse/sys/dev/pccard/pccardvar.h#7 integrate ... //depot/projects/kse/sys/dev/pccbb/pccbb.c#16 integrate ... //depot/projects/kse/sys/dev/pci/pci.c#12 integrate ... //depot/projects/kse/sys/dev/pci/pcireg.h#2 integrate ... //depot/projects/kse/sys/dev/pci/pcivar.h#6 integrate ... //depot/projects/kse/sys/dev/pcic/i82365_isa.c#2 integrate ... //depot/projects/kse/sys/dev/pdq/if_fea.c#3 integrate ... //depot/projects/kse/sys/dev/pdq/if_fpa.c#3 integrate ... //depot/projects/kse/sys/dev/pdq/pdq_freebsd.h#2 integrate ... //depot/projects/kse/sys/dev/pdq/pdqvar.h#3 integrate ... //depot/projects/kse/sys/dev/ray/if_ray.c#2 integrate ... //depot/projects/kse/sys/dev/stg/tmc18c30var.h#4 integrate ... //depot/projects/kse/sys/dev/syscons/syscons.c#15 integrate ... //depot/projects/kse/sys/dev/usb/udbp.c#3 integrate ... //depot/projects/kse/sys/dev/usb/udbp.h#2 integrate ... //depot/projects/kse/sys/dev/usb/urio.c#11 integrate ... //depot/projects/kse/sys/dev/wl/if_wl.c#6 integrate ... //depot/projects/kse/sys/dev/wl/if_wl.h#2 integrate ... //depot/projects/kse/sys/dev/xe/if_xe_pccard.c#2 integrate ... //depot/projects/kse/sys/fs/devfs/devfs_vnops.c#13 integrate ... //depot/projects/kse/sys/fs/fifofs/fifo_vnops.c#13 integrate ... //depot/projects/kse/sys/fs/portalfs/portal_vnops.c#10 integrate ... //depot/projects/kse/sys/fs/pseudofs/pseudofs.c#11 integrate ... //depot/projects/kse/sys/fs/pseudofs/pseudofs.h#12 integrate ... //depot/projects/kse/sys/fs/pseudofs/pseudofs_fileno.c#5 integrate ... //depot/projects/kse/sys/fs/pseudofs/pseudofs_vncache.c#11 integrate ... //depot/projects/kse/sys/fs/pseudofs/pseudofs_vnops.c#15 integrate ... //depot/projects/kse/sys/geom/geom.h#6 integrate ... //depot/projects/kse/sys/geom/geom_bsd.c#6 integrate ... //depot/projects/kse/sys/geom/geom_gpt.c#3 integrate ... //depot/projects/kse/sys/geom/geom_mbr.c#5 integrate ... //depot/projects/kse/sys/geom/geom_subr.c#6 integrate ... //depot/projects/kse/sys/geom/geom_sunlabel.c#4 integrate ... //depot/projects/kse/sys/i386/conf/GENERIC#19 integrate ... //depot/projects/kse/sys/i386/ibcs2/ibcs2_isc.c#4 integrate ... //depot/projects/kse/sys/i386/ibcs2/ibcs2_sysi86.c#6 integrate ... //depot/projects/kse/sys/i386/ibcs2/ibcs2_xenix.c#5 integrate ... //depot/projects/kse/sys/i386/ibcs2/imgact_coff.c#11 integrate ... //depot/projects/kse/sys/i386/include/asmacros.h#3 integrate ... //depot/projects/kse/sys/i386/include/elf.h#3 integrate ... //depot/projects/kse/sys/i386/include/floatingpoint.h#2 integrate ... //depot/projects/kse/sys/i386/include/if_wl_wavelan.h#2 integrate ... //depot/projects/kse/sys/i386/isa/ic/lemac.h#2 integrate ... //depot/projects/kse/sys/i386/isa/if_le.c#5 integrate ... //depot/projects/kse/sys/i386/isa/scd.c#6 integrate ... //depot/projects/kse/sys/i386/linux/imgact_linux.c#5 integrate ... //depot/projects/kse/sys/i386/linux/linux_dummy.c#7 integrate ... //depot/projects/kse/sys/i386/linux/linux_sysvec.c#17 integrate ... //depot/projects/kse/sys/i386/pci/pci_cfgreg.c#10 integrate ... //depot/projects/kse/sys/i4b/driver/i4b_ing.c#5 integrate ... //depot/projects/kse/sys/i4b/layer1/isic/i4b_itk_ix1.c#2 integrate ... //depot/projects/kse/sys/ia64/ia32/imgact_ia32.c#2 integrate ... //depot/projects/kse/sys/ia64/ia32/imgact_ia32.h#2 integrate ... //depot/projects/kse/sys/ia64/include/elf.h#5 integrate ... //depot/projects/kse/sys/kern/imgact_elf.c#18 integrate ... //depot/projects/kse/sys/kern/kern_descrip.c#31 integrate ... //depot/projects/kse/sys/kern/kern_exit.c#51 integrate ... //depot/projects/kse/sys/kern/kern_lock.c#13 integrate ... //depot/projects/kse/sys/kern/kern_malloc.c#12 integrate ... //depot/projects/kse/sys/kern/kern_mutex.c#27 integrate ... //depot/projects/kse/sys/kern/kern_sig.c#55 integrate ... //depot/projects/kse/sys/kern/kern_tc.c#9 integrate ... //depot/projects/kse/sys/kern/subr_diskslice.c#9 integrate ... //depot/projects/kse/sys/kern/subr_prf.c#14 integrate ... //depot/projects/kse/sys/kern/subr_witness.c#25 integrate ... //depot/projects/kse/sys/kern/sys_socket.c#8 integrate ... //depot/projects/kse/sys/kern/tty.c#25 integrate ... //depot/projects/kse/sys/kern/uipc_domain.c#5 integrate ... //depot/projects/kse/sys/kern/uipc_mbuf.c#7 integrate ... //depot/projects/kse/sys/kern/uipc_socket.c#17 integrate ... //depot/projects/kse/sys/kern/uipc_socket2.c#16 integrate ... //depot/projects/kse/sys/kern/uipc_syscalls.c#15 integrate ... //depot/projects/kse/sys/kern/uipc_usrreq.c#19 integrate ... //depot/projects/kse/sys/kern/vfs_aio.c#27 integrate ... //depot/projects/kse/sys/kern/vfs_bio.c#18 integrate ... //depot/projects/kse/sys/kern/vfs_subr.c#32 integrate ... //depot/projects/kse/sys/modules/Makefile#28 integrate ... //depot/projects/kse/sys/modules/em/Makefile#2 integrate ... //depot/projects/kse/sys/modules/hea/Makefile#1 branch ... //depot/projects/kse/sys/modules/oldcard/Makefile#3 integrate ... //depot/projects/kse/sys/net/raw_cb.c#4 integrate ... //depot/projects/kse/sys/net/raw_usrreq.c#8 integrate ... //depot/projects/kse/sys/net/route.c#5 integrate ... //depot/projects/kse/sys/net/rtsock.c#16 integrate ... //depot/projects/kse/sys/netatalk/ddp_input.c#5 integrate ... //depot/projects/kse/sys/netatalk/ddp_usrreq.c#9 integrate ... //depot/projects/kse/sys/netatm/atm_aal5.c#7 integrate ... //depot/projects/kse/sys/netatm/atm_socket.c#6 integrate ... //depot/projects/kse/sys/netgraph/ng_async.c#4 integrate ... //depot/projects/kse/sys/netgraph/ng_async.h#2 integrate ... //depot/projects/kse/sys/netgraph/ng_base.c#7 integrate ... //depot/projects/kse/sys/netgraph/ng_bpf.c#3 integrate ... //depot/projects/kse/sys/netgraph/ng_bpf.h#2 integrate ... //depot/projects/kse/sys/netgraph/ng_bridge.c#4 integrate ... //depot/projects/kse/sys/netgraph/ng_bridge.h#2 integrate ... //depot/projects/kse/sys/netgraph/ng_cisco.c#3 integrate ... //depot/projects/kse/sys/netgraph/ng_cisco.h#2 integrate ... //depot/projects/kse/sys/netgraph/ng_eiface.c#3 integrate ... //depot/projects/kse/sys/netgraph/ng_eiface.h#2 integrate ... //depot/projects/kse/sys/netgraph/ng_etf.c#2 integrate ... //depot/projects/kse/sys/netgraph/ng_etf.h#2 integrate ... //depot/projects/kse/sys/netgraph/ng_ether.c#8 integrate ... //depot/projects/kse/sys/netgraph/ng_iface.c#3 integrate ... //depot/projects/kse/sys/netgraph/ng_ksocket.c#15 integrate ... //depot/projects/kse/sys/netgraph/ng_ksocket.h#4 integrate ... //depot/projects/kse/sys/netgraph/ng_lmi.c#2 integrate ... //depot/projects/kse/sys/netgraph/ng_message.h#2 integrate ... //depot/projects/kse/sys/netgraph/ng_one2many.c#3 integrate ... //depot/projects/kse/sys/netgraph/ng_one2many.h#2 integrate ... //depot/projects/kse/sys/netgraph/ng_parse.c#8 integrate ... //depot/projects/kse/sys/netgraph/ng_parse.h#2 integrate ... //depot/projects/kse/sys/netgraph/ng_ppp.c#5 integrate ... //depot/projects/kse/sys/netgraph/ng_ppp.h#2 integrate ... //depot/projects/kse/sys/netgraph/ng_pppoe.c#7 integrate ... //depot/projects/kse/sys/netgraph/ng_pppoe.h#4 integrate ... //depot/projects/kse/sys/netgraph/ng_pptpgre.c#5 integrate ... //depot/projects/kse/sys/netgraph/ng_pptpgre.h#2 integrate ... //depot/projects/kse/sys/netgraph/ng_rfc1490.c#3 integrate ... //depot/projects/kse/sys/netgraph/ng_sample.c#2 integrate ... //depot/projects/kse/sys/netgraph/ng_sample.h#2 integrate ... //depot/projects/kse/sys/netgraph/ng_socket.c#11 integrate ... //depot/projects/kse/sys/netgraph/ng_tee.c#5 integrate ... //depot/projects/kse/sys/netgraph/ng_tee.h#2 integrate ... //depot/projects/kse/sys/netgraph/ng_vjc.c#3 integrate ... //depot/projects/kse/sys/netgraph/ng_vjc.h#2 integrate ... //depot/projects/kse/sys/netinet/accf_data.c#4 integrate ... //depot/projects/kse/sys/netinet/accf_http.c#4 integrate ... //depot/projects/kse/sys/netinet/in_pcb.c#15 integrate ... //depot/projects/kse/sys/netinet/ip_divert.c#12 integrate ... //depot/projects/kse/sys/netinet/ip_input.c#21 integrate ... //depot/projects/kse/sys/netinet/ip_mroute.c#10 integrate ... //depot/projects/kse/sys/netinet/raw_ip.c#13 integrate ... //depot/projects/kse/sys/netinet/tcp_input.c#19 integrate ... //depot/projects/kse/sys/netinet/tcp_output.c#7 integrate ... //depot/projects/kse/sys/netinet/tcp_subr.c#12 integrate ... //depot/projects/kse/sys/netinet/tcp_timer.c#5 integrate ... //depot/projects/kse/sys/netinet/tcp_usrreq.c#9 integrate ... //depot/projects/kse/sys/netinet/udp_usrreq.c#13 integrate ... //depot/projects/kse/sys/netinet6/icmp6.c#7 integrate ... //depot/projects/kse/sys/netinet6/in6_pcb.c#13 integrate ... //depot/projects/kse/sys/netinet6/in6_src.c#8 integrate ... //depot/projects/kse/sys/netinet6/ip6_input.c#10 integrate ... //depot/projects/kse/sys/netinet6/ip6_mroute.c#7 integrate ... //depot/projects/kse/sys/netinet6/raw_ip6.c#11 integrate ... //depot/projects/kse/sys/netinet6/udp6_usrreq.c#11 integrate ... //depot/projects/kse/sys/netipx/ipx_pcb.c#7 integrate ... //depot/projects/kse/sys/netipx/ipx_usrreq.c#8 integrate ... //depot/projects/kse/sys/netipx/spx_usrreq.c#9 integrate ... //depot/projects/kse/sys/netkey/keysock.c#9 integrate ... //depot/projects/kse/sys/netnatm/natm.c#7 integrate ... //depot/projects/kse/sys/netncp/ncp_sock.c#4 integrate ... //depot/projects/kse/sys/netns/idp_usrreq.c#4 integrate ... //depot/projects/kse/sys/netns/ns.c#3 integrate ... //depot/projects/kse/sys/netns/ns_pcb.c#4 integrate ... //depot/projects/kse/sys/netns/spp_usrreq.c#3 integrate ... //depot/projects/kse/sys/netsmb/smb_trantcp.c#8 integrate ... //depot/projects/kse/sys/nfsclient/bootp_subr.c#10 integrate ... //depot/projects/kse/sys/nfsclient/nfs_socket.c#12 integrate ... //depot/projects/kse/sys/nfsserver/nfs_srvsock.c#7 integrate ... //depot/projects/kse/sys/pc98/pc98/pmc.c#3 integrate ... //depot/projects/kse/sys/pccard/pccard_nbk.c#6 integrate ... //depot/projects/kse/sys/pci/dc21040reg.h#2 integrate ... //depot/projects/kse/sys/pci/if_de.c#3 integrate ... //depot/projects/kse/sys/pci/if_devar.h#3 integrate ... //depot/projects/kse/sys/powerpc/include/elf.h#3 integrate ... //depot/projects/kse/sys/security/lomac/kernel_interface.c#4 integrate ... //depot/projects/kse/sys/security/lomac/kernel_log.c#4 integrate ... //depot/projects/kse/sys/security/lomac/kernel_mmap.c#6 integrate ... //depot/projects/kse/sys/security/lomac/kernel_socket.c#8 integrate ... //depot/projects/kse/sys/sparc64/include/elf.h#7 integrate ... //depot/projects/kse/sys/sparc64/include/tsb.h#11 integrate ... //depot/projects/kse/sys/sparc64/sparc64/machdep.c#32 integrate ... //depot/projects/kse/sys/sys/elf32.h#2 integrate ... //depot/projects/kse/sys/sys/elf64.h#2 integrate ... //depot/projects/kse/sys/sys/elf_generic.h#2 integrate ... //depot/projects/kse/sys/sys/gpt.h#3 integrate ... //depot/projects/kse/sys/sys/imgact_elf.h#7 integrate ... //depot/projects/kse/sys/sys/joystick.h#2 integrate ... //depot/projects/kse/sys/sys/lockmgr.h#7 integrate ... //depot/projects/kse/sys/sys/mbuf.h#8 integrate ... //depot/projects/kse/sys/sys/param.h#21 integrate ... //depot/projects/kse/sys/sys/proc.h#105 integrate ... //depot/projects/kse/sys/sys/socket.h#6 integrate ... //depot/projects/kse/sys/sys/socketvar.h#19 integrate ... //depot/projects/kse/sys/sys/vmmeter.h#2 integrate ... //depot/projects/kse/sys/sys/wait.h#4 integrate ... //depot/projects/kse/sys/ufs/ffs/ffs_vfsops.c#19 integrate ... //depot/projects/kse/sys/ufs/ufs/ufs_acl.c#10 integrate ... //depot/projects/kse/sys/ufs/ufs/ufs_extern.h#6 integrate ... //depot/projects/kse/sys/ufs/ufs/ufs_ihash.c#7 integrate ... //depot/projects/kse/sys/vm/uma_core.c#7 integrate ... //depot/projects/kse/sys/vm/vm_map.c#18 integrate ... //depot/projects/kse/sys/vm/vm_map.h#12 integrate ... //depot/projects/kse/sys/vm/vm_mmap.c#15 integrate ... //depot/projects/kse/sys/vm/vm_object.c#10 integrate ... //depot/projects/kse/sys/vm/vm_object.h#5 integrate ... //depot/projects/kse/sys/vm/vm_swap.c#9 integrate Differences ... ==== //depot/projects/kse/bin/ps/fmt.c#5 (text+ko) ==== @@ -33,7 +33,7 @@ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/ps/fmt.c,v 1.19 2002/05/05 04:42:50 jmallett Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/fmt.c,v 1.22 2002/06/05 01:36:30 jmallett Exp $"); #if 0 #ifndef lint @@ -58,10 +58,6 @@ static char *cmdpart(char *); static char *shquote(char **); -/* - * XXX - * This is a stub until marc does the real one. - */ static char * shquote(char **argv) { @@ -81,18 +77,18 @@ errx(1, "malloc failed"); } - if (*argv == 0) { - buf[0] = 0; + if (*argv == NULL) { + buf[0] = '\0'; return (buf); } dst = buf; - for (p = argv; (src = *p++) != 0; ) { - if (*src == 0) + for (p = argv; (src = *p++) != NULL; ) { + if (*src == '\0') continue; len = (buf_size - 1 - (dst - buf)) / 4; strvisx(dst, src, strlen(src) < len ? strlen(src) : len, VIS_NL | VIS_CSTYLE); - while (*dst) + while (*dst != '\0') dst++; if ((buf_size - 1 - (dst - buf)) / 4 > 0) *dst++ = ' '; @@ -129,7 +125,7 @@ } cp = malloc(len); if (cp == NULL) - return (NULL); + errx(1, "malloc failed"); if (ap == NULL) sprintf(cp, " (%.*s)", (int)maxlen, cmd); else if (strncmp(cmdpart(argv[0]), cmd, maxlen) != 0) ==== //depot/projects/kse/bin/ps/keyword.c#6 (text+ko) ==== @@ -33,7 +33,7 @@ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.38 2002/02/21 18:27:16 dillon Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.44 2002/06/06 18:04:46 jmallett Exp $"); #if 0 #ifndef lint @@ -87,6 +87,8 @@ {"acflg", "", "acflag", 0, NULL, NULL, 0, 0, CHAR, NULL, 0}, {"blocked", "", "sigmask", 0, NULL, NULL, 0, 0, CHAR, NULL, 0}, {"caught", "", "sigcatch", 0, NULL, NULL, 0, 0, CHAR, NULL, 0}, + {"comm", "COMMAND", NULL, COMM|LJUST|USER, command, NULL, 16, 0, + CHAR, NULL, 0}, {"command", "COMMAND", NULL, COMM|LJUST|USER, command, NULL, 16, 0, CHAR, NULL, 0}, {"cpu", "CPU", NULL, 0, kvar, NULL, 3, KOFF(ki_estcpu), UINT, "d", @@ -233,20 +235,25 @@ static struct varent *vtail; char *tempstr, *tempstr1; -#define FMTSEP " \t,\n" tempstr1 = tempstr = strdup(p); while (tempstr && *tempstr) { char *cp; VAR *v; struct varent *vent; - while ((cp = strsep(&tempstr, FMTSEP)) != NULL && *cp == '\0') + /* + * Seperate the format by commas. + */ + while ((cp = strsep(&tempstr, ",")) != NULL && *cp == '\0') /* void */; if (cp == NULL || !(v = findvar(cp))) continue; if ((vent = malloc(sizeof(struct varent))) == NULL) - err(1, NULL); - vent->var = v; + errx(1, "malloc failed"); + vent->var = malloc(sizeof(*vent->var)); + if (vent->var == NULL) + errx(1, "malloc failed"); + memcpy(vent->var, v, sizeof(*vent->var)); vent->next = NULL; if (vhead == NULL) vhead = vtail = vent; @@ -285,7 +292,7 @@ warnx("%s: keyword not found", p); eval = 1; } else if (hp) - v->header = hp; + v->header = strdup(hp); return (v); } ==== //depot/projects/kse/bin/ps/print.c#10 (text+ko) ==== @@ -33,7 +33,7 @@ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.59 2002/02/22 23:31:57 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.61 2002/06/05 18:11:25 jmallett Exp $"); #if 0 #ifndef lint @@ -108,11 +108,11 @@ } if ((vis_args = malloc(strlen(k->ki_args) * 4 + 1)) == NULL) - err(1, NULL); + errx(1, "malloc failed"); strvis(vis_args, k->ki_args, VIS_TAB | VIS_NL | VIS_NOSLASH); if (k->ki_env) { if ((vis_env = malloc(strlen(k->ki_env) * 4 + 1)) == NULL) - err(1, NULL); + errx(1, "malloc failed"); strvis(vis_env, k->ki_env, VIS_TAB | VIS_NL | VIS_NOSLASH); } else vis_env = NULL; @@ -618,7 +618,8 @@ printval(char *bp, VAR *v) { static char ofmt[32] = "%"; - char *fcp, *cp; + const char *fcp; + char *cp; cp = ofmt + 1; fcp = v->fmt; ==== //depot/projects/kse/bin/ps/ps.1#8 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/ps/ps.1,v 1.46 2002/05/16 11:51:05 joe Exp $ +.\" $FreeBSD: src/bin/ps/ps.1,v 1.48 2002/06/06 18:10:12 jmallett Exp $ .\" .Dd April 18, 1994 .Dt PS 1 @@ -370,8 +370,8 @@ percentage memory usage (alias pmem) .It acflag accounting flag (alias acflg) -.It command -command and arguments +.It comm +command and arguments (alias command) .It cpu short-term cpu usage factor (for scheduling) .It flags @@ -506,6 +506,16 @@ .It xstat exit or stop status (valid only for stopped or zombie process) .El +.Sh ENVIRONMENT +The following environment variables affect the execution of +.Nm : +.Bl -tag -width ".Ev COLUMNS" +.It Ev COLUMNS +If set, specifies the user's preferred output width in column positions. +By default, +.Nm +attempts to automatically determine the terminal width. +.El .Sh FILES .Bl -tag -width /var/db/kvm_kernel.db -compact .It Pa /dev/kmem ==== //depot/projects/kse/bin/ps/ps.c#8 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.50 2002/04/07 04:59:13 jedgar Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.53 2002/06/05 18:11:25 jmallett Exp $"); #ifndef lint static const char copyright[] = @@ -101,13 +101,13 @@ static void usage(void); static uid_t *getuids(const char *, int *); -static char dfmt[] = "pid tt state time command"; -static char jfmt[] = "user pid ppid pgid jobc state tt time command"; -static char lfmt[] = "uid pid ppid cpu pri nice vsz rss mwchan state tt time command"; +static char dfmt[] = "pid,tt,state,time,command"; +static char jfmt[] = "user,pid,ppid,pgid,jobc,state,tt,time,command"; +static char lfmt[] = "uid,pid,ppid,cpu,pri,nice,vsz,rss,mwchan,state,tt,time,command"; static char o1[] = "pid"; -static char o2[] = "tt state time command"; -static char ufmt[] = "user pid %cpu %mem vsz rss tt state start time command"; -static char vfmt[] = "pid state time sl re pagein vsz rss lim tsiz %cpu %mem command"; +static char o2[] = "tt,state,time,command"; +static char ufmt[] = "user,pid,%cpu,%mem,vsz,rss,tt,state,start,time,command"; +static char vfmt[] = "pid,state,time,sl,re,pagein,vsz,rss,lim,tsiz,%cpu,%mem,command"; static char Zfmt[] = "lvl"; static kvm_t *kd; @@ -123,12 +123,15 @@ uid_t *uids; int all, ch, flag, i, _fmt, lineno, nentries, dropgid; int prtheader, wflag, what, xflg, uid, nuids; + char *cols; char errbuf[_POSIX2_LINE_MAX]; const char *nlistf, *memf; (void) setlocale(LC_ALL, ""); - if ((ioctl(STDOUT_FILENO, TIOCGWINSZ, (char *)&ws) == -1 && + if ((cols = getenv("COLUMNS")) != NULL && *cols != '\0') + termwidth = atoi(cols); + else if ((ioctl(STDOUT_FILENO, TIOCGWINSZ, (char *)&ws) == -1 && ioctl(STDERR_FILENO, TIOCGWINSZ, (char *)&ws) == -1 && ioctl(STDIN_FILENO, TIOCGWINSZ, (char *)&ws) == -1) || ws.ws_col == 0) @@ -308,7 +311,7 @@ /* XXX - should be cleaner */ if (!all && ttydev == NODEV && pid == -1 && !nuids) { if ((uids = malloc(sizeof (*uids))) == NULL) - err(1, "malloc"); + errx(1, "malloc failed"); nuids = 1; *uids = getuid(); } @@ -340,7 +343,7 @@ if ((kp = kvm_getprocs(kd, what, flag, &nentries)) == 0 || nentries < 0) errx(1, "%s", kvm_geterr(kd)); if ((kinfo = malloc(nentries * sizeof(*kinfo))) == NULL) - err(1, NULL); + errx(1, "malloc failed"); for (i = nentries; --i >= 0; ++kp) { kinfo[i].ki_p = kp; if (needuser) @@ -421,7 +424,7 @@ moreuids = realloc(uids, alloc * sizeof (*uids)); if (moreuids == NULL) { free(uids); - err(1, "realloc"); + errx(1, "realloc failed"); } uids = moreuids; } @@ -497,8 +500,6 @@ const char *s; s = fmt_argv((*fn)(kd, ki->ki_p, termwidth), comm, maxlen); - if (s == NULL) - err(1, NULL); return (s); } @@ -575,7 +576,7 @@ len = strlen(s); if ((newopts = ns = malloc(len + 2)) == NULL) - err(1, NULL); + errx(1, "malloc failed"); /* * options begin with '-' */ ==== //depot/projects/kse/sys/alpha/include/elf.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/include/elf.h,v 1.12 2001/10/10 23:06:48 ps Exp $ + * $FreeBSD: src/sys/alpha/include/elf.h,v 1.13 2002/05/30 08:32:18 dfr Exp $ */ #ifndef _MACHINE_ELF_H_ @@ -60,17 +60,6 @@ __ElfType(Auxinfo); -/* - * Types of dynamic symbol hash table bucket and chain elements. - * - * This is inconsistent among 64 bit architectures, so a machine dependent - * typedef is required. - */ - -typedef Elf64_Off Elf64_Hashelt; - -__ElfType(Hashelt); - /* Values for a_type. */ #define AT_NULL 0 /* Terminates the vector. */ #define AT_IGNORE 1 /* Ignored entry. */ ==== //depot/projects/kse/sys/alpha/linux/linux_dummy.c#5 (text+ko) ==== @@ -13,7 +13,7 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software withough specific prior written permission + * derived from this software without specific prior written permission * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/linux/linux_dummy.c,v 1.34 2001/10/16 06:15:35 marcel Exp $ + * $FreeBSD: src/sys/alpha/linux/linux_dummy.c,v 1.35 2002/06/02 20:05:40 schweikh Exp $ */ #include <sys/param.h> ==== //depot/projects/kse/sys/alpha/linux/linux_sysvec.c#6 (text+ko) ==== @@ -12,7 +12,7 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software withough specific prior written permission + * derived from this software without specific prior written permission * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/linux/linux_sysvec.c,v 1.81 2002/03/20 18:58:46 obrien Exp $ + * $FreeBSD: src/sys/alpha/linux/linux_sysvec.c,v 1.82 2002/06/02 20:05:40 schweikh Exp $ */ /* XXX we use functions that might not exist. */ ==== //depot/projects/kse/sys/alpha/osf1/imgact_osf1.c#5 (text+ko) ==== @@ -17,7 +17,7 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software withough specific prior written permission + * derived from this software without specific prior written permission * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -30,7 +30,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/osf1/imgact_osf1.c,v 1.10 2002/02/07 22:29:41 peter Exp $ + * $FreeBSD: src/sys/alpha/osf1/imgact_osf1.c,v 1.11 2002/06/02 20:05:41 schweikh Exp $ */ #include <sys/types.h> ==== //depot/projects/kse/sys/alpha/osf1/osf1.h#2 (text+ko) ==== @@ -11,7 +11,7 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software withough specific prior written permission + * derived from this software without specific prior written permission * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -24,7 +24,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/osf1/osf1.h,v 1.4 2000/11/09 08:25:45 marcel Exp $ + * $FreeBSD: src/sys/alpha/osf1/osf1.h,v 1.5 2002/06/02 20:05:41 schweikh Exp $ */ extern struct sysent osf1_sysent[]; ==== //depot/projects/kse/sys/alpha/osf1/osf1_signal.c#7 (text+ko) ==== @@ -17,7 +17,7 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software withough specific prior written permission + * derived from this software without specific prior written permission * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -30,7 +30,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/osf1/osf1_signal.c,v 1.17 2002/04/05 00:52:15 alc Exp $ + * $FreeBSD: src/sys/alpha/osf1/osf1_signal.c,v 1.18 2002/06/02 20:05:41 schweikh Exp $ */ #include <sys/param.h> ==== //depot/projects/kse/sys/alpha/osf1/osf1_sysvec.c#3 (text+ko) ==== @@ -15,7 +15,7 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software withough specific prior written permission + * derived from this software without specific prior written permission * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -28,7 +28,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/osf1/osf1_sysvec.c,v 1.6 2002/03/20 18:58:46 obrien Exp $ + * $FreeBSD: src/sys/alpha/osf1/osf1_sysvec.c,v 1.7 2002/06/02 20:05:41 schweikh Exp $ */ /* XXX we use functions that might not exist. */ ==== //depot/projects/kse/sys/alpha/osf1/osf1_util.h#4 (text+ko) ==== @@ -12,7 +12,7 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software withough specific prior written permission + * derived from this software without specific prior written permission * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/osf1/osf1_util.h,v 1.3 2002/03/20 18:58:46 obrien Exp $ + * $FreeBSD: src/sys/alpha/osf1/osf1_util.h,v 1.4 2002/06/02 20:05:41 schweikh Exp $ */ #include <vm/vm.h> ==== //depot/projects/kse/sys/boot/forth/loader.4th.8#4 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sys/boot/forth/loader.4th.8,v 1.11 2002/05/09 11:47:42 joe Exp $ +.\" $FreeBSD: src/sys/boot/forth/loader.4th.8,v 1.12 2002/05/30 09:24:01 schweikh Exp $ .\" .Dd April 25, 1999 .Dt LOADER.4TH 8 @@ -39,7 +39,7 @@ .Pa /boot/loader.rc includes .Nm -and uses one of it's commands to automatically read and process +and uses one of its commands to automatically read and process the standard .Xr loader.conf 5 files. Other commands exists to help the user specify alternate @@ -59,7 +59,7 @@ .Pp .Dl include loader.4th .Pp -This line is present on the default +This line is present in the default .Pa /boot/loader.rc file, so it isn't needed (and should not be re-issued) in a normal setup. .Pp @@ -92,7 +92,7 @@ all other .Xr loader.conf 5 files specified in it, and then proceeds to boot as specified in them. This -is command used on the default +is the command used in the default .Pa /boot/loader.rc file, and it uses the .Pa autoboot @@ -112,12 +112,12 @@ and all other .Xr loader.conf 5 files specified in it. Returns a flag on the stack to indicate -if any configuration file was succesfully loaded. +if any configuration file was successfully loaded. .Pp .It Ic read-conf Ar filename Reads and processes a .Xr loader.conf 5 -file. Does not proceeds to boot. +file. Does not proceed to boot. .Pp .It Ic enable-module Ar module Enables the loading of @@ -173,7 +173,7 @@ start .Ed .Pp -Loads a different kernel with the standard configuration: +Load a different kernel with the standard configuration: .Pp .Bd -literal -offset indent -compact set kernel="/boot/kernel.old/kernel" @@ -181,7 +181,7 @@ boot-conf .Ed .Pp -Reads an additional configuration file and then proceeds to boot: +Read an additional configuration file and then proceed to boot: .Pp .Bd -literal -offset indent -compact unload @@ -190,7 +190,7 @@ .Ed .Pp Disable the loading of the splash screen module and bitmap and then -proceeds to boot: +proceed to boot: .Pp .Bd -literal -offset indent -compact unload @@ -210,4 +210,4 @@ was written by .An Daniel C. Sobral Aq dcs@FreeBSD.org . .Sh BUGS -A british espionage series. +A British espionage series. ==== //depot/projects/kse/sys/boot/i386/boot2/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/i386/boot2/Makefile,v 1.27 2002/05/13 16:16:00 ru Exp $ +# $FreeBSD: src/sys/boot/i386/boot2/Makefile,v 1.29 2002/06/05 12:30:41 phk Exp $ PROG= boot2 NOMAN= @@ -30,6 +30,7 @@ CFLAGS= -elf -ffreestanding -Os -fno-builtin \ -fno-guess-branch-probability \ -mrtd \ + -I${.CURDIR}/../../common \ -I${.CURDIR}/../btx/lib -I. \ -Wall -Waggregate-return -Wbad-function-cast -Wcast-align \ -Wmissing-declarations -Wmissing-prototypes -Wnested-externs \ @@ -48,7 +49,7 @@ boot1.o: boot1.s ${AS} ${AFLAGS} --defsym FLAGS=${B1FLAGS} ${.IMPSRC} -o ${.TARGET} -boot2.o: boot2.c +boot2.o: boot2.c ${.CURDIR}/../../common/ufsread.c ${CC} ${CFLAGS} -S -o boot2.s.tmp ${.IMPSRC} sed -e '/align/d' -e '/nop/d' < boot2.s.tmp > boot2.s rm -f boot2.s.tmp ==== //depot/projects/kse/sys/boot/i386/boot2/boot2.c#10 (text+ko) ==== @@ -14,7 +14,7 @@ */ /* - * $FreeBSD: src/sys/boot/i386/boot2/boot2.c,v 1.41 2002/05/11 21:49:39 peter Exp $ + * $FreeBSD: src/sys/boot/i386/boot2/boot2.c,v 1.42 2002/06/05 11:10:38 phk Exp $ */ #include <sys/param.h> @@ -25,9 +25,6 @@ #include <machine/bootinfo.h> #include <machine/elf.h> -#include <ufs/ffs/fs.h> -#include <ufs/ufs/dinode.h> - #include <stdarg.h> #include <a.out.h> @@ -71,22 +68,6 @@ #define V86_CY(x) ((x) & 1) #define V86_ZR(x) ((x) & 0x40) -/* - * We use 4k `virtual' blocks for filesystem data, whatever the actual - * filesystem block size. FFS blocks are always a multiple of 4k. - */ -#define VBLKSIZE 4096 -#define VBLKMASK (VBLKSIZE - 1) -#define DBPERVBLK (VBLKSIZE / DEV_BSIZE) -#define IPERVBLK (VBLKSIZE / sizeof(struct dinode)) -#define INDIRPERVBLK (VBLKSIZE / sizeof(ufs_daddr_t)) -#define INO_TO_VBA(fs, x) (fsbtodb(fs, ino_to_fsba(fs, x)) + \ - (ino_to_fsbo(fs, x) / IPERVBLK) * DBPERVBLK) -#define INO_TO_VBO(fs, x) (ino_to_fsbo(fs, x) % IPERVBLK) -#define FS_TO_VBA(fs, fsb, off) (fsbtodb(fs, fsb) + \ - ((off) / VBLKSIZE) * DBPERVBLK) -#define FS_TO_VBO(fs, fsb, off) ((off) & VBLKMASK) - #define DRV_HARD 0x80 #define DRV_MASK 0x7f @@ -96,14 +77,6 @@ #define TYPE_FD 3 #define TYPE_DA 4 -/* Buffers that must not span a 64k boundary. */ -static struct dmadat { - char blkbuf[VBLKSIZE]; /* filesystem blocks */ - ufs_daddr_t indbuf[VBLKSIZE / sizeof(ufs_daddr_t)]; /* indir blocks */ - char sbbuf[SBSIZE]; /* superblock */ - char secbuf[DEV_BSIZE]; /* for MBR/disklabel */ -} *dmadat; - extern uint32_t _end; static const char optstr[NOPT] = "DhaCcdgmnPprsv"; @@ -135,14 +108,11 @@ unsigned part; unsigned start; int init; - int meta; } dsk; static char cmd[512]; static char kname[1024]; static uint32_t opts; static struct bootinfo bootinfo; -static int ls; -static uint32_t fs_off; static uint8_t ioctrl = IO_KEYBOARD; void exit(int); @@ -179,31 +149,8 @@ return (u_char)*s1 - (u_char)*s2; } -static inline int -fsfind(const char *name, ino_t * ino) -{ - char buf[DEV_BSIZE]; - struct dirent *d; - char *s; - ssize_t n; +#include "ufsread.c" - fs_off = 0; - while ((n = fsread(*ino, buf, DEV_BSIZE)) > 0) - for (s = buf; s < buf + DEV_BSIZE;) { - d = (void *)s; - if (ls) - printf("%s ", d->d_name); - else if (!strcmp(name, d->d_name)) { - *ino = d->d_fileno; - return d->d_type; - } - s += d->d_reclen; - } - if (n != -1 && ls) - putchar('\n'); - return 0; -} - static inline int getchar(void) { @@ -505,7 +452,7 @@ dsk.drive = (dsk.type == TYPE_WD || dsk.type == TYPE_AD || >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200206062012.g56KClC19632>