Date: Mon, 15 Aug 2005 18:13:42 GMT From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 82027 for review Message-ID: <200508151813.j7FIDgmH084002@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=82027 Change 82027 by peter@peter_overcee on 2005/08/15 18:13:01 IFC @82025 Affected files ... .. //depot/projects/hammer/MAINTAINERS#35 integrate .. //depot/projects/hammer/Makefile.inc1#102 integrate .. //depot/projects/hammer/ObsoleteFiles.inc#4 integrate .. //depot/projects/hammer/bin/sh/Makefile#7 integrate .. //depot/projects/hammer/bin/sh/alias.c#4 integrate .. //depot/projects/hammer/bin/sh/arith.h#4 integrate .. //depot/projects/hammer/bin/sh/arith.y#6 integrate .. //depot/projects/hammer/bin/sh/arith_lex.l#5 integrate .. //depot/projects/hammer/bin/sh/bltin/bltin.h#3 integrate .. //depot/projects/hammer/bin/sh/exec.c#6 integrate .. //depot/projects/hammer/bin/sh/histedit.c#4 integrate .. //depot/projects/hammer/bin/sh/mail.c#3 integrate .. //depot/projects/hammer/bin/sh/miscbltin.c#4 integrate .. //depot/projects/hammer/bin/sh/mkbuiltins#6 integrate .. //depot/projects/hammer/bin/sh/mkinit.c#3 integrate .. //depot/projects/hammer/bin/sh/mksyntax.c#5 integrate .. //depot/projects/hammer/bin/sh/parser.c#9 integrate .. //depot/projects/hammer/bin/sh/var.c#7 integrate .. //depot/projects/hammer/bin/sleep/sleep.c#7 integrate .. //depot/projects/hammer/contrib/pf/man/pf.os.5#4 integrate .. //depot/projects/hammer/contrib/pf/man/pfsync.4#7 integrate .. //depot/projects/hammer/contrib/pf/pflogd/pflogd.8#4 integrate .. //depot/projects/hammer/contrib/smbfs/lib/smb/ctx.c#6 integrate .. //depot/projects/hammer/etc/Makefile#42 integrate .. //depot/projects/hammer/etc/defaults/rc.conf#58 integrate .. //depot/projects/hammer/etc/mtree/BSD.var.dist#8 integrate .. //depot/projects/hammer/etc/portsnap.conf#1 branch .. //depot/projects/hammer/etc/rc.d/Makefile#37 integrate .. //depot/projects/hammer/etc/rc.d/cleanvar#9 integrate .. //depot/projects/hammer/etc/rc.d/encswap#1 branch .. //depot/projects/hammer/etc/rc.d/gbde#9 integrate .. //depot/projects/hammer/etc/rc.d/gbde_swap#5 delete .. //depot/projects/hammer/etc/rc.d/geli#1 branch .. //depot/projects/hammer/etc/rc.d/geli2#1 branch .. //depot/projects/hammer/etc/rc.d/jail#16 integrate .. //depot/projects/hammer/etc/rc.subr#23 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes#47 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes2-o#10 integrate .. //depot/projects/hammer/games/fortune/datfiles/freebsd-tips#14 integrate .. //depot/projects/hammer/gnu/usr.bin/Makefile#13 integrate .. //depot/projects/hammer/gnu/usr.bin/bc/Makefile#3 integrate .. //depot/projects/hammer/gnu/usr.bin/dialog/Makefile#3 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/kgdb/main.c#8 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/kgdb/trgt.c#3 integrate .. //depot/projects/hammer/include/Makefile#46 integrate .. //depot/projects/hammer/include/histedit.h#3 integrate .. //depot/projects/hammer/include/wchar.h#18 integrate .. //depot/projects/hammer/lib/libarchive/archive_platform.h#11 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_data_into_fd.c#9 integrate .. //depot/projects/hammer/lib/libarchive/configure.ac.in#6 integrate .. //depot/projects/hammer/lib/libc/Makefile#21 integrate .. //depot/projects/hammer/lib/libc/gen/Makefile.inc#23 integrate .. //depot/projects/hammer/lib/libc/net/Makefile.inc#12 integrate .. //depot/projects/hammer/lib/libc/regex/regex2.h#3 integrate .. //depot/projects/hammer/lib/libc/string/Makefile.inc#9 integrate .. //depot/projects/hammer/lib/libc/string/wcsdup.c#1 branch .. //depot/projects/hammer/lib/libc/string/wmemchr.3#3 integrate .. //depot/projects/hammer/lib/libdevstat/devstat.3#9 integrate .. //depot/projects/hammer/lib/libedit/Makefile#6 integrate .. //depot/projects/hammer/lib/libedit/TEST/test.c#2 integrate .. //depot/projects/hammer/lib/libedit/chared.c#2 integrate .. //depot/projects/hammer/lib/libedit/chared.h#3 integrate .. //depot/projects/hammer/lib/libedit/common.c#3 integrate .. //depot/projects/hammer/lib/libedit/editline.3#6 integrate .. //depot/projects/hammer/lib/libedit/editrc.5#4 integrate .. //depot/projects/hammer/lib/libedit/el.c#2 integrate .. //depot/projects/hammer/lib/libedit/el.h#2 integrate .. //depot/projects/hammer/lib/libedit/emacs.c#3 integrate .. //depot/projects/hammer/lib/libedit/hist.c#2 integrate .. //depot/projects/hammer/lib/libedit/hist.h#2 integrate .. //depot/projects/hammer/lib/libedit/history.c#3 integrate .. //depot/projects/hammer/lib/libedit/key.c#3 integrate .. //depot/projects/hammer/lib/libedit/key.h#2 integrate .. //depot/projects/hammer/lib/libedit/makelist#3 integrate .. //depot/projects/hammer/lib/libedit/map.c#2 integrate .. //depot/projects/hammer/lib/libedit/map.h#2 integrate .. //depot/projects/hammer/lib/libedit/parse.c#2 integrate .. //depot/projects/hammer/lib/libedit/parse.h#2 integrate .. //depot/projects/hammer/lib/libedit/prompt.c#2 integrate .. //depot/projects/hammer/lib/libedit/prompt.h#2 integrate .. //depot/projects/hammer/lib/libedit/read.c#2 integrate .. //depot/projects/hammer/lib/libedit/read.h#1 branch .. //depot/projects/hammer/lib/libedit/refresh.c#2 integrate .. //depot/projects/hammer/lib/libedit/refresh.h#2 integrate .. //depot/projects/hammer/lib/libedit/search.c#2 integrate .. //depot/projects/hammer/lib/libedit/search.h#2 integrate .. //depot/projects/hammer/lib/libedit/sig.c#2 integrate .. //depot/projects/hammer/lib/libedit/sig.h#2 integrate .. //depot/projects/hammer/lib/libedit/sys.h#2 integrate .. //depot/projects/hammer/lib/libedit/term.c#2 integrate .. //depot/projects/hammer/lib/libedit/term.h#2 integrate .. //depot/projects/hammer/lib/libedit/tokenizer.c#2 integrate .. //depot/projects/hammer/lib/libedit/tokenizer.h#2 delete .. //depot/projects/hammer/lib/libedit/tty.c#2 integrate .. //depot/projects/hammer/lib/libedit/tty.h#2 integrate .. //depot/projects/hammer/lib/libedit/vi.c#3 integrate .. //depot/projects/hammer/lib/libfetch/ftp.c#8 integrate .. //depot/projects/hammer/lib/libkiconv/xlat16_iconv.c#4 integrate .. //depot/projects/hammer/lib/libmemstat/libmemstat.3#5 integrate .. //depot/projects/hammer/lib/libmemstat/memstat.h#5 integrate .. //depot/projects/hammer/lib/libmemstat/memstat_all.c#3 integrate .. //depot/projects/hammer/lib/libmemstat/memstat_malloc.c#5 integrate .. //depot/projects/hammer/lib/libmemstat/memstat_uma.c#6 integrate .. //depot/projects/hammer/rescue/librescue/Makefile#6 integrate .. //depot/projects/hammer/sbin/atacontrol/atacontrol.c#17 integrate .. //depot/projects/hammer/sbin/atm/atmconfig/diag.c#7 integrate .. //depot/projects/hammer/sbin/bsdlabel/bsdlabel.c#19 integrate .. //depot/projects/hammer/sbin/ccdconfig/ccdconfig.c#8 integrate .. //depot/projects/hammer/sbin/fsdb/fsdb.c#5 integrate .. //depot/projects/hammer/sbin/geom/class/eli/geli.8#2 integrate .. //depot/projects/hammer/sbin/geom/class/eli/geom_eli.c#2 integrate .. //depot/projects/hammer/sbin/geom/class/label/glabel.8#10 integrate .. //depot/projects/hammer/sbin/geom/core/geom.c#11 integrate .. //depot/projects/hammer/sbin/ifconfig/ifconfig.8#28 integrate .. //depot/projects/hammer/sbin/ifconfig/ifieee80211.c#16 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw.8#45 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw2.c#44 integrate .. //depot/projects/hammer/sbin/mount_ext2fs/mount_ext2fs.c#8 integrate .. //depot/projects/hammer/sbin/newfs/mkfs.c#20 integrate .. //depot/projects/hammer/sbin/ping/ping.8#8 integrate .. //depot/projects/hammer/sbin/ping/ping.c#17 integrate .. //depot/projects/hammer/sbin/routed/input.c#5 integrate .. //depot/projects/hammer/share/Makefile#8 integrate .. //depot/projects/hammer/share/man/man4/Makefile#74 integrate .. //depot/projects/hammer/share/man/man4/ata.4#17 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/acpi_ibm.4#5 integrate .. //depot/projects/hammer/share/man/man4/nge.4#7 integrate .. //depot/projects/hammer/share/man/man4/nve.4#4 integrate .. //depot/projects/hammer/share/man/man4/pcvt.4#5 integrate .. //depot/projects/hammer/share/man/man4/re.4#14 integrate .. //depot/projects/hammer/share/man/man4/rl.4#15 integrate .. //depot/projects/hammer/share/man/man4/snd_t4dwave.4#1 branch .. //depot/projects/hammer/share/man/man4/twe.4#9 integrate .. //depot/projects/hammer/share/man/man4/uhid.4#4 integrate .. //depot/projects/hammer/share/man/man5/Makefile#12 integrate .. //depot/projects/hammer/share/man/man5/libmap.conf.5#9 integrate .. //depot/projects/hammer/share/man/man5/portsnap.conf.5#1 branch .. //depot/projects/hammer/share/man/man5/rc.conf.5#60 integrate .. //depot/projects/hammer/share/man/man9/bios.9#4 integrate .. //depot/projects/hammer/share/man/man9/bus_alloc_resource.9#10 integrate .. //depot/projects/hammer/share/man/man9/device_add_child.9#7 integrate .. //depot/projects/hammer/share/man/man9/driver.9#5 integrate .. //depot/projects/hammer/share/man/man9/mbuf.9#23 integrate .. //depot/projects/hammer/share/mk/bsd.lib.mk#24 integrate .. //depot/projects/hammer/share/termcap/Makefile#3 integrate .. //depot/projects/hammer/share/termcap/map3270#3 delete .. //depot/projects/hammer/sys/alpha/conf/GENERIC.hints#6 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#123 integrate .. //depot/projects/hammer/sys/boot/forth/loader.conf#23 integrate .. //depot/projects/hammer/sys/boot/i386/boot2/boot2.c#14 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_target.c#16 integrate .. //depot/projects/hammer/sys/coda/coda_fbsd.c#18 integrate .. //depot/projects/hammer/sys/compat/linux/linux_ioctl.c#24 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_sockio.c#7 integrate .. //depot/projects/hammer/sys/conf/files#122 integrate .. //depot/projects/hammer/sys/contrib/altq/altq/altq_cbq.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/oltr/if_oltr.c#13 integrate .. //depot/projects/hammer/sys/contrib/pf/net/if_pflog.c#13 integrate .. //depot/projects/hammer/sys/contrib/pf/net/if_pfsync.c#17 integrate .. //depot/projects/hammer/sys/ddb/db_command.c#14 integrate .. //depot/projects/hammer/sys/dev/aac/aac_compat.h#2 delete .. //depot/projects/hammer/sys/dev/aac/aac_debug.c#8 integrate .. //depot/projects/hammer/sys/dev/aac/aac_pci.c#23 integrate .. //depot/projects/hammer/sys/dev/acpi_support/acpi_ibm.c#6 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_battery.c#12 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_thermal.c#24 integrate .. //depot/projects/hammer/sys/dev/amr/amr.c#24 integrate .. //depot/projects/hammer/sys/dev/amr/amr_cam.c#12 integrate .. //depot/projects/hammer/sys/dev/amr/amr_compat.h#5 delete .. //depot/projects/hammer/sys/dev/amr/amr_disk.c#13 integrate .. //depot/projects/hammer/sys/dev/amr/amr_pci.c#18 integrate .. //depot/projects/hammer/sys/dev/amr/amrvar.h#15 integrate .. //depot/projects/hammer/sys/dev/an/if_an.c#25 integrate .. //depot/projects/hammer/sys/dev/ar/if_ar.c#17 integrate .. //depot/projects/hammer/sys/dev/arl/if_arl.c#9 integrate .. //depot/projects/hammer/sys/dev/ata/ata-all.c#51 integrate .. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#58 integrate .. //depot/projects/hammer/sys/dev/ata/ata-pci.h#33 integrate .. //depot/projects/hammer/sys/dev/ata/ata-raid.c#26 integrate .. //depot/projects/hammer/sys/dev/ath/ath_rate/amrr/amrr.c#8 integrate .. //depot/projects/hammer/sys/dev/ath/ath_rate/onoe/onoe.c#9 integrate .. //depot/projects/hammer/sys/dev/ath/if_ath.c#36 integrate .. //depot/projects/hammer/sys/dev/ath/if_athvar.h#19 integrate .. //depot/projects/hammer/sys/dev/awi/awi.c#18 integrate .. //depot/projects/hammer/sys/dev/bfe/if_bfe.c#19 integrate .. //depot/projects/hammer/sys/dev/bge/if_bge.c#50 integrate .. //depot/projects/hammer/sys/dev/ciss/ciss.c#35 integrate .. //depot/projects/hammer/sys/dev/ciss/cissreg.h#12 integrate .. //depot/projects/hammer/sys/dev/cm/if_cm_isa.c#6 integrate .. //depot/projects/hammer/sys/dev/cm/smc90cx6.c#11 integrate .. //depot/projects/hammer/sys/dev/cnw/if_cnw.c#13 integrate .. //depot/projects/hammer/sys/dev/cp/if_cp.c#19 integrate .. //depot/projects/hammer/sys/dev/cs/if_cs.c#17 integrate .. //depot/projects/hammer/sys/dev/ctau/if_ct.c#20 integrate .. //depot/projects/hammer/sys/dev/cx/if_cx.c#26 integrate .. //depot/projects/hammer/sys/dev/ed/if_ed.c#31 integrate .. //depot/projects/hammer/sys/dev/em/if_em.c#44 integrate .. //depot/projects/hammer/sys/dev/en/if_en_pci.c#9 integrate .. //depot/projects/hammer/sys/dev/en/midway.c#23 integrate .. //depot/projects/hammer/sys/dev/ep/if_ep.c#22 integrate .. //depot/projects/hammer/sys/dev/ex/if_ex.c#17 integrate .. //depot/projects/hammer/sys/dev/fatm/if_fatm.c#13 integrate .. //depot/projects/hammer/sys/dev/fe/if_fe.c#20 integrate .. //depot/projects/hammer/sys/dev/firewire/firewirereg.h#18 integrate .. //depot/projects/hammer/sys/dev/firewire/fwdev.c#18 integrate .. //depot/projects/hammer/sys/dev/firewire/if_fwe.c#23 integrate .. //depot/projects/hammer/sys/dev/firewire/if_fwip.c#6 integrate .. //depot/projects/hammer/sys/dev/fxp/if_fxp.c#48 integrate .. //depot/projects/hammer/sys/dev/fxp/if_fxpvar.h#14 integrate .. //depot/projects/hammer/sys/dev/gem/if_gem.c#19 integrate .. //depot/projects/hammer/sys/dev/hatm/if_hatm.c#15 integrate .. //depot/projects/hammer/sys/dev/hatm/if_hatm_intr.c#10 integrate .. //depot/projects/hammer/sys/dev/hatm/if_hatm_ioctl.c#7 integrate .. //depot/projects/hammer/sys/dev/hatm/if_hatm_rx.c#7 integrate .. //depot/projects/hammer/sys/dev/hatm/if_hatm_tx.c#10 integrate .. //depot/projects/hammer/sys/dev/hme/if_hme.c#21 integrate .. //depot/projects/hammer/sys/dev/ie/if_ie.c#15 integrate .. //depot/projects/hammer/sys/dev/ieee488/upd7210.h#3 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis.c#38 integrate .. //depot/projects/hammer/sys/dev/iicbus/if_ic.c#11 integrate .. //depot/projects/hammer/sys/dev/iicbus/iicbus.h#2 integrate .. //depot/projects/hammer/sys/dev/ipw/if_ipw.c#8 integrate .. //depot/projects/hammer/sys/dev/iwi/if_iwi.c#8 integrate .. //depot/projects/hammer/sys/dev/ixgb/if_ixgb.c#11 integrate .. //depot/projects/hammer/sys/dev/lge/if_lge.c#25 integrate .. //depot/projects/hammer/sys/dev/lnc/if_lnc.c#21 integrate .. //depot/projects/hammer/sys/dev/mly/mly.c#14 integrate .. //depot/projects/hammer/sys/dev/mly/mlyvar.h#4 integrate .. //depot/projects/hammer/sys/dev/my/if_my.c#20 integrate .. //depot/projects/hammer/sys/dev/my/if_myreg.h#4 integrate .. //depot/projects/hammer/sys/dev/nge/if_nge.c#30 integrate .. //depot/projects/hammer/sys/dev/nmdm/nmdm.c#21 integrate .. //depot/projects/hammer/sys/dev/nve/if_nve.c#9 integrate .. //depot/projects/hammer/sys/dev/owi/if_owi.c#11 integrate .. //depot/projects/hammer/sys/dev/patm/if_patm.c#7 integrate .. //depot/projects/hammer/sys/dev/patm/if_patm_intr.c#6 integrate .. //depot/projects/hammer/sys/dev/patm/if_patm_ioctl.c#6 integrate .. //depot/projects/hammer/sys/dev/patm/if_patm_tx.c#8 integrate .. //depot/projects/hammer/sys/dev/pdq/pdq_ifsubr.c#10 integrate .. //depot/projects/hammer/sys/dev/ppbus/if_plip.c#12 integrate .. //depot/projects/hammer/sys/dev/puc/puc_ebus.c#6 integrate .. //depot/projects/hammer/sys/dev/ral/if_ral.c#7 integrate .. //depot/projects/hammer/sys/dev/ral/if_ral_pci.c#2 integrate .. //depot/projects/hammer/sys/dev/ray/if_ray.c#19 integrate .. //depot/projects/hammer/sys/dev/ray/if_rayvar.h#6 integrate .. //depot/projects/hammer/sys/dev/re/if_re.c#29 integrate .. //depot/projects/hammer/sys/dev/sbni/if_sbni.c#16 integrate .. //depot/projects/hammer/sys/dev/sbsh/if_sbsh.c#9 integrate .. //depot/projects/hammer/sys/dev/smbus/smbus.h#2 integrate .. //depot/projects/hammer/sys/dev/sn/if_sn.c#22 integrate .. //depot/projects/hammer/sys/dev/sn/if_snvar.h#6 integrate .. //depot/projects/hammer/sys/dev/snc/dp83932.c#14 integrate .. //depot/projects/hammer/sys/dev/snc/if_snc_pccard.c#8 integrate .. //depot/projects/hammer/sys/dev/snp/snp.c#19 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/dsp.c#19 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/mixer.c#16 integrate .. //depot/projects/hammer/sys/dev/sr/if_sr.c#18 integrate .. //depot/projects/hammer/sys/dev/tx/if_tx.c#22 integrate .. //depot/projects/hammer/sys/dev/txp/if_txp.c#19 integrate .. //depot/projects/hammer/sys/dev/uart/uart_bus_ebus.c#7 integrate .. //depot/projects/hammer/sys/dev/uart/uart_cpu_sparc64.c#16 integrate .. //depot/projects/hammer/sys/dev/usb/if_aue.c#24 integrate .. //depot/projects/hammer/sys/dev/usb/if_axe.c#23 integrate .. //depot/projects/hammer/sys/dev/usb/if_cdce.c#3 integrate .. //depot/projects/hammer/sys/dev/usb/if_cue.c#24 integrate .. //depot/projects/hammer/sys/dev/usb/if_kue.c#20 integrate .. //depot/projects/hammer/sys/dev/usb/if_rue.c#17 integrate .. //depot/projects/hammer/sys/dev/usb/if_udav.c#12 integrate .. //depot/projects/hammer/sys/dev/usb/if_ural.c#7 integrate .. //depot/projects/hammer/sys/dev/usb/ums.c#16 integrate .. //depot/projects/hammer/sys/dev/vge/if_vge.c#9 integrate .. //depot/projects/hammer/sys/dev/vkbd/vkbd.c#9 integrate .. //depot/projects/hammer/sys/dev/vx/if_vx.c#20 integrate .. //depot/projects/hammer/sys/dev/wi/if_wi.c#40 integrate .. //depot/projects/hammer/sys/dev/wi/if_wi_pci.c#13 integrate .. //depot/projects/hammer/sys/dev/wl/if_wl.c#18 integrate .. //depot/projects/hammer/sys/dev/xe/if_xe.c#25 integrate .. //depot/projects/hammer/sys/dev/xe/if_xe_pccard.c#19 integrate .. //depot/projects/hammer/sys/fs/devfs/devfs_vnops.c#37 integrate .. //depot/projects/hammer/sys/fs/fdescfs/fdesc_vnops.c#15 integrate .. //depot/projects/hammer/sys/fs/pseudofs/pseudofs_vnops.c#20 integrate .. //depot/projects/hammer/sys/fs/unionfs/union.h#8 integrate .. //depot/projects/hammer/sys/geom/eli/g_eli.c#2 integrate .. //depot/projects/hammer/sys/geom/eli/g_eli.h#2 integrate .. //depot/projects/hammer/sys/geom/label/g_label.c#10 integrate .. //depot/projects/hammer/sys/geom/label/g_label.h#5 integrate .. //depot/projects/hammer/sys/geom/label/g_label_ext2fs.c#1 branch .. //depot/projects/hammer/sys/geom/label/g_label_reiserfs.c#1 branch .. //depot/projects/hammer/sys/geom/vinum/geom_vinum.c#13 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_drive.c#13 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_var.h#10 integrate .. //depot/projects/hammer/sys/i386/conf/GENERIC#39 integrate .. //depot/projects/hammer/sys/i386/i386/pmap.c#70 integrate .. //depot/projects/hammer/sys/i386/i386/ptrace_machdep.c#4 integrate .. //depot/projects/hammer/sys/i386/isa/if_el.c#12 integrate .. //depot/projects/hammer/sys/i4b/driver/i4b_ipr.c#17 integrate .. //depot/projects/hammer/sys/i4b/driver/i4b_isppp.c#14 integrate .. //depot/projects/hammer/sys/ia64/ia64/elf_machdep.c#17 integrate .. //depot/projects/hammer/sys/ia64/ia64/exception.S#8 integrate .. //depot/projects/hammer/sys/ia64/ia64/interrupt.c#18 integrate .. //depot/projects/hammer/sys/ia64/ia64/machdep.c#51 integrate .. //depot/projects/hammer/sys/ia64/ia64/mp_machdep.c#12 integrate .. //depot/projects/hammer/sys/ia64/ia64/pmap.c#45 integrate .. //depot/projects/hammer/sys/ia64/ia64/sal.c#6 integrate .. //depot/projects/hammer/sys/ia64/ia64/trap.c#34 integrate .. //depot/projects/hammer/sys/ia64/ia64/vm_machdep.c#30 integrate .. //depot/projects/hammer/sys/ia64/include/ia64_cpu.h#4 integrate .. //depot/projects/hammer/sys/ia64/include/param.h#10 integrate .. //depot/projects/hammer/sys/ia64/include/proc.h#6 integrate .. //depot/projects/hammer/sys/ia64/include/smp.h#4 integrate .. //depot/projects/hammer/sys/isofs/cd9660/cd9660_vfsops.c#30 integrate .. //depot/projects/hammer/sys/kern/kern_cpu.c#7 integrate .. //depot/projects/hammer/sys/kern/kern_poll.c#11 integrate .. //depot/projects/hammer/sys/kern/kern_sysctl.c#23 integrate .. //depot/projects/hammer/sys/kern/sched_ule.c#64 integrate .. //depot/projects/hammer/sys/kern/subr_kobj.c#5 integrate .. //depot/projects/hammer/sys/kern/subr_witness.c#44 integrate .. //depot/projects/hammer/sys/kern/sysv_shm.c#22 integrate .. //depot/projects/hammer/sys/kern/tty_pty.c#29 integrate .. //depot/projects/hammer/sys/kern/tty_tty.c#11 integrate .. //depot/projects/hammer/sys/kern/vfs_cluster.c#28 integrate .. //depot/projects/hammer/sys/kern/vfs_lookup.c#16 integrate .. //depot/projects/hammer/sys/kern/vfs_subr.c#90 integrate .. //depot/projects/hammer/sys/libkern/strcasecmp.c#1 branch .. //depot/projects/hammer/sys/modules/geom/geom_label/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/procfs/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/twa/Makefile#4 integrate .. //depot/projects/hammer/sys/modules/twe/Makefile#2 integrate .. //depot/projects/hammer/sys/net/bpf.c#37 integrate .. //depot/projects/hammer/sys/net/bridge.c#27 integrate .. //depot/projects/hammer/sys/net/bridgestp.c#3 integrate .. //depot/projects/hammer/sys/net/if.c#53 integrate .. //depot/projects/hammer/sys/net/if.h#20 integrate .. //depot/projects/hammer/sys/net/if_arcsubr.c#17 integrate .. //depot/projects/hammer/sys/net/if_atm.h#12 integrate .. //depot/projects/hammer/sys/net/if_atmsubr.c#18 integrate .. //depot/projects/hammer/sys/net/if_bridge.c#9 integrate .. //depot/projects/hammer/sys/net/if_ef.c#14 integrate .. //depot/projects/hammer/sys/net/if_ethersubr.c#44 integrate .. //depot/projects/hammer/sys/net/if_faith.c#20 integrate .. //depot/projects/hammer/sys/net/if_fddisubr.c#18 integrate .. //depot/projects/hammer/sys/net/if_fwsubr.c#10 integrate .. //depot/projects/hammer/sys/net/if_gif.c#21 integrate .. //depot/projects/hammer/sys/net/if_gre.c#25 integrate .. //depot/projects/hammer/sys/net/if_iso88025subr.c#16 integrate .. //depot/projects/hammer/sys/net/if_loop.c#27 integrate .. //depot/projects/hammer/sys/net/if_ppp.c#21 integrate .. //depot/projects/hammer/sys/net/if_pppvar.h#5 integrate .. //depot/projects/hammer/sys/net/if_spppsubr.c#22 integrate .. //depot/projects/hammer/sys/net/if_tap.c#26 integrate .. //depot/projects/hammer/sys/net/if_tun.c#28 integrate .. //depot/projects/hammer/sys/net/if_var.h#34 integrate .. //depot/projects/hammer/sys/net/if_vlan.c#26 integrate .. //depot/projects/hammer/sys/net/ppp_tty.c#14 integrate .. //depot/projects/hammer/sys/net/route.c#19 integrate .. //depot/projects/hammer/sys/net/rtsock.c#25 integrate .. //depot/projects/hammer/sys/net80211/_ieee80211.h#3 integrate .. //depot/projects/hammer/sys/net80211/ieee80211.c#17 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_acl.c#3 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_crypto.c#10 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_crypto.h#8 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_crypto_tkip.c#5 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_freebsd.c#6 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_freebsd.h#5 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_input.c#24 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_ioctl.c#22 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_ioctl.h#11 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_node.c#26 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_node.h#17 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_output.c#19 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_proto.c#18 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_proto.h#10 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_var.h#18 integrate .. //depot/projects/hammer/sys/netatm/atm_if.c#12 integrate .. //depot/projects/hammer/sys/netgraph/atm/atmpif/ng_atmpif_harp.c#5 integrate .. //depot/projects/hammer/sys/netgraph/atm/ng_atm.c#14 integrate .. //depot/projects/hammer/sys/netgraph/atm/sscop/ng_sscop.c#4 integrate .. //depot/projects/hammer/sys/netgraph/atm/uni/ng_uni.c#5 integrate .. //depot/projects/hammer/sys/netgraph/netgraph.h#21 integrate .. //depot/projects/hammer/sys/netgraph/ng_eiface.c#21 integrate .. //depot/projects/hammer/sys/netgraph/ng_ether.c#20 integrate .. //depot/projects/hammer/sys/netgraph/ng_fec.c#15 integrate .. //depot/projects/hammer/sys/netgraph/ng_iface.c#21 integrate .. //depot/projects/hammer/sys/netgraph/ng_l2tp.c#10 integrate .. //depot/projects/hammer/sys/netgraph/ng_sppp.c#9 integrate .. //depot/projects/hammer/sys/netinet/if_atm.c#7 integrate .. //depot/projects/hammer/sys/netinet/if_ether.c#23 integrate .. //depot/projects/hammer/sys/netinet/in_proto.c#17 integrate .. //depot/projects/hammer/sys/netinet/ip_carp.c#11 integrate .. //depot/projects/hammer/sys/netinet/ip_fastfwd.c#22 integrate .. //depot/projects/hammer/sys/netinet/ip_fw.h#24 integrate .. //depot/projects/hammer/sys/netinet/ip_fw2.c#62 integrate .. //depot/projects/hammer/sys/netinet/ip_output.c#49 integrate .. //depot/projects/hammer/sys/netinet/pim_var.h#3 integrate .. //depot/projects/hammer/sys/netinet6/icmp6.c#22 integrate .. //depot/projects/hammer/sys/netinet6/in6.c#17 integrate .. //depot/projects/hammer/sys/netinet6/in6.h#11 integrate .. //depot/projects/hammer/sys/netinet6/in6_proto.c#12 integrate .. //depot/projects/hammer/sys/netinet6/in6_src.c#14 integrate .. //depot/projects/hammer/sys/netinet6/in6_var.h#11 integrate .. //depot/projects/hammer/sys/netinet6/ip6_forward.c#14 integrate .. //depot/projects/hammer/sys/netinet6/ip6_fw.c#13 integrate .. //depot/projects/hammer/sys/netinet6/ip6_mroute.c#13 integrate .. //depot/projects/hammer/sys/netinet6/ip6_var.h#15 integrate .. //depot/projects/hammer/sys/netinet6/nd6.c#20 integrate .. //depot/projects/hammer/sys/netinet6/nd6_nbr.c#15 integrate .. //depot/projects/hammer/sys/netinet6/nd6_rtr.c#11 integrate .. //depot/projects/hammer/sys/netinet6/pim6_var.h#3 integrate .. //depot/projects/hammer/sys/netnatm/natm.c#17 integrate .. //depot/projects/hammer/sys/netsmb/smb_dev.c#12 integrate .. //depot/projects/hammer/sys/pci/if_dc.c#47 integrate .. //depot/projects/hammer/sys/pci/if_dcreg.h#18 integrate .. //depot/projects/hammer/sys/pci/if_de.c#27 integrate .. //depot/projects/hammer/sys/pci/if_pcn.c#30 integrate .. //depot/projects/hammer/sys/pci/if_pcnreg.h#6 integrate .. //depot/projects/hammer/sys/pci/if_rl.c#46 integrate .. //depot/projects/hammer/sys/pci/if_rlreg.h#18 integrate .. //depot/projects/hammer/sys/pci/if_sf.c#32 integrate .. //depot/projects/hammer/sys/pci/if_sfreg.h#7 integrate .. //depot/projects/hammer/sys/pci/if_sis.c#38 integrate .. //depot/projects/hammer/sys/pci/if_sk.c#41 integrate .. //depot/projects/hammer/sys/pci/if_ste.c#35 integrate .. //depot/projects/hammer/sys/pci/if_ti.c#33 integrate .. //depot/projects/hammer/sys/pci/if_tl.c#24 integrate .. //depot/projects/hammer/sys/pci/if_vr.c#33 integrate .. //depot/projects/hammer/sys/pci/if_wb.c#27 integrate .. //depot/projects/hammer/sys/pci/if_xl.c#55 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/tick.c#9 integrate .. //depot/projects/hammer/sys/sys/ata.h#12 integrate .. //depot/projects/hammer/sys/sys/buf.h#24 integrate .. //depot/projects/hammer/sys/sys/conf.h#34 integrate .. //depot/projects/hammer/sys/sys/interrupt.h#12 integrate .. //depot/projects/hammer/sys/sys/kobj.h#4 integrate .. //depot/projects/hammer/sys/sys/libkern.h#12 integrate .. //depot/projects/hammer/sys/sys/mac_policy.h#30 integrate .. //depot/projects/hammer/sys/sys/mount.h#36 integrate .. //depot/projects/hammer/sys/sys/param.h#65 integrate .. //depot/projects/hammer/sys/sys/proc.h#84 integrate .. //depot/projects/hammer/sys/sys/protosw.h#9 integrate .. //depot/projects/hammer/sys/sys/queue.h#7 integrate .. //depot/projects/hammer/sys/sys/shm.h#7 integrate .. //depot/projects/hammer/sys/sys/vnode.h#58 integrate .. //depot/projects/hammer/sys/vm/uma_int.h#20 integrate .. //depot/projects/hammer/sys/vm/vm_contig.c#26 integrate .. //depot/projects/hammer/sys/vm/vm_object.c#55 integrate .. //depot/projects/hammer/sys/vm/vm_page.c#42 integrate .. //depot/projects/hammer/sys/vm/vm_page.h#22 integrate .. //depot/projects/hammer/sys/vm/vm_pageout.c#34 integrate .. //depot/projects/hammer/sys/vm/vm_pager.c#20 integrate .. //depot/projects/hammer/sys/vm/vnode_pager.c#35 integrate .. //depot/projects/hammer/tools/tools/ath/80211debug.c#4 integrate .. //depot/projects/hammer/tools/tools/build_option_survey/collect_all_make_options.sh#1 branch .. //depot/projects/hammer/tools/tools/build_option_survey/mkhtml.sh#2 integrate .. //depot/projects/hammer/tools/tools/build_option_survey/no_list#2 delete .. //depot/projects/hammer/tools/tools/build_option_survey/option_survey.sh#2 integrate .. //depot/projects/hammer/tools/tools/build_option_survey/reduce.sh#1 branch .. //depot/projects/hammer/tools/tools/nanobsd/nanobsd.sh#3 integrate .. //depot/projects/hammer/usr.bin/Makefile#44 integrate .. //depot/projects/hammer/usr.bin/at/parsetime.c#2 integrate .. //depot/projects/hammer/usr.bin/bsdiff/Makefile#1 branch .. //depot/projects/hammer/usr.bin/bsdiff/Makefile.inc#1 branch .. //depot/projects/hammer/usr.bin/bsdiff/bsdiff/Makefile#1 branch .. //depot/projects/hammer/usr.bin/bsdiff/bsdiff/bsdiff.1#1 branch .. //depot/projects/hammer/usr.bin/bsdiff/bsdiff/bsdiff.c#1 branch .. //depot/projects/hammer/usr.bin/bsdiff/bspatch/Makefile#1 branch .. //depot/projects/hammer/usr.bin/bsdiff/bspatch/bspatch.1#1 branch .. //depot/projects/hammer/usr.bin/bsdiff/bspatch/bspatch.c#1 branch .. //depot/projects/hammer/usr.bin/ipcs/ipcs.c#9 integrate .. //depot/projects/hammer/usr.bin/lam/lam.c#3 integrate .. //depot/projects/hammer/usr.bin/netstat/Makefile#8 integrate .. //depot/projects/hammer/usr.bin/netstat/main.c#14 integrate .. //depot/projects/hammer/usr.bin/printf/printf.c#9 integrate .. //depot/projects/hammer/usr.bin/rlogin/rlogin.c#5 integrate .. //depot/projects/hammer/usr.bin/rwho/rwho.1#3 integrate .. //depot/projects/hammer/usr.bin/sed/compile.c#6 integrate .. //depot/projects/hammer/usr.bin/tftp/tftp.c#2 integrate .. //depot/projects/hammer/usr.bin/vmstat/vmstat.c#21 integrate .. //depot/projects/hammer/usr.bin/xlint/lint1/main1.c#2 integrate .. //depot/projects/hammer/usr.bin/xlint/lint1/mem1.c#2 integrate .. //depot/projects/hammer/usr.bin/xlint/lint2/chk.c#2 integrate .. //depot/projects/hammer/usr.bin/xlint/lint2/emit2.c#2 integrate .. //depot/projects/hammer/usr.bin/xlint/lint2/hash.c#2 integrate .. //depot/projects/hammer/usr.bin/xlint/lint2/mem2.c#2 integrate .. //depot/projects/hammer/usr.bin/xlint/lint2/read.c#3 integrate .. //depot/projects/hammer/usr.sbin/IPXrouted/trace.c#4 integrate .. //depot/projects/hammer/usr.sbin/Makefile#67 integrate .. //depot/projects/hammer/usr.sbin/amd/Makefile.inc#6 integrate .. //depot/projects/hammer/usr.sbin/amd/amd/Makefile#6 integrate .. //depot/projects/hammer/usr.sbin/amd/include/config.h#5 integrate .. //depot/projects/hammer/usr.sbin/chkgrp/chkgrp.c#5 integrate .. //depot/projects/hammer/usr.sbin/config/config.8#9 integrate .. //depot/projects/hammer/usr.sbin/config/main.c#9 integrate .. //depot/projects/hammer/usr.sbin/jail/jail.8#26 integrate .. //depot/projects/hammer/usr.sbin/jls/jls.c#2 integrate .. //depot/projects/hammer/usr.sbin/mtree/verify.c#7 integrate .. //depot/projects/hammer/usr.sbin/pmcstat/pmcstat.c#7 integrate .. //depot/projects/hammer/usr.sbin/portsnap/Makefile#1 branch .. //depot/projects/hammer/usr.sbin/portsnap/Makefile.inc#1 branch .. //depot/projects/hammer/usr.sbin/portsnap/make_index/Makefile#1 branch .. //depot/projects/hammer/usr.sbin/portsnap/make_index/make_index.c#1 branch .. //depot/projects/hammer/usr.sbin/portsnap/phttpget/Makefile#1 branch .. //depot/projects/hammer/usr.sbin/portsnap/phttpget/phttpget.c#1 branch .. //depot/projects/hammer/usr.sbin/portsnap/portsnap/Makefile#1 branch .. //depot/projects/hammer/usr.sbin/portsnap/portsnap/portsnap.8#1 branch .. //depot/projects/hammer/usr.sbin/portsnap/portsnap/portsnap.sh#1 branch .. //depot/projects/hammer/usr.sbin/rtadvd/rtadvd.conf.5#7 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/system.c#6 integrate .. //depot/projects/hammer/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c#4 integrate Differences ... ==== //depot/projects/hammer/MAINTAINERS#35 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.121 2005/06/04 16:56:35 imp Exp $ +$FreeBSD: src/MAINTAINERS,v 1.124 2005/08/08 20:10:04 cperciva Exp $ Please note that the content of this file is strictly advisory. No locks listed here are valid. The only strict review requirements @@ -111,6 +111,7 @@ contrib/bzip2 obrien Pre-commit review required. lukemftpd obrien Pre-commit review required. geom_concat pjd Pre-commit review preferred. +geom_eli pjd Pre-commit review preferred. geom_gate pjd Pre-commit review preferred. geom_label pjd Pre-commit review preferred. geom_mirror pjd Pre-commit review preferred. @@ -118,6 +119,7 @@ geom_raid3 pjd Pre-commit review preferred. geom_shsec pjd Pre-commit review preferred. geom_stripe pjd Pre-commit review preferred. +geom_zero pjd Pre-commit review preferred. sbin/geom pjd Pre-commit review preferred. nfs alfred Will be happy to review code, but not mandatory. rpc.lockd alfred Will be happy to review code, but not mandatory. @@ -125,6 +127,8 @@ rpc alfred Pre-commit review requested. pkg_install krion Pre-commit review or approval from portmgr@ requested. linux emul emulation Please discuss changes here. +bs{diff,patch} cperciva Pre-commit review requested. +portsnap cperciva Pre-commit review requested. Following are the entries from the Makefiles, and a few other sources. Please remove stale entries from both their origin, and this file. ==== //depot/projects/hammer/Makefile.inc1#102 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.508 2005/08/03 20:27:06 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.510 2005/08/07 13:47:25 netchild Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -274,6 +274,9 @@ @echo "--------------------------------------------------------------" .if !defined(NO_CLEAN) rm -rf ${WORLDTMP} +.if ${TARGET_ARCH} == "amd64" + rm -rf ${LIB32TMP} +.endif .else rm -rf ${WORLDTMP}/legacy/usr/include # XXX - These two can depend on any header file. @@ -332,6 +335,9 @@ @echo ">>> stage 2.1: cleaning up the object tree" @echo "--------------------------------------------------------------" ${_+_}cd ${.CURDIR}; ${WMAKE} ${CLEANDIR:S/^/par-/} +.if ${TARGET_ARCH} == "amd64" + rm -rf ${OBJTREE}/lib32 +.endif .endif _obj: @echo @@ -391,6 +397,7 @@ .endfor mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \ -p ${LIB32TMP}/usr/include >/dev/null + mkdir -p ${WORLDTMP} ln -sf ${.CURDIR}/sys ${WORLDTMP} .if !defined(NO_KERBEROS) && !defined(NO_CRYPT) && !defined(NO_OPENSSL) .for _t in obj depend all @@ -1087,6 +1094,17 @@ && chflags noschg "${DESTDIR}/${file}" \ && rm ${RM_I} "${DESTDIR}/${file}")) .endfor +# Remove catpages without corresponding manpages. + @for dir in ${DESTDIR}/usr/share/man/cat*; do \ + for catpage in $${dir}/*; do \ + manpage=$$(echo $${catpage} \ + | sed 's:${DESTDIR}/usr/share/man/cat:${DESTDIR}/usr/share/man/man:') \ + check_empty=$$(echo $${catpage} \ + | sed 's:.*\*:empty:'); \ + [ $${check_empty} != empty -a ! -e $${manpage} ] \ + && rm ${RM_I} $${catpage} || true; \ + done; \ + done @echo ">>> Old files removed" check-old-files: @@ -1094,6 +1112,17 @@ .for file in ${OLD_FILES} @[ ! -f "${DESTDIR}/${file}" ] || echo "${DESTDIR}/${file}" .endfor +# Check for catpages without corresponding manpages. + @for dir in ${DESTDIR}/usr/share/man/cat*; do \ + for catpage in $${dir}/*; do \ + manpage=$$(echo $${catpage} \ + | sed 's:${DESTDIR}/usr/share/man/cat:${DESTDIR}/usr/share/man/man:'); \ + check_empty=$$(echo $${catpage} \ + | sed 's:.*\*:empty:'); \ + [ $${check_empty} != empty -a ! -e $${manpage} ] \ + && echo $${catpage} || true; \ + done; \ + done delete-old-libs: @echo ">>> Removing old libraries" ==== //depot/projects/hammer/ObsoleteFiles.inc#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.8 2005/08/03 20:09:59 ru Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.11 2005/08/07 13:46:28 netchild Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,10 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20050805 tn3270 retired long ago +OLD_FILES+=usr/share/misc/map3270 +# 20050801: too old to be interesting here +OLD_FILES+=usr/share/doc/papers/px.ps.gz # 20050721: moved to ports OLD_FILES+=usr/sbin/vttest OLD_FILES+=usr/share/man/man1/vttest.1.gz @@ -556,7 +560,7 @@ OLD_LIBS+=usr/lib/libhistory.so.5 OLD_LIBS+=usr/lib/libkadm5clnt.so.7 OLD_LIBS+=usr/lib/libkadm5srv.so.7 -OLD_LIBS+=usr/lib/libafs5.so.7 +OLD_LIBS+=usr/lib/libkafs5.so.7 OLD_LIBS+=usr/lib/libkrb5.so.7 OLD_LIBS+=usr/lib/libmagic.so.1 OLD_LIBS+=usr/lib/libmenu.so.2 ==== //depot/projects/hammer/bin/sh/Makefile#7 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.4 (Berkeley) 5/5/95 -# $FreeBSD: src/bin/sh/Makefile,v 1.44 2004/03/18 10:55:47 ru Exp $ +# $FreeBSD: src/bin/sh/Makefile,v 1.45 2005/08/14 07:46:56 stefanf Exp $ PROG= sh INSTALLFLAGS= -S @@ -22,7 +22,7 @@ CFLAGS+=-DSHELL -I. -I${.CURDIR} # for debug: # CFLAGS+= -g -DDEBUG=2 -WARNS?= 0 +WARNS?= 3 WFORMAT=0 .PATH: ${.CURDIR}/bltin \ ==== //depot/projects/hammer/bin/sh/alias.c#4 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/alias.c,v 1.18 2004/04/06 20:06:51 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/alias.c,v 1.19 2005/08/13 08:12:18 stefanf Exp $"); #include <stdlib.h> #include "shell.h" @@ -144,7 +144,7 @@ } #ifdef mkinit -MKINIT void rmaliases(); +MKINIT void rmaliases(void); SHELLPROC { rmaliases(); ==== //depot/projects/hammer/bin/sh/arith.h#4 (text+ko) ==== @@ -27,9 +27,11 @@ * SUCH DAMAGE. * * @(#)arith.h 1.1 (Berkeley) 5/4/95 - * $FreeBSD: src/bin/sh/arith.h,v 1.9 2004/04/06 20:06:51 markm Exp $ + * $FreeBSD: src/bin/sh/arith.h,v 1.11 2005/08/13 07:59:46 stefanf Exp $ */ +extern char *arith_buf, *arith_startbuf; + int arith(char *); -int arith_assign(char *, arith_t); +void arith_lex_reset(void); int expcmd(int, char **); ==== //depot/projects/hammer/bin/sh/arith.y#6 (text+ko) ==== @@ -38,11 +38,12 @@ #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/arith.y,v 1.19 2004/05/24 10:11:31 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/arith.y,v 1.21 2005/08/13 07:59:46 stefanf Exp $"); #include <limits.h> #include <stdio.h> +#include "arith.h" #include "shell.h" #include "var.h" %} @@ -261,12 +262,11 @@ #define lstrlen(var) (3 + (2 + CHAR_BIT * sizeof((var))) / 3) char *arith_buf, *arith_startbuf; -extern void arith_lex_reset(); int yylex(void); int yyparse(void); -int +static int arith_assign(char *name, arith_t value) { char *str; @@ -294,7 +294,7 @@ return result; } -void +static void yyerror(char *s) { ==== //depot/projects/hammer/bin/sh/arith_lex.l#5 (text+ko) ==== @@ -38,17 +38,19 @@ #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/arith_lex.l,v 1.22 2004/04/06 20:06:51 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/arith_lex.l,v 1.24 2005/08/13 07:59:46 stefanf Exp $"); #include <string.h> +#include "arith.h" #include "shell.h" #include "y.tab.h" #include "error.h" #include "memalloc.h" #include "var.h" -extern char *arith_buf, *arith_startbuf; +int yylex(void); + #undef YY_INPUT #define YY_INPUT(buf,result,max) \ result = (*buf = *arith_buf++) ? 1 : YY_NULL; ==== //depot/projects/hammer/bin/sh/bltin/bltin.h#3 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * @(#)bltin.h 8.2 (Berkeley) 5/4/95 - * $FreeBSD: src/bin/sh/bltin/bltin.h,v 1.13 2004/04/06 20:06:53 markm Exp $ + * $FreeBSD: src/bin/sh/bltin/bltin.h,v 1.14 2005/08/13 15:04:30 stefanf Exp $ */ /* @@ -82,5 +82,7 @@ pointer stalloc(int); void error(const char *, ...) __printf0like(1, 2); +int echocmd(int, char **); +int testcmd(int, char **); extern char *commandname; ==== //depot/projects/hammer/bin/sh/exec.c#6 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/exec.c,v 1.25 2004/09/27 18:43:18 des Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/exec.c,v 1.26 2005/08/13 08:12:18 stefanf Exp $"); #include <sys/types.h> #include <sys/stat.h> @@ -555,7 +555,7 @@ */ #ifdef mkinit -MKINIT void deletefuncs(); +MKINIT void deletefuncs(void); SHELLPROC { deletefuncs(); ==== //depot/projects/hammer/bin/sh/histedit.c#4 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/histedit.c,v 1.26 2004/04/06 20:06:51 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/histedit.c,v 1.27 2005/08/11 20:28:26 stefanf Exp $"); #include <sys/param.h> #include <limits.h> @@ -481,7 +481,7 @@ if (el == NULL) error("line editing is disabled"); - return (el_parse(el, argc, argv)); + return (el_parse(el, argc, (const char **)argv)); } #else ==== //depot/projects/hammer/bin/sh/mail.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/mail.c,v 1.13 2004/04/06 20:06:51 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/mail.c,v 1.14 2005/08/13 08:26:58 stefanf Exp $"); /* * Routines to check for mail. (Perhaps make part of main.c?) @@ -44,6 +44,7 @@ #include "shell.h" #include "exec.h" /* defines padvance() */ +#include "mail.h" #include "var.h" #include "output.h" #include "memalloc.h" ==== //depot/projects/hammer/bin/sh/miscbltin.c#4 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/miscbltin.c,v 1.30 2004/04/06 20:06:51 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/miscbltin.c,v 1.31 2005/08/13 08:31:37 stefanf Exp $"); /* * Miscellaneous builtins. @@ -64,6 +64,10 @@ #undef eflag +int readcmd(int, char **); +int umaskcmd(int, char **); +int ulimitcmd(int, char **); + /* * The read builtin. The -r option causes backslashes to be treated like * ordinary characters. ==== //depot/projects/hammer/bin/sh/mkbuiltins#6 (text+ko) ==== @@ -32,7 +32,7 @@ # SUCH DAMAGE. # # @(#)mkbuiltins 8.2 (Berkeley) 5/4/95 -# $FreeBSD: src/bin/sh/mkbuiltins,v 1.14 2005/01/10 08:39:25 imp Exp $ +# $FreeBSD: src/bin/sh/mkbuiltins,v 1.15 2005/08/13 08:09:22 stefanf Exp $ temp=`/usr/bin/mktemp -t ka` havejobs=0 @@ -58,9 +58,9 @@ ! awk '/^[^#]/ {if(('$havejobs' || $2 != "-j") && ('$havehist' || $2 != "-h")) \ print $0}' builtins.def | sed 's/-[hj]//' > $temp -awk '{ printf "int %s();\n", $1}' $temp +awk '{ printf "int %s(int, char **);\n", $1}' $temp echo ' -int (*const builtinfunc[])() = {' +int (*const builtinfunc[])(int, char **) = {' awk '/^[^#]/ { printf "\t%s,\n", $1}' $temp echo '}; @@ -87,6 +87,6 @@ int code; }; -extern int (*const builtinfunc[])(); +extern int (*const builtinfunc[])(int, char **); extern const struct builtincmd builtincmd[];' rm -f $temp ==== //depot/projects/hammer/bin/sh/mkinit.c#3 (text+ko) ==== @@ -42,7 +42,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/mkinit.c,v 1.17 2004/04/06 20:06:51 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/mkinit.c,v 1.18 2005/08/13 08:38:02 stefanf Exp $"); /* * This program scans all the source files for code to handle various @@ -133,10 +133,10 @@ struct event event[] = { - {"INIT", "init", init}, - {"RESET", "reset", reset}, - {"SHELLPROC", "initshellproc", shellproc}, - {NULL, NULL} + { "INIT", "init", init, { NULL, 0, NULL, NULL } }, + { "RESET", "reset", reset, { NULL, 0, NULL, NULL } }, + { "SHELLPROC", "initshellproc", shellproc, { NULL, 0, NULL, NULL } }, + { NULL, NULL, NULL, { NULL, 0, NULL, NULL } } }; @@ -172,6 +172,7 @@ header_files[0] = "\"shell.h\""; header_files[1] = "\"mystring.h\""; + header_files[2] = "\"init.h\""; for (ap = argv + 1 ; *ap ; ap++) readfile(*ap); output(); @@ -391,7 +392,7 @@ for (ep = event ; ep->name ; ep++) { fputs("\n\n\n", fp); fputs(ep->comment, fp); - fprintf(fp, "\nvoid\n%s() {\n", ep->routine); + fprintf(fp, "\nvoid\n%s(void)\n{\n", ep->routine); writetext(&ep->code, fp); fprintf(fp, "}\n"); } ==== //depot/projects/hammer/bin/sh/mksyntax.c#5 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/mksyntax.c,v 1.23 2004/04/06 20:06:51 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/mksyntax.c,v 1.24 2005/08/13 15:47:13 stefanf Exp $"); /* * This program creates syntax.h and syntax.c. @@ -343,9 +343,10 @@ static char *macro[] = { "#define is_digit(c)\t((is_type+SYNBASE)[c] & ISDIGIT)", - "#define is_alpha(c)\t((c) != PEOF && ((c) < CTLESC || (c) > CTLQUOTEMARK) && isalpha((unsigned char) (c)))", - "#define is_name(c)\t((c) != PEOF && ((c) < CTLESC || (c) > CTLQUOTEMARK) && ((c) == '_' || isalpha((unsigned char) (c))))", - "#define is_in_name(c)\t((c) != PEOF && ((c) < CTLESC || (c) > CTLQUOTEMARK) && ((c) == '_' || isalnum((unsigned char) (c))))", + "#define is_eof(c)\t((c) == PEOF)", + "#define is_alpha(c)\t(((c) < CTLESC || (c) > CTLQUOTEMARK) && isalpha((unsigned char) (c)))", + "#define is_name(c)\t(((c) < CTLESC || (c) > CTLQUOTEMARK) && ((c) == '_' || isalpha((unsigned char) (c))))", + "#define is_in_name(c)\t(((c) < CTLESC || (c) > CTLQUOTEMARK) && ((c) == '_' || isalnum((unsigned char) (c))))", "#define is_special(c)\t((is_type+SYNBASE)[c] & (ISSPECL|ISDIGIT))", NULL }; ==== //depot/projects/hammer/bin/sh/parser.c#9 (text+ko) ==== @@ -36,9 +36,10 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.52 2005/03/01 03:35:58 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.55 2005/08/13 15:47:13 stefanf Exp $"); #include <stdlib.h> +#include <unistd.h> #include "shell.h" #include "parser.h" @@ -1191,7 +1192,8 @@ int bracketed_name = 0; /* used to handle ${[0-9]*} variables */ >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200508151813.j7FIDgmH084002>