CVS commit: src/tests/lib/libc/gen
Module Name:src Committed By: pgoyette Date: Sun Dec 26 03:25:07 UTC 2010 Modified Files: src/tests/lib/libc/gen: t_siginfo.c Log Message: For now, don't try to print out machine-dependant stuff. When I figure out what the right format strings are, I'll re-enable it. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libc/gen/t_siginfo.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/lib/libc/gen/t_siginfo.c diff -u src/tests/lib/libc/gen/t_siginfo.c:1.1 src/tests/lib/libc/gen/t_siginfo.c:1.2 --- src/tests/lib/libc/gen/t_siginfo.c:1.1 Sat Dec 25 01:04:26 2010 +++ src/tests/lib/libc/gen/t_siginfo.c Sun Dec 26 03:25:07 2010 @@ -28,6 +28,7 @@ #include +#include #include #include #include @@ -56,7 +57,6 @@ sig_debug(int signo, siginfo_t *info, ucontext_t *ctx) { unsigned int i; - mcontext_t *mc = &ctx->uc_mcontext; printf("%d %p %p\n", signo, info, ctx); if (info != NULL) { @@ -74,9 +74,14 @@ printf("uc_stack %p %lu 0x%x\n", ctx->uc_stack.ss_sp, (unsigned long)ctx->uc_stack.ss_size, ctx->uc_stack.ss_flags); + /* + * XXX Don't try to print MD __gregs since we don't + * XXX know what format to use + * for (i = 0; i < __arraycount(mc->__gregs); i++) - printf("uc_mcontext.greg[%d] 0x%lx\n", i, - mc->__gregs[i]); + printf("uc_mcontext.greg[%d] 0x%x\n", i, + uc->uc_mcontext.__gregs[i]); + */ } } @@ -129,8 +134,13 @@ printf("si_uid=%d\n", info->si_uid); printf("si_pid=%d\n", info->si_pid); printf("si_status=%d\n", info->si_status); - printf("si_utime=%d\n", info->si_utime); - printf("si_stime=%d\n", info->si_stime); + /* + * XXX don't print these until we figure out the + * XXX correct machine-independant format specifier + * + printf("si_utime=%u\n", info->si_utime); + printf("si_stime=%u\n", info->si_stime); + */ } ATF_REQUIRE_EQ(info->si_code, code); ATF_REQUIRE_EQ(info->si_signo, SIGCHLD);
CVS commit: src/external/bsd/byacc/dist
Module Name:src Committed By: christos Date: Sat Dec 25 23:43:30 UTC 2010 Modified Files: src/external/bsd/byacc/dist: closure.c error.c graph.c lalr.c lr0.c main.c mkpar.c output.c reader.c skeleton.c symtab.c verbose.c warshall.c Log Message: defs.h already includes nbtool_config.h, so don't do it twice. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/bsd/byacc/dist/closure.c \ src/external/bsd/byacc/dist/lr0.c src/external/bsd/byacc/dist/mkpar.c \ src/external/bsd/byacc/dist/symtab.c \ src/external/bsd/byacc/dist/verbose.c \ src/external/bsd/byacc/dist/warshall.c cvs rdiff -u -r1.5 -r1.6 src/external/bsd/byacc/dist/error.c \ src/external/bsd/byacc/dist/main.c src/external/bsd/byacc/dist/reader.c cvs rdiff -u -r1.3 -r1.4 src/external/bsd/byacc/dist/graph.c \ src/external/bsd/byacc/dist/lalr.c cvs rdiff -u -r1.6 -r1.7 src/external/bsd/byacc/dist/output.c cvs rdiff -u -r1.8 -r1.9 src/external/bsd/byacc/dist/skeleton.c 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/byacc/dist/closure.c diff -u src/external/bsd/byacc/dist/closure.c:1.4 src/external/bsd/byacc/dist/closure.c:1.5 --- src/external/bsd/byacc/dist/closure.c:1.4 Sat Dec 25 14:24:28 2010 +++ src/external/bsd/byacc/dist/closure.c Sat Dec 25 18:43:30 2010 @@ -1,13 +1,10 @@ -/* $NetBSD: closure.c,v 1.4 2010/12/25 19:24:28 joerg Exp $ */ +/* $NetBSD: closure.c,v 1.5 2010/12/25 23:43:30 christos Exp $ */ /* Id: closure.c,v 1.9 2010/06/09 08:21:47 tom Exp */ #include "defs.h" -#if HAVE_NBTOOL_CONFIG_H -#include "nbtool_config.h" -#endif #include -__RCSID("$NetBSD: closure.c,v 1.4 2010/12/25 19:24:28 joerg Exp $"); +__RCSID("$NetBSD: closure.c,v 1.5 2010/12/25 23:43:30 christos Exp $"); Value_t *itemset; Value_t *itemsetend; Index: src/external/bsd/byacc/dist/lr0.c diff -u src/external/bsd/byacc/dist/lr0.c:1.4 src/external/bsd/byacc/dist/lr0.c:1.5 --- src/external/bsd/byacc/dist/lr0.c:1.4 Sat Dec 25 14:24:28 2010 +++ src/external/bsd/byacc/dist/lr0.c Sat Dec 25 18:43:30 2010 @@ -1,14 +1,10 @@ -/* $NetBSD: lr0.c,v 1.4 2010/12/25 19:24:28 joerg Exp $ */ +/* $NetBSD: lr0.c,v 1.5 2010/12/25 23:43:30 christos Exp $ */ /* Id: lr0.c,v 1.12 2010/06/09 08:53:17 tom Exp */ #include "defs.h" -#if HAVE_NBTOOL_CONFIG_H -#include "nbtool_config.h" -#endif - #include -__RCSID("$NetBSD: lr0.c,v 1.4 2010/12/25 19:24:28 joerg Exp $"); +__RCSID("$NetBSD: lr0.c,v 1.5 2010/12/25 23:43:30 christos Exp $"); static core *new_state(int symbol); static Value_t get_state(int symbol); Index: src/external/bsd/byacc/dist/mkpar.c diff -u src/external/bsd/byacc/dist/mkpar.c:1.4 src/external/bsd/byacc/dist/mkpar.c:1.5 --- src/external/bsd/byacc/dist/mkpar.c:1.4 Sat Dec 25 14:24:28 2010 +++ src/external/bsd/byacc/dist/mkpar.c Sat Dec 25 18:43:30 2010 @@ -1,14 +1,10 @@ -/* $NetBSD: mkpar.c,v 1.4 2010/12/25 19:24:28 joerg Exp $ */ +/* $NetBSD: mkpar.c,v 1.5 2010/12/25 23:43:30 christos Exp $ */ /* Id: mkpar.c,v 1.11 2010/06/09 08:53:17 tom Exp */ #include "defs.h" -#if HAVE_NBTOOL_CONFIG_H -#include "nbtool_config.h" -#endif - #include -__RCSID("$NetBSD: mkpar.c,v 1.4 2010/12/25 19:24:28 joerg Exp $"); +__RCSID("$NetBSD: mkpar.c,v 1.5 2010/12/25 23:43:30 christos Exp $"); static action *add_reduce(action *actions, int ruleno, int symbol); static action *add_reductions(int stateno, action *actions); Index: src/external/bsd/byacc/dist/symtab.c diff -u src/external/bsd/byacc/dist/symtab.c:1.4 src/external/bsd/byacc/dist/symtab.c:1.5 --- src/external/bsd/byacc/dist/symtab.c:1.4 Sat Dec 25 14:24:28 2010 +++ src/external/bsd/byacc/dist/symtab.c Sat Dec 25 18:43:30 2010 @@ -1,14 +1,11 @@ -/* $NetBSD: symtab.c,v 1.4 2010/12/25 19:24:28 joerg Exp $ */ +/* $NetBSD: symtab.c,v 1.5 2010/12/25 23:43:30 christos Exp $ */ /* Id: symtab.c,v 1.9 2010/11/24 15:12:29 tom Exp */ -#if HAVE_NBTOOL_CONFIG_H -#include "nbtool_config.h" -#endif - -#include -__RCSID("$NetBSD: symtab.c,v 1.4 2010/12/25 19:24:28 joerg Exp $"); #include "defs.h" +#include +__RCSID("$NetBSD: symtab.c,v 1.5 2010/12/25 23:43:30 christos Exp $"); + /* TABLE_SIZE is the number of entries in the symbol table. */ /* TABLE_SIZE must be a power of two. */ Index: src/external/bsd/byacc/dist/verbose.c diff -u src/external/bsd/byacc/dist/verbose.c:1.4 src/external/bsd/byacc/dist/verbose.c:1.5 --- src/external/bsd/byacc/dist/verbose.c:1.4 Sat Dec 25 14:24:28 2010 +++ src/external/bsd/byacc/dist/verbose.c Sat Dec 25 18:43:30 2010 @@ -1,14 +1,10 @@ -/* $NetBSD: verbose.c,v 1.4 2010/12/25 19:24:28 joerg Exp $ */ +/* $NetBSD: verbose.c,v 1.5 2010/12/25 23:43:30 christos Exp $ */ /* Id: verbose.c,v 1.9 2010/06/09 08:58:29 tom Exp */ -#if HAVE_NBTOOL_CONFIG_H -#include "nbtool_config.h" -#endif +#include "defs.h" #include -__RCSID("$NetBSD: verbose.c,v 1.4 2010/12/25 19:24:28 joerg Exp $");
CVS commit: src/usr.bin/vmstat
Module Name:src Committed By: christos Date: Sat Dec 25 23:36:59 UTC 2010 Modified Files: src/usr.bin/vmstat: vmstat.c Log Message: can't play games with structure names since cpu_data refers to cpu_info, so provide our own copy for everything. To generate a diff of this commit: cvs rdiff -u -r1.174 -r1.175 src/usr.bin/vmstat/vmstat.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/vmstat/vmstat.c diff -u src/usr.bin/vmstat/vmstat.c:1.174 src/usr.bin/vmstat/vmstat.c:1.175 --- src/usr.bin/vmstat/vmstat.c:1.174 Sat Dec 25 15:50:36 2010 +++ src/usr.bin/vmstat/vmstat.c Sat Dec 25 18:36:59 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: vmstat.c,v 1.174 2010/12/25 20:50:36 christos Exp $ */ +/* $NetBSD: vmstat.c,v 1.175 2010/12/25 23:36:59 christos Exp $ */ /*- * Copyright (c) 1998, 2000, 2001, 2007 The NetBSD Foundation, Inc. @@ -70,7 +70,7 @@ #if 0 static char sccsid[] = "@(#)vmstat.c 8.2 (Berkeley) 3/1/95"; #else -__RCSID("$NetBSD: vmstat.c,v 1.174 2010/12/25 20:50:36 christos Exp $"); +__RCSID("$NetBSD: vmstat.c,v 1.175 2010/12/25 23:36:59 christos Exp $"); #endif #endif /* not lint */ @@ -95,7 +95,6 @@ #include #include #include -#include #include #include @@ -134,13 +133,19 @@ * All this mess will go away once everything is converted. */ #ifdef __HAVE_CPU_DATA_FIRST -#include -struct xcpu_info { + +# include +struct cpu_info { struct cpu_data ci_data; }; -# define CPU_INFO xcpu_info +CIRCLEQ_HEAD(cpuqueue, cpu_info); +struct cpuqueue cpu_queue; + #else -# define CPU_INFO cpu_info + +# include +struct cpuqueue cpu_queue; + #endif /* * General namelist @@ -253,7 +258,6 @@ } cpucounter, ocpucounter; struct uvmexp uvmexp, ouvmexp; -struct cpuqueue cpu_queue; int ndrives; int winlines = 20; @@ -989,10 +993,10 @@ void cpucounters(struct cpu_counter *cc) { - struct CPU_INFO *ci; + struct cpu_info *ci; (void)memset(cc, 0, sizeof(*cc)); CIRCLEQ_FOREACH(ci, &cpu_queue, ci_data.cpu_qchain) { - struct CPU_INFO tci; + struct cpu_info tci; if ((size_t)kvm_read(kd, (u_long)ci, &tci, sizeof(tci)) != sizeof(tci)) { warnx("Can't read cpu info from %p (%s)",
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: haad Date: Sat Dec 25 23:28:19 UTC 2010 Modified Files: src/distrib/sets/lists/comp: mi Log Message: Fix MKDTRACE & MKDEBUG enabled build, add some dtrace entries. To generate a diff of this commit: cvs rdiff -u -r1.1561 -r1.1562 src/distrib/sets/lists/comp/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/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1561 src/distrib/sets/lists/comp/mi:1.1562 --- src/distrib/sets/lists/comp/mi:1.1561 Wed Dec 22 19:35:41 2010 +++ src/distrib/sets/lists/comp/mi Sat Dec 25 23:28:18 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1561 2010/12/22 19:35:41 jruoho Exp $ +# $NetBSD: mi,v 1.1562 2010/12/25 23:28:18 haad Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -3114,6 +3114,9 @@ ./usr/libdata/debug/usr/bin/crunchide.debug comp-c-debug debug ./usr/libdata/debug/usr/bin/csplit.debug comp-c-debug debug ./usr/libdata/debug/usr/bin/ctags.debug comp-c-debug debug +./usr/libdata/debug/usr/bin/ctfconvert.debug comp-util-debug dtrace,debug +./usr/libdata/debug/usr/bin/ctfdump.debug comp-util-debug dtrace,debug +./usr/libdata/debug/usr/bin/ctfmerge.debug comp-util-debug dtrace,debug ./usr/libdata/debug/usr/bin/cut.debug comp-util-debug debug ./usr/libdata/debug/usr/bin/cvs.debug comp-cvs-debug cvs,debug ./usr/libdata/debug/usr/bin/db.debug comp-util-debug debug @@ -3612,6 +3615,7 @@ ./usr/libdata/debug/usr/sbin/dnssec-settime.debug comp-bind-debug debug ./usr/libdata/debug/usr/sbin/dnssec-signzone.debug comp-bind-debug debug ./usr/libdata/debug/usr/sbin/dtmfdecode.debug comp-isdn-debug debug +./usr/libdata/debug/usr/sbin/dtrace.debug comp-util-debug dtrace,debug ./usr/libdata/debug/usr/sbin/dumpfs.debug comp-sysutil-debug debug ./usr/libdata/debug/usr/sbin/dumplfs.debug comp-sysutil-debug debug ./usr/libdata/debug/usr/sbin/edquota.debug comp-sysutil-debug debug
CVS commit: src/sys/sys
Module Name:src Committed By: joerg Date: Sat Dec 25 22:30:52 UTC 2010 Modified Files: src/sys/sys: cdefs.h Log Message: Rename __BEGIN_PUBLIC / __BEGIN_HIDDEN to __BEGIN_PUBLIC_DECLS / __BEGIN_HIDDEN_DECLS and corresponding __END_* macros. Push the extern "C" logic into __BEGIN_PUBLIC_DECLS / __BEGIN_HIDDEN_DECLS to make them easier to use in header files used by C++. To generate a diff of this commit: cvs rdiff -u -r1.80 -r1.81 src/sys/sys/cdefs.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/cdefs.h diff -u src/sys/sys/cdefs.h:1.80 src/sys/sys/cdefs.h:1.81 --- src/sys/sys/cdefs.h:1.80 Sat Aug 7 21:03:18 2010 +++ src/sys/sys/cdefs.h Sat Dec 25 22:30:52 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: cdefs.h,v 1.80 2010/08/07 21:03:18 joerg Exp $ */ +/* $NetBSD: cdefs.h,v 1.81 2010/12/25 22:30:52 joerg Exp $ */ /* * Copyright (c) 1991, 1993 @@ -218,32 +218,36 @@ #define __used __unused #endif +#if defined(__cplusplus) +#define __BEGIN_EXTERN_C extern "C" { +#define __END_EXTERN_C } +#define __static_cast(x,y) static_cast(y) +#else +#define __BEGIN_EXTERN_C +#define __END_EXTERN_C +#define __static_cast(x,y) (x)y +#endif + #if __GNUC_PREREQ__(4, 0) # define __dso_public __attribute__((__visibility__("default"))) # define __dso_hidden __attribute__((__visibility__("hidden"))) -# define __BEGIN_PUBLIC _Pragma("GCC visibility push(default)") -# define __END_PUBLIC _Pragma("GCC visibility pop") -# define __BEGIN_HIDDEN _Pragma("GCC visibility push(hidden)") -# define __END_HIDDEN _Pragma("GCC visibility pop") +# define __BEGIN_PUBLIC_DECLS \ + _Pragma("GCC visibility push(default)") __BEGIN_EXTERN_C +# define __END_PUBLIC_DECLS __END_EXTERN_C _Pragma("GCC visibility pop") +# define __BEGIN_HIDDEN_DECLS \ + _Pragma("GCC visibility push(hidden)") __BEGIN_EXTERN_C +# define __END_HIDDEN_DECLS __END_EXTERN_C _Pragma("GCC visibility pop") #else # define __dso_public # define __dso_hidden -# define __BEGIN_PUBLIC -# define __END_PUBLIC -# define __BEGIN_HIDDEN -# define __END_HIDDEN +# define __BEGIN_PUBLIC_DECLS __BEGIN_EXTERN_C +# define __END_PUBLIC_DECLS __END_EXTERN_C +# define __BEGIN_HIDDEN_DECLS __BEGIN_EXTERN_C +# define __END_HIDDEN_DECLS __END_EXTERN_C #endif - -#if defined(__cplusplus) -#define __BEGIN_DECLS __BEGIN_PUBLIC extern "C" { -#define __END_DECLS } __END_PUBLIC -#define __static_cast(x,y) static_cast(y) -#else -#define __BEGIN_DECLS __BEGIN_PUBLIC -#define __END_DECLS __END_PUBLIC -#define __static_cast(x,y) (x)y -#endif +#define __BEGIN_DECLS __BEGIN_PUBLIC_DECLS +#define __END_DECLS __END_PUBLIC_DECLS /* * Non-static C99 inline functions are optional bodies. They don't
CVS commit: src/usr.bin/make
Module Name:src Committed By: dholland Date: Sat Dec 25 21:39:12 UTC 2010 Modified Files: src/usr.bin/make: parse.c Log Message: erm. fix previous... To generate a diff of this commit: cvs rdiff -u -r1.172 -r1.173 src/usr.bin/make/parse.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/make/parse.c diff -u src/usr.bin/make/parse.c:1.172 src/usr.bin/make/parse.c:1.173 --- src/usr.bin/make/parse.c:1.172 Sat Dec 25 20:46:18 2010 +++ src/usr.bin/make/parse.c Sat Dec 25 21:39:11 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: parse.c,v 1.172 2010/12/25 20:46:18 dholland Exp $ */ +/* $NetBSD: parse.c,v 1.173 2010/12/25 21:39:11 dholland Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -69,14 +69,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: parse.c,v 1.172 2010/12/25 20:46:18 dholland Exp $"; +static char rcsid[] = "$NetBSD: parse.c,v 1.173 2010/12/25 21:39:11 dholland Exp $"; #else #include #ifndef lint #if 0 static char sccsid[] = "@(#)parse.c 8.3 (Berkeley) 3/19/94"; #else -__RCSID("$NetBSD: parse.c,v 1.172 2010/12/25 20:46:18 dholland Exp $"); +__RCSID("$NetBSD: parse.c,v 1.173 2010/12/25 21:39:11 dholland Exp $"); #endif #endif /* not lint */ #endif @@ -543,10 +543,10 @@ bufpos += result; } assert(bufpos <= lf->len); + lf->len = bufpos; /* truncate malloc region to actual length (maybe not useful) */ if (lf->len > 0) { - lf->len = bufpos; lf->buf = bmake_realloc(lf->buf, lf->len); }
CVS commit: src/regress/lib/libc/string
Module Name:src Committed By: pgoyette Date: Sat Dec 25 21:13:40 UTC 2010 Modified Files: src/regress/lib/libc/string: Makefile Removed Files: src/regress/lib/libc/string/memchr: Makefile memchr_test.c src/regress/lib/libc/string/strcat: Makefile strcat_test.c src/regress/lib/libc/string/strchr: Makefile strchr_test.c src/regress/lib/libc/string/strcmp: Makefile strcmp_test.c src/regress/lib/libc/string/strcpy: Makefile strcpy_test.c src/regress/lib/libc/string/strlen: Makefile strlen_test.c src/regress/lib/libc/string/strrchr: Makefile strrchr_test.c Log Message: Remove regress versions of str* tests - they have been atf-ified To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/regress/lib/libc/string/Makefile cvs rdiff -u -r1.1 -r0 src/regress/lib/libc/string/memchr/Makefile cvs rdiff -u -r1.2 -r0 src/regress/lib/libc/string/memchr/memchr_test.c cvs rdiff -u -r1.1 -r0 src/regress/lib/libc/string/strcat/Makefile \ src/regress/lib/libc/string/strcat/strcat_test.c cvs rdiff -u -r1.1 -r0 src/regress/lib/libc/string/strchr/Makefile cvs rdiff -u -r1.4 -r0 src/regress/lib/libc/string/strchr/strchr_test.c cvs rdiff -u -r1.1 -r0 src/regress/lib/libc/string/strcmp/Makefile \ src/regress/lib/libc/string/strcmp/strcmp_test.c cvs rdiff -u -r1.1 -r0 src/regress/lib/libc/string/strcpy/Makefile \ src/regress/lib/libc/string/strcpy/strcpy_test.c cvs rdiff -u -r1.1 -r0 src/regress/lib/libc/string/strlen/Makefile cvs rdiff -u -r1.2 -r0 src/regress/lib/libc/string/strlen/strlen_test.c cvs rdiff -u -r1.1 -r0 src/regress/lib/libc/string/strrchr/Makefile \ src/regress/lib/libc/string/strrchr/strrchr_test.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/regress/lib/libc/string/Makefile diff -u src/regress/lib/libc/string/Makefile:1.9 src/regress/lib/libc/string/Makefile:1.10 --- src/regress/lib/libc/string/Makefile:1.9 Sat Aug 12 23:51:12 2006 +++ src/regress/lib/libc/string/Makefile Sat Dec 25 21:13:37 2010 @@ -1,6 +1,5 @@ -# $NetBSD: Makefile,v 1.9 2006/08/12 23:51:12 christos Exp $ +# $NetBSD: Makefile,v 1.10 2010/12/25 21:13:37 pgoyette Exp $ -SUBDIR+= memchr memmem strcat strchr strcmp strcpy strlen strrchr swab wcsncpy\ - memcpy stresep +SUBDIR+= memmem swab wcsncpy memcpy stresep .include
CVS commit: src
Module Name:src Committed By: pgoyette Date: Sat Dec 25 21:10:25 UTC 2010 Modified Files: src/distrib/sets/lists/tests: mi src/etc/mtree: NetBSD.dist.tests src/tests/lib/libc: Makefile src/tests/lib/libc/string: Makefile Added Files: src/tests/lib/libc/string: t_string.c Log Message: Migrate J.T.Conklin's public-domain str* tests from regress to atf. While here, do some clean-up and knf. To generate a diff of this commit: cvs rdiff -u -r1.189 -r1.190 src/distrib/sets/lists/tests/mi cvs rdiff -u -r1.6 -r1.7 src/etc/mtree/NetBSD.dist.tests cvs rdiff -u -r1.8 -r1.9 src/tests/lib/libc/Makefile cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libc/string/Makefile cvs rdiff -u -r0 -r1.1 src/tests/lib/libc/string/t_string.c 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/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.189 src/distrib/sets/lists/tests/mi:1.190 --- src/distrib/sets/lists/tests/mi:1.189 Sat Dec 25 01:04:27 2010 +++ src/distrib/sets/lists/tests/mi Sat Dec 25 21:10:24 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.189 2010/12/25 01:04:27 pgoyette Exp $ +# $NetBSD: mi,v 1.190 2010/12/25 21:10:24 pgoyette Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -334,8 +334,9 @@ ./usr/libdata/debug/usr/tests/lib/libc/stdlib/t_environment_pth.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/libc/stdlib/t_mi_vector_hash.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/libc/stdlib/t_strtox.debug tests-lib-debug debug,atf -./usr/libdata/debug/usr/tests/lib/libc/stringtests-obsolete obsolete -./usr/libdata/debug/usr/tests/lib/libc/string/t_popcount.debug tests-obsolete obsolete +./usr/libdata/debug/usr/tests/lib/libc/stringtests-lib-debug +#./usr/libdata/debug/usr/tests/lib/libc/string/t_popcount.debug tests-lib-debug debug,atf +./usr/libdata/debug/usr/tests/lib/libc/string/t_string.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/libdestests-lib-debug ./usr/libdata/debug/usr/tests/lib/libdes/t_des.debug tests-lib-debug debug,atf,crypto ./usr/libdata/debug/usr/tests/lib/semaphoretests-lib-debug @@ -1558,9 +1559,10 @@ ./usr/tests/lib/libc/stdio/t_fmemopen tests-lib-tests atf ./usr/tests/lib/libc/stdio/t_format tests-lib-tests atf ./usr/tests/lib/libc/stdio/t_popen tests-lib-tests atf -./usr/tests/lib/libc/string tests-obsolete obsolete -./usr/tests/lib/libc/string/Atffile tests-obsolete obsolete -./usr/tests/lib/libc/string/t_popcount tests-obsolete obsolete +./usr/tests/lib/libc/string tests-lib-tests +./usr/tests/lib/libc/string/Atffile tests-lib-tests atf +#./usr/tests/lib/libc/string/t_popcount tests-lib-tests atf +./usr/tests/lib/libc/string/t_string tests-lib-tests atf ./usr/tests/lib/libdestests-lib-tests ./usr/tests/lib/libdes/Atffile tests-lib-tests atf,crypto ./usr/tests/lib/libdes/t_des tests-lib-tests atf,crypto Index: src/etc/mtree/NetBSD.dist.tests diff -u src/etc/mtree/NetBSD.dist.tests:1.6 src/etc/mtree/NetBSD.dist.tests:1.7 --- src/etc/mtree/NetBSD.dist.tests:1.6 Mon Dec 20 23:47:23 2010 +++ src/etc/mtree/NetBSD.dist.tests Sat Dec 25 21:10:25 2010 @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.tests,v 1.6 2010/12/20 23:47:23 pgoyette Exp $ +# $NetBSD: NetBSD.dist.tests,v 1.7 2010/12/25 21:10:25 pgoyette Exp $ ./usr/libdata/debug/usr/tests ./usr/libdata/debug/usr/tests/atf @@ -49,6 +49,7 @@ ./usr/libdata/debug/usr/tests/lib/libc/hash ./usr/libdata/debug/usr/tests/lib/libc/stdio ./usr/libdata/debug/usr/tests/lib/libc/stdlib +./usr/libdata/debug/usr/tests/lib/libc/string ./usr/libdata/debug/usr/tests/lib/libdes ./usr/libdata/debug/usr/tests/lib/libevent ./usr/libdata/debug/usr/tests/lib/semaphore @@ -141,6 +142,7 @@ ./usr/tests/lib/libc/hash ./usr/tests/lib/libc/stdio ./usr/tests/lib/libc/stdlib +./usr/tests/lib/libc/string ./usr/tests/lib/libdes ./usr/tests/lib/semaphore ./usr/tests/lib/semaphore/pthread Index: src/tests/lib/libc/Makefile diff -u src/tests/lib/libc/Makefile:1.8 src/tests/lib/libc/Makefile:1.9 --- src/tests/lib/libc/Makefile:1.8 Wed Nov 3 20:20:12 2010 +++ src/tests/lib/libc/Makefile Sat Dec 25 21:10:25 2010 @@ -1,11 +1,8 @@ -# $NetBSD: Makefile,v 1.8 2010/11/03 20:20:12 christos Exp $ +# $NetBSD: Makefile,v 1.9 2010/12/25 21:10:25 pgoyette Exp $ .include -TESTS_SUBDIRS+= gen hash stdlib stdio - -# Disabled for now, only test in there is very expensive -#SUBDIR+= string +TESTS_SUBDIRS+= gen hash stdlib stdio string TESTSDIR= ${TESTSBASE}/lib/libc Index: src/tests/lib/libc/string/Makefile diff -u src/tests/lib/libc/string/Makefile:1.2 src/tests/lib/libc/string/Makefile:1.3 --- src/tests/lib/libc/string/Makefile:1.2 Fri Feb 26 09:35:08 2010 +++ src/tests/lib/libc/string/Makefile Sat Dec 25 21:10:24 2010 @@ -1,10 +1,12 @@ -# $NetBSD: Makefile,v 1.2
CVS commit: src/usr.bin/vmstat
Module Name:src Committed By: christos Date: Sat Dec 25 20:50:36 UTC 2010 Modified Files: src/usr.bin/vmstat: vmstat.c Log Message: use a local definition of cpu_info if we have __HAVE_CPU_DATA_FIRST To generate a diff of this commit: cvs rdiff -u -r1.173 -r1.174 src/usr.bin/vmstat/vmstat.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/vmstat/vmstat.c diff -u src/usr.bin/vmstat/vmstat.c:1.173 src/usr.bin/vmstat/vmstat.c:1.174 --- src/usr.bin/vmstat/vmstat.c:1.173 Sat Dec 25 09:18:37 2010 +++ src/usr.bin/vmstat/vmstat.c Sat Dec 25 15:50:36 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: vmstat.c,v 1.173 2010/12/25 14:18:37 christos Exp $ */ +/* $NetBSD: vmstat.c,v 1.174 2010/12/25 20:50:36 christos Exp $ */ /*- * Copyright (c) 1998, 2000, 2001, 2007 The NetBSD Foundation, Inc. @@ -70,13 +70,14 @@ #if 0 static char sccsid[] = "@(#)vmstat.c 8.2 (Berkeley) 3/1/95"; #else -__RCSID("$NetBSD: vmstat.c,v 1.173 2010/12/25 14:18:37 christos Exp $"); +__RCSID("$NetBSD: vmstat.c,v 1.174 2010/12/25 20:50:36 christos Exp $"); #endif #endif /* not lint */ #define __POOL_EXPOSE #include +#include #include #include @@ -130,6 +131,18 @@ #include "drvstats.h" /* + * All this mess will go away once everything is converted. + */ +#ifdef __HAVE_CPU_DATA_FIRST +#include +struct xcpu_info { + struct cpu_data ci_data; +}; +# define CPU_INFO xcpu_info +#else +# define CPU_INFO cpu_info +#endif +/* * General namelist */ struct nlist namelist[] = @@ -247,6 +260,7 @@ kvm_t *kd; + #define FORKSTAT 1<<0 #define INTRSTAT 1<<1 #define MEMSTAT 1<<2 @@ -975,10 +989,10 @@ void cpucounters(struct cpu_counter *cc) { - struct cpu_info *ci; + struct CPU_INFO *ci; (void)memset(cc, 0, sizeof(*cc)); CIRCLEQ_FOREACH(ci, &cpu_queue, ci_data.cpu_qchain) { - struct cpu_info tci; + struct CPU_INFO tci; if ((size_t)kvm_read(kd, (u_long)ci, &tci, sizeof(tci)) != sizeof(tci)) { warnx("Can't read cpu info from %p (%s)",
CVS commit: src/usr.bin/make
Module Name:src Committed By: dholland Date: Sat Dec 25 20:46:18 UTC 2010 Modified Files: src/usr.bin/make: parse.c Log Message: Maybe fix a problem that appeared on loonix. To generate a diff of this commit: cvs rdiff -u -r1.171 -r1.172 src/usr.bin/make/parse.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/make/parse.c diff -u src/usr.bin/make/parse.c:1.171 src/usr.bin/make/parse.c:1.172 --- src/usr.bin/make/parse.c:1.171 Sat Dec 25 17:19:04 2010 +++ src/usr.bin/make/parse.c Sat Dec 25 20:46:18 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: parse.c,v 1.171 2010/12/25 17:19:04 dholland Exp $ */ +/* $NetBSD: parse.c,v 1.172 2010/12/25 20:46:18 dholland Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -69,14 +69,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: parse.c,v 1.171 2010/12/25 17:19:04 dholland Exp $"; +static char rcsid[] = "$NetBSD: parse.c,v 1.172 2010/12/25 20:46:18 dholland Exp $"; #else #include #ifndef lint #if 0 static char sccsid[] = "@(#)parse.c 8.3 (Berkeley) 3/19/94"; #else -__RCSID("$NetBSD: parse.c,v 1.171 2010/12/25 17:19:04 dholland Exp $"); +__RCSID("$NetBSD: parse.c,v 1.172 2010/12/25 20:46:18 dholland Exp $"); #endif #endif /* not lint */ #endif @@ -545,8 +545,10 @@ assert(bufpos <= lf->len); /* truncate malloc region to actual length (maybe not useful) */ - lf->len = bufpos; - lf->buf = bmake_realloc(lf->buf, lf->len); + if (lf->len > 0) { + lf->len = bufpos; + lf->buf = bmake_realloc(lf->buf, lf->len); + } done: if (path != NULL) {
CVS commit: src/external/bsd/wpa/dist/src/drivers
Module Name:src Committed By: christos Date: Sat Dec 25 20:45:50 UTC 2010 Modified Files: src/external/bsd/wpa/dist/src/drivers: driver_bsd.c Log Message: fix debugging: - don't print junk for the interface name - parse and print known rtm messages we get To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/bsd/wpa/dist/src/drivers/driver_bsd.c 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/wpa/dist/src/drivers/driver_bsd.c diff -u src/external/bsd/wpa/dist/src/drivers/driver_bsd.c:1.3 src/external/bsd/wpa/dist/src/drivers/driver_bsd.c:1.4 --- src/external/bsd/wpa/dist/src/drivers/driver_bsd.c:1.3 Thu Aug 5 10:03:17 2010 +++ src/external/bsd/wpa/dist/src/drivers/driver_bsd.c Sat Dec 25 15:45:49 2010 @@ -1258,22 +1258,41 @@ wpa_supplicant_event(ctx, EVENT_INTERFACE_STATUS, &event); } else if ((ifm->ifm_flags & IFF_UP) != 0 && (drv->flags & IFF_UP) == 0) { - strlcpy(event.interface_status.ifname, drv->ifname, + os_strlcpy(event.interface_status.ifname, drv->ifname, sizeof(event.interface_status.ifname)); event.interface_status.ievent = EVENT_INTERFACE_ADDED; wpa_printf(MSG_DEBUG, "RTM_IFINFO: Interface '%s' UP", event.interface_status.ifname); wpa_supplicant_event(ctx, EVENT_INTERFACE_STATUS, &event); } else { + os_strlcpy(event.interface_status.ifname, drv->ifname, +sizeof(event.interface_status.ifname)); wpa_printf(MSG_DEBUG, "RTM_IFINFO: Interface '%s' " "if=%x drv=%x", event.interface_status.ifname, ifm->ifm_flags, drv->flags); } drv->flags = ifm->ifm_flags; break; +#ifdef RTM_OIFINFO + case RTM_OIFINFO: + wpa_printf(MSG_DEBUG, "RTM_OIFINFO ignored"); + break; +#endif +#ifdef RTM_OOIFINFO + case RTM_OOIFINFO: + wpa_printf(MSG_DEBUG, "RTM_OOIFINFO ignored"); + break; +#endif +#ifdef RTM_LOSING case RTM_LOSING: - wpa_printf(MSG_DEBUG, "RTM_LOSING: %d", rtm->rtm_type); + wpa_printf(MSG_DEBUG, "RTM_LOSING ignored"); + break; +#endif +#ifdef RTM_MISS + case RTM_MISS: + wpa_printf(MSG_DEBUG, "RTM_MISS ignored"); break; +#endif default: wpa_printf(MSG_DEBUG, "RTM_???: %d", rtm->rtm_type); break;
CVS commit: src/sys/net
Module Name:src Committed By: christos Date: Sat Dec 25 20:37:45 UTC 2010 Modified Files: src/sys/net: rtsock.c Log Message: merge the length getting code from rt_msg1 and rt_msg2 and make it fail when the compatibility ifinfo is missing instead of returning junk. To generate a diff of this commit: cvs rdiff -u -r1.131 -r1.132 src/sys/net/rtsock.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/net/rtsock.c diff -u src/sys/net/rtsock.c:1.131 src/sys/net/rtsock.c:1.132 --- src/sys/net/rtsock.c:1.131 Fri Nov 12 11:30:26 2010 +++ src/sys/net/rtsock.c Sat Dec 25 15:37:44 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: rtsock.c,v 1.131 2010/11/12 16:30:26 roy Exp $ */ +/* $NetBSD: rtsock.c,v 1.132 2010/12/25 20:37:44 christos Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -61,7 +61,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: rtsock.c,v 1.131 2010/11/12 16:30:26 roy Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rtsock.c,v 1.132 2010/12/25 20:37:44 christos Exp $"); #include "opt_inet.h" #include "opt_mpls.h" @@ -572,58 +572,69 @@ return 0; } -struct mbuf * -rt_msg1(int type, struct rt_addrinfo *rtinfo, void *data, int datalen) +static int +rt_getlen(int type) { - struct rt_msghdr *rtm; - struct mbuf *m; - int i; - const struct sockaddr *sa; - int len, dlen; - - m = m_gethdr(M_DONTWAIT, MT_DATA); - if (m == NULL) - return m; - MCLAIM(m, &routedomain.dom_mowner); switch (type) { - case RTM_DELADDR: case RTM_NEWADDR: case RTM_CHGADDR: - len = sizeof(struct ifa_msghdr); - break; + return sizeof(struct ifa_msghdr); -#ifdef COMPAT_14 case RTM_OOIFINFO: - len = sizeof(struct if_msghdr14); - break; +#ifdef COMPAT_14 + return sizeof(struct if_msghdr14); +#else +#ifdef DIAGNOSTIC + printf("RTM_OOIFINFO\n"); +#endif + return -1; #endif -#ifdef COMPAT_50 case RTM_OIFINFO: - len = sizeof(struct if_msghdr50); - break; +#ifdef COMPAT_50 + return sizeof(struct if_msghdr50); +#else +#ifdef DIAGNOSTIC + printf("RTM_OIFINFO\n"); +#endif + return -1; #endif case RTM_IFINFO: - len = sizeof(struct if_msghdr); - break; + return sizeof(struct if_msghdr); case RTM_IFANNOUNCE: case RTM_IEEE80211: - len = sizeof(struct if_announcemsghdr); - break; + return sizeof(struct if_announcemsghdr); default: - len = sizeof(struct rt_msghdr); + return sizeof(struct rt_msghdr); } +} + + +struct mbuf * +rt_msg1(int type, struct rt_addrinfo *rtinfo, void *data, int datalen) +{ + struct rt_msghdr *rtm; + struct mbuf *m; + int i; + const struct sockaddr *sa; + int len, dlen; + + m = m_gethdr(M_DONTWAIT, MT_DATA); + if (m == NULL) + return m; + MCLAIM(m, &routedomain.dom_mowner); + + if ((len = rt_getlen(type)) == -1) + goto out; if (len > MHLEN + MLEN) panic("rt_msg1: message too long"); else if (len > MHLEN) { m->m_next = m_get(M_DONTWAIT, MT_DATA); - if (m->m_next == NULL) { - m_freem(m); - return NULL; - } + if (m->m_next == NULL) + goto out; MCLAIM(m->m_next, m->m_owner); m->m_pkthdr.len = len; m->m_len = MHLEN; @@ -644,14 +655,15 @@ m_copyback(m, len, dlen, sa); len += dlen; } - if (m->m_pkthdr.len != len) { - m_freem(m); - return NULL; - } + if (m->m_pkthdr.len != len) + goto out; rtm->rtm_msglen = len; rtm->rtm_version = RTM_VERSION; rtm->rtm_type = type; return m; +out: + m_freem(m); + return NULL; } /* @@ -677,31 +689,9 @@ rtinfo->rti_addrs = 0; again: - switch (type) { - - case RTM_DELADDR: - case RTM_NEWADDR: - case RTM_CHGADDR: - len = sizeof(struct ifa_msghdr); - break; -#ifdef COMPAT_14 - case RTM_OOIFINFO: - len = sizeof(struct if_msghdr14); - break; -#endif -#ifdef COMPAT_50 - case RTM_OIFINFO: - len = sizeof(struct if_msghdr50); - break; -#endif - - case RTM_IFINFO: - len = sizeof(struct if_msghdr); - break; + if ((len = rt_getlen(type)) == -1) + return EINVAL; - default: - len = sizeof(struct rt_msghdr); - } if ((cp0 = cp) != NULL) cp += len; for (i = 0; i < RTAX_MAX; i++) {
CVS commit: src/usr.bin/make
Module Name:src Committed By: dholland Date: Sat Dec 25 20:35:25 UTC 2010 Modified Files: src/usr.bin/make: make_malloc.c Log Message: Many C libraries don't set errno when make fails, so always use strerror(ENOMEM). To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/usr.bin/make/make_malloc.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/make/make_malloc.c diff -u src/usr.bin/make/make_malloc.c:1.5 src/usr.bin/make/make_malloc.c:1.6 --- src/usr.bin/make/make_malloc.c:1.5 Sat Jan 24 23:19:50 2009 +++ src/usr.bin/make/make_malloc.c Sat Dec 25 20:35:25 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: make_malloc.c,v 1.5 2009/01/24 23:19:50 dsl Exp $ */ +/* $NetBSD: make_malloc.c,v 1.6 2010/12/25 20:35:25 dholland Exp $ */ /*- * Copyright (c) 2009 The NetBSD Foundation, Inc. @@ -28,7 +28,7 @@ #ifdef MAKE_NATIVE #include -__RCSID("$NetBSD: make_malloc.c,v 1.5 2009/01/24 23:19:50 dsl Exp $"); +__RCSID("$NetBSD: make_malloc.c,v 1.6 2010/12/25 20:35:25 dholland Exp $"); #endif #include @@ -48,7 +48,7 @@ { extern char *progname; - (void)fprintf(stderr, "%s: %s.\n", progname, strerror(errno)); + (void)fprintf(stderr, "%s: %s.\n", progname, strerror(ENOMEM)); exit(2); }
CVS commit: src/usr.bin/make
Module Name:src Committed By: dholland Date: Sat Dec 25 20:34:08 UTC 2010 Modified Files: src/usr.bin/make: main.c Log Message: Improve confusing error message when getcwd() fails. To generate a diff of this commit: cvs rdiff -u -r1.193 -r1.194 src/usr.bin/make/main.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/make/main.c diff -u src/usr.bin/make/main.c:1.193 src/usr.bin/make/main.c:1.194 --- src/usr.bin/make/main.c:1.193 Sat Dec 25 04:57:07 2010 +++ src/usr.bin/make/main.c Sat Dec 25 20:34:08 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.193 2010/12/25 04:57:07 dholland Exp $ */ +/* $NetBSD: main.c,v 1.194 2010/12/25 20:34:08 dholland Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -69,7 +69,7 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: main.c,v 1.193 2010/12/25 04:57:07 dholland Exp $"; +static char rcsid[] = "$NetBSD: main.c,v 1.194 2010/12/25 20:34:08 dholland Exp $"; #else #include #ifndef lint @@ -81,7 +81,7 @@ #if 0 static char sccsid[] = "@(#)main.c 8.3 (Berkeley) 3/19/94"; #else -__RCSID("$NetBSD: main.c,v 1.193 2010/12/25 04:57:07 dholland Exp $"); +__RCSID("$NetBSD: main.c,v 1.194 2010/12/25 20:34:08 dholland Exp $"); #endif #endif /* not lint */ #endif @@ -964,7 +964,8 @@ * We take care of PWD for the automounter below... */ if (getcwd(curdir, MAXPATHLEN) == NULL) { - (void)fprintf(stderr, "%s: %s.\n", progname, strerror(errno)); + (void)fprintf(stderr, "%s: getcwd: %s.\n", + progname, strerror(errno)); exit(2); }
CVS commit: src/external/bsd/byacc/dist
Module Name:src Committed By: joerg Date: Sat Dec 25 19:24:29 UTC 2010 Modified Files: src/external/bsd/byacc/dist: closure.c error.c graph.c lalr.c lr0.c main.c mkpar.c output.c reader.c skeleton.c symtab.c verbose.c warshall.c Log Message: Include nbtool_config.h for the toolchain build as platforms like Linux don't define __RCSID. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/bsd/byacc/dist/closure.c \ src/external/bsd/byacc/dist/lr0.c src/external/bsd/byacc/dist/mkpar.c \ src/external/bsd/byacc/dist/symtab.c \ src/external/bsd/byacc/dist/verbose.c \ src/external/bsd/byacc/dist/warshall.c cvs rdiff -u -r1.4 -r1.5 src/external/bsd/byacc/dist/error.c \ src/external/bsd/byacc/dist/main.c src/external/bsd/byacc/dist/reader.c cvs rdiff -u -r1.2 -r1.3 src/external/bsd/byacc/dist/graph.c \ src/external/bsd/byacc/dist/lalr.c cvs rdiff -u -r1.5 -r1.6 src/external/bsd/byacc/dist/output.c cvs rdiff -u -r1.7 -r1.8 src/external/bsd/byacc/dist/skeleton.c 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/byacc/dist/closure.c diff -u src/external/bsd/byacc/dist/closure.c:1.3 src/external/bsd/byacc/dist/closure.c:1.4 --- src/external/bsd/byacc/dist/closure.c:1.3 Fri Dec 24 02:58:20 2010 +++ src/external/bsd/byacc/dist/closure.c Sat Dec 25 19:24:28 2010 @@ -1,10 +1,13 @@ -/* $NetBSD: closure.c,v 1.3 2010/12/24 02:58:20 christos Exp $ */ +/* $NetBSD: closure.c,v 1.4 2010/12/25 19:24:28 joerg Exp $ */ /* Id: closure.c,v 1.9 2010/06/09 08:21:47 tom Exp */ #include "defs.h" +#if HAVE_NBTOOL_CONFIG_H +#include "nbtool_config.h" +#endif #include -__RCSID("$NetBSD: closure.c,v 1.3 2010/12/24 02:58:20 christos Exp $"); +__RCSID("$NetBSD: closure.c,v 1.4 2010/12/25 19:24:28 joerg Exp $"); Value_t *itemset; Value_t *itemsetend; Index: src/external/bsd/byacc/dist/lr0.c diff -u src/external/bsd/byacc/dist/lr0.c:1.3 src/external/bsd/byacc/dist/lr0.c:1.4 --- src/external/bsd/byacc/dist/lr0.c:1.3 Fri Dec 24 02:58:20 2010 +++ src/external/bsd/byacc/dist/lr0.c Sat Dec 25 19:24:28 2010 @@ -1,10 +1,14 @@ -/* $NetBSD: lr0.c,v 1.3 2010/12/24 02:58:20 christos Exp $ */ +/* $NetBSD: lr0.c,v 1.4 2010/12/25 19:24:28 joerg Exp $ */ /* Id: lr0.c,v 1.12 2010/06/09 08:53:17 tom Exp */ #include "defs.h" +#if HAVE_NBTOOL_CONFIG_H +#include "nbtool_config.h" +#endif + #include -__RCSID("$NetBSD: lr0.c,v 1.3 2010/12/24 02:58:20 christos Exp $"); +__RCSID("$NetBSD: lr0.c,v 1.4 2010/12/25 19:24:28 joerg Exp $"); static core *new_state(int symbol); static Value_t get_state(int symbol); Index: src/external/bsd/byacc/dist/mkpar.c diff -u src/external/bsd/byacc/dist/mkpar.c:1.3 src/external/bsd/byacc/dist/mkpar.c:1.4 --- src/external/bsd/byacc/dist/mkpar.c:1.3 Fri Dec 24 02:58:20 2010 +++ src/external/bsd/byacc/dist/mkpar.c Sat Dec 25 19:24:28 2010 @@ -1,10 +1,14 @@ -/* $NetBSD: mkpar.c,v 1.3 2010/12/24 02:58:20 christos Exp $ */ +/* $NetBSD: mkpar.c,v 1.4 2010/12/25 19:24:28 joerg Exp $ */ /* Id: mkpar.c,v 1.11 2010/06/09 08:53:17 tom Exp */ #include "defs.h" +#if HAVE_NBTOOL_CONFIG_H +#include "nbtool_config.h" +#endif + #include -__RCSID("$NetBSD: mkpar.c,v 1.3 2010/12/24 02:58:20 christos Exp $"); +__RCSID("$NetBSD: mkpar.c,v 1.4 2010/12/25 19:24:28 joerg Exp $"); static action *add_reduce(action *actions, int ruleno, int symbol); static action *add_reductions(int stateno, action *actions); Index: src/external/bsd/byacc/dist/symtab.c diff -u src/external/bsd/byacc/dist/symtab.c:1.3 src/external/bsd/byacc/dist/symtab.c:1.4 --- src/external/bsd/byacc/dist/symtab.c:1.3 Fri Dec 24 02:58:21 2010 +++ src/external/bsd/byacc/dist/symtab.c Sat Dec 25 19:24:28 2010 @@ -1,7 +1,11 @@ -/* $NetBSD: symtab.c,v 1.3 2010/12/24 02:58:21 christos Exp $ */ +/* $NetBSD: symtab.c,v 1.4 2010/12/25 19:24:28 joerg Exp $ */ /* Id: symtab.c,v 1.9 2010/11/24 15:12:29 tom Exp */ +#if HAVE_NBTOOL_CONFIG_H +#include "nbtool_config.h" +#endif + #include -__RCSID("$NetBSD: symtab.c,v 1.3 2010/12/24 02:58:21 christos Exp $"); +__RCSID("$NetBSD: symtab.c,v 1.4 2010/12/25 19:24:28 joerg Exp $"); #include "defs.h" Index: src/external/bsd/byacc/dist/verbose.c diff -u src/external/bsd/byacc/dist/verbose.c:1.3 src/external/bsd/byacc/dist/verbose.c:1.4 --- src/external/bsd/byacc/dist/verbose.c:1.3 Fri Dec 24 02:58:21 2010 +++ src/external/bsd/byacc/dist/verbose.c Sat Dec 25 19:24:28 2010 @@ -1,8 +1,12 @@ -/* $NetBSD: verbose.c,v 1.3 2010/12/24 02:58:21 christos Exp $ */ +/* $NetBSD: verbose.c,v 1.4 2010/12/25 19:24:28 joerg Exp $ */ /* Id: verbose.c,v 1.9 2010/06/09 08:58:29 tom Exp */ +#if HAVE_NBTOOL_CONFIG_H +#include "nbtool_config.h" +#endif + #include -__RCSID("$NetBSD: verbose.c,v 1.3 2010/12/24 02:58:21 christos Exp $"); +__RCSID("$NetBSD: verbose.c,v 1.4 2010/12/25 19:24:28 joerg Exp $"); #include "defs.h" Index: src/external/bsd/
CVS commit: src
Module Name:src Committed By: joerg Date: Sat Dec 25 18:56:45 UTC 2010 Modified Files: src/share/mk: bsd.hostprog.mk bsd.sys.mk src/tools: Makefile.host Log Message: If MKREPRO, transform ${NETBSDSRCDIR} to /usr/src and ${DESTDIR} to / for the purpose of the C preprocessor. This avoids leaking the source path into the final binaries. To generate a diff of this commit: cvs rdiff -u -r1.59 -r1.60 src/share/mk/bsd.hostprog.mk cvs rdiff -u -r1.192 -r1.193 src/share/mk/bsd.sys.mk cvs rdiff -u -r1.26 -r1.27 src/tools/Makefile.host 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.hostprog.mk diff -u src/share/mk/bsd.hostprog.mk:1.59 src/share/mk/bsd.hostprog.mk:1.60 --- src/share/mk/bsd.hostprog.mk:1.59 Mon Nov 22 11:29:07 2010 +++ src/share/mk/bsd.hostprog.mk Sat Dec 25 18:56:45 2010 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.hostprog.mk,v 1.59 2010/11/22 11:29:07 pooka Exp $ +# $NetBSD: bsd.hostprog.mk,v 1.60 2010/12/25 18:56:45 joerg Exp $ # @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94 .include @@ -125,7 +125,7 @@ beforedepend: CFLAGS:= ${HOST_CFLAGS} -CPPFLAGS:= ${HOST_CPPFLAGS} +CPPFLAGS:= ${HOST_CPPFLAGS:N-Wp,-iremap,*} lint: ${LOBJS} .if defined(LOBJS) && !empty(LOBJS) Index: src/share/mk/bsd.sys.mk diff -u src/share/mk/bsd.sys.mk:1.192 src/share/mk/bsd.sys.mk:1.193 --- src/share/mk/bsd.sys.mk:1.192 Wed Apr 21 16:09:11 2010 +++ src/share/mk/bsd.sys.mk Sat Dec 25 18:56:45 2010 @@ -1,10 +1,15 @@ -# $NetBSD: bsd.sys.mk,v 1.192 2010/04/21 16:09:11 pooka Exp $ +# $NetBSD: bsd.sys.mk,v 1.193 2010/12/25 18:56:45 joerg Exp $ # # Build definitions used for NetBSD source tree builds. .if !defined(_BSD_SYS_MK_) _BSD_SYS_MK_=1 +.if ${MKREPRO:Uno} == "yes" +CPPFLAGS+= -Wp,-iremap,${NETBSDSRCDIR}:/usr/src +CPPFLAGS+= -Wp,-iremap,${DESTDIR}/:/ +.endif + .if defined(WARNS) .if ${WARNS} > 0 CFLAGS+= -Wall -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith Index: src/tools/Makefile.host diff -u src/tools/Makefile.host:1.26 src/tools/Makefile.host:1.27 --- src/tools/Makefile.host:1.26 Tue Dec 1 17:06:34 2009 +++ src/tools/Makefile.host Sat Dec 25 18:56:44 2010 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.host,v 1.26 2009/12/01 17:06:34 uebayasi Exp $ +# $NetBSD: Makefile.host,v 1.27 2010/12/25 18:56:44 joerg Exp $ NOINFO= # defined NOLINT= # defined @@ -42,6 +42,7 @@ HOSTPROGNAME?= ${HOSTPROG} HOST_BINDIR?= ${TOOLDIR}/bin HOST_CPPFLAGS:= ${HOST_CPPFLAGS} ${CPPFLAGS} +HOST_CPPFLAGS:= ${HOST_CPPFLAGS:N-Wp,-iremap,*} .undef LINKS SRCS?= ${HOSTPROG}.c
CVS commit: src/external/bsd/bind/dist
Module Name:src Committed By: christos Date: Sat Dec 25 18:23:39 UTC 2010 Modified Files: src/external/bsd/bind/dist/bin/named: client.c src/external/bsd/bind/dist/lib/dns: byaddr.c lookup.c request.c sdb.c validator.c Log Message: fix type-punned warnings on gcc-3.3.3 To generate a diff of this commit: cvs rdiff -u -r1.1.1.4 -r1.2 src/external/bsd/bind/dist/bin/named/client.c cvs rdiff -u -r1.1.1.2 -r1.2 src/external/bsd/bind/dist/lib/dns/byaddr.c \ src/external/bsd/bind/dist/lib/dns/request.c cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/bind/dist/lib/dns/lookup.c cvs rdiff -u -r1.1.1.5 -r1.2 src/external/bsd/bind/dist/lib/dns/sdb.c cvs rdiff -u -r1.1.1.6 -r1.2 src/external/bsd/bind/dist/lib/dns/validator.c 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/bind/dist/bin/named/client.c diff -u src/external/bsd/bind/dist/bin/named/client.c:1.1.1.4 src/external/bsd/bind/dist/bin/named/client.c:1.2 --- src/external/bsd/bind/dist/bin/named/client.c:1.1.1.4 Thu Dec 2 09:22:26 2010 +++ src/external/bsd/bind/dist/bin/named/client.c Sat Dec 25 13:23:39 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: client.c,v 1.1.1.4 2010/12/02 14:22:26 christos Exp $ */ +/* $NetBSD: client.c,v 1.2 2010/12/25 18:23:39 christos Exp $ */ /* * Copyright (C) 2004-2010 Internet Systems Consortium, Inc. ("ISC") @@ -490,8 +490,8 @@ ns_query_free(client); isc_mem_put(client->mctx, client->recvbuf, RECV_BUFFER_SIZE); - isc_event_free((isc_event_t **)&client->sendevent); - isc_event_free((isc_event_t **)&client->recvevent); + isc_event_free((isc_event_t **)(void *)&client->sendevent); + isc_event_free((isc_event_t **)(void *)&client->recvevent); isc_timer_detach(&client->timer); if (client->tcpbuf != NULL) @@ -2139,13 +2139,13 @@ ns_query_free(client); cleanup_recvevent: - isc_event_free((isc_event_t **)&client->recvevent); + isc_event_free((isc_event_t **)(void *)&client->recvevent); cleanup_recvbuf: isc_mem_put(client->mctx, client->recvbuf, RECV_BUFFER_SIZE); cleanup_sendevent: - isc_event_free((isc_event_t **)&client->sendevent); + isc_event_free((isc_event_t **)(void *)&client->sendevent); client->magic = 0; Index: src/external/bsd/bind/dist/lib/dns/byaddr.c diff -u src/external/bsd/bind/dist/lib/dns/byaddr.c:1.1.1.2 src/external/bsd/bind/dist/lib/dns/byaddr.c:1.2 --- src/external/bsd/bind/dist/lib/dns/byaddr.c:1.1.1.2 Sat Oct 24 20:02:27 2009 +++ src/external/bsd/bind/dist/lib/dns/byaddr.c Sat Dec 25 13:23:39 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: byaddr.c,v 1.1.1.2 2009/10/25 00:02:27 christos Exp $ */ +/* $NetBSD: byaddr.c,v 1.2 2010/12/25 18:23:39 christos Exp $ */ /* * Copyright (C) 2004, 2005, 2007, 2009 Internet Systems Consortium, Inc. ("ISC") @@ -190,7 +190,7 @@ } else byaddr->event->result = levent->result; isc_event_free(&event); - isc_task_sendanddetach(&byaddr->task, (isc_event_t **)&byaddr->event); + isc_task_sendanddetach(&byaddr->task, (isc_event_t **)(void *)&byaddr->event); } static void Index: src/external/bsd/bind/dist/lib/dns/request.c diff -u src/external/bsd/bind/dist/lib/dns/request.c:1.1.1.2 src/external/bsd/bind/dist/lib/dns/request.c:1.2 --- src/external/bsd/bind/dist/lib/dns/request.c:1.1.1.2 Sat Oct 24 20:02:33 2009 +++ src/external/bsd/bind/dist/lib/dns/request.c Sat Dec 25 13:23:39 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: request.c,v 1.1.1.2 2009/10/25 00:02:33 christos Exp $ */ +/* $NetBSD: request.c,v 1.2 2010/12/25 18:23:39 christos Exp $ */ /* * Copyright (C) 2004-2009 Internet Systems Consortium, Inc. ("ISC") @@ -1415,7 +1415,7 @@ task = request->event->ev_sender; request->event->ev_sender = request; request->event->result = result; - isc_task_sendanddetach(&task, (isc_event_t **)&request->event); + isc_task_sendanddetach(&task, (isc_event_t **)(void *)&request->event); } static void @@ -1432,7 +1432,7 @@ if (request->answer != NULL) isc_buffer_free(&request->answer); if (request->event != NULL) - isc_event_free((isc_event_t **)&request->event); + isc_event_free((isc_event_t **)(void *)&request->event); if (request->dispentry != NULL) dns_dispatch_removeresponse(&request->dispentry, NULL); if (request->dispatch != NULL) Index: src/external/bsd/bind/dist/lib/dns/lookup.c diff -u src/external/bsd/bind/dist/lib/dns/lookup.c:1.1.1.1 src/external/bsd/bind/dist/lib/dns/lookup.c:1.2 --- src/external/bsd/bind/dist/lib/dns/lookup.c:1.1.1.1 Sun Mar 22 11:01:07 2009 +++ src/external/bsd/bind/dist/lib/dns/lookup.c Sat Dec 25 13:23:39 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: lookup.c,v 1.1.1.1 2009/03/22 15:01:07 christos Exp $ */ +/* $NetBSD: lookup.c,v 1.2 2010/12/25 18:23:39 christos Exp $ */ /* * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") @@ -347,7 +347,7 @@ lookup->event->result = result; lookup->event->ev_sender = lookup; isc_task_sendanddeta
CVS commit: src/usr.bin/make
Module Name:src Committed By: dholland Date: Sat Dec 25 17:19:05 UTC 2010 Modified Files: src/usr.bin/make: parse.c Log Message: Uses stat; needs sys/stat.h. No idea what's pulling it in implicitly on NetBSD so I didn't notice. Woops. Noted by Kurt Schreiner on current-users. To generate a diff of this commit: cvs rdiff -u -r1.170 -r1.171 src/usr.bin/make/parse.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/make/parse.c diff -u src/usr.bin/make/parse.c:1.170 src/usr.bin/make/parse.c:1.171 --- src/usr.bin/make/parse.c:1.170 Sat Dec 25 04:57:07 2010 +++ src/usr.bin/make/parse.c Sat Dec 25 17:19:04 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: parse.c,v 1.170 2010/12/25 04:57:07 dholland Exp $ */ +/* $NetBSD: parse.c,v 1.171 2010/12/25 17:19:04 dholland Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -69,14 +69,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: parse.c,v 1.170 2010/12/25 04:57:07 dholland Exp $"; +static char rcsid[] = "$NetBSD: parse.c,v 1.171 2010/12/25 17:19:04 dholland Exp $"; #else #include #ifndef lint #if 0 static char sccsid[] = "@(#)parse.c 8.3 (Berkeley) 3/19/94"; #else -__RCSID("$NetBSD: parse.c,v 1.170 2010/12/25 04:57:07 dholland Exp $"); +__RCSID("$NetBSD: parse.c,v 1.171 2010/12/25 17:19:04 dholland Exp $"); #endif #endif /* not lint */ #endif @@ -125,6 +125,7 @@ #include #include +#include #include #include #include
CVS commit: src/include
Module Name:src Committed By: jmcneill Date: Sat Dec 25 16:49:09 UTC 2010 Modified Files: src/include: paths.h Log Message: add /dev/video, /dev/video0 To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 src/include/paths.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/include/paths.h diff -u src/include/paths.h:1.37 src/include/paths.h:1.38 --- src/include/paths.h:1.37 Sat Apr 24 20:44:33 2010 +++ src/include/paths.h Sat Dec 25 16:49:08 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: paths.h,v 1.37 2010/04/24 20:44:33 jruoho Exp $ */ +/* $NetBSD: paths.h,v 1.38 2010/12/25 16:49:08 jmcneill Exp $ */ /* * Copyright (c) 1989, 1993 @@ -95,6 +95,8 @@ #define _PATH_TTY "/dev/tty" #define _PATH_UNIX "/netbsd" #define _PATH_URANDOM "/dev/urandom" +#define _PATH_VIDEO "/dev/video" +#define _PATH_VIDEO0 "/dev/video0" /* * Provide trailing slash, since mostly used for building pathnames.
CVS commit: src/sys/arch/x68k/x68k
Module Name:src Committed By: tsutsui Date: Sat Dec 25 16:37:22 UTC 2010 Modified Files: src/sys/arch/x68k/x68k: pmap_bootstrap.c Log Message: Fix one more typo that affects x68k with 040/060. I hope this is the last one... To generate a diff of this commit: cvs rdiff -u -r1.51 -r1.52 src/sys/arch/x68k/x68k/pmap_bootstrap.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/x68k/x68k/pmap_bootstrap.c diff -u src/sys/arch/x68k/x68k/pmap_bootstrap.c:1.51 src/sys/arch/x68k/x68k/pmap_bootstrap.c:1.52 --- src/sys/arch/x68k/x68k/pmap_bootstrap.c:1.51 Sun Jun 6 04:50:08 2010 +++ src/sys/arch/x68k/x68k/pmap_bootstrap.c Sat Dec 25 16:37:22 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap_bootstrap.c,v 1.51 2010/06/06 04:50:08 mrg Exp $ */ +/* $NetBSD: pmap_bootstrap.c,v 1.52 2010/12/25 16:37:22 tsutsui Exp $ */ /* * Copyright (c) 1991, 1993 @@ -36,7 +36,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.51 2010/06/06 04:50:08 mrg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.52 2010/12/25 16:37:22 tsutsui Exp $"); #include "opt_m68k_arch.h" @@ -188,7 +188,7 @@ nl1desc = howmany(nl2desc, SG4_LEV2SIZE); ste = (st_entry_t *)kstpa; este = &ste[nl1desc]; - protoste = (paddr_t)este[SG4_LEV1SIZE] | SG_U | SG_RW | SG_V; + protoste = (paddr_t)&ste[SG4_LEV1SIZE] | SG_U | SG_RW | SG_V; while (ste < este) { *ste++ = protoste; protoste += (SG4_LEV2SIZE * sizeof(st_entry_t));
CVS commit: src/sys/arch/mvme68k/mvme68k
Module Name:src Committed By: tsutsui Date: Sat Dec 25 16:14:44 UTC 2010 Modified Files: src/sys/arch/mvme68k/mvme68k: pmap_bootstrap.c Log Message: Put somehow missed code part in rev 1.36: > Allocate lwp0upa (PA of lwp0 uarea) right after kernel rather than > between other page tables to use different mappings for ste/pte pages > as well as amiga and atari. Should resolve XXX comments in next68k and x68k. To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.44 src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.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/mvme68k/mvme68k/pmap_bootstrap.c diff -u src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c:1.43 src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c:1.44 --- src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c:1.43 Sat Dec 25 15:29:34 2010 +++ src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c Sat Dec 25 16:14:44 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap_bootstrap.c,v 1.43 2010/12/25 15:29:34 tsutsui Exp $ */ +/* $NetBSD: pmap_bootstrap.c,v 1.44 2010/12/25 16:14:44 tsutsui Exp $ */ /* * Copyright (c) 1991, 1993 @@ -38,7 +38,7 @@ #include "opt_m68k_arch.h" #include -__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.43 2010/12/25 15:29:34 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.44 2010/12/25 16:14:44 tsutsui Exp $"); #include #include @@ -122,6 +122,9 @@ * The KVA corresponding to any of these PAs is: * (PA - firstpa + KERNBASE). */ + lwp0upa = nextpa; + nextpa += USPACE; + iiomappages = m68k_btop(RELOC(intiotop_phys, u_int) - RELOC(intiobase_phys, u_int)); @@ -137,8 +140,6 @@ nextpa += PAGE_SIZE; lkptpa = nextpa; nextpa += PAGE_SIZE; - lwp0upa = nextpa; - nextpa += USPACE; kptpa = nextpa; nptpages = RELOC(Sysptsize, int) + (iiomappages + NPTEPG - 1) / NPTEPG; nextpa += nptpages * PAGE_SIZE;
CVS commit: src/sys/arch/cesfic/cesfic
Module Name:src Committed By: tsutsui Date: Sat Dec 25 16:11:12 UTC 2010 Modified Files: src/sys/arch/cesfic/cesfic: pmap_bootstrap.c Log Message: Fix another fatal typo. sigh. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/sys/arch/cesfic/cesfic/pmap_bootstrap.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/cesfic/cesfic/pmap_bootstrap.c diff -u src/sys/arch/cesfic/cesfic/pmap_bootstrap.c:1.27 src/sys/arch/cesfic/cesfic/pmap_bootstrap.c:1.28 --- src/sys/arch/cesfic/cesfic/pmap_bootstrap.c:1.27 Sat Dec 25 14:42:59 2010 +++ src/sys/arch/cesfic/cesfic/pmap_bootstrap.c Sat Dec 25 16:11:11 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap_bootstrap.c,v 1.27 2010/12/25 14:42:59 tsutsui Exp $ */ +/* $NetBSD: pmap_bootstrap.c,v 1.28 2010/12/25 16:11:11 tsutsui Exp $ */ /* * Copyright (c) 1991, 1993 @@ -36,7 +36,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.27 2010/12/25 14:42:59 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.28 2010/12/25 16:11:11 tsutsui Exp $"); #include #include @@ -215,7 +215,7 @@ i = SG4_LEV1SIZE + (nl1desc * SG4_LEV2SIZE); ste = (st_entry_t *)kstpa; ste = &ste[i + SG4_LEV2SIZE - NPTEPG / SG4_LEV3SIZE * 2]; - epte = &ste[NPTEPG / SG4_LEV3SIZE]; + este = &ste[NPTEPG / SG4_LEV3SIZE]; protoste = kptmpa | SG_U | SG_RW | SG_V; while (ste < este) { *ste++ = protoste;
CVS commit: src/sys/arch/mvme68k/mvme68k
Module Name:src Committed By: tsutsui Date: Sat Dec 25 15:29:34 UTC 2010 Modified Files: src/sys/arch/mvme68k/mvme68k: pmap_bootstrap.c Log Message: Fix harmless pasto and tweak some comments. To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.43 src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.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/mvme68k/mvme68k/pmap_bootstrap.c diff -u src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c:1.42 src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c:1.43 --- src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c:1.42 Sat Dec 25 14:43:00 2010 +++ src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c Sat Dec 25 15:29:34 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap_bootstrap.c,v 1.42 2010/12/25 14:43:00 tsutsui Exp $ */ +/* $NetBSD: pmap_bootstrap.c,v 1.43 2010/12/25 15:29:34 tsutsui Exp $ */ /* * Copyright (c) 1991, 1993 @@ -38,7 +38,7 @@ #include "opt_m68k_arch.h" #include -__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.42 2010/12/25 14:43:00 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.43 2010/12/25 15:29:34 tsutsui Exp $"); #include #include @@ -103,7 +103,7 @@ /* * Calculate important physical addresses: * - * lwp0upa lwp0 0 u-area UPAGES pages + * lwp0upa lwp0 u-area UPAGES pages * * kstpa kernel segment table 1 page (!040) * N pages (040) @@ -212,7 +212,7 @@ } /* * Initialize level 1 descriptors. We need: - * roundup(nl2desc, SG4_LEV2SIZE) / SG4_LEV2SIZE + * howmany(nl2desc, SG4_LEV2SIZE) * level 1 descriptors to map the `nl2desc' level 2's. */ nl1desc = howmany(nl2desc, SG4_LEV2SIZE); @@ -302,7 +302,7 @@ * and the software Sysptmap. */ ste = (st_entry_t *)kstpa; - pte = (st_entry_t *)kptmpa; + pte = (pt_entry_t *)kptmpa; epte = &pte[nptpages]; protoste = kptpa | SG_RW | SG_V; protopte = kptpa | PG_RW | PG_CI | PG_V; @@ -319,7 +319,7 @@ este = &este[TIA_SIZE]; while (ste < este) *ste++ = SG_NV; - epte = (st_entry_t *)kptmpa; + epte = (pt_entry_t *)kptmpa; epte = &epte[TIB_SIZE]; while (pte < epte) *pte++ = PG_NV;
CVS commit: src/sys/dev/usb
Module Name:src Committed By: wiz Date: Sat Dec 25 15:27:08 UTC 2010 Modified Files: src/sys/dev/usb: usb.h Log Message: Add missing semicolon. To generate a diff of this commit: cvs rdiff -u -r1.89 -r1.90 src/sys/dev/usb/usb.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/dev/usb/usb.h diff -u src/sys/dev/usb/usb.h:1.89 src/sys/dev/usb/usb.h:1.90 --- src/sys/dev/usb/usb.h:1.89 Sat Dec 25 14:06:14 2010 +++ src/sys/dev/usb/usb.h Sat Dec 25 15:27:08 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: usb.h,v 1.89 2010/12/25 14:06:14 jmcneill Exp $ */ +/* $NetBSD: usb.h,v 1.90 2010/12/25 15:27:08 wiz Exp $ */ /* $FreeBSD: src/sys/dev/usb/usb.h,v 1.14 1999/11/17 22:33:46 n_hibma Exp $ */ /* @@ -282,7 +282,7 @@ uByte bFunctionClass; uByte bFunctionSubClass; uByte bFunctionProtocol; - uByte iFunction + uByte iFunction; } UPACKED usb_interface_assoc_descriptor_t; #define USB_INTERFACE_ASSOC_DESCRIPTOR_SIZE 8
CVS commit: src/external/bsd/bind/include/isc
Module Name:src Committed By: christos Date: Sat Dec 25 15:26:32 UTC 2010 Modified Files: src/external/bsd/bind/include/isc: atomic.h platform.h Log Message: Fix non-threads compatibility code which was causing trouble even in the threaded version. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/bsd/bind/include/isc/atomic.h cvs rdiff -u -r1.8 -r1.9 src/external/bsd/bind/include/isc/platform.h 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/bind/include/isc/atomic.h diff -u src/external/bsd/bind/include/isc/atomic.h:1.2 src/external/bsd/bind/include/isc/atomic.h:1.3 --- src/external/bsd/bind/include/isc/atomic.h:1.2 Tue Dec 14 18:19:23 2010 +++ src/external/bsd/bind/include/isc/atomic.h Sat Dec 25 10:26:32 2010 @@ -1,9 +1,9 @@ -/* $NetBSD: atomic.h,v 1.2 2010/12/14 23:19:23 christos Exp $ */ +/* $NetBSD: atomic.h,v 1.3 2010/12/25 15:26:32 christos Exp $ */ #ifndef ISC_ATOMIC_H #define ISC_ATOMIC_H 1 -#ifdef ISC_PLATFORM_USE_THREADS +#ifdef ISC_PLATFORM_USETHREADS #include #else #define ISC_NO_ATOMIC @@ -18,7 +18,7 @@ isc_atomic_xadd(isc_int32_t *p, isc_int32_t val) { #ifdef ISC_NO_ATOMIC isc_int32_t oval = *p; - *p = val; + *p += val; return oval; #else return (isc_int32_t)atomic_add_32_nv((volatile uint32_t *)p, @@ -31,7 +31,7 @@ isc_atomic_xaddq(isc_int64_t *p, isc_int64_t val) { #ifdef ISC_NO_ATOMIC isc_int64_t oval = *p; - *p = val; + *p += val; return oval; #else return (isc_int64_t)atomic_add_64_nv((volatile uint64_t *)p, @@ -61,7 +61,7 @@ isc_atomic_cmpxchg(isc_int32_t *p, isc_int32_t cmpval, isc_int32_t val) { #ifdef ISC_NO_ATOMIC isc_int32_t oval = *p; - if (oval == val) + if (cmpval == oval) *p = val; return oval; #else Index: src/external/bsd/bind/include/isc/platform.h diff -u src/external/bsd/bind/include/isc/platform.h:1.8 src/external/bsd/bind/include/isc/platform.h:1.9 --- src/external/bsd/bind/include/isc/platform.h:1.8 Tue Dec 14 18:19:23 2010 +++ src/external/bsd/bind/include/isc/platform.h Sat Dec 25 10:26:32 2010 @@ -25,9 +25,6 @@ /* * Platform-dependent defines. */ -#ifdef ISC_PLATFORM_USE_THREADS -#include -#endif /*** *** Network.
CVS commit: src/sys/arch/hp300/include
Module Name:src Committed By: tsutsui Date: Sat Dec 25 15:05:22 UTC 2010 Modified Files: src/sys/arch/hp300/include: cpu.h Log Message: Make sure MAXADDR is unsigned otherwise it could be mangled in shift ops and causes silent hang on bootstrap. Analyzed on HP9000/362 I get today, but I'm not sure how 040 lkptpa code has worked on my HP382... To generate a diff of this commit: cvs rdiff -u -r1.63 -r1.64 src/sys/arch/hp300/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/hp300/include/cpu.h diff -u src/sys/arch/hp300/include/cpu.h:1.63 src/sys/arch/hp300/include/cpu.h:1.64 --- src/sys/arch/hp300/include/cpu.h:1.63 Wed Dec 22 02:42:27 2010 +++ src/sys/arch/hp300/include/cpu.h Sat Dec 25 15:05:22 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.h,v 1.63 2010/12/22 02:42:27 matt Exp $ */ +/* $NetBSD: cpu.h,v 1.64 2010/12/25 15:05:22 tsutsui Exp $ */ /* * Copyright (c) 1982, 1990, 1993 @@ -194,7 +194,7 @@ #define INTIOTOP (0x0060) #define EXTIOBASE (0x0060) #define EXTIOTOP (0x2000) -#define MAXADDR (0 - NBPG) +#define MAXADDR ((paddr_t)(0 - NBPG)) /* * Internal IO space:
CVS commit: src/sys/arch
Module Name:src Committed By: tsutsui Date: Sat Dec 25 14:43:00 UTC 2010 Modified Files: src/sys/arch/cesfic/cesfic: pmap_bootstrap.c src/sys/arch/hp300/hp300: pmap_bootstrap.c src/sys/arch/mvme68k/mvme68k: pmap_bootstrap.c src/sys/arch/next68k/next68k: pmap_bootstrap.c Log Message: Fix fatal typo and pasted lines slipped in the last December that prevent 68030 machines boot on these ports. (only hp300 and mvme68k have supported 030 models) Sorry for so long breakage. To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/sys/arch/cesfic/cesfic/pmap_bootstrap.c cvs rdiff -u -r1.46 -r1.47 src/sys/arch/hp300/hp300/pmap_bootstrap.c cvs rdiff -u -r1.41 -r1.42 src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c cvs rdiff -u -r1.36 -r1.37 src/sys/arch/next68k/next68k/pmap_bootstrap.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/cesfic/cesfic/pmap_bootstrap.c diff -u src/sys/arch/cesfic/cesfic/pmap_bootstrap.c:1.26 src/sys/arch/cesfic/cesfic/pmap_bootstrap.c:1.27 --- src/sys/arch/cesfic/cesfic/pmap_bootstrap.c:1.26 Fri Dec 11 22:23:08 2009 +++ src/sys/arch/cesfic/cesfic/pmap_bootstrap.c Sat Dec 25 14:42:59 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap_bootstrap.c,v 1.26 2009/12/11 22:23:08 tsutsui Exp $ */ +/* $NetBSD: pmap_bootstrap.c,v 1.27 2010/12/25 14:42:59 tsutsui Exp $ */ /* * Copyright (c) 1991, 1993 @@ -36,7 +36,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.26 2009/12/11 22:23:08 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.27 2010/12/25 14:42:59 tsutsui Exp $"); #include #include @@ -293,7 +293,7 @@ * Invalidate all remaining entries in both. */ este = (st_entry_t *)kstpa; - este = &epte[TIA_SIZE]; + este = &este[TIA_SIZE]; while (ste < este) *ste++ = SG_NV; epte = (pt_entry_t *)kptmpa; Index: src/sys/arch/hp300/hp300/pmap_bootstrap.c diff -u src/sys/arch/hp300/hp300/pmap_bootstrap.c:1.46 src/sys/arch/hp300/hp300/pmap_bootstrap.c:1.47 --- src/sys/arch/hp300/hp300/pmap_bootstrap.c:1.46 Fri Dec 11 22:23:08 2009 +++ src/sys/arch/hp300/hp300/pmap_bootstrap.c Sat Dec 25 14:43:00 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap_bootstrap.c,v 1.46 2009/12/11 22:23:08 tsutsui Exp $ */ +/* $NetBSD: pmap_bootstrap.c,v 1.47 2010/12/25 14:43:00 tsutsui Exp $ */ /* * Copyright (c) 1991, 1993 @@ -36,7 +36,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.46 2009/12/11 22:23:08 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.47 2010/12/25 14:43:00 tsutsui Exp $"); #include @@ -299,7 +299,7 @@ * Invalidate all remaining entries in both. */ este = (st_entry_t *)kstpa; - este = &epte[TIA_SIZE]; + este = &este[TIA_SIZE]; while (ste < este) *ste++ = SG_NV; epte = (pt_entry_t *)kptmpa; Index: src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c diff -u src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c:1.41 src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c:1.42 --- src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c:1.41 Sun Jun 6 04:50:07 2010 +++ src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c Sat Dec 25 14:43:00 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap_bootstrap.c,v 1.41 2010/06/06 04:50:07 mrg Exp $ */ +/* $NetBSD: pmap_bootstrap.c,v 1.42 2010/12/25 14:43:00 tsutsui Exp $ */ /* * Copyright (c) 1991, 1993 @@ -38,7 +38,7 @@ #include "opt_m68k_arch.h" #include -__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.41 2010/06/06 04:50:07 mrg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.42 2010/12/25 14:43:00 tsutsui Exp $"); #include #include @@ -316,7 +316,7 @@ * Invalidate all remaining entries in both. */ este = (st_entry_t *)kstpa; - este = &epte[TIA_SIZE]; + este = &este[TIA_SIZE]; while (ste < este) *ste++ = SG_NV; epte = (st_entry_t *)kptmpa; Index: src/sys/arch/next68k/next68k/pmap_bootstrap.c diff -u src/sys/arch/next68k/next68k/pmap_bootstrap.c:1.36 src/sys/arch/next68k/next68k/pmap_bootstrap.c:1.37 --- src/sys/arch/next68k/next68k/pmap_bootstrap.c:1.36 Sun Jun 6 04:50:08 2010 +++ src/sys/arch/next68k/next68k/pmap_bootstrap.c Sat Dec 25 14:43:00 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap_bootstrap.c,v 1.36 2010/06/06 04:50:08 mrg Exp $ */ +/* $NetBSD: pmap_bootstrap.c,v 1.37 2010/12/25 14:43:00 tsutsui Exp $ */ /* * This file was taken from mvme68k/mvme68k/pmap_bootstrap.c @@ -47,7 +47,7 @@ #include "opt_m68k_arch.h" #include -__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.36 2010/06/06 04:50:08 mrg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.37 2010/12/25 14:43:00 tsutsui Exp $"); #include #include @@ -326,7 +326,7 @@ * Invalidate all remaining entries in both. */ este = (st_entry_t *)kstpa; - este = &epte[TIA_SIZE]; + este = &este[TIA_SIZE]; while (ste < este) *ste++ = SG_NV; epte = (pt_entry_t *)kptmpa;
CVS commit: src/usr.bin/vmstat
Module Name:src Committed By: christos Date: Sat Dec 25 14:18:38 UTC 2010 Modified Files: src/usr.bin/vmstat: vmstat.c Log Message: Don't crash on old kernels that don't have the new per cpu counters. To generate a diff of this commit: cvs rdiff -u -r1.172 -r1.173 src/usr.bin/vmstat/vmstat.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/vmstat/vmstat.c diff -u src/usr.bin/vmstat/vmstat.c:1.172 src/usr.bin/vmstat/vmstat.c:1.173 --- src/usr.bin/vmstat/vmstat.c:1.172 Fri Dec 24 18:39:19 2010 +++ src/usr.bin/vmstat/vmstat.c Sat Dec 25 09:18:37 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: vmstat.c,v 1.172 2010/12/24 23:39:19 enami Exp $ */ +/* $NetBSD: vmstat.c,v 1.173 2010/12/25 14:18:37 christos Exp $ */ /*- * Copyright (c) 1998, 2000, 2001, 2007 The NetBSD Foundation, Inc. @@ -70,7 +70,7 @@ #if 0 static char sccsid[] = "@(#)vmstat.c 8.2 (Berkeley) 3/1/95"; #else -__RCSID("$NetBSD: vmstat.c,v 1.172 2010/12/24 23:39:19 enami Exp $"); +__RCSID("$NetBSD: vmstat.c,v 1.173 2010/12/25 14:18:37 christos Exp $"); #endif #endif /* not lint */ @@ -983,7 +983,8 @@ != sizeof(tci)) { warnx("Can't read cpu info from %p (%s)", ci, kvm_geterr(kd)); - continue; + (void)memset(cc, 0, sizeof(*cc)); + return; } /* Found the fake element, done */ if (tci.ci_data.cpu_qchain.cqe_prev == NULL)
CVS commit: src/sys/dev/usb
Module Name:src Committed By: jmcneill Date: Sat Dec 25 14:06:14 UTC 2010 Modified Files: src/sys/dev/usb: usb.h Log Message: add USB interface assoc descriptor (IAD) info To generate a diff of this commit: cvs rdiff -u -r1.88 -r1.89 src/sys/dev/usb/usb.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/dev/usb/usb.h diff -u src/sys/dev/usb/usb.h:1.88 src/sys/dev/usb/usb.h:1.89 --- src/sys/dev/usb/usb.h:1.88 Fri Nov 19 18:21:48 2010 +++ src/sys/dev/usb/usb.h Sat Dec 25 14:06:14 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: usb.h,v 1.88 2010/11/19 18:21:48 phx Exp $ */ +/* $NetBSD: usb.h,v 1.89 2010/12/25 14:06:14 jmcneill Exp $ */ /* $FreeBSD: src/sys/dev/usb/usb.h,v 1.14 1999/11/17 22:33:46 n_hibma Exp $ */ /* @@ -195,6 +195,7 @@ #define UDESC_INTERFACE_POWER 0x08 #define UDESC_OTG 0x09 #define UDESC_DEBUG 0x0a +#define UDESC_INTERFACE_ASSOC 0x0b #define UDESC_CS_DEVICE 0x21 /* class specific */ #define UDESC_CS_CONFIG 0x22 #define UDESC_CS_STRING 0x23 @@ -276,6 +277,18 @@ typedef struct { uByte bLength; uByte bDescriptorType; + uByte bFirstInterface; + uByte bInterfaceCount; + uByte bFunctionClass; + uByte bFunctionSubClass; + uByte bFunctionProtocol; + uByte iFunction +} UPACKED usb_interface_assoc_descriptor_t; +#define USB_INTERFACE_ASSOC_DESCRIPTOR_SIZE 8 + +typedef struct { + uByte bLength; + uByte bDescriptorType; uByte bEndpointAddress; #define UE_GET_DIR(a) ((a) & 0x80) #define UE_SET_DIR(a,d) ((a) | (((d)&1) << 7))
CVS commit: src/doc
Module Name:src Committed By: wiz Date: Sat Dec 25 12:12:50 UTC 2010 Modified Files: src/doc: 3RDPARTY Log Message: mdocml-1.10.8 out. To generate a diff of this commit: cvs rdiff -u -r1.797 -r1.798 src/doc/3RDPARTY 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.797 src/doc/3RDPARTY:1.798 --- src/doc/3RDPARTY:1.797 Fri Dec 24 02:56:56 2010 +++ src/doc/3RDPARTY Sat Dec 25 12:12:49 2010 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.797 2010/12/24 02:56:56 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.798 2010/12/25 12:12:49 wiz Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -645,7 +645,7 @@ Package: mdocml Version: 1.10.5 -Current Vers: 1.10.6 +Current Vers: 1.10.8 Maintainer: Kristaps Džonsons Archive Site: http://mdocml.bsd.lv/snapshots/ Home Page: http://mdocml.bsd.lv/
CVS commit: src/sys/dev/pci
Module Name:src Committed By: macallan Date: Sat Dec 25 11:51:21 UTC 2010 Modified Files: src/sys/dev/pci: voodoofb.c Log Message: remove some ancient, unused debug code To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/sys/dev/pci/voodoofb.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/dev/pci/voodoofb.c diff -u src/sys/dev/pci/voodoofb.c:1.25 src/sys/dev/pci/voodoofb.c:1.26 --- src/sys/dev/pci/voodoofb.c:1.25 Thu Dec 16 06:45:50 2010 +++ src/sys/dev/pci/voodoofb.c Sat Dec 25 11:51:21 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: voodoofb.c,v 1.25 2010/12/16 06:45:50 cegger Exp $ */ +/* $NetBSD: voodoofb.c,v 1.26 2010/12/25 11:51:21 macallan Exp $ */ /* * Copyright (c) 2005, 2006 Michael Lorenz @@ -32,7 +32,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: voodoofb.c,v 1.25 2010/12/16 06:45:50 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: voodoofb.c,v 1.26 2010/12/25 11:51:21 macallan Exp $"); #include #include @@ -159,10 +159,6 @@ int, uint32_t, uint32_t); static void voodoofb_feed_line(struct voodoofb_softc *, int, uint8_t *); -#ifdef VOODOOFB_DEBUG -static void voodoofb_showpal(struct voodoofb_softc *); -#endif - static void voodoofb_wait_idle(struct voodoofb_softc *); #ifdef VOODOOFB_ENABLE_INTR @@ -892,19 +888,6 @@ voodoo3_write32(sc, LAUNCH_2D, latch); } -#ifdef VOODOOFB_DEBUG -static void -voodoofb_showpal(struct voodoofb_softc *sc) -{ - int i, x = 0; - - for (i = 0; i < 16; i++) { - voodoofb_rectfill(sc, x, 0, 64, 64, i); - x += 64; - } -} -#endif - #if 0 static int voodoofb_allocattr(void *cookie, int fg, int bg, int flags, long *attrp)
CVS commit: src/lib/libcurses
Module Name:src Committed By: blymn Date: Sat Dec 25 10:08:21 UTC 2010 Modified Files: src/lib/libcurses: attributes.c Log Message: Little bit more debug information. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/lib/libcurses/attributes.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libcurses/attributes.c diff -u src/lib/libcurses/attributes.c:1.20 src/lib/libcurses/attributes.c:1.21 --- src/lib/libcurses/attributes.c:1.20 Wed Feb 3 15:34:40 2010 +++ src/lib/libcurses/attributes.c Sat Dec 25 10:08:20 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: attributes.c,v 1.20 2010/02/03 15:34:40 roy Exp $ */ +/* $NetBSD: attributes.c,v 1.21 2010/12/25 10:08:20 blymn Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ #include #ifndef lint -__RCSID("$NetBSD: attributes.c,v 1.20 2010/02/03 15:34:40 roy Exp $"); +__RCSID("$NetBSD: attributes.c,v 1.21 2010/12/25 10:08:20 blymn Exp $"); #endif/* not lint */ #include "curses.h" @@ -358,6 +358,9 @@ __CTRACE(__CTRACE_ATTR, "termattrs\n"); #endif if (exit_attribute_mode != NULL) { +#ifdef DEBUG + __CTRACE(__CTRACE_ATTR, "termattrs: have exit attribute mode\n"); +#endif if (enter_blink_mode != NULL) ch |= __BLINK; if (enter_bold_mode != NULL)
CVS commit: src/lib/libcurses
Module Name:src Committed By: blymn Date: Sat Dec 25 10:05:08 UTC 2010 Modified Files: src/lib/libcurses: color.c Log Message: Ignore request to change the values of colour pair 0 Explicitly set foreground and/or background colours when -1 is passed to assume_default_colors() To generate a diff of this commit: cvs rdiff -u -r1.35 -r1.36 src/lib/libcurses/color.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libcurses/color.c diff -u src/lib/libcurses/color.c:1.35 src/lib/libcurses/color.c:1.36 --- src/lib/libcurses/color.c:1.35 Wed Feb 3 15:34:40 2010 +++ src/lib/libcurses/color.c Sat Dec 25 10:05:08 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: color.c,v 1.35 2010/02/03 15:34:40 roy Exp $ */ +/* $NetBSD: color.c,v 1.36 2010/12/25 10:05:08 blymn Exp $ */ /* * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ #include #ifndef lint -__RCSID("$NetBSD: color.c,v 1.35 2010/02/03 15:34:40 roy Exp $"); +__RCSID("$NetBSD: color.c,v 1.36 2010/12/25 10:05:08 blymn Exp $"); #endif/* not lint */ #include "curses.h" @@ -274,6 +274,10 @@ if (pair < 0 || pair >= COLOR_PAIRS) return (ERR); + + if (pair == 0) /* Ignore request for pair 0, it is default. */ + return OK; + if (fore >= COLORS) return (ERR); if (back >= COLORS) @@ -424,7 +428,7 @@ #ifdef DEBUG __CTRACE(__CTRACE_COLOR, "use_default_colors\n"); #endif - + return(assume_default_colors(-1, -1)); } @@ -433,12 +437,24 @@ * Set the default foreground and background colours. */ int -assume_default_colors(short fore, short back) +assume_default_colors(short arg_fore, short arg_back) { + short fore, back; + + fore = arg_fore; + back = arg_back; + #ifdef DEBUG __CTRACE(__CTRACE_COLOR, "assume_default_colors: %d, %d\n", fore, back); + __CTRACE(__CTRACE_COLOR, "assume_default_colors: default_colour = %d, pair_number = %d\n", __default_color, PAIR_NUMBER(__default_color)); #endif + + if (arg_fore == -1) + fore = COLOR_WHITE; + if (arg_back == -1) + back = COLOR_BLACK; + /* Swap red/blue and yellow/cyan */ if (_cursesi_screen->color_type == COLOR_OTHER) { switch (fore) {
CVS commit: src/lib/libcurses
Module Name:src Committed By: blymn Date: Sat Dec 25 09:59:52 UTC 2010 Modified Files: src/lib/libcurses: border.c Log Message: Allow attributes to be applied to the default line drawing characters by just passing attributes as arguments to the wborder call. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/lib/libcurses/border.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libcurses/border.c diff -u src/lib/libcurses/border.c:1.13 src/lib/libcurses/border.c:1.14 --- src/lib/libcurses/border.c:1.13 Tue Feb 23 19:48:26 2010 +++ src/lib/libcurses/border.c Sat Dec 25 09:59:52 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: border.c,v 1.13 2010/02/23 19:48:26 drochner Exp $ */ +/* $NetBSD: border.c,v 1.14 2010/12/25 09:59:52 blymn Exp $ */ /* * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ #include #ifndef lint -__RCSID("$NetBSD: border.c,v 1.13 2010/02/23 19:48:26 drochner Exp $"); +__RCSID("$NetBSD: border.c,v 1.14 2010/12/25 09:59:52 blymn Exp $"); #endif/* not lint */ #include @@ -161,20 +161,23 @@ cchar_t ls, rs, ts, bs, tl, tr, bl, br; cchar_t *lsp, *rsp, *tsp, *bsp, *tlp, *trp, *blp, *brp; -#define S(in, out) \ +#define S(in, out, def) \ if (in & __CHARTEXT) { \ __cursesi_chtype_to_cchar(in, &out); \ - out##p = &out; \ - } else \ - out##p = NULL - S(left, ls); - S(right, rs); - S(top, ts); - S(bottom, bs); - S(topleft, tl); - S(topright, tr); - S(botleft, bl); - S(botright, br); + } else { \ + memcpy(&out, def, sizeof(cchar_t)); \ + out.attributes |= in & __ATTRIBUTES; \ + } \ + out##p = &out; + + S(left, ls, WACS_VLINE); + S(right, rs, WACS_VLINE); + S(top, ts, WACS_HLINE); + S(bottom, bs, WACS_HLINE); + S(topleft, tl, WACS_ULCORNER); + S(topright, tr, WACS_URCORNER); + S(botleft, bl, WACS_LLCORNER); + S(botright, br, WACS_LRCORNER); #undef S return wborder_set(win, lsp, rsp, tsp, bsp, tlp, trp, blp, brp); #endif /* HAVE_WCHAR */