PERFORCE change 77202 for review

Peter Wemm peter at FreeBSD.org
Thu May 19 18:23:12 PDT 2005


http://perforce.freebsd.org/chv.cgi?CH=77202

Change 77202 by peter at peter_daintree on 2005/05/20 01:22:09

	IFC @77199

Affected files ...

.. //depot/projects/hammer/Makefile.inc1#91 integrate
.. //depot/projects/hammer/UPDATING#76 integrate
.. //depot/projects/hammer/bin/chflags/chflags.1#9 integrate
.. //depot/projects/hammer/bin/chflags/chflags.c#7 integrate
.. //depot/projects/hammer/bin/csh/config.h#6 integrate
.. //depot/projects/hammer/bin/mv/mv.c#7 integrate
.. //depot/projects/hammer/bin/sh/options.c#4 integrate
.. //depot/projects/hammer/contrib/bzip2/CHANGES#2 integrate
.. //depot/projects/hammer/contrib/bzip2/FREEBSD-Xlist#1 branch
.. //depot/projects/hammer/contrib/bzip2/FREEBSD-upgrade#2 integrate
.. //depot/projects/hammer/contrib/bzip2/LICENSE#2 integrate
.. //depot/projects/hammer/contrib/bzip2/Makefile#2 integrate
.. //depot/projects/hammer/contrib/bzip2/Makefile-libbz2_so#2 integrate
.. //depot/projects/hammer/contrib/bzip2/README#2 integrate
.. //depot/projects/hammer/contrib/bzip2/README.COMPILATION.PROBLEMS#2 integrate
.. //depot/projects/hammer/contrib/bzip2/blocksort.c#2 integrate
.. //depot/projects/hammer/contrib/bzip2/bzip2.1#2 integrate
.. //depot/projects/hammer/contrib/bzip2/bzip2.c#2 integrate
.. //depot/projects/hammer/contrib/bzip2/bzip2recover.c#2 integrate
.. //depot/projects/hammer/contrib/bzip2/bzlib.c#2 integrate
.. //depot/projects/hammer/contrib/bzip2/bzlib.h#2 integrate
.. //depot/projects/hammer/contrib/bzip2/bzlib_private.h#2 integrate
.. //depot/projects/hammer/contrib/bzip2/compress.c#2 integrate
.. //depot/projects/hammer/contrib/bzip2/crctable.c#2 integrate
.. //depot/projects/hammer/contrib/bzip2/decompress.c#2 integrate
.. //depot/projects/hammer/contrib/bzip2/huffman.c#2 integrate
.. //depot/projects/hammer/contrib/bzip2/randtable.c#2 integrate
.. //depot/projects/hammer/contrib/bzip2/sample1.bz2.uu#2 integrate
.. //depot/projects/hammer/contrib/bzip2/sample1.ref.gz.uu#2 integrate
.. //depot/projects/hammer/contrib/bzip2/sample2.bz2.uu#2 integrate
.. //depot/projects/hammer/contrib/bzip2/sample2.ref.gz.uu#2 integrate
.. //depot/projects/hammer/contrib/bzip2/sample3.bz2.uu#2 integrate
.. //depot/projects/hammer/contrib/bzip2/sample3.ref.gz.uu#2 integrate
.. //depot/projects/hammer/contrib/ipfilter/pcap-bpf.h#1 branch
.. //depot/projects/hammer/contrib/ipfilter/tools/ipf_y.y#2 integrate
.. //depot/projects/hammer/contrib/ipfilter/tools/ipmon.c#2 integrate
.. //depot/projects/hammer/contrib/lukemftp/src/cmds.c#5 integrate
.. //depot/projects/hammer/contrib/lukemftp/src/cmdtab.c#5 integrate
.. //depot/projects/hammer/contrib/lukemftp/src/extern.h#5 integrate
.. //depot/projects/hammer/contrib/lukemftp/src/fetch.c#6 integrate
.. //depot/projects/hammer/contrib/lukemftp/src/ftp.1#7 integrate
.. //depot/projects/hammer/contrib/lukemftp/src/ftp.c#6 integrate
.. //depot/projects/hammer/contrib/lukemftp/src/ftp_var.h#5 integrate
.. //depot/projects/hammer/contrib/lukemftp/src/main.c#5 integrate
.. //depot/projects/hammer/contrib/lukemftp/src/progressbar.c#6 integrate
.. //depot/projects/hammer/contrib/lukemftp/src/util.c#6 integrate
.. //depot/projects/hammer/contrib/lukemftp/src/version.h#6 integrate
.. //depot/projects/hammer/contrib/one-true-awk/FIXES#6 integrate
.. //depot/projects/hammer/contrib/one-true-awk/FREEBSD-upgrade#6 integrate
.. //depot/projects/hammer/contrib/one-true-awk/README#4 integrate
.. //depot/projects/hammer/contrib/one-true-awk/awk.h#3 integrate
.. //depot/projects/hammer/contrib/one-true-awk/b.c#6 integrate
.. //depot/projects/hammer/contrib/one-true-awk/lex.c#5 integrate
.. //depot/projects/hammer/contrib/one-true-awk/lib.c#4 integrate
.. //depot/projects/hammer/contrib/one-true-awk/main.c#6 integrate
.. //depot/projects/hammer/contrib/one-true-awk/makefile#4 integrate
.. //depot/projects/hammer/contrib/one-true-awk/proctab.c#2 integrate
.. //depot/projects/hammer/contrib/one-true-awk/run.c#6 integrate
.. //depot/projects/hammer/contrib/one-true-awk/tran.c#3 integrate
.. //depot/projects/hammer/contrib/pf/authpf/authpf.8#3 integrate
.. //depot/projects/hammer/contrib/pf/authpf/authpf.c#4 integrate
.. //depot/projects/hammer/contrib/pf/authpf/pathnames.h#2 integrate
.. //depot/projects/hammer/contrib/pf/ftp-proxy/ftp-proxy.8#4 integrate
.. //depot/projects/hammer/contrib/pf/ftp-proxy/ftp-proxy.c#4 integrate
.. //depot/projects/hammer/contrib/pf/ftp-proxy/getline.c#2 integrate
.. //depot/projects/hammer/contrib/pf/ftp-proxy/util.c#3 integrate
.. //depot/projects/hammer/contrib/pf/ftp-proxy/util.h#2 integrate
.. //depot/projects/hammer/contrib/pf/man/pf.4#6 integrate
.. //depot/projects/hammer/contrib/pf/man/pf.conf.5#8 integrate
.. //depot/projects/hammer/contrib/pf/man/pf.os.5#3 integrate
.. //depot/projects/hammer/contrib/pf/man/pflog.4#4 integrate
.. //depot/projects/hammer/contrib/pf/man/pfsync.4#5 integrate
.. //depot/projects/hammer/contrib/pf/pfctl/parse.y#5 integrate
.. //depot/projects/hammer/contrib/pf/pfctl/pf_print_state.c#3 integrate
.. //depot/projects/hammer/contrib/pf/pfctl/pfctl.8#3 integrate
.. //depot/projects/hammer/contrib/pf/pfctl/pfctl.c#4 integrate
.. //depot/projects/hammer/contrib/pf/pfctl/pfctl.h#4 integrate
.. //depot/projects/hammer/contrib/pf/pfctl/pfctl_altq.c#5 integrate
.. //depot/projects/hammer/contrib/pf/pfctl/pfctl_optimize.c#1 branch
.. //depot/projects/hammer/contrib/pf/pfctl/pfctl_osfp.c#3 integrate
.. //depot/projects/hammer/contrib/pf/pfctl/pfctl_parser.c#5 integrate
.. //depot/projects/hammer/contrib/pf/pfctl/pfctl_parser.h#4 integrate
.. //depot/projects/hammer/contrib/pf/pfctl/pfctl_qstats.c#4 integrate
.. //depot/projects/hammer/contrib/pf/pfctl/pfctl_radix.c#3 integrate
.. //depot/projects/hammer/contrib/pf/pfctl/pfctl_table.c#5 integrate
.. //depot/projects/hammer/contrib/pf/pflogd/pflogd.8#3 integrate
.. //depot/projects/hammer/contrib/pf/pflogd/pflogd.c#6 integrate
.. //depot/projects/hammer/contrib/pf/pflogd/pidfile.c#4 integrate
.. //depot/projects/hammer/contrib/pf/pflogd/privsep.c#2 integrate
.. //depot/projects/hammer/contrib/pf/pflogd/privsep_fdpass.c#2 integrate
.. //depot/projects/hammer/contrib/smbfs/lib/smb/ctx.c#4 integrate
.. //depot/projects/hammer/contrib/tcp_wrappers/hosts_access.c#2 integrate
.. //depot/projects/hammer/contrib/tcp_wrappers/socket.c#3 integrate
.. //depot/projects/hammer/contrib/top/commands.c#6 integrate
.. //depot/projects/hammer/contrib/top/display.c#3 integrate
.. //depot/projects/hammer/contrib/top/machine.h#3 integrate
.. //depot/projects/hammer/contrib/top/top.c#7 integrate
.. //depot/projects/hammer/etc/devd.conf#19 integrate
.. //depot/projects/hammer/etc/mtree/BSD.local.dist#24 integrate
.. //depot/projects/hammer/games/caesar/Makefile#2 integrate
.. //depot/projects/hammer/games/caesar/caesar.c#3 integrate
.. //depot/projects/hammer/games/fortune/datfiles/fortunes#44 integrate
.. //depot/projects/hammer/games/fortune/datfiles/limerick#4 integrate
.. //depot/projects/hammer/games/pom/Makefile#2 integrate
.. //depot/projects/hammer/games/pom/pom.c#3 integrate
.. //depot/projects/hammer/gnu/lib/libobjc/Makefile#11 integrate
.. //depot/projects/hammer/gnu/lib/libregex/FREEBSD-upgrade#3 integrate
.. //depot/projects/hammer/gnu/lib/libregex/Makefile#8 integrate
.. //depot/projects/hammer/gnu/lib/libregex/config.h#1 branch
.. //depot/projects/hammer/gnu/lib/libregex/posix/regex.h#3 integrate
.. //depot/projects/hammer/gnu/lib/libregex/regcomp.c#1 branch
.. //depot/projects/hammer/gnu/lib/libregex/regex.c#8 integrate
.. //depot/projects/hammer/gnu/lib/libregex/regex_internal.c#1 branch
.. //depot/projects/hammer/gnu/lib/libregex/regex_internal.h#1 branch
.. //depot/projects/hammer/gnu/lib/libregex/regexec.c#1 branch
.. //depot/projects/hammer/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#8 integrate
.. //depot/projects/hammer/gnu/usr.bin/grep/FREEBSD-upgrade#1 branch
.. //depot/projects/hammer/gnu/usr.bin/grep/dfa.c#6 integrate
.. //depot/projects/hammer/gnu/usr.bin/grep/dfa.h#3 integrate
.. //depot/projects/hammer/gnu/usr.bin/grep/grep.c#7 integrate
.. //depot/projects/hammer/gnu/usr.bin/grep/grep.h#3 integrate
.. //depot/projects/hammer/gnu/usr.bin/grep/mbcache.h#2 delete
.. //depot/projects/hammer/gnu/usr.bin/grep/search.c#6 integrate
.. //depot/projects/hammer/include/Makefile#42 integrate
.. //depot/projects/hammer/include/netdb.h#9 integrate
.. //depot/projects/hammer/include/runefile.h#2 delete
.. //depot/projects/hammer/include/unistd.h#16 integrate
.. //depot/projects/hammer/lib/csu/i386-elf/crt1.c#5 integrate
.. //depot/projects/hammer/lib/csu/i386-elf/crti.S#2 integrate
.. //depot/projects/hammer/lib/csu/i386-elf/crtn.S#2 integrate
.. //depot/projects/hammer/lib/libalias/HISTORY#2 delete
.. //depot/projects/hammer/lib/libalias/Makefile#11 integrate
.. //depot/projects/hammer/lib/libalias/alias.c#12 delete
.. //depot/projects/hammer/lib/libalias/alias.h#7 delete
.. //depot/projects/hammer/lib/libalias/alias_cuseeme.c#6 delete
.. //depot/projects/hammer/lib/libalias/alias_db.c#9 delete
.. //depot/projects/hammer/lib/libalias/alias_ftp.c#6 delete
.. //depot/projects/hammer/lib/libalias/alias_irc.c#6 delete
.. //depot/projects/hammer/lib/libalias/alias_local.h#8 delete
.. //depot/projects/hammer/lib/libalias/alias_nbt.c#7 delete
.. //depot/projects/hammer/lib/libalias/alias_old.c#5 delete
.. //depot/projects/hammer/lib/libalias/alias_pptp.c#8 delete
.. //depot/projects/hammer/lib/libalias/alias_proxy.c#7 delete
.. //depot/projects/hammer/lib/libalias/alias_skinny.c#8 delete
.. //depot/projects/hammer/lib/libalias/alias_smedia.c#6 delete
.. //depot/projects/hammer/lib/libalias/alias_util.c#7 delete
.. //depot/projects/hammer/lib/libalias/libalias.3#9 delete
.. //depot/projects/hammer/lib/libarchive/archive_entry.c#16 integrate
.. //depot/projects/hammer/lib/libc/gen/Makefile.inc#22 integrate
.. //depot/projects/hammer/lib/libc/gen/getbootfile.c#3 integrate
.. //depot/projects/hammer/lib/libc/gen/getgrouplist.c#4 integrate
.. //depot/projects/hammer/lib/libc/gen/ttyname.3#4 integrate
.. //depot/projects/hammer/lib/libc/gen/ttyname.c#5 integrate
.. //depot/projects/hammer/lib/libc/gmon/mcount.c#4 integrate
.. //depot/projects/hammer/lib/libc/locale/rune.c#5 integrate
.. //depot/projects/hammer/lib/libc/locale/runefile.h#1 branch
.. //depot/projects/hammer/lib/libc/net/getaddrinfo.c#22 integrate
.. //depot/projects/hammer/lib/libc/net/gethostbynis.c#5 integrate
.. //depot/projects/hammer/lib/libc/net/getnameinfo.c#5 integrate
.. //depot/projects/hammer/lib/libc/net/getnetbydns.c#6 integrate
.. //depot/projects/hammer/lib/libc/net/getnetbyht.c#4 integrate
.. //depot/projects/hammer/lib/libc/net/getnetbynis.c#3 integrate
.. //depot/projects/hammer/lib/libc/net/getnetnamadr.c#4 integrate
.. //depot/projects/hammer/lib/libc/net/name6.c#17 integrate
.. //depot/projects/hammer/lib/libc/net/netdb_private.h#4 integrate
.. //depot/projects/hammer/lib/libc/net/rcmd.c#6 integrate
.. //depot/projects/hammer/lib/libc/net/res_send.c#6 integrate
.. //depot/projects/hammer/lib/libc/stdio/fopen.3#4 integrate
.. //depot/projects/hammer/lib/libc/stdio/glue.h#2 integrate
.. //depot/projects/hammer/lib/libc/sys/accept.2#7 integrate
.. //depot/projects/hammer/lib/libc/uuid/uuid_is_nil.c#4 integrate
.. //depot/projects/hammer/lib/libc/yp/yplib.c#6 integrate
.. //depot/projects/hammer/lib/libc_r/uthread/pthread_private.h#15 integrate
.. //depot/projects/hammer/lib/libpam/modules/pam_unix/pam_unix.c#8 integrate
.. //depot/projects/hammer/lib/libpmc/Makefile#2 integrate
.. //depot/projects/hammer/lib/libpmc/libpmc.c#2 integrate
.. //depot/projects/hammer/lib/libpmc/pmc.3#2 integrate
.. //depot/projects/hammer/lib/libpmc/pmc.h#2 integrate
.. //depot/projects/hammer/lib/libstand/Makefile#12 integrate
.. //depot/projects/hammer/lib/libstand/bzipfs.c#3 integrate
.. //depot/projects/hammer/lib/libstand/bzlib.c.diff#2 delete
.. //depot/projects/hammer/lib/libstand/bzlib.h.diff#2 delete
.. //depot/projects/hammer/lib/libstand/bzlib_private.h.diff#3 delete
.. //depot/projects/hammer/lib/libstand/stand.h#7 integrate
.. //depot/projects/hammer/lib/libstand/zutil.h.diff#2 delete
.. //depot/projects/hammer/lib/libutil/logwtmp.c#4 integrate
.. //depot/projects/hammer/lib/libutil/realhostname.c#4 integrate
.. //depot/projects/hammer/lib/libz/FREEBSD-upgrade#1 branch
.. //depot/projects/hammer/lib/libz/adler32.c#3 integrate
.. //depot/projects/hammer/lib/libz/compress.c#3 integrate
.. //depot/projects/hammer/lib/libz/crc32.c#3 integrate
.. //depot/projects/hammer/lib/libz/deflate.c#3 integrate
.. //depot/projects/hammer/lib/libz/deflate.h#3 integrate
.. //depot/projects/hammer/lib/libz/example.c#3 integrate
.. //depot/projects/hammer/lib/libz/infback.c#3 integrate
.. //depot/projects/hammer/lib/libz/inffast.c#3 integrate
.. //depot/projects/hammer/lib/libz/inflate.c#4 integrate
.. //depot/projects/hammer/lib/libz/inftrees.c#3 integrate
.. //depot/projects/hammer/lib/libz/trees.c#3 integrate
.. //depot/projects/hammer/lib/libz/uncompr.c#3 integrate
.. //depot/projects/hammer/lib/libz/zlib.3#4 integrate
.. //depot/projects/hammer/lib/libz/zutil.c#3 integrate
.. //depot/projects/hammer/lib/libz/zutil.h#3 integrate
.. //depot/projects/hammer/lib/msun/i387/s_ceilf.S#2 integrate
.. //depot/projects/hammer/lib/msun/i387/s_floorf.S#2 integrate
.. //depot/projects/hammer/lib/msun/i387/s_truncf.S#2 integrate
.. //depot/projects/hammer/libexec/Makefile#29 integrate
.. //depot/projects/hammer/libexec/ftp-proxy/Makefile#2 integrate
.. //depot/projects/hammer/libexec/rlogind/rlogind.c#4 integrate
.. //depot/projects/hammer/libexec/rshd/rshd.c#5 integrate
.. //depot/projects/hammer/libexec/rtld-elf/i386/rtld_start.S#2 integrate
.. //depot/projects/hammer/libexec/talkd/process.c#2 integrate
.. //depot/projects/hammer/libexec/tftpd/tftpd.c#10 integrate
.. //depot/projects/hammer/release/Makefile#71 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#76 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#94 integrate
.. //depot/projects/hammer/release/doc/share/misc/dev.archlist.txt#27 integrate
.. //depot/projects/hammer/release/doc/share/sgml/release.dsl#4 integrate
.. //depot/projects/hammer/release/doc/zh_CN.GB2312/relnotes/common/new.sgml#5 integrate
.. //depot/projects/hammer/release/picobsd/tinyware/login/pico-login.c#3 integrate
.. //depot/projects/hammer/release/scripts/package-split.py#4 integrate
.. //depot/projects/hammer/release/scripts/package-trees.sh#2 integrate
.. //depot/projects/hammer/sbin/atacontrol/atacontrol.8#6 integrate
.. //depot/projects/hammer/sbin/atacontrol/atacontrol.c#14 integrate
.. //depot/projects/hammer/sbin/atm/atm/atm.h#4 integrate
.. //depot/projects/hammer/sbin/atm/atmconfig/atmconfig_device.h#2 integrate
.. //depot/projects/hammer/sbin/atm/ilmid/ilmid.c#11 integrate
.. //depot/projects/hammer/sbin/devd/devd.cc#11 integrate
.. //depot/projects/hammer/sbin/dump/traverse.c#9 integrate
.. //depot/projects/hammer/sbin/fdisk/fdisk.c#16 integrate
.. //depot/projects/hammer/sbin/fdisk_pc98/Makefile#4 integrate
.. //depot/projects/hammer/sbin/fdisk_pc98/fdisk.c#9 integrate
.. //depot/projects/hammer/sbin/ggate/shared/ggate.h#2 integrate
.. //depot/projects/hammer/sbin/ifconfig/af_inet6.c#2 integrate
.. //depot/projects/hammer/sbin/ifconfig/ifpfsync.c#2 integrate
.. //depot/projects/hammer/sbin/ipf/Makefile.inc#2 integrate
.. //depot/projects/hammer/sbin/ipf/ipf/Makefile#2 integrate
.. //depot/projects/hammer/sbin/ipfw/ipfw.8#41 integrate
.. //depot/projects/hammer/sbin/kldstat/kldstat.8#3 integrate
.. //depot/projects/hammer/sbin/kldstat/kldstat.c#6 integrate
.. //depot/projects/hammer/sbin/natd/natd.c#10 integrate
.. //depot/projects/hammer/sbin/pfctl/Makefile#5 integrate
.. //depot/projects/hammer/sbin/route/route.c#9 integrate
.. //depot/projects/hammer/share/dict/freebsd#5 integrate
.. //depot/projects/hammer/share/examples/etc/make.conf#38 integrate
.. //depot/projects/hammer/share/examples/mdoc/example.4#4 integrate
.. //depot/projects/hammer/share/man/man3/Makefile#11 integrate
.. //depot/projects/hammer/share/man/man3/pthread.3#7 integrate
.. //depot/projects/hammer/share/man/man3/pthread_atfork.3#1 branch
.. //depot/projects/hammer/share/man/man4/Makefile#71 integrate
.. //depot/projects/hammer/share/man/man4/carp.4#4 integrate
.. //depot/projects/hammer/share/man/man4/hwpmc.4#2 integrate
.. //depot/projects/hammer/share/man/man4/ichsmb.4#3 integrate
.. //depot/projects/hammer/share/man/man4/iwi.4#2 integrate
.. //depot/projects/hammer/share/man/man4/man4.i386/Makefile#29 integrate
.. //depot/projects/hammer/share/man/man4/man4.i386/acpi_asus.4#6 integrate
.. //depot/projects/hammer/share/man/man4/man4.i386/acpi_ibm.4#1 branch
.. //depot/projects/hammer/share/man/man4/man4.i386/ep.4#10 integrate
.. //depot/projects/hammer/share/man/man4/mn.4#1 branch
.. //depot/projects/hammer/share/man/man4/ng_nat.4#1 branch
.. //depot/projects/hammer/share/man/man4/ng_netflow.4#8 integrate
.. //depot/projects/hammer/share/man/man4/nve.4#1 branch
.. //depot/projects/hammer/share/man/man4/twe.4#8 integrate
.. //depot/projects/hammer/share/man/man5/Makefile#11 integrate
.. //depot/projects/hammer/share/man/man5/devfs.conf.5#1 branch
.. //depot/projects/hammer/share/man/man5/devfs.rules.5#1 branch
.. //depot/projects/hammer/share/man/man5/rc.conf.5#55 integrate
.. //depot/projects/hammer/share/man/man7/release.7#26 integrate
.. //depot/projects/hammer/share/man/man9/style.9#22 integrate
.. //depot/projects/hammer/share/man/man9/taskqueue.9#11 integrate
.. //depot/projects/hammer/share/misc/bsd-family-tree#25 integrate
.. //depot/projects/hammer/sys/alpha/alpha/clock.c#9 integrate
.. //depot/projects/hammer/sys/alpha/alpha/timerreg.h#4 delete
.. //depot/projects/hammer/sys/alpha/include/ppireg.h#1 branch
.. //depot/projects/hammer/sys/alpha/include/timerreg.h#1 branch
.. //depot/projects/hammer/sys/alpha/isa/isa_dma.c#8 integrate
.. //depot/projects/hammer/sys/amd64/amd64/machdep.c#124 integrate
.. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#92 integrate
.. //depot/projects/hammer/sys/amd64/amd64/prof_machdep.c#4 integrate
.. //depot/projects/hammer/sys/amd64/include/cpufunc.h#33 integrate
.. //depot/projects/hammer/sys/amd64/include/ppireg.h#1 branch
.. //depot/projects/hammer/sys/amd64/include/timerreg.h#1 branch
.. //depot/projects/hammer/sys/amd64/isa/clock.c#40 integrate
.. //depot/projects/hammer/sys/amd64/isa/isa.h#12 integrate
.. //depot/projects/hammer/sys/amd64/isa/isa_dma.c#18 integrate
.. //depot/projects/hammer/sys/amd64/isa/timerreg.h#9 delete
.. //depot/projects/hammer/sys/arm/arm/vm_machdep.c#12 integrate
.. //depot/projects/hammer/sys/boot/common/boot.c#5 integrate
.. //depot/projects/hammer/sys/boot/common/help.common#12 integrate
.. //depot/projects/hammer/sys/boot/common/loader.8#19 integrate
.. //depot/projects/hammer/sys/boot/forth/loader.conf#21 integrate
.. //depot/projects/hammer/sys/boot/ofw/libofw/ofw_copy.c#5 integrate
.. //depot/projects/hammer/sys/boot/pc98/boot2/Makefile#9 integrate
.. //depot/projects/hammer/sys/boot/pc98/boot2/boot.c#6 integrate
.. //depot/projects/hammer/sys/boot/pc98/boot2/boot.h#4 integrate
.. //depot/projects/hammer/sys/boot/pc98/boot2/boot2.S#2 integrate
.. //depot/projects/hammer/sys/boot/pc98/boot2/disk.c#7 integrate
.. //depot/projects/hammer/sys/boot/pc98/boot2/io.c#4 integrate
.. //depot/projects/hammer/sys/boot/pc98/boot2/sys.c#6 integrate
.. //depot/projects/hammer/sys/boot/pc98/boot2/table.c#3 integrate
.. //depot/projects/hammer/sys/boot/pc98/btx/btx/Makefile#6 integrate
.. //depot/projects/hammer/sys/boot/pc98/btx/btx/btx.S#6 integrate
.. //depot/projects/hammer/sys/boot/pc98/btx/btxldr/Makefile#6 integrate
.. //depot/projects/hammer/sys/boot/pc98/btx/btxldr/btxldr.S#5 integrate
.. //depot/projects/hammer/sys/boot/pc98/kgzldr/Makefile#8 integrate
.. //depot/projects/hammer/sys/boot/pc98/kgzldr/crt.s#4 integrate
.. //depot/projects/hammer/sys/boot/pc98/libpc98/Makefile#8 integrate
.. //depot/projects/hammer/sys/boot/pc98/libpc98/biosdisk.c#8 integrate
.. //depot/projects/hammer/sys/boot/pc98/libpc98/biosmem.c#4 integrate
.. //depot/projects/hammer/sys/boot/pc98/libpc98/comconsole.c#4 integrate
.. //depot/projects/hammer/sys/boot/pc98/libpc98/gatea20.c#3 integrate
.. //depot/projects/hammer/sys/boot/pc98/libpc98/time.c#3 integrate
.. //depot/projects/hammer/sys/boot/pc98/libpc98/vidconsole.c#5 integrate
.. //depot/projects/hammer/sys/boot/pc98/loader/Makefile#9 integrate
.. //depot/projects/hammer/sys/boot/pc98/loader/main.c#5 integrate
.. //depot/projects/hammer/sys/cam/cam_xpt.c#20 integrate
.. //depot/projects/hammer/sys/cam/scsi/scsi_da.c#27 integrate
.. //depot/projects/hammer/sys/compat/ndis/kern_ndis.c#31 integrate
.. //depot/projects/hammer/sys/compat/ndis/kern_windrv.c#7 integrate
.. //depot/projects/hammer/sys/compat/ndis/ndis_var.h#21 integrate
.. //depot/projects/hammer/sys/compat/ndis/ntoskrnl_var.h#19 integrate
.. //depot/projects/hammer/sys/compat/ndis/subr_hal.c#13 integrate
.. //depot/projects/hammer/sys/compat/ndis/subr_ndis.c#30 integrate
.. //depot/projects/hammer/sys/compat/ndis/subr_ntoskrnl.c#30 integrate
.. //depot/projects/hammer/sys/compat/ndis/subr_usbd.c#3 integrate
.. //depot/projects/hammer/sys/conf/NOTES#89 integrate
.. //depot/projects/hammer/sys/conf/files#113 integrate
.. //depot/projects/hammer/sys/conf/files.pc98#44 integrate
.. //depot/projects/hammer/sys/conf/files.sparc64#29 integrate
.. //depot/projects/hammer/sys/conf/options#73 integrate
.. //depot/projects/hammer/sys/conf/options.i386#34 integrate
.. //depot/projects/hammer/sys/conf/options.pc98#30 integrate
.. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_compat.h#9 integrate
.. //depot/projects/hammer/sys/contrib/pf/net/if_pflog.c#11 integrate
.. //depot/projects/hammer/sys/contrib/pf/net/if_pflog.h#4 integrate
.. //depot/projects/hammer/sys/contrib/pf/net/if_pfsync.c#13 integrate
.. //depot/projects/hammer/sys/contrib/pf/net/if_pfsync.h#4 integrate
.. //depot/projects/hammer/sys/contrib/pf/net/pf.c#22 integrate
.. //depot/projects/hammer/sys/contrib/pf/net/pf_if.c#8 integrate
.. //depot/projects/hammer/sys/contrib/pf/net/pf_ioctl.c#17 integrate
.. //depot/projects/hammer/sys/contrib/pf/net/pf_norm.c#7 integrate
.. //depot/projects/hammer/sys/contrib/pf/net/pf_osfp.c#4 integrate
.. //depot/projects/hammer/sys/contrib/pf/net/pf_subr.c#2 integrate
.. //depot/projects/hammer/sys/contrib/pf/net/pf_table.c#5 integrate
.. //depot/projects/hammer/sys/contrib/pf/net/pfvar.h#9 integrate
.. //depot/projects/hammer/sys/dev/aac/aac_disk.c#12 integrate
.. //depot/projects/hammer/sys/dev/acpi_support/acpi_asus.c#5 integrate
.. //depot/projects/hammer/sys/dev/acpi_support/acpi_panasonic.c#3 integrate
.. //depot/projects/hammer/sys/dev/acpica/Osd/OsdSchedule.c#12 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi.c#60 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_acad.c#17 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_ec.c#32 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpivar.h#45 integrate
.. //depot/projects/hammer/sys/dev/arcmsr/arcmsr.c#3 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-all.c#50 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-all.h#30 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#56 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-commands.h#4 delete
.. //depot/projects/hammer/sys/dev/ata/ata-disk.c#32 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-dma.c#21 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-lowlevel.c#29 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-pci.c#31 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-pci.h#31 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-queue.c#25 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-raid.c#24 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-raid.h#14 integrate
.. //depot/projects/hammer/sys/dev/ata/atapi-cam.c#21 integrate
.. //depot/projects/hammer/sys/dev/ata/atapi-cd.c#28 integrate
.. //depot/projects/hammer/sys/dev/ata/atapi-fd.c#15 integrate
.. //depot/projects/hammer/sys/dev/ata/atapi-tape.c#18 integrate
.. //depot/projects/hammer/sys/dev/bge/if_bge.c#44 integrate
.. //depot/projects/hammer/sys/dev/bge/if_bgereg.h#23 integrate
.. //depot/projects/hammer/sys/dev/ciss/ciss.c#33 integrate
.. //depot/projects/hammer/sys/dev/ciss/cissio.h#4 integrate
.. //depot/projects/hammer/sys/dev/ct/ct_isa.c#10 integrate
.. //depot/projects/hammer/sys/dev/digi/CX.bios.h#2 integrate
.. //depot/projects/hammer/sys/dev/digi/CX.fepos.h#2 integrate
.. //depot/projects/hammer/sys/dev/digi/CX_PCI.bios.h#2 integrate
.. //depot/projects/hammer/sys/dev/digi/CX_PCI.fepos.h#2 integrate
.. //depot/projects/hammer/sys/dev/digi/EPCX.bios.h#2 integrate
.. //depot/projects/hammer/sys/dev/digi/EPCX.fepos.h#2 integrate
.. //depot/projects/hammer/sys/dev/digi/EPCX_PCI.bios.h#2 integrate
.. //depot/projects/hammer/sys/dev/digi/EPCX_PCI.fepos.h#2 integrate
.. //depot/projects/hammer/sys/dev/digi/Xe.bios.h#2 integrate
.. //depot/projects/hammer/sys/dev/digi/Xe.fepos.h#2 integrate
.. //depot/projects/hammer/sys/dev/digi/Xem.bios.h#2 integrate
.. //depot/projects/hammer/sys/dev/digi/Xem.fepos.h#2 integrate
.. //depot/projects/hammer/sys/dev/esp/esp_sbus.c#9 integrate
.. //depot/projects/hammer/sys/dev/esp/ncr53c9x.c#8 integrate
.. //depot/projects/hammer/sys/dev/esp/ncr53c9xreg.h#5 integrate
.. //depot/projects/hammer/sys/dev/esp/ncr53c9xvar.h#6 integrate
.. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_amd.c#2 integrate
.. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_intel.c#2 integrate
.. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_mod.c#2 integrate
.. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_piv.c#2 integrate
.. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_ppro.c#2 integrate
.. //depot/projects/hammer/sys/dev/ic/i8237.h#3 integrate
.. //depot/projects/hammer/sys/dev/ic/i8253reg.h#1 branch
.. //depot/projects/hammer/sys/dev/if_ndis/if_ndis.c#32 integrate
.. //depot/projects/hammer/sys/dev/if_ndis/if_ndis_pccard.c#11 integrate
.. //depot/projects/hammer/sys/dev/if_ndis/if_ndis_pci.c#13 integrate
.. //depot/projects/hammer/sys/dev/if_ndis/if_ndisvar.h#15 integrate
.. //depot/projects/hammer/sys/dev/iir/iir_ctrl.c#11 integrate
.. //depot/projects/hammer/sys/dev/isp/isp_freebsd.h#9 integrate
.. //depot/projects/hammer/sys/dev/isp/isp_inline.h#6 integrate
.. //depot/projects/hammer/sys/dev/isp/isp_pci.c#15 integrate
.. //depot/projects/hammer/sys/dev/isp/ispvar.h#12 integrate
.. //depot/projects/hammer/sys/dev/iwi/if_iwi.c#2 integrate
.. //depot/projects/hammer/sys/dev/iwi/if_iwivar.h#2 integrate
.. //depot/projects/hammer/sys/dev/ixgb/if_ixgb.c#8 integrate
.. //depot/projects/hammer/sys/dev/ixgb/if_ixgb.h#6 integrate
.. //depot/projects/hammer/sys/dev/kbd/kbdtables.h#2 integrate
.. //depot/projects/hammer/sys/dev/mc146818/mc146818.c#3 integrate
.. //depot/projects/hammer/sys/dev/mc146818/mc146818var.h#3 integrate
.. //depot/projects/hammer/sys/dev/mii/brgphy.c#17 integrate
.. //depot/projects/hammer/sys/dev/mii/miidevs#10 integrate
.. //depot/projects/hammer/sys/dev/mk48txx/mk48txx.c#5 integrate
.. //depot/projects/hammer/sys/dev/mk48txx/mk48txxreg.h#4 integrate
.. //depot/projects/hammer/sys/dev/mk48txx/mk48txxvar.h#2 integrate
.. //depot/projects/hammer/sys/dev/nve/if_nve.c#4 integrate
.. //depot/projects/hammer/sys/dev/ofw/openfirmio.h#6 integrate
.. //depot/projects/hammer/sys/dev/ofw/openpromio.c#7 integrate
.. //depot/projects/hammer/sys/dev/sound/sbus/cs4231.c#4 integrate
.. //depot/projects/hammer/sys/dev/syscons/daemon/daemon_saver.c#3 integrate
.. //depot/projects/hammer/sys/dev/syscons/snake/snake_saver.c#3 integrate
.. //depot/projects/hammer/sys/dev/syscons/star/star_saver.c#2 integrate
.. //depot/projects/hammer/sys/dev/syscons/syscons.c#29 integrate
.. //depot/projects/hammer/sys/dev/syscons/syscons.h#6 integrate
.. //depot/projects/hammer/sys/dev/uart/uart_tty.c#16 integrate
.. //depot/projects/hammer/sys/dev/usb/ohci_pci.c#11 integrate
.. //depot/projects/hammer/sys/dev/usb/uhub.c#16 integrate
.. //depot/projects/hammer/sys/dev/usb/umass.c#31 integrate
.. //depot/projects/hammer/sys/dev/usb/usbdi.h#11 integrate
.. //depot/projects/hammer/sys/dev/usb/uvisor.c#15 integrate
.. //depot/projects/hammer/sys/dev/vkbd/vkbd.c#6 integrate
.. //depot/projects/hammer/sys/dev/wl/if_wl.c#15 integrate
.. //depot/projects/hammer/sys/dev/wl/if_wl_i82586.h#1 branch
.. //depot/projects/hammer/sys/fs/devfs/devfs_vnops.c#33 integrate
.. //depot/projects/hammer/sys/fs/ntfs/ntfs_subr.c#11 integrate
.. //depot/projects/hammer/sys/fs/nwfs/nwfs_subr.c#5 integrate
.. //depot/projects/hammer/sys/fs/smbfs/smbfs_smb.c#9 integrate
.. //depot/projects/hammer/sys/fs/smbfs/smbfs_subr.c#5 integrate
.. //depot/projects/hammer/sys/fs/smbfs/smbfs_subr.h#5 integrate
.. //depot/projects/hammer/sys/fs/udf/udf_vnops.c#27 integrate
.. //depot/projects/hammer/sys/fs/unionfs/union_vnops.c#27 integrate
.. //depot/projects/hammer/sys/geom/geom_event.c#22 integrate
.. //depot/projects/hammer/sys/geom/geom_pc98_enc.c#3 integrate
.. //depot/projects/hammer/sys/geom/mirror/g_mirror.c#22 integrate
.. //depot/projects/hammer/sys/geom/raid3/g_raid3_ctl.c#8 integrate
.. //depot/projects/hammer/sys/geom/stripe/g_stripe.c#11 integrate
.. //depot/projects/hammer/sys/geom/vinum/geom_vinum_drive.c#12 integrate
.. //depot/projects/hammer/sys/i386/i386/identcpu.c#20 integrate
.. //depot/projects/hammer/sys/i386/i386/initcpu.c#11 integrate
.. //depot/projects/hammer/sys/i386/i386/locore.s#14 integrate
.. //depot/projects/hammer/sys/i386/i386/machdep.c#51 integrate
.. //depot/projects/hammer/sys/i386/i386/mp_machdep.c#43 integrate
.. //depot/projects/hammer/sys/i386/i386/nexus.c#17 integrate
.. //depot/projects/hammer/sys/i386/i386/sys_machdep.c#18 integrate
.. //depot/projects/hammer/sys/i386/i386/vm_machdep.c#44 integrate
.. //depot/projects/hammer/sys/i386/include/cpufunc.h#12 integrate
.. //depot/projects/hammer/sys/i386/include/md_var.h#14 integrate
.. //depot/projects/hammer/sys/i386/include/npx.h#6 integrate
.. //depot/projects/hammer/sys/i386/include/pmc_mdep.h#2 integrate
.. //depot/projects/hammer/sys/i386/include/ppireg.h#1 branch
.. //depot/projects/hammer/sys/i386/include/timerreg.h#1 branch
.. //depot/projects/hammer/sys/i386/isa/atpic.c#14 integrate
.. //depot/projects/hammer/sys/i386/isa/clock.c#25 integrate
.. //depot/projects/hammer/sys/i386/isa/ic/if_wl_i82586.h#3 delete
.. //depot/projects/hammer/sys/i386/isa/isa.h#6 integrate
.. //depot/projects/hammer/sys/i386/isa/isa_dma.c#8 integrate
.. //depot/projects/hammer/sys/i386/isa/lptreg.h#2 delete
.. //depot/projects/hammer/sys/i386/isa/npx.c#25 integrate
.. //depot/projects/hammer/sys/i386/isa/prof_machdep.c#6 integrate
.. //depot/projects/hammer/sys/i386/isa/spkr.c#11 integrate
.. //depot/projects/hammer/sys/i386/isa/timerreg.h#3 delete
.. //depot/projects/hammer/sys/ia64/include/bus.h#16 integrate
.. //depot/projects/hammer/sys/ia64/isa/isa_dma.c#6 integrate
.. //depot/projects/hammer/sys/isa/isa_dmareg.h#1 branch
.. //depot/projects/hammer/sys/isa/isareg.h#5 integrate
.. //depot/projects/hammer/sys/isa/syscons_isa.c#10 integrate
.. //depot/projects/hammer/sys/kern/imgact_aout.c#14 integrate
.. //depot/projects/hammer/sys/kern/imgact_elf.c#28 integrate
.. //depot/projects/hammer/sys/kern/kern_descrip.c#47 integrate
.. //depot/projects/hammer/sys/kern/kern_exec.c#47 integrate
.. //depot/projects/hammer/sys/kern/kern_exit.c#45 integrate
.. //depot/projects/hammer/sys/kern/kern_switch.c#42 integrate
.. //depot/projects/hammer/sys/kern/subr_bus.c#40 integrate
.. //depot/projects/hammer/sys/kern/subr_devstat.c#12 integrate
.. //depot/projects/hammer/sys/kern/subr_rman.c#15 integrate
.. //depot/projects/hammer/sys/kern/subr_taskqueue.c#12 integrate
.. //depot/projects/hammer/sys/kern/sysv_shm.c#21 integrate
.. //depot/projects/hammer/sys/kern/uipc_mbuf.c#29 integrate
.. //depot/projects/hammer/sys/kern/uipc_sem.c#12 integrate
.. //depot/projects/hammer/sys/kern/uipc_syscalls.c#49 integrate
.. //depot/projects/hammer/sys/kern/uipc_usrreq.c#33 integrate
.. //depot/projects/hammer/sys/kern/vfs_cluster.c#27 integrate
.. //depot/projects/hammer/sys/kern/vfs_default.c#39 integrate
.. //depot/projects/hammer/sys/kern/vfs_export.c#12 integrate
.. //depot/projects/hammer/sys/kern/vfs_mount.c#56 integrate
.. //depot/projects/hammer/sys/kern/vfs_subr.c#83 integrate
.. //depot/projects/hammer/sys/modules/Makefile#76 integrate
.. //depot/projects/hammer/sys/modules/acpi/acpi/Makefile#8 integrate
.. //depot/projects/hammer/sys/modules/esp/Makefile#4 integrate
.. //depot/projects/hammer/sys/modules/fdc/Makefile#9 integrate
.. //depot/projects/hammer/sys/modules/libalias/Makefile#1 branch
.. //depot/projects/hammer/sys/modules/netgraph/Makefile#17 integrate
.. //depot/projects/hammer/sys/modules/netgraph/Makefile.inc#3 integrate
.. //depot/projects/hammer/sys/modules/netgraph/nat/Makefile#1 branch
.. //depot/projects/hammer/sys/modules/pmc/Makefile#3 integrate
.. //depot/projects/hammer/sys/modules/sem/Makefile#2 integrate
.. //depot/projects/hammer/sys/modules/sio/Makefile#5 integrate
.. //depot/projects/hammer/sys/net/bpf.c#31 integrate
.. //depot/projects/hammer/sys/net/if_mib.c#4 integrate
.. //depot/projects/hammer/sys/net/if_tap.c#23 integrate
.. //depot/projects/hammer/sys/net/if_tun.c#25 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#16 integrate
.. //depot/projects/hammer/sys/netgraph/netflow/netflow.c#10 integrate
.. //depot/projects/hammer/sys/netgraph/netflow/netflow.h#2 integrate
.. //depot/projects/hammer/sys/netgraph/netflow/ng_netflow.c#5 integrate
.. //depot/projects/hammer/sys/netgraph/netflow/ng_netflow.h#4 integrate
.. //depot/projects/hammer/sys/netgraph/netgraph.h#17 integrate
.. //depot/projects/hammer/sys/netgraph/ng_base.c#29 integrate
.. //depot/projects/hammer/sys/netgraph/ng_device.c#18 integrate
.. //depot/projects/hammer/sys/netgraph/ng_ksocket.c#18 integrate
.. //depot/projects/hammer/sys/netgraph/ng_nat.c#1 branch
.. //depot/projects/hammer/sys/netgraph/ng_nat.h#1 branch
.. //depot/projects/hammer/sys/netgraph/ng_ppp.c#14 integrate
.. //depot/projects/hammer/sys/netgraph/ng_socket.c#14 integrate
.. //depot/projects/hammer/sys/netinet/ip_carp.c#6 integrate
.. //depot/projects/hammer/sys/netinet/ip_divert.c#30 integrate
.. //depot/projects/hammer/sys/netinet/ip_dummynet.c#31 integrate
.. //depot/projects/hammer/sys/netinet/ip_fastfwd.c#20 integrate
.. //depot/projects/hammer/sys/netinet/ip_fw.h#22 integrate
.. //depot/projects/hammer/sys/netinet/ip_fw2.c#55 integrate
.. //depot/projects/hammer/sys/netinet/ip_icmp.c#23 integrate
.. //depot/projects/hammer/sys/netinet/ip_icmp.h#8 integrate
.. //depot/projects/hammer/sys/netinet/ip_input.c#50 integrate
.. //depot/projects/hammer/sys/netinet/libalias/Makefile#2 delete
.. //depot/projects/hammer/sys/netinet/libalias/alias.c#2 integrate
.. //depot/projects/hammer/sys/netinet/libalias/alias.h#2 integrate
.. //depot/projects/hammer/sys/netinet/libalias/alias_cuseeme.c#2 integrate
.. //depot/projects/hammer/sys/netinet/libalias/alias_db.c#2 integrate
.. //depot/projects/hammer/sys/netinet/libalias/alias_ftp.c#2 integrate
.. //depot/projects/hammer/sys/netinet/libalias/alias_irc.c#2 integrate
.. //depot/projects/hammer/sys/netinet/libalias/alias_local.h#2 integrate
.. //depot/projects/hammer/sys/netinet/libalias/alias_nbt.c#2 integrate
.. //depot/projects/hammer/sys/netinet/libalias/alias_old.c#2 integrate
.. //depot/projects/hammer/sys/netinet/libalias/alias_pptp.c#2 integrate
.. //depot/projects/hammer/sys/netinet/libalias/alias_proxy.c#2 integrate
.. //depot/projects/hammer/sys/netinet/libalias/alias_skinny.c#2 integrate
.. //depot/projects/hammer/sys/netinet/libalias/alias_smedia.c#2 integrate
.. //depot/projects/hammer/sys/netinet/libalias/alias_util.c#2 integrate
.. //depot/projects/hammer/sys/netinet/raw_ip.c#33 integrate
.. //depot/projects/hammer/sys/netinet/tcp_input.c#48 integrate
.. //depot/projects/hammer/sys/netinet/tcp_output.c#30 integrate
.. //depot/projects/hammer/sys/netinet/tcp_sack.c#15 integrate
.. //depot/projects/hammer/sys/netinet/tcp_subr.c#43 integrate
.. //depot/projects/hammer/sys/netinet/tcp_usrreq.c#29 integrate
.. //depot/projects/hammer/sys/netinet/tcp_var.h#28 integrate
.. //depot/projects/hammer/sys/netinet/udp_usrreq.c#31 integrate
.. //depot/projects/hammer/sys/netinet6/icmp6.c#20 integrate
.. //depot/projects/hammer/sys/netinet6/in6_src.c#12 integrate
.. //depot/projects/hammer/sys/netinet6/ip6_fw.c#12 integrate
.. //depot/projects/hammer/sys/netinet6/ip6_output.c#30 integrate
.. //depot/projects/hammer/sys/netsmb/smb_conn.c#9 integrate
.. //depot/projects/hammer/sys/nfsclient/nfs_socket.c#26 integrate
.. //depot/projects/hammer/sys/nfsclient/nfs_vfsops.c#39 integrate
.. //depot/projects/hammer/sys/pc98/cbus/30line.h#1 branch
.. //depot/projects/hammer/sys/pc98/cbus/cbus.h#1 branch
.. //depot/projects/hammer/sys/pc98/cbus/cbus_dma.c#1 branch
.. //depot/projects/hammer/sys/pc98/cbus/cbus_dmareg.h#1 branch
.. //depot/projects/hammer/sys/pc98/cbus/clock.c#1 branch
.. //depot/projects/hammer/sys/pc98/cbus/fdc.c#1 branch
.. //depot/projects/hammer/sys/pc98/cbus/fdc_cbus.c#1 branch
.. //depot/projects/hammer/sys/pc98/cbus/fdcreg.h#1 branch
.. //depot/projects/hammer/sys/pc98/cbus/fdcvar.h#1 branch
.. //depot/projects/hammer/sys/pc98/cbus/gdc.c#1 branch
.. //depot/projects/hammer/sys/pc98/cbus/nmi.c#1 branch
.. //depot/projects/hammer/sys/pc98/cbus/olpt.c#1 branch
.. //depot/projects/hammer/sys/pc98/cbus/olptreg.h#1 branch
.. //depot/projects/hammer/sys/pc98/cbus/pckbd.c#1 branch
.. //depot/projects/hammer/sys/pc98/cbus/pckbdtables.h#1 branch
.. //depot/projects/hammer/sys/pc98/cbus/pmc.c#1 branch
.. //depot/projects/hammer/sys/pc98/cbus/ppc.c#1 branch
.. //depot/projects/hammer/sys/pc98/cbus/ppcreg.h#1 branch
.. //depot/projects/hammer/sys/pc98/cbus/sc_machdep.h#1 branch
.. //depot/projects/hammer/sys/pc98/cbus/scgdcrndr.c#1 branch
.. //depot/projects/hammer/sys/pc98/cbus/scterm-sck.c#1 branch
.. //depot/projects/hammer/sys/pc98/cbus/scvtb.c#1 branch
.. //depot/projects/hammer/sys/pc98/cbus/sio.c#1 branch
.. //depot/projects/hammer/sys/pc98/cbus/sio_cbus.c#1 branch
.. //depot/projects/hammer/sys/pc98/cbus/syscons_cbus.c#1 branch
.. //depot/projects/hammer/sys/pc98/conf/NOTES#43 integrate
.. //depot/projects/hammer/sys/pc98/i386/busio.s#5 delete
.. //depot/projects/hammer/sys/pc98/i386/busiosubr.c#4 delete
.. //depot/projects/hammer/sys/pc98/i386/machdep.c#44 delete
.. //depot/projects/hammer/sys/pc98/include/npx.h#2 integrate
.. //depot/projects/hammer/sys/pc98/include/ppireg.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/timerreg.h#1 branch
.. //depot/projects/hammer/sys/pc98/pc98/30line.h#3 delete
.. //depot/projects/hammer/sys/pc98/pc98/busio.s#1 branch
.. //depot/projects/hammer/sys/pc98/pc98/busiosubr.c#1 branch
.. //depot/projects/hammer/sys/pc98/pc98/clock.c#20 delete
.. //depot/projects/hammer/sys/pc98/pc98/fd.c#27 delete
.. //depot/projects/hammer/sys/pc98/pc98/fdc_cbus.c#4 delete
.. //depot/projects/hammer/sys/pc98/pc98/fdcvar.h#3 delete
.. //depot/projects/hammer/sys/pc98/pc98/fdreg.h#3 delete
.. //depot/projects/hammer/sys/pc98/pc98/isa_dma.c#7 delete
.. //depot/projects/hammer/sys/pc98/pc98/machdep.c#1 branch
.. //depot/projects/hammer/sys/pc98/pc98/nmi.c#3 delete
.. //depot/projects/hammer/sys/pc98/pc98/olpt.c#10 delete
.. //depot/projects/hammer/sys/pc98/pc98/pc98.h#5 delete
.. //depot/projects/hammer/sys/pc98/pc98/pc98_machdep.c#4 integrate
.. //depot/projects/hammer/sys/pc98/pc98/pc98gdc.c#13 delete
.. //depot/projects/hammer/sys/pc98/pc98/pc98kbd.c#7 delete
.. //depot/projects/hammer/sys/pc98/pc98/pmc.c#3 delete
.. //depot/projects/hammer/sys/pc98/pc98/ppc.c#8 delete
.. //depot/projects/hammer/sys/pc98/pc98/ppcreg.h#2 delete
.. //depot/projects/hammer/sys/pc98/pc98/sc_machdep.h#2 delete
.. //depot/projects/hammer/sys/pc98/pc98/scgdcrndr.c#3 delete
.. //depot/projects/hammer/sys/pc98/pc98/scterm-sck.c#4 delete
.. //depot/projects/hammer/sys/pc98/pc98/scvtbpc98.c#4 delete
.. //depot/projects/hammer/sys/pc98/pc98/sio.c#36 delete
.. //depot/projects/hammer/sys/pc98/pc98/sio_cbus.c#7 delete
.. //depot/projects/hammer/sys/pc98/pc98/syscons_pc98.c#8 delete
.. //depot/projects/hammer/sys/pccard/pccard_nbk.c#6 integrate
.. //depot/projects/hammer/sys/posix4/ksem.h#1 branch
.. //depot/projects/hammer/sys/powerpc/conf/GENERIC#22 integrate
.. //depot/projects/hammer/sys/powerpc/powermac/ata_kauai.c#10 integrate
.. //depot/projects/hammer/sys/powerpc/powermac/ata_macio.c#14 integrate
.. //depot/projects/hammer/sys/security/mac/mac_posix_sem.c#1 branch
.. //depot/projects/hammer/sys/security/mac_biba/mac_biba.c#32 integrate
.. //depot/projects/hammer/sys/security/mac_mls/mac_mls.c#31 integrate
.. //depot/projects/hammer/sys/security/mac_stub/mac_stub.c#14 integrate
.. //depot/projects/hammer/sys/security/mac_test/mac_test.c#32 integrate
.. //depot/projects/hammer/sys/sparc64/central/central.c#6 integrate
.. //depot/projects/hammer/sys/sparc64/ebus/ebus.c#15 integrate
.. //depot/projects/hammer/sys/sparc64/fhc/fhc_central.c#6 integrate
.. //depot/projects/hammer/sys/sparc64/fhc/fhc_nexus.c#6 integrate
.. //depot/projects/hammer/sys/sparc64/include/eeprom.h#6 delete
.. //depot/projects/hammer/sys/sparc64/isa/isa.c#12 integrate
.. //depot/projects/hammer/sys/sparc64/sbus/dma_sbus.c#1 branch
.. //depot/projects/hammer/sys/sparc64/sbus/lsi64854.c#4 integrate
.. //depot/projects/hammer/sys/sparc64/sbus/lsi64854var.h#3 integrate
.. //depot/projects/hammer/sys/sparc64/sbus/sbus.c#18 integrate
.. //depot/projects/hammer/sys/sparc64/sbus/sbusvar.h#6 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/eeprom.c#7 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/eeprom_ebus.c#9 delete
.. //depot/projects/hammer/sys/sparc64/sparc64/eeprom_sbus.c#9 delete
.. //depot/projects/hammer/sys/sparc64/sparc64/rtc.c#3 integrate
.. //depot/projects/hammer/sys/sys/acl.h#5 integrate
.. //depot/projects/hammer/sys/sys/ata.h#11 integrate
.. //depot/projects/hammer/sys/sys/consio.h#3 integrate
.. //depot/projects/hammer/sys/sys/diskpc98.h#7 integrate
.. //depot/projects/hammer/sys/sys/imgact_aout.h#6 integrate
.. //depot/projects/hammer/sys/sys/mac.h#24 integrate
.. //depot/projects/hammer/sys/sys/mac_policy.h#26 integrate
.. //depot/projects/hammer/sys/sys/mbuf.h#40 integrate
.. //depot/projects/hammer/sys/sys/param.h#59 integrate
.. //depot/projects/hammer/sys/sys/pmc.h#2 integrate
.. //depot/projects/hammer/sys/sys/taskqueue.h#8 integrate
.. //depot/projects/hammer/sys/ufs/ffs/ffs_softdep.c#28 integrate
.. //depot/projects/hammer/sys/ufs/ufs/ufs_vnops.c#35 integrate
.. //depot/projects/hammer/sys/vm/swap_pager.c#39 integrate
.. //depot/projects/hammer/sys/vm/vm_fault.c#30 integrate
.. //depot/projects/hammer/sys/vm/vm_map.c#48 integrate
.. //depot/projects/hammer/sys/vm/vm_meter.c#18 integrate
.. //depot/projects/hammer/sys/vm/vm_object.c#54 integrate
.. //depot/projects/hammer/sys/vm/vm_object.h#23 integrate
.. //depot/projects/hammer/sys/vm/vm_pager.c#19 integrate
.. //depot/projects/hammer/sys/vm/vm_pager.h#10 integrate
.. //depot/projects/hammer/sys/vm/vnode_pager.c#34 integrate
.. //depot/projects/hammer/tools/build/Makefile#7 integrate
.. //depot/projects/hammer/tools/regression/lib/libc/resolv/Makefile#1 branch
.. //depot/projects/hammer/tools/regression/lib/libc/resolv/mach#1 branch
.. //depot/projects/hammer/tools/regression/lib/libc/resolv/resolv.c#1 branch
.. //depot/projects/hammer/tools/regression/lib/libc/resolv/resolv.t#1 branch
.. //depot/projects/hammer/tools/regression/net80211/ccmp/test_ccmp.c#2 integrate
.. //depot/projects/hammer/tools/regression/net80211/tkip/test_tkip.c#2 integrate
.. //depot/projects/hammer/tools/regression/net80211/wep/test_wep.c#2 integrate
.. //depot/projects/hammer/tools/regression/netinet/tcpconnect/tcpconnect.c#4 integrate
.. //depot/projects/hammer/tools/regression/sockets/listenclose/listenclose.c#2 integrate
.. //depot/projects/hammer/tools/regression/usr.bin/file2c/regress.1.out#1 branch
.. //depot/projects/hammer/tools/regression/usr.bin/file2c/regress.2.out#1 branch
.. //depot/projects/hammer/tools/regression/usr.bin/file2c/regress.3.out#1 branch
.. //depot/projects/hammer/tools/regression/usr.bin/file2c/regress.4.out#1 branch
.. //depot/projects/hammer/tools/regression/usr.bin/file2c/regress.5.out#1 branch
.. //depot/projects/hammer/tools/regression/usr.bin/file2c/regress.6.out#1 branch
.. //depot/projects/hammer/tools/regression/usr.bin/file2c/regress.7.out#1 branch
.. //depot/projects/hammer/tools/regression/usr.bin/file2c/regress.8.out#1 branch
.. //depot/projects/hammer/tools/regression/usr.bin/file2c/regress.9.out#1 branch
.. //depot/projects/hammer/tools/regression/usr.bin/file2c/regress.out#2 delete
.. //depot/projects/hammer/tools/regression/usr.bin/file2c/regress.sh#3 integrate
.. //depot/projects/hammer/tools/regression/usr.bin/make/shell/path/Makefile#1 branch
.. //depot/projects/hammer/tools/regression/usr.bin/make/shell/path/expected.status#1 branch
.. //depot/projects/hammer/tools/regression/usr.bin/make/shell/path/expected.stderr#1 branch
.. //depot/projects/hammer/tools/regression/usr.bin/make/shell/path/expected.stdout#1 branch
.. //depot/projects/hammer/tools/regression/usr.bin/make/shell/path/sh.sh#1 branch
.. //depot/projects/hammer/tools/regression/usr.bin/make/shell/path/test.t#1 branch
.. //depot/projects/hammer/tools/regression/usr.bin/make/shell/path_select/Makefile#1 branch
.. //depot/projects/hammer/tools/regression/usr.bin/make/shell/path_select/expected.status#1 branch
.. //depot/projects/hammer/tools/regression/usr.bin/make/shell/path_select/expected.stderr#1 branch
.. //depot/projects/hammer/tools/regression/usr.bin/make/shell/path_select/expected.stdout#1 branch
.. //depot/projects/hammer/tools/regression/usr.bin/make/shell/path_select/sh.sh#1 branch
.. //depot/projects/hammer/tools/regression/usr.bin/make/shell/path_select/test.t#1 branch
.. //depot/projects/hammer/tools/regression/usr.bin/make/shell/select/Makefile#1 branch
.. //depot/projects/hammer/tools/regression/usr.bin/make/shell/select/expected.status#1 branch
.. //depot/projects/hammer/tools/regression/usr.bin/make/shell/select/expected.stderr#1 branch
.. //depot/projects/hammer/tools/regression/usr.bin/make/shell/select/expected.stdout#1 branch
.. //depot/projects/hammer/tools/regression/usr.bin/make/shell/select/test.t#1 branch
.. //depot/projects/hammer/tools/tools/nanobsd/Customize/files#1 branch
.. //depot/projects/hammer/tools/tools/nanobsd/Customize/pkgs#1 branch
.. //depot/projects/hammer/tools/tools/nanobsd/Files/root/change_password#1 branch
.. //depot/projects/hammer/tools/tools/nanobsd/Files/root/save_sshkeys#1 branch
.. //depot/projects/hammer/tools/tools/nanobsd/Files/root/updatep1#1 branch
.. //depot/projects/hammer/tools/tools/nanobsd/Files/root/updatep2#1 branch
.. //depot/projects/hammer/tools/tools/nanobsd/Makefile#10 integrate
.. //depot/projects/hammer/tools/tools/nanobsd/i386.diskimage#12 integrate
.. //depot/projects/hammer/tools/tools/nanobsd/make.conf#14 integrate
.. //depot/projects/hammer/usr.bin/Makefile#42 integrate
.. //depot/projects/hammer/usr.bin/awk/Makefile#4 integrate
.. //depot/projects/hammer/usr.bin/awk/b.c.diff#1 branch
.. //depot/projects/hammer/usr.bin/awk/main.c.diff#1 branch
.. //depot/projects/hammer/usr.bin/awk/run.c.diff#1 branch
.. //depot/projects/hammer/usr.bin/brandelf/brandelf.c#2 integrate
.. //depot/projects/hammer/usr.bin/compress/zopen.c#2 integrate
.. //depot/projects/hammer/usr.bin/file2c/Makefile#2 integrate
.. //depot/projects/hammer/usr.bin/file2c/file2c.1#2 integrate
.. //depot/projects/hammer/usr.bin/file2c/file2c.c#2 integrate
.. //depot/projects/hammer/usr.bin/less/Makefile#3 integrate
.. //depot/projects/hammer/usr.bin/less/lesspipe.sh#2 integrate
.. //depot/projects/hammer/usr.bin/less/zless.sh#1 branch
.. //depot/projects/hammer/usr.bin/make/GNode.h#3 integrate
.. //depot/projects/hammer/usr.bin/make/Makefile#18 integrate
.. //depot/projects/hammer/usr.bin/make/arch.c#18 integrate
.. //depot/projects/hammer/usr.bin/make/arch.h#4 integrate
.. //depot/projects/hammer/usr.bin/make/buf.c#11 integrate
.. //depot/projects/hammer/usr.bin/make/buf.h#9 integrate
.. //depot/projects/hammer/usr.bin/make/compat.c#19 delete
.. //depot/projects/hammer/usr.bin/make/compat.h#3 delete
.. //depot/projects/hammer/usr.bin/make/cond.c#20 integrate
.. //depot/projects/hammer/usr.bin/make/for.c#18 integrate
.. //depot/projects/hammer/usr.bin/make/for.h#3 integrate
.. //depot/projects/hammer/usr.bin/make/globals.h#5 integrate
.. //depot/projects/hammer/usr.bin/make/hash.c#7 integrate
.. //depot/projects/hammer/usr.bin/make/hash.h#6 integrate
.. //depot/projects/hammer/usr.bin/make/hash_tables.c#2 integrate
.. //depot/projects/hammer/usr.bin/make/job.c#26 integrate
.. //depot/projects/hammer/usr.bin/make/job.h#14 integrate
.. //depot/projects/hammer/usr.bin/make/lst.c#5 integrate
.. //depot/projects/hammer/usr.bin/make/lst.h#14 integrate
.. //depot/projects/hammer/usr.bin/make/main.c#34 integrate
.. //depot/projects/hammer/usr.bin/make/make.c#14 integrate
.. //depot/projects/hammer/usr.bin/make/make.h#9 integrate
.. //depot/projects/hammer/usr.bin/make/nonints.h#13 delete
.. //depot/projects/hammer/usr.bin/make/parse.c#30 integrate
.. //depot/projects/hammer/usr.bin/make/parse.h#4 integrate
.. //depot/projects/hammer/usr.bin/make/sprite.h#4 delete
.. //depot/projects/hammer/usr.bin/make/str.c#14 integrate
.. //depot/projects/hammer/usr.bin/make/str.h#3 integrate
.. //depot/projects/hammer/usr.bin/make/suff.c#18 integrate
.. //depot/projects/hammer/usr.bin/make/targ.c#15 integrate
.. //depot/projects/hammer/usr.bin/make/util.c#6 integrate
.. //depot/projects/hammer/usr.bin/make/util.h#5 integrate
.. //depot/projects/hammer/usr.bin/make/var.c#28 integrate
.. //depot/projects/hammer/usr.bin/make/var.h#9 integrate
.. //depot/projects/hammer/usr.bin/make/var_modify.c#10 delete
.. //depot/projects/hammer/usr.bin/mklocale/Makefile#3 integrate
.. //depot/projects/hammer/usr.bin/mklocale/yacc.y#12 integrate
.. //depot/projects/hammer/usr.bin/mkuzip/Makefile#2 integrate
.. //depot/projects/hammer/usr.bin/mkuzip/mkuzip.c#2 integrate
.. //depot/projects/hammer/usr.bin/netstat/route.c#9 integrate
.. //depot/projects/hammer/usr.bin/rsh/rsh.c#6 integrate
.. //depot/projects/hammer/usr.bin/sed/main.c#7 integrate
.. //depot/projects/hammer/usr.bin/sed/sed.1#12 integrate
.. //depot/projects/hammer/usr.bin/smbutil/Makefile#2 integrate
.. //depot/projects/hammer/usr.bin/systat/pigs.c#4 integrate
.. //depot/projects/hammer/usr.bin/tar/Makefile#14 integrate
.. //depot/projects/hammer/usr.bin/tar/tree.c#2 integrate
.. //depot/projects/hammer/usr.bin/tar/tree.h#2 integrate
.. //depot/projects/hammer/usr.bin/tar/write.c#16 integrate
.. //depot/projects/hammer/usr.bin/top/machine.c#14 integrate
.. //depot/projects/hammer/usr.bin/what/what.1#5 integrate
.. //depot/projects/hammer/usr.bin/what/what.c#3 integrate
.. //depot/projects/hammer/usr.sbin/IPXrouted/main.c#3 integrate
.. //depot/projects/hammer/usr.sbin/authpf/Makefile#2 integrate
.. //depot/projects/hammer/usr.sbin/bluetooth/bthidd/parser.y#4 integrate
.. //depot/projects/hammer/usr.sbin/bluetooth/bthidd/server.c#3 integrate
.. //depot/projects/hammer/usr.sbin/burncd/burncd.8#12 integrate
.. //depot/projects/hammer/usr.sbin/burncd/burncd.c#10 integrate
.. //depot/projects/hammer/usr.sbin/faithd/ftp.c#4 integrate
.. //depot/projects/hammer/usr.sbin/inetd/inetd.c#13 integrate
.. //depot/projects/hammer/usr.sbin/jail/jail.8#20 integrate
.. //depot/projects/hammer/usr.sbin/lpr/common_source/net.c#3 integrate
.. //depot/projects/hammer/usr.sbin/lpr/lpd/lpd.c#5 integrate
.. //depot/projects/hammer/usr.sbin/mount_portalfs/activate.c#4 integrate
.. //depot/projects/hammer/usr.sbin/mount_smbfs/Makefile#5 integrate
.. //depot/projects/hammer/usr.sbin/mountd/mountd.c#14 integrate
.. //depot/projects/hammer/usr.sbin/ndiscvt/inf.c#7 integrate
.. //depot/projects/hammer/usr.sbin/ndiscvt/windrv_stub.c#2 integrate
.. //depot/projects/hammer/usr.sbin/pmccontrol/pmccontrol.c#2 integrate
.. //depot/projects/hammer/usr.sbin/pmcstat/pmcstat.c#2 integrate
.. //depot/projects/hammer/usr.sbin/ppp/ncpaddr.c#9 integrate
.. //depot/projects/hammer/usr.sbin/ppp/ppp.8.m4#19 integrate
.. //depot/projects/hammer/usr.sbin/rip6query/rip6query.c#2 integrate
.. //depot/projects/hammer/usr.sbin/rpc.yppasswdd/yppasswdd_main.c#5 integrate
.. //depot/projects/hammer/usr.sbin/sysinstall/dist.c#20 integrate
.. //depot/projects/hammer/usr.sbin/sysinstall/menus.c#33 integrate
.. //depot/projects/hammer/usr.sbin/syslogd/syslogd.c#22 integrate
.. //depot/projects/hammer/usr.sbin/vidcontrol/vidcontrol.c#5 integrate
.. //depot/projects/hammer/usr.sbin/ypserv/Makefile.yp#4 integrate
.. //depot/projects/hammer/usr.sbin/ypserv/yp_dnslookup.c#5 integrate
.. //depot/projects/hammer/usr.sbin/ypserv/yp_extern.h#2 integrate
.. //depot/projects/hammer/usr.sbin/ypserv/yp_server.c#3 integrate

