CVS commit: src/lib/libcurses/PSD.doc
Module Name:src
Committed By: christos
Date: Tue Jul 15 11:19:08 UTC 2014
Modified Files:
src/lib/libcurses/PSD.doc: Makefile
Log Message:
stopgap for non-netbsd build.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/lib/libcurses/PSD.doc/Makefile
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/PSD.doc/Makefile
diff -u src/lib/libcurses/PSD.doc/Makefile:1.12 src/lib/libcurses/PSD.doc/Makefile:1.13
--- src/lib/libcurses/PSD.doc/Makefile:1.12 Sat Jul 5 15:22:42 2014
+++ src/lib/libcurses/PSD.doc/Makefile Tue Jul 15 07:19:08 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2014/07/05 19:22:42 dholland Exp $
+# $NetBSD: Makefile,v 1.13 2014/07/15 11:19:08 christos Exp $
# from: @(#)Makefile 8.2 (Berkeley) 5/23/94
SECTION=reference/ref3
@@ -23,7 +23,12 @@ CLEANFILES+= ${CEXAMPLES} intro.2.tbl
# Don't re-run vgrind unless you want to patch the output files.
# XXXBUILDSH: can we use TOOL_VGRIND here ?
+.if exists(/usr/libexec/vfontedpr)
VFONT= /usr/libexec/vfontedpr
+.else
+VFONT= ${TOOL_CAT}
+.endif
+
.c.gr:
${VFONT} ${.IMPSRC} | grep -v ^'wh ${.TARGET}
CVS commit: src/sys/fs/msdosfs
Module Name:src
Committed By: christos
Date: Tue Jul 15 11:43:54 UTC 2014
Modified Files:
src/sys/fs/msdosfs: msdosfs_vfsops.c
Log Message:
Correct the bread size of struct fsinfo from Gerald Lee at DELL dot com
To generate a diff of this commit:
cvs rdiff -u -r1.112 -r1.113 src/sys/fs/msdosfs/msdosfs_vfsops.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/fs/msdosfs/msdosfs_vfsops.c
diff -u src/sys/fs/msdosfs/msdosfs_vfsops.c:1.112 src/sys/fs/msdosfs/msdosfs_vfsops.c:1.113
--- src/sys/fs/msdosfs/msdosfs_vfsops.c:1.112 Wed Jul 9 05:00:18 2014
+++ src/sys/fs/msdosfs/msdosfs_vfsops.c Tue Jul 15 07:43:54 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: msdosfs_vfsops.c,v 1.112 2014/07/09 09:00:18 maxv Exp $ */
+/* $NetBSD: msdosfs_vfsops.c,v 1.113 2014/07/15 11:43:54 christos Exp $ */
/*-
* Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
@@ -48,7 +48,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: msdosfs_vfsops.c,v 1.112 2014/07/09 09:00:18 maxv Exp $);
+__KERNEL_RCSID(0, $NetBSD: msdosfs_vfsops.c,v 1.113 2014/07/15 11:43:54 christos Exp $);
#if defined(_KERNEL_OPT)
#include opt_compat_netbsd.h
@@ -741,6 +741,7 @@ msdosfs_mountfs(struct vnode *devvp, str
*/
if (pmp-pm_fsinfo) {
struct fsinfo *fp;
+ const int rdsz = roundup(sizeof(*fp), pmp-pm_BytesPerSec);
/*
* XXX If the fsinfo block is stored on media with
@@ -748,7 +749,7 @@ msdosfs_mountfs(struct vnode *devvp, str
* padded at the end or in the middle?
*/
if ((error = bread(devvp, de_bn2kb(pmp, pmp-pm_fsinfo),
- pmp-pm_BytesPerSec, NOCRED, 0, bp)) != 0)
+ rdsz, NOCRED, 0, bp)) != 0)
goto error_exit;
fp = (struct fsinfo *)bp-b_data;
if (!memcmp(fp-fsisig1, RRaA, 4)
CVS commit: src/usr.bin/vgrind
Module Name:src
Committed By: christos
Date: Tue Jul 15 13:17:15 UTC 2014
Modified Files:
src/usr.bin/vgrind: Makefile extern.h pathnames.h regexp.c vfontedpr.c
Removed Files:
src/usr.bin/vgrind: vgrindefs.c
Log Message:
first attempt at toolification.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/usr.bin/vgrind/Makefile
cvs rdiff -u -r1.5 -r1.6 src/usr.bin/vgrind/extern.h
cvs rdiff -u -r1.4 -r1.5 src/usr.bin/vgrind/pathnames.h
cvs rdiff -u -r1.12 -r1.13 src/usr.bin/vgrind/regexp.c
cvs rdiff -u -r1.14 -r1.15 src/usr.bin/vgrind/vfontedpr.c
cvs rdiff -u -r1.10 -r0 src/usr.bin/vgrind/vgrindefs.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/vgrind/Makefile
diff -u src/usr.bin/vgrind/Makefile:1.21 src/usr.bin/vgrind/Makefile:1.22
--- src/usr.bin/vgrind/Makefile:1.21 Tue Apr 14 18:15:28 2009
+++ src/usr.bin/vgrind/Makefile Tue Jul 15 09:17:15 2014
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2009/04/14 22:15:28 lukem Exp $
+# $NetBSD: Makefile,v 1.22 2014/07/15 13:17:15 christos Exp $
# @(#)Makefile 8.1 (Berkeley) 6/9/93
+WARNS=6
.include bsd.own.mk
PROG= vfontedpr
@@ -13,8 +14,8 @@ CLEANFILES+=vgrindefs.src.db
FILES=tmac.vgrind vgrindefs.src vgrindefs.src.db
FILESNAME_vgrindefs.src= vgrindefs
FILESNAME_vgrindefs.src.db= vgrindefs.db
-FILESDIR= /usr/share/misc
-FILESDIR_tmac.vgrind= /usr/share/tmac
+FILESDIR?= /usr/share/misc
+FILESDIR_tmac.vgrind?= /usr/share/tmac
FILESNAME_tmac.vgrind= vgrind.tmac
.endif
@@ -35,8 +36,7 @@ CAP_MKDB_ENDIAN=
.if ${MKSHARE} != no
vgrindefs.src.db: vgrindefs.src
${_MKTARGET_CREATE}
- ${TOOL_CAP_MKDB} ${CAP_MKDB_ENDIAN} -f vgrindefs.src \
- ${.CURDIR}/vgrindefs.src
+ ${TOOL_CAP_MKDB} ${CAP_MKDB_ENDIAN} -f vgrindefs.src ${.ALLSRC}
.else
vgrindefs.src.db:
.endif
Index: src/usr.bin/vgrind/extern.h
diff -u src/usr.bin/vgrind/extern.h:1.5 src/usr.bin/vgrind/extern.h:1.6
--- src/usr.bin/vgrind/extern.h:1.5 Fri Apr 23 18:14:57 2004
+++ src/usr.bin/vgrind/extern.h Tue Jul 15 09:17:15 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.5 2004/04/23 22:14:57 christos Exp $ */
+/* $NetBSD: extern.h,v 1.6 2014/07/15 13:17:15 christos Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -32,9 +32,8 @@
* @(#)extern.h 8.1 (Berkeley) 6/6/93
*/
-typedef int boolean;
-extern boolean x_escaped;/* if last character was an escape */
+extern bool x_escaped; /* if last character was an escape */
extern char*x_start; /* start of the current string */
extern char*l_acmbeg; /* string introducing a comment */
extern char*l_acmend; /* string ending a comment */
@@ -46,11 +45,11 @@ extern char*l_combeg; /
extern char*l_comend; /* string ending a comment */
extern char l_escape; /* character used to escape characters */
extern char*l_keywds[]; /* keyword table address */
-extern boolean l_onecase; /* upper and lower case are equivalent */
+extern bool l_onecase; /* upper and lower case are equivalent */
extern char*l_prcbeg; /* regular expr for procedure begin */
extern char*l_strbeg; /* delimiter for string constant */
extern char*l_strend; /* delimiter for string constant */
-extern boolean l_toplex; /* procedures only defined at top lex level */
+extern bool l_toplex; /* procedures only defined at top lex level */
extern const char *language; /* the language indicator */
#include sys/cdefs.h
Index: src/usr.bin/vgrind/pathnames.h
diff -u src/usr.bin/vgrind/pathnames.h:1.4 src/usr.bin/vgrind/pathnames.h:1.5
--- src/usr.bin/vgrind/pathnames.h:1.4 Thu Aug 7 07:17:00 2003
+++ src/usr.bin/vgrind/pathnames.h Tue Jul 15 09:17:15 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: pathnames.h,v 1.4 2003/08/07 11:17:00 agc Exp $ */
+/* $NetBSD: pathnames.h,v 1.5 2014/07/15 13:17:15 christos Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -31,4 +31,6 @@
* @(#)pathnames.h 8.1 (Berkeley) 6/6/93
*/
+#ifndef _PATH_VGRINDEFS
#define _PATH_VGRINDEFS /usr/share/misc/vgrindefs
+#endif
Index: src/usr.bin/vgrind/regexp.c
diff -u src/usr.bin/vgrind/regexp.c:1.12 src/usr.bin/vgrind/regexp.c:1.13
--- src/usr.bin/vgrind/regexp.c:1.12 Tue Mar 20 16:34:59 2012
+++ src/usr.bin/vgrind/regexp.c Tue Jul 15 09:17:15 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: regexp.c,v 1.12 2012/03/20 20:34:59 matt Exp $ */
+/* $NetBSD: regexp.c,v 1.13 2014/07/15 13:17:15 christos Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -30,6 +30,10 @@
* SUCH DAMAGE.
*/
+#if HAVE_NBTOOL_CONFIG_H
+#include nbtool_config.h
+#endif
+
#include sys/cdefs.h
#ifndef lint
__COPYRIGHT(@(#) Copyright (c) 1980, 1993\
@@ -40,27 +44,31 @@ __COPYRIGHT(@(#) Copyright (c) 1980, 19
#if 0
static char sccsid[] = @(#)regexp.c
CVS commit: src/tools/vgrind
Module Name:src
Committed By: christos
Date: Tue Jul 15 13:19:13 UTC 2014
Added Files:
src/tools/vgrind: Makefile
Log Message:
build glue
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/tools/vgrind/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/tools/vgrind/Makefile
diff -u /dev/null src/tools/vgrind/Makefile:1.1
--- /dev/null Tue Jul 15 09:19:13 2014
+++ src/tools/vgrind/Makefile Tue Jul 15 09:19:13 2014
@@ -0,0 +1,11 @@
+# $NetBSD: Makefile,v 1.1 2014/07/15 13:19:13 christos Exp $
+
+HOSTPROGNAME= nbvfontedpr
+HOST_BINDIR= ${TOOLDIR}/libexec
+HOST_SRCDIR= usr.bin/vgrind
+VGDEFDIR= ${TOOLDIR}/share/misc
+HOST_CPPFLAGS= -D_PATH_VGRINDEFS=\${VGDEFDIR}/vgrindefs\
+FILESDIR=${VGDEFDIR}
+FILESDIR_tmac.vgrind=${VGDEFDIR}
+
+.include ${.CURDIR}/../Makefile.host
CVS commit: src/tools
Module Name:src Committed By: christos Date: Tue Jul 15 13:19:44 UTC 2014 Modified Files: src/tools: Makefile Log Message: descend to vgrind To generate a diff of this commit: cvs rdiff -u -r1.175 -r1.176 src/tools/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.175 src/tools/Makefile:1.176 --- src/tools/Makefile:1.175 Sun Jun 15 10:36:57 2014 +++ src/tools/Makefile Tue Jul 15 09:19:44 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.175 2014/06/15 14:36:57 pooka Exp $ +# $NetBSD: Makefile,v 1.176 2014/07/15 13:19:44 christos Exp $ .include bsd.own.mk .include bsd.endian.mk @@ -117,7 +117,7 @@ SUBDIR += .WAIT texinfo \ .WAIT paxctl \ .WAIT fdisk \ .WAIT installboot \ - pwd_mkdb strfile sunlabel zic + pwd_mkdb strfile sunlabel vgrind zic .endif SUBDIR+= stat .WAIT config
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Tue Jul 15 13:22:39 UTC 2014
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Add vfontedpr
To generate a diff of this commit:
cvs rdiff -u -r1.820 -r1.821 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.820 src/share/mk/bsd.own.mk:1.821
--- src/share/mk/bsd.own.mk:1.820 Sun Jul 6 14:22:03 2014
+++ src/share/mk/bsd.own.mk Tue Jul 15 09:22:39 2014
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.820 2014/07/06 18:22:03 dholland Exp $
+# $NetBSD: bsd.own.mk,v 1.821 2014/07/15 13:22:39 christos Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -377,6 +377,7 @@ TOOL_TBL= ${TOOLDIR}/bin/${_TOOL_PREFIX
TOOL_TIC= ${TOOLDIR}/bin/${_TOOL_PREFIX}tic
TOOL_UUDECODE= ${TOOLDIR}/bin/${_TOOL_PREFIX}uudecode
TOOL_VGRIND= ${TOOLDIR}/bin/${_TOOL_PREFIX}vgrind -f
+TOOL_VFONTEDPR ${TOOLDIR}/libexec/${_TOOL_PREFIX}/vfontedpr
TOOL_ZIC= ${TOOLDIR}/bin/${_TOOL_PREFIX}zic
.else # USETOOLS != yes # } {
@@ -480,6 +481,7 @@ TOOL_TBL= tbl
TOOL_TIC= tic
TOOL_UUDECODE= uudecode
TOOL_VGRIND= vgrind -f
+TOOL_VFONTEDPR /usr/libexec/vfontedpr
TOOL_ZIC= zic
.endif # USETOOLS != yes # }
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Tue Jul 15 13:25:40 UTC 2014
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
fix typo
To generate a diff of this commit:
cvs rdiff -u -r1.821 -r1.822 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.821 src/share/mk/bsd.own.mk:1.822
--- src/share/mk/bsd.own.mk:1.821 Tue Jul 15 09:22:39 2014
+++ src/share/mk/bsd.own.mk Tue Jul 15 09:25:40 2014
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.821 2014/07/15 13:22:39 christos Exp $
+# $NetBSD: bsd.own.mk,v 1.822 2014/07/15 13:25:40 christos Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -377,7 +377,7 @@ TOOL_TBL= ${TOOLDIR}/bin/${_TOOL_PREFIX
TOOL_TIC= ${TOOLDIR}/bin/${_TOOL_PREFIX}tic
TOOL_UUDECODE= ${TOOLDIR}/bin/${_TOOL_PREFIX}uudecode
TOOL_VGRIND= ${TOOLDIR}/bin/${_TOOL_PREFIX}vgrind -f
-TOOL_VFONTEDPR ${TOOLDIR}/libexec/${_TOOL_PREFIX}/vfontedpr
+TOOL_VFONTEDPR= ${TOOLDIR}/libexec/${_TOOL_PREFIX}/vfontedpr
TOOL_ZIC= ${TOOLDIR}/bin/${_TOOL_PREFIX}zic
.else # USETOOLS != yes # } {
@@ -481,7 +481,7 @@ TOOL_TBL= tbl
TOOL_TIC= tic
TOOL_UUDECODE= uudecode
TOOL_VGRIND= vgrind -f
-TOOL_VFONTEDPR /usr/libexec/vfontedpr
+TOOL_VFONTEDPR= /usr/libexec/vfontedpr
TOOL_ZIC= zic
.endif # USETOOLS != yes # }
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Tue Jul 15 13:27:04 UTC 2014
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
stray slash
To generate a diff of this commit:
cvs rdiff -u -r1.822 -r1.823 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.822 src/share/mk/bsd.own.mk:1.823
--- src/share/mk/bsd.own.mk:1.822 Tue Jul 15 09:25:40 2014
+++ src/share/mk/bsd.own.mk Tue Jul 15 09:27:04 2014
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.822 2014/07/15 13:25:40 christos Exp $
+# $NetBSD: bsd.own.mk,v 1.823 2014/07/15 13:27:04 christos Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -377,7 +377,7 @@ TOOL_TBL= ${TOOLDIR}/bin/${_TOOL_PREFIX
TOOL_TIC= ${TOOLDIR}/bin/${_TOOL_PREFIX}tic
TOOL_UUDECODE= ${TOOLDIR}/bin/${_TOOL_PREFIX}uudecode
TOOL_VGRIND= ${TOOLDIR}/bin/${_TOOL_PREFIX}vgrind -f
-TOOL_VFONTEDPR= ${TOOLDIR}/libexec/${_TOOL_PREFIX}/vfontedpr
+TOOL_VFONTEDPR= ${TOOLDIR}/libexec/${_TOOL_PREFIX}vfontedpr
TOOL_ZIC= ${TOOLDIR}/bin/${_TOOL_PREFIX}zic
.else # USETOOLS != yes # } {
CVS commit: src/lib/libcurses/PSD.doc
Module Name:src
Committed By: christos
Date: Tue Jul 15 13:27:58 UTC 2014
Modified Files:
src/lib/libcurses/PSD.doc: Makefile
Log Message:
Use TOOL_VFONTEDPR
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/lib/libcurses/PSD.doc/Makefile
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/PSD.doc/Makefile
diff -u src/lib/libcurses/PSD.doc/Makefile:1.13 src/lib/libcurses/PSD.doc/Makefile:1.14
--- src/lib/libcurses/PSD.doc/Makefile:1.13 Tue Jul 15 07:19:08 2014
+++ src/lib/libcurses/PSD.doc/Makefile Tue Jul 15 09:27:58 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2014/07/15 11:19:08 christos Exp $
+# $NetBSD: Makefile,v 1.14 2014/07/15 13:27:58 christos Exp $
# from: @(#)Makefile 8.2 (Berkeley) 5/23/94
SECTION=reference/ref3
@@ -20,17 +20,10 @@ CLEANFILES+= ${CEXAMPLES} intro.2.tbl
# bold font, and comments in italics.
#
-
# Don't re-run vgrind unless you want to patch the output files.
-# XXXBUILDSH: can we use TOOL_VGRIND here ?
-.if exists(/usr/libexec/vfontedpr)
-VFONT= /usr/libexec/vfontedpr
-.else
-VFONT= ${TOOL_CAT}
-.endif
.c.gr:
- ${VFONT} ${.IMPSRC} | grep -v ^'wh ${.TARGET}
+ ${TOOL_VFONTEDPR} ${.IMPSRC} | grep -v ^'wh ${.TARGET}
# Unfortunately our make doesn't handle single-suffix rules.
intro.2.tbl: intro.2
CVS commit: src/tests/lib/libc/gen
Module Name:src Committed By: gson Date: Tue Jul 15 14:56:35 UTC 2014 Modified Files: src/tests/lib/libc/gen: t_sleep.c Log Message: space after comma To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/tests/lib/libc/gen/t_sleep.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_sleep.c diff -u src/tests/lib/libc/gen/t_sleep.c:1.7 src/tests/lib/libc/gen/t_sleep.c:1.8 --- src/tests/lib/libc/gen/t_sleep.c:1.7 Fri Apr 12 17:13:55 2013 +++ src/tests/lib/libc/gen/t_sleep.c Tue Jul 15 14:56:34 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: t_sleep.c,v 1.7 2013/04/12 17:13:55 christos Exp $ */ +/* $NetBSD: t_sleep.c,v 1.8 2014/07/15 14:56:34 gson Exp $ */ /*- * Copyright (c) 2006 Frank Kardel @@ -69,7 +69,7 @@ * penultimate pass, and the KEVNT_TIMEOUT on the final pass. We * set KEVNT_TIMEOUT just barely long enough to put it into the * last test pass, and set MAXSLEEP a couple seconds longer than - * necessary,in order to avoid a QEMU bug which nearly doubles + * necessary, in order to avoid a QEMU bug which nearly doubles * some timers. */
CVS commit: src/tools/vgrind
Module Name:src
Committed By: christos
Date: Tue Jul 15 16:04:35 UTC 2014
Modified Files:
src/tools/vgrind: Makefile
Log Message:
use host rules for files.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tools/vgrind/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/vgrind/Makefile
diff -u src/tools/vgrind/Makefile:1.1 src/tools/vgrind/Makefile:1.2
--- src/tools/vgrind/Makefile:1.1 Tue Jul 15 09:19:13 2014
+++ src/tools/vgrind/Makefile Tue Jul 15 12:04:35 2014
@@ -1,11 +1,18 @@
-# $NetBSD: Makefile,v 1.1 2014/07/15 13:19:13 christos Exp $
+# $NetBSD: Makefile,v 1.2 2014/07/15 16:04:35 christos Exp $
HOSTPROGNAME= nbvfontedpr
HOST_BINDIR= ${TOOLDIR}/libexec
HOST_SRCDIR= usr.bin/vgrind
-VGDEFDIR= ${TOOLDIR}/share/misc
-HOST_CPPFLAGS= -D_PATH_VGRINDEFS=\${VGDEFDIR}/vgrindefs\
-FILESDIR=${VGDEFDIR}
-FILESDIR_tmac.vgrind=${VGDEFDIR}
+HOST_FILESDIR= ${TOOLDIR}/share/misc
+HOST_CPPFLAGS= -D_PATH_VGRINDEFS=\${HOST_FILESDIR}/vgrindefs\
+HOSTFILES= vgrindefs vgrindefs.db
+NOSHARE=# defined
+CLEANFILES+= ${HOSTFILES}
.include ${.CURDIR}/../Makefile.host
+
+vgrindefs: vgrindefs.src
+ cp ${.ALLSRC} ${.TARGET}
+
+vgrindefs.db: vgrindefs
+ ${TOOL_CAP_MKDB} -f ${.ALLSRC} ${.ALLSRC}
CVS commit: src/games/tetris
Module Name:src Committed By: wiz Date: Tue Jul 15 16:17:15 UTC 2014 Modified Files: src/games/tetris: tetris.6 Log Message: Bump date for -c (exactly one year after previous bump) To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/games/tetris/tetris.6 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/games/tetris/tetris.6 diff -u src/games/tetris/tetris.6:1.13 src/games/tetris/tetris.6:1.14 --- src/games/tetris/tetris.6:1.13 Sun Jul 13 17:38:38 2014 +++ src/games/tetris/tetris.6 Tue Jul 15 16:17:15 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: tetris.6,v 1.13 2014/07/13 17:38:38 pgoyette Exp $ +.\ $NetBSD: tetris.6,v 1.14 2014/07/15 16:17:15 wiz Exp $ .\ .\ Copyright (c) 1992, 1993 .\ The Regents of the University of California. All rights reserved. @@ -32,7 +32,7 @@ .\ .\ @(#)tetris.6 8.1 (Berkeley) 5/31/93 .\ -.Dd July 13, 2013 +.Dd July 13, 2014 .Dt TETRIS 6 .Os .Sh NAME
CVS commit: src/external/gpl3/gdb/dist/gdb
Module Name:src
Committed By: christos
Date: Tue Jul 15 17:35:39 UTC 2014
Modified Files:
src/external/gpl3/gdb/dist/gdb: nbsd-thread.c
Log Message:
replace the old macros with the function names like the rest of the code did.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/external/gpl3/gdb/dist/gdb/nbsd-thread.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/gpl3/gdb/dist/gdb/nbsd-thread.c
diff -u src/external/gpl3/gdb/dist/gdb/nbsd-thread.c:1.19 src/external/gpl3/gdb/dist/gdb/nbsd-thread.c:1.20
--- src/external/gpl3/gdb/dist/gdb/nbsd-thread.c:1.19 Sun Jun 22 19:52:58 2014
+++ src/external/gpl3/gdb/dist/gdb/nbsd-thread.c Tue Jul 15 13:35:39 2014
@@ -83,12 +83,6 @@ struct td_proc_callbacks_t nbsd_thread_c
static ptid_t find_active_thread (void);
static void nbsd_find_new_threads (struct target_ops *);
-#define GET_PID(ptid) ptid_get_pid (ptid)
-#define GET_LWP(ptid) ptid_get_lwp (ptid)
-
-#define IS_LWP(ptid) (GET_LWP (ptid) != 0)
-
-#define BUILD_LWP(lwp, ptid) ptid_build (GET_PID(ptid), (lwp), 0)
static td_proc_t *main_ta;
@@ -143,7 +137,8 @@ nbsd_thread_activate (void)
nbsd_thread_active = 1;
main_ptid = inferior_ptid;
cached_thread = minus_one_ptid;
- thread_change_ptid(inferior_ptid, BUILD_LWP(1, inferior_ptid));
+ thread_change_ptid(inferior_ptid,
+ ptid_build (ptid_get_pid (inferior_ptid), 1, 0));
nbsd_find_new_threads (NULL);
inferior_ptid = find_active_thread ();
}
@@ -280,10 +275,11 @@ find_active_thread (void)
if (target_has_execution)
{
pl.pl_lwpid = 0;
- val = ptrace (PT_LWPINFO, GET_PID(inferior_ptid), (void *)pl, sizeof(pl));
+ val = ptrace (PT_LWPINFO, ptid_get_pid(inferior_ptid), (void *)pl, sizeof(pl));
while ((val != -1) (pl.pl_lwpid != 0)
- (pl.pl_event != PL_EVENT_SIGNAL))
- val = ptrace (PT_LWPINFO, GET_PID(inferior_ptid), (void *)pl, sizeof(pl));
+ (pl.pl_event != PL_EVENT_SIGNAL)) {
+ val = ptrace (PT_LWPINFO, ptid_get_pid(inferior_ptid), (void *)pl, sizeof(pl));
+}
if (pl.pl_lwpid == 0)
/* found no active thread, stay with current */
pl.pl_lwpid = inferior_ptid.lwp;
@@ -293,7 +289,7 @@ find_active_thread (void)
return inferior_ptid;
}
- cached_thread = BUILD_LWP (pl.pl_lwpid, main_ptid);
+ cached_thread = ptid_build (ptid_get_pid (main_ptid), pl.pl_lwpid, 0);
return cached_thread;
}
@@ -341,8 +337,8 @@ nbsd_thread_fetch_registers (struct targ
if (!target_has_execution)
{
- inferior_ptid = pid_to_ptid ((GET_LWP (inferior_ptid) 16) |
-GET_PID (inferior_ptid));
+ inferior_ptid = pid_to_ptid ((ptid_get_lwp (inferior_ptid) 16) |
+ptid_get_pid (inferior_ptid));
}
beneath-to_fetch_registers (beneath, cache, regno);
@@ -418,11 +414,11 @@ nbsd_pid_to_str (struct target_ops *ops,
td_thread_t *th;
char name[32];
- if ((GET_LWP(ptid) == 0)
+ if ((ptid_get_lwp(ptid) == 0)
(nbsd_thread_active == 0))
-sprintf (buf, process %d, GET_PID (ptid));
+sprintf (buf, process %d, ptid_get_pid (ptid));
else
-sprintf (buf, LWP %ld, GET_LWP (ptid));
+sprintf (buf, LWP %ld, ptid_get_lwp (ptid));
return buf;
}
@@ -440,7 +436,7 @@ nbsd_add_to_thread_list (bfd *abfd, asec
regval = atoi (bfd_section_name (abfd, asect) + 5);
- add_thread (BUILD_LWP(regval, main_ptid));
+ add_thread (ptid_build (ptid_get_pid (main_ptid), regval, 0));
}
#endif
@@ -505,11 +501,11 @@ nbsd_thread_alive (struct target_ops *op
if (nbsd_thread_active)
{
- if (IS_LWP (ptid))
+ if (ptid_lwp_p (ptid))
{
struct ptrace_lwpinfo pl;
- pl.pl_lwpid = GET_LWP (ptid);
- val = ptrace (PT_LWPINFO, GET_PID (ptid), (void *)pl, sizeof(pl));
+ pl.pl_lwpid = ptid_get_lwp (ptid);
+ val = ptrace (PT_LWPINFO, ptid_get_pid (ptid), (void *)pl, sizeof(pl));
if (val == -1)
val = 0;
else
@@ -553,13 +549,13 @@ nbsd_find_new_threads (struct target_ops
{
struct ptrace_lwpinfo pl;
pl.pl_lwpid = 0;
- retval = ptrace (PT_LWPINFO, GET_PID(inferior_ptid), (void *)pl, sizeof(pl));
+ retval = ptrace (PT_LWPINFO, ptid_get_pid(inferior_ptid), (void *)pl, sizeof(pl));
while ((retval != -1) pl.pl_lwpid != 0)
{
- ptid = BUILD_LWP (pl.pl_lwpid, main_ptid);
+ ptid = ptid_build (ptid_get_pid (main_ptid), pl.pl_lwpid, 0);
if (!in_thread_list (ptid))
add_thread (ptid);
- retval = ptrace (PT_LWPINFO, GET_PID(inferior_ptid), (void *)pl, sizeof(pl));
+ retval = ptrace (PT_LWPINFO, ptid_get_pid(inferior_ptid), (void *)pl, sizeof(pl));
}
}
}
@@ -668,7 +664,7 @@ nbsd_thread_proc_getregs (void *arg, int
{
/* Fetching registers from a live process requires that
inferior_ptid is a LWP value rather than a thread value. */
- inferior_ptid = BUILD_LWP (lwp, main_ptid);
+ inferior_ptid =
CVS commit: src/external/gpl3/gdb/dist/gdb
Module Name:src Committed By: christos Date: Tue Jul 15 17:35:54 UTC 2014 Modified Files: src/external/gpl3/gdb/dist/gdb: amd64bsd-nat.c armnbsd-nat.c hppanbsd-nat.c i386bsd-nat.c m68kbsd-nat.c mipsnbsd-nat.c ppcnbsd-nat.c shnbsd-nat.c sparc-nat.c vaxbsd-nat.c Log Message: PR/47430: Fix debugging threads again, GETTID == ptid_get_lwp for us, not ptid_get_tid :-) To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/gdb/dist/gdb/amd64bsd-nat.c \ src/external/gpl3/gdb/dist/gdb/hppanbsd-nat.c \ src/external/gpl3/gdb/dist/gdb/i386bsd-nat.c \ src/external/gpl3/gdb/dist/gdb/sparc-nat.c cvs rdiff -u -r1.10 -r1.11 src/external/gpl3/gdb/dist/gdb/armnbsd-nat.c cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/gdb/dist/gdb/m68kbsd-nat.c \ src/external/gpl3/gdb/dist/gdb/mipsnbsd-nat.c \ src/external/gpl3/gdb/dist/gdb/ppcnbsd-nat.c \ src/external/gpl3/gdb/dist/gdb/shnbsd-nat.c cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/gdb/dist/gdb/vaxbsd-nat.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/gpl3/gdb/dist/gdb/amd64bsd-nat.c diff -u src/external/gpl3/gdb/dist/gdb/amd64bsd-nat.c:1.5 src/external/gpl3/gdb/dist/gdb/amd64bsd-nat.c:1.6 --- src/external/gpl3/gdb/dist/gdb/amd64bsd-nat.c:1.5 Sun Jun 22 19:52:57 2014 +++ src/external/gpl3/gdb/dist/gdb/amd64bsd-nat.c Tue Jul 15 13:35:54 2014 @@ -47,7 +47,7 @@ amd64bsd_fetch_inferior_registers (struc struct reg regs; if (ptrace (PT_GETREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) regs, ptid_get_tid (inferior_ptid)) == -1) + (PTRACE_TYPE_ARG3) regs, ptid_get_lwp (inferior_ptid)) == -1) perror_with_name (_(Couldn't get registers)); amd64_supply_native_gregset (regcache, regs, -1); @@ -60,7 +60,7 @@ amd64bsd_fetch_inferior_registers (struc struct fpreg fpregs; if (ptrace (PT_GETFPREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) fpregs, ptid_get_tid (inferior_ptid)) == -1) + (PTRACE_TYPE_ARG3) fpregs, ptid_get_lwp (inferior_ptid)) == -1) perror_with_name (_(Couldn't get floating point status)); amd64_supply_fxsave (regcache, -1, fpregs); @@ -81,13 +81,13 @@ amd64bsd_store_inferior_registers (struc struct reg regs; if (ptrace (PT_GETREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) regs, ptid_get_tid (inferior_ptid)) == -1) + (PTRACE_TYPE_ARG3) regs, ptid_get_lwp (inferior_ptid)) == -1) perror_with_name (_(Couldn't get registers)); amd64_collect_native_gregset (regcache, regs, regnum); if (ptrace (PT_SETREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) regs, ptid_get_tid (inferior_ptid)) == -1) + (PTRACE_TYPE_ARG3) regs, ptid_get_lwp (inferior_ptid)) == -1) perror_with_name (_(Couldn't write registers)); if (regnum != -1) @@ -99,13 +99,13 @@ amd64bsd_store_inferior_registers (struc struct fpreg fpregs; if (ptrace (PT_GETFPREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) fpregs, ptid_get_tid (inferior_ptid)) == -1) + (PTRACE_TYPE_ARG3) fpregs, ptid_get_lwp (inferior_ptid)) == -1) perror_with_name (_(Couldn't get floating point status)); amd64_collect_fxsave (regcache, regnum, fpregs); if (ptrace (PT_SETFPREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) fpregs, ptid_get_tid (inferior_ptid)) == -1) + (PTRACE_TYPE_ARG3) fpregs, ptid_get_lwp (inferior_ptid)) == -1) perror_with_name (_(Couldn't write floating point status)); } } Index: src/external/gpl3/gdb/dist/gdb/hppanbsd-nat.c diff -u src/external/gpl3/gdb/dist/gdb/hppanbsd-nat.c:1.5 src/external/gpl3/gdb/dist/gdb/hppanbsd-nat.c:1.6 --- src/external/gpl3/gdb/dist/gdb/hppanbsd-nat.c:1.5 Sun Jun 22 19:52:58 2014 +++ src/external/gpl3/gdb/dist/gdb/hppanbsd-nat.c Tue Jul 15 13:35:54 2014 @@ -178,7 +178,7 @@ hppanbsd_fetch_registers (struct target_ struct reg regs; if (ptrace (PT_GETREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) regs, ptid_get_tid (inferior_ptid)) == -1) + (PTRACE_TYPE_ARG3) regs, ptid_get_lwp (inferior_ptid)) == -1) perror_with_name (_(Couldn't get registers)); hppanbsd_supply_gregset (regcache, regs); @@ -189,7 +189,7 @@ hppanbsd_fetch_registers (struct target_ struct fpreg fpregs; if (ptrace (PT_GETFPREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) fpregs, ptid_get_tid (inferior_ptid)) == -1) + (PTRACE_TYPE_ARG3) fpregs, ptid_get_lwp (inferior_ptid)) == -1) perror_with_name (_(Couldn't get floating point status)); hppanbsd_supply_fpregset (regcache, fpregs); @@ -208,13 +208,13 @@ hppanbsd_store_registers (struct target_ struct reg regs; if (ptrace (PT_GETREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) regs, ptid_get_tid
CVS commit: src/lib/libc/sys
Module Name:src Committed By: wiz Date: Tue Jul 15 17:39:21 UTC 2014 Modified Files: src/lib/libc/sys: kill.2 Log Message: Clean up ERRORS (sort, merge). To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/lib/libc/sys/kill.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/sys/kill.2 diff -u src/lib/libc/sys/kill.2:1.22 src/lib/libc/sys/kill.2:1.23 --- src/lib/libc/sys/kill.2:1.22 Wed Jul 9 16:06:47 2014 +++ src/lib/libc/sys/kill.2 Tue Jul 15 17:39:21 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: kill.2,v 1.22 2014/07/09 16:06:47 christos Exp $ +.\ $NetBSD: kill.2,v 1.23 2014/07/15 17:39:21 wiz Exp $ .\ .\ Copyright (c) 1980, 1991, 1993 .\ The Regents of the University of California. All rights reserved. @@ -114,17 +114,16 @@ will fail and no signal will be sent if: .It Bq Er EINVAL .Fa sig is not a valid signal number. -.It Bq Er ESRCH -No process can be found corresponding to that specified by -.Fa pid . -.It Bq Er ESRCH -The process id was given as 0 -but the sending process does not have a process group. .It Bq Er EPERM The sending process is not the super-user and its effective user id does not match the effective user-id of the receiving process. When signaling a process group, this error is returned if any members of the group could not be signaled. +.It Bq Er ESRCH +No process can be found corresponding to that specified by +.Fa pid ; +or the process id was given as 0 +but the sending process does not have a process group. .El .Sh SEE ALSO .Xr getpgrp 2 ,
CVS commit: src/lib/libc/sys
Module Name:src Committed By: pgoyette Date: Tue Jul 15 18:24:45 UTC 2014 Modified Files: src/lib/libc/sys: modctl.2 Log Message: Document the upper limit on size of props dictionary that was recently imposed. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/lib/libc/sys/modctl.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/sys/modctl.2 diff -u src/lib/libc/sys/modctl.2:1.9 src/lib/libc/sys/modctl.2:1.10 --- src/lib/libc/sys/modctl.2:1.9 Tue Aug 7 01:19:05 2012 +++ src/lib/libc/sys/modctl.2 Tue Jul 15 18:24:44 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: modctl.2,v 1.9 2012/08/07 01:19:05 jnemeth Exp $ +.\ $NetBSD: modctl.2,v 1.10 2014/07/15 18:24:44 pgoyette Exp $ .\ .\ Copyright (c) 2009 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -24,7 +24,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd August 3, 2012 +.Dd July 15, 2014 .Dt MODCTL 2 .Os .Sh NAME @@ -133,6 +133,9 @@ in which case .Fa ml_propslen must be .Dv 0 . +An upper limit of 4096 bytes is imposed on the value of ml_propslen. +Attempting to load a proplib dictionary larger than this size will return +.Er ENOMEM . .El .Pp The
CVS commit: src/tests/ipf/expected
Module Name:src Committed By: martin Date: Tue Jul 15 19:51:36 UTC 2014 Modified Files: src/tests/ipf/expected: in2_6 Log Message: NetBSD has an entry for protocol #255 in /etc/protocols labeled reserved so expect that in the parsing output instead of 255. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tests/ipf/expected/in2_6 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/ipf/expected/in2_6 diff -u src/tests/ipf/expected/in2_6:1.1 src/tests/ipf/expected/in2_6:1.2 --- src/tests/ipf/expected/in2_6:1.1 Sun Jun 29 09:25:31 2014 +++ src/tests/ipf/expected/in2_6 Tue Jul 15 19:51:36 2014 @@ -1,5 +1,5 @@ rdr le0 inet6 9:8:7::6/128 port 0 - 1:1:1::1/128 port 0 tcp -rdr le0 inet6 9:8:7::6/128 - 1:1:1::1/128 255 +rdr le0 inet6 9:8:7::6/128 - 1:1:1::1/128 reserved rdr le0 inet6 9:8:7::6/128 port 80 - 1:1:1::1/128 port 80 tcp rdr le0 inet6 9:8:7::6/128 - 1:1:1::1/128 ip rdr le0 inet6 9:8::/32 - 1:1:1::1/128 ip
CVS commit: src/tests/ipf
Module Name:src Committed By: martin Date: Tue Jul 15 20:00:23 UTC 2014 Modified Files: src/tests/ipf: t_nat_exec.sh Log Message: Darren fixed n8 and n9 recently To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/tests/ipf/t_nat_exec.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/ipf/t_nat_exec.sh diff -u src/tests/ipf/t_nat_exec.sh:1.19 src/tests/ipf/t_nat_exec.sh:1.20 --- src/tests/ipf/t_nat_exec.sh:1.19 Sat Jul 12 14:37:12 2014 +++ src/tests/ipf/t_nat_exec.sh Tue Jul 15 20:00:23 2014 @@ -1,4 +1,4 @@ -# $NetBSD: t_nat_exec.sh,v 1.19 2014/07/12 14:37:12 darrenr Exp $ +# $NetBSD: t_nat_exec.sh,v 1.20 2014/07/15 20:00:23 martin Exp $ # # Copyright (c) 2008, 2010 The NetBSD Foundation, Inc. # All rights reserved. @@ -67,8 +67,8 @@ test_case n4 nattest text text test_case n5 nattest text text test_case n6 nattest text text test_case n7 nattest text text -failing_test_case_be n8 nattest See PR kern/47665 hex hex -T update_ipid=0 -failing_test_case_be n9 nattest See PR kern/47665 hex hex -T update_ipid=0 +test_case n8 nattest hex hex -T update_ipid=0 +test_case n9 nattest hex hex -T update_ipid=0 test_case n10 nattest hex hex -T update_ipid=0 test_case n11 nattest text text failing_test_case n12 nattest Known to be broken hex hex -T update_ipid=0 -v
CVS commit: src/sys/net
Module Name:src
Committed By: joerg
Date: Tue Jul 15 20:17:53 UTC 2014
Modified Files:
src/sys/net: link_proto.c
Log Message:
socklen_t is not uint8_t, so don't print it as such.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/net/link_proto.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/link_proto.c
diff -u src/sys/net/link_proto.c:1.15 src/sys/net/link_proto.c:1.16
--- src/sys/net/link_proto.c:1.15 Wed Jul 9 04:54:03 2014
+++ src/sys/net/link_proto.c Tue Jul 15 20:17:53 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: link_proto.c,v 1.15 2014/07/09 04:54:03 rtr Exp $ */
+/* $NetBSD: link_proto.c,v 1.16 2014/07/15 20:17:53 joerg Exp $ */
/*-
* Copyright (c) 1982, 1986, 1993
@@ -32,7 +32,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: link_proto.c,v 1.15 2014/07/09 04:54:03 rtr Exp $);
+__KERNEL_RCSID(0, $NetBSD: link_proto.c,v 1.16 2014/07/15 20:17:53 joerg Exp $);
#include sys/param.h
#include sys/socket.h
@@ -362,8 +362,8 @@ sockaddr_dl_init(struct sockaddr_dl *sdl
if (len socklen) {
sdl-sdl_len = socklen;
#ifdef DIAGNOSTIC
- printf(%s: too long: % PRIu8 % PRIu8 \n, __func__, len,
- socklen);
+ printf(%s: too long: %u %u\n, __func__, (u_int)len,
+ (u_int)socklen);
#endif
return NULL;
}
@@ -442,8 +442,8 @@ sockaddr_dl_setaddr(struct sockaddr_dl *
len = sockaddr_dl_measure(sdl-sdl_nlen, addrlen);
if (len socklen) {
#ifdef DIAGNOSTIC
- printf(%s: too long: % PRIu8 % PRIu8 \n, __func__, len,
- socklen);
+ printf(%s: too long: %u %u\n, __func__, (u_int)len,
+ (u_int)socklen);
#endif
return NULL;
}
CVS commit: src/sbin/disklabel
Module Name:src
Committed By: joerg
Date: Tue Jul 15 20:18:30 UTC 2014
Modified Files:
src/sbin/disklabel: main.c
Log Message:
Print uint32_t field as such.
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/sbin/disklabel/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/sbin/disklabel/main.c
diff -u src/sbin/disklabel/main.c:1.38 src/sbin/disklabel/main.c:1.39
--- src/sbin/disklabel/main.c:1.38 Mon Feb 24 07:23:40 2014
+++ src/sbin/disklabel/main.c Tue Jul 15 20:18:30 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.38 2014/02/24 07:23:40 skrll Exp $ */
+/* $NetBSD: main.c,v 1.39 2014/07/15 20:18:30 joerg Exp $ */
/*
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -76,7 +76,7 @@ __COPYRIGHT(@(#) Copyright (c) 1987, 19
static char sccsid[] = @(#)disklabel.c 8.4 (Berkeley) 5/4/95;
/* from static char sccsid[] = @(#)disklabel.c 1.2 (Symmetric) 11/28/85; */
#else
-__RCSID($NetBSD: main.c,v 1.38 2014/02/24 07:23:40 skrll Exp $);
+__RCSID($NetBSD: main.c,v 1.39 2014/07/15 20:18:30 joerg Exp $);
#endif
#endif /* not lint */
@@ -1384,7 +1384,7 @@ makedisktab(FILE *f, struct disklabel *l
did = ;
}
if (lp-d_headswitch != 0) {
- (void) fprintf(f, %shs#% PRIu16 :, did, lp-d_headswitch);
+ (void) fprintf(f, %shs#% PRIu32 :, did, lp-d_headswitch);
did = ;
}
if (lp-d_trkseek != 0) {
CVS commit: xsrc/external/mit/xf86-input-mouse/dist
Module Name:xsrc Committed By: dholland Date: Wed Jul 16 02:45:47 UTC 2014 Modified Files: xsrc/external/mit/xf86-input-mouse/dist: xorg-mouse.pc.in Log Message: Because of the way we do substitutions we (currently anyway) need to set prefix=@prefix@ and includedir=@includedir@ here. Fixes PR 48991. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ xsrc/external/mit/xf86-input-mouse/dist/xorg-mouse.pc.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/xf86-input-mouse/dist/xorg-mouse.pc.in diff -u xsrc/external/mit/xf86-input-mouse/dist/xorg-mouse.pc.in:1.1.1.1 xsrc/external/mit/xf86-input-mouse/dist/xorg-mouse.pc.in:1.2 --- xsrc/external/mit/xf86-input-mouse/dist/xorg-mouse.pc.in:1.1.1.1 Wed Jun 5 06:57:57 2013 +++ xsrc/external/mit/xf86-input-mouse/dist/xorg-mouse.pc.in Wed Jul 16 02:45:47 2014 @@ -1,3 +1,5 @@ +prefix=@prefix@ +includedir=@includedir@ sdkdir=@sdkdir@ Name: xorg-mouse
CVS commit: src/sys/net
Module Name:src
Committed By: ozaki-r
Date: Wed Jul 16 03:17:26 UTC 2014
Modified Files:
src/sys/net: if.h
Log Message:
Kill void * for bridge in struct ifnet
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.171 -r1.172 src/sys/net/if.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/net/if.h
diff -u src/sys/net/if.h:1.171 src/sys/net/if.h:1.172
--- src/sys/net/if.h:1.171 Mon Jul 14 02:34:36 2014
+++ src/sys/net/if.h Wed Jul 16 03:17:26 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if.h,v 1.171 2014/07/14 02:34:36 ozaki-r Exp $ */
+/* $NetBSD: if.h,v 1.172 2014/07/16 03:17:26 ozaki-r Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -242,6 +242,9 @@ struct ifnet_lock {
*/
TAILQ_HEAD(ifnet_head, ifnet); /* the actual queue head */
+struct bridge_softc;
+struct bridge_iflist;
+
typedef struct ifnet {
void *if_softc; /* lower-level data for this if */
TAILQ_ENTRY(ifnet) if_list; /* all struct ifnets are chained */
@@ -289,8 +292,8 @@ typedef struct ifnet {
*/
struct ifaddr *if_hwdl;
const uint8_t *if_broadcastaddr;/* linklevel broadcast bytestring */
- void *if_bridge; /* bridge glue */
- void *if_bridgeif; /* shortcut to interface list entry */
+ struct bridge_softc *if_bridge; /* bridge glue */
+ struct bridge_iflist *if_bridgeif; /* shortcut to interface list entry */
int if_dlt; /* data link type (net/dlt.h) */
pfil_head_t * if_pfil; /* filtering point */
uint64_t if_capabilities; /* interface capabilities */
