Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/yamt-pagecache]: src sync with head.



details:   https://anonhg.NetBSD.org/src/rev/5982ae213c05
branches:  yamt-pagecache
changeset: 770880:5982ae213c05
user:      yamt <yamt%NetBSD.org@localhost>
date:      Wed May 23 10:07:03 2012 +0000

description:
sync with head.

diffstat:

 Makefile                                                        |      4 +-
 UPDATING                                                        |      7 +-
 bin/expr/expr.1                                                 |      4 +-
 bin/ps/ps.c                                                     |     89 +-
 bin/rcp/rcp.c                                                   |     24 +-
 crypto/external/bsd/openssh/dist/PROTOCOL.mux                   |      3 +-
 crypto/external/bsd/openssh/dist/auth-options.c                 |     22 +-
 crypto/external/bsd/openssh/dist/auth2-pubkey.c                 |     11 +-
 crypto/external/bsd/openssh/dist/auth2.c                        |      8 +-
 crypto/external/bsd/openssh/dist/authfile.c                     |      8 +-
 crypto/external/bsd/openssh/dist/channels.c                     |    258 +-
 crypto/external/bsd/openssh/dist/channels.h                     |     12 +-
 crypto/external/bsd/openssh/dist/clientloop.c                   |     58 +-
 crypto/external/bsd/openssh/dist/clientloop.h                   |      5 +-
 crypto/external/bsd/openssh/dist/compat.c                       |      7 +-
 crypto/external/bsd/openssh/dist/compat.h                       |      9 +-
 crypto/external/bsd/openssh/dist/dh.c                           |      8 +-
 crypto/external/bsd/openssh/dist/key.c                          |     11 +-
 crypto/external/bsd/openssh/dist/mac.c                          |      7 +-
 crypto/external/bsd/openssh/dist/misc.c                         |      8 +-
 crypto/external/bsd/openssh/dist/moduli.c                       |     75 +-
 crypto/external/bsd/openssh/dist/monitor.c                      |      7 +-
 crypto/external/bsd/openssh/dist/mux.c                          |    125 +-
 crypto/external/bsd/openssh/dist/packet.c                       |     20 +-
 crypto/external/bsd/openssh/dist/packet.h                       |      5 +-
 crypto/external/bsd/openssh/dist/readconf.c                     |     16 +-
 crypto/external/bsd/openssh/dist/readconf.h                     |      6 +-
 crypto/external/bsd/openssh/dist/roaming.h                      |      9 +-
 crypto/external/bsd/openssh/dist/roaming_client.c               |      8 +-
 crypto/external/bsd/openssh/dist/roaming_common.c               |      8 +-
 crypto/external/bsd/openssh/dist/scp.1                          |     10 +-
 crypto/external/bsd/openssh/dist/scp.c                          |     18 +-
 crypto/external/bsd/openssh/dist/servconf.c                     |      8 +-
 crypto/external/bsd/openssh/dist/session.c                      |      8 +-
 crypto/external/bsd/openssh/dist/sftp-client.c                  |     22 +-
 crypto/external/bsd/openssh/dist/sftp-glob.c                    |     10 +-
 crypto/external/bsd/openssh/dist/sftp.1                         |      8 +-
 crypto/external/bsd/openssh/dist/sftp.c                         |     13 +-
 crypto/external/bsd/openssh/dist/ssh-add.1                      |     12 +-
 crypto/external/bsd/openssh/dist/ssh-add.c                      |     35 +-
 crypto/external/bsd/openssh/dist/ssh-ecdsa.c                    |      7 +-
 crypto/external/bsd/openssh/dist/ssh-keygen.1                   |     17 +-
 crypto/external/bsd/openssh/dist/ssh-keygen.c                   |     20 +-
 crypto/external/bsd/openssh/dist/ssh-pkcs11-client.c            |      7 +-
 crypto/external/bsd/openssh/dist/ssh.1                          |     26 +-
 crypto/external/bsd/openssh/dist/ssh.c                          |     98 +-
 crypto/external/bsd/openssh/dist/ssh_config.5                   |      8 +-
 crypto/external/bsd/openssh/dist/sshconnect.c                   |     53 +-
 crypto/external/bsd/openssh/dist/sshd.8                         |      9 +-
 crypto/external/bsd/openssh/dist/sshd.c                         |     26 +-
 crypto/external/bsd/openssh/dist/sshd_config.5                  |      8 +-
 crypto/external/bsd/openssh/dist/umac.c                         |      8 +-
 crypto/external/bsd/openssh/dist/version.h                      |      7 +-
 crypto/external/bsd/openssh/lib/shlib_version                   |      4 +-
 crypto/external/bsd/openssl/dist/crypto/asn1/a_d2i_fp.c         |     54 +-
 crypto/external/bsd/openssl/dist/crypto/buffer/buffer.c         |     17 +
 crypto/external/bsd/openssl/dist/crypto/mem.c                   |      4 +
 crypto/external/bsd/openssl/dist/ssl/d1_enc.c                   |      2 +-
 crypto/external/bsd/openssl/dist/ssl/t1_enc.c                   |      2 +
 dist/bzip2/CHANGES                                              |    319 -
 dist/bzip2/LICENSE                                              |     42 -
 dist/bzip2/Makefile                                             |    217 -
 dist/bzip2/Makefile-libbz2_so                                   |     59 -
 dist/bzip2/README                                               |    210 -
 dist/bzip2/README.COMPILATION.PROBLEMS                          |     58 -
 dist/bzip2/README.XML.STUFF                                     |     45 -
 dist/bzip2/blocksort.c                                          |   1094 -
 dist/bzip2/bz-common.xsl                                        |     39 -
 dist/bzip2/bz-fo.xsl                                            |    276 -
 dist/bzip2/bz-html.xsl                                          |     20 -
 dist/bzip2/bzdiff                                               |     76 -
 dist/bzip2/bzdiff.1                                             |     47 -
 dist/bzip2/bzgrep                                               |     75 -
 dist/bzip2/bzgrep.1                                             |     56 -
 dist/bzip2/bzip.css                                             |     74 -
 dist/bzip2/bzip2.1                                              |    510 -
 dist/bzip2/bzip2.c                                              |   2041 -
 dist/bzip2/bzip2netbsd                                          |    123 -
 dist/bzip2/bzip2recover.c                                       |    530 -
 dist/bzip2/bzlib.c                                              |   1574 -
 dist/bzip2/bzlib.h                                              |    282 -
 dist/bzip2/bzlib_private.h                                      |    509 -
 dist/bzip2/bzmore                                               |     61 -
 dist/bzip2/bzmore.1                                             |    152 -
 dist/bzip2/compress.c                                           |    672 -
 dist/bzip2/crctable.c                                           |    104 -
 dist/bzip2/decompress.c                                         |    633 -
 dist/bzip2/dlltest.c                                            |    175 -
 dist/bzip2/dlltest.dsp                                          |     93 -
 dist/bzip2/entities.xml                                         |      9 -
 dist/bzip2/format.pl                                            |     68 -
 dist/bzip2/huffman.c                                            |    205 -
 dist/bzip2/libbz2.def                                           |     27 -
 dist/bzip2/libbz2.dsp                                           |    130 -
 dist/bzip2/makefile.msc                                         |     63 -
 dist/bzip2/manual.html                                          |   2540 -
 dist/bzip2/manual.xml                                           |   2964 -
 dist/bzip2/mk251.c                                              |     31 -
 dist/bzip2/randtable.c                                          |     84 -
 dist/bzip2/sample1.bz2                                          |    Bin 
 dist/bzip2/sample1.ref                                          |    Bin 
 dist/bzip2/sample2.bz2                                          |    Bin 
 dist/bzip2/sample2.ref                                          |    Bin 
 dist/bzip2/sample3.bz2                                          |    Bin 
 dist/bzip2/sample3.ref                                          |  30007 ----------
 dist/bzip2/spewG.c                                              |     54 -
 dist/bzip2/unzcrash.c                                           |    141 -
 dist/bzip2/words0                                               |      9 -
 dist/bzip2/words1                                               |      4 -
 dist/bzip2/words2                                               |      5 -
 dist/bzip2/words3                                               |     30 -
 dist/bzip2/xmlproc.sh                                           |    114 -
 distrib/common/bootimage/Makefile.bootimage                     |     44 +-
 distrib/common/bootimage/Makefile.installimage                  |      4 +-
 distrib/notes/amiga/hardware                                    |      9 +-
 distrib/notes/common/main                                       |      3 +-
 distrib/sandpoint/ramdisk/Makefile                              |      4 +-
 distrib/sandpoint/ramdisk/list                                  |      5 +-
 distrib/sets/lists/base/ad.mips64eb                             |     10 +-
 distrib/sets/lists/base/ad.mips64el                             |     10 +-
 distrib/sets/lists/base/md.amd64                                |      6 +-
 distrib/sets/lists/base/md.sparc64                              |      6 +-
 distrib/sets/lists/base/mi                                      |      5 +-
 distrib/sets/lists/base/shl.mi                                  |      6 +-
 distrib/sets/lists/comp/ad.mips64eb                             |      6 +-
 distrib/sets/lists/comp/ad.mips64el                             |      6 +-
 distrib/sets/lists/comp/md.amd64                                |      4 +-
 distrib/sets/lists/comp/md.sparc64                              |      4 +-
 distrib/sets/lists/comp/mi                                      |     27 +-
 distrib/sets/lists/comp/shl.mi                                  |     14 +-
 distrib/sets/lists/man/mi                                       |     32 +-
 distrib/sets/lists/modules/md.evbppc                            |     18 +-
 distrib/sets/lists/modules/mi                                   |     10 +-
 distrib/sets/lists/tests/mi                                     |     14 +-
 distrib/sets/lists/tests/module.mi                              |      5 +-
 distrib/sets/lists/xserver/md.vax                               |    110 +
 distrib/utils/sysinst/arch/i386/msg.md.de                       |     18 +-
 distrib/utils/sysinst/arch/sandpoint/md.c                       |      6 +-
 distrib/utils/sysinst/checkrc.c                                 |     10 +-
 distrib/utils/sysinst/configmenu.c                              |     30 +-
 distrib/utils/sysinst/disks.c                                   |     20 +-
 distrib/utils/sysinst/msg.mi.de                                 |     49 +-
 distrib/utils/sysinst/msg.mi.en                                 |      7 +-
 distrib/utils/sysinst/msg.mi.es                                 |      7 +-
 distrib/utils/sysinst/msg.mi.fr                                 |     10 +-
 distrib/utils/sysinst/msg.mi.pl                                 |     10 +-
 distrib/utils/sysinst/net.c                                     |     16 +-
 distrib/utils/sysinst/util.c                                    |      5 +-
 doc/3RDPARTY                                                    |     28 +-
 doc/BRANCHES                                                    |     15 +-
 doc/CHANGES                                                     |     11 +-
 doc/RESPONSIBLE                                                 |      5 +-
 etc/etc.x68k/MAKEDEV.conf                                       |      3 +-
 etc/etc.x68k/ttys                                               |      6 +-
 etc/master.passwd                                               |      2 +-
 etc/mtree/NetBSD.dist.tests                                     |      4 +-
 etc/rc.d/staticroute                                            |     15 +-
 external/bsd/bind/Makefile.inc                                  |      6 +-
 external/bsd/bind/bin/Makefile                                  |      4 +-
 external/bsd/bind/bin/Makefile.inc                              |      4 +-
 external/bsd/bind/bin/confgen/Makefile                          |      5 +
 external/bsd/bind/bin/confgen/Makefile.inc                      |     17 +
 external/bsd/bind/bin/confgen/ddns-confgen/Makefile             |      5 +
 external/bsd/bind/bin/confgen/rndc-confgen/Makefile             |      5 +
 external/bsd/bzip2/bzip2netbsd                                  |    123 +
 external/bsd/bzip2/dist/CHANGES                                 |    327 +
 external/bsd/bzip2/dist/LICENSE                                 |     42 +
 external/bsd/bzip2/dist/Makefile                                |    217 +
 external/bsd/bzip2/dist/Makefile-libbz2_so                      |     59 +
 external/bsd/bzip2/dist/README                                  |    215 +
 external/bsd/bzip2/dist/README.COMPILATION.PROBLEMS             |     58 +
 external/bsd/bzip2/dist/README.XML.STUFF                        |     45 +
 external/bsd/bzip2/dist/blocksort.c                             |   1096 +
 external/bsd/bzip2/dist/bz-common.xsl                           |     39 +
 external/bsd/bzip2/dist/bz-fo.xsl                               |    276 +
 external/bsd/bzip2/dist/bz-html.xsl                             |     20 +
 external/bsd/bzip2/dist/bzdiff                                  |     76 +
 external/bsd/bzip2/dist/bzdiff.1                                |     49 +
 external/bsd/bzip2/dist/bzgrep                                  |     75 +
 external/bsd/bzip2/dist/bzgrep.1                                |     58 +
 external/bsd/bzip2/dist/bzip.css                                |     74 +
 external/bsd/bzip2/dist/bzip2.1                                 |    510 +
 external/bsd/bzip2/dist/bzip2.c                                 |   2041 +
 external/bsd/bzip2/dist/bzip2recover.c                          |    529 +
 external/bsd/bzip2/dist/bzlib.c                                 |   1574 +
 external/bsd/bzip2/dist/bzlib.h                                 |    284 +
 external/bsd/bzip2/dist/bzlib_private.h                         |    511 +
 external/bsd/bzip2/dist/bzmore                                  |     61 +
 external/bsd/bzip2/dist/bzmore.1                                |    154 +
 external/bsd/bzip2/dist/compress.c                              |    674 +
 external/bsd/bzip2/dist/crctable.c                              |    106 +
 external/bsd/bzip2/dist/decompress.c                            |    648 +
 external/bsd/bzip2/dist/dlltest.c                               |    177 +
 external/bsd/bzip2/dist/dlltest.dsp                             |     93 +
 external/bsd/bzip2/dist/entities.xml                            |      9 +
 external/bsd/bzip2/dist/format.pl                               |     68 +
 external/bsd/bzip2/dist/huffman.c                               |    207 +
 external/bsd/bzip2/dist/libbz2.def                              |     27 +
 external/bsd/bzip2/dist/libbz2.dsp                              |    130 +
 external/bsd/bzip2/dist/makefile.msc                            |     63 +
 external/bsd/bzip2/dist/manual.html                             |   2540 +
 external/bsd/bzip2/dist/manual.xml                              |   2964 +
 external/bsd/bzip2/dist/mk251.c                                 |     33 +
 external/bsd/bzip2/dist/randtable.c                             |     86 +
 external/bsd/bzip2/dist/sample1.bz2                             |    Bin 
 external/bsd/bzip2/dist/sample1.ref                             |    Bin 
 external/bsd/bzip2/dist/sample2.bz2                             |    Bin 
 external/bsd/bzip2/dist/sample2.ref                             |    Bin 
 external/bsd/bzip2/dist/sample3.bz2                             |    Bin 
 external/bsd/bzip2/dist/sample3.ref                             |  30007 ++++++++++
 external/bsd/bzip2/dist/spewG.c                                 |     56 +
 external/bsd/bzip2/dist/unzcrash.c                              |    143 +
 external/bsd/bzip2/dist/words0                                  |      9 +
 external/bsd/bzip2/dist/words1                                  |      4 +
 external/bsd/bzip2/dist/words2                                  |      5 +
 external/bsd/bzip2/dist/words3                                  |     30 +
 external/bsd/bzip2/dist/xmlproc.sh                              |    114 +
 external/bsd/llvm/Makefile.inc                                  |      6 +-
 external/bsd/llvm/bin/Makefile                                  |      4 +-
 external/bsd/llvm/bin/clang/Makefile                            |      3 +-
 external/bsd/llvm/bin/llvm-ld/Makefile                          |     32 -
 external/bsd/llvm/bin/llvm-stub/Makefile                        |     12 -
 external/bsd/llvm/config/clang/Config/config.h                  |      3 +
 external/bsd/llvm/config/llvm/Config/config.h                   |      4 +-
 external/bsd/llvm/lib/Makefile                                  |      3 +-
 external/bsd/llvm/lib/libLLVMCodeGen/Makefile                   |      3 +-
 external/bsd/llvm/lib/libLLVMMipsCodeGen/Makefile               |      4 +-
 external/bsd/llvm/lib/libLLVMMipsDisassembler/Makefile          |     18 +
 external/bsd/llvm/lib/libLLVMRuntimeDyld/Makefile               |      5 +-
 external/bsd/llvm/lib/libLLVMSupport/Makefile                   |      4 +-
 external/bsd/llvm/lib/libclangIndex/Makefile                    |     25 -
 external/bsd/llvm/lib/libclangSema/Makefile                     |      3 +-
 external/bsd/wpa/dist/src/drivers/driver_bsd.c                  |     12 +
 external/cddl/osnet/sys/kern/kobj.c                             |      6 +-
 external/gpl2/lvm2/lib/liblvm/Makefile                          |      5 +-
 external/gpl2/lvm2/sbin/lvm/Makefile                            |      5 +-
 external/gpl3/gcc/dist/gcc/config/m68k/constraints.md           |      3 +-
 external/gpl3/gcc/dist/gcc/config/netbsd-elf.h                  |      5 +
 external/gpl3/gcc/dist/libmudflap/mf-hooks1.c                   |      4 +-
 external/gpl3/gcc/dist/libmudflap/mf-hooks2.c                   |      3 +-
 external/gpl3/gcc/dist/libmudflap/mf-impl.h                     |     27 +-
 external/gpl3/gcc/dist/libmudflap/mf-runtime.c                  |     33 +-
 external/gpl3/gcc/dist/libmudflap/mf-runtime.h                  |      8 +-
 external/gpl3/gcc/lib/Makefile                                  |      3 +-
 external/gpl3/gcc/lib/libmudflap/Makefile                       |     19 +
 external/gpl3/gcc/lib/libmudflap/config.h                       |    288 +
 external/gpl3/gcc/lib/libmudflap/shlib_version                  |      2 +
 external/gpl3/gcc/lib/libmudflapth/Makefile                     |     17 +
 external/gpl3/gcc/lib/libmudflapth/shlib_version                |      2 +
 external/gpl3/gdb/dist/gdb/nbsd-thread.c                        |      2 +
 external/gpl3/gdb/dist/gdb/sparc-nat.c                          |     27 +-
 external/mit/xorg/server/drivers/Makefile                       |      7 +-
 external/mit/xorg/server/xorg-server/Makefile.common            |      3 +-
 external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile |      9 +-
 games/backgammon/backgammon/backgammon.6                        |     14 +-
 games/wtf/wtf                                                   |    101 +-
 gnu/usr.bin/gettext/msgfmt/Makefile                             |      4 +-
 include/math.h                                                  |      4 +-
 include/stdio.h                                                 |      4 +-
 include/stdlib.h                                                |      6 +-
 include/string.h                                                |      6 +-
 lib/libbz2/Makefile                                             |      4 +-
 lib/libc/citrus/citrus_lookup.c                                 |      6 +-
 lib/libc/compat/include/stdlib.h                                |      4 +-
 lib/libc/compat/stdlib/Makefile.inc                             |      4 +-
 lib/libc/compat/stdlib/compat_putenv.c                          |     84 +
 lib/libc/gdtoa/dtoa.c                                           |     18 +-
 lib/libc/gen/cgetcap.3                                          |    266 +-
 lib/libc/gen/getpass.c                                          |     14 +-
 lib/libc/gen/getttyent.3                                        |      8 +-
 lib/libc/gen/makecontext.3                                      |     10 +-
 lib/libc/rpc/rpc.3                                              |    174 +-
 lib/libc/stdio/funopen.3                                        |      4 +-
 lib/libc/string/bcmp.3                                          |      9 +-
 lib/libc/string/bcopy.3                                         |     18 +-
 lib/libc/string/index.3                                         |      9 +-
 lib/libc/string/rindex.3                                        |      9 +-
 lib/libc/sys/_lwp_create.2                                      |     11 +-
 lib/libc/sys/issetugid.2                                        |      6 +-
 lib/libc/sys/msgrcv.2                                           |      4 +-
 lib/libcurses/Makefile                                          |      4 +-
 lib/libcurses/acs.c                                             |      8 +-
 lib/libcurses/curses.3                                          |      7 +-
 lib/libcurses/curses.h                                          |      3 +-
 lib/libcurses/curses_input.3                                    |     14 +-
 lib/libcurses/curses_screen.3                                   |     14 +-
 lib/libcurses/curses_standout.3                                 |     12 +-
 lib/libcurses/curses_termcap.3                                  |     15 +-
 lib/libcurses/getch.c                                           |     10 +-
 lib/libcurses/inchstr.c                                         |     18 +-
 lib/libcurses/keymap.h                                          |      8 +-
 lib/libcurses/refresh.c                                         |     19 +-
 lib/libcurses/setterm.c                                         |      6 +-
 lib/libedit/readline.c                                          |     13 +-
 lib/libedit/readline/readline.h                                 |      3 +-
 lib/libedit/tty.c                                               |     55 +-
 lib/libedit/tty.h                                               |      4 +-
 lib/libm/Makefile                                               |      9 +-
 lib/libm/man/lgamma.3                                           |     39 +-
 lib/libm/src/b_exp.c                                            |    137 +
 lib/libm/src/b_log.c                                            |    406 +
 lib/libm/src/b_tgamma.c                                         |    317 +
 lib/libm/src/math_private.h                                     |     31 +-
 lib/libm/src/s_tgammaf.c                                        |     47 +
 lib/libossaudio/Makefile                                        |      4 +-
 lib/libossaudio/ossaudio.c                                      |     67 +-
 lib/libossaudio/soundcard.h                                     |     24 +-
 lib/libperfuse/ops.c                                            |    235 +-
 lib/libperfuse/perfuse.c                                        |     42 +-
 lib/libperfuse/perfuse_priv.h                                   |      8 +-
 lib/libperfuse/subr.c                                           |     20 +-
 lib/libpthread/pthread.c                                        |     19 +-
 lib/libpthread/pthread_int.h                                    |     10 +-
 lib/libpuffs/dispatcher.c                                       |    135 +-
 lib/libpuffs/pnode.c                                            |     41 +-
 lib/libpuffs/puffs.3                                            |     24 +-
 lib/libpuffs/puffs.h                                            |     25 +-
 lib/libpuffs/puffs_ops.3                                        |     94 +-
 lib/libpuffs/puffs_priv.h                                       |      5 +-
 lib/librumphijack/hijack.c                                      |     13 +-
 lib/libusbhid/usb_hid_usages                                    |    626 +-
 libexec/getty/gettytab.5                                        |     15 +-
 libexec/getty/ttys.5                                            |      8 +-
 libexec/lfs_cleanerd/lfs_cleanerd.c                             |      6 +-
 sbin/amrctl/amrctl.c                                            |     67 +-
 sbin/dump/dump.h                                                |     14 +-
 sbin/fdisk/Makefile                                             |      9 +-
 sbin/fdisk/fdisk.c                                              |     15 +-
 sbin/gpt/gpt.8                                                  |      4 +-
 sbin/resize_ffs/resize_ffs.c                                    |      6 +-
 share/doc/smm/04.quotas/quotas.ms                               |    906 +-
 share/man/man2/siginfo.2                                        |      9 +-
 share/man/man3/intro.3                                          |     10 +-
 share/man/man4/Makefile                                         |      4 +-
 share/man/man4/bwi.4                                            |     12 +-
 share/man/man4/cardbus.4                                        |     22 +-
 share/man/man4/com.4                                            |      9 +-
 share/man/man4/filemon.4                                        |      8 +-
 share/man/man4/hdaudio.4                                        |      6 +-
 share/man/man4/man4.amiga/Makefile                              |      8 +-
 share/man/man4/man4.amiga/a1k2cp.4                              |     73 +
 share/man/man4/man4.amiga/clockport.4                           |     67 +
 share/man/man4/man4.amiga/ite.4                                 |      8 +-
 share/man/man4/man4.amiga/mppb.4                                |      4 +-
 share/man/man4/man4.amiga/xsurf.4                               |     73 +
 share/man/man4/man4.sparc/cgsix.4                               |      8 +-
 share/man/man4/mpii.4                                           |     97 +
 share/man/man4/rnd.4                                            |     51 +-
 share/man/man4/sk.4                                             |      9 +-
 share/man/man4/uhid.4                                           |      6 +-
 share/man/man4/wscons.4                                         |      6 +-
 share/man/man5/Makefile                                         |      5 +-
 share/man/man5/capfile.5                                        |    191 +
 share/man/man5/disktab.5                                        |     21 +-
 share/man/man5/login.conf.5                                     |      6 +-
 share/man/man5/netconfig.5                                      |     18 +-
 share/man/man5/passwd.5                                         |     42 +-
 share/man/man5/printcap.5                                       |     15 +-
 share/man/man5/remote.5                                         |      9 +-
 share/man/man5/route.conf.5                                     |     22 +-
 share/man/man5/rpc.5                                            |     12 +-
 share/man/man7/hier.7                                           |     21 +-
 share/man/man8/rescue.8                                         |     34 +-
 share/man/man9/Makefile                                         |      4 +-
 share/man/man9/usbd_status.9                                    |    109 +
 share/man/man9/usbdi.9                                          |    807 +-
 sys/arch/acorn26/acorn26/except.c                               |      8 +-
 sys/arch/acorn26/acorn26/irq.c                                  |     12 +-
 sys/arch/acorn26/acorn26/machdep.c                              |     10 +-
 sys/arch/acorn26/acorn26/pmap.c                                 |     14 +-
 sys/arch/acorn26/include/boot.h                                 |     44 +-
 sys/arch/acorn26/include/memcreg.h                              |      4 +-
 sys/arch/acorn26/iobus/ioc.c                                    |     10 +-
 sys/arch/acorn26/iobus/iocvar.h                                 |     10 +-
 sys/arch/acorn26/ioc/if_eca.c                                   |      6 +-
 sys/arch/acorn26/ioc/if_ecavar.h                                |     16 +-
 sys/arch/acorn26/ioc/latches.c                                  |     12 +-
 sys/arch/acorn26/ioc/latchvar.h                                 |      6 +-
 sys/arch/acorn26/ioc/ssn.c                                      |     12 +-
 sys/arch/acorn26/podulebus/if_eh.c                              |     46 +-
 sys/arch/acorn26/podulebus/podulebus.c                          |     20 +-
 sys/arch/acorn26/stand/lib/riscoscalls.h                        |     42 +-
 sys/arch/acorn26/vidc/arcvideo.c                                |     14 +-
 sys/arch/acorn26/vidc/vidcreg.h                                 |      4 +-
 sys/arch/acorn32/acorn32/rpc_machdep.c                          |      6 +-
 sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c                  |      6 +-
 sys/arch/acorn32/eb7500atx/if_cs.c                              |      8 +-
 sys/arch/acorn32/eb7500atx/rsbus_io.c                           |     16 +-
 sys/arch/acorn32/include/podulebus_machdep.h                    |      4 +-
 sys/arch/acorn32/podulebus/if_ie.c                              |      6 +-
 sys/arch/acorn32/podulebus/if_ne_pbus.c                         |     18 +-
 sys/arch/acorn32/podulebus/netslot.c                            |      6 +-
 sys/arch/acorn32/podulebus/podulebus_io.c                       |     16 +-
 sys/arch/acorn32/stand/boot32/boot32.c                          |      4 +-
 sys/arch/acorn32/stand/lib/riscoscalls.h                        |     42 +-
 sys/arch/acorn32/stand/lib/riscospart.c                         |      8 +-
 sys/arch/acorn32/stand/nbfs/nbfs.c                              |     47 +-
 sys/arch/alpha/alpha/machdep.c                                  |     22 +-
 sys/arch/amd64/acpi/acpi_wakecode.S                             |      4 +-
 sys/arch/amd64/amd64/db_memrw.c                                 |    203 -
 sys/arch/amd64/amd64/genassym.cf                                |      4 +-
 sys/arch/amd64/amd64/locore.S                                   |      4 +-
 sys/arch/amd64/amd64/machdep.c                                  |     32 +-
 sys/arch/amd64/amd64/mptramp.S                                  |      6 +-
 sys/arch/amd64/amd64/netbsd32_machdep.c                         |     11 +-
 sys/arch/amd64/amd64/process_machdep.c                          |      6 +-
 sys/arch/amd64/amd64/vector.S                                   |    144 +-
 sys/arch/amd64/conf/GENERIC                                     |      7 +-
 sys/arch/amd64/conf/XEN3_DOM0                                   |      5 +-
 sys/arch/amd64/conf/files.amd64                                 |      3 +-
 sys/arch/amd64/include/frameasm.h                               |     85 +-
 sys/arch/amd64/include/mcontext.h                               |      6 +-
 sys/arch/amd64/include/param.h                                  |      7 +-
 sys/arch/amd64/include/vmparam.h                                |      6 +-
 sys/arch/amiga/amiga/autoconf.c                                 |      6 +-
 sys/arch/amiga/clockport/a1k2cp.c                               |    109 +
 sys/arch/amiga/clockport/clockport.c                            |    102 +
 sys/arch/amiga/clockport/clockport_common.c                     |     65 +
 sys/arch/amiga/clockport/clockportvar.h                         |     67 +
 sys/arch/amiga/clockport/com_ss.c                               |     81 +
 sys/arch/amiga/clockport/files.clockport                        |     41 +
 sys/arch/amiga/clockport/gencp.c                                |     61 +
 sys/arch/amiga/clockport/gencp_xsurf.c                          |     99 +
 sys/arch/amiga/conf/DRACO                                       |     13 +-
 sys/arch/amiga/conf/GENERIC                                     |     18 +-
 sys/arch/amiga/conf/GENERIC.in                                  |     16 +-
 sys/arch/amiga/conf/INSTALL                                     |     13 +-
 sys/arch/amiga/conf/files.amiga                                 |     15 +-
 sys/arch/amiga/dev/if_ne_xsurf.c                                |    175 +
 sys/arch/amiga/dev/if_ne_zbus.c                                 |     19 +-
 sys/arch/amiga/dev/xsurf.c                                      |    156 +
 sys/arch/amiga/dev/xsurfvar.h                                   |     44 +
 sys/arch/amiga/include/bus.h                                    |      8 +-
 sys/arch/amiga/include/pci_machdep.h                            |      4 +-
 sys/arch/arm/arm/cpufunc.c                                      |      8 +-
 sys/arch/arm/arm/cpufunc_asm_arm11.S                            |      4 +-
 sys/arch/arm/arm/sig_machdep.c                                  |     22 +-
 sys/arch/arm/arm32/cpu.c                                        |     11 +-
 sys/arch/arm/conf/Makefile.arm                                  |      4 +-
 sys/arch/arm/imx/files.imx51                                    |     15 +-
 sys/arch/arm/imx/imx31_clock.c                                  |      4 +-
 sys/arch/arm/imx/imx51_axi.c                                    |      6 +-
 sys/arch/arm/imx/imx51_ccm.c                                    |    425 +
 sys/arch/arm/imx/imx51_ccmreg.h                                 |    199 +
 sys/arch/arm/imx/imx51_ccmvar.h                                 |     78 +
 sys/arch/arm/imx/imx51_clock.c                                  |     16 +-
 sys/arch/arm/imx/imx51_dpllreg.h                                |     62 +
 sys/arch/arm/imx/imx51_esdhc.c                                  |    128 +
 sys/arch/arm/imx/imx51_ipuv3.c                                  |   1288 +
 sys/arch/arm/imx/imx51_ipuv3reg.h                               |    841 +
 sys/arch/arm/imx/imx51_ipuv3var.h                               |    137 +
 sys/arch/arm/imx/imxclock.c                                     |     23 +-
 sys/arch/arm/imx/imxclockvar.h                                  |      2 +
 sys/arch/arm/imx/imxepitreg.h                                   |     14 +-
 sys/arch/arm/include/armreg.h                                   |      5 +-
 sys/arch/arm/iomd/iomd.c                                        |     71 +-
 sys/arch/arm/iomd/iomd_clock.c                                  |     52 +-
 sys/arch/arm/iomd/iomdiic.c                                     |     22 +-
 sys/arch/arm/iomd/iomdkbc.c                                     |     29 +-
 sys/arch/arm/iomd/iomdvar.h                                     |      4 +-
 sys/arch/arm/iomd/qms.c                                         |     31 +-
 sys/arch/arm/iomd/vidc20.c                                      |     31 +-
 sys/arch/arm/iomd/vidcaudio.c                                   |     25 +-
 sys/arch/arm/iomd/vidcvideo.c                                   |     26 +-
 sys/arch/cesfic/include/bus.h                                   |      7 +-
 sys/arch/evbarm/conf/NETWALKER                                  |     39 +-
 sys/arch/evbarm/conf/files.netwalker                            |      9 +-
 sys/arch/evbarm/conf/std.netwalker                              |      4 +-
 sys/arch/evbarm/dev/plcom.c                                     |    316 +-
 sys/arch/evbarm/dev/plcomreg.h                                  |    118 +-
 sys/arch/evbarm/dev/plcomvar.h                                  |     10 +-
 sys/arch/evbarm/ifpga/plcom_ifpga.c                             |     31 +-
 sys/arch/evbarm/ifpga/plcom_ifpgavar.h                          |      5 +-
 sys/arch/evbarm/netwalker/netwalker_lcd.c                       |    268 +
 sys/arch/hp300/include/bus.h                                    |      7 +-
 sys/arch/hp700/dev/apic.c                                       |     13 +-
 sys/arch/hp700/dev/cpu.c                                        |      7 +-
 sys/arch/hp700/hp700/autoconf.c                                 |      6 +-
 sys/arch/hp700/hp700/machdep.c                                  |      6 +-
 sys/arch/hppa/hppa/hppa_machdep.c                               |     76 +-
 sys/arch/hppa/hppa/trap.c                                       |      9 +-
 sys/arch/hppa/include/cpufunc.h                                 |     14 +-
 sys/arch/i386/acpi/acpi_wakecode.S                              |      4 +-
 sys/arch/i386/conf/ALL                                          |      9 +-
 sys/arch/i386/conf/GENERIC                                      |      7 +-
 sys/arch/i386/conf/XEN3_DOM0                                    |      5 +-
 sys/arch/i386/conf/files.i386                                   |      3 +-
 sys/arch/i386/i386/compat_16_machdep.c                          |      6 +-
 sys/arch/i386/i386/db_memrw.c                                   |    214 -
 sys/arch/i386/i386/genassym.cf                                  |      4 +-
 sys/arch/i386/i386/locore.S                                     |      6 +-
 sys/arch/i386/i386/machdep.c                                    |     43 +-
 sys/arch/i386/i386/mptramp.S                                    |      8 +-
 sys/arch/i386/include/param.h                                   |      9 +-
 sys/arch/i386/include/vmparam.h                                 |      4 +-
 sys/arch/i386/stand/lib/exec.c                                  |      9 +-
 sys/arch/ia64/conf/GENERIC                                      |      6 +-
 sys/arch/ia64/conf/GENERIC.SKI                                  |      6 +-
 sys/arch/luna68k/include/bus.h                                  |      7 +-
 sys/arch/m68k/m68k/sig_machdep.c                                |     24 +-
 sys/arch/macppc/macppc/pic_heathrow.c                           |      9 +-
 sys/arch/mips/alchemy/dev/if_aumac.c                            |     10 +-
 sys/arch/mips/mips/cpu_subr.c                                   |     18 +-
 sys/arch/mips/mips/netbsd32_machdep.c                           |     18 +-
 sys/arch/news68k/include/bus.h                                  |      7 +-
 sys/arch/powerpc/booke/dev/pq3etsec.c                           |      8 +-
 sys/arch/powerpc/booke/dev/pq3gpio.c                            |    140 +-
 sys/arch/powerpc/booke/spe_subr.S                               |      8 +-
 sys/arch/powerpc/booke/trap.c                                   |     10 +-
 sys/arch/powerpc/include/booke/etsecreg.h                       |      4 +-
 sys/arch/powerpc/include/userret.h                              |      6 +-
 sys/arch/powerpc/oea/ofwoea_machdep.c                           |      5 +-
 sys/arch/powerpc/powerpc/sig_machdep.c                          |     15 +-
 sys/arch/powerpc/stand/mkbootimage/mkbootimage.c                |     42 +-
 sys/arch/prep/stand/boot/Makefile                               |      3 +-
 sys/arch/prep/stand/boot/boot.c                                 |     17 +-
 sys/arch/prep/stand/boot/boot.h                                 |     22 +-
 sys/arch/prep/stand/boot/conf.c                                 |     10 +-
 sys/arch/prep/stand/boot/devopen.c                              |     30 +-
 sys/arch/prep/stand/boot/filesystem.c                           |      8 +-
 sys/arch/prep/stand/boot/io.c                                   |    163 +-
 sys/arch/prep/stand/boot/pci.c                                  |    192 +
 sys/arch/prep/stand/boot/sd.c                                   |    740 +
 sys/arch/prep/stand/boot/sdvar.h                                |    164 +
 sys/arch/prep/stand/boot/siop.c                                 |   1233 +
 sys/arch/prep/stand/boot/version                                |      4 +-
 sys/arch/sandpoint/conf/GENERIC                                 |      5 +-
 sys/arch/sandpoint/conf/KUROBOX                                 |     22 +-
 sys/arch/sandpoint/sandpoint/autoconf.c                         |     60 +-
 sys/arch/sandpoint/sandpoint/iic_eumb.c                         |     54 +-
 sys/arch/sandpoint/sandpoint/satmgr.c                           |    237 +-
 sys/arch/sandpoint/stand/altboot/README.altboot                 |     19 +-
 sys/arch/sandpoint/stand/altboot/brdsetup.c                     |     78 +-
 sys/arch/sandpoint/stand/altboot/dsk.c                          |     18 +-
 sys/arch/sandpoint/stand/altboot/globals.h                      |     39 +-
 sys/arch/sandpoint/stand/altboot/main.c                         |    184 +-
 sys/arch/sh3/sh3/sh3_machdep.c                                  |     22 +-
 sys/arch/shark/conf/GENERIC                                     |      6 +-
 sys/arch/sparc/include/cpu.h                                    |      4 +-
 sys/arch/sparc/sparc/emul.c                                     |     14 +-
 sys/arch/sparc/sparc/machdep.c                                  |     39 +-
 sys/arch/sparc/sparc/trap.c                                     |      8 +-
 sys/arch/sparc64/sparc64/machdep.c                              |     35 +-
 sys/arch/sparc64/sparc64/netbsd32_machdep.c                     |     36 +-
 sys/arch/sparc64/sparc64/trap.c                                 |     10 +-
 sys/arch/sun3/conf/files.sun3                                   |      3 +-
 sys/arch/vax/vax/machdep.c                                      |     26 +-
 sys/arch/vax/vsa/spx.c                                          |      8 +-
 sys/arch/x68k/conf/GENERIC                                      |      8 +-
 sys/arch/x68k/conf/INSTALL                                      |      8 +-
 sys/arch/x68k/conf/files.x68k                                   |      9 +-
 sys/arch/x68k/conf/majors.x68k                                  |      4 +-
 sys/arch/x68k/dev/com.c                                         |   1188 -
 sys/arch/x68k/dev/com_intio.c                                   |    130 +
 sys/arch/x68k/dev/comreg.h                                      |     44 -
 sys/arch/x68k/dev/fd.c                                          |    306 +-
 sys/arch/x68k/dev/fdreg.h                                       |      3 +-
 sys/arch/x68k/x68k/autoconf.c                                   |      5 +-
 sys/arch/x68k/x68k/clock.c                                      |      6 +-
 sys/arch/x68k/x68k/locore.s                                     |     39 +-
 sys/arch/x68k/x68k/machdep.c                                    |     23 +-
 sys/arch/x68k/x68k/mainbus.c                                    |      6 +-
 sys/arch/x68k/x68k/vectors.s                                    |      6 +-
 sys/arch/x86/acpi/acpi_wakeup.c                                 |     23 +-
 sys/arch/x86/conf/files.x86                                     |      3 +-
 sys/arch/x86/include/cpu.h                                      |      6 +-
 sys/arch/x86/include/cpuvar.h                                   |      6 +-
 sys/arch/x86/include/pmap.h                                     |     11 +-
 sys/arch/x86/include/psl.h                                      |      4 +-
 sys/arch/x86/include/specialreg.h                               |     37 +-
 sys/arch/x86/x86/cpu.c                                          |     33 +-
 sys/arch/x86/x86/cpu_ucode_amd.c                                |     21 +-
 sys/arch/x86/x86/db_memrw.c                                     |    207 +
 sys/arch/x86/x86/identcpu.c                                     |     30 +-
 sys/arch/x86/x86/mtrr_i686.c                                    |     59 +-
 sys/arch/x86/x86/pmap.c                                         |    173 +-
 sys/arch/x86/x86/pmap_tlb.c                                     |    231 +-
 sys/arch/xen/conf/files.xen                                     |      5 +-
 sys/arch/xen/include/xenpmap.h                                  |     11 +-
 sys/arch/xen/x86/cpu.c                                          |     30 +-
 sys/arch/xen/x86/x86_xpmap.c                                    |     38 +-
 sys/arch/xen/x86/xen_pmap.c                                     |     12 +-
 sys/arch/zaurus/dev/zkbdmap.h                                   |      6 +-
 sys/coda/cnode.h                                                |     14 +-
 sys/coda/coda_psdev.c                                           |     49 +-
 sys/coda/coda_subr.c                                            |     10 +-
 sys/coda/coda_venus.c                                           |      6 +-
 sys/coda/coda_vfsops.c                                          |     13 +-
 sys/coda/coda_vnops.c                                           |    394 +-
 sys/coda/coda_vnops.h                                           |     13 +-
 sys/common/pmap/tlb/pmap.c                                      |     48 +-
 sys/common/pmap/tlb/pmap.h                                      |      3 +-
 sys/compat/linux32/arch/amd64/linux32_syscall.h                 |      6 +-
 sys/compat/linux32/arch/amd64/linux32_syscallargs.h             |     10 +-
 sys/compat/linux32/arch/amd64/linux32_syscalls.c                |      6 +-
 sys/compat/linux32/arch/amd64/linux32_sysent.c                  |      6 +-
 sys/compat/linux32/arch/amd64/syscalls.master                   |      8 +-
 sys/compat/linux32/common/linux32_signal.c                      |     11 +-
 sys/compat/linux32/common/linux32_socketcall.c                  |      6 +-
 sys/compat/netbsd32/netbsd32_ioctl.c                            |    162 +-
 sys/compat/netbsd32/netbsd32_ioctl.h                            |     35 +-
 sys/compat/netbsd32/netbsd32_lwp.c                              |     42 +-
 sys/compat/sys/ucontext.h                                       |      3 +-
 sys/conf/files                                                  |     10 +-
 sys/ddb/db_command.c                                            |     23 +-
 sys/dev/DEVNAMES                                                |     14 +-
 sys/dev/acpi/acpi_cpu.h                                         |      3 +-
 sys/dev/acpi/acpi_cpu_tstate.c                                  |     12 +-
 sys/dev/acpi/acpica/OsdMemory.c                                 |     13 +-
 sys/dev/ata/sata_subr.c                                         |     16 +-
 sys/dev/audio.c                                                 |      8 +-
 sys/dev/dkwedge/dk.c                                            |      9 +-
 sys/dev/firmload.c                                              |      6 +-
 sys/dev/i2c/dbcool.c                                            |     14 +-
 sys/dev/i2c/i2c_exec.c                                          |      8 +-
 sys/dev/i2c/i2c_io.h                                            |     26 +-
 sys/dev/ic/ahcisata_core.c                                      |      5 +-
 sys/dev/ic/bwi.c                                                |     26 +-
 sys/dev/ic/com.c                                                |     12 +-
 sys/dev/ic/mvsata.c                                             |      5 +-
 sys/dev/ic/seeq8005.c                                           |      6 +-
 sys/dev/ic/siisata.c                                            |    104 +-
 sys/dev/ieee1394/firewire.c                                     |     11 +-
 sys/dev/ieee1394/firewirereg.h                                  |      3 +-
 sys/dev/ieee1394/fwdev.c                                        |     10 +-
 sys/dev/ieee1394/fwmem.c                                        |     12 +-
 sys/dev/ieee1394/fwohcivar.h                                    |      4 +-
 sys/dev/ieee1394/if_fwip.c                                      |     13 +-
 sys/dev/ieee1394/sbp.c                                          |      5 +-
 sys/dev/isa/isadmavar.h                                         |      7 +-
 sys/dev/ldvar.h                                                 |      4 +-
 sys/dev/pci/eso.c                                               |      6 +-
 sys/dev/pci/files.pci                                           |      7 +-
 sys/dev/pci/if_bnxvar.h                                         |      4 +-
 sys/dev/pci/if_wpi.c                                            |      6 +-
 sys/dev/pci/machfb.c                                            |      6 +-
 sys/dev/pci/mpii.c                                              |   5536 +
 sys/dev/pci/pci_subr.c                                          |     15 +-
 sys/dev/pci/pcidevs                                             |     14 +-
 sys/dev/pci/pcidevs.h                                           |     16 +-
 sys/dev/pci/pcidevs_data.h                                      |   4364 +-
 sys/dev/pci/r128fb.c                                            |     66 +-
 sys/dev/pci/radeonfb.c                                          |      6 +-
 sys/dev/pci/trm.c                                               |     22 +-
 sys/dev/pci/trmreg.h                                            |      6 +-
 sys/dev/pci/voodoofb.c                                          |      6 +-
 sys/dev/pci/voyager/voyagerfb.c                                 |     17 +-
 sys/dev/rasops/rasops.c                                         |     48 +-
 sys/dev/rasops/rasops.h                                         |      4 +-
 sys/dev/rasops/rasops15.c                                       |      8 +-
 sys/dev/rndpseudo.c                                             |     65 +-
 sys/dev/scsipi/atapi_wdc.c                                      |      5 +-
 sys/dev/scsipi/atapiconf.c                                      |      7 +-
 sys/dev/scsipi/cd.c                                             |     44 +-
 sys/dev/scsipi/scsi_base.c                                      |    147 +-
 sys/dev/scsipi/scsiconf.c                                       |     46 +-
 sys/dev/scsipi/scsiconf.h                                       |     13 +-
 sys/dev/scsipi/scsipi_base.c                                    |    118 +-
 sys/dev/scsipi/scsipi_ioctl.c                                   |      8 +-
 sys/dev/scsipi/scsipiconf.h                                     |     16 +-
 sys/dev/scsipi/sd.c                                             |     10 +-
 sys/dev/scsipi/st.c                                             |     10 +-
 sys/dev/scsipi/st_atapi.c                                       |      7 +-
 sys/dev/scsipi/st_scsi.c                                        |      7 +-
 sys/dev/sun/files.sun                                           |      4 +-
 sys/dev/sun/kbd.c                                               |     60 +-
 sys/dev/sun/kbdvar.h                                            |      6 +-
 sys/dev/usb/uaudio.c                                            |     18 +-
 sys/dev/usb/uaudioreg.h                                         |      4 +-
 sys/dev/usb/ubt.c                                               |     23 +-
 sys/dev/usb/ugen.c                                              |      5 +-
 sys/dev/usb/uhid.c                                              |      9 +-
 sys/dev/usb/ukbd.c                                              |     60 +-
 sys/dev/usb/umass_scsipi.c                                      |      8 +-
 sys/dev/usb/umidi.c                                             |      5 +-
 sys/dev/usb/umidi_quirks.c                                      |      5 +-
 sys/dev/usb/ums.c                                               |     70 +-
 sys/dev/usb/usbdevs                                             |     11 +-
 sys/dev/usb/usbdevs.h                                           |     13 +-
 sys/dev/usb/usbdevs_data.h                                      |     28 +-
 sys/dev/usb/usbdi.h                                             |      4 +-
 sys/dev/wscons/wsconsio.h                                       |      3 +-
 sys/dev/wscons/wsdisplay_glyphcache.c                           |      9 +-
 sys/dev/wscons/wsdisplay_glyphcachevar.h                        |      6 +-
 sys/dev/wscons/wsksymdef.h                                      |      3 +-
 sys/dev/wsfont/DejaVu_Sans_Mono_12x22.h                         |     85 +
 sys/fs/efs/efs_ihash.c                                          |      6 +-
 sys/fs/msdosfs/msdosfs_vnops.c                                  |      9 +-
 sys/fs/ntfs/ntfs_vnops.c                                        |      8 +-
 sys/fs/puffs/puffs_vnops.c                                      |     51 +-
 sys/fs/sysvbfs/bfs.c                                            |     20 +-
 sys/fs/sysvbfs/bfs.h                                            |      3 +-
 sys/fs/sysvbfs/sysvbfs_vnops.c                                  |     29 +-
 sys/fs/tmpfs/files.tmpfs                                        |      3 +-
 sys/fs/tmpfs/tmpfs_rename.c                                     |    591 +
 sys/fs/tmpfs/tmpfs_vnops.c                                      |   1272 +-
 sys/fs/udf/udf_subr.c                                           |     12 +-
 sys/fs/udf/udf_vnops.c                                          |     10 +-
 sys/fs/union/union_vfsops.c                                     |     13 +-
 sys/fs/v7fs/v7fs_vnops.c                                        |      7 +-
 sys/kern/exec_elf.c                                             |     69 +-
 sys/kern/init_sysent.c                                          |     10 +-
 sys/kern/kern_malloc.c                                          |    255 +-
 sys/kern/kern_malloc_debug.c                                    |    327 -
 sys/kern/kern_malloc_stdtype.c                                  |     58 -
 sys/kern/kern_rndpool.c                                         |     12 +-
 sys/kern/kern_rndq.c                                            |     26 +-
 sys/kern/kern_synch.c                                           |     11 +-
 sys/kern/kern_syscall.c                                         |      5 +-
 sys/kern/makesyscalls.sh                                        |     10 +-
 sys/kern/subr_cprng.c                                           |    144 +-
 sys/kern/subr_disk_open.c                                       |     13 +-
 sys/kern/subr_kcpuset.c                                         |     31 +-
 sys/kern/subr_pcu.c                                             |     31 +-
 sys/kern/subr_pool.c                                            |    240 +-
 sys/kern/sys_lwp.c                                              |     84 +-
 sys/kern/sys_pipe.c                                             |     18 +-
 sys/kern/sys_sched.c                                            |      6 +-
 sys/kern/sys_syscall.c                                          |      9 +-
 sys/kern/syscalls.c                                             |      8 +-
 sys/kern/syscalls.master                                        |      6 +-
 sys/kern/uipc_mbuf.c                                            |      5 +-
 sys/kern/vfs_mount.c                                            |     14 +-
 sys/kern/vfs_subr.c                                             |     20 +-
 sys/kern/vfs_syscalls.c                                         |     51 +-
 sys/kern/vfs_wapbl.c                                            |      5 +-
 sys/kern/vfs_xattr.c                                            |      6 +-
 sys/lib/libsa/ext2fs.c                                          |      6 +-
 sys/lib/libsa/ffsv1.c                                           |      4 +-
 sys/lib/libsa/ffsv2.c                                           |      4 +-
 sys/lib/libsa/globals.c                                         |      5 +-
 sys/lib/libsa/lfsv1.c                                           |      3 +-
 sys/lib/libsa/lfsv2.c                                           |      3 +-
 sys/lib/libsa/stand.h                                           |      3 +-
 sys/lib/libsa/ufs.c                                             |     10 +-
 sys/miscfs/genfs/genfs.h                                        |     70 +-
 sys/miscfs/genfs/genfs_io.c                                     |     43 +-
 sys/miscfs/genfs/genfs_rename.c                                 |   1154 +
 sys/miscfs/nullfs/null_vfsops.c                                 |     10 +-
 sys/miscfs/overlay/overlay_vfsops.c                             |     14 +-
 sys/miscfs/procfs/procfs_map.c                                  |     19 +-
 sys/miscfs/procfs/procfs_vfsops.c                               |     11 +-
 sys/miscfs/specfs/spec_vnops.c                                  |      6 +-
 sys/miscfs/umapfs/umap_vfsops.c                                 |     17 +-
 sys/modules/Makefile                                            |      6 +-
 sys/modules/coda/Makefile                                       |      5 +-
 sys/modules/ext2fs/Makefile                                     |      6 +-
 sys/modules/ffs/Makefile                                        |      6 +-
 sys/modules/tmpfs/Makefile                                      |      6 +-
 sys/modules/vcoda/Makefile                                      |     11 +
 sys/net/if_ethersubr.c                                          |      5 +-
 sys/net/npf/npf_handler.c                                       |     50 +-
 sys/net/npf/npf_impl.h                                          |      4 +-
 sys/net/npf/npf_sendpkt.c                                       |     51 +-
 sys/netinet/ip_mroute.c                                         |     13 +-
 sys/netinet/ip_output.c                                         |     21 +-
 sys/netsmb/smb_conn.c                                           |      5 +-
 sys/netsmb/smb_dev.c                                            |      6 +-
 sys/netsmb/smb_iod.c                                            |      7 +-
 sys/netsmb/subr_mchain.c                                        |     84 +-
 sys/nfs/nfs_vnops.c                                             |      9 +-
 sys/rump/dev/lib/libscsitest/scsitest.c                         |      7 +-
 sys/rump/fs/lib/libext2fs/Makefile                              |      6 +-
 sys/rump/fs/lib/libffs/Makefile                                 |      4 +-
 sys/rump/fs/lib/libtmpfs/Makefile                               |      4 +-
 sys/rump/librump/rumpkern/Makefile.rumpkern                     |      3 +-
 sys/rump/librump/rumpkern/locks_up.c                            |      5 +-
 sys/rump/librump/rumpkern/memalloc.c                            |     24 +-
 sys/rump/librump/rumpvfs/Makefile.rumpvfs                       |      4 +-
 sys/sys/bus.h                                                   |     23 +-
 sys/sys/cdefs.h                                                 |      4 +-
 sys/sys/cprng.h                                                 |      4 +-
 sys/sys/exec_elf.h                                              |     27 +-
 sys/sys/kcpuset.h                                               |      3 +-
 sys/sys/lwp.h                                                   |      3 +-
 sys/sys/malloc.h                                                |     59 +-
 sys/sys/mallocvar.h                                             |     42 +-
 sys/sys/mbuf.h                                                  |     23 +-
 sys/sys/param.h                                                 |      4 +-
 sys/sys/pcu.h                                                   |     16 +-
 sys/sys/pool.h                                                  |     29 +-
 sys/sys/rnd.h                                                   |     11 +-
 sys/sys/spawn.h                                                 |     10 +-
 sys/sys/syscall.h                                               |      7 +-
 sys/sys/syscallargs.h                                           |     17 +-
 sys/sys/ucontext.h                                              |      3 +-
 sys/ufs/chfs/chfs_inode.h                                       |      6 +-
 sys/ufs/chfs/chfs_vfsops.c                                      |     40 +-
 sys/ufs/chfs/chfs_vnops.c                                       |     20 +-
 sys/ufs/ext2fs/ext2fs_dir.h                                     |      4 +-
 sys/ufs/ext2fs/ext2fs_extern.h                                  |      3 +-
 sys/ufs/ext2fs/ext2fs_readwrite.c                               |     17 +-
 sys/ufs/ext2fs/ext2fs_rename.c                                  |   1012 +
 sys/ufs/ext2fs/ext2fs_vfsops.c                                  |     26 +-
 sys/ufs/ext2fs/ext2fs_vnops.c                                   |    426 +-
 sys/ufs/ffs/ffs_vfsops.c                                        |      6 +-
 sys/ufs/ffs/ffs_vnops.c                                         |     46 +-
 sys/ufs/ffs/fs.h                                                |      8 +-
 sys/ufs/files.ufs                                               |      5 +-
 sys/ufs/lfs/lfs_vfsops.c                                        |     19 +-
 sys/ufs/lfs/lfs_vnops.c                                         |    933 +-
 sys/ufs/ufs/inode.h                                             |      5 +-
 sys/ufs/ufs/ufs_extattr.c                                       |     18 +-
 sys/ufs/ufs/ufs_extern.h                                        |     25 +-
 sys/ufs/ufs/ufs_lookup.c                                        |     62 +-
 sys/ufs/ufs/ufs_readwrite.c                                     |     16 +-
 sys/ufs/ufs/ufs_rename.c                                        |   1080 +
 sys/ufs/ufs/ufs_vnops.c                                         |   1022 +-
 sys/ufs/ufs/ufsmount.h                                          |      8 +-
 sys/uvm/uvm_page.h                                              |     71 +-
 sys/uvm/uvm_pager.h                                             |      3 +-
 tests/README                                                    |     21 +-
 tests/dev/scsipi/t_cd.c                                         |      4 +-
 tests/fs/puffs/t_fuzz.c                                         |      8 +-
 tests/fs/vfs/t_renamerace.c                                     |     16 +-
 tests/lib/libc/gen/t_siginfo.c                                  |     72 +-
 tests/lib/libc/stdlib/t_strtod.c                                |     28 +-
 tests/lib/libc/sys/Makefile                                     |      4 +-
 tests/lib/libc/sys/t_lwp_create.c                               |    247 +
 tests/lib/libc/sys/t_mlock.c                                    |    219 +
 tests/lib/libc/sys/t_mmap.c                                     |     31 +-
 tests/lib/libc/sys/t_pipe2.c                                    |     36 +-
 tests/lib/librumphijack/h_client.c                              |     48 +-
 tests/lib/librumphijack/h_cwd.c                                 |     51 +-
 tests/lib/librumphijack/h_netget.c                              |     22 +-
 tests/modules/k_helper3/k_helper3.c                             |     21 +-
 tests/modules/t_abi_uvm.sh                                      |      9 +-
 tests/modules/t_modctl.c                                        |      6 +-
 tests/modules/t_modload.sh                                      |      8 +-
 tests/usr.bin/Makefile                                          |      4 +-
 tests/usr.bin/bzip2/Makefile                                    |      4 +-
 tests/usr.bin/tmux/Makefile                                     |      8 +
 tests/usr.bin/tmux/t_tmux.sh                                    |     49 +
 tests/usr.sbin/Makefile                                         |      4 +-
 tests/usr.sbin/useradd/Makefile                                 |     11 +
 tests/usr.sbin/useradd/t_useradd.sh                             |     50 +
 tools/Makefile.gnuhost                                          |      4 +-
 tools/fdisk/Makefile                                            |      6 +-
 usr.bin/bzip2/Makefile                                          |      4 +-
 usr.bin/bzip2recover/Makefile                                   |      4 +-
 usr.bin/calendar/calendars/calendar.christian                   |     26 +-
 usr.bin/calendar/calendars/calendar.holiday                     |     46 +-
 usr.bin/calendar/calendars/calendar.judaic                      |     28 +-
 usr.bin/calendar/calendars/calendar.netbsd                      |     12 +-
 usr.bin/calendar/calendars/calendar.usholiday                   |     24 +-
 usr.bin/cap_mkdb/cap_mkdb.1                                     |      8 +-
 usr.bin/chpass/chpass.1                                         |      6 +-
 usr.bin/colcrt/colcrt.1                                         |      4 +-
 usr.bin/colrm/colrm.1                                           |      6 +-
 usr.bin/crunch/examples/fixit.conf                              |      4 +-
 usr.bin/crunch/examples/really-big.conf                         |      4 +-
 usr.bin/du/du.1                                                 |      6 +-
 usr.bin/expand/expand.1                                         |      4 +-
 usr.bin/find/function.c                                         |      8 +-
 usr.bin/fold/fold.1                                             |     11 +-
 usr.bin/grep/grep.c                                             |     14 +-
 usr.bin/grep/grep.h                                             |      4 +-
 usr.bin/grep/util.c                                             |    127 +-
 usr.bin/last/last.1                                             |      4 +-
 usr.bin/logger/logger.1                                         |     18 +-
 usr.bin/logger/logger.c                                         |     16 +-
 usr.bin/login/Makefile                                          |      4 +-
 usr.bin/login/common.c                                          |     30 +-
 usr.bin/login/common.h                                          |     16 +-
 usr.bin/login/k5login.c                                         |    122 +-
 usr.bin/login/login.c                                           |     38 +-
 usr.bin/login/login_pam.c                                       |     20 +-
 usr.bin/m4/main.c                                               |      6 +-
 usr.bin/mail/cmd1.c                                             |      6 +-
 usr.bin/mail/cmd2.c                                             |      6 +-
 usr.bin/mail/cmd3.c                                             |      6 +-
 usr.bin/mail/collect.c                                          |     16 +-
 usr.bin/mail/edit.c                                             |      8 +-
 usr.bin/mail/fio.c                                              |      6 +-
 usr.bin/mail/lex.c                                              |     22 +-
 usr.bin/mail/list.c                                             |      6 +-
 usr.bin/mail/mime_attach.c                                      |     20 +-
 usr.bin/mail/mime_child.c                                       |      8 +-
 usr.bin/mail/mime_detach.c                                      |     10 +-
 usr.bin/mail/names.c                                            |     13 +-
 usr.bin/mail/popen.c                                            |     16 +-
 usr.bin/mail/quit.c                                             |     36 +-
 usr.bin/mail/send.c                                             |     10 +-
 usr.bin/mail/support.c                                          |      8 +-
 usr.bin/make/buf.c                                              |     47 +-
 usr.bin/make/buf.h                                              |      3 +-
 usr.bin/make/compat.c                                           |      8 +-
 usr.bin/make/cond.c                                             |      8 +-
 usr.bin/make/main.c                                             |     11 +-
 usr.bin/make/make.1                                             |      4 +-
 usr.bin/make/make.c                                             |      8 +-
 usr.bin/make/make_malloc.c                                      |      8 +-
 usr.bin/make/parse.c                                            |     17 +-
 usr.bin/make/var.c                                              |     11 +-
 usr.bin/man/man.conf.5                                          |     15 +-
 usr.bin/menuc/testm/Makefile                                    |      4 +-
 usr.bin/mkstr/mkstr.1                                           |      4 +-
 usr.bin/passwd/krb5_passwd.c                                    |     93 +-
 usr.bin/quota/quota.1                                           |     14 +-
 usr.bin/quota/quota.c                                           |     12 +-
 usr.bin/rpcinfo/rpcinfo.8                                       |     28 +-
 usr.bin/soelim/soelim.1                                         |      4 +-
 usr.bin/spell/spell/special.netbsd                              |      1 +
 usr.bin/tabs/tabs.1                                             |     18 +-
 usr.bin/tput/tput.1                                             |      7 +-
 usr.bin/tset/Makefile                                           |      4 +-
 usr.bin/tset/set.c                                              |      8 +-
 usr.bin/tset/tset.1                                             |     37 +-
 usr.bin/tset/wrterm.c                                           |    115 -
 usr.bin/ul/ul.1                                                 |      6 +-
 usr.bin/vgrind/vgrind.1                                         |      4 +-
 usr.bin/vgrind/vgrindefs.5                                      |      7 +-
 usr.bin/vmstat/vmstat.c                                         |    137 +-
 usr.bin/xlint/lint1/err.c                                       |      8 +-
 usr.bin/xlint/lint1/tree.c                                      |      8 +-
 usr.sbin/bootp/bootpd/ConvOldTab.sh                             |      4 +-
 usr.sbin/bootp/bootpd/bootptab.5                                |     12 +-
 usr.sbin/cpuctl/arch/i386.c                                     |     34 +-
 usr.sbin/envstat/envstat.c                                      |     10 +-
 usr.sbin/isdn/isdnd/isdnd.8                                     |     10 +-
 usr.sbin/makefs/Makefile                                        |      7 +-
 usr.sbin/makefs/cd9660/cd9660_eltorito.c                        |      6 +-
 usr.sbin/makefs/cd9660/iso9660_rrip.c                           |      8 +-
 usr.sbin/makefs/chfs.c                                          |    230 +
 usr.sbin/makefs/chfs/Makefile.inc                               |     11 +
 usr.sbin/makefs/chfs/chfs_mkfs.c                                |    309 +
 usr.sbin/makefs/chfs/chfs_mkfs.h                                |     44 +
 usr.sbin/makefs/chfs_makefs.h                                   |     50 +
 usr.sbin/makefs/ffs.c                                           |     21 +-
 usr.sbin/makefs/ffs/ffs_alloc.c                                 |     14 +-
 usr.sbin/makefs/ffs/mkfs.c                                      |     15 +-
 usr.sbin/makefs/makefs.8                                        |     27 +-
 usr.sbin/makefs/makefs.c                                        |     11 +-
 usr.sbin/makefs/makefs.h                                        |      9 +-
 usr.sbin/makefs/v7fs/v7fs_estimate.c                            |      7 +-
 usr.sbin/makefs/walk.c                                          |      6 +-
 usr.sbin/makemandb/DBSCHEMA                                     |      1 +
 usr.sbin/makemandb/apropos-utils.c                              |     13 +-
 usr.sbin/makemandb/apropos-utils.h                              |      4 +-
 usr.sbin/makemandb/apropos.1                                    |     11 +-
 usr.sbin/makemandb/makemandb.8                                  |      8 +-
 usr.sbin/makemandb/makemandb.c                                  |     14 +-
 usr.sbin/repquota/repquota.8                                    |     14 +-
 usr.sbin/repquota/repquota.c                                    |     10 +-
 usr.sbin/rtadvd/rtadvd.conf.5                                   |     14 +-
 usr.sbin/sup/source/supscan.c                                   |     42 +-
 usr.sbin/syslogd/syslogd.c                                      |     32 +-
 x11/Xserver/Makefile.common                                     |      8 +-
 x11/Xserver/Xserver/Makefile                                    |      6 +-
 949 files changed, 80004 insertions(+), 62092 deletions(-)

