CVS commit: othersrc/external/bsd/gensetlist
Module Name:othersrc
Committed By: agc
Date: Mon May 23 06:31:25 UTC 2011
Modified Files:
othersrc/external/bsd/gensetlist: bsd.setlist.mk
Log Message:
where there are multiple scripts and no syspkg category, take the first
script name as being the category.
also remove unwanted characters from the syspkg category names (not just for
scripts but for any category)
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 othersrc/external/bsd/gensetlist/bsd.setlist.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: othersrc/external/bsd/gensetlist/bsd.setlist.mk
diff -u othersrc/external/bsd/gensetlist/bsd.setlist.mk:1.4 othersrc/external/bsd/gensetlist/bsd.setlist.mk:1.5
--- othersrc/external/bsd/gensetlist/bsd.setlist.mk:1.4 Sat May 14 00:08:45 2011
+++ othersrc/external/bsd/gensetlist/bsd.setlist.mk Mon May 23 06:31:24 2011
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.setlist.mk,v 1.4 2011/05/14 00:08:45 agc Exp $
+# $NetBSD: bsd.setlist.mk,v 1.5 2011/05/23 06:31:24 agc Exp $
# Copyright (c) 2010,2011 Alistair Crooks a...@netbsd.org
# All rights reserved.
@@ -72,11 +72,11 @@
. elif defined(LIB)
CATEGORY=${LIB}
. elif defined(SCRIPTS)
-CATEGORY=${SCRIPTS:C|\.sh||}
+CATEGORY=${SCRIPTS:Q:C|[. ]+.*||}
. endif
.endif
.if defined(CATEGORY)
-GENSETLIST_ARGS+=-c ${CATEGORY:Q}
+GENSETLIST_ARGS+=-c ${CATEGORY:Q:C|-||g}
.endif
setlist: .PHONY
CVS commit: src/sys/conf
Module Name:src Committed By: mrg Date: Mon May 23 06:50:17 UTC 2011 Modified Files: src/sys/conf: files Log Message: move KERNHIST stuff much earlier, so drivers can depend upon it. To generate a diff of this commit: cvs rdiff -u -r1.1013 -r1.1014 src/sys/conf/files Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/conf/files diff -u src/sys/conf/files:1.1013 src/sys/conf/files:1.1014 --- src/sys/conf/files:1.1013 Tue May 17 05:32:31 2011 +++ src/sys/conf/files Mon May 23 06:50:17 2011 @@ -1,4 +1,4 @@ -# $NetBSD: files,v 1.1013 2011/05/17 05:32:31 mrg Exp $ +# $NetBSD: files,v 1.1014 2011/05/23 06:50:17 mrg Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 version 20100430 @@ -168,6 +168,12 @@ include opencrypto/files.opencrypto # +# Kernel history/tracing. Old UVMHIST depends upon this. +# +defflag opt_kernhist.h KERNHIST KERNHIST_PRINT +file kern/kern_history.c kernhist + +# # System monitoring framework # include dev/sysmon/files.sysmon @@ -1379,12 +1385,6 @@ include ufs/files.ufs # -# Kernel history/tracing. Old UVMHIST depends upon this. -# -defflag opt_kernhist.h KERNHIST KERNHIST_PRINT -file kern/kern_history.c kernhist - -# # UVM (virtual memory) # include uvm/files.uvm
CVS commit: src
Module Name:src
Committed By: drochner
Date: Mon May 23 13:46:54 UTC 2011
Modified Files:
src/share/man/man9: opencrypto.9
src/sys/netipsec: xform_esp.c
src/sys/opencrypto: cryptodev.c cryptosoft.c cryptosoft_xform.c xform.c
xform.h
Log Message:
-in the descriptor for encryption xforms, split the blocksize field
into blocksize and IV size
-add an reinit function pointer which, if set, means that the xform
does its IV handling itself and doesn't want the default CBC handling
by the framework (poor name, but left that way to avoid unecessary
differences)
This syncs with Open/FreeBSD, purpose is to allow non-CBC transforms.
Refer to ivsize instead of blocksize where appropriate.
(At this point, blocksize and ivsize are identical.)
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/share/man/man9/opencrypto.9
cvs rdiff -u -r1.34 -r1.35 src/sys/netipsec/xform_esp.c
cvs rdiff -u -r1.57 -r1.58 src/sys/opencrypto/cryptodev.c
cvs rdiff -u -r1.31 -r1.32 src/sys/opencrypto/cryptosoft.c
cvs rdiff -u -r1.16 -r1.17 src/sys/opencrypto/cryptosoft_xform.c
cvs rdiff -u -r1.23 -r1.24 src/sys/opencrypto/xform.c
cvs rdiff -u -r1.14 -r1.15 src/sys/opencrypto/xform.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/man/man9/opencrypto.9
diff -u src/share/man/man9/opencrypto.9:1.10 src/share/man/man9/opencrypto.9:1.11
--- src/share/man/man9/opencrypto.9:1.10 Fri Jan 22 10:28:08 2010
+++ src/share/man/man9/opencrypto.9 Mon May 23 13:46:54 2011
@@ -1,5 +1,5 @@
.\ $OpenBSD: crypto.9,v 1.25 2003/07/11 13:47:41 jmc Exp $
-.\ $NetBSD: opencrypto.9,v 1.10 2010/01/22 10:28:08 wiz Exp $
+.\ $NetBSD: opencrypto.9,v 1.11 2011/05/23 13:46:54 drochner Exp $
.\
.\ The author of this man page is Angelos D. Keromytis (ange...@cis.upenn.edu)
.\
@@ -338,8 +338,6 @@
Otherwise, the IV used to encrypt the packet will be written
at the location pointed to by
.Fa crd_inject .
-The IV length is assumed to be equal to the blocksize of the
-encryption algorithm.
Some applications that do special
.Dq IV cooking ,
such as the half-IV mode in
Index: src/sys/netipsec/xform_esp.c
diff -u src/sys/netipsec/xform_esp.c:1.34 src/sys/netipsec/xform_esp.c:1.35
--- src/sys/netipsec/xform_esp.c:1.34 Fri May 6 21:48:46 2011
+++ src/sys/netipsec/xform_esp.c Mon May 23 13:46:54 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: xform_esp.c,v 1.34 2011/05/06 21:48:46 drochner Exp $ */
+/* $NetBSD: xform_esp.c,v 1.35 2011/05/23 13:46:54 drochner Exp $ */
/* $FreeBSD: src/sys/netipsec/xform_esp.c,v 1.2.2.1 2003/01/24 05:11:36 sam Exp $ */
/* $OpenBSD: ip_esp.c,v 1.69 2001/06/26 06:18:59 angelos Exp $ */
@@ -39,7 +39,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: xform_esp.c,v 1.34 2011/05/06 21:48:46 drochner Exp $);
+__KERNEL_RCSID(0, $NetBSD: xform_esp.c,v 1.35 2011/05/23 13:46:54 drochner Exp $);
#include opt_inet.h
#ifdef __FreeBSD__
@@ -149,7 +149,7 @@
size = sizeof (struct esp);
else
size = sizeof (struct newesp);
- size += sav-tdb_encalgxform-blocksize + 9;
+ size += sav-tdb_encalgxform-ivsize + 9;
/*XXX need alg check???*/
if (sav-tdb_authalgxform != NULL sav-replay)
size += ah_hdrsiz(sav);
@@ -202,13 +202,7 @@
return EINVAL;
}
- /*
- * NB: The null xform needs a non-zero blocksize to keep the
- * crypto code happy but if we use it to set ivlen then
- * the ESP header will be processed incorrectly. The
- * compromise is to force it to zero here.
- */
- sav-ivlen = (txform == enc_xform_null ? 0 : txform-blocksize);
+ sav-ivlen = txform-ivsize;
sav-iv = malloc(sav-ivlen, M_SECA, M_WAITOK);
if (sav-iv == NULL) {
DPRINTF((esp_init: no memory for IV\n));
@@ -1039,8 +1033,8 @@
espstat_percpu = percpu_alloc(sizeof(uint64_t) * ESP_NSTATS);
#define MAXIV(xform) \
- if (xform.blocksize esp_max_ivlen) \
- esp_max_ivlen = xform.blocksize \
+ if (xform.ivsize esp_max_ivlen) \
+ esp_max_ivlen = xform.ivsize \
esp_max_ivlen = 0;
MAXIV(enc_xform_des); /* SADB_EALG_DESCBC */
Index: src/sys/opencrypto/cryptodev.c
diff -u src/sys/opencrypto/cryptodev.c:1.57 src/sys/opencrypto/cryptodev.c:1.58
--- src/sys/opencrypto/cryptodev.c:1.57 Mon May 16 10:27:49 2011
+++ src/sys/opencrypto/cryptodev.c Mon May 23 13:46:54 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cryptodev.c,v 1.57 2011/05/16 10:27:49 drochner Exp $ */
+/* $NetBSD: cryptodev.c,v 1.58 2011/05/23 13:46:54 drochner Exp $ */
/* $FreeBSD: src/sys/opencrypto/cryptodev.c,v 1.4.2.4 2003/06/03 00:09:02 sam Exp $ */
/* $OpenBSD: cryptodev.c,v 1.53 2002/07/10 22:21:30 mickey Exp $ */
@@ -64,7 +64,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cryptodev.c,v 1.57 2011/05/16 10:27:49 drochner Exp $);
+__KERNEL_RCSID(0, $NetBSD: cryptodev.c,v 1.58 2011/05/23 13:46:54 drochner Exp $);
#include sys/param.h
#include sys/systm.h
@@ -428,7 +428,10 @@
return
CVS commit: src/sys/opencrypto
Module Name:src Committed By: drochner Date: Mon May 23 13:51:10 UTC 2011 Modified Files: src/sys/opencrypto: cryptodev.c cryptodev.h cryptosoft.c cryptosoft_xform.c xform.c xform.h Log Message: add an AES-CTR xform, from OpenBSD To generate a diff of this commit: cvs rdiff -u -r1.58 -r1.59 src/sys/opencrypto/cryptodev.c cvs rdiff -u -r1.21 -r1.22 src/sys/opencrypto/cryptodev.h cvs rdiff -u -r1.32 -r1.33 src/sys/opencrypto/cryptosoft.c cvs rdiff -u -r1.17 -r1.18 src/sys/opencrypto/cryptosoft_xform.c cvs rdiff -u -r1.24 -r1.25 src/sys/opencrypto/xform.c cvs rdiff -u -r1.15 -r1.16 src/sys/opencrypto/xform.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/opencrypto/cryptodev.c diff -u src/sys/opencrypto/cryptodev.c:1.58 src/sys/opencrypto/cryptodev.c:1.59 --- src/sys/opencrypto/cryptodev.c:1.58 Mon May 23 13:46:54 2011 +++ src/sys/opencrypto/cryptodev.c Mon May 23 13:51:10 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: cryptodev.c,v 1.58 2011/05/23 13:46:54 drochner Exp $ */ +/* $NetBSD: cryptodev.c,v 1.59 2011/05/23 13:51:10 drochner Exp $ */ /* $FreeBSD: src/sys/opencrypto/cryptodev.c,v 1.4.2.4 2003/06/03 00:09:02 sam Exp $ */ /* $OpenBSD: cryptodev.c,v 1.53 2002/07/10 22:21:30 mickey Exp $ */ @@ -64,7 +64,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: cryptodev.c,v 1.58 2011/05/23 13:46:54 drochner Exp $); +__KERNEL_RCSID(0, $NetBSD: cryptodev.c,v 1.59 2011/05/23 13:51:10 drochner Exp $); #include sys/param.h #include sys/systm.h @@ -1521,6 +1521,9 @@ case CRYPTO_AES_CBC: txform = enc_xform_rijndael128; break; + case CRYPTO_AES_CTR: + txform = enc_xform_aes_ctr; + break; case CRYPTO_NULL_CBC: txform = enc_xform_null; break; Index: src/sys/opencrypto/cryptodev.h diff -u src/sys/opencrypto/cryptodev.h:1.21 src/sys/opencrypto/cryptodev.h:1.22 --- src/sys/opencrypto/cryptodev.h:1.21 Mon May 16 10:18:52 2011 +++ src/sys/opencrypto/cryptodev.h Mon May 23 13:51:10 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: cryptodev.h,v 1.21 2011/05/16 10:18:52 drochner Exp $ */ +/* $NetBSD: cryptodev.h,v 1.22 2011/05/23 13:51:10 drochner Exp $ */ /* $FreeBSD: src/sys/opencrypto/cryptodev.h,v 1.2.2.6 2003/07/02 17:04:50 sam Exp $ */ /* $OpenBSD: cryptodev.h,v 1.33 2002/07/17 23:52:39 art Exp $ */ @@ -138,7 +138,8 @@ #define CRYPTO_SHA2_384_HMAC 24 #define CRYPTO_SHA2_512_HMAC 25 #define CRYPTO_CAMELLIA_CBC 26 -#define CRYPTO_ALGORITHM_MAX 26 /* Keep updated - see below */ +#define CRYPTO_AES_CTR 27 +#define CRYPTO_ALGORITHM_MAX 27 /* Keep updated - see below */ /* Algorithm flags */ #define CRYPTO_ALG_FLAG_SUPPORTED 0x01 /* Algorithm is supported */ Index: src/sys/opencrypto/cryptosoft.c diff -u src/sys/opencrypto/cryptosoft.c:1.32 src/sys/opencrypto/cryptosoft.c:1.33 --- src/sys/opencrypto/cryptosoft.c:1.32 Mon May 23 13:46:54 2011 +++ src/sys/opencrypto/cryptosoft.c Mon May 23 13:51:10 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: cryptosoft.c,v 1.32 2011/05/23 13:46:54 drochner Exp $ */ +/* $NetBSD: cryptosoft.c,v 1.33 2011/05/23 13:51:10 drochner Exp $ */ /* $FreeBSD: src/sys/opencrypto/cryptosoft.c,v 1.2.2.1 2002/11/21 23:34:23 sam Exp $ */ /* $OpenBSD: cryptosoft.c,v 1.35 2002/04/26 08:43:50 deraadt Exp $ */ @@ -24,7 +24,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: cryptosoft.c,v 1.32 2011/05/23 13:46:54 drochner Exp $); +__KERNEL_RCSID(0, $NetBSD: cryptosoft.c,v 1.33 2011/05/23 13:51:10 drochner Exp $); #include sys/param.h #include sys/systm.h @@ -702,6 +702,9 @@ case CRYPTO_CAMELLIA_CBC: txf = swcr_enc_xform_camellia; goto enccommon; + case CRYPTO_AES_CTR: + txf = swcr_enc_xform_aes_ctr; + goto enccommon; case CRYPTO_NULL_CBC: txf = swcr_enc_xform_null; goto enccommon; @@ -889,6 +892,7 @@ case CRYPTO_SKIPJACK_CBC: case CRYPTO_RIJNDAEL128_CBC: case CRYPTO_CAMELLIA_CBC: + case CRYPTO_AES_CTR: case CRYPTO_NULL_CBC: txf = swd-sw_exf; @@ -1017,6 +1021,7 @@ case CRYPTO_SKIPJACK_CBC: case CRYPTO_RIJNDAEL128_CBC: case CRYPTO_CAMELLIA_CBC: + case CRYPTO_AES_CTR: if ((crp-crp_etype = swcr_encdec(crd, sw, crp-crp_buf, type)) != 0) goto done; @@ -1084,6 +1089,7 @@ REGISTER(CRYPTO_CAST_CBC); REGISTER(CRYPTO_SKIPJACK_CBC); REGISTER(CRYPTO_CAMELLIA_CBC); + REGISTER(CRYPTO_AES_CTR); REGISTER(CRYPTO_NULL_CBC); REGISTER(CRYPTO_MD5_HMAC); REGISTER(CRYPTO_MD5_HMAC_96); Index: src/sys/opencrypto/cryptosoft_xform.c diff -u src/sys/opencrypto/cryptosoft_xform.c:1.17 src/sys/opencrypto/cryptosoft_xform.c:1.18 --- src/sys/opencrypto/cryptosoft_xform.c:1.17 Mon May 23 13:46:54 2011 +++ src/sys/opencrypto/cryptosoft_xform.c Mon May 23 13:51:10 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: cryptosoft_xform.c,v 1.17 2011/05/23 13:46:54 drochner Exp $ */ +/* $NetBSD: cryptosoft_xform.c,v 1.18 2011/05/23 13:51:10 drochner Exp $ */ /* $FreeBSD: src/sys/opencrypto/xform.c,v 1.1.2.1 2002/11/21
CVS commit: src/sys/opencrypto
Module Name:src Committed By: drochner Date: Mon May 23 13:54:00 UTC 2011 Modified Files: src/sys/opencrypto: cryptodev.c Log Message: being here, export camellia-cbc through crypto(4) to allow userland tests To generate a diff of this commit: cvs rdiff -u -r1.59 -r1.60 src/sys/opencrypto/cryptodev.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/opencrypto/cryptodev.c diff -u src/sys/opencrypto/cryptodev.c:1.59 src/sys/opencrypto/cryptodev.c:1.60 --- src/sys/opencrypto/cryptodev.c:1.59 Mon May 23 13:51:10 2011 +++ src/sys/opencrypto/cryptodev.c Mon May 23 13:53:59 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: cryptodev.c,v 1.59 2011/05/23 13:51:10 drochner Exp $ */ +/* $NetBSD: cryptodev.c,v 1.60 2011/05/23 13:53:59 drochner Exp $ */ /* $FreeBSD: src/sys/opencrypto/cryptodev.c,v 1.4.2.4 2003/06/03 00:09:02 sam Exp $ */ /* $OpenBSD: cryptodev.c,v 1.53 2002/07/10 22:21:30 mickey Exp $ */ @@ -64,7 +64,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: cryptodev.c,v 1.59 2011/05/23 13:51:10 drochner Exp $); +__KERNEL_RCSID(0, $NetBSD: cryptodev.c,v 1.60 2011/05/23 13:53:59 drochner Exp $); #include sys/param.h #include sys/systm.h @@ -1521,6 +1521,9 @@ case CRYPTO_AES_CBC: txform = enc_xform_rijndael128; break; + case CRYPTO_CAMELLIA_CBC: + txform = enc_xform_camellia; + break; case CRYPTO_AES_CTR: txform = enc_xform_aes_ctr; break;
CVS commit: src/sys/conf
Module Name:src
Committed By: joerg
Date: Mon May 23 13:55:55 UTC 2011
Modified Files:
src/sys/conf: Makefile.kern.inc
Log Message:
Reorder flag order to not depend on -Wextra being applied before
-Wno-sign-compare
To generate a diff of this commit:
cvs rdiff -u -r1.135 -r1.136 src/sys/conf/Makefile.kern.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/Makefile.kern.inc
diff -u src/sys/conf/Makefile.kern.inc:1.135 src/sys/conf/Makefile.kern.inc:1.136
--- src/sys/conf/Makefile.kern.inc:1.135 Sun May 22 20:49:46 2011
+++ src/sys/conf/Makefile.kern.inc Mon May 23 13:55:55 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.kern.inc,v 1.135 2011/05/22 20:49:46 joerg Exp $
+# $NetBSD: Makefile.kern.inc,v 1.136 2011/05/23 13:55:55 joerg Exp $
#
# This file contains common `MI' targets and definitions and it is included
# at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -71,9 +71,6 @@
CWARNFLAGS+= -Wswitch -Wshadow
CWARNFLAGS+= -Wcast-qual -Wwrite-strings
CWARNFLAGS+= -Wno-unreachable-code
-# Add -Wno-sign-compare. -Wsign-compare is included in -Wall as of GCC 3.3,
-# but our sources aren't up for it yet.
-CWARNFLAGS+= -Wno-sign-compare
. if (defined(HAVE_GCC) ${HAVE_GCC} 3) || defined(HAVE_PCC)
CWARNFLAGS+= -Wno-pointer-sign -Wno-attributes
. if ${MACHINE} == i386 || ${MACHINE_ARCH} == x86_64 || \
@@ -81,6 +78,9 @@
CWARNFLAGS+= -Wextra -Wno-unused-parameter
. endif
. endif
+# Add -Wno-sign-compare. -Wsign-compare is included in -Wall as of GCC 3.3,
+# but our sources aren't up for it yet.
+CWARNFLAGS+= -Wno-sign-compare
.endif
CFLAGS+= -ffreestanding -fno-zero-initialized-in-bss
CVS commit: src/sys/netipsec
Module Name:src Committed By: drochner Date: Mon May 23 13:57:52 UTC 2011 Modified Files: src/sys/netipsec: xform_esp.c Log Message: allow ESP to use AES-CTR (pfkey and userland tool support is already there because it has been in KAME IPSEC all the time) tested against KAME IPSEC To generate a diff of this commit: cvs rdiff -u -r1.35 -r1.36 src/sys/netipsec/xform_esp.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/netipsec/xform_esp.c diff -u src/sys/netipsec/xform_esp.c:1.35 src/sys/netipsec/xform_esp.c:1.36 --- src/sys/netipsec/xform_esp.c:1.35 Mon May 23 13:46:54 2011 +++ src/sys/netipsec/xform_esp.c Mon May 23 13:57:52 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: xform_esp.c,v 1.35 2011/05/23 13:46:54 drochner Exp $ */ +/* $NetBSD: xform_esp.c,v 1.36 2011/05/23 13:57:52 drochner Exp $ */ /* $FreeBSD: src/sys/netipsec/xform_esp.c,v 1.2.2.1 2003/01/24 05:11:36 sam Exp $ */ /* $OpenBSD: ip_esp.c,v 1.69 2001/06/26 06:18:59 angelos Exp $ */ @@ -39,7 +39,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: xform_esp.c,v 1.35 2011/05/23 13:46:54 drochner Exp $); +__KERNEL_RCSID(0, $NetBSD: xform_esp.c,v 1.36 2011/05/23 13:57:52 drochner Exp $); #include opt_inet.h #ifdef __FreeBSD__ @@ -130,6 +130,8 @@ return enc_xform_skipjack; case SADB_X_EALG_CAMELLIACBC: return enc_xform_camellia; + case SADB_X_EALG_AESCTR: + return enc_xform_aes_ctr; case SADB_EALG_NULL: return enc_xform_null; } @@ -1044,6 +1046,7 @@ MAXIV(enc_xform_cast5); /* SADB_X_EALG_CAST128CBC */ MAXIV(enc_xform_skipjack); /* SADB_X_EALG_SKIPJACK */ MAXIV(enc_xform_camellia); /* SADB_X_EALG_CAMELLIACBC */ + MAXIV(enc_xform_aes_ctr); /* SADB_X_EALG_AESCTR */ MAXIV(enc_xform_null); /* SADB_EALG_NULL */ xform_register(esp_xformsw);
CVS commit: src/usr.bin/netstat
Module Name:src
Committed By: drochner
Date: Mon May 23 14:29:56 UTC 2011
Modified Files:
src/usr.bin/netstat: fast_ipsec.c
Log Message:
report aes-ctr statistic counter by name
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/usr.bin/netstat/fast_ipsec.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/netstat/fast_ipsec.c
diff -u src/usr.bin/netstat/fast_ipsec.c:1.14 src/usr.bin/netstat/fast_ipsec.c:1.15
--- src/usr.bin/netstat/fast_ipsec.c:1.14 Thu May 5 17:49:47 2011
+++ src/usr.bin/netstat/fast_ipsec.c Mon May 23 14:29:55 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: fast_ipsec.c,v 1.14 2011/05/05 17:49:47 drochner Exp $ */
+/* $NetBSD: fast_ipsec.c,v 1.15 2011/05/23 14:29:55 drochner Exp $ */
/* $FreeBSD: src/tools/tools/crypto/ipsecstats.c,v 1.1.4.1 2003/06/03 00:13:13 sam Exp $ */
/*-
@@ -33,7 +33,7 @@
#include sys/cdefs.h
#ifndef lint
#ifdef __NetBSD__
-__RCSID($NetBSD: fast_ipsec.c,v 1.14 2011/05/05 17:49:47 drochner Exp $);
+__RCSID($NetBSD: fast_ipsec.c,v 1.15 2011/05/23 14:29:55 drochner Exp $);
#endif
#endif /* not lint*/
@@ -127,6 +127,7 @@
{ SADB_X_EALG_BLOWFISHCBC, blowfish-cbc, },
{ SADB_X_EALG_RIJNDAELCBC, aes-cbc, },
{ SADB_X_EALG_CAMELLIACBC, camellia-cbc, },
+ { SADB_X_EALG_AESCTR, aes-ctr, },
};
static const struct alg ipcompalgs[] = {
{ SADB_X_CALG_NONE, none, },
CVS commit: src/share/mk
Module Name:src
Committed By: joerg
Date: Mon May 23 14:32:05 UTC 2011
Modified Files:
src/share/mk: bsd.sys.mk
Log Message:
Disable Clang's array boundary checker for now (hits e.g. in GCC and BDB)
To generate a diff of this commit:
cvs rdiff -u -r1.197 -r1.198 src/share/mk/bsd.sys.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.sys.mk
diff -u src/share/mk/bsd.sys.mk:1.197 src/share/mk/bsd.sys.mk:1.198
--- src/share/mk/bsd.sys.mk:1.197 Sun May 22 20:52:12 2011
+++ src/share/mk/bsd.sys.mk Mon May 23 14:32:05 2011
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.sys.mk,v 1.197 2011/05/22 20:52:12 joerg Exp $
+# $NetBSD: bsd.sys.mk,v 1.198 2011/05/23 14:32:05 joerg Exp $
#
# Build definitions used for NetBSD source tree builds.
@@ -20,6 +20,7 @@
.if defined(WARNS)
.if ${WARNS} 0
CFLAGS+= -Wall -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith
+CFLAGS+= ${${ACTIVE_CC} == clang:? -Wno-array-bounds :}
#CFLAGS+= -Wmissing-declarations -Wredundant-decls -Wnested-externs
# Add -Wno-sign-compare. -Wsign-compare is included in -Wall as of GCC 3.3,
# but our sources aren't up for it yet. Also, add -Wno-traditional because
CVS commit: src/lib/libc/resolv
Module Name:src
Committed By: joerg
Date: Mon May 23 14:34:29 UTC 2011
Modified Files:
src/lib/libc/resolv: res_send.c
Log Message:
Remove self-assignment of an argument that is later used.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/lib/libc/resolv/res_send.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/libc/resolv/res_send.c
diff -u src/lib/libc/resolv/res_send.c:1.21 src/lib/libc/resolv/res_send.c:1.22
--- src/lib/libc/resolv/res_send.c:1.21 Wed Feb 9 09:46:59 2011
+++ src/lib/libc/resolv/res_send.c Mon May 23 14:34:29 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: res_send.c,v 1.21 2011/02/09 09:46:59 pooka Exp $ */
+/* $NetBSD: res_send.c,v 1.22 2011/05/23 14:34:29 joerg Exp $ */
/*
* Portions Copyright (C) 2004-2009 Internet Systems Consortium, Inc. (ISC)
@@ -93,7 +93,7 @@
static const char sccsid[] = @(#)res_send.c 8.1 (Berkeley) 6/4/93;
static const char rcsid[] = Id: res_send.c,v 1.22 2009/01/22 23:49:23 tbox Exp;
#else
-__RCSID($NetBSD: res_send.c,v 1.21 2011/02/09 09:46:59 pooka Exp $);
+__RCSID($NetBSD: res_send.c,v 1.22 2011/05/23 14:34:29 joerg Exp $);
#endif
#endif /* LIBC_SCCS and not lint */
@@ -1066,8 +1066,6 @@
char hbuf[NI_MAXHOST];
char sbuf[NI_MAXSERV];
- alen = alen;
-
if ((statp-options RES_DEBUG) != 0U) {
if (getnameinfo(address, (socklen_t)alen, hbuf, sizeof(hbuf),
sbuf, sizeof(sbuf), niflags)) {
CVS commit: src/lib/libc/citrus/modules
Module Name:src
Committed By: joerg
Date: Mon May 23 14:45:44 UTC 2011
Modified Files:
src/lib/libc/citrus/modules: citrus_iconv_none.c
Log Message:
Actually return something deterministic
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/lib/libc/citrus/modules/citrus_iconv_none.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/libc/citrus/modules/citrus_iconv_none.c
diff -u src/lib/libc/citrus/modules/citrus_iconv_none.c:1.2 src/lib/libc/citrus/modules/citrus_iconv_none.c:1.3
--- src/lib/libc/citrus/modules/citrus_iconv_none.c:1.2 Tue Jul 1 09:42:16 2003
+++ src/lib/libc/citrus/modules/citrus_iconv_none.c Mon May 23 14:45:44 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: citrus_iconv_none.c,v 1.2 2003/07/01 09:42:16 tshiozak Exp $ */
+/* $NetBSD: citrus_iconv_none.c,v 1.3 2011/05/23 14:45:44 joerg Exp $ */
/*-
* Copyright (c)2003 Citrus Project,
@@ -28,7 +28,7 @@
#include sys/cdefs.h
#if defined(LIBC_SCCS) !defined(lint)
-__RCSID($NetBSD: citrus_iconv_none.c,v 1.2 2003/07/01 09:42:16 tshiozak Exp $);
+__RCSID($NetBSD: citrus_iconv_none.c,v 1.3 2011/05/23 14:45:44 joerg Exp $);
#endif /* LIBC_SCCS and not lint */
#include assert.h
@@ -87,6 +87,7 @@
_citrus_iconv_none_iconv_init_context(struct _citrus_iconv *cv)
{
cv-cv_closure = NULL;
+ return 0;
}
static void
CVS commit: src/lib/libc/citrus
Module Name:src
Committed By: joerg
Date: Mon May 23 14:52:32 UTC 2011
Modified Files:
src/lib/libc/citrus: citrus_prop.h
Log Message:
Use C99-style init in _CITRUS_PROP_HINT_END to avoid warnings for
uninitialised type field.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/lib/libc/citrus/citrus_prop.h
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/citrus/citrus_prop.h
diff -u src/lib/libc/citrus/citrus_prop.h:1.4 src/lib/libc/citrus/citrus_prop.h:1.5
--- src/lib/libc/citrus/citrus_prop.h:1.4 Wed Mar 30 08:22:01 2011
+++ src/lib/libc/citrus/citrus_prop.h Mon May 23 14:52:32 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: citrus_prop.h,v 1.4 2011/03/30 08:22:01 jruoho Exp $ */
+/* $NetBSD: citrus_prop.h,v 1.5 2011/05/23 14:52:32 joerg Exp $ */
/*-
* Copyright (c)2006 Citrus Project,
@@ -81,7 +81,7 @@
#define _CITRUS_PROP_HINT_NUM(name, cb) \
{ name, _CITRUS_PROP_NUM, { .num = { cb } } }
#define _CITRUS_PROP_HINT_END \
- { NULL }
+ { .name = NULL }
__BEGIN_DECLS
int _citrus_prop_parse_variable(const _citrus_prop_hint_t * __restrict,
CVS commit: src/sys/arch/m68k/fpe
Module Name:src
Committed By: tsutsui
Date: Mon May 23 14:52:31 UTC 2011
Modified Files:
src/sys/arch/m68k/fpe: fpu_emulate.c
Log Message:
KNF, mostly indent. No binary change.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/m68k/fpe/fpu_emulate.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/m68k/fpe/fpu_emulate.c
diff -u src/sys/arch/m68k/fpe/fpu_emulate.c:1.31 src/sys/arch/m68k/fpe/fpu_emulate.c:1.32
--- src/sys/arch/m68k/fpe/fpu_emulate.c:1.31 Sat May 14 16:17:55 2011
+++ src/sys/arch/m68k/fpe/fpu_emulate.c Mon May 23 14:52:31 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu_emulate.c,v 1.31 2011/05/14 16:17:55 tsutsui Exp $ */
+/* $NetBSD: fpu_emulate.c,v 1.32 2011/05/23 14:52:31 tsutsui Exp $ */
/*
* Copyright (c) 1995 Gordon W. Ross
@@ -37,7 +37,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: fpu_emulate.c,v 1.31 2011/05/14 16:17:55 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: fpu_emulate.c,v 1.32 2011/05/23 14:52:31 tsutsui Exp $);
#include sys/param.h
#include sys/types.h
@@ -51,29 +51,29 @@
#include fpu_emulate.h
-#define fpe_abort(tfp, ksi, signo, code) \
-do { \
- (ksi)-ksi_signo = (signo); \
- (ksi)-ksi_code = (code); \
- (ksi)-ksi_addr = (void *)(frame)-f_pc; \
- return -1; \
-} while (/*CONSTCOND*/0)
-
-static int fpu_emul_fmovmcr(struct fpemu *fe, struct instruction *insn);
-static int fpu_emul_fmovm(struct fpemu *fe, struct instruction *insn);
-static int fpu_emul_arith(struct fpemu *fe, struct instruction *insn);
-static int fpu_emul_type1(struct fpemu *fe, struct instruction *insn);
-static int fpu_emul_brcc(struct fpemu *fe, struct instruction *insn);
-static int test_cc(struct fpemu *fe, int pred);
-static struct fpn *fpu_cmp(struct fpemu *fe);
-
-#if DEBUG_FPE
-# define DUMP_INSN(insn) \
-printf(fpu_emulate: insn={adv=%d,siz=%d,op=%04x,w1=%04x}\n, \
- (insn)-is_advance, (insn)-is_datasize, \
- (insn)-is_opcode, (insn)-is_word1)
+#define fpe_abort(tfp, ksi, signo, code) \
+ do { \
+ (ksi)-ksi_signo = (signo); \
+ (ksi)-ksi_code = (code); \
+ (ksi)-ksi_addr = (void *)(frame)-f_pc; \
+ return -1; \
+ } while (/* CONSTCOND */ 0)
+
+static int fpu_emul_fmovmcr(struct fpemu *, struct instruction *);
+static int fpu_emul_fmovm(struct fpemu *, struct instruction *);
+static int fpu_emul_arith(struct fpemu *, struct instruction *);
+static int fpu_emul_type1(struct fpemu *, struct instruction *);
+static int fpu_emul_brcc(struct fpemu *, struct instruction *);
+static int test_cc(struct fpemu *, int);
+static struct fpn *fpu_cmp(struct fpemu *);
+
+#if DEBUG_FPE
+#define DUMP_INSN(insn) \
+ printf(fpu_emulate: insn={adv=%d,siz=%d,op=%04x,w1=%04x}\n, \
+ (insn)-is_advance, (insn)-is_datasize, \
+ (insn)-is_opcode, (insn)-is_word1)
#else
-# define DUMP_INSN(insn)
+#define DUMP_INSN(insn)
#endif
/*
@@ -84,370 +84,378 @@
int
fpu_emulate(struct frame *frame, struct fpframe *fpf, ksiginfo_t *ksi)
{
-static struct instruction insn;
-static struct fpemu fe;
-int word, optype, sig;
-
-
-/* initialize insn.is_datasize to tell it is *not* initialized */
-insn.is_datasize = -1;
-
-fe.fe_frame = frame;
-fe.fe_fpframe = fpf;
-fe.fe_fpsr = fpf-fpf_fpsr;
-fe.fe_fpcr = fpf-fpf_fpcr;
-
-#if DEBUG_FPE
-printf(ENTERING fpu_emulate: FPSR=%08x, FPCR=%08x\n,
- fe.fe_fpsr, fe.fe_fpcr);
+ static struct instruction insn;
+ static struct fpemu fe;
+ int word, optype, sig;
+
+
+ /* initialize insn.is_datasize to tell it is *not* initialized */
+ insn.is_datasize = -1;
+
+ fe.fe_frame = frame;
+ fe.fe_fpframe = fpf;
+ fe.fe_fpsr = fpf-fpf_fpsr;
+ fe.fe_fpcr = fpf-fpf_fpcr;
+
+#if DEBUG_FPE
+ printf(ENTERING fpu_emulate: FPSR=%08x, FPCR=%08x\n,
+ fe.fe_fpsr, fe.fe_fpcr);
+#endif
+
+ /* always set this (to avoid a warning) */
+ insn.is_pc = frame-f_pc;
+ insn.is_nextpc = 0;
+ if (frame-f_format == 4) {
+ /*
+ * A format 4 is generated by the 68{EC,LC}040. The PC is
+ * already set to the instruction following the faulting
+ * instruction. We need to calculate that, anyway. The
+ * fslw is the PC of the faulted instruction, which is what
+ * we expect to be in f_pc.
+ *
+ * XXX - This is a hack; it assumes we at least know the
+ * sizes of all instructions we run across.
+ * XXX TODO: This may not be true, so we might want to save
+ * the PC in order to restore it later.
+ */
+#if 0
+ insn.is_nextpc = frame-f_pc;
#endif
+ insn.is_pc = frame-f_fmt4.f_fslw;
+ frame-f_pc = insn.is_pc;
+ }
-/* always set this (to avoid a warning) */
-insn.is_pc = frame-f_pc;
-insn.is_nextpc = 0;
-if (frame-f_format == 4) {
- /*
- * A format 4 is generated by the 68{EC,LC}040. The PC is
- * already set to the instruction following the faulting
- * instruction. We need to
CVS commit: src/lib/libc/citrus/modules
Module Name:src
Committed By: joerg
Date: Mon May 23 14:53:46 UTC 2011
Modified Files:
src/lib/libc/citrus/modules: citrus_big5.c
Log Message:
Make intermediate size variable size_t like the rest to avoid
unnecessary casting.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/lib/libc/citrus/modules/citrus_big5.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/libc/citrus/modules/citrus_big5.c
diff -u src/lib/libc/citrus/modules/citrus_big5.c:1.12 src/lib/libc/citrus/modules/citrus_big5.c:1.13
--- src/lib/libc/citrus/modules/citrus_big5.c:1.12 Sat Jun 14 16:01:07 2008
+++ src/lib/libc/citrus/modules/citrus_big5.c Mon May 23 14:53:46 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: citrus_big5.c,v 1.12 2008/06/14 16:01:07 tnozaki Exp $ */
+/* $NetBSD: citrus_big5.c,v 1.13 2011/05/23 14:53:46 joerg Exp $ */
/*-
* Copyright (c)2002, 2006 Citrus Project,
@@ -60,7 +60,7 @@
#include sys/cdefs.h
#if defined(LIBC_SCCS) !defined(lint)
-__RCSID($NetBSD: citrus_big5.c,v 1.12 2008/06/14 16:01:07 tnozaki Exp $);
+__RCSID($NetBSD: citrus_big5.c,v 1.13 2011/05/23 14:53:46 joerg Exp $);
#endif /* LIBC_SCCS and not lint */
#include sys/queue.h
@@ -393,7 +393,7 @@
size_t n, wchar_t wc, _BIG5State * __restrict psenc,
size_t * __restrict nresult)
{
- int l, ret;
+ size_t l, ret;
_DIAGASSERT(ei != NULL);
_DIAGASSERT(nresult != 0);
CVS commit: src/sys/opencrypto
Module Name:src
Committed By: drochner
Date: Mon May 23 15:22:57 UTC 2011
Modified Files:
src/sys/opencrypto: cryptodev.c
Log Message:
If symmetric encryption is done from userland crypto(4) and no IV
is specified, the kernel gets one from the random generator. Make sure it
is copied out to the user, otherwise the result is quite useless.
To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/sys/opencrypto/cryptodev.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/opencrypto/cryptodev.c
diff -u src/sys/opencrypto/cryptodev.c:1.60 src/sys/opencrypto/cryptodev.c:1.61
--- src/sys/opencrypto/cryptodev.c:1.60 Mon May 23 13:53:59 2011
+++ src/sys/opencrypto/cryptodev.c Mon May 23 15:22:57 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cryptodev.c,v 1.60 2011/05/23 13:53:59 drochner Exp $ */
+/* $NetBSD: cryptodev.c,v 1.61 2011/05/23 15:22:57 drochner Exp $ */
/* $FreeBSD: src/sys/opencrypto/cryptodev.c,v 1.4.2.4 2003/06/03 00:09:02 sam Exp $ */
/* $OpenBSD: cryptodev.c,v 1.53 2002/07/10 22:21:30 mickey Exp $ */
@@ -64,7 +64,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cryptodev.c,v 1.60 2011/05/23 13:53:59 drochner Exp $);
+__KERNEL_RCSID(0, $NetBSD: cryptodev.c,v 1.61 2011/05/23 15:22:57 drochner Exp $);
#include sys/param.h
#include sys/systm.h
@@ -594,7 +594,8 @@
if (cse-cipher == CRYPTO_ARC4) { /* XXX use flag? */
crde-crd_skip = 0;
} else {
- crde-crd_flags |= CRD_F_IV_PRESENT;
+ if (!(crde-crd_flags CRD_F_ENCRYPT))
+crde-crd_flags |= CRD_F_IV_PRESENT;
crde-crd_skip = cse-txform-ivsize;
crde-crd_len -= cse-txform-ivsize;
}
@@ -1290,7 +1291,8 @@
if (cse-cipher == CRYPTO_ARC4) { /* XXX use flag? */
crde-crd_skip = 0;
} else {
-crde-crd_flags |= CRD_F_IV_PRESENT;
+if (!(crde-crd_flags CRD_F_ENCRYPT))
+ crde-crd_flags |= CRD_F_IV_PRESENT;
crde-crd_skip = cse-txform-ivsize;
crde-crd_len -= cse-txform-ivsize;
}
CVS commit: src/crypto/dist/ipsec-tools/src/setkey
Module Name:src Committed By: drochner Date: Mon May 23 16:00:07 UTC 2011 Modified Files: src/crypto/dist/ipsec-tools/src/setkey: setkey.8 Log Message: update draft-ipsec-* - RFC clarify a sentence To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/crypto/dist/ipsec-tools/src/setkey/setkey.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/dist/ipsec-tools/src/setkey/setkey.8 diff -u src/crypto/dist/ipsec-tools/src/setkey/setkey.8:1.26 src/crypto/dist/ipsec-tools/src/setkey/setkey.8:1.27 --- src/crypto/dist/ipsec-tools/src/setkey/setkey.8:1.26 Fri Dec 3 14:32:52 2010 +++ src/crypto/dist/ipsec-tools/src/setkey/setkey.8 Mon May 23 16:00:07 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: setkey.8,v 1.26 2010/12/03 14:32:52 tteras Exp $ +.\ $NetBSD: setkey.8,v 1.27 2011/05/23 16:00:07 drochner Exp $ .\ .\ Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project. .\ All rights reserved. @@ -689,12 +689,11 @@ keyed-sha1 160 ah: 96bit ICV (no document) 160 ah-old: 128bit ICV (no document) null 0 to 2048 for debugging -hmac-sha256 256 ah: 96bit ICV -(draft-ietf-ipsec-ciph-sha-256-00) +hmac-sha256 256 ah: 128bit ICV (RFC4868) 256 ah-old: 128bit ICV (no document) -hmac-sha384 384 ah: 96bit ICV (no document) +hmac-sha384 384 ah: 192bit ICV (RFC4868) 384 ah-old: 128bit ICV (no document) -hmac-sha512 512 ah: 96bit ICV (no document) +hmac-sha512 512 ah: 256bit ICV (RFC4868) 512 ah-old: 128bit ICV (no document) hmac-ripemd160 160 ah: 96bit ICV (RFC2857) ah-old: 128bit ICV (no document) @@ -722,11 +721,11 @@ 3des-deriv 192 no document rijndael-cbc 128/192/256 rfc3602 twofish-cbc 0 to 256 draft-ietf-ipsec-ciph-aes-cbc-01 -aes-ctr 160/224/288 draft-ietf-ipsec-ciph-aes-ctr-03 +aes-ctr 160/224/288 rfc3686 camellia-cbc 128/192/256 rfc4312 .Ed .Pp -Note that the first 128 bits of a key for +Note that the first 128/192/256 bits of a key for .Li aes-ctr will be used as AES key, and the remaining 32 bits will be used as nonce. .Pp
CVS commit: src/external/mit/xorg/bin
Module Name:src
Committed By: dsl
Date: Mon May 23 17:44:41 UTC 2011
Modified Files:
src/external/mit/xorg/bin/xdm: Makefile
src/external/mit/xorg/bin/xinput: Makefile
Log Message:
Add explicit -lfoo for libraries that are required because of NEEDED
entries in other libraries.
This avoids a bug in 'ld' which causes it to look in the directory
specified by the RPATH entry (in the library with the NEEDED entry)
without adding the directory supplied by --sysroot.
When the RPATH entry in blindly folloed the link is done w.r.t the
systems own libfoo.so which may be missing some symbols.
(Or might have a wrong sized data area that would need copying
into the programs (or other libraries) data space.)
ld also seems to add a NEEDED entry for these libraries directly
into the program binary - this doesn't seem right to me.
Fixes my build where the installed libX11.so is dated from 2009.
CVS :--
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/bin/xdm/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/bin/xinput/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xdm/Makefile
diff -u src/external/mit/xorg/bin/xdm/Makefile:1.6 src/external/mit/xorg/bin/xdm/Makefile:1.7
--- src/external/mit/xorg/bin/xdm/Makefile:1.6 Fri Dec 18 17:28:47 2009
+++ src/external/mit/xorg/bin/xdm/Makefile Mon May 23 17:44:41 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2009/12/18 17:28:47 christos Exp $
+# $NetBSD: Makefile,v 1.7 2011/05/23 17:44:41 dsl Exp $
.include bsd.own.mk
@@ -27,7 +27,7 @@
-DDEF_GREETER_LIB=\${XDMGREETERLIB}\
LDADD+= -lXau -lXdmcp -lXft -lXinerama -lXpm
-LDADD+= -lXmu -lXt -lSM -lICE -lXext -lX11
+LDADD+= -lXmu -lXt -lSM -lICE -lXext -lXrender -lX11
LDADD+= -lcrypt -lfreetype
DPADD+= ${LIBXAU} ${LIBXDMCP} ${LIBXFT} ${LIBXINERAMA} ${LIBXPM}
DPADD+= ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
Index: src/external/mit/xorg/bin/xinput/Makefile
diff -u src/external/mit/xorg/bin/xinput/Makefile:1.4 src/external/mit/xorg/bin/xinput/Makefile:1.5
--- src/external/mit/xorg/bin/xinput/Makefile:1.4 Sat May 22 02:40:55 2010
+++ src/external/mit/xorg/bin/xinput/Makefile Mon May 23 17:44:41 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2010/05/22 02:40:55 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2011/05/23 17:44:41 dsl Exp $
.include bsd.own.mk
@@ -8,7 +8,7 @@
CPPFLAGS+= -DVERSION='1.4.0'
-LDADD+= -lXi -lm
+LDADD+= -lXi -lX11 -lm
DPADD+= ${LIBXI} ${LIBM}
.PATH: ${X11SRCDIR.${PROG}}/src
.PATH: ${X11SRCDIR.${PROG}}/man
CVS commit: src/sys/arch/sparc/sparc
Module Name:src
Committed By: rmind
Date: Mon May 23 18:40:30 UTC 2011
Modified Files:
src/sys/arch/sparc/sparc: intr.c
Log Message:
nmi_hard: convert nmi_hard_wait to use atomics.
OK mrg@
To generate a diff of this commit:
cvs rdiff -u -r1.114 -r1.115 src/sys/arch/sparc/sparc/intr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc/sparc/intr.c
diff -u src/sys/arch/sparc/sparc/intr.c:1.114 src/sys/arch/sparc/sparc/intr.c:1.115
--- src/sys/arch/sparc/sparc/intr.c:1.114 Tue Feb 15 10:59:25 2011
+++ src/sys/arch/sparc/sparc/intr.c Mon May 23 18:40:30 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.c,v 1.114 2011/02/15 10:59:25 mrg Exp $ */
+/* $NetBSD: intr.c,v 1.115 2011/05/23 18:40:30 rmind Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -41,7 +41,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: intr.c,v 1.114 2011/02/15 10:59:25 mrg Exp $);
+__KERNEL_RCSID(0, $NetBSD: intr.c,v 1.115 2011/05/23 18:40:30 rmind Exp $);
#include opt_multiprocessor.h
#include opt_sparc_arch.h
@@ -52,7 +52,7 @@
#include sys/malloc.h
#include sys/cpu.h
#include sys/intr.h
-#include sys/simplelock.h
+#include sys/atomic.h
#include uvm/uvm_extern.h
@@ -187,9 +187,8 @@
int (*moduleerr_handler)(void);
#if defined(MULTIPROCESSOR)
-volatile int nmi_hard_wait = 0;
-struct simplelock nmihard_lock = SIMPLELOCK_INITIALIZER;
-int drop_into_rom_on_fatal = 1;
+static volatile u_int nmi_hard_wait = 0;
+int drop_into_rom_on_fatal = 1;
#endif
void
@@ -221,9 +220,7 @@
* variable is non-zero. If we are the master, loop while this
* variable is less than the number of cpus.
*/
- simple_lock(nmihard_lock);
- nmi_hard_wait++;
- simple_unlock(nmihard_lock);
+ atomic_inc_uint(nmi_hard_wait);
if (cpuinfo.master == 0) {
while (nmi_hard_wait)
@@ -275,9 +272,7 @@
/*
* Tell everyone else we've finished dealing with the hard NMI.
*/
- simple_lock(nmihard_lock);
nmi_hard_wait = 0;
- simple_unlock(nmihard_lock);
if (fatal drop_into_rom_on_fatal) {
prom_abort();
return;
CVS commit: xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha
Module Name:xsrc Committed By: christos Date: Mon May 23 18:48:45 UTC 2011 Modified Files: xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha: alphaInit.c Log Message: need err.h for warn To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/alphaInit.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/alphaInit.c diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/alphaInit.c:1.2 xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/alphaInit.c:1.3 --- xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/alphaInit.c:1.2 Sun Mar 27 19:08:16 2005 +++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/alphaInit.c Mon May 23 14:48:44 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: alphaInit.c,v 1.2 2005/03/28 00:08:16 tron Exp $ */ +/* $NetBSD: alphaInit.c,v 1.3 2011/05/23 18:48:44 christos Exp $ */ #includealpha.h #includegcstruct.h @@ -7,6 +7,7 @@ #includecfb.h #include stdio.h +#include err.h #define TGASUPPORT #define SFBSUPPORT
CVS commit: xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus
Module Name:xsrc
Committed By: christos
Date: Mon May 23 19:42:53 UTC 2011
Modified Files:
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus: amigaCL.c
amigaCL.h clbitblt.c clblt.c clfillrct.c clgc.c clsolid.c
clwindow.c
Log Message:
more prototypes.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/amigaCL.c \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/amigaCL.h \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clbitblt.c \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clblt.c \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clfillrct.c \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clgc.c \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clsolid.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clwindow.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/amigaCL.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/amigaCL.c:1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/amigaCL.c:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/amigaCL.c:1.1 Thu Jan 15 07:07:41 2004
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/amigaCL.c Mon May 23 15:42:53 2011
@@ -49,19 +49,8 @@
#includemigc.h
-Bool clCreateGC();
-void clCopyWindow();
-
-
-#if NeedFunctionPrototypes
-amigaCLGXInit (
-ScreenPtr pScreen,
-fbFd*fb)
-#else
-amigaCLGXInit (pScreen, fb)
-ScreenPtr pScreen;
-fbFd*fb;
-#endif
+Bool
+amigaCLGXInit(ScreenPtr pScreen, fbFd *fb)
{
#if 0
if (serverGeneration != amigaCLGeneration)
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/amigaCL.h
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/amigaCL.h:1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/amigaCL.h:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/amigaCL.h:1.1 Thu Jan 15 07:07:41 2004
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/amigaCL.h Mon May 23 15:42:53 2011
@@ -253,3 +253,22 @@
#define amigaInfo(s) (amigaFbs[(s)-myNum])
+
+/* amigaCL.c */
+Bool amigaCLGXInit(ScreenPtr, fbFd *);
+/* clgc.c */
+void clValidateGC(GCPtr, unsigned long, DrawablePtr);
+Bool clCreateGC(GCPtr);
+GCOps *clMatchCommon(GCPtr, cfbPrivGCPtr);
+/* clbitblt.c */
+void clDoBitblt(DrawablePtr, DrawablePtr, int, RegionPtr, DDXPointPtr,
+unsigned long);
+RegionPtr clCopyArea(DrawablePtr, DrawablePtr, GC *, int, int, int, int, int,
+int);
+/* clfillrct.c */
+void clPolyFillRect(DrawablePtr, GCPtr, int, xRectangle *);
+/* clwindow.c */
+void clCopyWindow(WindowPtr, DDXPointRec, RegionPtr);
+
+void clDoBitbltCopy(DrawablePtr, DrawablePtr, int, RegionPtr,
+DDXPointPtr, unsigned long);
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clbitblt.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clbitblt.c:1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clbitblt.c:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clbitblt.c:1.1 Thu Jan 15 07:07:41 2004
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clbitblt.c Mon May 23 15:42:53 2011
@@ -46,20 +46,18 @@
#include fastblt.h
#define MFB_CONSTS_ONLY
#include maskbits.h
-
-void clDoBitbltCopy(DrawablePtr, DrawablePtr, int, RegionPtr,
-DDXPointPtr, unsigned long);
-
+#include amigaCL.h
void
-clDoBitblt (pSrc, pDst, alu, prgnDst, pptSrc, planemask)
-DrawablePtr pSrc, pDst;
-int alu;
-RegionPtr prgnDst;
-DDXPointPtr pptSrc;
-unsigned long planemask;
+clDoBitblt(
+DrawablePtr pSrc, DrawablePtr pDst,
+int alu,
+RegionPtr prgnDst,
+DDXPointPtr pptSrc,
+unsigned long planemask)
{
-void (*blt)() = cfbDoBitbltGeneral;
+void (*blt)(DrawablePtr, DrawablePtr, int, RegionPtr, DDXPointPtr,
+ unsigned long) = cfbDoBitbltGeneral;
if ((planemask PMSK) == PMSK) {
switch (alu) {
case GXcopy:
@@ -77,16 +75,16 @@
}
RegionPtr
-clCopyArea(pSrcDrawable, pDstDrawable,
-pGC, srcx, srcy, width, height, dstx, dsty)
-register DrawablePtr pSrcDrawable;
-register DrawablePtr pDstDrawable;
-GC *pGC;
-int srcx, srcy;
-int width, height;
-int dstx, dsty;
+clCopyArea(
+DrawablePtr pSrcDrawable,
+DrawablePtr pDstDrawable,
+GC *pGC,
+int srcx, int srcy,
+int width, int height,
+int dstx, int dsty)
{
-void (*doBitBlt) ();
+void (*doBitBlt)(DrawablePtr, DrawablePtr, int, RegionPtr, DDXPointPtr,
+ unsigned long) = cfbDoBitbltGeneral;
doBitBlt = clDoBitbltCopy;
if (pGC-alu != GXcopy || (pGC-planemask PMSK) != PMSK)
Index:
CVS commit: xsrc/xfree/xc/programs/Xserver/hw/netbsd/mac68k
Module Name:xsrc
Committed By: christos
Date: Mon May 23 19:46:41 UTC 2011
Modified Files:
xsrc/xfree/xc/programs/Xserver/hw/netbsd/mac68k: mac68k.h mac68kMouse.c
Log Message:
change prototype to avoid casts.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/mac68k/mac68k.h
cvs rdiff -u -r1.1 -r1.2 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/mac68k/mac68kMouse.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/mac68k/mac68k.h
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/mac68k/mac68k.h:1.6 xsrc/xfree/xc/programs/Xserver/hw/netbsd/mac68k/mac68k.h:1.7
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/mac68k/mac68k.h:1.6 Sun May 22 22:40:13 2011
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/mac68k/mac68k.h Mon May 23 15:46:41 2011
@@ -94,7 +94,7 @@
void mac68k_processkbd(DeviceIntPtr, adb_event_t *);
-void mac68k_processmouse(DevicePtr, adb_event_t *);
+void mac68k_processmouse(DeviceIntPtr, adb_event_t *);
void mac68k_getmouse(void);
void mac68k_getkbd(void);
Bool mac68k_screeninit(ScreenPtr);
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/mac68k/mac68kMouse.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/mac68k/mac68kMouse.c:1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/mac68k/mac68kMouse.c:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/mac68k/mac68kMouse.c:1.1 Fri Jan 9 22:02:43 2004
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/mac68k/mac68kMouse.c Mon May 23 15:46:41 2011
@@ -143,14 +143,14 @@
static int accel_mouse (
- DevicePtr mouse,
+ DeviceIntPtr mouse,
int delta)
{
register int sgn = sign(delta);
register PtrCtrl *ctrlptr;
delta = abs(delta);
-ctrlptr = ((DeviceIntPtr) mouse)-ptrfeed-ctrl;
+ctrlptr = mouse-ptrfeed-ctrl;
if (delta ctrlptr-threshold)
return (sgn * (ctrlptr-threshold + ((delta - ctrlptr-threshold) *
@@ -161,7 +161,7 @@
void mac68k_processmouse(
- DevicePtr mouse,
+ DeviceIntPtr mouse,
adb_event_t *event)
{
xEvent xev;
CVS commit: xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec
Module Name:xsrc Committed By: christos Date: Mon May 23 19:48:14 UTC 2011 Modified Files: xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec: decCursor.c Log Message: Add missing casts. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/decCursor.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/decCursor.c diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/decCursor.c:1.3 xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/decCursor.c:1.4 --- xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/decCursor.c:1.3 Sun May 22 22:40:56 2011 +++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/decCursor.c Mon May 23 15:48:14 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: decCursor.c,v 1.3 2011/05/23 02:40:56 christos Exp $ */ +/* $NetBSD: decCursor.c,v 1.4 2011/05/23 19:48:14 christos Exp $ */ /* XConsortium: sunCursor.c,v 5.19 94/04/17 20:29:35 gildea Exp */ /* @@ -112,7 +112,7 @@ box.x2 = w; box.y2 = h; REGION_INIT(pScreen, rgnDst, box, 1); -mfbDoBitblt(src, dst, GXcopy, rgnDst, ptSrc); +mfbDoBitblt((Drawable)src, (Drawable)dst, GXcopy, rgnDst, ptSrc); REGION_UNINIT(pScreen, rgnDst); FreeScratchPixmapHeader(src); FreeScratchPixmapHeader(dst);
CVS commit: xsrc/external/mit/xf86-video-crime/dist/src
Module Name:xsrc Committed By: christos Date: Mon May 23 19:49:27 UTC 2011 Modified Files: xsrc/external/mit/xf86-video-crime/dist/src: crime_accel.c Log Message: fbComposite does not return a value. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 \ xsrc/external/mit/xf86-video-crime/dist/src/crime_accel.c 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-video-crime/dist/src/crime_accel.c diff -u xsrc/external/mit/xf86-video-crime/dist/src/crime_accel.c:1.15 xsrc/external/mit/xf86-video-crime/dist/src/crime_accel.c:1.16 --- xsrc/external/mit/xf86-video-crime/dist/src/crime_accel.c:1.15 Sun May 22 11:54:37 2011 +++ xsrc/external/mit/xf86-video-crime/dist/src/crime_accel.c Mon May 23 15:49:27 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: crime_accel.c,v 1.15 2011/05/22 15:54:37 christos Exp $ */ +/* $NetBSD: crime_accel.c,v 1.16 2011/05/23 19:49:27 christos Exp $ */ /* * Copyright (c) 2008 Michael Lorenz * All rights reserved. @@ -1769,8 +1769,9 @@ #if 0 return FALSE; #else - return fbComposite(op, pSrc, pMask, pDst, xSrc, ySrc, + fbComposite(op, pSrc, pMask, pDst, xSrc, ySrc, xMask, yMask, xDst, yDst, width, height); + return TRUE; #endif } }
CVS commit: xsrc/external/mit/xf86-video-igs/dist/src
Module Name:xsrc
Committed By: christos
Date: Mon May 23 19:51:27 UTC 2011
Modified Files:
xsrc/external/mit/xf86-video-igs/dist/src: igs.h
Log Message:
don't declare inb/outb.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xf86-video-igs/dist/src/igs.h
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-video-igs/dist/src/igs.h
diff -u xsrc/external/mit/xf86-video-igs/dist/src/igs.h:1.4 xsrc/external/mit/xf86-video-igs/dist/src/igs.h:1.5
--- xsrc/external/mit/xf86-video-igs/dist/src/igs.h:1.4 Sun May 22 12:04:15 2011
+++ xsrc/external/mit/xf86-video-igs/dist/src/igs.h Mon May 23 15:51:27 2011
@@ -1,5 +1,5 @@
/* $OpenBSD: wsfb_driver.c,v 1.18 2003/04/02 16:42:13 jason Exp $ */
-/* $NetBSD: igs.h,v 1.4 2011/05/22 16:04:15 christos Exp $ */
+/* $NetBSD: igs.h,v 1.5 2011/05/23 19:51:27 christos Exp $ */
/*
* Copyright (c) 2001 Matthieu Herrb
* 2009 Michael Lorenz
@@ -325,13 +325,6 @@
#define IGS_MIN_VCO 115000
-#ifdef __NetBSD__
-/* XXX: We don't have a usable pio.h so we just declare here.
- * This needs a proper implementation */
-uint8_t inb(unsigned);
-void outb(unsigned, uint8_t);
-#endif
-
static __inline uint8_t
igs_idx_read(u_int idxport, uint8_t idx)
{
CVS commit: xsrc/external/mit/xf86-video-ag10e/dist/src
Module Name:xsrc Committed By: christos Date: Mon May 23 19:53:36 UTC 2011 Modified Files: xsrc/external/mit/xf86-video-ag10e/dist/src: ag10e.h ag10e_driver.c Log Message: Add prototype and include To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xf86-video-ag10e/dist/src/ag10e.h cvs rdiff -u -r1.5 -r1.6 \ xsrc/external/mit/xf86-video-ag10e/dist/src/ag10e_driver.c 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-video-ag10e/dist/src/ag10e.h diff -u xsrc/external/mit/xf86-video-ag10e/dist/src/ag10e.h:1.2 xsrc/external/mit/xf86-video-ag10e/dist/src/ag10e.h:1.3 --- xsrc/external/mit/xf86-video-ag10e/dist/src/ag10e.h:1.2 Wed Jun 17 22:47:23 2009 +++ xsrc/external/mit/xf86-video-ag10e/dist/src/ag10e.h Mon May 23 15:53:36 2011 @@ -112,4 +112,7 @@ int AG10EAccelInit(ScreenPtr); Bool AG10EDGAInit(ScreenPtr); +/* ag10e_cursor.c */ +Bool AG10EHWCursorInit(ScreenPtr); + #endif /* AG10E_H */ Index: xsrc/external/mit/xf86-video-ag10e/dist/src/ag10e_driver.c diff -u xsrc/external/mit/xf86-video-ag10e/dist/src/ag10e_driver.c:1.5 xsrc/external/mit/xf86-video-ag10e/dist/src/ag10e_driver.c:1.6 --- xsrc/external/mit/xf86-video-ag10e/dist/src/ag10e_driver.c:1.5 Tue Nov 23 21:54:07 2010 +++ xsrc/external/mit/xf86-video-ag10e/dist/src/ag10e_driver.c Mon May 23 15:53:36 2011 @@ -31,6 +31,7 @@ #include fcntl.h #include sys/time.h #include sys/types.h +#include sys/ioctl.h #include dev/sun/fbio.h #include dev/wscons/wsconsio.h
CVS commit: xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc
Module Name:xsrc Committed By: christos Date: Mon May 23 19:58:56 UTC 2011 Modified Files: xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc: wscons.h Log Message: more prototypes. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 \ xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/wscons.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/wscons.h diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/wscons.h:1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/wscons.h:1.2 --- xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/wscons.h:1.1 Thu May 19 21:22:37 2011 +++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/wscons.h Mon May 23 15:58:56 2011 @@ -1,5 +1,14 @@ void wsdisplay_write_palette(int, int, int, int); void wsmouse_io(void); -int wsmouse_init(void); +void wskbd_io(void); + +void wscons_bell(int, DeviceIntPtr, pointer, int); + int wskbd_init(void); +int wsmouse_init(void); +int wsdisplay_init(ScreenPtr, int, char **); + void wsdisplay_shutdown(void); + +void wsdisplay_closedown(void); +void wskbd_closedown(void);
CVS commit: src/lib/libform
Module Name:src
Committed By: joerg
Date: Mon May 23 20:43:03 UTC 2011
Modified Files:
src/lib/libform: internals.c
Log Message:
Save space, kill some ()
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/lib/libform/internals.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/libform/internals.c
diff -u src/lib/libform/internals.c:1.34 src/lib/libform/internals.c:1.35
--- src/lib/libform/internals.c:1.34 Thu May 13 17:52:12 2010
+++ src/lib/libform/internals.c Mon May 23 20:43:02 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: internals.c,v 1.34 2010/05/13 17:52:12 tnozaki Exp $ */
+/* $NetBSD: internals.c,v 1.35 2011/05/23 20:43:02 joerg Exp $ */
/*-
* Copyright (c) 1998-1999 Brett Lymn
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: internals.c,v 1.34 2010/05/13 17:52:12 tnozaki Exp $);
+__RCSID($NetBSD: internals.c,v 1.35 2011/05/23 20:43:02 joerg Exp $);
#include limits.h
#include ctype.h
@@ -590,7 +590,7 @@
continue;
}
- if ((row-next == NULL)) {
+ if (row-next == NULL) {
/*
* If there are no more lines and this line
* is too short then our job is over.
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: joerg Date: Mon May 23 20:49:35 UTC 2011 Modified Files: src/sys/rump/include/rump: rumpuser.h Log Message: Mark rumpuser_exit and rumpuser_thread_exit as dead. To generate a diff of this commit: cvs rdiff -u -r1.68 -r1.69 src/sys/rump/include/rump/rumpuser.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/rump/include/rump/rumpuser.h diff -u src/sys/rump/include/rump/rumpuser.h:1.68 src/sys/rump/include/rump/rumpuser.h:1.69 --- src/sys/rump/include/rump/rumpuser.h:1.68 Mon Mar 21 16:41:08 2011 +++ src/sys/rump/include/rump/rumpuser.h Mon May 23 20:49:35 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: rumpuser.h,v 1.68 2011/03/21 16:41:08 pooka Exp $ */ +/* $NetBSD: rumpuser.h,v 1.69 2011/05/23 20:49:35 joerg Exp $ */ /* * Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved. @@ -102,7 +102,7 @@ int rumpuser_kill(int64_t, int, int *); #define RUMPUSER_PANIC (-1) -void rumpuser_exit(int); +void rumpuser_exit(int) __dead; void rumpuser_seterrno(int); int rumpuser_writewatchfile_setup(int, int, intptr_t, int *); @@ -118,7 +118,7 @@ int rumpuser_thread_create(void *(*f)(void *), void *, const char *, int, void **); -void rumpuser_thread_exit(void); +void rumpuser_thread_exit(void) __dead; int rumpuser_thread_join(void *); struct rumpuser_mtx;
CVS commit: src/sys/dev
Module Name:src
Committed By: joerg
Date: Mon May 23 21:18:55 UTC 2011
Modified Files:
src/sys/dev: fss.c
Log Message:
Don't use string literal as format string.
To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.74 src/sys/dev/fss.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/fss.c
diff -u src/sys/dev/fss.c:1.73 src/sys/dev/fss.c:1.74
--- src/sys/dev/fss.c:1.73 Thu Feb 24 09:38:57 2011
+++ src/sys/dev/fss.c Mon May 23 21:18:55 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: fss.c,v 1.73 2011/02/24 09:38:57 hannken Exp $ */
+/* $NetBSD: fss.c,v 1.74 2011/05/23 21:18:55 joerg Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: fss.c,v 1.73 2011/02/24 09:38:57 hannken Exp $);
+__KERNEL_RCSID(0, $NetBSD: fss.c,v 1.74 2011/05/23 21:18:55 joerg Exp $);
#include sys/param.h
#include sys/systm.h
@@ -456,7 +456,7 @@
sc-sc_flags |= FSS_BS_THREAD;
if ((error = kthread_create(PRI_BIO, 0, NULL, fss_bs_thread, sc,
- sc-sc_bs_lwp, device_xname(sc-sc_dev))) != 0) {
+ sc-sc_bs_lwp, %s, device_xname(sc-sc_dev))) != 0) {
sc-sc_flags = ~FSS_BS_THREAD;
return error;
}
CVS commit: src/sys/dev
Module Name:src
Committed By: joerg
Date: Mon May 23 21:30:56 UTC 2011
Modified Files:
src/sys/dev: vnd.c
Log Message:
Don't use the device name as format string.
To generate a diff of this commit:
cvs rdiff -u -r1.215 -r1.216 src/sys/dev/vnd.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/vnd.c
diff -u src/sys/dev/vnd.c:1.215 src/sys/dev/vnd.c:1.216
--- src/sys/dev/vnd.c:1.215 Tue Feb 8 20:20:26 2011
+++ src/sys/dev/vnd.c Mon May 23 21:30:56 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: vnd.c,v 1.215 2011/02/08 20:20:26 rmind Exp $ */
+/* $NetBSD: vnd.c,v 1.216 2011/05/23 21:30:56 joerg Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2008 The NetBSD Foundation, Inc.
@@ -91,7 +91,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vnd.c,v 1.215 2011/02/08 20:20:26 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: vnd.c,v 1.216 2011/05/23 21:30:56 joerg Exp $);
#if defined(_KERNEL_OPT)
#include opt_vnd.h
@@ -1271,7 +1271,7 @@
/* create the kernel thread, wait for it to be up */
error = kthread_create(PRI_NONE, 0, NULL, vndthread, vnd,
- vnd-sc_kthread, device_xname(vnd-sc_dev));
+ vnd-sc_kthread, %s, device_xname(vnd-sc_dev));
if (error)
goto close_and_exit;
while ((vnd-sc_flags VNF_KTHREAD) == 0) {
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSShared
Module Name:src
Committed By: joerg
Date: Mon May 23 22:39:25 UTC 2011
Modified Files:
src/external/apache2/mDNSResponder/dist/mDNSShared: uds_daemon.c
Log Message:
Make a gross hack nice enough to not trigger warnings with clang.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/apache2/mDNSResponder/dist/mDNSShared/uds_daemon.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/apache2/mDNSResponder/dist/mDNSShared/uds_daemon.c
diff -u src/external/apache2/mDNSResponder/dist/mDNSShared/uds_daemon.c:1.3 src/external/apache2/mDNSResponder/dist/mDNSShared/uds_daemon.c:1.4
--- src/external/apache2/mDNSResponder/dist/mDNSShared/uds_daemon.c:1.3 Sat Feb 12 17:21:38 2011
+++ src/external/apache2/mDNSResponder/dist/mDNSShared/uds_daemon.c Mon May 23 22:39:25 2011
@@ -1115,7 +1115,7 @@
mDNSlocal void FatalError(char *errmsg)
{
LogMsg(%s: %s, errmsg, dnssd_strerror(dnssd_errno));
- *(long*)0 = 0; // On OS X abort() doesn't generate a crash log, but writing to zero does
+ *(volatile long*)0 = 0; // On OS X abort() doesn't generate a crash log, but writing to zero does
abort(); // On platforms where writing to zero doesn't generate an exception, abort instead
}
CVS commit: src/games/battlestar
Module Name:src
Committed By: joerg
Date: Mon May 23 22:44:18 UTC 2011
Modified Files:
src/games/battlestar: room.c
Log Message:
Don't use return value of a function as format string.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/games/battlestar/room.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/battlestar/room.c
diff -u src/games/battlestar/room.c:1.12 src/games/battlestar/room.c:1.13
--- src/games/battlestar/room.c:1.12 Fri Jul 1 06:04:54 2005
+++ src/games/battlestar/room.c Mon May 23 22:44:18 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: room.c,v 1.12 2005/07/01 06:04:54 jmc Exp $ */
+/* $NetBSD: room.c,v 1.13 2011/05/23 22:44:18 joerg Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = @(#)room.c 8.2 (Berkeley) 4/28/95;
#else
-__RCSID($NetBSD: room.c,v 1.12 2005/07/01 06:04:54 jmc Exp $);
+__RCSID($NetBSD: room.c,v 1.13 2011/05/23 22:44:18 joerg Exp $);
#endif
#endif/* not lint */
@@ -58,7 +58,7 @@
putchar(c);
} else {
if (c != '*')
- printf(truedirec(compass, c));
+ printf(%s, truedirec(compass, c));
compass++;
}
}
CVS commit: src/games/hack
Module Name:src
Committed By: joerg
Date: Mon May 23 22:53:25 UTC 2011
Modified Files:
src/games/hack: hack.apply.c hack.eat.c hack.invent.c hack.main.c
hack.options.c hack.pager.c hack.potion.c hack.rumors.c
hack.timeout.c
Log Message:
Correctly print variables as strings, not as format string.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/games/hack/hack.apply.c \
src/games/hack/hack.options.c
cvs rdiff -u -r1.9 -r1.10 src/games/hack/hack.eat.c
cvs rdiff -u -r1.14 -r1.15 src/games/hack/hack.invent.c \
src/games/hack/hack.pager.c
cvs rdiff -u -r1.15 -r1.16 src/games/hack/hack.main.c
cvs rdiff -u -r1.8 -r1.9 src/games/hack/hack.potion.c \
src/games/hack/hack.timeout.c
cvs rdiff -u -r1.7 -r1.8 src/games/hack/hack.rumors.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/hack/hack.apply.c
diff -u src/games/hack/hack.apply.c:1.10 src/games/hack/hack.apply.c:1.11
--- src/games/hack/hack.apply.c:1.10 Sun Jun 7 18:30:39 2009
+++ src/games/hack/hack.apply.c Mon May 23 22:53:25 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: hack.apply.c,v 1.10 2009/06/07 18:30:39 dholland Exp $ */
+/* $NetBSD: hack.apply.c,v 1.11 2011/05/23 22:53:25 joerg Exp $ */
/*
* Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -63,7 +63,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: hack.apply.c,v 1.10 2009/06/07 18:30:39 dholland Exp $);
+__RCSID($NetBSD: hack.apply.c,v 1.11 2011/05/23 22:53:25 joerg Exp $);
#endif/* not lint */
#include hack.h
@@ -383,7 +383,7 @@
digtxt = Now what exactly was it that you were digging in?;
mnewsym(dpx, dpy);
prl(dpx, dpy);
- pline(digtxt); /* after mnewsym prl */
+ pline(%s, digtxt); /* after mnewsym prl */
return (0);
} else {
if (IS_WALL(levl[dpx][dpy].typ)) {
Index: src/games/hack/hack.options.c
diff -u src/games/hack/hack.options.c:1.10 src/games/hack/hack.options.c:1.11
--- src/games/hack/hack.options.c:1.10 Wed Aug 12 07:28:41 2009
+++ src/games/hack/hack.options.c Mon May 23 22:53:25 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: hack.options.c,v 1.10 2009/08/12 07:28:41 dholland Exp $ */
+/* $NetBSD: hack.options.c,v 1.11 2011/05/23 22:53:25 joerg Exp $ */
/*
* Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -63,7 +63,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: hack.options.c,v 1.10 2009/08/12 07:28:41 dholland Exp $);
+__RCSID($NetBSD: hack.options.c,v 1.11 2011/05/23 22:53:25 joerg Exp $);
#endif/* not lint */
#include stdlib.h
@@ -271,7 +271,7 @@
if (*--eop == ',')
*eop = 0;
}
- pline(buf);
+ pline(%s, buf);
} else
parseoptions(buf, FALSE);
Index: src/games/hack/hack.eat.c
diff -u src/games/hack/hack.eat.c:1.9 src/games/hack/hack.eat.c:1.10
--- src/games/hack/hack.eat.c:1.9 Wed Aug 12 07:28:40 2009
+++ src/games/hack/hack.eat.c Mon May 23 22:53:25 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: hack.eat.c,v 1.9 2009/08/12 07:28:40 dholland Exp $ */
+/* $NetBSD: hack.eat.c,v 1.10 2011/05/23 22:53:25 joerg Exp $ */
/*
* Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -63,7 +63,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: hack.eat.c,v 1.9 2009/08/12 07:28:40 dholland Exp $);
+__RCSID($NetBSD: hack.eat.c,v 1.10 2011/05/23 22:53:25 joerg Exp $);
#endif/* not lint */
#include hack.h
@@ -138,7 +138,7 @@
useup(tin.tin);
r = rn2(2 * TTSZ);
if (r TTSZ) {
- pline(tintxts[r].txt);
+ pline(%s, tintxts[r].txt);
lesshungry(tintxts[r].nut);
if (r == 1) { /* SALMON */
Glib = rnd(15);
Index: src/games/hack/hack.invent.c
diff -u src/games/hack/hack.invent.c:1.14 src/games/hack/hack.invent.c:1.15
--- src/games/hack/hack.invent.c:1.14 Wed Aug 12 07:28:40 2009
+++ src/games/hack/hack.invent.c Mon May 23 22:53:25 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: hack.invent.c,v 1.14 2009/08/12 07:28:40 dholland Exp $ */
+/* $NetBSD: hack.invent.c,v 1.15 2011/05/23 22:53:25 joerg Exp $ */
/*
* Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -63,7 +63,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: hack.invent.c,v 1.14 2009/08/12 07:28:40 dholland Exp $);
+__RCSID($NetBSD: hack.invent.c,v 1.15 2011/05/23 22:53:25 joerg Exp $);
#endif/* not lint */
#include assert.h
@@ -655,7 +655,7 @@
if (ckfn !(*ckfn) (otmp))
continue;
if (!allflag) {
- pline(xprname(otmp, ilet));
+ pline(%s, xprname(otmp, ilet));
addtopl( [nyaq]? );
sym = readchar();
} else
@@ -699,7 +699,7 @@
void
prinv(struct obj *obj)
{
- pline(xprname(obj, obj_to_let(obj)));
+ pline(%s, xprname(obj, obj_to_let(obj)));
}
static char *
Index: src/games/hack/hack.pager.c
diff -u src/games/hack/hack.pager.c:1.14 src/games/hack/hack.pager.c:1.15
--- src/games/hack/hack.pager.c:1.14 Wed Feb 3 15:34:38 2010
+++ src/games/hack/hack.pager.c Mon May 23
CVS commit: src/games/hunt/hunt
Module Name:src
Committed By: joerg
Date: Mon May 23 22:56:11 UTC 2011
Modified Files:
src/games/hunt/hunt: hunt.c
Log Message:
Don't use variables as format string.
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/games/hunt/hunt/hunt.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/hunt/hunt/hunt.c
diff -u src/games/hunt/hunt/hunt.c:1.38 src/games/hunt/hunt/hunt.c:1.39
--- src/games/hunt/hunt/hunt.c:1.38 Wed Jan 5 15:52:20 2011
+++ src/games/hunt/hunt/hunt.c Mon May 23 22:56:11 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: hunt.c,v 1.38 2011/01/05 15:52:20 dholland Exp $ */
+/* $NetBSD: hunt.c,v 1.39 2011/05/23 22:56:11 joerg Exp $ */
/*
* Copyright (c) 1983-2003, Regents of the University of California.
* All rights reserved.
@@ -32,7 +32,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: hunt.c,v 1.38 2011/01/05 15:52:20 dholland Exp $);
+__RCSID($NetBSD: hunt.c,v 1.39 2011/05/23 22:56:11 joerg Exp $);
#endif /* not lint */
#include sys/param.h
@@ -764,7 +764,7 @@
int serrno = errno;
fincurs();
errno = serrno;
- err(eval, mesg ? mesg : );
+ err(eval, %s, mesg ? mesg : );
}
/*
@@ -776,7 +776,7 @@
leavex(int eval, const char *mesg)
{
fincurs();
- errx(eval, mesg ? mesg : );
+ errx(eval, %s, mesg ? mesg : );
}
static long
CVS commit: src/games/mille
Module Name:src
Committed By: joerg
Date: Mon May 23 22:59:27 UTC 2011
Modified Files:
src/games/mille: print.c
Log Message:
ANSIfy
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/games/mille/print.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/mille/print.c
diff -u src/games/mille/print.c:1.15 src/games/mille/print.c:1.16
--- src/games/mille/print.c:1.15 Wed Aug 12 08:07:27 2009
+++ src/games/mille/print.c Mon May 23 22:59:27 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: print.c,v 1.15 2009/08/12 08:07:27 dholland Exp $ */
+/* $NetBSD: print.c,v 1.16 2011/05/23 22:59:27 joerg Exp $ */
/*
* Copyright (c) 1982, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = @(#)print.c 8.1 (Berkeley) 5/31/93;
#else
-__RCSID($NetBSD: print.c,v 1.15 2009/08/12 08:07:27 dholland Exp $);
+__RCSID($NetBSD: print.c,v 1.16 2011/05/23 22:59:27 joerg Exp $);
#endif
#endif /* not lint */
@@ -118,12 +118,7 @@
static char Score_fmt[] = %4d;
void
-prscore(for_real)
-#ifdef EXTRAP
- bool for_real;
-#else
- bool for_real __unused;
-#endif
+prscore(bool for_real)
{
PLAY *pp;
int x;
CVS commit: src/games/rogue
Module Name:src
Committed By: joerg
Date: Mon May 23 23:01:17 UTC 2011
Modified Files:
src/games/rogue: move.c pack.c rogue.h spec_hit.c throw.c
Log Message:
Kill some pointer indirections. Don't use variables as format strings.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/games/rogue/move.c
cvs rdiff -u -r1.11 -r1.12 src/games/rogue/pack.c src/games/rogue/throw.c
cvs rdiff -u -r1.20 -r1.21 src/games/rogue/rogue.h
cvs rdiff -u -r1.8 -r1.9 src/games/rogue/spec_hit.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/rogue/move.c
diff -u src/games/rogue/move.c:1.12 src/games/rogue/move.c:1.13
--- src/games/rogue/move.c:1.12 Wed Aug 12 08:44:45 2009
+++ src/games/rogue/move.c Mon May 23 23:01:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: move.c,v 1.12 2009/08/12 08:44:45 dholland Exp $ */
+/* $NetBSD: move.c,v 1.13 2011/05/23 23:01:17 joerg Exp $ */
/*
* Copyright (c) 1988, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = @(#)move.c 8.1 (Berkeley) 5/31/93;
#else
-__RCSID($NetBSD: move.c,v 1.12 2009/08/12 08:44:45 dholland Exp $);
+__RCSID($NetBSD: move.c,v 1.13 2011/05/23 23:01:17 joerg Exp $);
#endif
#endif /* not lint */
@@ -57,7 +57,7 @@
short m_moves = 0;
boolean jump = 0;
-const char *you_can_move_again = you can move again;
+const char you_can_move_again[] = you can move again;
static boolean can_turn(short, short);
static boolean check_hunger(boolean);
@@ -405,7 +405,7 @@
mv_mons();
}
}
- messagef(1, you_can_move_again);
+ messagef(1, %s, you_can_move_again);
}
}
if (msg_only) {
Index: src/games/rogue/pack.c
diff -u src/games/rogue/pack.c:1.11 src/games/rogue/pack.c:1.12
--- src/games/rogue/pack.c:1.11 Wed Aug 12 08:44:45 2009
+++ src/games/rogue/pack.c Mon May 23 23:01:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pack.c,v 1.11 2009/08/12 08:44:45 dholland Exp $ */
+/* $NetBSD: pack.c,v 1.12 2011/05/23 23:01:17 joerg Exp $ */
/*
* Copyright (c) 1988, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = @(#)pack.c 8.1 (Berkeley) 5/31/93;
#else
-__RCSID($NetBSD: pack.c,v 1.11 2009/08/12 08:44:45 dholland Exp $);
+__RCSID($NetBSD: pack.c,v 1.12 2011/05/23 23:01:17 joerg Exp $);
#endif
#endif /* not lint */
@@ -55,7 +55,7 @@
#include rogue.h
-const char *curse_message = you can't, it appears to be cursed;
+const char curse_message[] = you can't, it appears to be cursed;
static object *check_duplicate(object *, object *);
static boolean is_pack_letter(short *, unsigned short *);
Index: src/games/rogue/throw.c
diff -u src/games/rogue/throw.c:1.11 src/games/rogue/throw.c:1.12
--- src/games/rogue/throw.c:1.11 Wed Aug 12 08:44:45 2009
+++ src/games/rogue/throw.c Mon May 23 23:01:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: throw.c,v 1.11 2009/08/12 08:44:45 dholland Exp $ */
+/* $NetBSD: throw.c,v 1.12 2011/05/23 23:01:17 joerg Exp $ */
/*
* Copyright (c) 1988, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = @(#)throw.c 8.1 (Berkeley) 5/31/93;
#else
-__RCSID($NetBSD: throw.c,v 1.11 2009/08/12 08:44:45 dholland Exp $);
+__RCSID($NetBSD: throw.c,v 1.12 2011/05/23 23:01:17 joerg Exp $);
#endif
#endif /* not lint */
@@ -89,7 +89,7 @@
return;
}
if ((weapon-in_use_flags BEING_USED) weapon-is_cursed) {
- messagef(0, curse_message);
+ messagef(0, %s, curse_message);
return;
}
row = rogue.row; col = rogue.col;
Index: src/games/rogue/rogue.h
diff -u src/games/rogue/rogue.h:1.20 src/games/rogue/rogue.h:1.21
--- src/games/rogue/rogue.h:1.20 Wed Aug 12 08:44:45 2009
+++ src/games/rogue/rogue.h Mon May 23 23:01:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rogue.h,v 1.20 2009/08/12 08:44:45 dholland Exp $ */
+/* $NetBSD: rogue.h,v 1.21 2011/05/23 23:01:17 joerg Exp $ */
/*
* Copyright (c) 1988, 1993
@@ -667,7 +667,7 @@
extern char hunger_str[HUNGER_STR_LEN];
extern char login_name[MAX_OPT_LEN];
extern const char *byebye_string;
-extern const char *curse_message;
+extern const char curse_message[];
extern const char *error_file;
extern char *fruit;
extern const char *const m_names[];
@@ -676,7 +676,7 @@
extern char *nick_name;
extern const char *press_space;
extern char *save_file;
-extern const char *you_can_move_again;
+extern const char you_can_move_again[];
extern const long level_points[];
extern short add_strength;
extern short auto_search;
Index: src/games/rogue/spec_hit.c
diff -u src/games/rogue/spec_hit.c:1.8 src/games/rogue/spec_hit.c:1.9
--- src/games/rogue/spec_hit.c:1.8 Mon Jan 14 03:50:02 2008
+++ src/games/rogue/spec_hit.c Mon May 23 23:01:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: spec_hit.c,v 1.8 2008/01/14 03:50:02 dholland Exp $ */
+/* $NetBSD: spec_hit.c,v 1.9 2011/05/23 23:01:17 joerg Exp $ */
/*
* Copyright (c) 1988, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = @(#)spec_hit.c 8.1 (Berkeley) 5/31/93;
#else
-__RCSID($NetBSD: spec_hit.c,v 1.8
CVS commit: src/games/worm
Module Name:src
Committed By: joerg
Date: Mon May 23 23:03:38 UTC 2011
Modified Files:
src/games/worm: worm.c
Log Message:
ANSIfy
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/games/worm/worm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/worm/worm.c
diff -u src/games/worm/worm.c:1.29 src/games/worm/worm.c:1.30
--- src/games/worm/worm.c:1.29 Wed Aug 12 08:56:41 2009
+++ src/games/worm/worm.c Mon May 23 23:03:38 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: worm.c,v 1.29 2009/08/12 08:56:41 dholland Exp $ */
+/* $NetBSD: worm.c,v 1.30 2011/05/23 23:03:38 joerg Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = @(#)worm.c 8.1 (Berkeley) 5/31/93;
#else
-__RCSID($NetBSD: worm.c,v 1.29 2009/08/12 08:56:41 dholland Exp $);
+__RCSID($NetBSD: worm.c,v 1.30 2011/05/23 23:03:38 joerg Exp $);
#endif
#endif /* not lint */
@@ -95,9 +95,7 @@
static void wake(int);
int
-main(argc, argv)
- int argc;
- char **argv;
+main(int argc, char **argv)
{
/* Revoke setgid privileges */
@@ -158,7 +156,7 @@
}
static void
-life()
+life(void)
{
struct body *bp, *np;
int i, j = 1;
@@ -193,17 +191,14 @@
}
static void
-display(pos, chr)
- const struct body *pos;
- char chr;
+display(const struct body *pos, char chr)
{
wmove(tv, pos-y, pos-x);
waddch(tv, chr);
}
static void
-leave(dummy)
- int dummy;
+leave(int dummy)
{
endwin();
@@ -215,8 +210,7 @@
}
static void
-wake(dummy)
- int dummy __unused;
+wake(int dummy)
{
signal(SIGALRM, wake);
fflush(stdout);
@@ -224,15 +218,13 @@
}
static int
-rnd(range)
- int range;
+rnd(int range)
{
return abs((rand()5)+(rand()5)) % range;
}
static void
-newpos(bp)
- struct body * bp;
+newpos(struct body *bp)
{
if (visible_len == (LINES-3) * (COLS-3) - 1) {
endwin();
@@ -249,7 +241,7 @@
}
static void
-prize()
+prize(void)
{
int value;
@@ -260,8 +252,7 @@
}
static void
-process(ch)
- int ch;
+process(int ch)
{
int x,y;
struct body *nh;
@@ -355,13 +346,13 @@
}
static void
-crash()
+crash(void)
{
leave(0);
}
static void
-setup()
+setup(void)
{
clear();
refresh();
CVS commit: src/games/dab
Module Name:src
Committed By: joerg
Date: Mon May 23 23:06:41 UTC 2011
Modified Files:
src/games/dab: defs.h
Log Message:
Map RCSID to __RCSID
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/games/dab/defs.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/dab/defs.h
diff -u src/games/dab/defs.h:1.2 src/games/dab/defs.h:1.3
--- src/games/dab/defs.h:1.2 Mon Apr 28 20:22:53 2008
+++ src/games/dab/defs.h Mon May 23 23:06:41 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.2 2008/04/28 20:22:53 martin Exp $ */
+/* $NetBSD: defs.h,v 1.3 2011/05/23 23:06:41 joerg Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -36,9 +36,8 @@
#ifndef _H_DEFS
#define _H_DEFS
-#include stdlib.h
+#include sys/cdefs.h
-#define RCSID(id) \
-static const char *rcsid(const char* x) { return x ? rcsid(id) : x; }
+#define RCSID(id) __RCSID(id);
#endif
CVS commit: src/bin/ed
Module Name:src
Committed By: joerg
Date: Mon May 23 23:13:11 UTC 2011
Modified Files:
src/bin/ed: io.c main.c
Log Message:
Conditionalize printfs instead of using conditional empty format
strings.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/bin/ed/io.c
cvs rdiff -u -r1.22 -r1.23 src/bin/ed/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/bin/ed/io.c
diff -u src/bin/ed/io.c:1.8 src/bin/ed/io.c:1.9
--- src/bin/ed/io.c:1.8 Sun Jun 26 19:10:49 2005
+++ src/bin/ed/io.c Mon May 23 23:13:10 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: io.c,v 1.8 2005/06/26 19:10:49 christos Exp $ */
+/* $NetBSD: io.c,v 1.9 2011/05/23 23:13:10 joerg Exp $ */
/* io.c: This file contains the i/o routines for the ed line editor */
/*-
@@ -32,7 +32,7 @@
#if 0
static char *rcsid = @(#)io.c,v 1.1 1994/02/01 00:34:41 alm Exp;
#else
-__RCSID($NetBSD: io.c,v 1.8 2005/06/26 19:10:49 christos Exp $);
+__RCSID($NetBSD: io.c,v 1.9 2011/05/23 23:13:10 joerg Exp $);
#endif
#endif /* not lint */
@@ -59,7 +59,8 @@
sprintf(errmsg, cannot close input file);
return ERR;
}
- fprintf(stderr, !scripted ? %lu\n : , size);
+ if (!scripted)
+ fprintf(stderr, %lu\n, size);
return current_addr - n;
}
@@ -165,7 +166,8 @@
sprintf(errmsg, cannot close output file);
return ERR;
}
- fprintf(stderr, !scripted ? %lu\n : , size);
+ if (!scripted)
+ fprintf(stderr, %lu\n, size);
return n ? m - n + 1 : 0;
}
Index: src/bin/ed/main.c
diff -u src/bin/ed/main.c:1.22 src/bin/ed/main.c:1.23
--- src/bin/ed/main.c:1.22 Wed Jun 10 04:16:53 2009
+++ src/bin/ed/main.c Mon May 23 23:13:10 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.22 2009/06/10 04:16:53 ginsbach Exp $ */
+/* $NetBSD: main.c,v 1.23 2011/05/23 23:13:10 joerg Exp $ */
/* main.c: This file contains the main control and user-interface routines
for the ed line editor. */
@@ -39,7 +39,7 @@
#if 0
static char *rcsid = @(#)main.c,v 1.1 1994/02/01 00:34:42 alm Exp;
#else
-__RCSID($NetBSD: main.c,v 1.22 2009/06/10 04:16:53 ginsbach Exp $);
+__RCSID($NetBSD: main.c,v 1.23 2011/05/23 23:13:10 joerg Exp $);
#endif
#endif /* not lint */
@@ -200,9 +200,11 @@
fputs(?\n, stderr);
sprintf(errmsg, warning: file modified);
if (!isatty(0)) {
- fprintf(stderr, garrulous ?
- script, line %d: %s\n :
- , lineno, errmsg);
+ if (garrulous) {
+ fprintf(stderr,
+ script, line %d: %s\n,
+ lineno, errmsg);
+ }
quit(2);
}
clearerr(stdin);
@@ -233,27 +235,32 @@
fputs(?\n, stderr); /* give warning */
sprintf(errmsg, warning: file modified);
if (!isatty(0)) {
-fprintf(stderr, garrulous ?
-script, line %d: %s\n :
-, lineno, errmsg);
+if (garrulous) {
+ fprintf(stderr,
+ script, line %d: %s\n,
+ lineno, errmsg);
+}
quit(2);
}
break;
case FATAL:
- if (!isatty(0))
-fprintf(stderr, garrulous ?
-script, line %d: %s\n : ,
-lineno, errmsg);
- else
-fprintf(stderr, garrulous ? %s\n : ,
-errmsg);
+ if (garrulous) {
+if (!isatty(0)) {
+ fprintf(stderr,
+ script, line %d: %s\n,
+ lineno, errmsg);
+} else {
+ fprintf(stderr, %s\n, errmsg);
+}
+ }
quit(3);
default:
fputs(?\n, stderr);
if (!isatty(0)) {
-fprintf(stderr, garrulous ?
-script, line %d: %s\n : ,
-lineno, errmsg);
+if (garrulous) {
+ fprintf(stderr, script, line %d: %s\n,
+ lineno, errmsg);
+}
quit(2);
}
break;
CVS commit: src/sys/fs/tmpfs
Module Name:src
Committed By: rmind
Date: Tue May 24 01:09:48 UTC 2011
Modified Files:
src/sys/fs/tmpfs: tmpfs_mem.c tmpfs_subr.c tmpfs_vfsops.c
Log Message:
- tmpfs_alloc_node/tmpfs_free_node: move inode limiting into tmpfs_node_get()
and tmpfs_node_put(), update outdated/wrong comments and move/add asserts.
- tmpfs_mount: check for the version of arguments a bit earlier.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/fs/tmpfs/tmpfs_mem.c
cvs rdiff -u -r1.64 -r1.65 src/sys/fs/tmpfs/tmpfs_subr.c
cvs rdiff -u -r1.48 -r1.49 src/sys/fs/tmpfs/tmpfs_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/tmpfs/tmpfs_mem.c
diff -u src/sys/fs/tmpfs/tmpfs_mem.c:1.3 src/sys/fs/tmpfs/tmpfs_mem.c:1.4
--- src/sys/fs/tmpfs/tmpfs_mem.c:1.3 Thu May 19 03:21:23 2011
+++ src/sys/fs/tmpfs/tmpfs_mem.c Tue May 24 01:09:47 2011
@@ -1,9 +1,12 @@
-/* $NetBSD: tmpfs_mem.c,v 1.3 2011/05/19 03:21:23 rmind Exp $ */
+/* $NetBSD: tmpfs_mem.c,v 1.4 2011/05/24 01:09:47 rmind Exp $ */
/*
- * Copyright (c) 2010 The NetBSD Foundation, Inc.
+ * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
*
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Mindaugas Rasiukevicius.
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
@@ -32,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: tmpfs_mem.c,v 1.3 2011/05/19 03:21:23 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: tmpfs_mem.c,v 1.4 2011/05/24 01:09:47 rmind Exp $);
#include sys/param.h
#include sys/atomic.h
@@ -161,6 +164,10 @@
tmpfs_node_get(struct tmpfs_mount *mp)
{
+ if (atomic_inc_uint_nv(mp-tm_nodes_cnt) = mp-tm_nodes_max) {
+ atomic_dec_uint(mp-tm_nodes_cnt);
+ return NULL;
+ }
if (!tmpfs_mem_incr(mp, sizeof(struct tmpfs_node))) {
return NULL;
}
@@ -171,6 +178,7 @@
tmpfs_node_put(struct tmpfs_mount *mp, struct tmpfs_node *tn)
{
+ atomic_dec_uint(mp-tm_nodes_cnt);
tmpfs_mem_decr(mp, sizeof(struct tmpfs_node));
pool_put(tmpfs_node_pool, tn);
}
Index: src/sys/fs/tmpfs/tmpfs_subr.c
diff -u src/sys/fs/tmpfs/tmpfs_subr.c:1.64 src/sys/fs/tmpfs/tmpfs_subr.c:1.65
--- src/sys/fs/tmpfs/tmpfs_subr.c:1.64 Sun May 22 04:20:50 2011
+++ src/sys/fs/tmpfs/tmpfs_subr.c Tue May 24 01:09:47 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: tmpfs_subr.c,v 1.64 2011/05/22 04:20:50 rmind Exp $ */
+/* $NetBSD: tmpfs_subr.c,v 1.65 2011/05/24 01:09:47 rmind Exp $ */
/*
* Copyright (c) 2005, 2006, 2007 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: tmpfs_subr.c,v 1.64 2011/05/22 04:20:50 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: tmpfs_subr.c,v 1.65 2011/05/24 01:09:47 rmind Exp $);
#include sys/param.h
#include sys/dirent.h
@@ -61,29 +61,9 @@
#include fs/tmpfs/tmpfs_specops.h
#include fs/tmpfs/tmpfs_vnops.h
-/* - */
-
/*
- * Allocates a new node of type 'type' inside the 'tmp' mount point, with
- * its owner set to 'uid', its group to 'gid' and its mode set to 'mode',
- * using the credentials of the process 'p'.
- *
- * If the node type is set to 'VDIR', then the parent parameter must point
- * to the parent directory of the node being created. It may only be NULL
- * while allocating the root node.
- *
- * If the node type is set to 'VBLK' or 'VCHR', then the rdev parameter
- * specifies the device the node represents.
- *
- * If the node type is set to 'VLNK', then the parameter target specifies
- * the file name of the target file for the symbolic link that is being
- * created.
- *
- * Note that new nodes are retrieved from the available list if it has
- * items or, if it is empty, from the node pool as long as there is enough
- * space to create them.
- *
- * Returns zero on success or an appropriate error code on failure.
+ * tmpfs_alloc_node: allocate a new inode of a specified type and
+ * insert it into the list of specified mount point.
*/
int
tmpfs_alloc_node(struct tmpfs_mount *tmp, enum vtype type,
@@ -92,24 +72,8 @@
{
struct tmpfs_node *nnode;
- /* If the root directory of the 'tmp' file system is not yet
- * allocated, this must be the request to do it. */
- KASSERT(IMPLIES(tmp-tm_root == NULL, parent == NULL type == VDIR));
-
- KASSERT(IFF(type == VLNK, target != NULL));
- KASSERT(IFF(type == VBLK || type == VCHR, rdev != VNOVAL));
-
- KASSERT(uid != VNOVAL gid != VNOVAL mode != VNOVAL);
-
- nnode = NULL;
- if (atomic_inc_uint_nv(tmp-tm_nodes_cnt) = tmp-tm_nodes_max) {
- atomic_dec_uint(tmp-tm_nodes_cnt);
- return ENOSPC;
- }
-
nnode = tmpfs_node_get(tmp);
if (nnode == NULL) {
- atomic_dec_uint(tmp-tm_nodes_cnt);
return ENOSPC;
}
@@ -127,26 +91,35 @@
nnode-tn_status = 0;
nnode-tn_flags = 0;
CVS commit: src/sys/arch/sparc64/dev
Module Name:src Committed By: mrg Date: Tue May 24 01:17:36 UTC 2011 Modified Files: src/sys/arch/sparc64/dev: sab.c Log Message: also match the fujitsu sab: FJSV,se (from openbsd, pointed out by jdc) To generate a diff of this commit: cvs rdiff -u -r1.46 -r1.47 src/sys/arch/sparc64/dev/sab.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/sparc64/dev/sab.c diff -u src/sys/arch/sparc64/dev/sab.c:1.46 src/sys/arch/sparc64/dev/sab.c:1.47 --- src/sys/arch/sparc64/dev/sab.c:1.46 Sun Apr 24 16:26:57 2011 +++ src/sys/arch/sparc64/dev/sab.c Tue May 24 01:17:36 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: sab.c,v 1.46 2011/04/24 16:26:57 rmind Exp $ */ +/* $NetBSD: sab.c,v 1.47 2011/05/24 01:17:36 mrg Exp $ */ /* $OpenBSD: sab.c,v 1.7 2002/04/08 17:49:42 jason Exp $ */ /* @@ -42,7 +42,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: sab.c,v 1.46 2011/04/24 16:26:57 rmind Exp $); +__KERNEL_RCSID(0, $NetBSD: sab.c,v 1.47 2011/05/24 01:17:36 mrg Exp $); #include opt_kgdb.h #include sys/types.h @@ -227,7 +227,8 @@ struct ebus_attach_args *ea = aux; char *compat; - if (strcmp(ea-ea_name, se) == 0) + if (strcmp(ea-ea_name, se) == 0 || + strcmp(ea-ea_name, FJSV,se) == 0) return (1); compat = prom_getpropstring(ea-ea_node, compatible);
CVS commit: src/sys/kern
Module Name:src
Committed By: mrg
Date: Tue May 24 01:19:48 UTC 2011
Modified Files:
src/sys/kern: kern_resource.c
Log Message:
fix proc.pid.corename:
- oldp is not NULL means the get case
- newp is not NULL means the set case
which may both happen at the same time.
To generate a diff of this commit:
cvs rdiff -u -r1.164 -r1.165 src/sys/kern/kern_resource.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_resource.c
diff -u src/sys/kern/kern_resource.c:1.164 src/sys/kern/kern_resource.c:1.165
--- src/sys/kern/kern_resource.c:1.164 Sat May 14 17:57:05 2011
+++ src/sys/kern/kern_resource.c Tue May 24 01:19:48 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_resource.c,v 1.164 2011/05/14 17:57:05 rmind Exp $ */
+/* $NetBSD: kern_resource.c,v 1.165 2011/05/24 01:19:48 mrg Exp $ */
/*-
* Copyright (c) 1982, 1986, 1991, 1993
@@ -37,7 +37,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_resource.c,v 1.164 2011/05/14 17:57:05 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_resource.c,v 1.165 2011/05/24 01:19:48 mrg Exp $);
#include sys/param.h
#include sys/systm.h
@@ -825,7 +825,7 @@
cnbuf = PNBUF_GET();
- if (newp == NULL) {
+ if (oldp) {
/* Get case: copy the core name into the buffer. */
error = kauth_authorize_process(l-l_cred,
KAUTH_PROCESS_CORENAME, p,
@@ -837,7 +837,8 @@
mutex_enter(lim-pl_lock);
strlcpy(cnbuf, lim-pl_corename, MAXPATHLEN);
mutex_exit(lim-pl_lock);
- } else {
+ }
+ if (newp) {
/* Set case: just use the temporary buffer. */
error = kauth_authorize_process(l-l_cred,
KAUTH_PROCESS_CORENAME, p,
CVS commit: src/lib/libc/sys
Module Name:src
Committed By: ryo
Date: Tue May 24 02:31:11 UTC 2011
Modified Files:
src/lib/libc/sys: kqueue.2
Log Message:
fix incorrect variable name
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/lib/libc/sys/kqueue.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/kqueue.2
diff -u src/lib/libc/sys/kqueue.2:1.29 src/lib/libc/sys/kqueue.2:1.30
--- src/lib/libc/sys/kqueue.2:1.29 Tue Apr 13 10:45:46 2010
+++ src/lib/libc/sys/kqueue.2 Tue May 24 02:31:11 2011
@@ -1,4 +1,4 @@
-.\ $NetBSD: kqueue.2,v 1.29 2010/04/13 10:45:46 wiz Exp $
+.\ $NetBSD: kqueue.2,v 1.30 2011/05/24 02:31:11 ryo Exp $
.\
.\ Copyright (c) 2000 Jonathan Lemon
.\ All rights reserved.
@@ -508,8 +508,8 @@
EV_SET(\*[Am]ev, fd, EVFILT_VNODE, EV_ADD | EV_ENABLE | EV_CLEAR,
NOTE_DELETE|NOTE_WRITE|NOTE_EXTEND|NOTE_ATTRIB|NOTE_LINK|
NOTE_RENAME|NOTE_REVOKE, 0, 0);
- if (kevent(kq, \*[Am]ch, 1, NULL, 0, \*[Am]tout) == -1)
- err(1, kevent);
+if (kevent(kq, \*[Am]ev, 1, NULL, 0, \*[Am]tout) == -1)
+err(1, kevent);
for (;;) {
nev = kevent(kq, NULL, 0, \*[Am]ev, 1, \*[Am]tout);
if (nev == -1)
CVS commit: [matt-nb5-mips64] src/sys/arch/evbmips/conf
Module Name:src
Committed By: matt
Date: Tue May 24 04:38:50 UTC 2011
Modified Files:
src/sys/arch/evbmips/conf [matt-nb5-mips64]: Makefile.evbmips.inc
Log Message:
Add a NEED_UBOOTIMAGE block (inside NEED_BINARY)
To generate a diff of this commit:
cvs rdiff -u -r1.2.96.1 -r1.2.96.2 \
src/sys/arch/evbmips/conf/Makefile.evbmips.inc
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/evbmips/conf/Makefile.evbmips.inc
diff -u src/sys/arch/evbmips/conf/Makefile.evbmips.inc:1.2.96.1 src/sys/arch/evbmips/conf/Makefile.evbmips.inc:1.2.96.2
--- src/sys/arch/evbmips/conf/Makefile.evbmips.inc:1.2.96.1 Fri May 20 16:49:23 2011
+++ src/sys/arch/evbmips/conf/Makefile.evbmips.inc Tue May 24 04:38:49 2011
@@ -13,4 +13,18 @@
${OBJCOPY} -S -O binary $@ $@.bin
EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.bin@}
+
+.if defined(NEED_UBOOTIMAGE) ${NEED_UBOOTIMAGE} != no
+_OSRELEASE!= ${HOST_SH} $S/conf/osrelease.sh
+MKUBOOTIMAGEARGS= -A mips -T kernel -C none
+MKUBOOTIMAGEARGS+= -a ${TEXTADDR:C/$//} -e $(TEXTADDR)
+MKUBOOTIMAGEARGS+= -n NetBSD/$(MACHINE) ${_OSRELEASE} ($(KERNEL_BUILD:T))
+
+SYSTEM_LD_TAIL_EXTRA+=; \
+ echo ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS} $@.bin $@.ub; \
+ ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS} $@.bin $@.ub; \
+
+EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.ub@}
.endif
+.endif
+