Differences ...

==== //depot/projects/hammer/Makefile.inc1#91 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile.inc1,v 1.493 2005/04/30 16:09:23 imp Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.494 2005/05/01 17:36:09 imp Exp $
 #
 # Make command line options:
 #	-DNO_DYNAMICROOT do not link /bin and /sbin dynamically
@@ -337,7 +337,6 @@
 	@echo "--------------------------------------------------------------"
 	@echo ">>> stage 2.1: cleaning up the object tree"
 	@echo "--------------------------------------------------------------"
-	@rm -rf ${.OBJDIR}/sbin/ipf
 	${_+_}cd ${.CURDIR}; ${WMAKE} ${CLEANDIR:S/^/par-/}
 .endif
 _obj:

==== //depot/projects/hammer/UPDATING#76 (text+ko) ====

@@ -21,6 +21,11 @@
 	developers choose to disable these features on build machines
 	to maximize performance.
 
+20050503:
+	The packet filter (pf) code has been updated to OpenBSD 3.7
+	Please note the changed anchor syntax and the fact that
+	authpf(8) now needs a mounted fdescfs(5) to function.
+
 20050415:
 	The NO_MIXED_MODE kernel option has been removed from the i386
 	amd64 platforms as its use has been superceded by the new local
@@ -193,12 +198,10 @@
 	# is listed here if you are upgrading from a really old current.
 
 	<make sure you have good level 0 dumps>