diffs (truncated from 170128 to 300 lines):

diff -r a6aa02b47f22 -r 5982ae213c05 Makefile
--- a/Makefile  Wed Apr 18 13:40:44 2012 +0000
+++ b/Makefile  Wed May 23 10:07:03 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.289.2.1 2012/04/17 00:01:35 yamt Exp $
+#      $NetBSD: Makefile,v 1.289.2.2 2012/05/23 10:07:03 yamt Exp $
 
 #
 # This is the top-level makefile for building NetBSD. For an outline of
@@ -563,7 +563,7 @@
 # (Tells <bsd.subdir.mk> not to recurse for them.)
 #
 
-.for dir in bin etc distrib games libexec regress sbin usr.sbin tools
+.for dir in bin etc distrib games libexec regress sbin usr.bin usr.sbin tools
 includes-${dir}: .PHONY
        @true
 .endfor
diff -r a6aa02b47f22 -r 5982ae213c05 UPDATING
--- a/UPDATING  Wed Apr 18 13:40:44 2012 +0000
+++ b/UPDATING  Wed May 23 10:07:03 2012 +0000
@@ -1,4 +1,4 @@
-$NetBSD: UPDATING,v 1.229.2.1 2012/04/17 00:01:35 yamt Exp $
+$NetBSD: UPDATING,v 1.229.2.2 2012/05/23 10:07:04 yamt Exp $
 
 This file (UPDATING) is intended to be a brief reference to recent
 changes that might cause problems in the build process, and a guide for
