CVS commit: src/sys/arch/sparc/dev
Module Name:src
Committed By: macallan
Date: Fri Jun 4 06:04:15 UTC 2010
Modified Files:
src/sys/arch/sparc/dev: zs.c
Log Message:
make sure we pass a valid consdev pointer to the console keyboard so kbd
knows it's console and passes the right flags to wskbd, now the wskbd will
not drop off the mux when leaving event mode.
Symptoms: now the keyboard should no longer be dead when leaving X and there
should be no more panics caused by it
I tested this on an SS5 and an SS20, may need some more attention and zs.c
sure could use some cleanup - there are a few differences to sparc64 that
really don't make much sense to me, like not passing console flags to zstty
which sparc64 does but sparc avoids, which caused this problem in the first
place.
To generate a diff of this commit:
cvs rdiff -u -r1.117 -r1.118 src/sys/arch/sparc/dev/zs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc/dev/zs.c
diff -u src/sys/arch/sparc/dev/zs.c:1.117 src/sys/arch/sparc/dev/zs.c:1.118
--- src/sys/arch/sparc/dev/zs.c:1.117 Sun Jan 17 16:23:43 2010
+++ src/sys/arch/sparc/dev/zs.c Fri Jun 4 06:04:15 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: zs.c,v 1.117 2010/01/17 16:23:43 tsutsui Exp $ */
+/* $NetBSD: zs.c,v 1.118 2010/06/04 06:04:15 macallan Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: zs.c,v 1.117 2010/01/17 16:23:43 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: zs.c,v 1.118 2010/06/04 06:04:15 macallan Exp $);
#include opt_ddb.h
#include opt_kgdb.h
@@ -454,6 +454,9 @@
* mouse line disciplines for SUN4 machines below.
* Also, don't set the console flags, otherwise we
* tell zstty_attach() to attach as console.
+ * XXX
+ * is this still necessary? sparc64 passes the console flags to
+ * zstty etc.
*/
if (zsc-zsc_promunit == 1) {
if ((hwflags ZS_HWFLAG_CONSOLE_INPUT) != 0
@@ -535,8 +538,16 @@
struct tty *tp = zstty_get_tty_from_dev(child);
kma.kmta_tp = tp;
kma.kmta_dev = tp-t_dev;
- kma.kmta_consdev = zsc_args.consdev;
+ /*
+ * we need to pass a consdev since that's how kbd knows
+ * it's the console keyboard
+ */
+ if (hwflags ZS_HWFLAG_CONSOLE_INPUT) {
+kma.kmta_consdev = zs_consdev;
+ } else
+kma.kmta_consdev = zsc_args.consdev;
+
/* Attach 'em if we got 'em. */
#if (NKBD 0)
if (channel == 0) {
CVS commit: src/sys/arch/hp700/include
Module Name:src
Committed By: skrll
Date: Fri Jun 4 06:36:34 UTC 2010
Modified Files:
src/sys/arch/hp700/include: cpu.h
Log Message:
Change struct cpu_info layout to improve cache footprint. From OpenBSD.
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/hp700/include/cpu.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hp700/include/cpu.h
diff -u src/sys/arch/hp700/include/cpu.h:1.47 src/sys/arch/hp700/include/cpu.h:1.48
--- src/sys/arch/hp700/include/cpu.h:1.47 Tue Jun 1 10:20:29 2010
+++ src/sys/arch/hp700/include/cpu.h Fri Jun 4 06:36:34 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.47 2010/06/01 10:20:29 skrll Exp $ */
+/* $NetBSD: cpu.h,v 1.48 2010/06/04 06:36:34 skrll Exp $ */
/* $OpenBSD: cpu.h,v 1.55 2008/07/23 17:39:35 kettenis Exp $ */
@@ -220,7 +220,15 @@
#define cpu_need_proftick(l) ((l)-l_pflag |= LP_OWEUPC, setsoftast(l))
#include sys/cpu_data.h
+
+/*
+ * Note that the alignment of ci_trap_save is important since we want to keep
+ * it within a single cache line. As a result, it must be kept as the first
+ * entry within the cpu_info struct.
+ */
struct cpu_info {
+ register_t ci_trapsave[16];/* the phys part of frame */
+
struct cpu_data ci_data; /* MI per-cpu data */
struct lwp *ci_curlwp; /* CPU owner */
@@ -232,9 +240,7 @@
volatile int ci_cpl;
volatile int ci_ipending; /* The pending interrupts. */
u_int ci_intr_depth; /* Nonzero iff running an interrupt. */
-
- register_t ci_trapsave[16];/* the phys part of frame */
-};
+} __aligned(64);
extern struct cpu_info cpu_info_store;
CVS commit: src/sys/arch/hp700/include
Module Name:src Committed By: skrll Date: Fri Jun 4 06:39:38 UTC 2010 Modified Files: src/sys/arch/hp700/include: cpu.h Log Message: Remove unncessary cast. To generate a diff of this commit: cvs rdiff -u -r1.48 -r1.49 src/sys/arch/hp700/include/cpu.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hp700/include/cpu.h diff -u src/sys/arch/hp700/include/cpu.h:1.48 src/sys/arch/hp700/include/cpu.h:1.49 --- src/sys/arch/hp700/include/cpu.h:1.48 Fri Jun 4 06:36:34 2010 +++ src/sys/arch/hp700/include/cpu.h Fri Jun 4 06:39:38 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.h,v 1.48 2010/06/04 06:36:34 skrll Exp $ */ +/* $NetBSD: cpu.h,v 1.49 2010/06/04 06:39:38 skrll Exp $ */ /* $OpenBSD: cpu.h,v 1.55 2008/07/23 17:39:35 kettenis Exp $ */ @@ -270,7 +270,7 @@ __asm volatile(mfctl %1, %0 : =r (l): i (CR_CURLWP)); - return (struct lwp *)l; + return l; } #define curlwphppa_curlwp()
CVS commit: src/external/bsd/atf/dist
Module Name:src Committed By: jmmv Date: Fri Jun 4 08:24:03 UTC 2010 Update of /cvsroot/src/external/bsd/atf/dist In directory ivanova.netbsd.org:/tmp/cvs-serv8120 Log Message: Import atf 0.9: * Added atf-sh, an interpreter to process test programs written using the shell API. This is not really a shell interpreter by itself though: it is just a wrapper around the system shell that eases the loading of the necessary ATF libraries. * Removed atf-compile in favour of atf-sh. * Added the use.fs metadata property to test case, which is used to specify which test cases require file system access. This is to highlight dependencies on external resources more clearly and to speed up the execution of test suites by skipping the creation of many unnecessary work directories. * Fixed test programs to get a sane default value for their source directory. This means that it should not be necessary any more to pass -s when running test programs that do not live in the current directory. * Defining test case headers became optional. This is trivial to achieve in shell-based tests but a bit ugly in C and C++. In C, use the new ATF_TC_WITHOUT_HEAD macro to define the test case, and in C++ use ATF_TEST_CASE_WITHOUT_HEAD. Status: Vendor Tag: TNF Release Tags: atf-0-9 U src/external/bsd/atf/dist/configure.ac U src/external/bsd/atf/dist/README U src/external/bsd/atf/dist/Makefile.am.m4 U src/external/bsd/atf/dist/aclocal.m4 U src/external/bsd/atf/dist/atf-c.h U src/external/bsd/atf/dist/atf-c++.hpp U src/external/bsd/atf/dist/Makefile.am U src/external/bsd/atf/dist/Makefile.in U src/external/bsd/atf/dist/bconfig.h.in U src/external/bsd/atf/dist/configure U src/external/bsd/atf/dist/AUTHORS U src/external/bsd/atf/dist/COPYING U src/external/bsd/atf/dist/INSTALL U src/external/bsd/atf/dist/NEWS U src/external/bsd/atf/dist/admin/config.guess U src/external/bsd/atf/dist/admin/compile U src/external/bsd/atf/dist/admin/check-install.sh U src/external/bsd/atf/dist/admin/config.sub U src/external/bsd/atf/dist/admin/depcomp U src/external/bsd/atf/dist/admin/install-sh U src/external/bsd/atf/dist/admin/ltmain.sh U src/external/bsd/atf/dist/admin/missing U src/external/bsd/atf/dist/admin/check-style-common.awk U src/external/bsd/atf/dist/admin/check-style-c.awk U src/external/bsd/atf/dist/admin/check-style-cpp.awk U src/external/bsd/atf/dist/admin/check-style-man.awk U src/external/bsd/atf/dist/admin/check-style-shell.awk U src/external/bsd/atf/dist/admin/check-style.sh U src/external/bsd/atf/dist/admin/choose-revision.sh U src/external/bsd/atf/dist/admin/generate-makefile.sh U src/external/bsd/atf/dist/admin/generate-revision.sh U src/external/bsd/atf/dist/admin/revision-dist.h U src/external/bsd/atf/dist/admin/generate-revision-dist.sh U src/external/bsd/atf/dist/atf-c/error_fwd.h U src/external/bsd/atf/dist/atf-c/build.h U src/external/bsd/atf/dist/atf-c/check.h U src/external/bsd/atf/dist/atf-c/config.h U src/external/bsd/atf/dist/atf-c/dynstr.h U src/external/bsd/atf/dist/atf-c/env.h U src/external/bsd/atf/dist/atf-c/error.h U src/external/bsd/atf/dist/atf-c/list.h U src/external/bsd/atf/dist/atf-c/fs.h U src/external/bsd/atf/dist/atf-c/io.h U src/external/bsd/atf/dist/atf-c/process.h U src/external/bsd/atf/dist/atf-c/macros.h U src/external/bsd/atf/dist/atf-c/map.h U src/external/bsd/atf/dist/atf-c/atf-c-api.3 U src/external/bsd/atf/dist/atf-c/sanity.h U src/external/bsd/atf/dist/atf-c/tc.h U src/external/bsd/atf/dist/atf-c/tcr.h U src/external/bsd/atf/dist/atf-c/text.h U src/external/bsd/atf/dist/atf-c/tp.h U src/external/bsd/atf/dist/atf-c/ui.h U src/external/bsd/atf/dist/atf-c/user.h U src/external/bsd/atf/dist/atf-c/process.c C src/external/bsd/atf/dist/atf-c/dynstr.c U src/external/bsd/atf/dist/atf-c/defs.h.in U src/external/bsd/atf/dist/atf-c/build.c U src/external/bsd/atf/dist/atf-c/check.c U src/external/bsd/atf/dist/atf-c/config.c U src/external/bsd/atf/dist/atf-c/env.c U src/external/bsd/atf/dist/atf-c/error.c C src/external/bsd/atf/dist/atf-c/fs.c U src/external/bsd/atf/dist/atf-c/io.c U src/external/bsd/atf/dist/atf-c/list.c U src/external/bsd/atf/dist/atf-c/map.c U src/external/bsd/atf/dist/atf-c/tp_main.c U src/external/bsd/atf/dist/atf-c/sanity.c U src/external/bsd/atf/dist/atf-c/text.c U src/external/bsd/atf/dist/atf-c/ui.c U src/external/bsd/atf/dist/atf-c/user.c C src/external/bsd/atf/dist/atf-c/tc.c U src/external/bsd/atf/dist/atf-c/tcr.c U src/external/bsd/atf/dist/atf-c/tp.c N src/external/bsd/atf/dist/atf-c/atf-c.pc.in U src/external/bsd/atf/dist/atf-c++/application.hpp U src/external/bsd/atf/dist/atf-c++/atffile.hpp U src/external/bsd/atf/dist/atf-c++/build.hpp U src/external/bsd/atf/dist/atf-c++/check.hpp U src/external/bsd/atf/dist/atf-c++/config.hpp U src/external/bsd/atf/dist/atf-c++/env.hpp U src/external/bsd/atf/dist/atf-c++/exceptions.hpp U src/external/bsd/atf/dist/atf-c++/expand.hpp U
CVS commit: src/external/bsd/atf/dist
Module Name:src
Committed By: jmmv
Date: Fri Jun 4 08:32:15 UTC 2010
Modified Files:
src/external/bsd/atf/dist/atf-c: dynstr.c fs.c tc.c
src/external/bsd/atf/dist/atf-version: atf-version.cpp
Removed Files:
src/external/bsd/atf/dist/atf-c: object.c object.h
src/external/bsd/atf/dist/atf-compile: atf-compile.1 atf-compile.cpp
atf-host-compile.sh
src/external/bsd/atf/dist/atf-run: atf-run.hooks
src/external/bsd/atf/dist/atf-sh: atf.footer.subr atf.header.subr
atf.init.subr
src/external/bsd/atf/dist/data: atf-c++.pc.in atf-c.pc.in atf-run.hooks
tests-results.css tests-results.dtd tests-results.xsl
src/external/bsd/atf/dist/doc: roadmap.xml
src/external/bsd/atf/dist/doc/standalone: roadmap.html
src/external/bsd/atf/dist/doc/text: roadmap.txt
src/external/bsd/atf/dist/tests/atf/atf-c: d_include_object_h.c
src/external/bsd/atf/dist/tests/atf/atf-compile: Atffile h_mode.cpp
t_integration.sh
src/external/bsd/atf/dist/tests/atf/data: Atffile t_pkg_config.sh
Log Message:
Fix import conflicts for atf 0.9.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/atf/dist/atf-c/dynstr.c \
src/external/bsd/atf/dist/atf-c/fs.c
cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/atf/dist/atf-c/object.c \
src/external/bsd/atf/dist/atf-c/object.h
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/atf/dist/atf-c/tc.c
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/atf/dist/atf-compile/atf-compile.1 \
src/external/bsd/atf/dist/atf-compile/atf-compile.cpp \
src/external/bsd/atf/dist/atf-compile/atf-host-compile.sh
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/atf/dist/atf-run/atf-run.hooks
cvs rdiff -u -r1.2 -r0 src/external/bsd/atf/dist/atf-sh/atf.footer.subr
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/atf/dist/atf-sh/atf.header.subr \
src/external/bsd/atf/dist/atf-sh/atf.init.subr
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/atf/dist/atf-version/atf-version.cpp
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/atf/dist/data/atf-c++.pc.in \
src/external/bsd/atf/dist/data/atf-c.pc.in \
src/external/bsd/atf/dist/data/atf-run.hooks \
src/external/bsd/atf/dist/data/tests-results.css \
src/external/bsd/atf/dist/data/tests-results.dtd \
src/external/bsd/atf/dist/data/tests-results.xsl
cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/atf/dist/doc/roadmap.xml
cvs rdiff -u -r1.1.1.2 -r0 \
src/external/bsd/atf/dist/doc/standalone/roadmap.html
cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/atf/dist/doc/text/roadmap.txt
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/atf/dist/tests/atf/atf-c/d_include_object_h.c
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/atf/dist/tests/atf/atf-compile/Atffile \
src/external/bsd/atf/dist/tests/atf/atf-compile/h_mode.cpp \
src/external/bsd/atf/dist/tests/atf/atf-compile/t_integration.sh
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/atf/dist/tests/atf/data/Atffile
cvs rdiff -u -r1.1.1.2 -r0 \
src/external/bsd/atf/dist/tests/atf/data/t_pkg_config.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/dist/atf-c/dynstr.c
diff -u src/external/bsd/atf/dist/atf-c/dynstr.c:1.3 src/external/bsd/atf/dist/atf-c/dynstr.c:1.4
--- src/external/bsd/atf/dist/atf-c/dynstr.c:1.3 Tue Dec 22 13:36:56 2009
+++ src/external/bsd/atf/dist/atf-c/dynstr.c Fri Jun 4 08:32:14 2010
@@ -1,7 +1,7 @@
/*
* Automated Testing Framework (atf)
*
- * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
+ * Copyright (c) 2008, 2009, 2010 The NetBSD Foundation, Inc.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -29,6 +29,7 @@
#include errno.h
#include stdarg.h
+#include stdint.h
#include stdio.h
#include stdlib.h
#include string.h
@@ -121,22 +122,17 @@
{
atf_error_t err;
-atf_object_init(ad-m_object);
-
ad-m_data = (char *)malloc(sizeof(char));
if (ad-m_data == NULL) {
err = atf_no_memory_error();
-goto err_object;
+goto out;
}
ad-m_data[0] = '\0';
ad-m_datasize = 1;
ad-m_length = 0;
err = atf_no_error();
-goto out;
-err_object:
-atf_object_fini(ad-m_object);
out:
return err;
}
@@ -146,8 +142,6 @@
{
atf_error_t err;
-atf_object_init(ad-m_object);
-
ad-m_datasize = strlen(fmt) + 1;
ad-m_length = 0;
@@ -159,7 +153,7 @@
ad-m_data = (char *)malloc(ad-m_datasize);
if (ad-m_data == NULL) {
err = atf_no_memory_error();
-goto err_object;
+goto out;
}
va_copy(ap2, ap);
@@ -168,7 +162,7 @@
if (ret 0) {
free(ad-m_data);
err = atf_libc_error(errno, Cannot format string);
-goto err_object;
+goto out;
}
CVS commit: src/external/bsd/atf
Module Name:src
Committed By: jmmv
Date: Fri Jun 4 08:33:42 UTC 2010
Modified Files:
src/external/bsd/atf/etc/atf: Makefile
src/external/bsd/atf/lib/libatf-c: Makefile bconfig.h
src/external/bsd/atf/lib/libatf-c++: Makefile
src/external/bsd/atf/share: Makefile
src/external/bsd/atf/share/doc/atf: Makefile
src/external/bsd/atf/share/examples/atf: Makefile
src/external/bsd/atf/share/xml/atf: Makefile
src/external/bsd/atf/share/xsl/atf: Makefile
src/external/bsd/atf/tests/atf: Makefile
src/external/bsd/atf/tests/atf/atf-c: Makefile
src/external/bsd/atf/tests/atf/atf-c++: Makefile
src/external/bsd/atf/tests/atf/atf-run: Makefile
src/external/bsd/atf/tests/atf/atf-sh: Makefile
src/external/bsd/atf/usr.bin: Makefile
src/external/bsd/atf/usr.bin/atf-run: Makefile
src/external/bsd/atf/usr.bin/atf-version: Makefile
Added Files:
src/external/bsd/atf/usr.bin/atf-sh: Makefile
Removed Files:
src/external/bsd/atf/share/atf: Makefile
src/external/bsd/atf/tests/atf/atf-compile: Makefile
src/external/bsd/atf/tests/atf/data: Makefile
src/external/bsd/atf/usr.bin/atf-compile: Makefile
Log Message:
Adjust reachover makefiles for atf 0.9.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/atf/etc/atf/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/atf/lib/libatf-c/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/atf/lib/libatf-c/bconfig.h
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/atf/lib/libatf-c++/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/atf/share/Makefile
cvs rdiff -u -r1.1 -r0 src/external/bsd/atf/share/atf/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/atf/share/doc/atf/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/atf/share/examples/atf/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/atf/share/xml/atf/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/atf/share/xsl/atf/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/atf/tests/atf/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/atf/tests/atf/atf-c/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/atf/tests/atf/atf-c++/Makefile
cvs rdiff -u -r1.1 -r0 src/external/bsd/atf/tests/atf/atf-compile/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/atf/tests/atf/atf-run/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/atf/tests/atf/atf-sh/Makefile
cvs rdiff -u -r1.1 -r0 src/external/bsd/atf/tests/atf/data/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/atf/usr.bin/Makefile
cvs rdiff -u -r1.2 -r0 src/external/bsd/atf/usr.bin/atf-compile/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/atf/usr.bin/atf-run/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/usr.bin/atf-sh/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/atf/usr.bin/atf-version/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/etc/atf/Makefile
diff -u src/external/bsd/atf/etc/atf/Makefile:1.1 src/external/bsd/atf/etc/atf/Makefile:1.2
--- src/external/bsd/atf/etc/atf/Makefile:1.1 Mon Jan 19 07:13:03 2009
+++ src/external/bsd/atf/etc/atf/Makefile Fri Jun 4 08:33:40 2010
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2009/01/19 07:13:03 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/04 08:33:40 jmmv Exp $
.include bsd.own.mk
SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
-.PATH: ${SRCDIR}/data
+.PATH: ${SRCDIR}/atf-run/sample
CONFIGFILES= NetBSD.conf atf-run.hooks
FILESDIR= /etc/atf
Index: src/external/bsd/atf/lib/libatf-c/Makefile
diff -u src/external/bsd/atf/lib/libatf-c/Makefile:1.4 src/external/bsd/atf/lib/libatf-c/Makefile:1.5
--- src/external/bsd/atf/lib/libatf-c/Makefile:1.4 Sat May 8 08:12:33 2010
+++ src/external/bsd/atf/lib/libatf-c/Makefile Fri Jun 4 08:33:41 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2010/05/08 08:12:33 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2010/06/04 08:33:41 jmmv Exp $
NOLINT= # defined
@@ -44,7 +44,6 @@
io.c \
list.c \
map.c \
- object.c \
process.c \
sanity.c \
text.c \
@@ -68,7 +67,6 @@
list.h \
macros.h \
map.h \
- object.h \
process.h \
sanity.h \
tc.h \
@@ -82,7 +80,7 @@
INCS+= atf-c.h
INCSDIR_atf-c.h=/usr/include
-MAN= # empty
+MAN= atf-c-api.3
CLEANFILES+= defs.h
@@ -92,4 +90,18 @@
${.ALLSRC} ${.TARGET}.tmp
mv ${.TARGET}.tmp ${.TARGET}
+.if ${MKSHARE} != no
+FILES+= atf-c.pc
+FILESDIR= /usr/lib/pkgconfig
+
+realall: atf-c.pc
+atf-c.pc: Makefile atf-c.pc.in
+ ${TOOL_SED} -e 's,__ATF_VERSION__,0.9,g' \
+ -e 's,__CC__,gcc,g' \
+ -e 's,__INCLUDEDIR__,/usr/include,g' \
+ -e 's,__LIBDIR__,/usr/lib,g' \
+ ${SRCDIR}/atf-c/atf-c.pc.in atf-c.pc
+CLEANFILES+= atf-c.pc
+.endif
+
.include bsd.lib.mk
Index: src/external/bsd/atf/lib/libatf-c/bconfig.h
diff -u src/external/bsd/atf/lib/libatf-c/bconfig.h:1.3
CVS commit: src/tools
Module Name:src
Committed By: jmmv
Date: Fri Jun 4 08:34:35 UTC 2010
Modified Files:
src/tools: Makefile
Removed Files:
src/tools/atf-compile: Makefile
Log Message:
Bye bye atf-compile, you won't be missed.
To generate a diff of this commit:
cvs rdiff -u -r1.137 -r1.138 src/tools/Makefile
cvs rdiff -u -r1.7 -r0 src/tools/atf-compile/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/Makefile
diff -u src/tools/Makefile:1.137 src/tools/Makefile:1.138
--- src/tools/Makefile:1.137 Tue Mar 2 20:47:01 2010
+++ src/tools/Makefile Fri Jun 4 08:34:35 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.137 2010/03/02 20:47:01 darran Exp $
+# $NetBSD: Makefile,v 1.138 2010/06/04 08:34:35 jmmv Exp $
.include bsd.own.mk
@@ -54,7 +54,7 @@
.WAIT pax \
.WAIT ${TOOLCHAIN_BITS} \
${DTRACE_BITS} \
- asn1_compile atf-compile cat cksum compile_et config db \
+ asn1_compile cat cksum compile_et config db \
file lint1 \
makefs menuc mkcsmapper mkesdb mklocale mknod msgc \
.WAIT disklabel \
CVS commit: src/share/mk
Module Name:src
Committed By: jmmv
Date: Fri Jun 4 08:35:09 UTC 2010
Modified Files:
src/share/mk: bsd.README bsd.own.mk bsd.test.mk
Log Message:
Simplify build of shell-based test cases: atf-compile is gone.
To generate a diff of this commit:
cvs rdiff -u -r1.268 -r1.269 src/share/mk/bsd.README
cvs rdiff -u -r1.627 -r1.628 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.7 -r1.8 src/share/mk/bsd.test.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.README
diff -u src/share/mk/bsd.README:1.268 src/share/mk/bsd.README:1.269
--- src/share/mk/bsd.README:1.268 Wed May 26 14:52:10 2010
+++ src/share/mk/bsd.README Fri Jun 4 08:35:09 2010
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.README,v 1.268 2010/05/26 14:52:10 njoly Exp $
+# $NetBSD: bsd.README,v 1.269 2010/06/04 08:35:09 jmmv Exp $
# @(#)bsd.README 8.2 (Berkeley) 4/2/94
This is the README file for the make include files for the NetBSD
@@ -655,8 +655,6 @@
TOOL_ASN1_COMPILE ASN1 compiler. [asn1_compile]
-TOOL_ATF_COMPILE Generate POSIX shell test programs. [atf-compile]
-
TOOL_AWK Pattern-directed scanning/processing language. [awk]
TOOL_CAP_MKDB Create capability database. [cap_mkdb]
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.627 src/share/mk/bsd.own.mk:1.628
--- src/share/mk/bsd.own.mk:1.627 Tue Jun 1 23:29:10 2010
+++ src/share/mk/bsd.own.mk Fri Jun 4 08:35:09 2010
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.627 2010/06/01 23:29:10 joerg Exp $
+# $NetBSD: bsd.own.mk,v 1.628 2010/06/04 08:35:09 jmmv Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -227,7 +227,6 @@
TOOL_AMIGAELF2BB= ${TOOLDIR}/bin/${_TOOL_PREFIX}amiga-elf2bb
TOOL_AMIGATXLT= ${TOOLDIR}/bin/${_TOOL_PREFIX}amiga-txlt
TOOL_ASN1_COMPILE= ${TOOLDIR}/bin/${_TOOL_PREFIX}asn1_compile
-TOOL_ATF_COMPILE= ${TOOLDIR}/bin/${_TOOL_PREFIX}atf-compile
TOOL_AWK= ${TOOLDIR}/bin/${_TOOL_PREFIX}awk
TOOL_CAP_MKDB= ${TOOLDIR}/bin/${_TOOL_PREFIX}cap_mkdb
TOOL_CAT= ${TOOLDIR}/bin/${_TOOL_PREFIX}cat
@@ -304,7 +303,6 @@
TOOL_AMIGAELF2BB= amiga-elf2bb
TOOL_AMIGATXLT= amiga-txlt
TOOL_ASN1_COMPILE= asn1_compile
-TOOL_ATF_COMPILE= atf-compile
TOOL_AWK= awk
TOOL_CAP_MKDB= cap_mkdb
TOOL_CAT= cat
Index: src/share/mk/bsd.test.mk
diff -u src/share/mk/bsd.test.mk:1.7 src/share/mk/bsd.test.mk:1.8
--- src/share/mk/bsd.test.mk:1.7 Thu May 1 15:36:36 2008
+++ src/share/mk/bsd.test.mk Fri Jun 4 08:35:09 2010
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.test.mk,v 1.7 2008/05/01 15:36:36 jmmv Exp $
+# $NetBSD: bsd.test.mk,v 1.8 2010/06/04 08:35:09 jmmv Exp $
#
.include bsd.init.mk
@@ -37,22 +37,15 @@
CLEANFILES+= ${_T} ${_T}.tmp
TESTS_SH_SRC_${_T}?= ${_T}.sh
-${_T}: ${TESTS_SH_SRC_${_T}} atf-compile-cookie
+${_T}: ${TESTS_SH_SRC_${_T}}
${_MKTARGET_BUILD}
- ${TOOL_ATF_COMPILE} -o ${.TARGET}.tmp ${.ALLSRC}
+ echo '#! /usr/bin/atf-sh' ${.TARGET}.tmp
+ cat ${.ALLSRC} ${.TARGET}.tmp
+ chmod +x ${.TARGET}.tmp
mv ${.TARGET}.tmp ${.TARGET}
. endfor
.endif
-CLEANFILES+= atf-compile-cookie
-.if ${USETOOLS} == yes
-atf-compile-cookie: ${TOOL_ATF_COMPILE}
- touch atf-compile-cookie
-.else
-atf-compile-cookie:
- test -f atf-compile-cookie || touch atf-compile-cookie
-.endif
-
.if !defined(NOATFFILE)
FILES+= Atffile
FILESDIR_Atffile= ${TESTSDIR}
CVS commit: src/etc/mtree
Module Name:src Committed By: jmmv Date: Fri Jun 4 08:35:36 UTC 2010 Modified Files: src/etc/mtree: NetBSD.dist.base Log Message: Remove directories not required by atf-0.9 any more. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/etc/mtree/NetBSD.dist.base Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/mtree/NetBSD.dist.base diff -u src/etc/mtree/NetBSD.dist.base:1.19 src/etc/mtree/NetBSD.dist.base:1.20 --- src/etc/mtree/NetBSD.dist.base:1.19 Sat May 8 08:13:12 2010 +++ src/etc/mtree/NetBSD.dist.base Fri Jun 4 08:35:35 2010 @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.base,v 1.19 2010/05/08 08:13:12 jmmv Exp $ +# $NetBSD: NetBSD.dist.base,v 1.20 2010/06/04 08:35:35 jmmv Exp $ # @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93 # Do not customize this file as it may be overwritten on upgrades. @@ -193,7 +193,6 @@ ./usr/libdata/debug/usr/tests/atf ./usr/libdata/debug/usr/tests/atf/atf-c ./usr/libdata/debug/usr/tests/atf/atf-c++ -./usr/libdata/debug/usr/tests/atf/atf-compile ./usr/libdata/debug/usr/tests/atf/atf-report ./usr/libdata/debug/usr/tests/atf/atf-run ./usr/libdata/debug/usr/tests/atf/formats @@ -1086,12 +1085,10 @@ ./usr/tests/atf/atf-c++ ./usr/tests/atf/atf-check ./usr/tests/atf/atf-cleanup -./usr/tests/atf/atf-compile ./usr/tests/atf/atf-config ./usr/tests/atf/atf-report ./usr/tests/atf/atf-run ./usr/tests/atf/atf-sh -./usr/tests/atf/data ./usr/tests/atf/formats ./usr/tests/atf/test_programs ./usr/tests/crypto
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: jmmv Date: Fri Jun 4 08:37:10 UTC 2010 Modified Files: src/distrib/sets/lists/base: mi src/distrib/sets/lists/comp: mi src/distrib/sets/lists/man: mi src/distrib/sets/lists/tests: mi Log Message: Adjust file lists for atf-0.9. Most notably, some files are gone for good! To generate a diff of this commit: cvs rdiff -u -r1.865 -r1.866 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.1455 -r1.1456 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.1214 -r1.1215 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.77 -r1.78 src/distrib/sets/lists/tests/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/mi diff -u src/distrib/sets/lists/base/mi:1.865 src/distrib/sets/lists/base/mi:1.866 --- src/distrib/sets/lists/base/mi:1.865 Sat May 8 08:14:37 2010 +++ src/distrib/sets/lists/base/mi Fri Jun 4 08:37:09 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.865 2010/05/08 08:14:37 jmmv Exp $ +# $NetBSD: mi,v 1.866 2010/06/04 08:37:09 jmmv Exp $ # # Note: Don't delete entries from here - mark them as obsolete instead, # unless otherwise stated below. @@ -332,6 +332,7 @@ ./usr/bin/atf-configbase-atf-bin atf ./usr/bin/atf-reportbase-atf-bin atf ./usr/bin/atf-runbase-atf-bin atf +./usr/bin/atf-shbase-atf-bin atf ./usr/bin/atf-versionbase-atf-bin atf ./usr/bin/atq base-cron-bin ./usr/bin/atrm base-cron-bin @@ -1363,9 +1364,10 @@ ./usr/share/atf base-atf-share ./usr/share/atf/atf-run.hooks base-atf-bin share,atf ./usr/share/atf/atf.config.subr base-obsolete obsolete -./usr/share/atf/atf.footer.subr base-atf-share share,atf -./usr/share/atf/atf.header.subr base-atf-share share,atf -./usr/share/atf/atf.init.subr base-atf-share share,atf +./usr/share/atf/atf.footer.subr base-obsolete obsolete +./usr/share/atf/atf.header.subr base-obsolete obsolete +./usr/share/atf/atf.init.subr base-obsolete obsolete +./usr/share/atf/libatf-sh.subr base-atf-share atf ./usr/share/calendarbase-calendar-share ./usr/share/calendar/calendar.birthday base-calendar-share share ./usr/share/calendar/calendar.christian base-calendar-share share Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1455 src/distrib/sets/lists/comp/mi:1.1456 --- src/distrib/sets/lists/comp/mi:1.1455 Tue Jun 1 13:52:07 2010 +++ src/distrib/sets/lists/comp/mi Fri Jun 4 08:37:09 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1455 2010/06/01 13:52:07 tnozaki Exp $ +# $NetBSD: mi,v 1.1456 2010/06/04 08:37:09 jmmv Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -7,7 +7,7 @@ ./usr/bin/ar comp-util-bin binutils ./usr/bin/as comp-util-bin binutils ./usr/bin/asa comp-fortran-bin -./usr/bin/atf-compilecomp-atf-bin atf +./usr/bin/atf-compilecomp-obsolete obsolete ./usr/bin/c++ comp-cxx-bin gcccmds ./usr/bin/c++filtcomp-cxx-bin binutils ./usr/bin/c89 comp-c-bin @@ -153,7 +153,7 @@ ./usr/include/atf-c/list.h comp-atf-include atf ./usr/include/atf-c/macros.h comp-atf-include atf ./usr/include/atf-c/map.h comp-atf-include atf -./usr/include/atf-c/object.h comp-atf-include atf +./usr/include/atf-c/object.h comp-obsolete obsolete ./usr/include/atf-c/process.h comp-atf-include atf ./usr/include/atf-c/sanity.h comp-atf-include atf ./usr/include/atf-c/signals.h comp-atf-include obsolete @@ -2971,10 +2971,11 @@ ./usr/libdata/debug/usr/bin/asa.debug comp-fortran-debug debug ./usr/libdata/debug/usr/bin/at.debug comp-cron-debug debug ./usr/libdata/debug/usr/bin/atf-check.debug comp-atf-debug atf,debug -./usr/libdata/debug/usr/bin/atf-compile.debug comp-atf-debug atf,debug +./usr/libdata/debug/usr/bin/atf-compile.debug comp-obsolete obsolete ./usr/libdata/debug/usr/bin/atf-config.debug comp-atf-debug atf,debug ./usr/libdata/debug/usr/bin/atf-report.debug comp-atf-debug atf,debug ./usr/libdata/debug/usr/bin/atf-run.debug comp-atf-debug atf,debug +./usr/libdata/debug/usr/bin/atf-sh.debug comp-atf-debug atf,debug ./usr/libdata/debug/usr/bin/atf-version.debug comp-atf-debug atf,debug ./usr/libdata/debug/usr/bin/audioctl.debug comp-audio-debug debug ./usr/libdata/debug/usr/bin/audioplay.debug comp-audio-debug debug Index: src/distrib/sets/lists/man/mi diff -u src/distrib/sets/lists/man/mi:1.1214 src/distrib/sets/lists/man/mi:1.1215 --- src/distrib/sets/lists/man/mi:1.1214 Tue Jun 1 23:29:09 2010 +++ src/distrib/sets/lists/man/mi Fri Jun 4 08:37:10 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1214 2010/06/01 23:29:09 joerg Exp $ +# $NetBSD: mi,v 1.1215 2010/06/04 08:37:10 jmmv Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -51,13 +51,14 @@ ./usr/share/man/cat1/atari/msconfig.0 man-sysutil-catman .cat ./usr/share/man/cat1/atf-check.0 man-atf-catman
CVS commit: src/doc
Module Name:src Committed By: jmmv Date: Fri Jun 4 08:40:24 UTC 2010 Modified Files: src/doc: CHANGES Log Message: Note import of atf 0.9. To generate a diff of this commit: cvs rdiff -u -r1.1397 -r1.1398 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1397 src/doc/CHANGES:1.1398 --- src/doc/CHANGES:1.1397 Fri May 28 04:12:58 2010 +++ src/doc/CHANGES Fri Jun 4 08:40:24 2010 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1397 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1398 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -622,3 +622,4 @@ [mrg 20100523] X11: Added support for xf86-video-geode and xf86-video-openchrome. [mrg 20100527] + atf(7): Import 0.9. [jmmv 20100604]
CVS commit: src/external/bsd/dhcpcd/dist
Module Name:src Committed By: roy Date: Fri Jun 4 09:08:08 UTC 2010 Update of /cvsroot/src/external/bsd/dhcpcd/dist In directory ivanova.netbsd.org:/tmp/cvs-serv7074 Log Message: Import dhcpcd-5.2.4 with the following changes: * Fix crash when using clientid and the interface re-configures * log the pid of dhcpcd * Indicate server IP received message from even if server ID not present * Fix crashes on IPv4LL failure and add more logging Status: Vendor Tag: roy Release Tags: dhcpcd-5-2-4 U src/external/bsd/dhcpcd/dist/arp.c U src/external/bsd/dhcpcd/dist/bind.c U src/external/bsd/dhcpcd/dist/common.c U src/external/bsd/dhcpcd/dist/control.c U src/external/bsd/dhcpcd/dist/dhcp.c U src/external/bsd/dhcpcd/dist/dhcpcd.c U src/external/bsd/dhcpcd/dist/duid.c U src/external/bsd/dhcpcd/dist/eloop.c U src/external/bsd/dhcpcd/dist/if-options.c U src/external/bsd/dhcpcd/dist/if-pref.c U src/external/bsd/dhcpcd/dist/ipv4ll.c U src/external/bsd/dhcpcd/dist/net.c U src/external/bsd/dhcpcd/dist/signals.c U src/external/bsd/dhcpcd/dist/configure.c U src/external/bsd/dhcpcd/dist/bpf.c U src/external/bsd/dhcpcd/dist/if-bsd.c U src/external/bsd/dhcpcd/dist/platform-bsd.c U src/external/bsd/dhcpcd/dist/dhcpcd.conf U src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.8.in U src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.in U src/external/bsd/dhcpcd/dist/dhcpcd.8.in U src/external/bsd/dhcpcd/dist/dhcpcd.conf.5.in U src/external/bsd/dhcpcd/dist/arp.h U src/external/bsd/dhcpcd/dist/bind.h U src/external/bsd/dhcpcd/dist/bpf-filter.h U src/external/bsd/dhcpcd/dist/common.h U src/external/bsd/dhcpcd/dist/config.h U src/external/bsd/dhcpcd/dist/configure.h U src/external/bsd/dhcpcd/dist/control.h U src/external/bsd/dhcpcd/dist/defs.h U src/external/bsd/dhcpcd/dist/dhcp.h U src/external/bsd/dhcpcd/dist/dhcpcd.h U src/external/bsd/dhcpcd/dist/duid.h U src/external/bsd/dhcpcd/dist/eloop.h U src/external/bsd/dhcpcd/dist/if-options.h U src/external/bsd/dhcpcd/dist/if-pref.h U src/external/bsd/dhcpcd/dist/ipv4ll.h U src/external/bsd/dhcpcd/dist/net.h U src/external/bsd/dhcpcd/dist/platform.h U src/external/bsd/dhcpcd/dist/signals.h U src/external/bsd/dhcpcd/dist/compat/getline.c U src/external/bsd/dhcpcd/dist/compat/getline.h U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/01-test U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/10-mtu U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/20-resolv.conf U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/29-lookup-hostname U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/30-hostname U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/50-ntp.conf U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/50-ypbind No conflicts created by this import
CVS commit: src/doc
Module Name:src Committed By: roy Date: Fri Jun 4 09:10:53 UTC 2010 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: Import dhcpcd-5.2.4 To generate a diff of this commit: cvs rdiff -u -r1.762 -r1.763 src/doc/3RDPARTY cvs rdiff -u -r1.1398 -r1.1399 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.762 src/doc/3RDPARTY:1.763 --- src/doc/3RDPARTY:1.762 Wed Jun 2 02:24:46 2010 +++ src/doc/3RDPARTY Fri Jun 4 09:10:53 2010 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.762 2010/06/02 02:24:46 jruoho Exp $ +# $NetBSD: 3RDPARTY,v 1.763 2010/06/04 09:10:53 roy Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -268,8 +268,8 @@ top of the current tree. Package: dhcpcd -Version: 5.2.2 -Current Vers: 5.2.2 +Version: 5.2.4 +Current Vers: 5.2.4 Maintainer: roy Archive Site: ftp://roy.marples.name/pub/dhcpcd/ Home Page: http://roy.marples.name/projects/dhcpcd/ Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1398 src/doc/CHANGES:1.1399 --- src/doc/CHANGES:1.1398 Fri Jun 4 08:40:24 2010 +++ src/doc/CHANGES Fri Jun 4 09:10:53 2010 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1398 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1399 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -623,3 +623,4 @@ X11: Added support for xf86-video-geode and xf86-video-openchrome. [mrg 20100527] atf(7): Import 0.9. [jmmv 20100604] + dhcpcd(8): Import dhcpcd-5.2.4. [roy 20100604]
CVS commit: src/sys/arch/hppa/hppa
Module Name:src
Committed By: skrll
Date: Fri Jun 4 09:25:18 UTC 2010
Modified Files:
src/sys/arch/hppa/hppa: db_interface.c fpu.c kgdb_hppa.c
Log Message:
Misc KNF.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/hppa/hppa/db_interface.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/hppa/hppa/fpu.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/hppa/hppa/kgdb_hppa.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hppa/hppa/db_interface.c
diff -u src/sys/arch/hppa/hppa/db_interface.c:1.21 src/sys/arch/hppa/hppa/db_interface.c:1.22
--- src/sys/arch/hppa/hppa/db_interface.c:1.21 Thu Mar 11 07:14:22 2010
+++ src/sys/arch/hppa/hppa/db_interface.c Fri Jun 4 09:25:18 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: db_interface.c,v 1.21 2010/03/11 07:14:22 skrll Exp $ */
+/* $NetBSD: db_interface.c,v 1.22 2010/06/04 09:25:18 skrll Exp $ */
/* $OpenBSD: db_interface.c,v 1.16 2001/03/22 23:31:45 mickey Exp $ */
@@ -29,7 +29,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: db_interface.c,v 1.21 2010/03/11 07:14:22 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: db_interface.c,v 1.22 2010/06/04 09:25:18 skrll Exp $);
#include sys/param.h
#include sys/systm.h
@@ -187,7 +187,7 @@
splx(s);
*regs = ddb_regs;
- return (1);
+ return 1;
}
/*
@@ -197,5 +197,5 @@
int
db_valid_breakpoint(db_addr_t addr)
{
- return (1);
+ return 1;
}
Index: src/sys/arch/hppa/hppa/fpu.c
diff -u src/sys/arch/hppa/hppa/fpu.c:1.20 src/sys/arch/hppa/hppa/fpu.c:1.21
--- src/sys/arch/hppa/hppa/fpu.c:1.20 Tue Mar 16 16:20:19 2010
+++ src/sys/arch/hppa/hppa/fpu.c Fri Jun 4 09:25:18 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu.c,v 1.20 2010/03/16 16:20:19 skrll Exp $ */
+/* $NetBSD: fpu.c,v 1.21 2010/06/04 09:25:18 skrll Exp $ */
/*
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: fpu.c,v 1.20 2010/03/16 16:20:19 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: fpu.c,v 1.21 2010/06/04 09:25:18 skrll Exp $);
#include sys/param.h
#include sys/systm.h
@@ -273,7 +273,7 @@
* segfault.
*/
if (inst_s != pcb-pcb_space)
- return (EFAULT);
+ return EFAULT;
/* See whether or not this is a doubleword load/store. */
log2size = (inst OPCODE_DOUBLE) ? 3 : 2;
Index: src/sys/arch/hppa/hppa/kgdb_hppa.c
diff -u src/sys/arch/hppa/hppa/kgdb_hppa.c:1.6 src/sys/arch/hppa/hppa/kgdb_hppa.c:1.7
--- src/sys/arch/hppa/hppa/kgdb_hppa.c:1.6 Sat Dec 24 20:07:04 2005
+++ src/sys/arch/hppa/hppa/kgdb_hppa.c Fri Jun 4 09:25:18 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: kgdb_hppa.c,v 1.6 2005/12/24 20:07:04 perry Exp $ */
+/* $NetBSD: kgdb_hppa.c,v 1.7 2010/06/04 09:25:18 skrll Exp $ */
/*
* Copyright (c) 1990, 1993
@@ -45,7 +45,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kgdb_hppa.c,v 1.6 2005/12/24 20:07:04 perry Exp $);
+__KERNEL_RCSID(0, $NetBSD: kgdb_hppa.c,v 1.7 2010/06/04 09:25:18 skrll Exp $);
#include sys/param.h
#include sys/kgdb.h
@@ -61,7 +61,7 @@
{
/* Just let the trap handler deal with it. */
- return (1);
+ return 1;
}
/*
@@ -128,7 +128,7 @@
sigval = SIGILL;
break;
}
- return (sigval);
+ return sigval;
}
/*
CVS commit: src/external/mit/xorg/lib/xkeyboard-config
Module Name:src Committed By: ghen Date: Fri Jun 4 10:22:25 UTC 2010 Modified Files: src/external/mit/xorg/lib/xkeyboard-config: Makefile Log Message: A suggestion from veego to fix it (taken from ../../include/fontsproto). To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/xkeyboard-config/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/lib/xkeyboard-config/Makefile diff -u src/external/mit/xorg/lib/xkeyboard-config/Makefile:1.5 src/external/mit/xorg/lib/xkeyboard-config/Makefile:1.6 --- src/external/mit/xorg/lib/xkeyboard-config/Makefile:1.5 Thu Jun 3 20:48:48 2010 +++ src/external/mit/xorg/lib/xkeyboard-config/Makefile Fri Jun 4 10:22:25 2010 @@ -1,8 +1,11 @@ -# $NetBSD: Makefile,v 1.5 2010/06/03 20:48:48 ghen Exp $ +# $NetBSD: Makefile,v 1.6 2010/06/04 10:22:25 ghen Exp $ SUBDIR= compat geometry keycodes keymap rules semantics symbols types +NOOBJ= # defined + PKGCONFIG= xkeyboard-config .include bsd.x11.mk +.include bsd.prog.mk .include bsd.subdir.mk
CVS commit: src/crypto/dist/ipsec-tools/src/setkey
Module Name:src
Committed By: vanhu
Date: Fri Jun 4 13:06:03 UTC 2010
Modified Files:
src/crypto/dist/ipsec-tools/src/setkey: parse.y setkey.8 token.l
Log Message:
Added support for spdupdate command in setkey
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/crypto/dist/ipsec-tools/src/setkey/parse.y
cvs rdiff -u -r1.23 -r1.24 src/crypto/dist/ipsec-tools/src/setkey/setkey.8
cvs rdiff -u -r1.14 -r1.15 src/crypto/dist/ipsec-tools/src/setkey/token.l
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/dist/ipsec-tools/src/setkey/parse.y
diff -u src/crypto/dist/ipsec-tools/src/setkey/parse.y:1.12 src/crypto/dist/ipsec-tools/src/setkey/parse.y:1.13
--- src/crypto/dist/ipsec-tools/src/setkey/parse.y:1.12 Fri Mar 6 11:45:03 2009
+++ src/crypto/dist/ipsec-tools/src/setkey/parse.y Fri Jun 4 13:06:03 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.y,v 1.12 2009/03/06 11:45:03 tteras Exp $ */
+/* $NetBSD: parse.y,v 1.13 2010/06/04 13:06:03 vanhu Exp $ */
/* $KAME: parse.y,v 1.81 2003/07/01 04:01:48 itojun Exp $ */
@@ -131,7 +131,7 @@
%token F_LIFEBYTE_HARD F_LIFEBYTE_SOFT
%token DECSTRING QUOTEDSTRING HEXSTRING STRING ANY
/* SPD management */
-%token SPDADD SPDDELETE SPDDUMP SPDFLUSH
+%token SPDADD SPDUPDATE SPDDELETE SPDDUMP SPDFLUSH
%token F_POLICY PL_REQUESTS
%token F_AIFLAGS
%token TAGGED
@@ -170,6 +170,7 @@
| dump_command
| exit_command
| spdadd_command
+ | spdupdate_command
| spddelete_command
| spddump_command
| spdflush_command
@@ -572,6 +573,7 @@
/* definition about command for SPD management */
/* spdadd */
spdadd_command
+ /* XXX merge with spdupdate ??? */
: SPDADD ipaddropts STRING prefix portstr STRING prefix portstr upper_spec upper_misc_spec context_spec policy_spec EOT
{
int status;
@@ -624,6 +626,60 @@
}
;
+spdupdate_command
+ /* XXX merge with spdadd ??? */
+ : SPDUPDATE ipaddropts STRING prefix portstr STRING prefix portstr upper_spec upper_misc_spec context_spec policy_spec EOT
+ {
+ int status;
+ struct addrinfo *src, *dst;
+
+#ifdef HAVE_PFKEY_POLICY_PRIORITY
+ last_msg_type = SADB_X_SPDUPDATE;
+#endif
+
+ /* fixed port fields if ulp is icmp */
+ if ($10.buf != NULL) {
+if (($9 != IPPROTO_ICMPV6)
+ ($9 != IPPROTO_ICMP)
+ ($9 != IPPROTO_MH))
+ return -1;
+free($5.buf);
+free($8.buf);
+if (fix_portstr($10, $5, $8))
+ return -1;
+ }
+
+ src = parse_addr($3.buf, $5.buf);
+ dst = parse_addr($6.buf, $8.buf);
+ if (!src || !dst) {
+/* yyerror is already called */
+return -1;
+ }
+ if (src-ai_next || dst-ai_next) {
+yyerror(multiple address specified);
+freeaddrinfo(src);
+freeaddrinfo(dst);
+return -1;
+ }
+
+ status = setkeymsg_spdaddr(SADB_X_SPDUPDATE, $9, $12,
+ src, $4, dst, $7);
+ freeaddrinfo(src);
+ freeaddrinfo(dst);
+ if (status 0)
+return -1;
+ }
+ | SPDUPDATE TAGGED QUOTEDSTRING policy_spec EOT
+ {
+ int status;
+
+ status = setkeymsg_spdaddr_tag(SADB_X_SPDUPDATE,
+ $3.buf, $4);
+ if (status 0)
+return -1;
+ }
+ ;
+
spddelete_command
: SPDDELETE ipaddropts STRING prefix portstr STRING prefix portstr upper_spec upper_misc_spec context_spec policy_spec EOT
{
Index: src/crypto/dist/ipsec-tools/src/setkey/setkey.8
diff -u src/crypto/dist/ipsec-tools/src/setkey/setkey.8:1.23 src/crypto/dist/ipsec-tools/src/setkey/setkey.8:1.24
--- src/crypto/dist/ipsec-tools/src/setkey/setkey.8:1.23 Fri Mar 5 06:47:58 2010
+++ src/crypto/dist/ipsec-tools/src/setkey/setkey.8 Fri Jun 4 13:06:03 2010
@@ -1,4 +1,4 @@
-.\ $NetBSD: setkey.8,v 1.23 2010/03/05 06:47:58 tteras Exp $
+.\ $NetBSD: setkey.8,v 1.24 2010/06/04 13:06:03 vanhu Exp $
.\
.\ Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
.\ All rights reserved.
@@ -195,6 +195,15 @@
.Ar tag
must be a string surrounded by double quotes.
.\
+.It Li spdupdate Oo Fl 46n Oc Ar src_range Ar dst_range Ar upperspec \
+Ar label Ar policy Li ;
+Updates an SPD entry.
+.\
+.It Li spdupdate tagged Ar tag Ar policy Li ;
+Update an SPD entry based on a PF tag.
+.Ar tag
+must be a string surrounded by double quotes.
+.\
.It Li spddelete Oo Fl 46n Oc Ar src_range Ar dst_range Ar upperspec \
Fl P Ar direction Li ;
Delete an SPD entry.
Index: src/crypto/dist/ipsec-tools/src/setkey/token.l
diff -u src/crypto/dist/ipsec-tools/src/setkey/token.l:1.14 src/crypto/dist/ipsec-tools/src/setkey/token.l:1.15
--- src/crypto/dist/ipsec-tools/src/setkey/token.l:1.14 Thu Oct 29 14:34:27 2009
+++ src/crypto/dist/ipsec-tools/src/setkey/token.l Fri Jun 4 13:06:03 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: token.l,v 1.14 2009/10/29 14:34:27 christos Exp $ */
+/* $NetBSD: token.l,v 1.15 2010/06/04 13:06:03 vanhu Exp $ */
/* $KAME: token.l,v 1.44 2003/10/21 07:20:58 itojun Exp $ */
@@ -127,6 +127,7 @@
/* for management SPD */
spdadd { return(SPDADD); }
+spdupdate {
CVS commit: src
Module Name:src Committed By: jmmv Date: Fri Jun 4 15:11:31 UTC 2010 Modified Files: src: UPDATING Log Message: atf 0.9 includes a backwards incompatible change that requires rebuilding the sh tests. Add a note to tell users to clean up the old files, as otherwise the rebuilds will not be triggered. To generate a diff of this commit: cvs rdiff -u -r1.212 -r1.213 src/UPDATING Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/UPDATING diff -u src/UPDATING:1.212 src/UPDATING:1.213 --- src/UPDATING:1.212 Sat May 22 11:10:59 2010 +++ src/UPDATING Fri Jun 4 15:11:31 2010 @@ -1,4 +1,4 @@ -$NetBSD: UPDATING,v 1.212 2010/05/22 11:10:59 mrg Exp $ +$NetBSD: UPDATING,v 1.213 2010/06/04 15:11:31 jmmv 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,12 @@ Recent changes: ^^^ +20100604: + The update of ATF to 0.9 causes old tests written in shell to fail + unless they are rebuilt. If you are building with MKUPDATE=yes, + you need to clean the src/external/bsd/atf/tests/ and the src/tests/ + trees by hand. + 20100522: Recent Xorg updates in xsrc/external/mit/ will cause various build problems. Delete your entire DESTDIR and OBJDIR if you have any
CVS commit: src/sys/kern
Module Name:src
Committed By: njoly
Date: Fri Jun 4 16:32:01 UTC 2010
Modified Files:
src/sys/kern: syscalls.master
Log Message:
Rumpify pathconf(2)/fpathconf(2)
ok from pooka@
To generate a diff of this commit:
cvs rdiff -u -r1.233 -r1.234 src/sys/kern/syscalls.master
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/syscalls.master
diff -u src/sys/kern/syscalls.master:1.233 src/sys/kern/syscalls.master:1.234
--- src/sys/kern/syscalls.master:1.233 Wed Apr 21 16:17:04 2010
+++ src/sys/kern/syscalls.master Fri Jun 4 16:32:00 2010
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.233 2010/04/21 16:17:04 pooka Exp $
+ $NetBSD: syscalls.master,v 1.234 2010/06/04 16:32:00 njoly Exp $
; @(#)syscalls.master 8.2 (Berkeley) 1/13/94
@@ -368,8 +368,8 @@
189 COMPAT_12 MODULAR { int|sys||fstat(int fd, struct stat12 *sb); } fstat12
190 COMPAT_12 MODULAR { int|sys||lstat(const char *path, \
struct stat12 *ub); } lstat12
-191 STD { long|sys||pathconf(const char *path, int name); }
-192 STD { long|sys||fpathconf(int fd, int name); }
+191 STD RUMP { long|sys||pathconf(const char *path, int name); }
+192 STD RUMP { long|sys||fpathconf(int fd, int name); }
193 UNIMPL
194 STD RUMP { int|sys||getrlimit(int which, \
struct rlimit *rlp); }
CVS commit: src/sys/rump
Module Name:src
Committed By: njoly
Date: Fri Jun 4 16:33:32 UTC 2010
Modified Files:
src/sys/rump/include/rump: rump_syscalls.h
src/sys/rump/librump/rumpkern: rump_syscalls.c
Log Message:
Regen for pathconf/fpathconf rumpification.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/rump/include/rump/rump_syscalls.h
cvs rdiff -u -r1.44 -r1.45 src/sys/rump/librump/rumpkern/rump_syscalls.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/include/rump/rump_syscalls.h
diff -u src/sys/rump/include/rump/rump_syscalls.h:1.24 src/sys/rump/include/rump/rump_syscalls.h:1.25
--- src/sys/rump/include/rump/rump_syscalls.h:1.24 Mon May 17 12:37:20 2010
+++ src/sys/rump/include/rump/rump_syscalls.h Fri Jun 4 16:33:32 2010
@@ -1,10 +1,10 @@
-/* $NetBSD: rump_syscalls.h,v 1.24 2010/05/17 12:37:20 njoly Exp $ */
+/* $NetBSD: rump_syscalls.h,v 1.25 2010/06/04 16:33:32 njoly Exp $ */
/*
* System call protos in rump namespace.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.233 2010/04/21 16:17:04 pooka Exp
+ * created from NetBSD: syscalls.master,v 1.234 2010/06/04 16:32:00 njoly Exp
*/
#ifndef _RUMP_RUMP_SYSCALLS_H_
@@ -69,6 +69,8 @@
int rump_sys_nfssvc(int, void *);
ssize_t rump_sys_pread(int, void *, size_t, off_t);
ssize_t rump_sys_pwrite(int, const void *, size_t, off_t);
+long rump_sys_pathconf(const char *, int);
+long rump_sys_fpathconf(int, int);
int rump_sys_getrlimit(int, struct rlimit *);
int rump_sys_setrlimit(int, const struct rlimit *);
off_t rump_sys_lseek(int, off_t, int);
Index: src/sys/rump/librump/rumpkern/rump_syscalls.c
diff -u src/sys/rump/librump/rumpkern/rump_syscalls.c:1.44 src/sys/rump/librump/rumpkern/rump_syscalls.c:1.45
--- src/sys/rump/librump/rumpkern/rump_syscalls.c:1.44 Tue May 11 20:11:47 2010
+++ src/sys/rump/librump/rumpkern/rump_syscalls.c Fri Jun 4 16:33:32 2010
@@ -1,14 +1,14 @@
-/* $NetBSD: rump_syscalls.c,v 1.44 2010/05/11 20:11:47 pooka Exp $ */
+/* $NetBSD: rump_syscalls.c,v 1.45 2010/06/04 16:33:32 njoly Exp $ */
/*
* System call vector and marshalling for rump.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.233 2010/04/21 16:17:04 pooka Exp
+ * created from NetBSD: syscalls.master,v 1.234 2010/06/04 16:32:00 njoly Exp
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rump_syscalls.c,v 1.44 2010/05/11 20:11:47 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: rump_syscalls.c,v 1.45 2010/06/04 16:33:32 njoly Exp $);
#include sys/types.h
#include sys/param.h
@@ -1106,6 +1106,48 @@
}
__weak_alias(sys_pwrite,rump_enosys);
+long rump_sys_pathconf(const char *, int);
+long
+rump_sys_pathconf(const char * path, int name)
+{
+ register_t rval[2] = {0, 0};
+ int error = 0;
+ struct sys_pathconf_args callarg;
+
+ SPARG(callarg, path) = path;
+ SPARG(callarg, name) = name;
+
+ error = rump_sysproxy(SYS_pathconf, rump_sysproxy_arg,
+ (uint8_t *)callarg, sizeof(callarg), rval);
+ if (error) {
+ rval[0] = -1;
+ rumpuser_seterrno(error);
+ }
+ return rval[0];
+}
+__weak_alias(sys_pathconf,rump_enosys);
+
+long rump_sys_fpathconf(int, int);
+long
+rump_sys_fpathconf(int fd, int name)
+{
+ register_t rval[2] = {0, 0};
+ int error = 0;
+ struct sys_fpathconf_args callarg;
+
+ SPARG(callarg, fd) = fd;
+ SPARG(callarg, name) = name;
+
+ error = rump_sysproxy(SYS_fpathconf, rump_sysproxy_arg,
+ (uint8_t *)callarg, sizeof(callarg), rval);
+ if (error) {
+ rval[0] = -1;
+ rumpuser_seterrno(error);
+ }
+ return rval[0];
+}
+__weak_alias(sys_fpathconf,rump_enosys);
+
int rump_sys_getrlimit(int, struct rlimit *);
int
rump_sys_getrlimit(int which, struct rlimit * rlp)
@@ -2913,10 +2955,10 @@
(sy_call_t *)sys_nomodule }, /* 189 = unrumped */
{ 0, 0, 0,
(sy_call_t *)sys_nomodule }, /* 190 = unrumped */
- { 0, 0, 0,
- (sy_call_t *)rump_enosys }, /* 191 = unrumped */
- { 0, 0, 0,
- (sy_call_t *)rump_enosys }, /* 192 = unrumped */
+ { ns(struct sys_pathconf_args), 0,
+ (sy_call_t *)sys_pathconf }, /* 191 = pathconf */
+ { ns(struct sys_fpathconf_args), 0,
+ (sy_call_t *)sys_fpathconf }, /* 192 = fpathconf */
{ 0, 0, 0,
(sy_call_t *)rump_enosys }, /* 193 = unimplemented */
{ ns(struct sys_getrlimit_args), 0,
CVS commit: src/etc
Module Name:src
Committed By: christos
Date: Fri Jun 4 18:42:32 UTC 2010
Modified Files:
src/etc: man.conf
Log Message:
Add machine class manual paths. No manual pages have moved yet.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/etc/man.conf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/man.conf
diff -u src/etc/man.conf:1.23 src/etc/man.conf:1.24
--- src/etc/man.conf:1.23 Sun Nov 16 20:31:35 2008
+++ src/etc/man.conf Fri Jun 4 14:42:32 2010
@@ -1,4 +1,4 @@
-# $NetBSD: man.conf,v 1.23 2008/11/17 01:31:35 hubertf Exp $
+# $NetBSD: man.conf,v 1.24 2010/06/04 18:42:32 christos Exp $
# Sheer, raging paranoia...
_version BSD.2
@@ -56,3 +56,7 @@
9 {cat,man}9
l {cat,man}l
n {cat,man}n
+
+# machine classes per machine
+_i386 x86
+_amd64 x86
CVS commit: src/etc
Module Name:src
Committed By: christos
Date: Fri Jun 4 18:42:55 UTC 2010
Modified Files:
src/etc: rc rc.subr
Log Message:
print human readable exit code.
To generate a diff of this commit:
cvs rdiff -u -r1.164 -r1.165 src/etc/rc
cvs rdiff -u -r1.81 -r1.82 src/etc/rc.subr
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/rc
diff -u src/etc/rc:1.164 src/etc/rc:1.165
--- src/etc/rc:1.164 Fri Sep 11 14:17:04 2009
+++ src/etc/rc Fri Jun 4 14:42:54 2010
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: rc,v 1.164 2009/09/11 18:17:04 apb Exp $
+# $NetBSD: rc,v 1.165 2010/06/04 18:42:54 christos Exp $
#
# rc --
# Run the scripts in /etc/rc.d with rcorder, and log output
@@ -270,7 +270,7 @@
# If the command failed, report it, and add it to a list.
if [ $2 != 0 ]; then
rc_failures=${rc_failures}${rc_failures:+ }$1
- msg=$1 reported failure status $2
+ msg=$1 $(human_exit_code $2)
rc_log_message $msg
if ! $rc_silent; then
printf %s\n $msg
Index: src/etc/rc.subr
diff -u src/etc/rc.subr:1.81 src/etc/rc.subr:1.82
--- src/etc/rc.subr:1.81 Mon Mar 15 14:59:47 2010
+++ src/etc/rc.subr Fri Jun 4 14:42:54 2010
@@ -1,4 +1,4 @@
-# $NetBSD: rc.subr,v 1.81 2010/03/15 18:59:47 jmmv Exp $
+# $NetBSD: rc.subr,v 1.82 2010/06/04 18:42:54 christos Exp $
#
# Copyright (c) 1997-2004 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -1175,4 +1175,22 @@
_twiddle_state=$_next
}
+#
+# human_exit_code
+# Print the a human version of the exit code.
+#
+human_exit_code()
+{
+ if [ $1 -lt 127 ]
+ then
+ echo exited with code $1
+ elif [ $1 -eq 127 ]
+ then
+ echo stopped with signal $(expr $1 / 256)
+ else
+ echo terminated with signal $(expr $1 - 128)
+ fi
+}
+
+
_rc_subr_loaded=:
CVS commit: src/share/mk
Module Name:src Committed By: joerg Date: Fri Jun 4 20:19:39 UTC 2010 Modified Files: src/share/mk: bsd.own.mk Log Message: Add definitions for TOOL_MANDOC_* for standalone users. Requested by dyoung. To generate a diff of this commit: cvs rdiff -u -r1.628 -r1.629 src/share/mk/bsd.own.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/mk/bsd.own.mk diff -u src/share/mk/bsd.own.mk:1.628 src/share/mk/bsd.own.mk:1.629 --- src/share/mk/bsd.own.mk:1.628 Fri Jun 4 08:35:09 2010 +++ src/share/mk/bsd.own.mk Fri Jun 4 20:19:39 2010 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.own.mk,v 1.628 2010/06/04 08:35:09 jmmv Exp $ +# $NetBSD: bsd.own.mk,v 1.629 2010/06/04 20:19:39 joerg Exp $ # This needs to be before bsd.init.mk .if defined(BSD_MK_COMPAT_FILE) @@ -335,6 +335,9 @@ TOOL_MAKEFS= makefs TOOL_MAKEINFO= makeinfo TOOL_MAKEWHATIS= /usr/libexec/makewhatis +TOOL_MANDOC_ASCII= mandoc -Tascii +TOOL_MANDOC_HTML= mandoc -Thtml -Oman=../html%S/%N.html -Ostyle=../style.css +TOOL_MANDOC_LINT= mandoc -Tlint TOOL_MDSETIMAGE= mdsetimage TOOL_MENUC= menuc TOOL_MIPSELF2ECOFF= mips-elf2ecoff
CVS commit: src/sys/arch/powerpc/include
Module Name:src Committed By: chs Date: Fri Jun 4 20:31:58 UTC 2010 Modified Files: src/sys/arch/powerpc/include: ofw_bus.h Log Message: fix some cosmetics. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/powerpc/include/ofw_bus.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/powerpc/include/ofw_bus.h diff -u src/sys/arch/powerpc/include/ofw_bus.h:1.3 src/sys/arch/powerpc/include/ofw_bus.h:1.4 --- src/sys/arch/powerpc/include/ofw_bus.h:1.3 Mon Apr 28 20:23:32 2008 +++ src/sys/arch/powerpc/include/ofw_bus.h Fri Jun 4 20:31:58 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: ofw_bus.h,v 1.3 2008/04/28 20:23:32 martin Exp $ */ +/* $NetBSD: ofw_bus.h,v 1.4 2010/06/04 20:31:58 chs Exp $ */ /*- * Copyright (c) 2007 The NetBSD Foundation, Inc. @@ -29,8 +29,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _POWERPC_OWFPPC_BUS_H_ -#define _POWERPC_OWFPPC_BUS_H_ +#ifndef _POWERPC_OFW_BUS_H_ +#define _POWERPC_OFW_BUS_H_ #define RANGE_TYPE_PCI 1 #define RANGE_TYPE_ISA 2 @@ -52,8 +52,7 @@ void ofwoea_bus_space_init(void); void ofwoea_initppc(u_int, u_int, char *); void ofwoea_batinit(void); -int ofwoea_map_space(int rangetype, int iomem, int node, -struct powerpc_bus_space *tag, const char *name); +int ofwoea_map_space(int, int, int, struct powerpc_bus_space *, const char *); #endif -#endif /* _POWERPC_PREP_BUS_H_ */ +#endif /* _POWERPC_OFW_BUS_H_ */
CVS commit: xsrc/xfree/xc/extras/ogl-sample/main/doc/man/manglw
Module Name:xsrc Committed By: joerg Date: Fri Jun 4 21:16:25 UTC 2010 Modified Files: xsrc/xfree/xc/extras/ogl-sample/main/doc/man/manglw: glwcreatemdrawingarea.gl glwdrawingarea.gl glwdrawingareamakecurrent.gl glwdrawingareaswapbuffers.gl Log Message: Drop trailing non-sense arguments for .TH. Too many of those have been provided anyway. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ xsrc/xfree/xc/extras/ogl-sample/main/doc/man/manglw/glwcreatemdrawingarea.gl \ xsrc/xfree/xc/extras/ogl-sample/main/doc/man/manglw/glwdrawingareamakecurrent.gl \ xsrc/xfree/xc/extras/ogl-sample/main/doc/man/manglw/glwdrawingareaswapbuffers.gl cvs rdiff -u -r1.1.1.2 -r1.2 \ xsrc/xfree/xc/extras/ogl-sample/main/doc/man/manglw/glwdrawingarea.gl Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/xfree/xc/extras/ogl-sample/main/doc/man/manglw/glwcreatemdrawingarea.gl diff -u xsrc/xfree/xc/extras/ogl-sample/main/doc/man/manglw/glwcreatemdrawingarea.gl:1.1.1.1 xsrc/xfree/xc/extras/ogl-sample/main/doc/man/manglw/glwcreatemdrawingarea.gl:1.2 --- xsrc/xfree/xc/extras/ogl-sample/main/doc/man/manglw/glwcreatemdrawingarea.gl:1.1.1.1 Mon Jan 1 12:49:23 2001 +++ xsrc/xfree/xc/extras/ogl-sample/main/doc/man/manglw/glwcreatemdrawingarea.gl Fri Jun 4 21:16:25 2010 @@ -10,7 +10,7 @@ .\ ** Maynard, MA. All Rights Reserved. .\ ** .\ ** -.TH GLwCreateMDrawingArea 3X +.TH GLwCreateMDrawingArea 3X .SH NAME \fBGLwCreateMDrawingArea \(em Create a Motif/OpenGL Drawing Widget.\fP .iX GLwCreateMDrawingArea Index: xsrc/xfree/xc/extras/ogl-sample/main/doc/man/manglw/glwdrawingareamakecurrent.gl diff -u xsrc/xfree/xc/extras/ogl-sample/main/doc/man/manglw/glwdrawingareamakecurrent.gl:1.1.1.1 xsrc/xfree/xc/extras/ogl-sample/main/doc/man/manglw/glwdrawingareamakecurrent.gl:1.2 --- xsrc/xfree/xc/extras/ogl-sample/main/doc/man/manglw/glwdrawingareamakecurrent.gl:1.1.1.1 Mon Jan 1 12:49:23 2001 +++ xsrc/xfree/xc/extras/ogl-sample/main/doc/man/manglw/glwdrawingareamakecurrent.gl Fri Jun 4 21:16:25 2010 @@ -10,7 +10,7 @@ .\ ** Maynard, MA. All Rights Reserved. .\ ** .\ ** -.TH GLwDrawingAreaMakeCurrent 3X +.TH GLwDrawingAreaMakeCurrent 3X .SH NAME \fBGLwDrawingAreaMakeCurrent \(em Make the current GLwDrawingArea current.\fP .iX GLwDrawingAreaMakeCurrent Index: xsrc/xfree/xc/extras/ogl-sample/main/doc/man/manglw/glwdrawingareaswapbuffers.gl diff -u xsrc/xfree/xc/extras/ogl-sample/main/doc/man/manglw/glwdrawingareaswapbuffers.gl:1.1.1.1 xsrc/xfree/xc/extras/ogl-sample/main/doc/man/manglw/glwdrawingareaswapbuffers.gl:1.2 --- xsrc/xfree/xc/extras/ogl-sample/main/doc/man/manglw/glwdrawingareaswapbuffers.gl:1.1.1.1 Mon Jan 1 12:49:24 2001 +++ xsrc/xfree/xc/extras/ogl-sample/main/doc/man/manglw/glwdrawingareaswapbuffers.gl Fri Jun 4 21:16:25 2010 @@ -10,7 +10,7 @@ .\ ** Maynard, MA. All Rights Reserved. .\ ** .\ ** -.TH GLwDrawingAreaSwapBuffers 3X +.TH GLwDrawingAreaSwapBuffers 3X .SH NAME \fBGLwDrawingAreaSwapBuffers \(em Swap buffers in a GLwDrawingArea.\fP .iX GLwDrawingAreaSwapBuffers Index: xsrc/xfree/xc/extras/ogl-sample/main/doc/man/manglw/glwdrawingarea.gl diff -u xsrc/xfree/xc/extras/ogl-sample/main/doc/man/manglw/glwdrawingarea.gl:1.1.1.2 xsrc/xfree/xc/extras/ogl-sample/main/doc/man/manglw/glwdrawingarea.gl:1.2 --- xsrc/xfree/xc/extras/ogl-sample/main/doc/man/manglw/glwdrawingarea.gl:1.1.1.2 Fri Mar 18 13:07:45 2005 +++ xsrc/xfree/xc/extras/ogl-sample/main/doc/man/manglw/glwdrawingarea.gl Fri Jun 4 21:16:25 2010 @@ -11,7 +11,7 @@ .\ ** .\ ** .\ $XFree86: xc/extras/ogl-sample/main/doc/man/manglw/glwdrawingarea.gl,v 1.2 2004/03/10 18:26:06 tsi Exp $ -.TH GLwDrawingArea 3X +.TH GLwDrawingArea 3X .SH NAME \fBGLwDrawingArea, GLwMDrawingArea \(em OpenGL drawing widgets.\fP .iX GLwDrawingArea GLwMDrawingArea
CVS commit: xsrc/xfree/xc/doc/man/GL/glx
Module Name:xsrc Committed By: joerg Date: Fri Jun 4 21:20:44 UTC 2010 Modified Files: xsrc/xfree/xc/doc/man/GL/glx: xchoosevisual.3gl xcopycontext.3gl xcreatecontext.3gl xcreateglxpixmap.3gl xdestroycontext.3gl xdestroyglxpixmap.3gl xfreecontextext.3gl xgetclientstring.3gl xgetconfig.3gl xgetcontextidext.3gl xgetcurrentcontext.3gl xgetcurrentdisplay.3gl xgetcurrentdrawable.3gl ximportcontextext.3gl xintro.3gl xisdirect.3gl xmakecurrent.3gl xquerycontextinfoext.3gl xqueryextension.3gl xqueryextensionsstring.3gl xqueryserverstring.3gl xqueryversion.3gl xswapbuffers.3gl xusexfont.3gl xwaitgl.3gl xwaitx.3gl Log Message: Make sure that .TH actually gets a section number. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 xsrc/xfree/xc/doc/man/GL/glx/xchoosevisual.3gl \ xsrc/xfree/xc/doc/man/GL/glx/xcopycontext.3gl \ xsrc/xfree/xc/doc/man/GL/glx/xcreatecontext.3gl \ xsrc/xfree/xc/doc/man/GL/glx/xcreateglxpixmap.3gl \ xsrc/xfree/xc/doc/man/GL/glx/xdestroycontext.3gl \ xsrc/xfree/xc/doc/man/GL/glx/xdestroyglxpixmap.3gl \ xsrc/xfree/xc/doc/man/GL/glx/xfreecontextext.3gl \ xsrc/xfree/xc/doc/man/GL/glx/xgetclientstring.3gl \ xsrc/xfree/xc/doc/man/GL/glx/xgetconfig.3gl \ xsrc/xfree/xc/doc/man/GL/glx/xgetcontextidext.3gl \ xsrc/xfree/xc/doc/man/GL/glx/xgetcurrentcontext.3gl \ xsrc/xfree/xc/doc/man/GL/glx/xgetcurrentdisplay.3gl \ xsrc/xfree/xc/doc/man/GL/glx/xgetcurrentdrawable.3gl \ xsrc/xfree/xc/doc/man/GL/glx/ximportcontextext.3gl \ xsrc/xfree/xc/doc/man/GL/glx/xisdirect.3gl \ xsrc/xfree/xc/doc/man/GL/glx/xmakecurrent.3gl \ xsrc/xfree/xc/doc/man/GL/glx/xquerycontextinfoext.3gl \ xsrc/xfree/xc/doc/man/GL/glx/xqueryextension.3gl \ xsrc/xfree/xc/doc/man/GL/glx/xqueryextensionsstring.3gl \ xsrc/xfree/xc/doc/man/GL/glx/xqueryserverstring.3gl \ xsrc/xfree/xc/doc/man/GL/glx/xqueryversion.3gl \ xsrc/xfree/xc/doc/man/GL/glx/xswapbuffers.3gl \ xsrc/xfree/xc/doc/man/GL/glx/xusexfont.3gl \ xsrc/xfree/xc/doc/man/GL/glx/xwaitgl.3gl \ xsrc/xfree/xc/doc/man/GL/glx/xwaitx.3gl cvs rdiff -u -r1.1.1.2 -r1.2 xsrc/xfree/xc/doc/man/GL/glx/xintro.3gl Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/xfree/xc/doc/man/GL/glx/xchoosevisual.3gl diff -u xsrc/xfree/xc/doc/man/GL/glx/xchoosevisual.3gl:1.1.1.1 xsrc/xfree/xc/doc/man/GL/glx/xchoosevisual.3gl:1.2 --- xsrc/xfree/xc/doc/man/GL/glx/xchoosevisual.3gl:1.1.1.1 Mon Jan 1 12:47:45 2001 +++ xsrc/xfree/xc/doc/man/GL/glx/xchoosevisual.3gl Fri Jun 4 21:20:44 2010 @@ -6,7 +6,7 @@ .ds Dp Feb 16 02:56 .ds Dm Feb 10 17:2 .ds Xs 58988 14 xchoosevisual.gl -.TH GLXCHOOSEVISUAL +.TH GLXCHOOSEVISUAL 3G .SH NAME glXChooseVisual \- return a visual that matches specified attributes Index: xsrc/xfree/xc/doc/man/GL/glx/xcopycontext.3gl diff -u xsrc/xfree/xc/doc/man/GL/glx/xcopycontext.3gl:1.1.1.1 xsrc/xfree/xc/doc/man/GL/glx/xcopycontext.3gl:1.2 --- xsrc/xfree/xc/doc/man/GL/glx/xcopycontext.3gl:1.1.1.1 Mon Jan 1 12:47:45 2001 +++ xsrc/xfree/xc/doc/man/GL/glx/xcopycontext.3gl Fri Jun 4 21:20:44 2010 @@ -6,7 +6,7 @@ .ds Dp Feb 16 02:56 .ds Dm Feb 10 17:2 .ds Xs 49166 6 xcopycontext.gl -.TH GLXCOPYCONTEXT +.TH GLXCOPYCONTEXT 3G .SH NAME glXCopyContext \- copy state from one rendering context to another Index: xsrc/xfree/xc/doc/man/GL/glx/xcreatecontext.3gl diff -u xsrc/xfree/xc/doc/man/GL/glx/xcreatecontext.3gl:1.1.1.1 xsrc/xfree/xc/doc/man/GL/glx/xcreatecontext.3gl:1.2 --- xsrc/xfree/xc/doc/man/GL/glx/xcreatecontext.3gl:1.1.1.1 Mon Jan 1 12:47:45 2001 +++ xsrc/xfree/xc/doc/man/GL/glx/xcreatecontext.3gl Fri Jun 4 21:20:44 2010 @@ -6,7 +6,7 @@ .ds Dp Feb 16 02:56 .ds Dm Feb 10 17:2 .ds Xs 16965 8 xcreatecontext.gl -.TH GLXCREATECONTEXT +.TH GLXCREATECONTEXT 3G .SH NAME glXCreateContext \- create a new GLX rendering context Index: xsrc/xfree/xc/doc/man/GL/glx/xcreateglxpixmap.3gl diff -u xsrc/xfree/xc/doc/man/GL/glx/xcreateglxpixmap.3gl:1.1.1.1 xsrc/xfree/xc/doc/man/GL/glx/xcreateglxpixmap.3gl:1.2 --- xsrc/xfree/xc/doc/man/GL/glx/xcreateglxpixmap.3gl:1.1.1.1 Mon Jan 1 12:47:45 2001 +++ xsrc/xfree/xc/doc/man/GL/glx/xcreateglxpixmap.3gl Fri Jun 4 21:20:44 2010 @@ -6,7 +6,7 @@ .ds Dp Feb 16 02:56 .ds Dm Feb 10 17:2 .ds Xs 62493 5 xcreateglxpixmap.gl -.TH GLXCREATEGLXPIXMAP +.TH GLXCREATEGLXPIXMAP 3G .SH NAME glXCreateGLXPixmap \- create an off-screen GLX rendering area Index: xsrc/xfree/xc/doc/man/GL/glx/xdestroycontext.3gl diff -u xsrc/xfree/xc/doc/man/GL/glx/xdestroycontext.3gl:1.1.1.1 xsrc/xfree/xc/doc/man/GL/glx/xdestroycontext.3gl:1.2 --- xsrc/xfree/xc/doc/man/GL/glx/xdestroycontext.3gl:1.1.1.1 Mon Jan 1 12:47:45 2001 +++ xsrc/xfree/xc/doc/man/GL/glx/xdestroycontext.3gl Fri Jun 4 21:20:44 2010 @@ -6,7 +6,7 @@ .ds Dp Feb 16 02:56 .ds Dm Feb 10 17:2
CVS commit: src/crypto/dist/ipsec-tools/src/setkey
Module Name:src Committed By: wiz Date: Fri Jun 4 21:53:36 UTC 2010 Modified Files: src/crypto/dist/ipsec-tools/src/setkey: setkey.8 Log Message: New sentence, new line. Bump date for previous. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/crypto/dist/ipsec-tools/src/setkey/setkey.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/dist/ipsec-tools/src/setkey/setkey.8 diff -u src/crypto/dist/ipsec-tools/src/setkey/setkey.8:1.24 src/crypto/dist/ipsec-tools/src/setkey/setkey.8:1.25 --- src/crypto/dist/ipsec-tools/src/setkey/setkey.8:1.24 Fri Jun 4 13:06:03 2010 +++ src/crypto/dist/ipsec-tools/src/setkey/setkey.8 Fri Jun 4 21:53:36 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: setkey.8,v 1.24 2010/06/04 13:06:03 vanhu Exp $ +.\ $NetBSD: setkey.8,v 1.25 2010/06/04 21:53:36 wiz Exp $ .\ .\ Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project. .\ All rights reserved. @@ -27,7 +27,7 @@ .\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\ SUCH DAMAGE. .\ -.Dd March 19, 2004 +.Dd June 4, 2010 .Dt SETKEY 8 .Os .\ @@ -332,16 +332,16 @@ Specify hard/soft life time duration of the SA measured in bytes transported. .\ .It Fl ctx Ar doi Ar algorithm Ar context-name -Specify an access control label. The access control label is interpreted -by the LSM (e.g., SELinux). Ultimately, it enables MAC on network -communications. +Specify an access control label. +The access control label is interpreted by the LSM (e.g., SELinux). +Ultimately, it enables MAC on network communications. .Bl -tag -width Fl -compact .It Ar doi The domain of interpretation, which is used by the -IKE daemon to identify the domain in which negotiation takes place. +IKE daemon to identify the domain in which negotiation takes place. .It Ar algorithm Indicates the LSM for which the label is generated (e.g., SELinux). -.It Ar context-name +.It Ar context-name The string representation of the label that is interpreted by the LSM. .El .El @@ -462,11 +462,13 @@ .\ .Pp .It Ar label -.Ar label -is the access control label for the policy. This label is interpreted -by the LSM (e.g., SELinux). Ultimately, it enables MAC on network -communications. When a policy contains an access control label, SAs -negotiated with this policy will contain the label. It's format: +.Ar label +is the access control label for the policy. +This label is interpreted by the LSM (e.g., SELinux). +Ultimately, it enables MAC on network communications. +When a policy contains an access control label, SAs +negotiated with this policy will contain the label. +Its format: .Bl -tag -width Fl -compact .\ .It Fl ctx Ar doi Ar algorithm Ar context-name
CVS commit: src/sys/kern
Module Name:src
Committed By: rmind
Date: Fri Jun 4 23:02:18 UTC 2010
Modified Files:
src/sys/kern: kern_proc.c
Log Message:
proc_alloc: move kdtrace_proc_ctor() out of the proc_lock.
To generate a diff of this commit:
cvs rdiff -u -r1.163 -r1.164 src/sys/kern/kern_proc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_proc.c
diff -u src/sys/kern/kern_proc.c:1.163 src/sys/kern/kern_proc.c:1.164
--- src/sys/kern/kern_proc.c:1.163 Fri Feb 26 18:47:13 2010
+++ src/sys/kern/kern_proc.c Fri Jun 4 23:02:18 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_proc.c,v 1.163 2010/02/26 18:47:13 jym Exp $ */
+/* $NetBSD: kern_proc.c,v 1.164 2010/06/04 23:02:18 rmind Exp $ */
/*-
* Copyright (c) 1999, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_proc.c,v 1.163 2010/02/26 18:47:13 jym Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_proc.c,v 1.164 2010/06/04 23:02:18 rmind Exp $);
#include opt_kstack.h
#include opt_maxuprc.h
@@ -444,9 +444,8 @@
mutex_init(p-p_sigacts-sa_mutex, MUTEX_DEFAULT, IPL_SCHED);
siginit(p);
- kdtrace_proc_ctor(NULL, p);
-
proc_initspecific(p);
+ kdtrace_proc_ctor(NULL, p);
lwp_initspecific(l);
SYSCALL_TIME_LWP_INIT(l);
@@ -684,7 +683,7 @@
p-p_stat = SIDL; /* protect against others */
proc_initspecific(p);
- /* allocate next free pid */
+ kdtrace_proc_ctor(NULL, p);
for (;;expand_pid_table()) {
if (__predict_false(pid_alloc_cnt = pid_alloc_lim))
@@ -713,9 +712,6 @@
/* Grab table slot */
pt-pt_proc = p;
pid_alloc_cnt++;
-
- kdtrace_proc_ctor(NULL, p);
-
mutex_exit(proc_lock);
return p;
CVS commit: src/sys/sys
Module Name:src
Committed By: rmind
Date: Fri Jun 4 23:17:28 UTC 2010
Modified Files:
src/sys/sys: dtrace_bsd.h
Log Message:
kdtrace_{pro,thread}c_ctor: use kmem_zalloc(), instead of manual memset().
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/sys/dtrace_bsd.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/sys/dtrace_bsd.h
diff -u src/sys/sys/dtrace_bsd.h:1.3 src/sys/sys/dtrace_bsd.h:1.4
--- src/sys/sys/dtrace_bsd.h:1.3 Wed Feb 24 10:18:19 2010
+++ src/sys/sys/dtrace_bsd.h Fri Jun 4 23:17:28 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: dtrace_bsd.h,v 1.3 2010/02/24 10:18:19 tron Exp $ */
+/* $NetBSD: dtrace_bsd.h,v 1.4 2010/06/04 23:17:28 rmind Exp $ */
/*-
* Copyright (c) 2007-2008 John Birrell (j...@freebsd.org)
@@ -40,7 +40,6 @@
#include sys/param.h
#include sys/systm.h
#include sys/kernel.h
-#include sys/malloc.h
#include sys/kmem.h
#include sys/proc.h
@@ -190,7 +189,7 @@
kdtrace_proc_size()
{
- return(KDTRACE_PROC_SIZE);
+ return KDTRACE_PROC_SIZE;
}
/* Return the DTrace thread data size compiled in the kernel hooks. */
@@ -198,7 +197,7 @@
kdtrace_thread_size()
{
- return(KDTRACE_THREAD_SIZE);
+ return KDTRACE_THREAD_SIZE;
}
static inline void
@@ -206,8 +205,7 @@
{
#ifdef KDTRACE_HOOKS
- p-p_dtrace = kmem_alloc(KDTRACE_PROC_SIZE, KM_SLEEP);
- memset(p-p_dtrace, 0, KDTRACE_PROC_ZERO);
+ p-p_dtrace = kmem_zalloc(KDTRACE_PROC_SIZE, KM_SLEEP);
#endif
}
@@ -228,8 +226,7 @@
{
#ifdef KDTRACE_HOOKS
- l-l_dtrace = kmem_alloc(KDTRACE_THREAD_SIZE, KM_SLEEP);
- memset(l-l_dtrace, 0, KDTRACE_THREAD_ZERO);
+ l-l_dtrace = kmem_zalloc(KDTRACE_THREAD_SIZE, KM_SLEEP);
#endif
}
CVS commit: xsrc/xfree/xc/doc/man/Xi
Module Name:xsrc Committed By: joerg Date: Fri Jun 4 23:59:19 UTC 2010 Modified Files: xsrc/xfree/xc/doc/man/Xi: XSExEvnt.man Log Message: Kill empty .TP To generate a diff of this commit: cvs rdiff -u -r1.1.1.4 -r1.2 xsrc/xfree/xc/doc/man/Xi/XSExEvnt.man Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/xfree/xc/doc/man/Xi/XSExEvnt.man diff -u xsrc/xfree/xc/doc/man/Xi/XSExEvnt.man:1.1.1.4 xsrc/xfree/xc/doc/man/Xi/XSExEvnt.man:1.2 --- xsrc/xfree/xc/doc/man/Xi/XSExEvnt.man:1.1.1.4 Fri Mar 18 13:05:26 2005 +++ xsrc/xfree/xc/doc/man/Xi/XSExEvnt.man Fri Jun 4 23:59:19 2010 @@ -47,7 +47,6 @@ .TP 12 .I event_send Specifies a pointer to the event that is to be sent. -.TP 12 .SH DESCRIPTION The \fIXSendExtensionEvent\fP
CVS commit: xsrc/xfree/xc/doc/man/X11
Module Name:xsrc
Committed By: joerg
Date: Fri Jun 4 23:59:43 UTC 2010
Modified Files:
xsrc/xfree/xc/doc/man/X11: XCreGC.man
Log Message:
Don't depend on .TS H for now.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.4 -r1.2 xsrc/xfree/xc/doc/man/X11/XCreGC.man
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/xfree/xc/doc/man/X11/XCreGC.man
diff -u xsrc/xfree/xc/doc/man/X11/XCreGC.man:1.1.1.4 xsrc/xfree/xc/doc/man/X11/XCreGC.man:1.2
--- xsrc/xfree/xc/doc/man/X11/XCreGC.man:1.1.1.4 Fri Mar 18 13:05:23 2005
+++ xsrc/xfree/xc/doc/man/X11/XCreGC.man Fri Jun 4 23:59:43 2010
@@ -524,7 +524,7 @@
.\ and operation.
.\.CP T 1
.\Display Functions
-.TS H
+.TS
lw(1.5i) cw(.5i) lw(2i).
_
.sp 6p
@@ -533,7 +533,6 @@
.sp 6p
_
.sp 6p
-.TH
T{
.ZN GXclear
T} T{
CVS commit: src/bin/ksh
Module Name:src
Committed By: sjg
Date: Sat Jun 5 03:02:37 UTC 2010
Modified Files:
src/bin/ksh: edit.c
Log Message:
PR: 39604
Reviewed by:
add_glob:
Do not stop scanning if we see '$' as it does more harm than good.
For $HOME/tm we should return $HOME/tm*
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/bin/ksh/edit.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/ksh/edit.c
diff -u src/bin/ksh/edit.c:1.24 src/bin/ksh/edit.c:1.25
--- src/bin/ksh/edit.c:1.24 Fri Apr 2 20:19:40 2010
+++ src/bin/ksh/edit.c Sat Jun 5 03:02:37 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: edit.c,v 1.24 2010/04/02 20:19:40 plunky Exp $ */
+/* $NetBSD: edit.c,v 1.25 2010/06/05 03:02:37 sjg Exp $ */
/*
* Command line editing - common code
@@ -7,7 +7,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: edit.c,v 1.24 2010/04/02 20:19:40 plunky Exp $);
+__RCSID($NetBSD: edit.c,v 1.25 2010/06/05 03:02:37 sjg Exp $);
#endif
@@ -873,14 +873,14 @@
/*
* If the pathname contains a wildcard (an unquoted '*',
- * '?', or '[') or parameter expansion ('$'), or a ~username
+ * '?', or '['), or a ~username
* with no trailing slash, then it is globbed based on that
* value (i.e., without the appended '*').
*/
for (s = toglob; *s; s++) {
if (*s == '\\' s[1])
s++;
- else if (*s == '*' || *s == '[' || *s == '?' || *s == '$'
+ else if (*s == '*' || *s == '[' || *s == '?'
|| (s[1] == '(' /*)*/ strchr(*...@!, *s)))
break;
else if (ISDIRSEP(*s))
CVS commit: src/usr.bin/last
Module Name:src
Committed By: dholland
Date: Sat Jun 5 03:24:02 UTC 2010
Modified Files:
src/usr.bin/last: last.c
Log Message:
Avoid SIGSEGV on out-of-range time_t.
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/usr.bin/last/last.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/last/last.c
diff -u src/usr.bin/last/last.c:1.33 src/usr.bin/last/last.c:1.34
--- src/usr.bin/last/last.c:1.33 Sun Apr 12 13:07:21 2009
+++ src/usr.bin/last/last.c Sat Jun 5 03:24:01 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: last.c,v 1.33 2009/04/12 13:07:21 lukem Exp $ */
+/* $NetBSD: last.c,v 1.34 2010/06/05 03:24:01 dholland Exp $ */
/*
* Copyright (c) 1987, 1993, 1994
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = @(#)last.c 8.2 (Berkeley) 4/2/94;
#endif
-__RCSID($NetBSD: last.c,v 1.33 2009/04/12 13:07:21 lukem Exp $);
+__RCSID($NetBSD: last.c,v 1.34 2010/06/05 03:24:01 dholland Exp $);
#endif /* not lint */
#include sys/param.h
@@ -362,6 +362,10 @@
static char tbuf[TBUFLEN];
tm = (flags GMT) ? gmtime(t) : localtime(t);
+ if (tm == NULL) {
+ strcpy(tbuf, );
+ return tbuf;
+ }
strftime(tbuf, sizeof(tbuf),
(flags TIMEONLY)
? (flags FULLTIME ? LTFMTS : TFMTS)