-	<maybe fix /etc/fstab>				[7]
 	make buildworld
 	make kernel KERNCONF=YOUR_KERNEL_HERE
 							[1]
 	<reboot in single user>				[3]
-	src/etc/rc.d/preseedrandom			[10]
 	mergemaster -p					[5]
 	make installworld
 	mergemaster					[4]
@@ -331,4 +334,4 @@
 Contact Warner Losh if you have any questions about your use of
 this document.
 
-$FreeBSD: src/UPDATING,v 1.401 2005/04/18 14:33:18 scottl Exp $
+$FreeBSD: src/UPDATING,v 1.404 2005/05/16 05:37:32 imp Exp $

==== //depot/projects/hammer/bin/chflags/chflags.1#9 (text+ko) ====

@@ -30,9 +30,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)chflags.1	8.4 (Berkeley) 5/2/95
-.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.23 2005/02/25 00:40:46 trhodes Exp $
+.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.24 2005/05/14 23:23:10 dd Exp $
 .\"
-.Dd February 24, 2005
+.Dd May 14, 2005
 .Dt CHFLAGS 1
 .Os
 .Sh NAME
@@ -40,6 +40,7 @@
 .Nd change file flags
 .Sh SYNOPSIS
 .Nm
+.Op Fl h
 .Oo
 .Fl R
 .Op Fl H | Fl L | Fl P