@@ -16,6 +16,11 @@
 Recent changes:
 ^^^^^^^^^^^^^^^
 
+20120507:
+       The database schema for makemandb was changed. You will
+       need to update the database using 'makemandb -f' or wait
+       for the next weekly run to fix it.
+
 20120319:
        sys/conf/Makefile.kern.inc has been modified to adjust the
        size of db_symtab automatically.  You need to update dbsym in
diff -r a6aa02b47f22 -r 5982ae213c05 bin/expr/expr.1
--- a/bin/expr/expr.1   Wed Apr 18 13:40:44 2012 +0000
+++ b/bin/expr/expr.1   Wed May 23 10:07:03 2012 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: expr.1,v 1.31 2011/03/23 18:10:25 dholland Exp $
+.\"    $NetBSD: expr.1,v 1.31.4.1 2012/05/23 10:07:04 yamt Exp $
 .\"
 .\" Copyright (c) 2000,2003 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -81,7 +81,7 @@
 .Ar expr2 ,
 which must be a regular expression.
 The regular expression is anchored
-to the beginning of  the string with an implicit
+to the beginning of the string with an implicit
 .Dq ^ .
 .Pp
 If the match succeeds and the pattern contains at least one regular
diff -r a6aa02b47f22 -r 5982ae213c05 bin/ps/ps.c
--- a/bin/ps/ps.c       Wed Apr 18 13:40:44 2012 +0000
+++ b/bin/ps/ps.c       Wed May 23 10:07:03 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ps.c,v 1.76.2.1 2012/04/17 00:01:37 yamt Exp $ */
+/*     $NetBSD: ps.c,v 1.76.2.2 2012/05/23 10:07:04 yamt Exp $ */
 
 /*
  * Copyright (c) 2000-2008 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
 #if 0
 static char sccsid[] = "@(#)ps.c       8.4 (Berkeley) 4/2/94";
 #else
-__RCSID("$NetBSD: ps.c,v 1.76.2.1 2012/04/17 00:01:37 yamt Exp $");
+__RCSID("$NetBSD: ps.c,v 1.76.2.2 2012/05/23 10:07:04 yamt Exp $");
 #endif
 #endif /* not lint */
 
