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/b1e42965d323
branches: yamt-pagecache
changeset: 770820:b1e42965d323
user: yamt <yamt%NetBSD.org@localhost>
date: Thu Nov 10 14:31:09 2011 +0000
description:
sync with head
diffstat:
bin/csh/csh.h | 4 +-
bin/csh/dol.c | 10 +-
bin/csh/extern.h | 6 +-
bin/csh/proc.c | 16 +-
bin/csh/proc.h | 6 +-
bin/csh/time.c | 16 +-
bin/dd/Makefile | 4 +-
bin/dd/args.c | 48 +-
bin/dd/dd.1 | 88 +-
bin/dd/dd.c | 5 +-
bin/dd/extern.h | 8 +-
bin/dd/misc.c | 221 +++-
bin/pax/tar.c | 24 +-
common/lib/libc/string/memcmp.c | 5 +-
common/lib/libc/string/memset.c | 6 +-
common/lib/libc/string/memset2.c | 4 +-
common/lib/libc/string/strcpy.c | 6 +-
crypto/external/bsd/heimdal/include/config.h | 2 +
crypto/external/bsd/openssh/dist/log.c | 13 +-
dist/openpam/lib/openpam_configure.c | 8 +-
distrib/sets/lists/base/ad.mips64eb | 6 +-
distrib/sets/lists/base/ad.mips64el | 6 +-
distrib/sets/lists/base/md.amd64 | 4 +-
distrib/sets/lists/base/md.sparc64 | 4 +-
distrib/sets/lists/base/mi | 3 +-
distrib/sets/lists/base/shl.mi | 5 +-
distrib/sets/lists/comp/ad.mips64eb | 12 +-
distrib/sets/lists/comp/ad.mips64el | 12 +-
distrib/sets/lists/comp/md.amd64 | 7 +-
distrib/sets/lists/comp/md.sparc64 | 8 +-
distrib/sets/lists/comp/mi | 6 +-
distrib/sets/lists/comp/shl.mi | 4 +-
distrib/sets/lists/man/mi | 8 +-
distrib/sets/lists/modules/md.evbppc | 10 +-
distrib/sets/lists/modules/mi | 6 +-
distrib/sets/lists/tests/mi | 78 +-
distrib/utils/sysinst/arch/acorn32/md.c | 8 +-
distrib/utils/sysinst/arch/alpha/md.c | 8 +-
distrib/utils/sysinst/arch/amiga/md.c | 8 +-
distrib/utils/sysinst/arch/arc/md.c | 8 +-
distrib/utils/sysinst/arch/atari/md.c | 8 +-
distrib/utils/sysinst/arch/bebox/md.c | 8 +-
distrib/utils/sysinst/arch/cats/md.c | 8 +-
distrib/utils/sysinst/arch/cobalt/md.c | 8 +-
distrib/utils/sysinst/arch/emips/md.c | 8 +-
distrib/utils/sysinst/arch/evbarm/md.c | 8 +-
distrib/utils/sysinst/arch/evbmips/md.c | 8 +-
distrib/utils/sysinst/arch/evbppc/md.c | 8 +-
distrib/utils/sysinst/arch/evbsh3/md.c | 8 +-
distrib/utils/sysinst/arch/ews4800mips/md.c | 8 +-
distrib/utils/sysinst/arch/hp300/md.c | 8 +-
distrib/utils/sysinst/arch/hp700/md.c | 8 +-
distrib/utils/sysinst/arch/hpcarm/md.c | 8 +-
distrib/utils/sysinst/arch/hpcmips/md.c | 8 +-
distrib/utils/sysinst/arch/hpcsh/md.c | 8 +-
distrib/utils/sysinst/arch/i386/md.c | 8 +-
distrib/utils/sysinst/arch/landisk/md.c | 8 +-
distrib/utils/sysinst/arch/luna68k/md.c | 8 +-
distrib/utils/sysinst/arch/mac68k/md.c | 8 +-
distrib/utils/sysinst/arch/macppc/md.c | 8 +-
distrib/utils/sysinst/arch/mipsco/md.c | 8 +-
distrib/utils/sysinst/arch/mvme68k/md.c | 8 +-
distrib/utils/sysinst/arch/news68k/md.c | 8 +-
distrib/utils/sysinst/arch/newsmips/md.c | 8 +-
distrib/utils/sysinst/arch/ofppc/md.c | 8 +-
distrib/utils/sysinst/arch/pmax/md.c | 8 +-
distrib/utils/sysinst/arch/prep/md.c | 8 +-
distrib/utils/sysinst/arch/sandpoint/md.c | 8 +-
distrib/utils/sysinst/arch/sgimips/md.c | 8 +-
distrib/utils/sysinst/arch/shark/md.c | 8 +-
distrib/utils/sysinst/arch/sparc/md.c | 8 +-
distrib/utils/sysinst/arch/sparc64/md.c | 28 +-
distrib/utils/sysinst/arch/sparc64/msg.md.de | 6 +-
distrib/utils/sysinst/arch/sparc64/msg.md.en | 6 +-
distrib/utils/sysinst/arch/sparc64/msg.md.es | 6 +-
distrib/utils/sysinst/arch/sparc64/msg.md.fr | 6 +-
distrib/utils/sysinst/arch/sparc64/msg.md.pl | 6 +-
distrib/utils/sysinst/arch/vax/md.c | 8 +-
distrib/utils/sysinst/arch/x68k/md.c | 8 +-
distrib/utils/sysinst/arch/zaurus/md.c | 8 +-
distrib/utils/sysinst/defs.h | 3 +-
distrib/utils/sysinst/disks.c | 6 +-
doc/3RDPARTY | 29 +-
doc/BRANCHES | 19 +-
doc/CHANGES | 12 +-
doc/HACKS | 13 +-
etc/MAKEDEV.tmpl | 4 +-
etc/Makefile | 8 +-
etc/mtree/NetBSD.dist.tests | 5 +-
external/bsd/Makefile | 4 +-
external/bsd/atf/dist/atf-c/tc.c | 47 +-
external/bsd/iscsi/dist/src/lib/libiscsi.3 | 5 +-
external/bsd/iscsi/dist/src/lib/md5hl.c | 6 +-
external/bsd/llvm/Makefile.inc | 9 +-
external/bsd/llvm/bin/clang/Makefile | 3 +-
external/bsd/llvm/config/llvm/Config/config.h | 22 +-
external/bsd/llvm/config/llvm/Config/llvm-config.h | 27 +-
external/bsd/llvm/lib/Makefile | 4 +-
external/bsd/llvm/lib/libLLVMARMCodeGen/Makefile | 3 +-
external/bsd/llvm/lib/libLLVMCodeGen/Makefile | 3 +-
external/bsd/llvm/lib/libLLVMLinker/Makefile | 6 +-
external/bsd/llvm/lib/libLLVMMipsCodeGen/Makefile | 3 +-
external/bsd/llvm/lib/libLLVMScalarOpts/Makefile | 3 +-
external/bsd/llvm/lib/libLLVMSelectionDAG/Makefile | 3 +-
external/bsd/llvm/lib/libLLVMTransformsUtils/Makefile | 3 +-
external/bsd/llvm/lib/libclangAnalysis/Makefile | 6 +-
external/bsd/llvm/lib/libclangFrontend/Makefile | 4 +-
external/bsd/llvm/lib/libclangSema/Makefile | 5 +-
external/bsd/llvm/lib/libclangStaticAnalyzerCore/Makefile | 3 +-
external/bsd/tre/Makefile | 3 +
external/bsd/tre/Makefile.inc | 18 +-
external/bsd/tre/agrep/Makefile | 16 -
external/bsd/tre/agrep/agrep.1 | 205 ---
external/bsd/tre/bin/Makefile | 18 +
external/bsd/tre/bin/agrep.1 | 205 +++
external/bsd/tre/dist/config.h | 259 ---
external/bsd/tre/dist/lib/regcomp.c | 11 +-
external/bsd/tre/dist/lib/regerror.c | 4 -
external/bsd/tre/dist/lib/regexec.c | 21 +-
external/bsd/tre/dist/lib/tre-alloca.h | 17 +
external/bsd/tre/dist/lib/tre-ast.h | 8 +-
external/bsd/tre/dist/lib/tre-compile.c | 104 +-
external/bsd/tre/dist/lib/tre-config.h | 44 -
external/bsd/tre/dist/lib/tre-internal.h | 10 +-
external/bsd/tre/dist/lib/tre-match-approx.c | 38 +-
external/bsd/tre/dist/lib/tre-match-backtrack.c | 33 +-
external/bsd/tre/dist/lib/tre-match-parallel.c | 31 +-
external/bsd/tre/dist/lib/tre-match-utils.h | 63 +-
external/bsd/tre/dist/lib/tre-mem.c | 2 +-
external/bsd/tre/dist/lib/tre-parse.c | 62 +-
external/bsd/tre/dist/lib/tre-parse.h | 2 +-
external/bsd/tre/dist/lib/tre-stack.c | 6 +-
external/bsd/tre/dist/lib/tre-stack.h | 6 +-
external/bsd/tre/dist/lib/tre.h | 8 +-
external/bsd/tre/dist/lib/xmalloc.c | 2 +-
external/bsd/tre/include/config.h | 259 +++
external/bsd/tre/include/tre-config.h | 44 +
external/bsd/tre/lib/Makefile | 26 +
external/bsd/tre/lib/shlib_version | 2 +
external/bsd/tre/libtre/Makefile | 24 -
external/bsd/tre/libtre/config.h | 259 ---
external/bsd/tre/libtre/shlib_version | 2 -
external/bsd/tre/libtre/tre-config.h | 44 -
external/gpl3/gcc/dist/gcc/unwind-dw2-fde.c | 2 +
external/gpl3/gcc/usr.bin/backend/Makefile | 8 +-
external/gpl3/gdb/bin/gdb/Makefile | 4 +-
external/ibm-public/postfix/dist/HISTORY | 14 +
external/ibm-public/postfix/dist/makedefs | 2 +
external/ibm-public/postfix/dist/src/global/mail_version.h | 6 +-
external/ibm-public/postfix/dist/src/postscreen/postscreen_send.c | 10 +-
external/ibm-public/postfix/dist/src/util/sys_defs.h | 5 +-
external/public-domain/sqlite/dist/sqlite3.c | 15 +-
games/factor/factor.c | 7 +-
gnu/dist/gcc4/gcc/config/arm/arm.md | 110 +-
gnu/dist/gcc4/gcc/version.c | 2 +-
include/setjmp.h | 8 +-
include/ucontext.h | 4 +-
include/unistd.h | 4 +-
lib/Makefile | 3 +-
lib/libc/Makefile.inc | 5 +-
lib/libc/compat/include/setjmp.h | 10 +-
lib/libc/gen/cpuset.3 | 4 +-
lib/libc/gen/time.3 | 11 +-
lib/libc/gen/unvis.c | 32 +-
lib/libc/regex/regcomp.c | 8 +-
lib/libc/shlib_version | 3 +-
lib/libc/time/ctime.3 | 24 +-
lib/libc/time/localtime.c | 24 +-
lib/libnpf/npf.c | 13 +-
lib/libnpf/npf.h | 4 +-
lib/libterminfo/Makefile | 27 +-
lib/libterminfo/Makefile.hash | 27 +
lib/lua/Makefile | 4 +-
share/man/man4/Makefile | 6 +-
share/man/man4/filemon.4 | 4 +-
share/man/man4/ld.4 | 10 +-
share/man/man4/virtio.4 | 63 +
share/man/man5/mk.conf.5 | 9 +-
share/man/man7/sysctl.7 | 4 +-
share/man/man9/kauth.9 | 37 +-
share/mk/bsd.README | 3 +-
share/mk/bsd.prog.mk | 3 +-
sys/arch/amd64/amd64/machdep.c | 16 +-
sys/arch/amd64/amd64/trap.c | 8 +-
sys/arch/amd64/conf/files.amd64 | 8 +-
sys/arch/amd64/include/pmap.h | 17 +-
sys/arch/amiga/dev/efa.c | 49 +-
sys/arch/arm/at91/at91aic.c | 12 +-
sys/arch/arm/at91/at91bus.c | 20 +-
sys/arch/arm/at91/at91dbgu.c | 8 +-
sys/arch/arm/at91/at91dbgureg.h | 4 +-
sys/arch/arm/at91/at91ohci.c | 20 +-
sys/arch/arm/at91/at91pmc.c | 6 +-
sys/arch/arm/at91/at91pmcreg.h | 9 +-
sys/arch/arm/at91/at91sam9260bus.c | 161 ++
sys/arch/arm/at91/at91sam9260busvar.h | 62 +
sys/arch/arm/at91/at91sam9260reg.h | 280 ++++
sys/arch/arm/at91/at91tctmr.c | 8 +-
sys/arch/arm/at91/files.at91 | 6 +-
sys/arch/atari/stand/installboot/installboot.c | 59 +-
sys/arch/evbarm/conf/MMNET_GENERIC | 649 ++++++++++
sys/arch/evbarm/conf/files.mmnet | 9 +
sys/arch/evbarm/conf/mk.mmnet | 13 +
sys/arch/evbarm/conf/std.mmnet | 31 +
sys/arch/evbarm/mmnet/mmnet_machdep.c | 358 +++++
sys/arch/evbarm/mmnet/mmnet_start.S | 201 +++
sys/arch/evbmips/conf/LOONGSON | 5 +-
sys/arch/hp300/hp300/locore.s | 24 +-
sys/arch/i386/i386/dumpsys.c | 6 +-
sys/arch/i386/i386/gdt.c | 6 +-
sys/arch/i386/i386/machdep.c | 25 +-
sys/arch/i386/include/pmap.h | 23 +-
sys/arch/luna68k/include/param.h | 4 +-
sys/arch/luna68k/luna68k/genassym.cf | 4 +-
sys/arch/luna68k/luna68k/locore.s | 102 +-
sys/arch/m68k/m68k/pmap_motorola.c | 6 +-
sys/arch/mips/include/asm.h | 8 +-
sys/arch/mips/mips/mipsX_subr.S | 4 +-
sys/arch/mips/mips/mips_fixup.c | 7 +-
sys/arch/news68k/news68k/locore.s | 26 +-
sys/arch/sandpoint/README.NAS | 17 +-
sys/arch/sandpoint/pci/pci_machdep.c | 17 +-
sys/arch/sandpoint/stand/altboot/brdsetup.c | 142 +-
sys/arch/sandpoint/stand/altboot/globals.h | 7 +-
sys/arch/sandpoint/stand/altboot/main.c | 70 +-
sys/arch/x68k/x68k/locore.s | 4 +-
sys/arch/x86/include/cpu.h | 22 +-
sys/arch/x86/include/intrdefs.h | 5 +-
sys/arch/x86/include/pmap.h | 14 +-
sys/arch/x86/x86/pmap.c | 105 +-
sys/arch/xen/include/hypervisor.h | 3 +-
sys/arch/xen/include/intrdefs.h | 5 +-
sys/arch/xen/include/xenpmap.h | 12 +-
sys/arch/xen/x86/cpu.c | 183 ++-
sys/arch/xen/x86/x86_xpmap.c | 125 +-
sys/arch/xen/x86/xen_ipi.c | 29 +-
sys/arch/xen/x86/xen_pmap.c | 13 +-
sys/arch/xen/x86/xenfunc.c | 10 +-
sys/compat/netbsd32/netbsd32_netbsd.c | 17 +-
sys/compat/netbsd32/netbsd32_syscall.h | 9 +-
sys/compat/netbsd32/netbsd32_syscallargs.h | 11 +-
sys/compat/netbsd32/netbsd32_syscalls.c | 8 +-
sys/compat/netbsd32/netbsd32_sysent.c | 10 +-
sys/compat/netbsd32/syscalls.master | 3 +-
sys/dev/ata/satafisreg.h | 4 +-
sys/dev/i2c/lm75.c | 102 +-
sys/dev/ic/sm502reg.h | 4 +-
sys/dev/iscsi/files.iscsi | 4 +-
sys/dev/mii/miidevs | 4 +-
sys/dev/mii/miidevs.h | 8 +-
sys/dev/mii/miidevs_data.h | 6 +-
sys/dev/pci/hdaudio/hdaudio.c | 6 +-
sys/dev/pci/virtio.c | 6 +-
sys/dev/pci/voyager/voyagerfb.c | 29 +-
sys/dev/raidframe/rf_netbsdkintf.c | 32 +-
sys/dev/usb/files.usb | 4 +-
sys/dev/usb/u3g.c | 6 +-
sys/dev/usb/ukbd.c | 17 +-
sys/dev/usb/usbdevs | 3 +-
sys/dev/usb/usbdevs.h | 5 +-
sys/dev/usb/usbdevs_data.h | 10 +-
sys/kern/bufq_priocscan.c | 6 +-
sys/kern/kern_module.c | 6 +-
sys/kern/kern_synch.c | 6 +-
sys/kern/uipc_syscalls.c | 79 +-
sys/kern/vfs_xattr.c | 30 +-
sys/modules/Makefile | 4 +-
sys/modules/npf/Makefile | 12 +-
sys/modules/npf_alg_icmp/Makefile | 13 +
sys/net/if_gre.c | 16 +-
sys/net/npf/npf.c | 6 +-
sys/net/npf/npf.h | 93 +-
sys/net/npf/npf_alg_icmp.c | 20 +-
sys/net/npf/npf_ctl.c | 24 +-
sys/net/npf/npf_handler.c | 55 +-
sys/net/npf/npf_impl.h | 20 +-
sys/net/npf/npf_inet.c | 111 +-
sys/net/npf/npf_instr.c | 30 +-
sys/net/npf/npf_nat.c | 9 +-
sys/net/npf/npf_ncode.h | 5 +-
sys/net/npf/npf_processor.c | 30 +-
sys/net/npf/npf_sendpkt.c | 115 +-
sys/net/npf/npf_session.c | 7 +-
sys/net/npf/npf_state.c | 9 +-
sys/net/npf/npf_tableset.c | 81 +-
sys/netinet6/frag6.c | 140 +-
sys/netinet6/ip6_var.h | 3 +-
sys/sys/Makefile | 6 +-
sys/sys/cdefs.h | 8 +-
sys/sys/systm.h | 4 +-
tests/include/t_paths.c | 14 +-
tests/lib/Makefile | 4 +-
tests/lib/libc/gen/Makefile | 5 +-
tests/lib/libc/gen/t_cpuset.c | 114 +
tests/lib/libc/gen/t_ftok.c | 107 +
tests/lib/libc/gen/t_time.c | 114 +
tests/lib/libc/gen/t_vis.c | 40 +-
tests/lib/libc/regex/Makefile | 30 +-
tests/lib/libc/regex/att.c | 534 ++++++++
tests/lib/libc/regex/data/att/README | 8 +
tests/lib/libc/regex/data/att/basic.dat | 216 +++
tests/lib/libc/regex/data/att/categorization.dat | 62 +
tests/lib/libc/regex/data/att/forcedassoc.dat | 30 +
tests/lib/libc/regex/data/att/leftassoc.dat | 16 +
tests/lib/libc/regex/data/att/nullsubexpr.dat | 73 +
tests/lib/libc/regex/data/att/repetition.dat | 140 ++
tests/lib/libc/regex/data/att/rightassoc.dat | 16 +
tests/lib/libc/regex/t_exhaust.c | 49 +-
tests/lib/libc/regex/t_regex.awk | 4 +-
tests/lib/libc/regex/t_regex_att.in | 48 +
tests/lib/libc/sys/Makefile | 9 +-
tests/lib/libc/sys/t_connect.c | 99 +
tests/lib/libc/sys/t_listen.c | 74 +
tests/lib/libc/sys/t_msgctl.c | 358 +++++
tests/lib/libc/sys/t_msgget.c | 292 ++++
tests/lib/libc/sys/t_msgrcv.c | 341 +++++
tests/lib/libc/sys/t_msgsnd.c | 338 +++++
tests/lib/libc/sys/t_socketpair.c | 137 ++
tests/lib/libtre/Makefile | 17 +
tests/net/sys/Makefile | 6 +-
tests/net/sys/t_connect.c | 98 -
tests/net/sys/t_listen.c | 72 -
tests/net/sys/t_rfc6056.c | 31 +-
tools/Makefile | 9 +-
tools/compat/Makefile | 5 +-
tools/compat/compat_defs.h | 7 +-
tools/compat/configure | 4 +-
tools/compat/configure.ac | 6 +-
tools/compat/nbtool_config.h.in | 5 +-
tools/gdb/mknative-gdb | 8 +-
tools/llvm-lib/libLLVMLinker/Makefile | 3 +
tools/tic/Makefile | 9 +-
usr.bin/make/make.1 | 7 +-
usr.bin/make/parse.c | 26 +-
usr.bin/tic/tic.1 | 6 +-
usr.bin/tic/tic.c | 22 +-
usr.bin/time/ext.h | 7 +-
usr.bin/time/time.1 | 21 +-
usr.bin/time/time.c | 35 +-
usr.sbin/installboot/installboot.8 | 6 +-
usr.sbin/installboot/installboot.c | 8 +-
usr.sbin/lpr/lpd/lpd.8 | 10 +-
usr.sbin/lpr/lpd/lpd.c | 62 +-
usr.sbin/mountd/mountd.8 | 23 +-
usr.sbin/mountd/mountd.c | 6 +-
usr.sbin/npf/npfctl/npf_data.c | 172 +-
usr.sbin/npf/npfctl/npf_ncgen.c | 46 +-
usr.sbin/npf/npfctl/npf_parser.c | 40 +-
usr.sbin/npf/npfctl/npfctl.c | 9 +-
usr.sbin/npf/npfctl/npfctl.h | 15 +-
350 files changed, 9171 insertions(+), 2909 deletions(-)
diffs (truncated from 20895 to 300 lines):
diff -r 7beae76a96d1 -r b1e42965d323 bin/csh/csh.h
--- a/bin/csh/csh.h Sun Nov 06 22:05:00 2011 +0000
+++ b/bin/csh/csh.h Thu Nov 10 14:31:09 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: csh.h,v 1.21 2007/07/16 18:26:09 christos Exp $ */
+/* $NetBSD: csh.h,v 1.21.34.1 2011/11/10 14:31:09 yamt Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993
@@ -141,7 +141,7 @@
#include <sys/time.h>
#include <sys/types.h>
-struct timeval time0; /* Time at which the shell started */
+struct timespec time0; /* Time at which the shell started */
struct rusage ru0;
/*
diff -r 7beae76a96d1 -r b1e42965d323 bin/csh/dol.c
--- a/bin/csh/dol.c Sun Nov 06 22:05:00 2011 +0000
+++ b/bin/csh/dol.c Thu Nov 10 14:31:09 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dol.c,v 1.27 2011/08/29 14:51:17 joerg Exp $ */
+/* $NetBSD: dol.c,v 1.27.2.1 2011/11/10 14:31:09 yamt Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)dol.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: dol.c,v 1.27 2011/08/29 14:51:17 joerg Exp $");
+__RCSID("$NetBSD: dol.c,v 1.27.2.1 2011/11/10 14:31:09 yamt Exp $");
#endif
#endif /* not lint */
@@ -815,7 +815,7 @@
heredoc(Char *term)
{
Char obuf[BUFSIZE], lbuf[BUFSIZE], mbuf[BUFSIZE];
- struct timeval tv;
+ struct timespec tv;
Char *Dv[2], *lbp, *obp, *mbp, **vp;
char *tmp;
int c, ocnt, lcnt, mcnt;
@@ -826,9 +826,9 @@
if (open(tmp, O_RDWR | O_CREAT | O_TRUNC | O_EXCL, 0600) < 0) {
if (errno == EEXIST) {
if (unlink(tmp) == -1) {
- (void)gettimeofday(&tv, NULL);
+ (void)clock_gettime(CLOCK_MONOTONIC, &tv);
mbp = putn((((int)tv.tv_sec) ^
- ((int)tv.tv_usec) ^ ((int)getpid())) & 0x00ffffff);
+ ((int)tv.tv_nsec) ^ ((int)getpid())) & 0x00ffffff);
shtemp = Strspl(STRtmpsh, mbp);
xfree((ptr_t)mbp);
}
diff -r 7beae76a96d1 -r b1e42965d323 bin/csh/extern.h
--- a/bin/csh/extern.h Sun Nov 06 22:05:00 2011 +0000
+++ b/bin/csh/extern.h Thu Nov 10 14:31:09 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.23 2011/08/29 14:51:17 joerg Exp $ */
+/* $NetBSD: extern.h,v 1.23.2.1 2011/11/10 14:31:09 yamt Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -288,8 +288,8 @@
*/
void donice(Char **, struct command *);
void dotime(Char **, struct command *);
-void prusage(FILE *, struct rusage *, struct rusage *, struct timeval *,
- struct timeval *);
+void prusage(FILE *, struct rusage *, struct rusage *, struct timespec *,
+ struct timespec *);
void ruadd(struct rusage *, struct rusage *);
void settimes(void);
void psecs(long);
diff -r 7beae76a96d1 -r b1e42965d323 bin/csh/proc.c
--- a/bin/csh/proc.c Sun Nov 06 22:05:00 2011 +0000
+++ b/bin/csh/proc.c Thu Nov 10 14:31:09 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: proc.c,v 1.34 2007/07/16 18:26:10 christos Exp $ */
+/* $NetBSD: proc.c,v 1.34.34.1 2011/11/10 14:31:10 yamt Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)proc.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: proc.c,v 1.34 2007/07/16 18:26:10 christos Exp $");
+__RCSID("$NetBSD: proc.c,v 1.34.34.1 2011/11/10 14:31:10 yamt Exp $");
#endif
#endif /* not lint */
@@ -109,7 +109,7 @@
}
else {
if (pp->p_flags & (PTIME | PPTIME) || adrof(STRtime))
- (void)gettimeofday(&pp->p_etime, NULL);
+ (void)clock_gettime(CLOCK_MONOTONIC, &pp->p_etime);
pp->p_rusage = ru;
if (WIFSIGNALED(w)) {
@@ -500,7 +500,7 @@
}
pp->p_next = proclist.p_next;
proclist.p_next = pp;
- (void)gettimeofday(&pp->p_btime, NULL);
+ (void)clock_gettime(CLOCK_MONOTONIC, &pp->p_btime);
}
static void
@@ -800,9 +800,9 @@
ptprint(struct process *tp)
{
static struct rusage zru;
- static struct timeval ztime;
+ static struct timespec ztime;
struct rusage ru;
- struct timeval tetime, diff;
+ struct timespec tetime, diff;
struct process *pp;
pp = tp;
@@ -810,8 +810,8 @@
tetime = ztime;
do {
ruadd(&ru, &pp->p_rusage);
- timersub(&pp->p_etime, &pp->p_btime, &diff);
- if (timercmp(&diff, &tetime, >))
+ timespecsub(&pp->p_etime, &pp->p_btime, &diff);
+ if (timespeccmp(&diff, &tetime, >))
tetime = diff;
} while ((pp = pp->p_friends) != tp);
prusage(cshout, &zru, &ru, &tetime, &ztime);
diff -r 7beae76a96d1 -r b1e42965d323 bin/csh/proc.h
--- a/bin/csh/proc.h Sun Nov 06 22:05:00 2011 +0000
+++ b/bin/csh/proc.h Thu Nov 10 14:31:09 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: proc.h,v 1.12 2007/07/16 18:26:10 christos Exp $ */
+/* $NetBSD: proc.h,v 1.12.34.1 2011/11/10 14:31:10 yamt Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993
@@ -52,8 +52,8 @@
pid_t p_pid;
pid_t p_jobid; /* pid of job leader */
/* if a job is stopped/background p_jobid gives its pgrp */
- struct timeval p_btime; /* begin time */
- struct timeval p_etime; /* end time */
+ struct timespec p_btime; /* begin time */
+ struct timespec p_etime; /* end time */
struct rusage p_rusage;
Char *p_command; /* first PMAXLEN chars of command */
};
diff -r 7beae76a96d1 -r b1e42965d323 bin/csh/time.c
--- a/bin/csh/time.c Sun Nov 06 22:05:00 2011 +0000
+++ b/bin/csh/time.c Thu Nov 10 14:31:09 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: time.c,v 1.18 2011/08/28 07:49:16 christos Exp $ */
+/* $NetBSD: time.c,v 1.18.2.1 2011/11/10 14:31:10 yamt Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)time.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: time.c,v 1.18 2011/08/28 07:49:16 christos Exp $");
+__RCSID("$NetBSD: time.c,v 1.18.2.1 2011/11/10 14:31:10 yamt Exp $");
#endif
#endif /* not lint */
@@ -58,7 +58,7 @@
{
struct rusage ruch;
- (void)gettimeofday(&time0, NULL);
+ (void)clock_gettime(CLOCK_MONOTONIC, &time0);
(void)getrusage(RUSAGE_SELF, &ru0);
(void)getrusage(RUSAGE_CHILDREN, &ruch);
ruadd(&ru0, &ruch);
@@ -73,12 +73,12 @@
dotime(Char **v, struct command *t)
{
struct rusage ru1, ruch;
- struct timeval timedol;
+ struct timespec timedol;
(void)getrusage(RUSAGE_SELF, &ru1);
(void)getrusage(RUSAGE_CHILDREN, &ruch);
ruadd(&ru1, &ruch);
- (void)gettimeofday(&timedol, NULL);
+ (void)clock_gettime(CLOCK_MONOTONIC, &timedol);
prusage(cshout, &ru0, &ru1, &timedol, &time0);
}
@@ -127,8 +127,8 @@
#endif /* NOT_CSH */
void
-prusage(FILE *fp, struct rusage *r0, struct rusage *r1, struct timeval *e,
- struct timeval *b)
+prusage(FILE *fp, struct rusage *r0, struct rusage *r1, struct timespec *e,
+ struct timespec *b)
{
#ifndef NOT_CSH
struct varent *vp;
@@ -139,7 +139,7 @@
int ms;
cp = "%Uu %Ss %E %P %X+%Dk %I+%Oio %Fpf+%Ww";
- ms = (e->tv_sec - b->tv_sec) * 100 + (e->tv_usec - b->tv_usec) / 10000;
+ ms = (e->tv_sec - b->tv_sec) * 100 + (e->tv_nsec - b->tv_nsec) / 10000000;
t = (r1->ru_utime.tv_sec - r0->ru_utime.tv_sec) * 100 +
(r1->ru_utime.tv_usec - r0->ru_utime.tv_usec) / 10000 +
(r1->ru_stime.tv_sec - r0->ru_stime.tv_sec) * 100 +
diff -r 7beae76a96d1 -r b1e42965d323 bin/dd/Makefile
--- a/bin/dd/Makefile Sun Nov 06 22:05:00 2011 +0000
+++ b/bin/dd/Makefile Thu Nov 10 14:31:09 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2011/02/04 19:42:12 pooka Exp $
+# $NetBSD: Makefile,v 1.15.4.1 2011/11/10 14:31:10 yamt Exp $
# @(#)Makefile 8.1 (Berkeley) 5/31/93
RUMPPRG=dd
@@ -8,7 +8,7 @@
LDADD+= -lutil
.ifdef SMALLPROG
-CPPFLAGS+= -DNO_CONV -DSMALL
+CPPFLAGS+= -DNO_CONV -DNO_MSGFMT -DSMALL
.else
SRCS+= conv_tab.c
.ifndef CRUNCHEDPROG
diff -r 7beae76a96d1 -r b1e42965d323 bin/dd/args.c
--- a/bin/dd/args.c Sun Nov 06 22:05:00 2011 +0000
+++ b/bin/dd/args.c Thu Nov 10 14:31:09 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: args.c,v 1.35 2011/09/16 16:06:23 joerg Exp $ */
+/* $NetBSD: args.c,v 1.35.2.1 2011/11/10 14:31:10 yamt Exp $ */
/*-
* Copyright (c) 1991, 1993, 1994
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)args.c 8.3 (Berkeley) 4/2/94";
#else
-__RCSID("$NetBSD: args.c,v 1.35 2011/09/16 16:06:23 joerg Exp $");
+__RCSID("$NetBSD: args.c,v 1.35.2.1 2011/11/10 14:31:10 yamt Exp $");
#endif
#endif /* not lint */
@@ -56,15 +56,22 @@
#include "extern.h"
static int c_arg(const void *, const void *);
-#ifndef NO_CONV
+
+#ifdef NO_MSGFMT
+static void f_msgfmt(char *) __dead;
+#else
+static void f_msgfmt(char *);
+#endif /* NO_MSGFMT */
+
+#ifdef NO_CONV
+static void f_conv(char *) __dead;
+#else
+static void f_conv(char *);
static int c_conv(const void *, const void *);
-#endif
+#endif /* NO_CONV */
+
static void f_bs(char *);
static void f_cbs(char *);
-#ifdef NO_CONV
-__dead
-#endif
-static void f_conv(char *);
static void f_count(char *);
static void f_files(char *);
static void f_ibs(char *);
@@ -90,6 +97,7 @@
{ "ibs", f_ibs, C_IBS, C_BS|C_IBS },
{ "if", f_if, C_IF, C_IF },
{ "iseek", f_skip, C_SKIP, C_SKIP },
+ { "msgfmt", f_msgfmt, C_SKIP, C_SKIP },
{ "obs", f_obs, C_OBS, C_BS|C_OBS },
{ "of", f_of, C_OF, C_OF },
{ "oseek", f_seek, C_SEEK, C_SEEK },
@@ -252,6 +260,30 @@
in.name = arg;
}
+#ifdef NO_MSGFMT
+/* Build a small version (i.e. for a ramdisk root) */
+static void
+f_msgfmt(char *arg)
+{
Home |
Main Index |
Thread Index |
Old Index