@@ -61,6 +62,11 @@
 .Fl R
 option is specified, symbolic links on the command line are followed.
 (Symbolic links encountered in the tree traversal are not followed.)
+.It Fl h
+If the
+.Ar file
+is a symbolic link,
+change the mode of the link itself rather than the file to which it points.
 .It Fl L
 If the
 .Fl R
@@ -114,11 +120,12 @@
 clear the nodump flag (owner or super-user only)
 .El
 .Pp
-Symbolic links do not have flags, so unless the
-.Fl H
+Unless the
+.Fl H ,
+.Fl L ,
 or
-.Fl L
-option is set,
+.Fl h
+options are given,
 .Nm
 on a symbolic link always succeeds and has no effect.
 The

==== //depot/projects/hammer/bin/chflags/chflags.c#7 (text+ko) ====

@@ -40,7 +40,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/chflags/chflags.c,v 1.22 2005/01/10 08:39:20 imp Exp $");
+__FBSDID("$FreeBSD: src/bin/chflags/chflags.c,v 1.23 2005/05/14 23:23:10 dd Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -62,11 +62,12 @@
 	FTSENT *p;
 	u_long clear, set;
 	long val;
-	int Hflag, Lflag, Rflag, ch, fts_options, oct, rval;
+	int Hflag, Lflag, Rflag, hflag, ch, fts_options, oct, rval;
 	char *flags, *ep;
+	int (*change_flags)(const char *, unsigned long);
 
-	Hflag = Lflag = Rflag = 0;
-	while ((ch = getopt(argc, argv, "HLPR")) != -1)
+	Hflag = Lflag = Rflag = hflag = 0;
+	while ((ch = getopt(argc, argv, "HLPRh")) != -1)
 		switch (ch) {
 		case 'H':
 			Hflag = 1;
@@ -82,6 +83,9 @@
 		case 'R':
 			Rflag = 1;
 			break;
+		case 'h':
+			hflag = 1;
+			break;
 		case '?':
 		default:
 			usage();
@@ -94,6 +98,9 @@
 
 	if (Rflag) {
 		fts_options = FTS_PHYSICAL;
+		if (hflag)
+			errx(1, "the -R and -h options "
+			        "may not be specified together");
 		if (Hflag)
 			fts_options |= FTS_COMFOLLOW;
 		if (Lflag) {
@@ -103,6 +110,12 @@
 	} else
 		fts_options = FTS_LOGICAL;
 
+	/* XXX: Why don't chflags and lchflags have compatible prototypes? */
+	if (hflag)
+		change_flags = (int (*)(const char *, unsigned long))lchflags;
+	else
+		change_flags = chflags;
+
 	flags = *argv;
 	if (*flags >= '0' && *flags <= '7') {
 		errno = 0;
@@ -147,17 +160,20 @@
 			 * don't point to anything and ones that we found
 			 * doing a physical walk.
 			 */
-			continue;
+			if (!hflag)
+				continue;
+			/* FALLTHROUGH */
 		default:
 			break;
 		}
 		if (oct) {
-			if (!chflags(p->fts_accpath, set))

>>> TRUNCATED FOR MAIL (1000 lines) <<<


More information about the p4-projects mailing list