PERFORCE change 82802 for review
Peter Wemm
peter at FreeBSD.org
Mon Aug 29 20:21:38 GMT 2005
http://perforce.freebsd.org/chv.cgi?CH=82802
Change 82802 by peter at peter_overcee on 2005/08/29 20:20:47
IFC @82796
Affected files ...
.. //depot/projects/hammer/MAINTAINERS#36 integrate
.. //depot/projects/hammer/Makefile.inc1#103 integrate
.. //depot/projects/hammer/ObsoleteFiles.inc#5 integrate
.. //depot/projects/hammer/bin/sh/parser.c#10 integrate
.. //depot/projects/hammer/bin/sh/sh.1#17 integrate
.. //depot/projects/hammer/contrib/bind9/lib/dns/resolver.c#3 integrate
.. //depot/projects/hammer/contrib/less/line.c#3 integrate
.. //depot/projects/hammer/contrib/nvi/docs/USD.doc/vi.ref/vi.ref#2 integrate
.. //depot/projects/hammer/contrib/pf/pflogd/pflogd.c#7 integrate
.. //depot/projects/hammer/contrib/smbfs/lib/smb/kiconv.c#5 integrate
.. //depot/projects/hammer/contrib/traceroute/traceroute.c#4 integrate
.. //depot/projects/hammer/etc/Makefile#43 integrate
.. //depot/projects/hammer/etc/defaults/rc.conf#59 integrate
.. //depot/projects/hammer/etc/network.subr#12 integrate
.. //depot/projects/hammer/etc/pccard_ether#15 integrate
.. //depot/projects/hammer/etc/periodic/security/550.ipfwlimit#6 integrate
.. //depot/projects/hammer/etc/periodic/security/security.functions#5 integrate
.. //depot/projects/hammer/etc/rc.initdiskless#3 integrate
.. //depot/projects/hammer/etc/rc.subr#24 integrate
.. //depot/projects/hammer/games/fortune/datfiles/fortunes#48 integrate
.. //depot/projects/hammer/games/fortune/datfiles/fortunes2-o#11 integrate
.. //depot/projects/hammer/gnu/lib/libdialog/dialog.3#6 integrate
.. //depot/projects/hammer/gnu/lib/libobjc/Makefile#14 integrate
.. //depot/projects/hammer/gnu/lib/libsupc++/Makefile#6 integrate
.. //depot/projects/hammer/gnu/usr.bin/gdb/kgdb/trgt_sparc64.c#3 integrate
.. //depot/projects/hammer/include/pthread.h#10 integrate
.. //depot/projects/hammer/include/string.h#8 integrate
.. //depot/projects/hammer/lib/libc/gen/sem.c#3 integrate
.. //depot/projects/hammer/lib/libc/net/getprotoent.c#4 integrate
.. //depot/projects/hammer/lib/libc/net/getservent.c#7 integrate
.. //depot/projects/hammer/lib/libc/regex/engine.c#6 integrate
.. //depot/projects/hammer/lib/libc/regex/regex.3#10 integrate
.. //depot/projects/hammer/lib/libc/stdio/ungetwc.c#9 integrate
.. //depot/projects/hammer/lib/libc/stdio/vfwscanf.c#10 integrate
.. //depot/projects/hammer/lib/libc/string/Makefile.inc#10 integrate
.. //depot/projects/hammer/lib/libc/string/memchr.3#2 integrate
.. //depot/projects/hammer/lib/libc/string/memmem.3#1 branch
.. //depot/projects/hammer/lib/libc/string/memmem.c#1 branch
.. //depot/projects/hammer/lib/libc/string/strchr.3#4 integrate
.. //depot/projects/hammer/lib/libc/string/strstr.3#2 integrate
.. //depot/projects/hammer/lib/libc/sys/listen.2#3 integrate
.. //depot/projects/hammer/lib/libc_r/uthread/uthread_mattr_kind_np.c#3 integrate
.. //depot/projects/hammer/lib/libc_r/uthread/uthread_mutex.c#4 integrate
.. //depot/projects/hammer/lib/libfetch/http.c#12 integrate
.. //depot/projects/hammer/lib/libkiconv/xlat16_sysctl.c#2 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_kern.c#36 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_mattr_kind_np.c#2 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_mutex.c#16 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_rtld.c#5 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_mutex.c#23 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_mutexattr.c#2 integrate
.. //depot/projects/hammer/lib/libufs/Makefile#6 integrate
.. //depot/projects/hammer/lib/libutil/Makefile#10 integrate
.. //depot/projects/hammer/lib/libutil/libutil.h#5 integrate
.. //depot/projects/hammer/lib/libutil/pidfile.3#1 branch
.. //depot/projects/hammer/lib/libutil/pidfile.c#1 branch
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#79 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#104 integrate
.. //depot/projects/hammer/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#19 integrate
.. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml#13 integrate
.. //depot/projects/hammer/release/doc/share/misc/dev.archlist.txt#29 integrate
.. //depot/projects/hammer/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#4 integrate
.. //depot/projects/hammer/sbin/atacontrol/atacontrol.8#7 integrate
.. //depot/projects/hammer/sbin/ccdconfig/ccdconfig.8#12 integrate
.. //depot/projects/hammer/sbin/dhclient/alloc.c#2 integrate
.. //depot/projects/hammer/sbin/dhclient/bpf.c#4 integrate
.. //depot/projects/hammer/sbin/dhclient/clparse.c#2 integrate
.. //depot/projects/hammer/sbin/dhclient/conflex.c#2 integrate
.. //depot/projects/hammer/sbin/dhclient/convert.c#2 integrate
.. //depot/projects/hammer/sbin/dhclient/dhclient-script#3 integrate
.. //depot/projects/hammer/sbin/dhclient/dhclient.c#6 integrate
.. //depot/projects/hammer/sbin/dhclient/dispatch.c#2 integrate
.. //depot/projects/hammer/sbin/dhclient/errwarn.c#2 integrate
.. //depot/projects/hammer/sbin/dhclient/hash.c#2 integrate
.. //depot/projects/hammer/sbin/dhclient/inet.c#2 integrate
.. //depot/projects/hammer/sbin/dhclient/options.c#2 integrate
.. //depot/projects/hammer/sbin/dhclient/packet.c#2 integrate
.. //depot/projects/hammer/sbin/dhclient/parse.c#2 integrate
.. //depot/projects/hammer/sbin/dhclient/privsep.c#2 integrate
.. //depot/projects/hammer/sbin/dhclient/tables.c#3 integrate
.. //depot/projects/hammer/sbin/dhclient/tree.c#2 integrate
.. //depot/projects/hammer/sbin/geom/class/Makefile#7 integrate
.. //depot/projects/hammer/sbin/geom/class/eli/geli.8#3 integrate
.. //depot/projects/hammer/sbin/geom/class/eli/geom_eli.c#3 integrate
.. //depot/projects/hammer/sbin/geom/class/label/glabel.8#11 integrate
.. //depot/projects/hammer/sbin/geom/class/raid3/geom_raid3.c#12 integrate
.. //depot/projects/hammer/sbin/geom/misc/subr.c#4 integrate
.. //depot/projects/hammer/sbin/geom/misc/subr.h#4 integrate
.. //depot/projects/hammer/sbin/kldload/kldload.8#5 integrate
.. //depot/projects/hammer/sbin/reboot/boot_i386.8#12 integrate
.. //depot/projects/hammer/share/man/man4/Makefile#75 integrate
.. //depot/projects/hammer/share/man/man4/ata.4#18 integrate
.. //depot/projects/hammer/share/man/man4/bpf.4#10 integrate
.. //depot/projects/hammer/share/man/man4/carp.4#6 integrate
.. //depot/projects/hammer/share/man/man4/hwpmc.4#8 integrate
.. //depot/projects/hammer/share/man/man4/icmp.4#7 integrate
.. //depot/projects/hammer/share/man/man4/inet.4#17 integrate
.. //depot/projects/hammer/share/man/man4/inet6.4#4 integrate
.. //depot/projects/hammer/share/man/man4/ip.4#16 integrate
.. //depot/projects/hammer/share/man/man4/man4.i386/Makefile#30 integrate
.. //depot/projects/hammer/share/man/man4/man4.i386/acpi_ibm.4#6 integrate
.. //depot/projects/hammer/share/man/man4/man4.i386/el.4#7 delete
.. //depot/projects/hammer/share/man/man4/man4.i386/ep.4#15 integrate
.. //depot/projects/hammer/share/man/man4/pcm.4#13 integrate
.. //depot/projects/hammer/share/man/man4/sn.4#6 integrate
.. //depot/projects/hammer/share/man/man4/snd_cmi.4#5 integrate
.. //depot/projects/hammer/share/man/man4/snd_csa.4#4 integrate
.. //depot/projects/hammer/share/man/man4/snd_emu10k1.4#6 integrate
.. //depot/projects/hammer/share/man/man4/snd_es137x.4#6 integrate
.. //depot/projects/hammer/share/man/man4/snd_sbc.4#5 integrate
.. //depot/projects/hammer/share/man/man4/syncache.4#2 integrate
.. //depot/projects/hammer/share/man/man4/tcp.4#15 integrate
.. //depot/projects/hammer/share/man/man4/ttcp.4#5 delete
.. //depot/projects/hammer/share/man/man4/umodem.4#5 integrate
.. //depot/projects/hammer/share/man/man4/vlan.4#12 integrate
.. //depot/projects/hammer/share/man/man5/rc.conf.5#61 integrate
.. //depot/projects/hammer/share/man/man7/environ.7#6 integrate
.. //depot/projects/hammer/share/man/man9/VOP_LISTEXTATTR.9#7 integrate
.. //depot/projects/hammer/share/man/man9/bus_dma.9#17 integrate
.. //depot/projects/hammer/share/zoneinfo/africa#2 integrate
.. //depot/projects/hammer/share/zoneinfo/antarctica#3 integrate
.. //depot/projects/hammer/share/zoneinfo/asia#6 integrate
.. //depot/projects/hammer/share/zoneinfo/australasia#5 integrate
.. //depot/projects/hammer/share/zoneinfo/backward#4 integrate
.. //depot/projects/hammer/share/zoneinfo/etcetera#2 integrate
.. //depot/projects/hammer/share/zoneinfo/europe#6 integrate
.. //depot/projects/hammer/share/zoneinfo/leapseconds#6 integrate
.. //depot/projects/hammer/share/zoneinfo/northamerica#6 integrate
.. //depot/projects/hammer/share/zoneinfo/southamerica#7 integrate
.. //depot/projects/hammer/share/zoneinfo/yearistype.sh#2 integrate
.. //depot/projects/hammer/share/zoneinfo/zone.tab#7 integrate
.. //depot/projects/hammer/sys/alpha/include/_limits.h#8 integrate
.. //depot/projects/hammer/sys/alpha/include/signal.h#6 integrate
.. //depot/projects/hammer/sys/amd64/amd64/db_trace.c#31 integrate
.. //depot/projects/hammer/sys/amd64/amd64/exception.S#44 integrate
.. //depot/projects/hammer/sys/amd64/amd64/genassym.c#39 integrate
.. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#105 integrate
.. //depot/projects/hammer/sys/amd64/amd64/pmap.c#124 integrate
.. //depot/projects/hammer/sys/amd64/amd64/trap.c#72 integrate
.. //depot/projects/hammer/sys/amd64/include/_limits.h#11 integrate
.. //depot/projects/hammer/sys/amd64/include/atomic.h#20 integrate
.. //depot/projects/hammer/sys/amd64/include/signal.h#13 integrate
.. //depot/projects/hammer/sys/arm/include/_limits.h#7 integrate
.. //depot/projects/hammer/sys/arm/include/signal.h#7 integrate
.. //depot/projects/hammer/sys/boot/common/loader.8#22 integrate
.. //depot/projects/hammer/sys/boot/forth/loader.conf#24 integrate
.. //depot/projects/hammer/sys/boot/forth/loader.conf.5#7 integrate
.. //depot/projects/hammer/sys/boot/i386/boot2/boot2.c#15 integrate
.. //depot/projects/hammer/sys/boot/i386/boot2/lib.h#2 integrate
.. //depot/projects/hammer/sys/boot/i386/boot2/sio.S#4 integrate
.. //depot/projects/hammer/sys/boot/i386/libi386/comconsole.c#4 integrate
.. //depot/projects/hammer/sys/boot/sparc64/loader/metadata.c#12 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_ioctl.c#25 integrate
.. //depot/projects/hammer/sys/conf/files#123 integrate
.. //depot/projects/hammer/sys/conf/files.i386#62 integrate
.. //depot/projects/hammer/sys/conf/newvers.sh#17 integrate
.. //depot/projects/hammer/sys/crypto/rijndael/rijndael-alg-fst.c#6 integrate
.. //depot/projects/hammer/sys/crypto/via/padlock.c#1 branch
.. //depot/projects/hammer/sys/dev/acpica/acpi_thermal.c#25 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-all.c#52 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-all.h#32 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#59 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-disk.c#35 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-lowlevel.c#30 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-pci.h#34 integrate
.. //depot/projects/hammer/sys/dev/ata/atapi-cd.c#29 integrate
.. //depot/projects/hammer/sys/dev/ed/if_ed.c#32 integrate
.. //depot/projects/hammer/sys/dev/ed/if_ed_3c503.c#3 integrate
.. //depot/projects/hammer/sys/dev/ed/if_ed_cbus.c#12 integrate
.. //depot/projects/hammer/sys/dev/ed/if_ed_hpp.c#3 integrate
.. //depot/projects/hammer/sys/dev/ed/if_ed_isa.c#10 integrate
.. //depot/projects/hammer/sys/dev/ed/if_ed_novell.c#3 integrate
.. //depot/projects/hammer/sys/dev/ed/if_ed_pccard.c#26 integrate
.. //depot/projects/hammer/sys/dev/ed/if_ed_pci.c#11 integrate
.. //depot/projects/hammer/sys/dev/ed/if_ed_sic.c#4 integrate
.. //depot/projects/hammer/sys/dev/ed/if_ed_wd80x3.c#4 integrate
.. //depot/projects/hammer/sys/dev/ed/if_edvar.h#10 integrate
.. //depot/projects/hammer/sys/dev/ep/if_ep_eisa.c#10 integrate
.. //depot/projects/hammer/sys/dev/firewire/if_fwip.c#7 integrate
.. //depot/projects/hammer/sys/dev/fxp/if_fxp.c#49 integrate
.. //depot/projects/hammer/sys/dev/gem/if_gem.c#20 integrate
.. //depot/projects/hammer/sys/dev/hme/if_hme.c#22 integrate
.. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_amd.c#7 integrate
.. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_mod.c#8 integrate
.. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_x86.c#3 integrate
.. //depot/projects/hammer/sys/dev/ipw/if_ipw.c#9 integrate
.. //depot/projects/hammer/sys/dev/iwi/if_iwi.c#9 integrate
.. //depot/projects/hammer/sys/dev/iwi/if_iwireg.h#3 integrate
.. //depot/projects/hammer/sys/dev/iwi/if_iwivar.h#5 integrate
.. //depot/projects/hammer/sys/dev/md/md.c#50 integrate
.. //depot/projects/hammer/sys/dev/my/if_my.c#21 integrate
.. //depot/projects/hammer/sys/dev/my/if_myreg.h#5 integrate
.. //depot/projects/hammer/sys/dev/pccard/pccarddevs#38 integrate
.. //depot/projects/hammer/sys/dev/pci/pci_pci.c#15 integrate
.. //depot/projects/hammer/sys/dev/pci/pci_user.c#11 integrate
.. //depot/projects/hammer/sys/dev/ral/if_ral.c#8 integrate
.. //depot/projects/hammer/sys/dev/ral/if_ral_pccard.c#3 integrate
.. //depot/projects/hammer/sys/dev/re/if_re.c#30 integrate
.. //depot/projects/hammer/sys/dev/sn/if_sn_pccard.c#12 integrate
.. //depot/projects/hammer/sys/dev/uart/uart_cpu_sparc64.c#17 integrate
.. //depot/projects/hammer/sys/dev/usb/if_ural.c#8 integrate
.. //depot/projects/hammer/sys/dev/usb/uhub.c#17 integrate
.. //depot/projects/hammer/sys/dev/wi/if_wi.c#41 integrate
.. //depot/projects/hammer/sys/fs/devfs/devfs.h#10 integrate
.. //depot/projects/hammer/sys/fs/devfs/devfs_devs.c#13 integrate
.. //depot/projects/hammer/sys/fs/devfs/devfs_int.h#1 branch
.. //depot/projects/hammer/sys/fs/devfs/devfs_rule.c#9 integrate
.. //depot/projects/hammer/sys/fs/devfs/devfs_vfsops.c#18 integrate
.. //depot/projects/hammer/sys/fs/devfs/devfs_vnops.c#38 integrate
.. //depot/projects/hammer/sys/geom/eli/g_eli.c#3 integrate
.. //depot/projects/hammer/sys/geom/eli/g_eli.h#3 integrate
.. //depot/projects/hammer/sys/geom/eli/g_eli_ctl.c#2 integrate
.. //depot/projects/hammer/sys/geom/geom_ctl.c#20 integrate
.. //depot/projects/hammer/sys/geom/geom_io.c#32 integrate
.. //depot/projects/hammer/sys/geom/label/g_label.c#11 integrate
.. //depot/projects/hammer/sys/geom/label/g_label.h#6 integrate
.. //depot/projects/hammer/sys/geom/label/g_label_ext2fs.c#2 integrate
.. //depot/projects/hammer/sys/geom/label/g_label_iso9660.c#2 integrate
.. //depot/projects/hammer/sys/geom/label/g_label_ntfs.c#1 branch
.. //depot/projects/hammer/sys/geom/label/g_label_reiserfs.c#2 integrate
.. //depot/projects/hammer/sys/geom/stripe/g_stripe.c#13 integrate
.. //depot/projects/hammer/sys/geom/stripe/g_stripe.h#7 integrate
.. //depot/projects/hammer/sys/geom/vinum/geom_vinum_drive.c#14 integrate
.. //depot/projects/hammer/sys/geom/vinum/geom_vinum_init.c#10 integrate
.. //depot/projects/hammer/sys/geom/vinum/geom_vinum_plex.c#13 integrate
.. //depot/projects/hammer/sys/geom/vinum/geom_vinum_rm.c#6 integrate
.. //depot/projects/hammer/sys/geom/vinum/geom_vinum_volume.c#10 integrate
.. //depot/projects/hammer/sys/i386/acpica/acpi_wakeup.c#22 integrate
.. //depot/projects/hammer/sys/i386/conf/NOTES#74 integrate
.. //depot/projects/hammer/sys/i386/i386/mp_machdep.c#48 integrate
.. //depot/projects/hammer/sys/i386/i386/pmap.c#71 integrate
.. //depot/projects/hammer/sys/i386/i386/swtch.s#13 integrate
.. //depot/projects/hammer/sys/i386/include/_limits.h#7 integrate
.. //depot/projects/hammer/sys/i386/include/signal.h#9 integrate
.. //depot/projects/hammer/sys/i386/isa/if_el.c#13 delete
.. //depot/projects/hammer/sys/i386/isa/if_elreg.h#3 delete
.. //depot/projects/hammer/sys/ia64/include/_limits.h#7 integrate
.. //depot/projects/hammer/sys/ia64/include/signal.h#8 integrate
.. //depot/projects/hammer/sys/kern/kern_conf.c#34 integrate
.. //depot/projects/hammer/sys/kern/kern_cpu.c#8 integrate
.. //depot/projects/hammer/sys/kern/kern_descrip.c#49 integrate
.. //depot/projects/hammer/sys/kern/kern_kse.c#24 integrate
.. //depot/projects/hammer/sys/kern/kern_lock.c#21 integrate
.. //depot/projects/hammer/sys/kern/kern_mib.c#14 integrate
.. //depot/projects/hammer/sys/kern/link_elf.c#21 integrate
.. //depot/projects/hammer/sys/kern/link_elf_obj.c#48 integrate
.. //depot/projects/hammer/sys/kern/sched_ule.c#65 integrate
.. //depot/projects/hammer/sys/kern/subr_stack.c#2 integrate
.. //depot/projects/hammer/sys/kern/subr_witness.c#45 integrate
.. //depot/projects/hammer/sys/kern/sys_process.c#33 integrate
.. //depot/projects/hammer/sys/kern/vfs_default.c#43 integrate
.. //depot/projects/hammer/sys/kern/vfs_subr.c#91 integrate
.. //depot/projects/hammer/sys/libkern/iconv.c#9 integrate
.. //depot/projects/hammer/sys/modules/Makefile#84 integrate
.. //depot/projects/hammer/sys/modules/de/Makefile#4 integrate
.. //depot/projects/hammer/sys/modules/el/Makefile#2 delete
.. //depot/projects/hammer/sys/modules/geom/geom_label/Makefile#3 integrate
.. //depot/projects/hammer/sys/modules/geom/geom_vinum/Makefile#2 integrate
.. //depot/projects/hammer/sys/modules/padlock/Makefile#1 branch
.. //depot/projects/hammer/sys/modules/procfs/Makefile#4 integrate
.. //depot/projects/hammer/sys/net/bpf.c#38 integrate
.. //depot/projects/hammer/sys/net/bpf.h#14 integrate
.. //depot/projects/hammer/sys/net/bpfdesc.h#12 integrate
.. //depot/projects/hammer/sys/net/bridgestp.c#4 integrate
.. //depot/projects/hammer/sys/net/if.c#54 integrate
.. //depot/projects/hammer/sys/net/if_bridge.c#10 integrate
.. //depot/projects/hammer/sys/net/if_ethersubr.c#45 integrate
.. //depot/projects/hammer/sys/net/if_vlan.c#27 integrate
.. //depot/projects/hammer/sys/net/rtsock.c#26 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c#10 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.h#6 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#14 integrate
.. //depot/projects/hammer/sys/netgraph/ng_base.c#34 integrate
.. //depot/projects/hammer/sys/netgraph/ng_fec.c#16 integrate
.. //depot/projects/hammer/sys/netgraph/ng_ksocket.c#19 integrate
.. //depot/projects/hammer/sys/netgraph/ng_split.c#5 integrate
.. //depot/projects/hammer/sys/netinet/if_atm.c#8 integrate
.. //depot/projects/hammer/sys/netinet/if_ether.c#24 integrate
.. //depot/projects/hammer/sys/netinet/in.c#17 integrate
.. //depot/projects/hammer/sys/netinet/in.h#18 integrate
.. //depot/projects/hammer/sys/netinet/in_pcb.h#23 integrate
.. //depot/projects/hammer/sys/netinet/ip_fastfwd.c#23 integrate
.. //depot/projects/hammer/sys/netinet/ip_icmp.c#24 integrate
.. //depot/projects/hammer/sys/netinet/ip_output.c#50 integrate
.. //depot/projects/hammer/sys/netinet/raw_ip.c#35 integrate
.. //depot/projects/hammer/sys/netinet/tcp.h#13 integrate
.. //depot/projects/hammer/sys/netinet/tcp_input.c#55 integrate
.. //depot/projects/hammer/sys/netinet/tcp_sack.c#21 integrate
.. //depot/projects/hammer/sys/netinet/tcp_syncache.c#28 integrate
.. //depot/projects/hammer/sys/netinet/tcp_usrreq.c#33 integrate
.. //depot/projects/hammer/sys/netinet/udp_usrreq.c#33 integrate
.. //depot/projects/hammer/sys/netinet6/in6_src.c#15 integrate
.. //depot/projects/hammer/sys/netinet6/raw_ip6.c#21 integrate
.. //depot/projects/hammer/sys/netkey/key.c#23 integrate
.. //depot/projects/hammer/sys/opencrypto/cryptodev.c#18 integrate
.. //depot/projects/hammer/sys/opencrypto/xform.c#5 integrate
.. //depot/projects/hammer/sys/pci/if_dc.c#48 integrate
.. //depot/projects/hammer/sys/pci/if_de.c#28 integrate
.. //depot/projects/hammer/sys/pci/if_devar.h#10 integrate
.. //depot/projects/hammer/sys/pci/if_pcn.c#31 integrate
.. //depot/projects/hammer/sys/pci/if_sf.c#33 integrate
.. //depot/projects/hammer/sys/pci/if_sfreg.h#8 integrate
.. //depot/projects/hammer/sys/pci/if_ste.c#36 integrate
.. //depot/projects/hammer/sys/pci/if_stereg.h#10 integrate
.. //depot/projects/hammer/sys/pci/if_xl.c#56 integrate
.. //depot/projects/hammer/sys/pci/if_xlreg.h#15 integrate
.. //depot/projects/hammer/sys/powerpc/include/_limits.h#7 integrate
.. //depot/projects/hammer/sys/powerpc/include/signal.h#6 integrate
.. //depot/projects/hammer/sys/powerpc/ofw/ofw_syscons.c#8 integrate
.. //depot/projects/hammer/sys/sparc64/conf/GENERIC#41 integrate
.. //depot/projects/hammer/sys/sparc64/include/_limits.h#6 integrate
.. //depot/projects/hammer/sys/sparc64/include/signal.h#7 integrate
.. //depot/projects/hammer/sys/sys/conf.h#35 integrate
.. //depot/projects/hammer/sys/sys/malloc.h#12 integrate
.. //depot/projects/hammer/sys/sys/param.h#66 integrate
.. //depot/projects/hammer/sys/sys/signal.h#9 integrate
.. //depot/projects/hammer/sys/sys/stack.h#2 integrate
.. //depot/projects/hammer/sys/sys/systm.h#37 integrate
.. //depot/projects/hammer/sys/ufs/ffs/ffs_softdep.c#30 integrate
.. //depot/projects/hammer/sys/ufs/ffs/ffs_vfsops.c#51 integrate
.. //depot/projects/hammer/sys/ufs/ufs/ufs_dirhash.c#8 integrate
.. //depot/projects/hammer/tools/regression/usr.bin/pkill/pgrep-F.t#2 integrate
.. //depot/projects/hammer/tools/regression/usr.bin/pkill/pgrep-LF.t#1 branch
.. //depot/projects/hammer/tools/regression/usr.bin/pkill/pkill-F.t#2 integrate
.. //depot/projects/hammer/tools/regression/usr.bin/pkill/pkill-LF.t#1 branch
.. //depot/projects/hammer/tools/tools/bpfstat/bpfstat.c#2 integrate
.. //depot/projects/hammer/tools/tools/nanobsd/nanobsd.sh#4 integrate
.. //depot/projects/hammer/usr.bin/at/parsetime.c#3 integrate
.. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.birthday#12 integrate
.. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.history#11 integrate
.. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.holiday#8 integrate
.. //depot/projects/hammer/usr.bin/cmp/Makefile#2 integrate
.. //depot/projects/hammer/usr.bin/cmp/cmp.1#3 integrate
.. //depot/projects/hammer/usr.bin/cmp/cmp.c#2 integrate
.. //depot/projects/hammer/usr.bin/cmp/extern.h#2 integrate
.. //depot/projects/hammer/usr.bin/cmp/link.c#1 branch
.. //depot/projects/hammer/usr.bin/find/function.c#8 integrate
.. //depot/projects/hammer/usr.bin/find/getdate.y#3 integrate
.. //depot/projects/hammer/usr.bin/locate/locate/locate.rc#2 integrate
.. //depot/projects/hammer/usr.bin/locate/locate/updatedb.sh#2 integrate
.. //depot/projects/hammer/usr.bin/mail/USD.doc/mail0.nr#2 integrate
.. //depot/projects/hammer/usr.bin/netstat/if.c#9 integrate
.. //depot/projects/hammer/usr.bin/netstat/main.c#15 integrate
.. //depot/projects/hammer/usr.bin/netstat/netstat.1#10 integrate
.. //depot/projects/hammer/usr.bin/netstat/netstat.h#10 integrate
.. //depot/projects/hammer/usr.bin/pkill/pkill.1#7 integrate
.. //depot/projects/hammer/usr.bin/pkill/pkill.c#8 integrate
.. //depot/projects/hammer/usr.bin/split/split.1#4 integrate
.. //depot/projects/hammer/usr.bin/split/split.c#3 integrate
.. //depot/projects/hammer/usr.bin/tail/forward.c#8 integrate
.. //depot/projects/hammer/usr.bin/window/wwgets.c#2 integrate
.. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c#4 integrate
.. //depot/projects/hammer/usr.sbin/chkgrp/chkgrp.c#6 integrate
.. //depot/projects/hammer/usr.sbin/cron/cron/cron.c#3 integrate
.. //depot/projects/hammer/usr.sbin/cron/cron/cron.h#3 integrate
.. //depot/projects/hammer/usr.sbin/cron/cron/do_command.c#4 integrate
.. //depot/projects/hammer/usr.sbin/cron/lib/misc.c#3 integrate
.. //depot/projects/hammer/usr.sbin/daemon/Makefile#3 integrate
.. //depot/projects/hammer/usr.sbin/daemon/daemon.8#6 integrate
.. //depot/projects/hammer/usr.sbin/daemon/daemon.c#4 integrate
.. //depot/projects/hammer/usr.sbin/inetd/inetd.c#14 integrate
.. //depot/projects/hammer/usr.sbin/jls/jls.c#3 integrate
.. //depot/projects/hammer/usr.sbin/mountd/Makefile#5 integrate
.. //depot/projects/hammer/usr.sbin/mountd/mountd.c#15 integrate
.. //depot/projects/hammer/usr.sbin/moused/Makefile#3 integrate
.. //depot/projects/hammer/usr.sbin/moused/moused.c#13 integrate
.. //depot/projects/hammer/usr.sbin/pciconf/pciconf.c#7 integrate
.. //depot/projects/hammer/usr.sbin/powerd/Makefile#2 integrate
.. //depot/projects/hammer/usr.sbin/powerd/powerd.8#4 integrate
.. //depot/projects/hammer/usr.sbin/powerd/powerd.c#5 integrate
.. //depot/projects/hammer/usr.sbin/sendmail/Makefile#14 integrate
.. //depot/projects/hammer/usr.sbin/sysinstall/dist.c#22 integrate
.. //depot/projects/hammer/usr.sbin/sysinstall/label.c#14 integrate
.. //depot/projects/hammer/usr.sbin/sysinstall/menus.c#35 integrate
.. //depot/projects/hammer/usr.sbin/syslogd/syslogd.c#23 integrate
.. //depot/projects/hammer/usr.sbin/watchdogd/Makefile#4 integrate
.. //depot/projects/hammer/usr.sbin/watchdogd/watchdogd.c#7 integrate
.. //depot/projects/hammer/usr.sbin/wicontrol/wicontrol.8#13 integrate
.. //depot/projects/hammer/usr.sbin/wicontrol/wicontrol.c#9 integrate
Differences ...
==== //depot/projects/hammer/MAINTAINERS#36 (text+ko) ====
@@ -1,4 +1,4 @@
-$FreeBSD: src/MAINTAINERS,v 1.124 2005/08/08 20:10:04 cperciva Exp $
+$FreeBSD: src/MAINTAINERS,v 1.125 2005/08/25 17:14:39 emax Exp $
Please note that the content of this file is strictly advisory.
No locks listed here are valid. The only strict review requirements
@@ -129,6 +129,11 @@
linux emul emulation Please discuss changes here.
bs{diff,patch} cperciva Pre-commit review requested.
portsnap cperciva Pre-commit review requested.
+sys/netgraph/bluetooth emax Pre-commit review preferred.
+lib/libbluetooth emax Pre-commit review preferred.
+lib/libsdp emax Pre-commit review preferred.
+usr.bin/bluetooth emax Pre-commit review preferred.
+usr.sbin/bluetooth emax Pre-commit review preferred.
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#103 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile.inc1,v 1.510 2005/08/07 13:47:25 netchild Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.512 2005/08/23 07:58:55 brian Exp $
#
# Make command line options:
# -DNO_DYNAMICROOT do not link /bin and /sbin dynamically
@@ -1087,7 +1087,7 @@
@echo ">>> Removing old files (only deletes safe to delete libs)"
.for file in ${OLD_FILES}
# Ask for every old file if the user really wants to remove it.
-# It's anoying, but beter safe than sorry.
+# It's annoying, but better safe than sorry.
@[ ! -f "${DESTDIR}/${file}" ] || (rm ${RM_I} "${DESTDIR}/${file}" \
|| ([ -f "${DESTDIR}/${file}" ] \
&& echo "Removing schg flag on ${DESTDIR}/${file}" \
@@ -1101,7 +1101,7 @@
| 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} ] \
+ [ "$${check_empty}" != "empty" -a ! -e "$${manpage}" ] \
&& rm ${RM_I} $${catpage} || true; \
done; \
done
@@ -1119,7 +1119,7 @@
| 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} ] \
+ [ "$${check_empty}" != "empty" -a ! -e "$${manpage}" ] \
&& echo $${catpage} || true; \
done; \
done
==== //depot/projects/hammer/ObsoleteFiles.inc#5 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.11 2005/08/07 13:46:28 netchild Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.14 2005/08/25 13:47:41 glebius 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,8 @@
# The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
#
+# T/TCP retired several months ago
+OLD_FILES+=usr/share/man/man4/ttcp.4.gz
# 20050805 tn3270 retired long ago
OLD_FILES+=usr/share/misc/map3270
# 20050801: too old to be interesting here
@@ -27,6 +29,7 @@
OLD_FILES+=usr/libexec/rexecd
# 20050606: OpenBSD dhclient replaces ISC one
OLD_FILES+=bin/omshell
+OLD_FILES+=sbin/omshell
OLD_FILES+=usr/share/man/man1/omshell.1.gz
OLD_FILES+=usr/share/man/man5/dhcp-eval.5.gz
# 200504XX: ipf tools moved from /usr to /
@@ -53,8 +56,11 @@
# 20050203: Merged with fortunes
OLD_FILES+=usr/share/games/fortune/fortunes2
OLD_FILES+=usr/share/games/fortune/fortunes2.dat
+# 200501XX:
+OLD_FILES+=usr/libexec/getNAME
# 200411XX: gvinum replaces vinum
OLD_FILES+=bin/vinum
+OLD_FILES+=sbin/vinum
OLD_FILES+=usr/share/man/man8/vinum.8.gz
# 20041109: replaced by em(4)
OLD_FILES+=usr/share/man/man4/gx.4.gz
@@ -214,11 +220,19 @@
OLD_FILES+=usr/bin/gasp
OLD_FILES+=usr/bin/gdbreplay
OLD_FILES+=usr/share/man/man1/gasp.1.gz
+OLD_FILES+=sbin/mountd
+OLD_FILES+=sbin/mount_fdesc
+OLD_FILES+=sbin/mount_umap
+OLD_FILES+=sbin/mount_union
+OLD_FILES+=sbin/mount_msdos
+OLD_FILES+=sbin/mount_null
+OLD_FILES+=sbin/mount_kernfs
# 200405XX: arl
OLD_FILES+=usr/sbin/arlconfig
OLD_FILES+=usr/share/man/man8/arlconfig.8.gz
# 200403XX
OLD_FILES+=bin/raidctl
+OLD_FILES+=sbin/raidctl
OLD_FILES+=usr/bin/sasc
OLD_FILES+=usr/sbin/sgsc
OLD_FILES+=usr/sbin/stlload
@@ -255,6 +269,7 @@
OLD_FILES+=lib/libz.so
# 200312XX
OLD_FILES+=bin/cxconfig
+OLD_FILES+=sbin/cxconfig
OLD_FILES+=usr/share/man/man8/cxconfig.8.gz
# 200309XX
OLD_FILES+=usr/bin/symorder
@@ -284,6 +299,8 @@
OLD_FILES+=usr/lib/libskey.a
OLD_FILES+=usr/lib/libskey.so
OLD_FILES+=usr/lib/libskey_p.a
+OLD_FILES+=usr/libexec/tradcpp0
+OLD_FILES+=usr/libexec/cpp0
# 200304XX: removal of xten
OLD_FILES+=usr/sbin/xten
OLD_FILES+=usr/share/man/man1/xten.1.gz
@@ -410,6 +427,10 @@
OLD_FILES+=usr/share/man/man3/des_set_odd_parity.3.gz
OLD_FILES+=usr/share/man/man3/des_string_to_2key.3.gz
OLD_FILES+=usr/share/man/man3/des_string_to_key.3.gz
+# 200212XX
+OLD_FILES+=usr/sbin/kenv
+OLD_FILES+=usr/bin/kenv
+OLD_FILES+=usr/sbin/elf2aout
# 200210XX
OLD_FILES+=usr/share/man/man3/All_FreeBSD.3.gz
OLD_FILES+=usr/share/man/man3/CheckRules.3.gz
@@ -469,11 +490,44 @@
OLD_FILES+=usr/share/man/man6/worms.6.gz
OLD_FILES+=usr/share/man/man6/wump.6.gz
# 200207XX
+OLD_FILES+=usr/share/man/man1aout/ar.1aout.gz
+OLD_FILES+=usr/share/man/man1aout/as.1aout.gz
+OLD_FILES+=usr/share/man/man1aout/ld.1aout.gz
+OLD_FILES+=usr/share/man/man1aout/nm.1aout.gz
+OLD_FILES+=usr/share/man/man1aout/ranlib.1aout.gz
+OLD_FILES+=usr/share/man/man1aout/size.1aout.gz
+OLD_FILES+=usr/share/man/man1aout/strings.1aout.gz
+OLD_FILES+=usr/share/man/man1aout/strip.1aout.gz
OLD_FILES+=bin/mountd
OLD_FILES+=bin/nfsd
# 200206XX
OLD_FILES+=usr/lib/libpam_ssh.a
OLD_FILES+=usr/lib/libpam_ssh_p.a
+OLD_FILES+=usr/bin/help
+OLD_FILES+=usr/bin/sccs
+OLD_FILES+=usr/bin/gdbserver
+OLD_FILES+=usr/bin/ssh-keysign
+OLD_FILES+=usr/sbin/gifconfig
+OLD_FILES+=usr/sbin/prefix
+# 200205XX
+OLD_FILES+=usr/bin/doscmd
+# 200204XX
+OLD_FILES+=usr/bin/a2p
+OLD_FILES+=usr/bin/ptx
+OLD_FILES+=usr/bin/pod2text
+OLD_FILES+=usr/bin/pod2man
+OLD_FILES+=usr/bin/pod2latex
+OLD_FILES+=usr/bin/pod2html
+OLD_FILES+=usr/bin/h2ph
+OLD_FILES+=usr/bin/dprofpp
+OLD_FILES+=usr/bin/c2ph
+OLD_FILES+=usr/bin/h2xs
+OLD_FILES+=usr/bin/pl2pm
+OLD_FILES+=usr/bin/splain
+OLD_FILES+=usr/bin/s2p
+OLD_FILES+=usr/bin/find2perl
+OLD_FILES+=usr/sbin/pkg_update
+OLD_FILES+=usr/sbin/scriptdump
# 200203XX
OLD_FILES+=usr/lib/libss.a
OLD_FILES+=usr/lib/libss_p.a
@@ -482,12 +536,33 @@
OLD_FILES+=usr/lib/libusb.a
OLD_FILES+=usr/lib/libusb.so
OLD_FILES+=usr/lib/libusb_p.a
+OLD_FILES+=usr/sbin/diskpart
+# 200202XX
+OLD_FILES+=usr/bin/gprof4
+# 200201XX
+OLD_FILES+=usr/sbin/linux
# 2001XXXX
OLD_FILES+=etc/security
+OLD_FILES+=usr/bin/joy
+OLD_FILES+=usr/sbin/ibcs2
+OLD_FILES+=usr/sbin/svr4
+OLD_FILES+=usr/bin/chflags
+OLD_FILES+=usr/sbin/uuconv
+OLD_FILES+=usr/sbin/uuchk
+OLD_FILES+=usr/sbin/portmap
+OLD_FILES+=usr/sbin/pmap_set
+OLD_FILES+=usr/sbin/pmap_dump
+OLD_FILES+=usr/sbin/mcon
+OLD_FILES+=usr/sbin/stlstty
+OLD_FILES+=usr/sbin/ispppcontrol
+OLD_FILES+=usr/sbin/rndcontrol
# 200104XX
OLD_FILES+=usr/lib/libdescrypt.a
OLD_FILES+=usr/lib/libscrypt.a
OLD_FILES+=usr/lib/libscrypt_p.a
+OLD_FILES+=usr/sbin/pim6stat
+OLD_FILES+=usr/sbin/pim6sd
+OLD_FILES+=usr/sbin/pim6dd
# 20001200
OLD_FILES+=usr/lib/libgcc_r_pic.a
# 200009XX
@@ -505,8 +580,51 @@
OLD_FILES+=usr/bin/miniperl
# 20000810
OLD_FILES+=usr/bin/sperl
+# 200001XX
+OLD_FILES+=usr/sbin/apmconf
+# 199911XX
+OLD_FILES+=usr/sbin/ipfstat
+OLD_FILES+=usr/sbin/ipmon
+OLD_FILES+=usr/sbin/ipnat
+OLD_FILES+=usr/sbin/bad144
+OLD_FILES+=usr/sbin/wormcontrol
+OLD_FILES+=usr/sbin/named-bootconf
+OLD_FILES+=usr/sbin/kvm_mkdb
+OLD_FILES+=usr/sbin/keyadmin
# 199909XX
OLD_FILES+=usr/lib/libdesrypt_p.a
+OLD_FILES+=sbin/ft
+# 199903XX
+OLD_FILES+=sbin/modload
+OLD_FILES+=sbin/modunload
+OLD_FILES+=usr/sbin/natd
+# 199812XX
+OLD_FILES+=sbin/dset
+# 199809XX
+OLD_FILES+=sbin/scsi
+OLD_FILES+=sbin/scsiformat
+OLD_FILES+=usr/sbin/ncrcontrol
+OLD_FILES+=usr/sbin/tickadj
+# 199806XX
+OLD_FILES+=usr/sbin/mkdosfs
+# 199801XX
+OLD_FILES+=sbin/mount_lfs
+OLD_FILES+=sbin/newlfs
+OLD_FILES+=sbin/dumplfs
+OLD_FILES+=usr/sbin/qcamcontrol
+OLD_FILES+=usr/sbin/supscan
+# 1997XXXX
+OLD_FILES+=usr/sbin/sysctl
+OLD_FILES+=usr/sbin/ctm_scan
+OLD_FILES+=usr/sbin/addgroup
+OLD_FILES+=usr/sbin/rmgroup
+# 1996XXXX
+OLD_FILES+=sbin/rdisc
+OLD_FILES+=usr/sbin/cdplay
+OLD_FILES+=usr/sbin/supfilesrv
+OLD_FILES+=usr/sbin/routed
+OLD_FILES+=usr/sbin/lsdev
+OLD_FILES+=usr/sbin/yppasswdd
## unsorted
# do we still support aout builds?
#OLD_FILES+=usr/lib/aout/c++rt0.o
==== //depot/projects/hammer/bin/sh/parser.c#10 (text+ko) ====
@@ -36,7 +36,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.55 2005/08/13 15:47:13 stefanf Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.56 2005/08/15 17:49:38 stefanf Exp $");
#include <stdlib.h>
#include <unistd.h>
@@ -98,12 +98,6 @@
/* XXX When 'noaliases' is set to one, no alias expansion takes place. */
static int noaliases = 0;
-#define GDB_HACK 1 /* avoid local declarations which gdb can't handle */
-#ifdef GDB_HACK
-static const char argvars[5] = {CTLVAR, VSNORMAL|VSQUOTE, '@', '=', '\0'};
-static const char types[] = "}-+?=";
-#endif
-
STATIC union node *list(int);
STATIC union node *andor(void);
@@ -384,13 +378,12 @@
if (lasttoken != TNL && lasttoken != TSEMI)
synexpect(-1);
} else {
-#ifndef GDB_HACK
- static const char argvars[5] = {CTLVAR, VSNORMAL|VSQUOTE,
- '@', '=', '\0'};
-#endif
+ static char argvars[5] = {
+ CTLVAR, VSNORMAL|VSQUOTE, '@', '=', '\0'
+ };
n2 = (union node *)stalloc(sizeof (struct narg));
n2->type = NARG;
- n2->narg.text = (char *)argvars;
+ n2->narg.text = argvars;
n2->narg.backquote = NULL;
n2->narg.next = NULL;
n1->nfor.args = n2;
@@ -1186,9 +1179,7 @@
int typeloc;
int flags;
char *p;
-#ifndef GDB_HACK
static const char types[] = "}-+?=";
-#endif
int bracketed_name = 0; /* used to handle ${[0-9]*} variables */
c = pgetc();
==== //depot/projects/hammer/bin/sh/sh.1#17 (text+ko) ====
@@ -30,9 +30,9 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95
-.\" $FreeBSD: src/bin/sh/sh.1,v 1.102 2005/06/14 08:25:00 ru Exp $
+.\" $FreeBSD: src/bin/sh/sh.1,v 1.104 2005/08/29 06:47:43 jcamou Exp $
.\"
-.Dd July 3, 2004
+.Dd August 17, 2005
.Dt SH 1
.Os
.Sh NAME
@@ -355,8 +355,9 @@
.El
.Ss Quoting
Quoting is used to remove the special meaning of certain characters
-or words to the shell, such as operators, whitespace, or
-keywords.
+or words to the shell, such as operators, whitespace, keywords,
+or alias names.
+.Pp
There are three types of quoting: matched single quotes,
matched double quotes, and backslash.
.Bl -tag -width indent
@@ -422,6 +423,15 @@
They can also be
used to create lexically obscure code.
This use is discouraged.
+.Pp
+An alias name may be escaped in a command line, so that it is not
+replaced by its alias value, by using quoting characters within or
+adjacent to the alias name. This is most often done by prefixing
+an alias name with a backslash to execute a function, built-in, or
+normal program with the same name.
+See the
+.Sx Quoting
+subsection.
.Ss Commands
The shell interprets the words it reads according to a
language, the specification of which is outside the scope
@@ -1352,8 +1362,7 @@
If it is not found in the
.Ev PATH ,
it is sought in the current working directory.
-.It Ic alias Op Ar name ...
-.It Ic alias Op Ar name Ns = Ns Ar string ...
+.It Ic alias Oo Ar name Ns Oo = Ns Ar string Oc ... Oc
If
.Ar name Ns = Ns Ar string
is specified, the shell defines the alias
@@ -1372,6 +1381,9 @@
.Ic unalias ) .
Alias values are written with appropriate quoting so that they are
suitable for re-input to the shell.
+Also see the
+.Sx Aliases
+subsection.
.It Ic bg Op Ar job ...
Continue the specified jobs
(or the current job if no jobs are given)
@@ -1978,12 +1990,17 @@
.It Fl v Ar virtualmem
The maximal virtual size of a process, in kilobytes.
.El
-.It Ic umask Op Ar mask
+.It Ic umask Oo Fl S Oc Op Ar mask
Set the file creation mask (see
.Xr umask 2 )
-to the octal value specified by
+to the octal or symbolic (see
+.Xr chmod 1 )
+value specified by
.Ar mask .
If the argument is omitted, the current mask value is printed.
+If the
+.Fl S
+option is specified, the output is symbolic, otherwise the output is octal.
.It Ic unalias Oo Fl a Oc Op Ar name
If
.Ar name
==== //depot/projects/hammer/contrib/bind9/lib/dns/resolver.c#3 (text+ko) ====
@@ -2665,7 +2665,7 @@
unsigned int options, unsigned int bucketnum, fetchctx_t **fctxp)
{
fetchctx_t *fctx;
- isc_result_t result = ISC_R_SUCCESS;
+ isc_result_t result;
isc_result_t iresult;
isc_interval_t interval;
dns_fixedname_t qdomain;
@@ -2687,8 +2687,10 @@
strcat(buf, "/"); /* checked */
strcat(buf, typebuf); /* checked */
fctx->info = isc_mem_strdup(res->mctx, buf);
- if (fctx->info == NULL)
+ if (fctx->info == NULL) {
+ result = ISC_R_NOMEMORY;
goto cleanup_fetch;
+ }
FCTXTRACE("create");
dns_name_init(&fctx->name, NULL);
result = dns_name_dup(name, res->mctx, &fctx->name);
==== //depot/projects/hammer/contrib/less/line.c#3 (text+ko) ====
@@ -1,3 +1,4 @@
+/* $FreeBSD: src/contrib/less/line.c,v 1.2 2005/08/26 10:05:59 tjr Exp $ */
/*
* Copyright (C) 1984-2002 Mark Nudelman
*
@@ -911,8 +912,8 @@
/*
* Shift the data to the end of the new linebuf.
*/
- for (fm = linebuf + old_size_linebuf,
- to = linebuf + size_linebuf;
+ for (fm = linebuf + old_size_linebuf - 1,
+ to = linebuf + size_linebuf - 1;
fm >= linebuf; fm--, to--)
*to = *fm;
n = size_linebuf - old_size_linebuf;
==== //depot/projects/hammer/contrib/nvi/docs/USD.doc/vi.ref/vi.ref#2 (text+ko) ====
@@ -10,6 +10,7 @@
.\"
.\" @(#)vi.ref 8.88 (Berkeley) 10/19/96
.\"
+.\" $FreeBSD: src/contrib/nvi/docs/USD.doc/vi.ref/vi.ref,v 1.2 2005/08/17 15:56:04 cperciva Exp $
.\"
.so ref.so
.tp
@@ -27,7 +28,6 @@
University of California, Berkeley
Berkeley, California 94720
.sp 1
-\*(td
.)l
.sp 3
.(l C
==== //depot/projects/hammer/contrib/pf/pflogd/pflogd.c#7 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/contrib/pf/pflogd/pflogd.c,v 1.8 2005/05/03 16:55:20 mlaier Exp $");
+__FBSDID("$FreeBSD: src/contrib/pf/pflogd/pflogd.c,v 1.9 2005/08/23 00:03:58 csjp Exp $");
#include <sys/types.h>
#include <sys/ioctl.h>
@@ -216,15 +216,11 @@
cur_snaplen = snaplen = pcap_snapshot(hpcap);
-#ifdef __FreeBSD__
- /* We can not lock bpf devices ... yet */
-#else
/* lock */
if (ioctl(pcap_fileno(hpcap), BIOCLOCK) < 0) {
logmsg(LOG_ERR, "BIOCLOCK: %s", strerror(errno));
return (-1);
}
-#endif
return (0);
}
==== //depot/projects/hammer/contrib/smbfs/lib/smb/kiconv.c#5 (text+ko) ====
@@ -30,7 +30,7 @@
* SUCH DAMAGE.
*
* $Id: kiconv.c,v 1.3 2001/08/22 03:31:36 bp Exp $
- * $FreeBSD: src/contrib/smbfs/lib/smb/kiconv.c,v 1.3 2004/10/19 17:44:31 obrien Exp $
+ * $FreeBSD: src/contrib/smbfs/lib/smb/kiconv.c,v 1.4 2005/08/24 12:38:26 imura Exp $
*/
#include <sys/types.h>
@@ -52,7 +52,7 @@
struct iconv_add_out dout;
size_t olen;
- if (strlen(from) > ICONV_CSNMAXLEN || strlen(to) > ICONV_CSNMAXLEN)
+ if (strlen(from) >= ICONV_CSNMAXLEN || strlen(to) >= ICONV_CSNMAXLEN)
return EINVAL;
din.ia_version = ICONV_ADD_VER;
strcpy(din.ia_converter, "xlat");
==== //depot/projects/hammer/contrib/traceroute/traceroute.c#4 (text+ko) ====
@@ -28,7 +28,7 @@
"@(#)$Id: traceroute.c,v 1.68 2000/12/14 08:04:33 leres Exp $ (LBL)";
#endif
static const char rcsid[] =
- "$FreeBSD: src/contrib/traceroute/traceroute.c,v 1.26 2004/04/17 18:44:23 pb Exp $";
+ "$FreeBSD: src/contrib/traceroute/traceroute.c,v 1.27 2005/08/26 18:08:24 andre Exp $";
#endif
/*
@@ -946,6 +946,7 @@
continue;
if (!gotlastaddr ||
from->sin_addr.s_addr != lastaddr) {
+ if (probe > 0) printf("\n ");
print(packet, cc, from);
lastaddr = from->sin_addr.s_addr;
++gotlastaddr;
==== //depot/projects/hammer/etc/Makefile#43 (text+ko) ====
@@ -1,5 +1,5 @@
# from: @(#)Makefile 5.11 (Berkeley) 5/21/91
-# $FreeBSD: src/etc/Makefile,v 1.346 2005/08/08 20:10:05 cperciva Exp $
+# $FreeBSD: src/etc/Makefile,v 1.347 2005/08/26 18:54:06 imp Exp $
.if !defined(NO_SENDMAIL)
SUBDIR= sendmail
@@ -76,13 +76,14 @@
.include <bsd.endian.mk>
.if ${TARGET_ENDIANNESS} == "1234"
-CAP_MKDB_ENDIAN= -l
-PWD_MKDB_ENDIAN= -L
+CAP_MKDB_ENDIAN?=-l
+PWD_MKDB_ENDIAN?=-L
.elif ${TARGET_ENDIANNESS} == "4321"
-CAP_MKDB_ENDIAN= -b
-PWD_MKDB_ENDIAN= -B
+CAP_MKDB_ENDIAN?=-b
+PWD_MKDB_ENDIAN?=-B
.else
-CAP_MKDB_ENDIAN=
+CAP_MKDB_ENDIAN?=
+PWD_MKDB_ENDIAN?=
.endif
distribution:
==== //depot/projects/hammer/etc/defaults/rc.conf#59 (text+ko) ====
@@ -15,7 +15,7 @@
# For a more detailed explanation of all the rc.conf variables, please
# refer to the rc.conf(5) manual page.
#
-# $FreeBSD: src/etc/defaults/rc.conf,v 1.257 2005/08/14 18:02:21 pjd Exp $
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.259 2005/08/24 16:25:47 yar Exp $
##############################################################
### Important initial Boot-time options ####################
@@ -40,14 +40,13 @@
pccard_conf="/etc/defaults/pccard.conf" # pccardd(8) config file
powerd_enable="NO" # Run powerd to lower our power usage.
powerd_flags="" # Flags to powerd (if enabled).
-removable_interfaces="" # Removable network interfaces for /etc/pccard_ether.
removable_route_flush="YES" # Flush routes when removing an interface
tmpmfs="AUTO" # Set to YES to always create an mfs /tmp, NO to never
tmpsize="20m" # Size of mfs /tmp if created
-tmpmfs_flags="-S" # Extra mdmfs options for the mfs /tmp
+tmpmfs_flags="-S -M" # Extra mdmfs options for the mfs /tmp
varmfs="AUTO" # Set to YES to always create an mfs /var, NO to never
varsize="32m" # Size of mfs /var if created
-varmfs_flags="-S" # Extra mount options for the mfs /var
+varmfs_flags="-S -M" # Extra mount options for the mfs /var
populate_var="AUTO" # Set to YES to always (re)populate /var, NO to never
local_startup="/usr/local/etc/rc.d /usr/X11R6/etc/rc.d" # startup script dirs.
script_name_sep=" " # Change if your startup scripts' names contain spaces
==== //depot/projects/hammer/etc/network.subr#12 (text+ko) ====
@@ -22,7 +22,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/etc/network.subr,v 1.164 2005/06/30 05:02:34 brooks Exp $
+# $FreeBSD: src/etc/network.subr,v 1.166 2005/08/26 04:06:17 brooks Exp $
#
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list