PERFORCE change 38813 for review
Peter Wemm
peter at FreeBSD.org
Mon Sep 29 17:03:35 PDT 2003
http://perforce.freebsd.org/chv.cgi?CH=38813
Change 38813 by peter at peter_daintree on 2003/09/29 17:03:15
IFC @38810
Affected files ...
.. //depot/projects/hammer/UPDATING#18 integrate
.. //depot/projects/hammer/etc/Makefile#17 integrate
.. //depot/projects/hammer/etc/defaults/devfs.rules#2 integrate
.. //depot/projects/hammer/etc/rc.d/ipfilter#10 integrate
.. //depot/projects/hammer/gnu/usr.bin/groff/tmac/mdoc.local#10 integrate
.. //depot/projects/hammer/lib/Makefile#25 integrate
.. //depot/projects/hammer/lib/libc/amd64/gen/fabs.S#5 integrate
.. //depot/projects/hammer/lib/libc/stdlib/malloc.c#9 integrate
.. //depot/projects/hammer/lib/libc_r/uthread/uthread_write.c#4 integrate
.. //depot/projects/hammer/lib/libdisk/libdisk.h#10 integrate
.. //depot/projects/hammer/lib/libkiconv/Makefile#1 branch
.. //depot/projects/hammer/lib/libkiconv/kiconv.3#1 branch
.. //depot/projects/hammer/lib/libkiconv/quirks.c#1 branch
.. //depot/projects/hammer/lib/libkiconv/quirks.h#1 branch
.. //depot/projects/hammer/lib/libkiconv/xlat16_iconv.c#1 branch
.. //depot/projects/hammer/lib/libkiconv/xlat16_sysctl.c#1 branch
.. //depot/projects/hammer/lib/libkvm/kvm_getprocs.3#4 integrate
.. //depot/projects/hammer/lib/libkvm/kvm_proc.c#14 integrate
.. //depot/projects/hammer/lib/libpthread/Makefile#13 integrate
.. //depot/projects/hammer/lib/libpthread/arch/alpha/include/atomic_ops.h#2 integrate
.. //depot/projects/hammer/lib/libpthread/arch/alpha/include/pthread_md.h#3 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_attr_setcreatesuspend_np.c#3 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_kern.c#22 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_sigaction.c#7 integrate
.. //depot/projects/hammer/lib/libthr/Makefile#5 integrate
.. //depot/projects/hammer/libexec/talkd/talkd.c#3 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#29 integrate
.. //depot/projects/hammer/release/i386/fixit_crunch.conf#5 integrate
.. //depot/projects/hammer/release/ia64/boot_crunch.conf#5 integrate
.. //depot/projects/hammer/release/pc98/fixit-small_crunch.conf#4 integrate
.. //depot/projects/hammer/release/pc98/fixit_crunch.conf#5 integrate
.. //depot/projects/hammer/rescue/rescue/Makefile#7 integrate
.. //depot/projects/hammer/sbin/devd/devd.8#7 integrate
.. //depot/projects/hammer/sbin/ipfw/ipfw.8#13 integrate
.. //depot/projects/hammer/sbin/mount_cd9660/Makefile#2 integrate
.. //depot/projects/hammer/sbin/mount_cd9660/mount_cd9660.8#3 integrate
.. //depot/projects/hammer/sbin/mount_cd9660/mount_cd9660.c#3 integrate
.. //depot/projects/hammer/sbin/mount_msdosfs/Makefile#2 integrate
.. //depot/projects/hammer/sbin/mount_msdosfs/iso22dos#2 delete
.. //depot/projects/hammer/sbin/mount_msdosfs/iso72dos#2 delete
.. //depot/projects/hammer/sbin/mount_msdosfs/koi2dos#2 delete
.. //depot/projects/hammer/sbin/mount_msdosfs/koi8u2dos#2 delete
.. //depot/projects/hammer/sbin/mount_msdosfs/mount_msdosfs.8#4 integrate
.. //depot/projects/hammer/sbin/mount_msdosfs/mount_msdosfs.c#3 integrate
.. //depot/projects/hammer/sbin/mount_ntfs/Makefile#2 integrate
.. //depot/projects/hammer/sbin/mount_ntfs/mount_ntfs.8#3 integrate
.. //depot/projects/hammer/sbin/mount_ntfs/mount_ntfs.c#2 integrate
.. //depot/projects/hammer/sbin/rcorder/rcorder.c#3 integrate
.. //depot/projects/hammer/sbin/route/route.8#2 integrate
.. //depot/projects/hammer/share/examples/scsi_target/scsi_cmds.c#2 integrate
.. //depot/projects/hammer/share/examples/scsi_target/scsi_target.c#3 integrate
.. //depot/projects/hammer/share/man/man4/acpi.4#11 integrate
.. //depot/projects/hammer/share/man/man4/amr.4#5 integrate
.. //depot/projects/hammer/share/man/man4/iir.4#4 integrate
.. //depot/projects/hammer/share/man/man4/wlan.4#3 integrate
.. //depot/projects/hammer/share/man/man9/Makefile#17 integrate
.. //depot/projects/hammer/share/man/man9/VOP_GETPAGES.9#3 integrate
.. //depot/projects/hammer/share/man/man9/disk.9#1 branch
.. //depot/projects/hammer/share/man/man9/pfil.9#3 integrate
.. //depot/projects/hammer/share/man/man9/pmap.9#1 branch
.. //depot/projects/hammer/share/man/man9/pmap_activate.9#1 branch
.. //depot/projects/hammer/share/man/man9/pmap_addr_hint.9#1 branch
.. //depot/projects/hammer/share/man/man9/pmap_change_wiring.9#1 branch
.. //depot/projects/hammer/share/man/man9/pmap_clear_modify.9#1 branch
.. //depot/projects/hammer/share/man/man9/pmap_copy.9#1 branch
.. //depot/projects/hammer/share/man/man9/pmap_enter.9#1 branch
.. //depot/projects/hammer/share/man/man9/pmap_extract.9#1 branch
.. //depot/projects/hammer/share/man/man9/pmap_growkernel.9#1 branch
.. //depot/projects/hammer/share/man/man9/pmap_init.9#1 branch
.. //depot/projects/hammer/share/man/man9/pmap_is_modified.9#1 branch
.. //depot/projects/hammer/share/man/man9/pmap_map.9#1 branch
.. //depot/projects/hammer/share/man/man9/pmap_mincore.9#1 branch
.. //depot/projects/hammer/share/man/man9/pmap_object_init_pt.9#1 branch
.. //depot/projects/hammer/share/man/man9/pmap_page_exists_quick.9#1 branch
.. //depot/projects/hammer/share/man/man9/pmap_page_protect.9#1 branch
.. //depot/projects/hammer/share/man/man9/pmap_pinit.9#1 branch
.. //depot/projects/hammer/share/man/man9/pmap_prefault.9#1 branch
.. //depot/projects/hammer/share/man/man9/pmap_qenter.9#1 branch
.. //depot/projects/hammer/share/man/man9/pmap_release.9#1 branch
.. //depot/projects/hammer/share/man/man9/pmap_remove.9#1 branch
.. //depot/projects/hammer/share/man/man9/pmap_zero_page.9#1 branch
.. //depot/projects/hammer/share/man/man9/style.9#10 integrate
.. //depot/projects/hammer/share/mk/bsd.libnames.mk#15 integrate
.. //depot/projects/hammer/share/mk/sys.mk#8 integrate
.. //depot/projects/hammer/share/skel/dot.mail_aliases#2 integrate
.. //depot/projects/hammer/sys/alpha/alpha/elf_machdep.c#7 integrate
.. //depot/projects/hammer/sys/alpha/alpha/promcons.c#5 integrate
.. //depot/projects/hammer/sys/alpha/include/elf.h#2 integrate
.. //depot/projects/hammer/sys/alpha/linux/linux_sysvec.c#6 integrate
.. //depot/projects/hammer/sys/alpha/osf1/osf1_sysvec.c#5 integrate
.. //depot/projects/hammer/sys/alpha/tlsb/zs_tlsb.c#5 integrate
.. //depot/projects/hammer/sys/amd64/amd64/elf_machdep.c#9 integrate
.. //depot/projects/hammer/sys/amd64/amd64/pmap.c#36 integrate
.. //depot/projects/hammer/sys/amd64/include/elf.h#9 integrate
.. //depot/projects/hammer/sys/amd64/include/pmap.h#20 integrate
.. //depot/projects/hammer/sys/amd64/include/vmparam.h#15 integrate
.. //depot/projects/hammer/sys/arm/include/elf.h#2 integrate
.. //depot/projects/hammer/sys/cam/scsi/scsi_targ_bh.c#6 integrate
.. //depot/projects/hammer/sys/compat/ia32/ia32_sysvec.c#2 integrate
.. //depot/projects/hammer/sys/compat/ia32/ia32_util.h#2 integrate
.. //depot/projects/hammer/sys/compat/pecoff/imgact_pecoff.c#7 integrate
.. //depot/projects/hammer/sys/compat/svr4/svr4_sysvec.c#7 integrate
.. //depot/projects/hammer/sys/conf/NOTES#26 integrate
.. //depot/projects/hammer/sys/conf/files#28 integrate
.. //depot/projects/hammer/sys/conf/majors#13 integrate
.. //depot/projects/hammer/sys/conf/options#24 integrate
.. //depot/projects/hammer/sys/ddb/db_elf.c#4 integrate
.. //depot/projects/hammer/sys/dev/aac/aac.c#15 integrate
.. //depot/projects/hammer/sys/dev/acpica/Osd/OsdSchedule.c#5 integrate
.. //depot/projects/hammer/sys/dev/acpica/Osd/OsdSynch.c#5 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi.c#13 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_acad.c#6 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_cmbat.c#7 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_ec.c#12 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_resource.c#5 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_thermal.c#6 integrate
.. //depot/projects/hammer/sys/dev/adlink/adlink.c#4 integrate
.. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx_pci.c#10 integrate
.. //depot/projects/hammer/sys/dev/aic7xxx/aic7xxx_pci.c#8 integrate
.. //depot/projects/hammer/sys/dev/asr/asr.c#7 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-all.c#13 integrate
.. //depot/projects/hammer/sys/dev/digi/digi.c#5 integrate
.. //depot/projects/hammer/sys/dev/exca/exca.c#7 integrate
.. //depot/projects/hammer/sys/dev/fb/fb.c#5 integrate
.. //depot/projects/hammer/sys/dev/fb/fbreg.h#10 integrate
.. //depot/projects/hammer/sys/dev/firewire/fwphyreg.h#1 branch
.. //depot/projects/hammer/sys/dev/gfb/gfb_pci.c#6 integrate
.. //depot/projects/hammer/sys/dev/iir/iir.c#7 integrate
.. //depot/projects/hammer/sys/dev/iir/iir.h#3 integrate
.. //depot/projects/hammer/sys/dev/iir/iir_ctrl.c#6 integrate
.. //depot/projects/hammer/sys/dev/iir/iir_pci.c#7 integrate
.. //depot/projects/hammer/sys/dev/isp/isp_freebsd.c#9 integrate
.. //depot/projects/hammer/sys/dev/kbd/kbd.c#4 integrate
.. //depot/projects/hammer/sys/dev/kbd/kbdreg.h#2 integrate
.. //depot/projects/hammer/sys/dev/md/md.c#16 integrate
.. //depot/projects/hammer/sys/dev/mii/brgphy.c#11 integrate
.. //depot/projects/hammer/sys/dev/nmdm/nmdm.c#4 integrate
.. //depot/projects/hammer/sys/dev/null/null.c#6 integrate
.. //depot/projects/hammer/sys/dev/ofw/ofw_console.c#6 integrate
.. //depot/projects/hammer/sys/dev/ofw/openfirmio.c#5 integrate
.. //depot/projects/hammer/sys/dev/puc/puc.c#8 integrate
.. //depot/projects/hammer/sys/dev/puc/pucvar.h#7 integrate
.. //depot/projects/hammer/sys/dev/raidframe/rf_decluster.c#3 integrate
.. //depot/projects/hammer/sys/dev/raidframe/rf_freebsdkintf.c#5 integrate
.. //depot/projects/hammer/sys/dev/sab/sab.c#7 integrate
.. //depot/projects/hammer/sys/dev/sio/sio.c#21 integrate
.. //depot/projects/hammer/sys/dev/syscons/syscons.c#10 integrate
.. //depot/projects/hammer/sys/dev/uart/uart.h#3 integrate
.. //depot/projects/hammer/sys/dev/uart/uart_bus.h#3 integrate
.. //depot/projects/hammer/sys/dev/uart/uart_bus_acpi.c#2 integrate
.. //depot/projects/hammer/sys/dev/uart/uart_bus_ebus.c#2 integrate
.. //depot/projects/hammer/sys/dev/uart/uart_bus_isa.c#2 integrate
.. //depot/projects/hammer/sys/dev/uart/uart_bus_pccard.c#3 integrate
.. //depot/projects/hammer/sys/dev/uart/uart_bus_pci.c#2 integrate
.. //depot/projects/hammer/sys/dev/uart/uart_bus_puc.c#2 integrate
.. //depot/projects/hammer/sys/dev/uart/uart_core.c#4 integrate
.. //depot/projects/hammer/sys/dev/uart/uart_cpu_alpha.c#3 integrate
.. //depot/projects/hammer/sys/dev/uart/uart_cpu_amd64.c#3 integrate
.. //depot/projects/hammer/sys/dev/uart/uart_cpu_i386.c#3 integrate
.. //depot/projects/hammer/sys/dev/uart/uart_cpu_ia64.c#3 integrate
.. //depot/projects/hammer/sys/dev/uart/uart_cpu_pc98.c#3 integrate
.. //depot/projects/hammer/sys/dev/uart/uart_cpu_sparc64.c#4 integrate
.. //depot/projects/hammer/sys/dev/uart/uart_dev_sab82532.c#4 integrate
.. //depot/projects/hammer/sys/dev/uart/uart_dev_z8530.c#4 integrate
.. //depot/projects/hammer/sys/dev/uart/uart_tty.c#3 integrate
.. //depot/projects/hammer/sys/dev/usb/ugen.c#9 integrate
.. //depot/projects/hammer/sys/dev/usb/uhid.c#8 integrate
.. //depot/projects/hammer/sys/dev/usb/ulpt.c#7 integrate
.. //depot/projects/hammer/sys/dev/usb/ums.c#5 integrate
.. //depot/projects/hammer/sys/dev/usb/uscanner.c#8 integrate
.. //depot/projects/hammer/sys/dev/vinum/vinumconfig.c#10 integrate
.. //depot/projects/hammer/sys/dev/vinum/vinumrevive.c#7 integrate
.. //depot/projects/hammer/sys/dev/vinum/vinumvar.h#4 integrate
.. //depot/projects/hammer/sys/dev/zs/zs.c#4 integrate
.. //depot/projects/hammer/sys/fs/fdescfs/fdesc_vnops.c#7 integrate
.. //depot/projects/hammer/sys/fs/msdosfs/direntry.h#2 integrate
.. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_conv.c#4 integrate
.. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_iconv.c#1 branch
.. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_lookup.c#2 integrate
.. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_vfsops.c#11 integrate
.. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_vnops.c#9 integrate
.. //depot/projects/hammer/sys/fs/msdosfs/msdosfsmount.h#3 integrate
.. //depot/projects/hammer/sys/fs/ntfs/ntfs.h#2 integrate
.. //depot/projects/hammer/sys/fs/ntfs/ntfs_iconv.c#1 branch
.. //depot/projects/hammer/sys/fs/ntfs/ntfs_subr.c#6 integrate
.. //depot/projects/hammer/sys/fs/ntfs/ntfs_subr.h#2 integrate
.. //depot/projects/hammer/sys/fs/ntfs/ntfs_vfsops.c#9 integrate
.. //depot/projects/hammer/sys/fs/ntfs/ntfs_vnops.c#6 integrate
.. //depot/projects/hammer/sys/fs/ntfs/ntfsmount.h#2 integrate
.. //depot/projects/hammer/sys/fs/procfs/procfs_map.c#3 integrate
.. //depot/projects/hammer/sys/fs/smbfs/smbfs_vfsops.c#7 integrate
.. //depot/projects/hammer/sys/fs/smbfs/smbfs_vnops.c#9 integrate
.. //depot/projects/hammer/sys/geom/geom_ctl.c#14 integrate
.. //depot/projects/hammer/sys/geom/geom_disk.c#18 integrate
.. //depot/projects/hammer/sys/geom/geom_io.c#15 integrate
.. //depot/projects/hammer/sys/i386/acpica/acpi_wakeup.c#12 integrate
.. //depot/projects/hammer/sys/i386/bios/smapi.c#4 integrate
.. //depot/projects/hammer/sys/i386/i386/elan-mmcr.c#8 integrate
.. //depot/projects/hammer/sys/i386/i386/elf_machdep.c#7 integrate
.. //depot/projects/hammer/sys/i386/i386/pmap.c#18 integrate
.. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_sysvec.c#4 integrate
.. //depot/projects/hammer/sys/i386/include/elf.h#5 integrate
.. //depot/projects/hammer/sys/i386/include/pmap.h#7 integrate
.. //depot/projects/hammer/sys/i386/isa/cy.c#4 integrate
.. //depot/projects/hammer/sys/i386/isa/pcvt/pcvt_drv.c#6 integrate
.. //depot/projects/hammer/sys/i386/linux/linux_sysvec.c#12 integrate
.. //depot/projects/hammer/sys/ia64/ia32/ia32_sysvec.c#5 integrate
.. //depot/projects/hammer/sys/ia64/ia64/elf_machdep.c#8 integrate
.. //depot/projects/hammer/sys/ia64/ia64/ssc.c#3 integrate
.. //depot/projects/hammer/sys/ia64/include/elf.h#3 integrate
.. //depot/projects/hammer/sys/ia64/include/varargs.h#4 integrate
.. //depot/projects/hammer/sys/isa/vga_isa.c#8 integrate
.. //depot/projects/hammer/sys/isofs/cd9660/cd9660_iconv.c#1 branch
.. //depot/projects/hammer/sys/isofs/cd9660/cd9660_lookup.c#5 integrate
.. //depot/projects/hammer/sys/isofs/cd9660/cd9660_mount.h#2 integrate
.. //depot/projects/hammer/sys/isofs/cd9660/cd9660_rrip.c#4 integrate
.. //depot/projects/hammer/sys/isofs/cd9660/cd9660_util.c#3 integrate
.. //depot/projects/hammer/sys/isofs/cd9660/cd9660_vfsops.c#10 integrate
.. //depot/projects/hammer/sys/isofs/cd9660/cd9660_vnops.c#7 integrate
.. //depot/projects/hammer/sys/isofs/cd9660/iso.h#2 integrate
.. //depot/projects/hammer/sys/kern/imgact_aout.c#7 integrate
.. //depot/projects/hammer/sys/kern/imgact_elf.c#10 integrate
.. //depot/projects/hammer/sys/kern/init_main.c#17 integrate
.. //depot/projects/hammer/sys/kern/kern_conf.c#10 integrate
.. //depot/projects/hammer/sys/kern/kern_exec.c#13 integrate
.. //depot/projects/hammer/sys/kern/kern_mac.c#19 integrate
.. //depot/projects/hammer/sys/kern/kern_sig.c#25 integrate
.. //depot/projects/hammer/sys/kern/subr_devstat.c#8 integrate
.. //depot/projects/hammer/sys/kern/subr_xxx.c#5 delete
.. //depot/projects/hammer/sys/kern/sys_generic.c#9 integrate
.. //depot/projects/hammer/sys/kern/tty_cons.c#9 integrate
.. //depot/projects/hammer/sys/kern/tty_pty.c#7 integrate
.. //depot/projects/hammer/sys/kern/tty_tty.c#5 integrate
.. //depot/projects/hammer/sys/kern/vfs_default.c#14 integrate
.. //depot/projects/hammer/sys/kern/vfs_mount.c#14 integrate
.. //depot/projects/hammer/sys/libkern/iconv.c#5 integrate
.. //depot/projects/hammer/sys/libkern/iconv_converter_if.m#2 integrate
.. //depot/projects/hammer/sys/libkern/iconv_xlat.c#4 integrate
.. //depot/projects/hammer/sys/libkern/iconv_xlat16.c#1 branch
.. //depot/projects/hammer/sys/modules/Makefile#26 integrate
.. //depot/projects/hammer/sys/modules/cd9660/Makefile#2 integrate
.. //depot/projects/hammer/sys/modules/cd9660_iconv/Makefile#1 branch
.. //depot/projects/hammer/sys/modules/libiconv/Makefile#2 integrate
.. //depot/projects/hammer/sys/modules/msdosfs/Makefile#3 integrate
.. //depot/projects/hammer/sys/modules/msdosfs_iconv/Makefile#1 branch
.. //depot/projects/hammer/sys/modules/ntfs/Makefile#2 integrate
.. //depot/projects/hammer/sys/modules/ntfs_iconv/Makefile#1 branch
.. //depot/projects/hammer/sys/net/if.c#9 integrate
.. //depot/projects/hammer/sys/net/if_tun.c#6 integrate
.. //depot/projects/hammer/sys/net/if_tunvar.h#2 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211_ioctl.c#6 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211_ioctl.h#3 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211_node.c#7 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211_node.h#5 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211_proto.c#4 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211_var.h#6 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#5 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#2 integrate
.. //depot/projects/hammer/sys/netinet/icmp6.h#3 integrate
.. //depot/projects/hammer/sys/netinet/ip6.h#3 integrate
.. //depot/projects/hammer/sys/netipsec/ipsec.c#5 integrate
.. //depot/projects/hammer/sys/netipsec/ipsec.h#4 integrate
.. //depot/projects/hammer/sys/netipsec/ipsec_input.c#6 integrate
.. //depot/projects/hammer/sys/netipsec/ipsec_mbuf.c#4 integrate
.. //depot/projects/hammer/sys/netipsec/ipsec_osdep.h#1 branch
.. //depot/projects/hammer/sys/netipsec/ipsec_output.c#6 integrate
.. //depot/projects/hammer/sys/netipsec/key.c#5 integrate
.. //depot/projects/hammer/sys/netipsec/key_debug.c#2 integrate
.. //depot/projects/hammer/sys/netipsec/keydb.h#3 integrate
.. //depot/projects/hammer/sys/netipsec/keysock.c#4 integrate
.. //depot/projects/hammer/sys/netipsec/xform_ah.c#5 integrate
.. //depot/projects/hammer/sys/netipsec/xform_esp.c#5 integrate
.. //depot/projects/hammer/sys/netipsec/xform_ipcomp.c#5 integrate
.. //depot/projects/hammer/sys/netipsec/xform_ipip.c#3 integrate
.. //depot/projects/hammer/sys/netkey/key.c#4 integrate
.. //depot/projects/hammer/sys/netkey/key_debug.c#3 integrate
.. //depot/projects/hammer/sys/netkey/key_debug.h#2 integrate
.. //depot/projects/hammer/sys/netkey/keysock.c#5 integrate
.. //depot/projects/hammer/sys/netncp/ncp_mod.c#4 integrate
.. //depot/projects/hammer/sys/netsmb/smb_dev.c#4 integrate
.. //depot/projects/hammer/sys/opencrypto/cryptodev.c#7 integrate
.. //depot/projects/hammer/sys/pc98/pc98/pc98gdc.c#6 integrate
.. //depot/projects/hammer/sys/pc98/pc98/sio.c#11 integrate
.. //depot/projects/hammer/sys/pci/if_xl.c#20 integrate
.. //depot/projects/hammer/sys/powerpc/include/cpu.h#6 integrate
.. //depot/projects/hammer/sys/powerpc/include/elf.h#2 integrate
.. //depot/projects/hammer/sys/powerpc/powerpc/clock.c#4 integrate
.. //depot/projects/hammer/sys/powerpc/powerpc/cpu.c#2 integrate
.. //depot/projects/hammer/sys/powerpc/powerpc/elf_machdep.c#6 integrate
.. //depot/projects/hammer/sys/sparc64/include/elf.h#4 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/elf_machdep.c#7 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/pmap.c#19 integrate
.. //depot/projects/hammer/sys/sys/conf.h#6 integrate
.. //depot/projects/hammer/sys/sys/cons.h#3 integrate
.. //depot/projects/hammer/sys/sys/iconv.h#2 integrate
.. //depot/projects/hammer/sys/sys/param.h#20 integrate
.. //depot/projects/hammer/sys/sys/signalvar.h#9 integrate
.. //depot/projects/hammer/sys/sys/sysent.h#4 integrate
.. //depot/projects/hammer/sys/sys/systm.h#10 integrate
.. //depot/projects/hammer/sys/vm/uma_dbg.c#6 integrate
.. //depot/projects/hammer/sys/vm/vm_map.c#20 integrate
.. //depot/projects/hammer/sys/vm/vm_map.h#7 integrate
.. //depot/projects/hammer/sys/vm/vm_mmap.c#10 integrate
.. //depot/projects/hammer/sys/vm/vm_page.c#15 integrate
.. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.holiday#5 integrate
.. //depot/projects/hammer/usr.bin/killall/killall.c#6 integrate
.. //depot/projects/hammer/usr.bin/rlogin/rlogin.1#3 integrate
.. //depot/projects/hammer/usr.bin/rlogin/rlogin.c#3 integrate
.. //depot/projects/hammer/usr.bin/su/su.1#5 integrate
.. //depot/projects/hammer/usr.bin/talk/ctl.c#2 integrate
.. //depot/projects/hammer/usr.bin/talk/io.c#2 integrate
.. //depot/projects/hammer/usr.bin/talk/look_up.c#2 integrate
.. //depot/projects/hammer/usr.sbin/asf/asf.8#2 integrate
.. //depot/projects/hammer/usr.sbin/asf/asf.c#2 integrate
.. //depot/projects/hammer/usr.sbin/fwcontrol/fwcontrol.8#6 integrate
.. //depot/projects/hammer/usr.sbin/fwcontrol/fwcontrol.c#7 integrate
.. //depot/projects/hammer/usr.sbin/sysinstall/config.c#8 integrate
.. //depot/projects/hammer/usr.sbin/sysinstall/menus.c#15 integrate
.. //depot/projects/hammer/usr.sbin/wicontrol/wicontrol.8#8 integrate
.. //depot/projects/hammer/usr.sbin/wicontrol/wicontrol.c#7 integrate
Differences ...
==== //depot/projects/hammer/UPDATING#18 (text+ko) ====
@@ -17,6 +17,22 @@
developers choose to disable these features on build machines
to maximize performance.
+20030928:
+ Changes to the cdevsw default functions have been made to remove
+ the need to specify nullopen() and nullclose() explicitly.
+ __FreeBSD_version bumpted to 501110.
+
+20030926:
+ kiconv(3) has been added. mount_msdosfs(8), mount_ntfs(8) and
+ mount_cd9660(8) need to be in sync with kernel.
+
+20030925:
+ Configuring a system to use IPFILTER now requires that PFIL_HOOKS
+ also be explicitly configured. Previously this dependency was
+ magically handled through some cruft in net/pfil.h; but that has
+ been removed. Building a kernel with IPFILTER but not PFIL_HOOKS
+ will fail with obtuse errors in ip_fil.c.
+
20030923:
Fix a bug in arplookup(), whereby a hostile party on a locally
attached network could exhaust kernel memory, and cause a system
@@ -1368,4 +1384,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: src/UPDATING,v 1.267 2003/09/23 16:39:30 bms Exp $
+$FreeBSD: src/UPDATING,v 1.270 2003/09/28 16:25:35 phk Exp $
==== //depot/projects/hammer/etc/Makefile#17 (text+ko) ====
@@ -1,5 +1,5 @@
# from: @(#)Makefile 5.11 (Berkeley) 5/21/91
-# $FreeBSD: src/etc/Makefile,v 1.318 2003/09/18 16:35:43 markm Exp $
+# $FreeBSD: src/etc/Makefile,v 1.319 2003/09/27 17:33:03 markm Exp $
.if !defined(NO_SENDMAIL)
SUBDIR= sendmail
@@ -11,7 +11,7 @@
hosts hosts.allow hosts.equiv hosts.lpd \
inetd.conf login.access login.conf \
mac.conf motd netconfig network.subr networks newsyslog.conf \
- phones printcap profile protocols \
+ phones profile protocols \
rc rc.firewall rc.firewall6 rc.sendmail rc.shutdown \
rc.subr remote rpc services \
shells sysctl.conf syslog.conf usbd.conf \
@@ -79,6 +79,11 @@
.if !defined(NO_I4B)
cd ${.CURDIR}/isdn; ${MAKE} install
.endif
+.if !defined(NO_LPR)
+ cd ${.CURDIR}; \
+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
+ printcap ${DESTDIR}/etc
+.endif
.if !defined(NO_SENDMAIL)
cd ${.CURDIR}/sendmail; ${MAKE} distribution
.endif
==== //depot/projects/hammer/etc/defaults/devfs.rules#2 (text+ko) ====
@@ -13,7 +13,7 @@
# references must include a dollar sign '$' in-front of the
# name to be expanded properly.
#
-# $FreeBSD: src/etc/defaults/devfs.rules,v 1.1 2003/08/20 06:15:18 mtm Exp $
+# $FreeBSD: src/etc/defaults/devfs.rules,v 1.2 2003/09/26 10:32:21 phk Exp $
#
# Very basic and secure ruleset: Hide everything.
@@ -28,6 +28,7 @@
[devfsrules_unhide_basic=2]
add path null unhide
add path zero unhide
+add path crypto unhide
add path random unhide
add path urandom unhide
==== //depot/projects/hammer/etc/rc.d/ipfilter#10 (text+ko) ====
@@ -1,7 +1,7 @@
#!/bin/sh
#
# $NetBSD: ipfilter,v 1.10 2001/02/28 17:03:50 lukem Exp $
-# $FreeBSD: src/etc/rc.d/ipfilter,v 1.11 2003/07/30 18:53:59 mtm Exp $
+# $FreeBSD: src/etc/rc.d/ipfilter,v 1.12 2003/09/27 13:50:47 mux Exp $
#
# PROVIDE: ipfilter
@@ -40,7 +40,7 @@
case ${OSTYPE} in
FreeBSD)
# load ipfilter kernel module if needed
- if ! sysctl net.inet.ipf.fr_pass > /dev/null 2>&1; then
+ if ! kldstat -v | grep "IP Filter" > /dev/null 2>&1; then
if kldload ipl; then
info 'IP-filter module loaded.'
else
@@ -79,12 +79,15 @@
echo "Enabling ipfilter."
case ${OSTYPE} in
FreeBSD)
- ${ipfilter_program:-/sbin/ipf} -EFa
+ if [ `sysctl -n net.inet.ipf.fr_running` -eq 0 ]; then
+ ${ipfilter_program:-/sbin/ipf} -E
+ fi
+ ${ipfilter_program:-/sbin/ipf} -Fa
if [ -r "${ipfilter_rules}" ]; then
${ipfilter_program:-/sbin/ipf} \
-f "${ipfilter_rules}" ${ipfilter_flags}
fi
- ${ipfilter_program:-/sbin/ipf} -6 -EFa
+ ${ipfilter_program:-/sbin/ipf} -6 -Fa
if [ -r "${ipv6_ipfilter_rules}" ]; then
${ipfilter_program:-/sbin/ipf} -6 \
-f "${ipv6_ipfilter_rules}" ${ipfilter_flags}
@@ -104,17 +107,21 @@
ipfilter_stop()
{
- case ${OSTYPE} in
- FreeBSD)
- echo "Saving firewall state tables"
- ${ipfs_program:-/sbin/ipfs} -W ${ipfs_flags}
- ;;
- NetBSD)
- ;;
- esac
- # XXX - The following command is not effective for 'lkm's
- echo "Disabling ipfilter."
- /sbin/ipf -D
+ # XXX - The ipf -D command is not effective for 'lkm's
+ if [ `sysctl -n net.inet.ipf.fr_running` -eq 1 ]; then
+ case ${OSTYPE} in
+ FreeBSD)
+ echo "Saving firewall state tables"
+ ${ipfs_program:-/sbin/ipfs} -W ${ipfs_flags}
+ echo "Disabling ipfilter."
+ ${ipfilter_program:-/sbin/ipf} -D
+ ;;
+ NetBSD)
+ echo "Disabling ipfilter."
+ /sbin/ipf -D
+ ;;
+ esac
+ fi
}
ipfilter_reload()
@@ -157,7 +164,7 @@
case ${OSTYPE} in
FreeBSD)
# Don't resync if ipfilter is not loaded
- [ sysctl net.inet.ipf.fr_pass > /dev/null 2>&1 ] && return
+ [ kldstat -v | grep "IP Filter" > /dev/null 2>&1 ] && return
;;
esac
${ipfilter_program:-/sbin/ipf} -y ${ipfilter_flags}
==== //depot/projects/hammer/gnu/usr.bin/groff/tmac/mdoc.local#10 (text+ko) ====
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.30 2003/09/20 21:32:26 ru Exp $
+.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.31 2003/09/26 20:26:20 fjoe Exp $
.\"
.\" %beginstrip%
.
@@ -43,6 +43,7 @@
.ds doc-str-Lb-libfetch File Transfer Library (libfetch, \-lfetch)
.ds doc-str-Lb-libgeom Userland API Library for kernel GEOM subsystem (libgeom, \-lgeom)
.ds doc-str-Lb-libipx IPX Address Conversion Support Library (libipx, \-lipx)
+.ds doc-str-Lb-libkiconv Kernel side iconv library (libkiconv, \-lkiconv)
.ds doc-str-Lb-libmd Message Digest (MD4, MD5, etc.) Support Library (libmd, \-lmd)
.ds doc-str-Lb-libnetgraph Netgraph User Library (libnetgraph, \-lnetgraph)
.ds doc-str-Lb-libpam PAM Library (libpam, \-lpam)
==== //depot/projects/hammer/lib/Makefile#25 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/Makefile,v 1.171 2003/08/29 10:35:00 phk Exp $
+# $FreeBSD: src/lib/Makefile,v 1.172 2003/09/26 20:26:20 fjoe Exp $
# To satisfy shared library or ELF linkage when only the libraries being
# built are visible:
@@ -26,7 +26,7 @@
${_compat} libalias ${_libatm} ${_libbind} libbz2 libc ${_libc_r} \
libcalendar libcam libcompat libdevinfo libdevstat ${_libdisk} \
libedit libexpat libfetch libform libftpio libgeom ${_libio} libipsec \
- libipx libisc libmenu ${_libmilter} ${_libmp} ${_libncp} \
+ libipx libisc libkiconv libmenu ${_libmilter} ${_libmp} ${_libncp} \
libnetgraph libopie libpam libpanel libpcap ${_libpthread} \
${_libsm} ${_libsmb} ${_libsmdb} ${_libsmutil} \
libstand libtelnet ${_libthr} libufs libugidfw ${_libusbhid} \
==== //depot/projects/hammer/lib/libc/amd64/gen/fabs.S#5 (text+ko) ====
@@ -2,7 +2,7 @@
#if defined(LIBC_SCCS)
RCSID("$NetBSD: fabs.S,v 1.4 1997/07/16 14:37:16 christos Exp $")
#endif
-__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/fabs.S,v 1.1 2003/04/30 16:21:03 obrien Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/fabs.S,v 1.2 2003/09/26 01:49:48 peter Exp $");
/*
* Ok, this sucks. Is there really no way to push an xmm register onto
@@ -13,6 +13,6 @@
movsd %xmm0, -8(%rsp)
fldl -8(%rsp)
fabs
- fstp -8(%rsp)
+ fstpl -8(%rsp)
movsd -8(%rsp),%xmm0
ret
==== //depot/projects/hammer/lib/libc/stdlib/malloc.c#9 (text+ko) ====
@@ -9,17 +9,17 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.77 2003/07/29 11:16:14 phk Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.79 2003/09/27 18:58:26 phk Exp $");
/*
- * Defining EXTRA_SANITY will enable extra checks which are related
+ * Defining MALLOC_EXTRA_SANITY will enable extra checks which are related
* to internal conditions and consistency in malloc.c. This has a
* noticeable runtime performance hit, and generally will not do you
* any good unless you fiddle with the internals of malloc or want
* to catch random pointer corruption as early as possible.
*/
-#ifndef MALLOC_EXTRA_SANITY
-#undef MALLOC_EXTRA_SANITY
+#ifndef MALLOC_MALLOC_EXTRA_SANITY
+#undef MALLOC_MALLOC_EXTRA_SANITY
#endif
/*
@@ -76,8 +76,8 @@
# include "libc_private.h"
# include "spinlock.h"
static spinlock_t thread_lock = _SPINLOCK_INITIALIZER;
-# define THREAD_LOCK() if (__isthreaded) _SPINLOCK(&thread_lock);
-# define THREAD_UNLOCK() if (__isthreaded) _SPINUNLOCK(&thread_lock);
+# define _MALLOC_LOCK() if (__isthreaded) _SPINLOCK(&thread_lock);
+# define _MALLOC_UNLOCK() if (__isthreaded) _SPINUNLOCK(&thread_lock);
#endif /* __FreeBSD__ */
#if defined(__sparc__) && defined(sun)
@@ -184,12 +184,12 @@
#define pageround(foo) (((foo) + (malloc_pagemask))&(~(malloc_pagemask)))
#define ptr2index(foo) (((u_long)(foo) >> malloc_pageshift)-malloc_origo)
-#ifndef THREAD_LOCK
-#define THREAD_LOCK()
+#ifndef _MALLOC_LOCK
+#define _MALLOC_LOCK()
#endif
-#ifndef THREAD_UNLOCK
-#define THREAD_UNLOCK()
+#ifndef _MALLOC_UNLOCK
+#define _MALLOC_UNLOCK()
#endif
#ifndef MMAP_FD
@@ -331,22 +331,22 @@
result = (caddr_t)pageround((u_long)sbrk(0));
tail = result + (pages << malloc_pageshift);
if (tail < result)
- return 0;
+ return (NULL);
if (brk(tail)) {
-#ifdef EXTRA_SANITY
- wrterror("(ES): map_pages fails\n");
-#endif /* EXTRA_SANITY */
- return 0;
+#ifdef MALLOC_EXTRA_SANITY
+ wrterror("(ES): map_pages fails.\n");
+#endif /* MALLOC_EXTRA_SANITY */
+ return (NULL);
}
last_index = ptr2index(tail) - 1;
malloc_brk = tail;
if ((last_index+1) >= malloc_ninfo && !extend_pgdir(last_index))
- return 0;;
+ return (NULL);
- return result;
+ return (result);
}
/*
@@ -383,8 +383,8 @@
/* Get new pages */
new = (struct pginfo**) MMAP(i * malloc_pagesize);
- if (new == (struct pginfo **)-1)
- return 0;
+ if (new == MAP_FAILED)
+ return (0);
/* Copy the old stuff */
memcpy(new, page_dir,
@@ -399,7 +399,7 @@
/* Now free the old stuff */
munmap(old, oldlen);
- return 1;
+ return (1);
}
/*
@@ -421,9 +421,9 @@
malloc_pageshift++;
#endif
-#ifdef EXTRA_SANITY
+#ifdef MALLOC_EXTRA_SANITY
malloc_junk = 1;
-#endif /* EXTRA_SANITY */
+#endif /* MALLOC_EXTRA_SANITY */
for (i = 0; i < 3; i++) {
if (i == 0) {
@@ -439,7 +439,7 @@
} else {
p = _malloc_options;
}
- for (; p && *p; p++) {
+ for (; p != NULL && *p != '\0'; p++) {
switch (*p) {
case '>': malloc_cache <<= 1; break;
case '<': malloc_cache >>= 1; break;
@@ -464,7 +464,7 @@
default:
j = malloc_abort;
malloc_abort = 0;
- wrtwarning("unknown char in MALLOC_OPTIONS\n");
+ wrtwarning("unknown char in MALLOC_OPTIONS.\n");
malloc_abort = j;
break;
}
@@ -498,7 +498,7 @@
page_dir = (struct pginfo **) MMAP(malloc_pagesize);
if (page_dir == (struct pginfo **) -1)
- wrterror("mmap(2) failed, check limits\n");
+ wrterror("mmap(2) failed, check limits.\n");
/*
* We need a maximum of malloc_pageshift buckets, steal these from the
@@ -509,6 +509,9 @@
malloc_ninfo = malloc_pagesize / sizeof *page_dir;
+ /* Been here, done that */
+ malloc_started++;
+
/* Recalculate the cache size in bytes, and make sure it's nonzero */
if (!malloc_cache)
@@ -521,9 +524,6 @@
* We can sbrk(2) further back when we keep this on a low address.
*/
px = (struct pgfree *) imalloc (sizeof *px);
-
- /* Been here, done that */
- malloc_started++;
}
/*
@@ -532,41 +532,41 @@
static void *
malloc_pages(size_t size)
{
- void *p, *delay_free = 0;
+ void *p, *delay_free = NULL;
size_t i;
struct pgfree *pf;
u_long index;
size = pageround(size);
- p = 0;
+ p = NULL;
/* Look for free pages before asking for more */
for(pf = free_list.next; pf; pf = pf->next) {
-#ifdef EXTRA_SANITY
+#ifdef MALLOC_EXTRA_SANITY
if (pf->size & malloc_pagemask)
- wrterror("(ES): junk length entry on free_list\n");
+ wrterror("(ES): junk length entry on free_list.\n");
if (!pf->size)
- wrterror("(ES): zero length entry on free_list\n");
+ wrterror("(ES): zero length entry on free_list.\n");
if (pf->page == pf->end)
- wrterror("(ES): zero entry on free_list\n");
+ wrterror("(ES): zero entry on free_list.\n");
if (pf->page > pf->end)
- wrterror("(ES): sick entry on free_list\n");
+ wrterror("(ES): sick entry on free_list.\n");
if ((void*)pf->page >= (void*)sbrk(0))
- wrterror("(ES): entry on free_list past brk\n");
+ wrterror("(ES): entry on free_list past brk.\n");
if (page_dir[ptr2index(pf->page)] != MALLOC_FREE)
- wrterror("(ES): non-free first page on free-list\n");
+ wrterror("(ES): non-free first page on free-list.\n");
if (page_dir[ptr2index(pf->end)-1] != MALLOC_FREE)
- wrterror("(ES): non-free last page on free-list\n");
-#endif /* EXTRA_SANITY */
+ wrterror("(ES): non-free last page on free-list.\n");
+#endif /* MALLOC_EXTRA_SANITY */
if (pf->size < size)
continue;
if (pf->size == size) {
p = pf->page;
- if (pf->next)
+ if (pf->next != NULL)
pf->next->prev = pf->prev;
pf->prev->next = pf->next;
delay_free = pf;
@@ -579,18 +579,18 @@
break;
}
-#ifdef EXTRA_SANITY
- if (p && page_dir[ptr2index(p)] != MALLOC_FREE)
- wrterror("(ES): allocated non-free page on free-list\n");
-#endif /* EXTRA_SANITY */
+#ifdef MALLOC_EXTRA_SANITY
+ if (p != NULL && page_dir[ptr2index(p)] != MALLOC_FREE)
+ wrterror("(ES): allocated non-free page on free-list.\n");
+#endif /* MALLOC_EXTRA_SANITY */
size >>= malloc_pageshift;
/* Map new pages */
- if (!p)
+ if (p == NULL)
p = map_pages(size);
- if (p) {
+ if (p != NULL) {
index = ptr2index(p);
page_dir[index] = MALLOC_FIRST;
@@ -602,13 +602,13 @@
}
if (delay_free) {
- if (!px)
+ if (px == NULL)
px = delay_free;
else
ifree(delay_free);
}
- return p;
+ return (p);
}
/*
@@ -624,8 +624,8 @@
/* Allocate a new bucket */
pp = malloc_pages(malloc_pagesize);
- if (!pp)
- return 0;
+ if (pp == NULL)
+ return (0);
/* Find length of admin structure */
l = offsetof(struct pginfo, bits[0]);
@@ -637,9 +637,9 @@
bp = (struct pginfo *)pp;
} else {
bp = (struct pginfo *)imalloc(l);
- if (!bp) {
+ if (bp == NULL) {
ifree(pp);
- return 0;
+ return (0);
}
}
@@ -678,7 +678,7 @@
/* MALLOC_UNLOCK */
- return 1;
+ return (1);
}
/*
@@ -704,8 +704,8 @@
j++;
/* If it's empty, make a page more of that size chunks */
- if (!page_dir[j] && !malloc_make_chunks(j))
- return 0;
+ if (page_dir[j] == NULL && !malloc_make_chunks(j))
+ return (NULL);
bp = page_dir[j];
@@ -725,7 +725,7 @@
/* If there are no more free, remove from free-list */
if (!--bp->free) {
page_dir[j] = bp->next;
- bp->next = 0;
+ bp->next = NULL;
}
/* Adjust to the real offset of that chunk */
@@ -735,7 +735,7 @@
if (malloc_junk)
memset((u_char*)bp->page + k, SOME_JUNK, bp->size);
- return (u_char *)bp->page + k;
+ return ((u_char *)bp->page + k);
}
/*
@@ -746,22 +746,28 @@
{
void *result;
+ if (!malloc_started)
+ malloc_init();
+
if (suicide)
abort();
if ((size + malloc_pagesize) < size) /* Check for overflow */
- result = 0;
+ result = NULL;
else if ((size + malloc_pagesize) >= (uintptr_t)page_dir)
- result = 0;
+ result = NULL;
else if (size <= malloc_maxsize)
- result = malloc_bytes(size);
+ result = malloc_bytes(size);
else
- result = malloc_pages(size);
+ result = malloc_pages(size);
+
+ if (malloc_abort && result == NULL)
+ wrterror("allocation failed.\n");
- if (malloc_zero && result)
+ if (malloc_zero && result != NULL)
memset(result, 0, size);
- return result;
+ return (result);
}
/*
@@ -778,16 +784,21 @@
if (suicide)
abort();
+ if (!malloc_started) {
+ wrtwarning("malloc() has never been called.\n");
+ return (NULL);
+ }
+
index = ptr2index(ptr);
if (index < malloc_pageshift) {
- wrtwarning("junk pointer, too low to make sense\n");
- return 0;
+ wrtwarning("junk pointer, too low to make sense.\n");
+ return (NULL);
}
if (index > last_index) {
- wrtwarning("junk pointer, too high to make sense\n");
- return 0;
+ wrtwarning("junk pointer, too high to make sense.\n");
+ return (NULL);
}
mp = &page_dir[index];
@@ -796,26 +807,28 @@
/* Check the pointer */
if ((u_long)ptr & malloc_pagemask) {
- wrtwarning("modified (page-) pointer\n");
- return 0;
+ wrtwarning("modified (page-) pointer.\n");
+ return (NULL);
}
/* Find the size in bytes */
- for (osize = malloc_pagesize; *++mp == MALLOC_FOLLOW;)
+ for (osize = malloc_pagesize; *(++mp) == MALLOC_FOLLOW;)
osize += malloc_pagesize;
- if (!malloc_realloc && /* unless we have to, */
+ if (!malloc_realloc && /* Unless we have to, */
size <= osize && /* .. or are too small, */
size > (osize - malloc_pagesize)) { /* .. or can free a page, */
- return ptr; /* don't do anything. */
+ if (malloc_junk)
+ memset((char *)ptr + size, SOME_JUNK, osize-size);
+ return (ptr); /* ..don't do anything else. */
}
} else if (*mp >= MALLOC_MAGIC) { /* Chunk allocation */
/* Check the pointer for sane values */
if (((u_long)ptr & ((*mp)->size-1))) {
- wrtwarning("modified (chunk-) pointer\n");
- return 0;
+ wrtwarning("modified (chunk-) pointer.\n");
+ return (NULL);
}
/* Find the chunk index in the page */
@@ -823,27 +836,29 @@
/* Verify that it isn't a free chunk already */
if ((*mp)->bits[i/MALLOC_BITS] & (1<<(i%MALLOC_BITS))) {
- wrtwarning("chunk is already free\n");
- return 0;
+ wrtwarning("chunk is already free.\n");
+ return (NULL);
}
osize = (*mp)->size;
if (!malloc_realloc && /* Unless we have to, */
- size < osize && /* ..or are too small, */
+ size <= osize && /* ..or are too small, */
(size > osize/2 || /* ..or could use a smaller size, */
osize == malloc_minsize)) { /* ..(if there is one) */
- return ptr; /* ..Don't do anything */
+ if (malloc_junk)
+ memset((char *)ptr + size, SOME_JUNK, osize-size);
+ return (ptr); /* ..don't do anything else. */
}
} else {
- wrtwarning("pointer to wrong page\n");
- return 0;
+ wrtwarning("pointer to wrong page.\n");
+ return (NULL);
}
p = imalloc(size);
- if (p) {
+ if (p != NULL) {
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list