@@ -146,6 +146,52 @@
 
 kvm_t *kd;
 
+static long long
+ttyname2dev(const char *ttname, int *xflg, int *what)
+{
+       struct stat sb;
+       const char *ttypath;
+       char pathbuf[MAXPATHLEN];
+
+       ttypath = NULL;
+       if (strcmp(ttname, "?") == 0) {
+               *xflg = 1;
+               return KERN_PROC_TTY_NODEV;
+       }
+       if (strcmp(ttname, "-") == 0)
+               return KERN_PROC_TTY_REVOKE;
+
+       if (strcmp(ttname, "co") == 0)
+               ttypath = _PATH_CONSOLE;
+       else if (strncmp(ttname, "pts/", 4) == 0 ||
+               strncmp(ttname, "tty", 3) == 0) {
+               (void)snprintf(pathbuf,
+                   sizeof(pathbuf), "%s%s", _PATH_DEV, ttname);
+               ttypath = pathbuf;
+       } else if (*ttname != '/') {
+               (void)snprintf(pathbuf,
+                   sizeof(pathbuf), "%s%s", _PATH_TTY, ttname);
+               ttypath = pathbuf;
+       } else
+               ttypath = ttname;
+       *what = KERN_PROC_TTY;
+       if (stat(ttypath, &sb) == -1) {
+               devmajor_t pts = getdevmajor("pts", S_IFCHR);
+
+               if (pts != NODEVMAJOR && strncmp(ttname, "pts/", 4) == 0) {
+                       int ptsminor = atoi(ttname + 4);
+
+                       snprintf(pathbuf, sizeof(pathbuf), "pts/%d", ptsminor);
+                       if (strcmp(pathbuf, ttname) == 0 && ptsminor >= 0)
+                               return makedev(pts, ptsminor);
+               }
+               err(1, "%s", ttypath);
+       }
+       if (!S_ISCHR(sb.st_mode))
+               errx(1, "%s: not a terminal", ttypath);
+       return sb.st_rdev;
+}
+
 int
 main(int argc, char *argv[])
 {
@@ -272,44 +318,11 @@
                case 'T':
                        if ((ttname = ttyname(STDIN_FILENO)) == NULL)
                                errx(1, "stdin: not a terminal");
-                       goto tty;
+                       flag = ttyname2dev(ttname, &xflg, &what);
+                       break;
                case 't':
-                       ttname = optarg;
-               tty: {
-                       struct stat sb;
-                       const char *ttypath;
-                       char pathbuf[MAXPATHLEN];
-
-                       flag = 0;
-                       ttypath = NULL;
-                       if (strcmp(ttname, "?") == 0) {
-                               flag = KERN_PROC_TTY_NODEV;
-                               xflg = 1;
-                       } else if (strcmp(ttname, "-") == 0)
-                               flag = KERN_PROC_TTY_REVOKE;
-                       else if (strcmp(ttname, "co") == 0)
-                               ttypath = _PATH_CONSOLE;
-                       else if (strncmp(ttname, "pts/", 4) == 0 ||
-                               strncmp(ttname, "tty", 3) == 0) {
-                               (void)snprintf(pathbuf,
-                                   sizeof(pathbuf), "%s%s", _PATH_DEV, ttname);
-                               ttypath = pathbuf;
-                       } else if (*ttname != '/') {
-                               (void)snprintf(pathbuf,
-                                   sizeof(pathbuf), "%s%s", _PATH_TTY, ttname);
-                               ttypath = pathbuf;
-                       } else
-                               ttypath = ttname;
-                       what = KERN_PROC_TTY;
-                       if (flag == 0) {
-                               if (stat(ttypath, &sb) == -1)
-                                       err(1, "%s", ttypath);
-                               if (!S_ISCHR(sb.st_mode))
-                                       errx(1, "%s: not a terminal", ttypath);
-                               flag = sb.st_rdev;
-                       }
+                       flag = ttyname2dev(optarg, &xflg, &what);
                        break;
-               }
                case 'U':
                        if (*optarg != '\0') {
                                struct passwd *pw;
diff -r a6aa02b47f22 -r 5982ae213c05 bin/rcp/rcp.c
--- a/bin/rcp/rcp.c     Wed Apr 18 13:40:44 2012 +0000
+++ b/bin/rcp/rcp.c     Wed May 23 10:07:03 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rcp.c,v 1.48 2009/08/31 07:11:16 dholland Exp $        */
+/*     $NetBSD: rcp.c,v 1.48.6.1 2012/05/23 10:07:04 yamt Exp $        */
 
 /*
  * Copyright (c) 1983, 1990, 1992, 1993
@@ -39,7 +39,7 @@
 #if 0
 static char sccsid[] = "@(#)rcp.c      8.2 (Berkeley) 4/2/94";
 #else
-__RCSID("$NetBSD: rcp.c,v 1.48 2009/08/31 07:11:16 dholland Exp $");
+__RCSID("$NetBSD: rcp.c,v 1.48.6.1 2012/05/23 10:07:04 yamt Exp $");
 #endif
 #endif /* not lint */
 
@@ -485,6 +485,8 @@
        char ch, *cp, *np, *targ, *vect[1], buf[BUFSIZ];
        const char *why;
        off_t size;
+       char *namebuf = NULL;
+       size_t cursize = 0;
 
 #define        atime   tv[0]
 #define        mtime   tv[1]
@@ -507,7 +509,7 @@
        for (first = 1;; first = 0) {
                cp = buf;
                if (read(rem, cp, 1) <= 0)
-                       return;
+                       goto out;
                if (*cp++ == '\n')
                        SCREWUP("unexpected <newline>");
                do {
@@ -528,7 +530,7 @@
                }
                if (buf[0] == 'E') {
                        (void)write(rem, "", 1);
-                       return;
+                       goto out;
                }
 
                if (ch == '\n')
@@ -582,20 +584,19 @@
                if (*cp++ != ' ')
                        SCREWUP("size not delimited");
                if (targisdir) {
-                       static char *namebuf;
-                       static size_t cursize;
                        char *newnamebuf;
                        size_t need;
 
-                       need = strlen(targ) + strlen(cp) + 250;
+                       need = strlen(targ) + strlen(cp) + 2;
                        if (need > cursize) {
+                               need += 256;
                                newnamebuf = realloc(namebuf, need);
                                if (newnamebuf != NULL) {
                                        namebuf = newnamebuf;
                                        cursize = need;
                                } else {
-                                       /* note: run_err is not fatal */
                                        run_err("%s", strerror(errno));
+                                       exit(1);
                                }
                        }
                        (void)snprintf(namebuf, cursize, "%s%s%s", targ,
@@ -726,6 +727,13 @@
                        break;
                }
        }
+
+out:
+       if (namebuf) {
+               free(namebuf);
+       }
+       return;
+
 screwup:
        run_err("protocol error: %s", why);
        exit(1);
diff -r a6aa02b47f22 -r 5982ae213c05 crypto/external/bsd/openssh/dist/PROTOCOL.mux
--- a/crypto/external/bsd/openssh/dist/PROTOCOL.mux     Wed Apr 18 13:40:44 2012 +0000
+++ b/crypto/external/bsd/openssh/dist/PROTOCOL.mux     Wed May 23 10:07:03 2012 +0000
@@ -133,6 +133,7 @@
 
        uint32  MUX_C_CLOSE_FWD
        uint32  request id
+       uint32  forwarding type
        string  listen host
        string  listen port
        string  connect host
@@ -219,4 +220,4 @@
 XXX send signals via mux
 
 $OpenBSD: PROTOCOL.mux,v 1.7 2011/05/08 12:52:01 djm Exp $
-$NetBSD: PROTOCOL.mux,v 1.3 2011/09/07 17:49:19 christos Exp $
+$NetBSD: PROTOCOL.mux,v 1.3.2.1 2012/05/23 10:07:04 yamt Exp $
diff -r a6aa02b47f22 -r 5982ae213c05 crypto/external/bsd/openssh/dist/auth-options.c
--- a/crypto/external/bsd/openssh/dist/auth-options.c   Wed Apr 18 13:40:44 2012 +0000
+++ b/crypto/external/bsd/openssh/dist/auth-options.c   Wed May 23 10:07:03 2012 +0000
@@ -1,5 +1,5 @@
-/*     $NetBSD: auth-options.c,v 1.4 2011/07/25 03:03:10 christos Exp $        */
-/* $OpenBSD: auth-options.c,v 1.54 2010/12/24 21:41:48 djm Exp $ */
+/*     $NetBSD: auth-options.c,v 1.4.2.1 2012/05/23 10:07:04 yamt Exp $        */
+/* $OpenBSD: auth-options.c,v 1.56 2011/10/18 04:58:26 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo%cs.hut.fi@localhost>
  * Copyright (c) 1995 Tatu Ylonen <ylo%cs.hut.fi@localhost>, Espoo, Finland
@@ -12,7 +12,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: auth-options.c,v 1.4 2011/07/25 03:03:10 christos Exp $");
+__RCSID("$NetBSD: auth-options.c,v 1.4.2.1 2012/05/23 10:07:04 yamt Exp $");
 #include <sys/types.h>
 #include <sys/queue.h>
 
@@ -344,7 +344,7 @@
                                goto bad_option;
                        }
                        host = cleanhostname(host);



Home | Main Index | Thread Index | Old Index