CVS commit: src
Module Name:src Committed By: jruoho Date: Thu Dec 16 08:35:36 UTC 2010 Modified Files: src/distrib/sets/lists/comp: mi src/share/man/man3: Makefile Added Files: src/share/man/man3: attribute.3 Log Message: Start to document the GNU C attributes. For now, only __packed, __aligned, and __section are documented, but I will keep extending this. To generate a diff of this commit: cvs rdiff -u -r1.1545 -r1.1546 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.58 -r1.59 src/share/man/man3/Makefile cvs rdiff -u -r0 -r1.1 src/share/man/man3/attribute.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1545 src/distrib/sets/lists/comp/mi:1.1546 --- src/distrib/sets/lists/comp/mi:1.1545 Wed Dec 15 18:39:28 2010 +++ src/distrib/sets/lists/comp/mi Thu Dec 16 08:35:36 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1545 2010/12/15 18:39:28 pooka Exp $ +# $NetBSD: mi,v 1.1546 2010/12/16 08:35:36 jruoho Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -4903,8 +4903,11 @@ ./usr/share/man/cat3/__STRING.0 comp-c-catman .cat ./usr/share/man/cat3/__UNCONST.0 comp-c-catman .cat ./usr/share/man/cat3/__UNVOLATILE.0 comp-c-catman .cat +./usr/share/man/cat3/__aligned.0 comp-c-catman .cat ./usr/share/man/cat3/__arraycount.0 comp-c-catman .cat ./usr/share/man/cat3/__builtin_object_size.0 comp-c-catman .cat +./usr/share/man/cat3/__packed.0 comp-c-catman .cat +./usr/share/man/cat3/__section.0 comp-c-catman .cat ./usr/share/man/cat3/__svc_getcallercreds.0 comp-c-catman .cat ./usr/share/man/cat3/_longjmp.0 comp-c-catman .cat ./usr/share/man/cat3/_lwp_makecontext.0 comp-c-catman .cat @@ -5215,6 +5218,7 @@ ./usr/share/man/cat3/attr_off.0 comp-c-catman .cat ./usr/share/man/cat3/attr_on.0 comp-c-catman .cat ./usr/share/man/cat3/attr_set.0 comp-c-catman .cat +./usr/share/man/cat3/attribute.0 comp-c-catman .cat ./usr/share/man/cat3/attroff.0 comp-c-catman .cat ./usr/share/man/cat3/attron.0 comp-c-catman .cat ./usr/share/man/cat3/attrset.0 comp-c-catman .cat @@ -10963,8 +10967,11 @@ ./usr/share/man/html3/__STRING.html comp-c-htmlman html ./usr/share/man/html3/__UNCONST.html comp-c-htmlman html ./usr/share/man/html3/__UNVOLATILE.html comp-c-htmlman html +./usr/share/man/html3/__aligned.html comp-c-htmlman html ./usr/share/man/html3/__arraycount.html comp-c-htmlman html ./usr/share/man/html3/__builtin_object_size.html comp-c-htmlman html +./usr/share/man/html3/__packed.html comp-c-htmlman html +./usr/share/man/html3/__section.html comp-c-htmlman html ./usr/share/man/html3/__svc_getcallercreds.html comp-c-htmlman html ./usr/share/man/html3/_longjmp.html comp-c-htmlman html ./usr/share/man/html3/_lwp_makecontext.html comp-c-htmlman html @@ -11275,6 +11282,7 @@ ./usr/share/man/html3/attr_off.html comp-c-htmlman html ./usr/share/man/html3/attr_on.html comp-c-htmlman html ./usr/share/man/html3/attr_set.html comp-c-htmlman html +./usr/share/man/html3/attribute.html comp-c-htmlman html ./usr/share/man/html3/attroff.html comp-c-htmlman html ./usr/share/man/html3/attron.html comp-c-htmlman html ./usr/share/man/html3/attrset.html comp-c-htmlman html @@ -16823,8 +16831,11 @@ ./usr/share/man/man3/__STRING.3 comp-c-man .man ./usr/share/man/man3/__UNCONST.3 comp-c-man .man ./usr/share/man/man3/__UNVOLATILE.3 comp-c-man .man +./usr/share/man/man3/__aligned.3 comp-c-man .man ./usr/share/man/man3/__arraycount.3 comp-c-man .man ./usr/share/man/man3/__builtin_object_size.3 comp-c-man .man +./usr/share/man/man3/__packed.3 comp-c-man .man +./usr/share/man/man3/__section.3 comp-c-man .man ./usr/share/man/man3/__svc_getcallercreds.3 comp-c-man .man ./usr/share/man/man3/_longjmp.3 comp-c-man .man ./usr/share/man/man3/_lwp_makecontext.3 comp-c-man .man @@ -17135,6 +17146,7 @@ ./usr/share/man/man3/attr_off.3 comp-c-man .man ./usr/share/man/man3/attr_on.3 comp-c-man .man ./usr/share/man/man3/attr_set.3 comp-c-man .man +./usr/share/man/man3/attribute.3 comp-c-man .man ./usr/share/man/man3/attroff.3 comp-c-man .man ./usr/share/man/man3/attron.3 comp-c-man .man ./usr/share/man/man3/attrset.3 comp-c-man .man Index: src/share/man/man3/Makefile diff -u src/share/man/man3/Makefile:1.58 src/share/man/man3/Makefile:1.59 --- src/share/man/man3/Makefile:1.58 Tue Dec 14 17:09:27 2010 +++ src/share/man/man3/Makefile Thu Dec 16 08:35:35 2010 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.58 2010/12/14 17:09:27 jruoho Exp $ +# $NetBSD: Makefile,v 1.59 2010/12/16 08:35:35 jruoho Exp $ # @(#)Makefile 8.2 (Berkeley) 12/13/93 MAN= _DIAGASSERT.3 __CONCAT.3 __UNCONST.3 CMSG_DATA.3 \ - __arraycount.3 assert.3 bits.3 bitstring.3 dirent.3 \ + __arraycount.3 assert.3 attribute.3 bits.3 bitstring.3 dirent.3 \
CVS commit: src/share/man/man7
Module Name:src Committed By: jruoho Date: Thu Dec 16 08:43:01 UTC 2010 Modified Files: src/share/man/man7: c.7 Log Message: Mention attribute(3) in passing. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/share/man/man7/c.7 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/man7/c.7 diff -u src/share/man/man7/c.7:1.7 src/share/man/man7/c.7:1.8 --- src/share/man/man7/c.7:1.7 Mon Dec 13 19:35:00 2010 +++ src/share/man/man7/c.7 Thu Dec 16 08:43:01 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: c.7,v 1.7 2010/12/13 19:35:00 jruoho Exp $ +.\ $NetBSD: c.7,v 1.8 2010/12/16 08:43:01 jruoho Exp $ .\ .\ Copyright (C) 2007, 2010 Gabor Kovesdan. All rights reserved. .\ @@ -25,7 +25,7 @@ .\ .\ $FreeBSD: src/share/man/man7/c99.7,v 1.1 2010/06/17 12:05:47 gabor Exp $ .\ -.Dd December 11, 2010 +.Dd December 16, 2010 .Dt C 7 .Os .Sh NAME @@ -151,8 +151,9 @@ C compiler: GNU C .Pq Xr gcc 1 . Most of the UNIX-like operating systems use GNU C as a system compiler, -but the various extensions of GNU C should not be considered -standard features. +but the various extensions of GNU C, such as +.Xr attribute 3 , +should not be considered standard features. .Sh SEE ALSO .Xr c89 1 , .Xr c99 1 ,
CVS commit: src/lib/libbluetooth
Module Name:src
Committed By: plunky
Date: Thu Dec 16 08:44:23 UTC 2010
Modified Files:
src/lib/libbluetooth: sdp_data.3
Log Message:
remove unnecessary step in example code
(sdp_service_attribute() did that already)
while here, start new paragraph for next example
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/lib/libbluetooth/sdp_data.3
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libbluetooth/sdp_data.3
diff -u src/lib/libbluetooth/sdp_data.3:1.3 src/lib/libbluetooth/sdp_data.3:1.4
--- src/lib/libbluetooth/sdp_data.3:1.3 Thu May 21 09:23:50 2009
+++ src/lib/libbluetooth/sdp_data.3 Thu Dec 16 08:44:23 2010
@@ -1,4 +1,4 @@
-.\ $NetBSD: sdp_data.3,v 1.3 2009/05/21 09:23:50 wiz Exp $
+.\ $NetBSD: sdp_data.3,v 1.4 2010/12/16 08:44:23 plunky Exp $
.\
.\ Copyright (c) 2009 The NetBSD Foundation, Inc.
.\ All rights reserved.
@@ -309,10 +309,6 @@
/* rsp contains remote response */
- /* discard sequence header */
- if (!sdp_get_seq(\*[Am]rsp, \*[Am]rsp))
- err(EXIT_FAILURE, response is not a sequence);
-
while (sdp_get_attr(\*[Am]rsp, \*[Am]attr, \*[Am]val)) {
switch(attr) {
case SDP_ATTR_SERVICE_RECORD_HANDLE:
@@ -330,8 +326,8 @@
break;
}
}
-
.Ed
+.Pp
The following code creates a ProtocolDataList attribute value for a service
using the L2CAP and RFCOMM protocols and illustrates how to construct sequences
of known and unknown length.
CVS commit: src/share/man/man3
Module Name:src Committed By: jruoho Date: Thu Dec 16 08:45:05 UTC 2010 Modified Files: src/share/man/man3: attribute.3 Log Message: Remove extra .Pp before wizd(8) beats me. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/share/man/man3/attribute.3 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/man3/attribute.3 diff -u src/share/man/man3/attribute.3:1.1 src/share/man/man3/attribute.3:1.2 --- src/share/man/man3/attribute.3:1.1 Thu Dec 16 08:35:35 2010 +++ src/share/man/man3/attribute.3 Thu Dec 16 08:45:05 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: attribute.3,v 1.1 2010/12/16 08:35:35 jruoho Exp $ +.\ $NetBSD: attribute.3,v 1.2 2010/12/16 08:45:05 jruoho Exp $ .\ .\ Copyright (c) 2010 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -54,7 +54,6 @@ .Tn GCC's .Em __attribute__ extension directly. -.Pp .Sh FUNCTIONS .Bl -tag -width abc .It Ic __packed
CVS commit: src/lib/libbluetooth
Module Name:src Committed By: plunky Date: Thu Dec 16 08:45:32 UTC 2010 Modified Files: src/lib/libbluetooth: sdp_data.3 Log Message: bump date for previous To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/lib/libbluetooth/sdp_data.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libbluetooth/sdp_data.3 diff -u src/lib/libbluetooth/sdp_data.3:1.4 src/lib/libbluetooth/sdp_data.3:1.5 --- src/lib/libbluetooth/sdp_data.3:1.4 Thu Dec 16 08:44:23 2010 +++ src/lib/libbluetooth/sdp_data.3 Thu Dec 16 08:45:32 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: sdp_data.3,v 1.4 2010/12/16 08:44:23 plunky Exp $ +.\ $NetBSD: sdp_data.3,v 1.5 2010/12/16 08:45:32 plunky Exp $ .\ .\ Copyright (c) 2009 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -27,7 +27,7 @@ .\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\ SUCH DAMAGE. .\ -.Dd May 7, 2009 +.Dd Dec 16, 2010 .Dt SDP_DATA 3 .Os .Sh NAME
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: martin Date: Thu Dec 16 09:35:31 UTC 2010 Modified Files: src/sys/arch/sparc64/conf: GENERIC Log Message: Ooops, backout intended part of previous change, pointed out by Masao Uebayashi. To generate a diff of this commit: cvs rdiff -u -r1.132 -r1.133 src/sys/arch/sparc64/conf/GENERIC 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/conf/GENERIC diff -u src/sys/arch/sparc64/conf/GENERIC:1.132 src/sys/arch/sparc64/conf/GENERIC:1.133 --- src/sys/arch/sparc64/conf/GENERIC:1.132 Sat Dec 11 14:30:12 2010 +++ src/sys/arch/sparc64/conf/GENERIC Thu Dec 16 09:35:31 2010 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.132 2010/12/11 14:30:12 martin Exp $ +# $NetBSD: GENERIC,v 1.133 2010/12/16 09:35:31 martin Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.132 $ +#ident GENERIC-$Revision: 1.133 $ maxusers 64 @@ -100,13 +100,13 @@ ## Compile the kernel with debugging symbols (`netbsd.gdb' is the debug file), ## such that gdb(1) can be used on a kernel coredump. -makeoptions DEBUG=-g +#makeoptions DEBUG=-g ## Adds code to the kernel that does internal consistency checks, and will ## cause the kernel to panic if corruption of internal data structures ## is detected. -options DIAGNOSTIC # extra kernel sanity checking +#options DIAGNOSTIC # extra kernel sanity checking ## Enable (possibly expensive) debugging code that may also display messages ## on the system console
CVS commit: src/lib/libbluetooth
Module Name:src Committed By: wiz Date: Thu Dec 16 10:08:27 UTC 2010 Modified Files: src/lib/libbluetooth: sdp_data.3 Log Message: Use full month name in dates. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/lib/libbluetooth/sdp_data.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libbluetooth/sdp_data.3 diff -u src/lib/libbluetooth/sdp_data.3:1.5 src/lib/libbluetooth/sdp_data.3:1.6 --- src/lib/libbluetooth/sdp_data.3:1.5 Thu Dec 16 08:45:32 2010 +++ src/lib/libbluetooth/sdp_data.3 Thu Dec 16 10:08:27 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: sdp_data.3,v 1.5 2010/12/16 08:45:32 plunky Exp $ +.\ $NetBSD: sdp_data.3,v 1.6 2010/12/16 10:08:27 wiz Exp $ .\ .\ Copyright (c) 2009 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -27,7 +27,7 @@ .\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\ SUCH DAMAGE. .\ -.Dd Dec 16, 2010 +.Dd December 16, 2010 .Dt SDP_DATA 3 .Os .Sh NAME
CVS commit: src/sys/dev/usb
Module Name:src Committed By: pooka Date: Thu Dec 16 10:08:43 UTC 2010 Modified Files: src/sys/dev/usb: usb_mem.c Log Message: _KERNEL_OPT XXX: should figure out how to make defopt compatible with a modular world (e.g. kill it or define it a little better). To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.43 src/sys/dev/usb/usb_mem.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/usb/usb_mem.c diff -u src/sys/dev/usb/usb_mem.c:1.42 src/sys/dev/usb/usb_mem.c:1.43 --- src/sys/dev/usb/usb_mem.c:1.42 Wed Dec 15 23:43:02 2010 +++ src/sys/dev/usb/usb_mem.c Thu Dec 16 10:08:43 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: usb_mem.c,v 1.42 2010/12/15 23:43:02 matt Exp $ */ +/* $NetBSD: usb_mem.c,v 1.43 2010/12/16 10:08:43 pooka Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -38,9 +38,11 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: usb_mem.c,v 1.42 2010/12/15 23:43:02 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: usb_mem.c,v 1.43 2010/12/16 10:08:43 pooka Exp $); +#ifdef _KERNEL_OPT #include opt_usb.h +#endif #include sys/param.h #include sys/systm.h
CVS commit: src
Module Name:src Committed By: jruoho Date: Thu Dec 16 10:19:14 UTC 2010 Modified Files: src/distrib/sets/lists/comp: mi src/share/man/man3: Makefile Added Files: src/share/man/man3: cdefs.3 Log Message: Now that sys/cdefs.h is mostly documented, include a small summary page for it, cdefs(3). To generate a diff of this commit: cvs rdiff -u -r1.1546 -r1.1547 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.59 -r1.60 src/share/man/man3/Makefile cvs rdiff -u -r0 -r1.1 src/share/man/man3/cdefs.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1546 src/distrib/sets/lists/comp/mi:1.1547 --- src/distrib/sets/lists/comp/mi:1.1546 Thu Dec 16 08:35:36 2010 +++ src/distrib/sets/lists/comp/mi Thu Dec 16 10:19:13 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1546 2010/12/16 08:35:36 jruoho Exp $ +# $NetBSD: mi,v 1.1547 2010/12/16 10:19:13 jruoho Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -4897,6 +4897,8 @@ ./usr/share/man/cat3/__BIT.0 comp-c-catman .cat ./usr/share/man/cat3/__BITS.0 comp-c-catman .cat ./usr/share/man/cat3/__CONCAT.0 comp-c-catman .cat +./usr/share/man/cat3/__KERNEL_RCSID.0 comp-c-catman .cat +./usr/share/man/cat3/__RCSID.0 comp-c-catman .cat ./usr/share/man/cat3/__SHIFTIN.0 comp-c-catman .cat ./usr/share/man/cat3/__SHIFTOUT.0 comp-c-catman .cat ./usr/share/man/cat3/__SHIFTOUT_MASK.0 comp-c-catman .cat @@ -5393,6 +5395,7 @@ ./usr/share/man/cat3/cdbw_put.0 comp-c-catman .cat ./usr/share/man/cat3/cdbw_put_data.0 comp-c-catman .cat ./usr/share/man/cat3/cdbw_put_key.0 comp-c-catman .cat +./usr/share/man/cat3/cdefs.0 comp-c-catman .cat ./usr/share/man/cat3/cdk.0 comp-obsolete obsolete ./usr/share/man/cat3/cdk_alphalist.0 comp-obsolete obsolete ./usr/share/man/cat3/cdk_binding.0 comp-obsolete obsolete @@ -10961,6 +10964,8 @@ ./usr/share/man/html3/__BIT.html comp-c-htmlman html ./usr/share/man/html3/__BITS.html comp-c-htmlman html ./usr/share/man/html3/__CONCAT.html comp-c-htmlman html +./usr/share/man/html3/__KERNEL_RCSID.html comp-c-htmlman html +./usr/share/man/html3/__RCSID.html comp-c-htmlman html ./usr/share/man/html3/__SHIFTIN.html comp-c-htmlman html ./usr/share/man/html3/__SHIFTOUT.html comp-c-htmlman html ./usr/share/man/html3/__SHIFTOUT_MASK.html comp-c-htmlman html @@ -11446,6 +11451,7 @@ ./usr/share/man/html3/cdbw_put.html comp-c-htmlman html ./usr/share/man/html3/cdbw_put_data.html comp-c-htmlman html ./usr/share/man/html3/cdbw_put_key.html comp-c-htmlman html +./usr/share/man/html3/cdefs.html comp-c-htmlman html ./usr/share/man/html3/ceil.html comp-c-htmlman html ./usr/share/man/html3/ceilf.html comp-c-htmlman html ./usr/share/man/html3/cexp.html comp-c-htmlman complex,html @@ -16825,6 +16831,8 @@ ./usr/share/man/man3/__BIT.3 comp-c-man .man ./usr/share/man/man3/__BITS.3 comp-c-man .man ./usr/share/man/man3/__CONCAT.3 comp-c-man .man +./usr/share/man/man3/__KERNEL_RCSID.3 comp-c-man .man +./usr/share/man/man3/__RCSID.3 comp-c-man .man ./usr/share/man/man3/__SHIFTIN.3 comp-c-man .man ./usr/share/man/man3/__SHIFTOUT.3 comp-c-man .man ./usr/share/man/man3/__SHIFTOUT_MASK.3 comp-c-man .man @@ -17321,6 +17329,7 @@ ./usr/share/man/man3/cdbw_put.3 comp-c-man .man ./usr/share/man/man3/cdbw_put_data.3 comp-c-man .man ./usr/share/man/man3/cdbw_put_key.3 comp-c-man .man +./usr/share/man/man3/cdefs.3 comp-c-man .man ./usr/share/man/man3/cdk.3 comp-obsolete obsolete ./usr/share/man/man3/cdk_alphalist.3 comp-obsolete obsolete ./usr/share/man/man3/cdk_binding.3 comp-obsolete obsolete Index: src/share/man/man3/Makefile diff -u src/share/man/man3/Makefile:1.59 src/share/man/man3/Makefile:1.60 --- src/share/man/man3/Makefile:1.59 Thu Dec 16 08:35:35 2010 +++ src/share/man/man3/Makefile Thu Dec 16 10:19:14 2010 @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.59 2010/12/16 08:35:35 jruoho Exp $ +# $NetBSD: Makefile,v 1.60 2010/12/16 10:19:14 jruoho Exp $ # @(#)Makefile 8.2 (Berkeley) 12/13/93 MAN= _DIAGASSERT.3 __CONCAT.3 __UNCONST.3 CMSG_DATA.3 \ - __arraycount.3 assert.3 attribute.3 bits.3 bitstring.3 dirent.3 \ - dlfcn.3 dl_iterate_phdr.3 end.3 \ + __arraycount.3 assert.3 attribute.3 bits.3 bitstring.3 \ + cdefs.3 dirent.3 dlfcn.3 dl_iterate_phdr.3 end.3 \ fast_divide32.3 ffs32.3 gcq.3 \ ilog2.3 intro.3 inttypes.3 iso646.3 \ makedev.3 offsetof.3 queue.3 rbtree.3 sigevent.3 \ @@ -32,6 +32,8 @@ bits.3 __SHIFTIN.3 \ bits.3 __SHIFTOUT.3 \ bits.3 __SHIFTOUT_MASK.3 +MLINKS+=cdefs.3 __RCSID.3 \ + cdefs.3 __KERNEL_RCSID.3 MLINKS+=end.3 edata.3 end.3 etext.3 MLINKS+=fast_divide32.3 fast_divide32_prepare.3 \ fast_divide32.3 fast_remainder32.3 Added files: Index: src/share/man/man3/cdefs.3 diff -u /dev/null
CVS commit: src/share/man/man3
Module Name:src Committed By: jruoho Date: Thu Dec 16 10:40:04 UTC 2010 Modified Files: src/share/man/man3: __CONCAT.3 __UNCONST.3 __arraycount.3 bits.3 Log Message: Xref cdefs(3). To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/share/man/man3/__CONCAT.3 \ src/share/man/man3/__arraycount.3 cvs rdiff -u -r1.4 -r1.5 src/share/man/man3/__UNCONST.3 cvs rdiff -u -r1.9 -r1.10 src/share/man/man3/bits.3 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/man3/__CONCAT.3 diff -u src/share/man/man3/__CONCAT.3:1.5 src/share/man/man3/__CONCAT.3:1.6 --- src/share/man/man3/__CONCAT.3:1.5 Thu May 13 21:03:33 2010 +++ src/share/man/man3/__CONCAT.3 Thu Dec 16 10:40:04 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: __CONCAT.3,v 1.5 2010/05/13 21:03:33 joerg Exp $ $ +.\ $NetBSD: __CONCAT.3,v 1.6 2010/12/16 10:40:04 jruoho Exp $ $ .\ .\ Copyright (c) 2010 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -27,7 +27,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd April 17, 2010 +.Dd December 16, 2010 .Dt __CONCAT 3 .Os .Sh NAME @@ -80,7 +80,8 @@ (void)printf(%s%s\en, __STRING(Net), __STRING(BSD)); .Ed .Sh SEE ALSO -.Xr cpp 1 +.Xr cpp 1 , +.Xr cdefs 3 .Sh HISTORY The .Fn __CONCAT Index: src/share/man/man3/__arraycount.3 diff -u src/share/man/man3/__arraycount.3:1.5 src/share/man/man3/__arraycount.3:1.6 --- src/share/man/man3/__arraycount.3:1.5 Thu May 13 19:31:28 2010 +++ src/share/man/man3/__arraycount.3 Thu Dec 16 10:40:04 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: __arraycount.3,v 1.5 2010/05/13 19:31:28 joerg Exp $ +.\ $NetBSD: __arraycount.3,v 1.6 2010/12/16 10:40:04 jruoho Exp $ .\ .\ Copyright (c) 2010 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -27,7 +27,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd March 1, 2010 +.Dd December 16, 2010 .Dt __ARRAYCOUNT 3 .Os .Sh NAME @@ -53,6 +53,8 @@ for (i = 0; i \*[Lt] __arraycount(buf); i++) \... .Ed +.Sh SEE ALSO +.Xr cdefs 3 .Sh HISTORY The .Fn __arraycount Index: src/share/man/man3/__UNCONST.3 diff -u src/share/man/man3/__UNCONST.3:1.4 src/share/man/man3/__UNCONST.3:1.5 --- src/share/man/man3/__UNCONST.3:1.4 Thu May 13 19:29:01 2010 +++ src/share/man/man3/__UNCONST.3 Thu Dec 16 10:40:04 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: __UNCONST.3,v 1.4 2010/05/13 19:29:01 joerg Exp $ +.\ $NetBSD: __UNCONST.3,v 1.5 2010/12/16 10:40:04 jruoho Exp $ .\ .\ Copyright (c) 2010 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -27,7 +27,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd February 28, 2010 +.Dd December 16, 2010 .Dt __UNCONST 3 .Os .Sh NAME @@ -64,7 +64,8 @@ .Em intptr_t , a signed type guaranteed to hold a pointer. .Sh SEE ALSO -.Xr cc 1 +.Xr cc 1 , +.Xr cdefs 3 .Sh CAVEATS As both macros may hide valid errors, their usage is not recommended unless there is a well-thought reason for a cast. Index: src/share/man/man3/bits.3 diff -u src/share/man/man3/bits.3:1.9 src/share/man/man3/bits.3:1.10 --- src/share/man/man3/bits.3:1.9 Fri Aug 27 09:13:38 2010 +++ src/share/man/man3/bits.3 Thu Dec 16 10:40:04 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: bits.3,v 1.9 2010/08/27 09:13:38 jruoho Exp $ +.\ $NetBSD: bits.3,v 1.10 2010/12/16 10:40:04 jruoho Exp $ .\ .\ Copyright (c) 2006, 2010 David Young. All rights reserved. .\ @@ -25,7 +25,7 @@ .\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd August 27, 2010 +.Dd December 16, 2010 .Dt BITS 3 .Os .Sh NAME @@ -122,6 +122,8 @@ val = __SHIFTIN(0x03, mask); /* 1100 */ val = __SHIFTOUT(0xf, mask); /* 0011 */ .Ed +.Sh SEE ALSO +.Xr cdefs 3 .Sh HISTORY The .Nm bits
CVS commit: src/share/man/man3
Module Name:src Committed By: jruoho Date: Thu Dec 16 10:40:44 UTC 2010 Modified Files: src/share/man/man3: attribute.3 Log Message: Xref cdefs(3). To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/share/man/man3/attribute.3 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/man3/attribute.3 diff -u src/share/man/man3/attribute.3:1.2 src/share/man/man3/attribute.3:1.3 --- src/share/man/man3/attribute.3:1.2 Thu Dec 16 08:45:05 2010 +++ src/share/man/man3/attribute.3 Thu Dec 16 10:40:43 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: attribute.3,v 1.2 2010/12/16 08:45:05 jruoho Exp $ +.\ $NetBSD: attribute.3,v 1.3 2010/12/16 10:40:43 jruoho Exp $ .\ .\ Copyright (c) 2010 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -127,6 +127,7 @@ .El .Sh SEE ALSO .Xr gcc 1 , +.Xr cdefs 3 , .Xr c 7 .Sh CAVEATS It goes without saying that portable applications
CVS commit: src/lib/libc/db/man
Module Name:src Committed By: jruoho Date: Thu Dec 16 11:49:35 UTC 2010 Modified Files: src/lib/libc/db/man: mpool.3 Log Message: Use .Fn. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/lib/libc/db/man/mpool.3 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/db/man/mpool.3 diff -u src/lib/libc/db/man/mpool.3:1.9 src/lib/libc/db/man/mpool.3:1.10 --- src/lib/libc/db/man/mpool.3:1.9 Thu Aug 7 16:42:43 2003 +++ src/lib/libc/db/man/mpool.3 Thu Dec 16 11:49:35 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: mpool.3,v 1.9 2003/08/07 16:42:43 agc Exp $ +.\ $NetBSD: mpool.3,v 1.10 2010/12/16 11:49:35 jruoho Exp $ .\ .\ Copyright (c) 1990, 1993 .\ The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\ .\ @(#)mpool.3 8.1 (Berkeley) 6/4/93 .\ -.Dd April 17, 2003 +.Dd December 16, 2010 .Dt MPOOL 3 .Os .Sh NAME @@ -67,7 +67,7 @@ The buffers may be shared between processes. .Pp The function -.Nm mpool_open +.Fn mpool_open initializes a memory pool. The .Fa key @@ -105,7 +105,7 @@ processes sharing the file. .Pp The -.Nm mpool_filter +.Fn mpool_filter function is intended to make transparent input and output processing of the pages possible. If the @@ -122,7 +122,7 @@ written. .Pp The function -.Nm mpool_new +.Fn mpool_new takes an MPOOL pointer and an address as arguments. If a new page can be allocated, a pointer to the page is returned and the page number is stored into the @@ -133,7 +133,7 @@ is returned and errno is set. .Pp The function -.Nm mpool_get +.Fn mpool_get takes a MPOOL pointer and a page number as arguments. If the page exists, a pointer to the page is returned. Otherwise, @@ -142,14 +142,14 @@ The flags parameter is not currently used. .Pp The function -.Nm mpool_put +.Fn mpool_put unpins the page referenced by .Fa pgaddr . .Fa pgaddr must be an address previously returned by -.Nm mpool_get +.Fn mpool_get or -.Nm mpool_new . +.Fn mpool_new . The flag value is specified by or'ing any of the following values: .Bl -tag -width MPOOL_DIRTYX -offset indent .It Dv MPOOL_DIRTY @@ -157,35 +157,35 @@ file. .El .Pp -.Nm mpool_put +.Fn mpool_put returns 0 on success and \-1 if an error occurs. .Pp The function -.Nm mpool_sync +.Fn mpool_sync writes all modified pages associated with the MPOOL pointer to the backing file. -.Nm mpool_sync +.Fn mpool_sync returns 0 on success and \-1 if an error occurs. .Pp The -.Nm mpool_close +.Fn mpool_close function frees up any allocated memory associated with the memory pool cookie. Modified pages are .Em not written to the backing file. -.Nm mpool_close +.Fn mpool_close returns 0 on success and \-1 if an error occurs. .Sh ERRORS The -.Nm mpool_open +.Fn mpool_open function may fail and set .Va errno for any of the errors specified for the library routine .Xr malloc 3 . .Pp The -.Nm mpool_get +.Fn mpool_get function may fail and set .Va errno for the following: @@ -195,9 +195,9 @@ .El .Pp The -.Nm mpool_new +.Fn mpool_new and -.Nm mpool_get +.Fn mpool_get functions may fail and set .Va errno for any of the errors specified for the library routines @@ -207,14 +207,14 @@ .Xr malloc 3 . .Pp The -.Nm mpool_sync +.Fn mpool_sync function may fail and set .Va errno for any of the errors specified for the library routine .Xr write 2 . .Pp The -.Nm mpool_close +.Fn mpool_close function may fail and set .Va errno for any of the errors specified for the library routine
CVS commit: src/lib/libc/db/man
Module Name:src
Committed By: jruoho
Date: Thu Dec 16 11:57:20 UTC 2010
Modified Files:
src/lib/libc/db/man: hash.3
Log Message:
Fix the references and -offset indent.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/lib/libc/db/man/hash.3
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/db/man/hash.3
diff -u src/lib/libc/db/man/hash.3:1.13 src/lib/libc/db/man/hash.3:1.14
--- src/lib/libc/db/man/hash.3:1.13 Mon Mar 22 19:30:53 2010
+++ src/lib/libc/db/man/hash.3 Thu Dec 16 11:57:20 2010
@@ -1,4 +1,4 @@
-.\ $NetBSD: hash.3,v 1.13 2010/03/22 19:30:53 joerg Exp $
+.\ $NetBSD: hash.3,v 1.14 2010/12/16 11:57:20 jruoho Exp $
.\
.\ Copyright (c) 1990, 1993
.\ The Regents of the University of California. All rights reserved.
@@ -29,7 +29,7 @@
.\
.\ @(#)hash.3 8.6 (Berkeley) 8/18/94
.\
-.Dd September 5, 2008
+.Dd December 16, 2010
.Dt HASH 3
.Os
.Sh NAME
@@ -53,8 +53,8 @@
.Fn dbopen
is defined in the
.In db.h
-include file as follows:
-.Bd -literal
+header as follows:
+.Bd -literal -offset indent
typedef struct {
u_int bsize;
u_int ffactor;
@@ -152,16 +152,21 @@
.Xr recno 3
.Pp
.Rs
-.%T Dynamic Hash Tables
+.%T Dynamic Hash Tables
.%A Per-Ake Larson
.%J Communications of the ACM
.%D April 1988
+.%N Issue 4
+.%V Volume 31
.Re
.Rs
-.%T A New Hash Package for UNIX
+.%T A New Hash Package for UNIX
.%A Margo Seltzer
-.%J USENIX Proceedings
-.%D Winter 1991
+.%I USENIX Association
+.%B Proceedings of the 1991 Winter USENIX Technical Conference
+.%D January 1991
+.%P 173-184
+.%U http://www.usenix.org/publications/library/proceedings/seltzer2.pdf
.Re
.Sh BUGS
Only big and little endian byte order is supported.
CVS commit: src/lib/libc/db/man
Module Name:src
Committed By: jruoho
Date: Thu Dec 16 12:08:16 UTC 2010
Modified Files:
src/lib/libc/db/man: dbopen.3
Log Message:
.Fn, offset indent, complete reference.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/lib/libc/db/man/dbopen.3
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/db/man/dbopen.3
diff -u src/lib/libc/db/man/dbopen.3:1.18 src/lib/libc/db/man/dbopen.3:1.19
--- src/lib/libc/db/man/dbopen.3:1.18 Mon Mar 22 19:30:53 2010
+++ src/lib/libc/db/man/dbopen.3 Thu Dec 16 12:08:16 2010
@@ -1,4 +1,4 @@
-.\ $NetBSD: dbopen.3,v 1.18 2010/03/22 19:30:53 joerg Exp $
+.\ $NetBSD: dbopen.3,v 1.19 2010/12/16 12:08:16 jruoho Exp $
.\
.\ Copyright (c) 1990, 1993
.\ The Regents of the University of California. All rights reserved.
@@ -29,7 +29,7 @@
.\
.\ @(#)dbopen.3 8.5 (Berkeley) 1/2/94
.\
-.Dd April 17, 2003
+.Dd December 16, 2010
.Dt DBOPEN 3
.Os
.Sh NAME
@@ -60,8 +60,9 @@
and
.Xr recno 3 .
.Pp
-.Nm
-opens
+The
+.Fn dbopen
+function opens
.Fa file
for reading and/or writing.
Files never intended to be preserved on disk may be created by setting
@@ -134,15 +135,16 @@
.Dv NULL ,
each access method will use defaults appropriate for the system and
the access method.
-.Pp
-.Nm
-returns a pointer to a DB structure on success and
+.Ss The DB Structure
+The
+.Fn dbopen
+function returns a pointer to a DB structure on success and
.Dv NULL
on error.
The DB structure is defined in the
.In db.h
include file, and contains at least the following fields:
-.Bd -literal
+.Bd -literal -offset indent
typedef struct {
DBTYPE type;
int (*close)(const DB *db);
@@ -162,7 +164,7 @@
.Nm ,
and sometimes one or more pointers to key/data structures and a flag
value.
-.Bl -tag -width closex
+.Bl -tag -width closex -offset indent
.It Fa type
The type of the underlying access method (and file format).
.It Fa close
@@ -420,10 +422,10 @@
.Va errno )
and 0 on success.
.El
-.Ss KEY/DATA PAIRS
+.Ss Key/data Pairs
Access to all file types is based on key/data pairs.
Both keys and data are represented by the following data structure:
-.Bd -literal
+.Bd -literal -offset indent
typedef struct {
void *data;
size_t size;
@@ -431,7 +433,7 @@
.Ed
.Pp
The elements of the DBT structure are defined as follows:
-.Bl -tag -width datax
+.Bl -tag -width datax -offset indent
.It Fa data
A pointer to a byte string.
.It Fa size
@@ -515,11 +517,13 @@
.Xr recno 3
.Pp
.Rs
-.%T LIBTP: Portable, Modular Transactions for UNIX
+.%T LIBTP: Portable, Modular Transactions for UNIX
.%A Margo Seltzer
.%A Michael Olson
-.%J USENIX proceedings
-.%D Winter 1992
+.%I USENIX Association
+.%B Proceedings of the 1992 Winter USENIX Technical Conference
+.%D 1992
+.%P 9-25
.Re
.Sh BUGS
The typedef DBT is a mnemonic for
CVS commit: src
Module Name:src
Committed By: pooka
Date: Thu Dec 16 12:38:21 UTC 2010
Modified Files:
src/lib/librumpclient: rumpclient.c
src/lib/librumpuser: rumpuser_sp.c sp_common.c
src/sys/rump/include/rump: rumpuser.h
src/sys/rump/librump/rumpkern: rump.c
Log Message:
Print a banner a connecting client. The banner contains rump sp
protocol version, os name, os revision and machine.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/lib/librumpclient/rumpclient.c
cvs rdiff -u -r1.25 -r1.26 src/lib/librumpuser/rumpuser_sp.c
cvs rdiff -u -r1.15 -r1.16 src/lib/librumpuser/sp_common.c
cvs rdiff -u -r1.58 -r1.59 src/sys/rump/include/rump/rumpuser.h
cvs rdiff -u -r1.211 -r1.212 src/sys/rump/librump/rumpkern/rump.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/librumpclient/rumpclient.c
diff -u src/lib/librumpclient/rumpclient.c:1.8 src/lib/librumpclient/rumpclient.c:1.9
--- src/lib/librumpclient/rumpclient.c:1.8 Tue Nov 30 22:30:43 2010
+++ src/lib/librumpclient/rumpclient.c Thu Dec 16 12:38:21 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpclient.c,v 1.8 2010/11/30 22:30:43 pooka Exp $ */
+/* $NetBSD: rumpclient.c,v 1.9 2010/12/16 12:38:21 pooka Exp $ */
/*
* Copyright (c) 2010 Antti Kantee. All Rights Reserved.
@@ -207,9 +207,11 @@
int
rumpclient_init()
{
+ char banner[MAXBANNER];
struct sockaddr *sap;
char *p;
unsigned idx;
+ ssize_t n;
int error, s;
if ((p = getenv(RUMP_SERVER)) == NULL) {
@@ -244,5 +246,19 @@
pthread_mutex_init(clispc.spc_mtx, NULL);
pthread_cond_init(clispc.spc_cv, NULL);
+ if ((n = read(s, banner, sizeof(banner)-1)) 0) {
+ fprintf(stderr, rump_sp: failed to read banner\n);
+ return -1;
+ }
+
+ if (banner[n-1] != '\n') {
+ fprintf(stderr, rump_sp: invalid banner\n);
+ errno = EINVAL;
+ return -1;
+ }
+ banner[n] = '\0';
+
+ /* parse the banner some day */
+
return 0;
}
Index: src/lib/librumpuser/rumpuser_sp.c
diff -u src/lib/librumpuser/rumpuser_sp.c:1.25 src/lib/librumpuser/rumpuser_sp.c:1.26
--- src/lib/librumpuser/rumpuser_sp.c:1.25 Sun Dec 12 17:58:28 2010
+++ src/lib/librumpuser/rumpuser_sp.c Thu Dec 16 12:38:20 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpuser_sp.c,v 1.25 2010/12/12 17:58:28 pooka Exp $ */
+/* $NetBSD: rumpuser_sp.c,v 1.26 2010/12/16 12:38:20 pooka Exp $ */
/*
* Copyright (c) 2010 Antti Kantee. All Rights Reserved.
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: rumpuser_sp.c,v 1.25 2010/12/12 17:58:28 pooka Exp $);
+__RCSID($NetBSD: rumpuser_sp.c,v 1.26 2010/12/16 12:38:20 pooka Exp $);
#include sys/types.h
#include sys/atomic.h
@@ -81,6 +81,11 @@
static struct rumpuser_sp_ops spops;
+static char banner[MAXBANNER];
+
+#define PROTOMAJOR 0
+#define PROTOMINOR 0
+
/*
* Manual wrappers, since librump does not have access to the
* user namespace wrapped interfaces.
@@ -415,8 +420,6 @@
return 0;
}
- /* XXX: should do some sort of handshake too */
-
flags = fcntl(newfd, F_GETFL, 0);
if (fcntl(newfd, F_SETFL, flags | O_NONBLOCK) == -1) {
close(newfd);
@@ -428,6 +431,12 @@
return 0;
}
+ /* write out a banner for the client */
+ if (write(newfd, banner, strlen(banner)) != (ssize_t)strlen(banner)) {
+ close(newfd);
+ return 0;
+ }
+
/* find empty slot the simple way */
for (i = 0; i MAXCLI; i++) {
if (pfdlist[i].fd == -1 spclist[i].spc_dying == 0)
@@ -809,7 +818,8 @@
static unsigned cleanupidx;
static struct sockaddr *cleanupsa;
int
-rumpuser_sp_init(const struct rumpuser_sp_ops *spopsp, const char *url)
+rumpuser_sp_init(const char *url, const struct rumpuser_sp_ops *spopsp,
+ const char *ostype, const char *osrelease, const char *machine)
{
pthread_t pt;
struct spservarg *sarg;
@@ -826,6 +836,9 @@
if (error)
return error;
+ snprintf(banner, sizeof(banner), RUMPSP-%d.%d-%s-%s/%s\n,
+ PROTOMAJOR, PROTOMINOR, ostype, osrelease, machine);
+
s = socket(parsetab[idx].domain, SOCK_STREAM, 0);
if (s == -1)
return errno;
Index: src/lib/librumpuser/sp_common.c
diff -u src/lib/librumpuser/sp_common.c:1.15 src/lib/librumpuser/sp_common.c:1.16
--- src/lib/librumpuser/sp_common.c:1.15 Sun Dec 12 17:58:28 2010
+++ src/lib/librumpuser/sp_common.c Thu Dec 16 12:38:20 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sp_common.c,v 1.15 2010/12/12 17:58:28 pooka Exp $ */
+/* $NetBSD: sp_common.c,v 1.16 2010/12/16 12:38:20 pooka Exp $ */
/*
* Copyright (c) 2010 Antti Kantee. All Rights Reserved.
@@ -99,6 +99,8 @@
#define rsp_sysnum u.sysnum
#define rsp_error u.error
+#define MAXBANNER 96
+
/*
* Data follows the header. We have two types of structured data.
*/
Index: src/sys/rump/include/rump/rumpuser.h
diff -u src/sys/rump/include/rump/rumpuser.h:1.58 src/sys/rump/include/rump/rumpuser.h:1.59
--- src/sys/rump/include/rump/rumpuser.h:1.58 Sun Dec 12 17:10:36 2010
+++
CVS commit: src/lib/librump
Module Name:src Committed By: pooka Date: Thu Dec 16 12:39:39 UTC 2010 Modified Files: src/lib/librump: rump.3 Log Message: xfer rump_etfs To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/lib/librump/rump.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/librump/rump.3 diff -u src/lib/librump/rump.3:1.5 src/lib/librump/rump.3:1.6 --- src/lib/librump/rump.3:1.5 Fri Nov 19 17:35:04 2010 +++ src/lib/librump/rump.3 Thu Dec 16 12:39:39 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: rump.3,v 1.5 2010/11/19 17:35:04 pooka Exp $ +.\ $NetBSD: rump.3,v 1.6 2010/12/16 12:39:39 pooka Exp $ .\ .\ Copyright (c) 2008-2010 Antti Kantee. All rights reserved. .\ @@ -149,6 +149,7 @@ kernel module boundaries. .Sh SEE ALSO .Xr p2k 3 , +.Xr rump_etfs 3 , .Xr rump_lwproc 3 , .Xr rumpuser 3 , .Xr ukfs 3
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: uebayasi Date: Thu Dec 16 12:49:20 UTC 2010 Modified Files: src/sys/arch/evbarm/conf: NAPPI Log Message: Bump SYMTAB_SPACE. To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.37 src/sys/arch/evbarm/conf/NAPPI 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/evbarm/conf/NAPPI diff -u src/sys/arch/evbarm/conf/NAPPI:1.36 src/sys/arch/evbarm/conf/NAPPI:1.37 --- src/sys/arch/evbarm/conf/NAPPI:1.36 Tue Nov 23 11:13:56 2010 +++ src/sys/arch/evbarm/conf/NAPPI Thu Dec 16 12:49:19 2010 @@ -1,4 +1,4 @@ -# $NetBSD: NAPPI,v 1.36 2010/11/23 11:13:56 hannken Exp $ +# $NetBSD: NAPPI,v 1.37 2010/12/16 12:49:19 uebayasi Exp $ # # NAPPI -- Netwise APlication Platform Board Kernel # @@ -120,14 +120,14 @@ # Development and Debugging options -options DIAGNOSTIC # internally consistency checks -options DEBUG +#options DIAGNOSTIC # internally consistency checks +#options DEBUG options PMAP_DEBUG # Enable pmap_debug_level code options VERBOSE_INIT_ARM # verbose bootstraping messages options DDB # in-kernel debugger options DDB_HISTORY_SIZE=100 # Enable history editing in DDB #makeoptions DEBUG=-g # compile full symbol table -options SYMTAB_SPACE=285000 +options SYMTAB_SPACE=29 config netbsd root on ? type ?
CVS commit: src/sys/arch/arm/omap
Module Name:src Committed By: uebayasi Date: Thu Dec 16 13:02:51 UTC 2010 Modified Files: src/sys/arch/arm/omap: omap5912_intr.c omap_intr.c Log Message: Fix build. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/omap/omap5912_intr.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/omap/omap_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/arm/omap/omap5912_intr.c diff -u src/sys/arch/arm/omap/omap5912_intr.c:1.2 src/sys/arch/arm/omap/omap5912_intr.c:1.3 --- src/sys/arch/arm/omap/omap5912_intr.c:1.2 Fri Nov 21 17:13:07 2008 +++ src/sys/arch/arm/omap/omap5912_intr.c Thu Dec 16 13:02:51 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: omap5912_intr.c,v 1.2 2008/11/21 17:13:07 matt Exp $ */ +/* $NetBSD: omap5912_intr.c,v 1.3 2010/12/16 13:02:51 uebayasi Exp $ */ /* * IRQ data specific to the Texas Instruments OMAP5912 processor. @@ -27,11 +27,12 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: omap5912_intr.c,v 1.2 2008/11/21 17:13:07 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: omap5912_intr.c,v 1.3 2010/12/16 13:02:51 uebayasi Exp $); #include sys/param.h #include sys/systm.h #include sys/malloc.h +#include sys/device.h #include machine/bus.h #include machine/intr.h Index: src/sys/arch/arm/omap/omap_intr.c diff -u src/sys/arch/arm/omap/omap_intr.c:1.6 src/sys/arch/arm/omap/omap_intr.c:1.7 --- src/sys/arch/arm/omap/omap_intr.c:1.6 Fri Nov 21 17:13:07 2008 +++ src/sys/arch/arm/omap/omap_intr.c Thu Dec 16 13:02:51 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: omap_intr.c,v 1.6 2008/11/21 17:13:07 matt Exp $ */ +/* $NetBSD: omap_intr.c,v 1.7 2010/12/16 13:02:51 uebayasi Exp $ */ /* * Based on arch/arm/xscale/pxa2x0_intr.c @@ -42,11 +42,12 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: omap_intr.c,v 1.6 2008/11/21 17:13:07 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: omap_intr.c,v 1.7 2010/12/16 13:02:51 uebayasi Exp $); #include sys/param.h #include sys/systm.h #include sys/malloc.h +#include sys/device.h #include machine/bus.h #include machine/intr.h
CVS commit: src
Module Name:src Committed By: pgoyette Date: Thu Dec 16 14:33:31 UTC 2010 Modified Files: src/share/man/man4: swsensor.4 src/sys/dev/sysmon: swsensor.c Log Message: Also allow specification of sensor's initial value when it is loaded, using -i value=value. Suggested by njoly@ To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/share/man/man4/swsensor.4 cvs rdiff -u -r1.5 -r1.6 src/sys/dev/sysmon/swsensor.c 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/man4/swsensor.4 diff -u src/share/man/man4/swsensor.4:1.4 src/share/man/man4/swsensor.4:1.5 --- src/share/man/man4/swsensor.4:1.4 Sat Dec 11 15:49:34 2010 +++ src/share/man/man4/swsensor.4 Thu Dec 16 14:33:30 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: swsensor.4,v 1.4 2010/12/11 15:49:34 wiz Exp $ +.\ $NetBSD: swsensor.4,v 1.5 2010/12/16 14:33:30 pgoyette Exp $ .\ .\ Copyright (c) 2010 The NetBSD Foundation .\ All rights reserved. @@ -27,7 +27,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd December 9, 2010 +.Dd December 16, 2010 .Dt SWSENSOR 4 .Os .Sh NAME @@ -77,6 +77,9 @@ is set to 1 or 2) .It Li type Override the sensor's unit/type. +.It Li value +Provide an initial value for the sensor. +If this is omitted, the sensor's initial value is set to zero. .El .Pp For example, Index: src/sys/dev/sysmon/swsensor.c diff -u src/sys/dev/sysmon/swsensor.c:1.5 src/sys/dev/sysmon/swsensor.c:1.6 --- src/sys/dev/sysmon/swsensor.c:1.5 Sat Dec 11 04:13:03 2010 +++ src/sys/dev/sysmon/swsensor.c Thu Dec 16 14:33:30 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: swsensor.c,v 1.5 2010/12/11 04:13:03 pgoyette Exp $ */ +/* $NetBSD: swsensor.c,v 1.6 2010/12/16 14:33:30 pgoyette Exp $ */ /* * Copyright (c) 2008 The NetBSD Foundation, Inc. * All rights reserved. @@ -27,7 +27,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: swsensor.c,v 1.5 2010/12/11 04:13:03 pgoyette Exp $); +__KERNEL_RCSID(0, $NetBSD: swsensor.c,v 1.6 2010/12/16 14:33:30 pgoyette Exp $); #include sys/param.h #include sys/kernel.h @@ -227,6 +227,13 @@ sw_sensor_deflims, sw_sensor_defprops); } + /* See if an initial value was specified */ + if (pd != NULL) + po = prop_dictionary_get(pd, value); + + if (po != NULL prop_object_type(po) == PROP_TYPE_NUMBER) + sw_sensor_value = prop_number_integer_value(po); + swsensor_edata.value_cur = 0; strlcpy(swsensor_edata.desc, sensor, ENVSYS_DESCLEN);
CVS commit: src/usr.sbin/envstat
Module Name:src
Committed By: pgoyette
Date: Thu Dec 16 14:37:23 UTC 2010
Modified Files:
src/usr.sbin/envstat: envstat.c
Log Message:
When skipping output for a temperature of absolute zero, don't forget to
skip past the display columns that the value would otherwise occupy.
Fixes display issue when swsensor(4) is used and it has a value of 0K,
as reported by njoly@
To generate a diff of this commit:
cvs rdiff -u -r1.84 -r1.85 src/usr.sbin/envstat/envstat.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.sbin/envstat/envstat.c
diff -u src/usr.sbin/envstat/envstat.c:1.84 src/usr.sbin/envstat/envstat.c:1.85
--- src/usr.sbin/envstat/envstat.c:1.84 Tue Dec 14 08:04:14 2010
+++ src/usr.sbin/envstat/envstat.c Thu Dec 16 14:37:23 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: envstat.c,v 1.84 2010/12/14 08:04:14 pooka Exp $ */
+/* $NetBSD: envstat.c,v 1.85 2010/12/16 14:37:23 pgoyette Exp $ */
/*-
* Copyright (c) 2007, 2008 Juan Romero Pardines.
@@ -27,7 +27,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: envstat.c,v 1.84 2010/12/14 08:04:14 pooka Exp $);
+__RCSID($NetBSD: envstat.c,v 1.85 2010/12/16 14:37:23 pgoyette Exp $);
#endif /* not lint */
#include stdio.h
@@ -852,7 +852,6 @@
PRINTTEMP(sensor-cur_value);
stype = degrees;
- ilen = 8;
if (statistics) {
/* show statistics if flag set */
PRINTTEMP(stats-max);
CVS commit: src/lib/librump
Module Name:src
Committed By: pooka
Date: Thu Dec 16 15:29:28 UTC 2010
Modified Files:
src/lib/librump: Makefile
Added Files:
src/lib/librump: rump_sp.7
Log Message:
Describe the rump_sp facility a bit.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/lib/librump/Makefile
cvs rdiff -u -r0 -r1.1 src/lib/librump/rump_sp.7
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/librump/Makefile
diff -u src/lib/librump/Makefile:1.3 src/lib/librump/Makefile:1.4
--- src/lib/librump/Makefile:1.3 Thu Sep 2 12:29:49 2010
+++ src/lib/librump/Makefile Thu Dec 16 15:29:28 2010
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2010/09/02 12:29:49 pooka Exp $
+# $NetBSD: Makefile,v 1.4 2010/12/16 15:29:28 pooka Exp $
#
RUMPTOP= ${.CURDIR}/../../sys/rump
LIBDPLIBS+= rumpuser ${.CURDIR}/../librumpuser
-MAN= rump.3 rump_lwproc.3
+MAN= rump.3 rump_lwproc.3 rump_sp.7
WARNS= 3 # XXX: kernel isn't ready for -Wsign-compare
Added files:
Index: src/lib/librump/rump_sp.7
diff -u /dev/null src/lib/librump/rump_sp.7:1.1
--- /dev/null Thu Dec 16 15:29:28 2010
+++ src/lib/librump/rump_sp.7 Thu Dec 16 15:29:28 2010
@@ -0,0 +1,95 @@
+.\ $NetBSD: rump_sp.7,v 1.1 2010/12/16 15:29:28 pooka Exp $
+.\
+.\ Copyright (c) 2010 Antti Kantee. All rights reserved.
+.\
+.\ Redistribution and use in source and binary forms, with or without
+.\ modification, are permitted provided that the following conditions
+.\ are met:
+.\ 1. Redistributions of source code must retain the above copyright
+.\notice, this list of conditions and the following disclaimer.
+.\ 2. Redistributions in binary form must reproduce the above copyright
+.\notice, this list of conditions and the following disclaimer in the
+.\documentation and/or other materials provided with the distribution.
+.\
+.\ THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+.\ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\ ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+.\ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\ SUCH DAMAGE.
+.\
+.Dd December 16, 2010
+.Dt RUMP_SP 3
+.Os
+.Sh NAME
+.Nm rump_sp
+.Nd rump remote system call support
+.Sh DESCRIPTION
+The
+.Nm
+facility allows clients to attach to a rump kernel server over a
+socket and perform system calls.
+While making a local rump system call is faster than calling the
+host kernel, a remote system call over a socket is slower.
+This facility is therefore meant mostly for operations which are
+not performance critical, such as configuration of a rump kernel
+server.
+.Ss Clients
+The
+.Nx
+base system comes with multiple preinstalled clients which can be
+used to configure a rump kernel and request diagnostic information.
+These clients run as hybrids partially in the host system and
+partially against the rump kernel.
+For example, network-related clients will typically avoid making
+any file system related system calls against the rump kernel, since
+it is not guaranteed that a rump network server has file system
+support.
+Another example is DNS: since a rump server very rarely has a DNS
+service configured, host networking used to do DNS lookups.
+.Pp
+Some examples of clients include
+.Nm rump.ifconfig
+which configures interfaces,
+.Nm rump.sysctl
+which is used to access the
+.Xr sysctl 7
+namespace
+and
+.Nm rump.traceroute
+which is used to display a network trace starting from the rump kernel.
+.Ss Connecting to the server
+A remote rump server is specified using an URL.
+Currently two types of URLs are supported: TCP and local domain sockets.
+The TCP URL is of the format tcp://ip.address:port/ and the local
+domain URL is unix://path.
+The latter can accept relative or absolute paths.
+Note that absolute paths require three leading slashes.
+.Pp
+To preserve the standard usage of the rump clients' counterparts
+the environment variable
+.Ev RUMP_SERVER
+is used to specify the server URL.
+To keep track of which rump kernel the current shell is using,
+modifying the shell prompt is recommended -- this is analoguous
+to the visual clue you have when you login from one machine to
+another.
+.Sh EXAMPLES
+Get a list of file systems supported by a rump kernel server
+(in case that particular server does not support file systems,
+an error will be returned):
+.Bd -literal -offset indent
+$ env
CVS commit: src/distrib/sets/lists/man
Module Name:src Committed By: pooka Date: Thu Dec 16 15:30:57 UTC 2010 Modified Files: src/distrib/sets/lists/man: mi Log Message: +rump_sp manpage To generate a diff of this commit: cvs rdiff -u -r1.1268 -r1.1269 src/distrib/sets/lists/man/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/man/mi diff -u src/distrib/sets/lists/man/mi:1.1268 src/distrib/sets/lists/man/mi:1.1269 --- src/distrib/sets/lists/man/mi:1.1268 Tue Dec 14 16:18:16 2010 +++ src/distrib/sets/lists/man/mi Thu Dec 16 15:30:56 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1268 2010/12/14 16:18:16 jruoho Exp $ +# $NetBSD: mi,v 1.1269 2010/12/16 15:30:56 pooka Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -1989,6 +1989,7 @@ ./usr/share/man/cat7/pkgsrc.0 man-reference-catman .cat ./usr/share/man/cat7/re_format.0 man-reference-catman .cat ./usr/share/man/cat7/release.0 man-reference-catman .cat +./usr/share/man/cat7/rump_sp.0 man-reference-catman .cat ./usr/share/man/cat7/script.0 man-reference-catman .cat ./usr/share/man/cat7/setuid.0 man-reference-catman .cat ./usr/share/man/cat7/signal.0 man-reference-catman .cat @@ -4608,6 +4609,7 @@ ./usr/share/man/html7/pkgsrc.html man-reference-htmlman html ./usr/share/man/html7/re_format.html man-reference-htmlman html ./usr/share/man/html7/release.html man-reference-htmlman html +./usr/share/man/html7/rump_sp.html man-reference-htmlman html ./usr/share/man/html7/script.html man-reference-htmlman html ./usr/share/man/html7/setuid.html man-reference-htmlman html ./usr/share/man/html7/signal.html man-reference-htmlman html @@ -7208,6 +7210,7 @@ ./usr/share/man/man7/pcap-filter.7 man-netutil-man .man ./usr/share/man/man7/pcap-linktype.7 man-netutil-man .man ./usr/share/man/man7/pkgsrc.7 man-reference-man .man +./usr/share/man/man7/rump_sp.7 man-reference-man .man ./usr/share/man/man7/re_format.7 man-reference-man .man ./usr/share/man/man7/release.7 man-reference-man .man ./usr/share/man/man7/script.7 man-reference-man .man
CVS commit: src/share/man/man3
Module Name:src Committed By: jruoho Date: Thu Dec 16 15:55:41 UTC 2010 Modified Files: src/share/man/man3: attribute.3 Log Message: Paraphrase slightly. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/share/man/man3/attribute.3 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/man3/attribute.3 diff -u src/share/man/man3/attribute.3:1.3 src/share/man/man3/attribute.3:1.4 --- src/share/man/man3/attribute.3:1.3 Thu Dec 16 10:40:43 2010 +++ src/share/man/man3/attribute.3 Thu Dec 16 15:55:41 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: attribute.3,v 1.3 2010/12/16 10:40:43 jruoho Exp $ +.\ $NetBSD: attribute.3,v 1.4 2010/12/16 15:55:41 jruoho Exp $ .\ .\ Copyright (c) 2010 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -69,6 +69,10 @@ or .Vt union , all variables therein are also packed. +The +.Ic __packed +macro is often useful when dealing with data that +is in a particular static format on the disk, wire, or memory. .It Fn __aligned x The .Fn __aligned @@ -95,15 +99,13 @@ Note that when used with functions, structures, or structure members, .Fn __aligned can only be used to increase the alignment. -It is however possible to decrease the alignment +If the macro is however used as part of a +.Vt typedef , +the alignment can both increase and decrease. +Otherwise it is only possible to decrease the alignment for variables and fields by using the .Ic __packed macro. -If -.Fn __aligned -is used as part of a -.Vt typedef , -the alignment can both increase and decrease. The effectiveness of .Fn __aligned is largely dependent on the linker. @@ -134,4 +136,4 @@ should steer clear from non-standard extensions specific to any given compiler. Even when portability is not a concern, -use these macros wisely. +use these macros sparsely and wisely.
CVS commit: src/sys/dev/sysmon
Module Name:src
Committed By: njoly
Date: Thu Dec 16 16:08:57 UTC 2010
Modified Files:
src/sys/dev/sysmon: sysmon_envsys.c
Log Message:
Be sure to always initialize props variable to a sensible value.
Fix a problem with envstat -S call which was installing bogus/random
limits.
ok pgoyette.
To generate a diff of this commit:
cvs rdiff -u -r1.110 -r1.111 src/sys/dev/sysmon/sysmon_envsys.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/sysmon/sysmon_envsys.c
diff -u src/sys/dev/sysmon/sysmon_envsys.c:1.110 src/sys/dev/sysmon/sysmon_envsys.c:1.111
--- src/sys/dev/sysmon/sysmon_envsys.c:1.110 Wed Dec 15 17:17:16 2010
+++ src/sys/dev/sysmon/sysmon_envsys.c Thu Dec 16 16:08:57 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon_envsys.c,v 1.110 2010/12/15 17:17:16 pgoyette Exp $ */
+/* $NetBSD: sysmon_envsys.c,v 1.111 2010/12/16 16:08:57 njoly Exp $ */
/*-
* Copyright (c) 2007, 2008 Juan Romero Pardines.
@@ -64,7 +64,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sysmon_envsys.c,v 1.110 2010/12/15 17:17:16 pgoyette Exp $);
+__KERNEL_RCSID(0, $NetBSD: sysmon_envsys.c,v 1.111 2010/12/16 16:08:57 njoly Exp $);
#include sys/param.h
#include sys/types.h
@@ -1136,6 +1136,7 @@
/*
* Next, we need to retrieve those initial limits.
*/
+ props = 0;
edata-upropset = ~PROP_LIMITS;
if (sme-sme_get_limits) {
DPRINTF((%s: retrieve limits for %s %s\n,
CVS commit: src/crypto/dist/ipsec-tools/src/racoon
Module Name:src Committed By: gdt Date: Thu Dec 16 16:59:05 UTC 2010 Modified Files: src/crypto/dist/ipsec-tools/src/racoon: oakley.c Log Message: When encountering a certificate where ID mismatched with ASN1 SubjectName, and verify_identifier is off, don't raise an error. This makes the behavior match the man page. Patch sent for review long ago: http://mail-index.netbsd.org/tech-security/2006/03/24/.html with no negative feedback received to date. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/crypto/dist/ipsec-tools/src/racoon/oakley.c 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/racoon/oakley.c diff -u src/crypto/dist/ipsec-tools/src/racoon/oakley.c:1.17 src/crypto/dist/ipsec-tools/src/racoon/oakley.c:1.18 --- src/crypto/dist/ipsec-tools/src/racoon/oakley.c:1.17 Mon Aug 24 09:33:03 2009 +++ src/crypto/dist/ipsec-tools/src/racoon/oakley.c Thu Dec 16 16:59:05 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: oakley.c,v 1.17 2009/08/24 09:33:03 vanhu Exp $ */ +/* $NetBSD: oakley.c,v 1.18 2010/12/16 16:59:05 gdt Exp $ */ /* Id: oakley.c,v 1.32 2006/05/26 12:19:46 manubsd Exp */ @@ -1817,7 +1817,8 @@ ID mismatched with ASN1 SubjectName.\n); plogdump(LLV_DEBUG, id_b + 1, idlen); plogdump(LLV_DEBUG, name-v, idlen); - return ISAKMP_NTYPE_INVALID_ID_INFORMATION; + if (iph1-rmconf-verify_identifier) +return ISAKMP_NTYPE_INVALID_ID_INFORMATION; } return 0; case IPSECDOI_ID_IPV4_ADDR: @@ -1889,7 +1890,8 @@ ID mismatched with subjectAltName.\n); plogdump(LLV_DEBUG, id_b + 1, idlen); plogdump(LLV_DEBUG, a, idlen); - return ISAKMP_NTYPE_INVALID_ID_INFORMATION; + if (iph1-rmconf-verify_identifier) +return ISAKMP_NTYPE_INVALID_ID_INFORMATION; } return 0; }
CVS commit: src/lib
Module Name:src
Committed By: pooka
Date: Thu Dec 16 17:05:45 UTC 2010
Modified Files:
src/lib/librumpclient: rumpclient.c
src/lib/librumpuser: rumpuser_sp.c sp_common.c
Log Message:
Have the client and server perform some sort of handshake first.
It's pretty much a placeholder for now. One plan for the future
is to require some sort of authentication for superuser clients.
The code will need a little massage then, though, to prevent DoS
attacks.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/lib/librumpclient/rumpclient.c
cvs rdiff -u -r1.26 -r1.27 src/lib/librumpuser/rumpuser_sp.c
cvs rdiff -u -r1.16 -r1.17 src/lib/librumpuser/sp_common.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/librumpclient/rumpclient.c
diff -u src/lib/librumpclient/rumpclient.c:1.9 src/lib/librumpclient/rumpclient.c:1.10
--- src/lib/librumpclient/rumpclient.c:1.9 Thu Dec 16 12:38:21 2010
+++ src/lib/librumpclient/rumpclient.c Thu Dec 16 17:05:44 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpclient.c,v 1.9 2010/12/16 12:38:21 pooka Exp $ */
+/* $NetBSD: rumpclient.c,v 1.10 2010/12/16 17:05:44 pooka Exp $ */
/*
* Copyright (c) 2010 Antti Kantee. All Rights Reserved.
@@ -87,6 +87,36 @@
}
static int
+handshake_req(struct spclient *spc)
+{
+ struct rsp_hdr rhdr;
+ struct respwait rw;
+ int rv;
+
+ /* performs server handshake */
+ rhdr.rsp_len = sizeof(rhdr);
+ rhdr.rsp_class = RUMPSP_REQ;
+ rhdr.rsp_type = RUMPSP_HANDSHAKE;
+ rhdr.rsp_handshake = HANDSHAKE_GUEST;
+
+ putwait(spc, rw, rhdr);
+ rv = dosend(spc, rhdr, sizeof(rhdr));
+ if (rv != 0) {
+ unputwait(spc, rw);
+ return rv;
+ }
+
+ rv = waitresp(spc, rw);
+ if (rv)
+ return rv;
+
+ rv = *(int *)rw.rw_data;
+ free(rw.rw_data);
+
+ return rv;
+}
+
+static int
send_copyin_resp(struct spclient *spc, uint64_t reqno, void *data, size_t dlen,
int wantstr)
{
@@ -235,19 +265,10 @@
return -1;
}
- if ((error = parsetab[idx].connhook(s)) != 0) {
- error = errno;
- fprintf(stderr, rump_sp: connect hook failed\n);
- errno = error;
- return -1;
- }
- clispc.spc_fd = s;
- TAILQ_INIT(clispc.spc_respwait);
- pthread_mutex_init(clispc.spc_mtx, NULL);
- pthread_cond_init(clispc.spc_cv, NULL);
-
if ((n = read(s, banner, sizeof(banner)-1)) 0) {
+ error = errno;
fprintf(stderr, rump_sp: failed to read banner\n);
+ errno = error;
return -1;
}
@@ -260,5 +281,23 @@
/* parse the banner some day */
- return 0;
+ if ((error = parsetab[idx].connhook(s)) != 0) {
+ error = errno;
+ fprintf(stderr, rump_sp: connect hook failed\n);
+ errno = error;
+ return -1;
+ }
+
+ pthread_mutex_init(clispc.spc_mtx, NULL);
+ pthread_cond_init(clispc.spc_cv, NULL);
+ clispc.spc_fd = s;
+ TAILQ_INIT(clispc.spc_respwait);
+
+ error = handshake_req(clispc);
+ if (error) {
+ pthread_mutex_destroy(clispc.spc_mtx);
+ pthread_cond_destroy(clispc.spc_cv);
+ close(s);
+ }
+ return error;
}
Index: src/lib/librumpuser/rumpuser_sp.c
diff -u src/lib/librumpuser/rumpuser_sp.c:1.26 src/lib/librumpuser/rumpuser_sp.c:1.27
--- src/lib/librumpuser/rumpuser_sp.c:1.26 Thu Dec 16 12:38:20 2010
+++ src/lib/librumpuser/rumpuser_sp.c Thu Dec 16 17:05:44 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpuser_sp.c,v 1.26 2010/12/16 12:38:20 pooka Exp $ */
+/* $NetBSD: rumpuser_sp.c,v 1.27 2010/12/16 17:05:44 pooka Exp $ */
/*
* Copyright (c) 2010 Antti Kantee. All Rights Reserved.
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: rumpuser_sp.c,v 1.26 2010/12/16 12:38:20 pooka Exp $);
+__RCSID($NetBSD: rumpuser_sp.c,v 1.27 2010/12/16 17:05:44 pooka Exp $);
#include sys/types.h
#include sys/atomic.h
@@ -198,6 +198,26 @@
}
static int
+send_handshake_resp(struct spclient *spc, uint64_t reqno, int error)
+{
+ struct rsp_hdr rhdr;
+ int rv;
+
+ rhdr.rsp_len = sizeof(rhdr) + sizeof(error);
+ rhdr.rsp_reqno = reqno;
+ rhdr.rsp_class = RUMPSP_RESP;
+ rhdr.rsp_type = RUMPSP_HANDSHAKE;
+ rhdr.rsp_error = 0;
+
+ sendlock(spc);
+ rv = dosend(spc, rhdr, sizeof(rhdr));
+ rv = dosend(spc, error, sizeof(error));
+ sendunlock(spc);
+
+ return rv;
+}
+
+static int
send_syscall_resp(struct spclient *spc, uint64_t reqno, int error,
register_t *retval)
{
@@ -355,7 +375,7 @@
close(spc-spc_fd);
spc-spc_fd = -1;
- spc-spc_dying = 0;
+ spc-spc_state = SPCSTATE_NEW;
atomic_inc_uint(disco);
}
@@ -370,7 +390,7 @@
pfdlist[idx].fd = -1;
pfdlist[idx].revents = 0;
pthread_mutex_lock(spc-spc_mtx);
- spc-spc_dying = 1;
+ spc-spc_state = SPCSTATE_DYING;
kickall(spc);
pthread_mutex_unlock(spc-spc_mtx);
@@ -439,7 +459,7 @@
/* find empty slot the simple way */
for (i = 0; i MAXCLI; i++) {
- if (pfdlist[i].fd == -1 spclist[i].spc_dying == 0)
+ if (pfdlist[i].fd == -1 spclist[i].spc_state == SPCSTATE_NEW)
break;
}
@@ -647,7 +667,24 @@
{
struct sysbouncearg *sba;
pthread_t pt;
- int retries;
+ int
CVS commit: src/sys/dev/pci
Module Name:src Committed By: jakllsch Date: Thu Dec 16 17:07:44 UTC 2010 Modified Files: src/sys/dev/pci: if_vr.c Log Message: Enable ETHERCAP_VLAN_MTU in vr(4). Tested on VT6105M and VT8237R+. May or may not work on earlier chips, for now just assume it will. Provoked by PR#44243. To generate a diff of this commit: cvs rdiff -u -r1.106 -r1.107 src/sys/dev/pci/if_vr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/if_vr.c diff -u src/sys/dev/pci/if_vr.c:1.106 src/sys/dev/pci/if_vr.c:1.107 --- src/sys/dev/pci/if_vr.c:1.106 Sat Nov 13 13:52:07 2010 +++ src/sys/dev/pci/if_vr.c Thu Dec 16 17:07:44 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: if_vr.c,v 1.106 2010/11/13 13:52:07 uebayasi Exp $ */ +/* $NetBSD: if_vr.c,v 1.107 2010/12/16 17:07:44 jakllsch Exp $ */ /*- * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. @@ -97,7 +97,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: if_vr.c,v 1.106 2010/11/13 13:52:07 uebayasi Exp $); +__KERNEL_RCSID(0, $NetBSD: if_vr.c,v 1.107 2010/12/16 17:07:44 jakllsch Exp $); #include rnd.h @@ -1686,6 +1686,8 @@ } else ifmedia_set(sc-vr_mii.mii_media, IFM_ETHER|IFM_AUTO); + sc-vr_ec.ec_capabilities |= ETHERCAP_VLAN_MTU; + /* * Call MI attach routines. */
CVS commit: src/tests/sbin/resize_ffs
Module Name:src
Committed By: riz
Date: Thu Dec 16 17:16:07 UTC 2010
Modified Files:
src/tests/sbin/resize_ffs: common.sh t_grow.sh t_shrink.sh
Log Message:
Factor out more common code. No functional changes intended.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/tests/sbin/resize_ffs/common.sh \
src/tests/sbin/resize_ffs/t_grow.sh src/tests/sbin/resize_ffs/t_shrink.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/sbin/resize_ffs/common.sh
diff -u src/tests/sbin/resize_ffs/common.sh:1.4 src/tests/sbin/resize_ffs/common.sh:1.5
--- src/tests/sbin/resize_ffs/common.sh:1.4 Sat Dec 11 11:36:48 2010
+++ src/tests/sbin/resize_ffs/common.sh Thu Dec 16 17:16:07 2010
@@ -96,3 +96,56 @@
check_data $i
done
}
+
+
+resize_ffs()
+{
+ echo in shrink_ffs: $...@}
+ local bs=$1
+ local fragsz=$2
+ local osize=$3
+ local nsize=$4
+ local fslevel=$5
+ local numdata=$6
+ local swap=$7
+ mkdir -p mnt
+ echo bs is ${bs} numdata is ${numdata}
+ echo shrinking fs with blocksize ${bs}
+
+ # we want no more than 16K/inode to allow test files to copy.
+ local fpi=$((fragsz * 4))
+ local i
+ if [ $fpi -gt 16384 ]; then
+ i=-i 16384
+ fi
+ if [ x$swap != x ]; then
+ newfs -B ${BYTESWAP} -O${fslevel} -b ${bs} -f ${fragsz} \
+ -s ${osize} ${i} -F ${IMG}
+ else
+ newfs -O${fslevel} -b ${bs} -f ${fragsz} -s ${osize} ${i} \
+ -F ${IMG}
+ fi
+
+ # we're specifying relative paths, so rump_ffs warns - ignore.
+ atf_check -s exit:0 -e ignore rump_ffs ${IMG} mnt
+ copy_multiple ${numdata}
+
+ if [ ${nsize} -lt ${osize} ]; then
+ # how much data to remove so fs can be shrunk
+ local remove=$((numdata-numdata*nsize/osize))
+ local dataleft=$((numdata-remove))
+ echo remove is $remove dataleft is $dataleft
+ remove_multiple ${remove}
+ fi
+
+ umount mnt
+ atf_check -s exit:0 -o ignore resize_ffs -y -s ${nsize} ${IMG}
+ atf_check -s exit:0 -o ignore fsck_ffs -f -n -F ${IMG}
+ atf_check -s exit:0 -e ignore rump_ffs ${IMG} mnt
+ if [ ${nsize} -lt ${osize} ]; then
+ # checking everything because we don't delete on grow
+ check_data_range $((remove + 1)) ${numdata}
+ fi
+ umount mnt
+ rm -f ${IMG} # probably unnecessary
+}
Index: src/tests/sbin/resize_ffs/t_grow.sh
diff -u src/tests/sbin/resize_ffs/t_grow.sh:1.4 src/tests/sbin/resize_ffs/t_grow.sh:1.5
--- src/tests/sbin/resize_ffs/t_grow.sh:1.4 Sun Dec 12 22:50:42 2010
+++ src/tests/sbin/resize_ffs/t_grow.sh Thu Dec 16 17:16:07 2010
@@ -1,4 +1,4 @@
-# $NetBSD: t_grow.sh,v 1.4 2010/12/12 22:50:42 riz Exp $
+# $NetBSD: t_grow.sh,v 1.5 2010/12/16 17:16:07 riz Exp $
#
# Copyright (c) 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -28,85 +28,45 @@
# POSSIBILITY OF SUCH DAMAGE.
#
-grow_ffs()
-{
- echo in grow_ffs: $...@}
- local bs=$1
- local fragsz=$2
- local osize=$3
- local nsize=$4
- local fslevel=$5
- local numdata=$6
- local swap=$7
- mkdir -p mnt
- echo bs is ${bs} numdata is ${numdata}
- echo growing fs with blocksize ${bs}
-
- # we want no more than 16K/inode to allow test files to copy.
- local fpi=$((fragsz * 4))
- local i
- if [ $fpi -gt 16384 ]; then
- i=-i 16384
- fi
- if [ x$swap != x ]; then
- newfs -B ${BYTESWAP} -O${fslevel} -b ${bs} -f ${fragsz} \
- -s ${osize} ${i} -F ${IMG}
- else
- newfs -O${fslevel} -b ${bs} -f ${fragsz} -s ${osize} ${i} \
- -F ${IMG}
- fi
-
- # we're specifying relative paths, so rump_ffs warns - ignore.
- atf_check -s exit:0 -e ignore rump_ffs ${IMG} mnt
- copy_multiple ${numdata}
- umount mnt
- atf_check -s exit:0 resize_ffs -y -s ${nsize} ${IMG}
- atf_check -s exit:0 -o ignore fsck_ffs -f -n -F ${IMG}
- atf_check -s exit:0 -e ignore rump_ffs ${IMG} mnt
- # checking everything because we don't delete on grow
- check_data_range 1 ${numdata}
- umount mnt
- rm -f ${IMG} # probably unnecessary
-}
-# grow_ffs params as follows:
-# grow_ffs blocksize fragsize fssize newfssize level numdata swap
+# resize_ffs params as follows:
+# resize_ffs blocksize fragsize fssize newfssize level numdata swap
# where 'numdata' is the number of data directories to copy - this is
# determined manually based on the maximum number that will fit in the
# created fs. 'level' is the fs-level (-O 0,1,2) passed to newfs.
# If 'swap' is included, byteswap the fs
-test_case grow_16M_v1_4096 grow_ffs 4096 512 32768 131072 1 28
-test_case_xfail grow_16M_v1_4096_swapped PR bin/44203 grow_ffs 4096 512 32768 131072 1 28 swap
-test_case_xfail grow_16M_v2_4096 PR bin/44205 grow_ffs 4096 512 32768 131072 2 28
-test_case_xfail grow_16M_v2_4096_swapped PR bin/44203, PR bin/44205 grow_ffs 4096 512 32768 131072 2 28 swap
-test_case grow_16M_v1_8192 grow_ffs 8192 1024 32768 131072 1 28
-test_case grow_16M_v1_16384 grow_ffs 16384 2048 32768 131072 1 29
-test_case grow_16M_v1_32768 grow_ffs 32768 4096 32768 131072 1 28
-test_case grow_16M_v1_65536 grow_ffs 65536 8192 32768 131072 1
CVS commit: src/lib/librump
Module Name:src Committed By: wiz Date: Thu Dec 16 17:17:07 UTC 2010 Modified Files: src/lib/librump: rump_sp.7 Log Message: Add missing word. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/lib/librump/rump_sp.7 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/librump/rump_sp.7 diff -u src/lib/librump/rump_sp.7:1.1 src/lib/librump/rump_sp.7:1.2 --- src/lib/librump/rump_sp.7:1.1 Thu Dec 16 15:29:28 2010 +++ src/lib/librump/rump_sp.7 Thu Dec 16 17:17:07 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: rump_sp.7,v 1.1 2010/12/16 15:29:28 pooka Exp $ +.\ $NetBSD: rump_sp.7,v 1.2 2010/12/16 17:17:07 wiz Exp $ .\ .\ Copyright (c) 2010 Antti Kantee. All rights reserved. .\ @@ -51,7 +51,7 @@ it is not guaranteed that a rump network server has file system support. Another example is DNS: since a rump server very rarely has a DNS -service configured, host networking used to do DNS lookups. +service configured, host networking is used to do DNS lookups. .Pp Some examples of clients include .Nm rump.ifconfig
CVS commit: src
Module Name:src Committed By: wiz Date: Thu Dec 16 17:42:29 UTC 2010 Modified Files: src/external/bsd/libarchive/dist/libarchive: archive_entry.3 src/external/bsd/pcc/dist/pcc: configure.ac src/external/bsd/pcc/dist/pcc/cc/ccom: scan.l src/external/bsd/tre/dist/doc: tre-api.html src/external/gpl3/binutils/dist/binutils/doc: strings.1 src/gnu/dist/gcc4/gcc: c-format.c src/gnu/dist/gcc4/gcc/doc: cpp.texi implement-c.texi src/lib/libc/locale: _wcstod.h mbsrtowcs.3 mbstowcs.3 wcscoll.3 wcsrtombs.3 wcstol.3 wcstombs.3 wcsxfrm.3 src/lib/libc/stdio: fgetwln.3 fgetws.3 fputws.3 getwc.3 printf.3 putwc.3 ungetwc.3 vfscanf.c vfwprintf.c wprintf.3 wscanf.3 src/lib/libc/string: wcscasecmp.3 wcsdup.3 wcstok.3 wmemchr.3 src/lib/libcurses: addbytes.c cchar.c curses.h curses_private.h get_wch.c ins_wstr.c src/lib/libedit: chartype.h editline.3 src/share/doc/smm/01.setup: 3.t src/share/man/man0: title.cdrom title.urm src/usr.bin/xlint/lint1: scan.l src/usr.sbin/chrtbl: chrtbl.8 Log Message: Observe the following spelling: - wide character (noun) - wide-character (adjective) Inspired by j...@openbsd. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/bsd/libarchive/dist/libarchive/archive_entry.3 cvs rdiff -u -r1.1.1.3 -r1.2 src/external/bsd/pcc/dist/pcc/configure.ac cvs rdiff -u -r1.1.1.3 -r1.2 src/external/bsd/pcc/dist/pcc/cc/ccom/scan.l cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/tre/dist/doc/tre-api.html cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl3/binutils/dist/binutils/doc/strings.1 cvs rdiff -u -r1.1.1.1 -r1.2 src/gnu/dist/gcc4/gcc/c-format.c cvs rdiff -u -r1.5 -r1.6 src/gnu/dist/gcc4/gcc/doc/cpp.texi cvs rdiff -u -r1.1.1.2 -r1.2 src/gnu/dist/gcc4/gcc/doc/implement-c.texi cvs rdiff -u -r1.1 -r1.2 src/lib/libc/locale/_wcstod.h cvs rdiff -u -r1.11 -r1.12 src/lib/libc/locale/mbsrtowcs.3 \ src/lib/libc/locale/wcstombs.3 cvs rdiff -u -r1.10 -r1.11 src/lib/libc/locale/mbstowcs.3 cvs rdiff -u -r1.2 -r1.3 src/lib/libc/locale/wcscoll.3 \ src/lib/libc/locale/wcstol.3 cvs rdiff -u -r1.12 -r1.13 src/lib/libc/locale/wcsrtombs.3 cvs rdiff -u -r1.3 -r1.4 src/lib/libc/locale/wcsxfrm.3 cvs rdiff -u -r1.1 -r1.2 src/lib/libc/stdio/fgetwln.3 cvs rdiff -u -r1.2 -r1.3 src/lib/libc/stdio/fgetws.3 \ src/lib/libc/stdio/fputws.3 src/lib/libc/stdio/wscanf.3 cvs rdiff -u -r1.8 -r1.9 src/lib/libc/stdio/getwc.3 \ src/lib/libc/stdio/putwc.3 cvs rdiff -u -r1.54 -r1.55 src/lib/libc/stdio/printf.3 cvs rdiff -u -r1.7 -r1.8 src/lib/libc/stdio/ungetwc.3 \ src/lib/libc/stdio/wprintf.3 cvs rdiff -u -r1.40 -r1.41 src/lib/libc/stdio/vfscanf.c cvs rdiff -u -r1.22 -r1.23 src/lib/libc/stdio/vfwprintf.c cvs rdiff -u -r1.2 -r1.3 src/lib/libc/string/wcscasecmp.3 \ src/lib/libc/string/wcsdup.3 cvs rdiff -u -r1.5 -r1.6 src/lib/libc/string/wcstok.3 cvs rdiff -u -r1.14 -r1.15 src/lib/libc/string/wmemchr.3 cvs rdiff -u -r1.37 -r1.38 src/lib/libcurses/addbytes.c cvs rdiff -u -r1.4 -r1.5 src/lib/libcurses/cchar.c cvs rdiff -u -r1.100 -r1.101 src/lib/libcurses/curses.h cvs rdiff -u -r1.45 -r1.46 src/lib/libcurses/curses_private.h cvs rdiff -u -r1.8 -r1.9 src/lib/libcurses/get_wch.c cvs rdiff -u -r1.5 -r1.6 src/lib/libcurses/ins_wstr.c cvs rdiff -u -r1.6 -r1.7 src/lib/libedit/chartype.h cvs rdiff -u -r1.73 -r1.74 src/lib/libedit/editline.3 cvs rdiff -u -r1.4 -r1.5 src/share/doc/smm/01.setup/3.t cvs rdiff -u -r1.6 -r1.7 src/share/man/man0/title.cdrom cvs rdiff -u -r1.8 -r1.9 src/share/man/man0/title.urm cvs rdiff -u -r1.47 -r1.48 src/usr.bin/xlint/lint1/scan.l cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/chrtbl/chrtbl.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/libarchive/dist/libarchive/archive_entry.3 diff -u src/external/bsd/libarchive/dist/libarchive/archive_entry.3:1.1.1.1 src/external/bsd/libarchive/dist/libarchive/archive_entry.3:1.2 --- src/external/bsd/libarchive/dist/libarchive/archive_entry.3:1.1.1.1 Fri Sep 19 21:56:14 2008 +++ src/external/bsd/libarchive/dist/libarchive/archive_entry.3 Thu Dec 16 17:42:25 2010 @@ -336,11 +336,11 @@ In the case of strings, a const-qualified pointer to the string is returned. .El -String data can be set or accessed as wide character strings +String data can be set or accessed as wide-character strings or normal .Va char strings. -The functions that use wide character strings are suffixed with +The functions that use wide-character strings are suffixed with .Cm _w . Note that these are different representations of the same data: For example, if you store a narrow string and read the corresponding Index: src/external/bsd/pcc/dist/pcc/configure.ac diff -u src/external/bsd/pcc/dist/pcc/configure.ac:1.1.1.3 src/external/bsd/pcc/dist/pcc/configure.ac:1.2 ---
CVS commit: src
Module Name:src Committed By: jruoho Date: Thu Dec 16 17:47:54 UTC 2010 Modified Files: src/distrib/sets/lists/comp: mi src/share/man/man3: Makefile attribute.3 Log Message: Document __dead, __pure, __constfunc, __noinline, __unused, and __used. To generate a diff of this commit: cvs rdiff -u -r1.1547 -r1.1548 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.60 -r1.61 src/share/man/man3/Makefile cvs rdiff -u -r1.4 -r1.5 src/share/man/man3/attribute.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1547 src/distrib/sets/lists/comp/mi:1.1548 --- src/distrib/sets/lists/comp/mi:1.1547 Thu Dec 16 10:19:13 2010 +++ src/distrib/sets/lists/comp/mi Thu Dec 16 17:47:53 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1547 2010/12/16 10:19:13 jruoho Exp $ +# $NetBSD: mi,v 1.1548 2010/12/16 17:47:53 jruoho Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -4908,9 +4908,15 @@ ./usr/share/man/cat3/__aligned.0 comp-c-catman .cat ./usr/share/man/cat3/__arraycount.0 comp-c-catman .cat ./usr/share/man/cat3/__builtin_object_size.0 comp-c-catman .cat +./usr/share/man/cat3/__constfunc.0 comp-c-catman .cat +./usr/share/man/cat3/__dead.0 comp-c-catman .cat +./usr/share/man/cat3/__noinline.0 comp-c-catman .cat ./usr/share/man/cat3/__packed.0 comp-c-catman .cat +./usr/share/man/cat3/__pure.0 comp-c-catman .cat ./usr/share/man/cat3/__section.0 comp-c-catman .cat ./usr/share/man/cat3/__svc_getcallercreds.0 comp-c-catman .cat +./usr/share/man/cat3/__unused.0 comp-c-catman .cat +./usr/share/man/cat3/__used.0 comp-c-catman .cat ./usr/share/man/cat3/_longjmp.0 comp-c-catman .cat ./usr/share/man/cat3/_lwp_makecontext.0 comp-c-catman .cat ./usr/share/man/cat3/_setjmp.0 comp-c-catman .cat @@ -10975,9 +10981,15 @@ ./usr/share/man/html3/__aligned.html comp-c-htmlman html ./usr/share/man/html3/__arraycount.html comp-c-htmlman html ./usr/share/man/html3/__builtin_object_size.html comp-c-htmlman html +./usr/share/man/html3/__constfunc.html comp-c-htmlman html +./usr/share/man/html3/__dead.html comp-c-htmlman html +./usr/share/man/html3/__noinline.html comp-c-htmlman html ./usr/share/man/html3/__packed.html comp-c-htmlman html +./usr/share/man/html3/__pure.html comp-c-htmlman html ./usr/share/man/html3/__section.html comp-c-htmlman html ./usr/share/man/html3/__svc_getcallercreds.html comp-c-htmlman html +./usr/share/man/html3/__unused.html comp-c-htmlman html +./usr/share/man/html3/__used.html comp-c-htmlman html ./usr/share/man/html3/_longjmp.html comp-c-htmlman html ./usr/share/man/html3/_lwp_makecontext.html comp-c-htmlman html ./usr/share/man/html3/_setjmp.html comp-c-htmlman html @@ -16842,9 +16854,15 @@ ./usr/share/man/man3/__aligned.3 comp-c-man .man ./usr/share/man/man3/__arraycount.3 comp-c-man .man ./usr/share/man/man3/__builtin_object_size.3 comp-c-man .man +./usr/share/man/man3/__constfunc.3 comp-c-man .man +./usr/share/man/man3/__dead.3 comp-c-man .man +./usr/share/man/man3/__noinline.3 comp-c-man .man ./usr/share/man/man3/__packed.3 comp-c-man .man +./usr/share/man/man3/__pure.3 comp-c-man .man ./usr/share/man/man3/__section.3 comp-c-man .man ./usr/share/man/man3/__svc_getcallercreds.3 comp-c-man .man +./usr/share/man/man3/__unused.3 comp-c-man .man +./usr/share/man/man3/__used.3 comp-c-man .man ./usr/share/man/man3/_longjmp.3 comp-c-man .man ./usr/share/man/man3/_lwp_makecontext.3 comp-c-man .man ./usr/share/man/man3/_setjmp.3 comp-c-man .man Index: src/share/man/man3/Makefile diff -u src/share/man/man3/Makefile:1.60 src/share/man/man3/Makefile:1.61 --- src/share/man/man3/Makefile:1.60 Thu Dec 16 10:19:14 2010 +++ src/share/man/man3/Makefile Thu Dec 16 17:47:54 2010 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.60 2010/12/16 10:19:14 jruoho Exp $ +# $NetBSD: Makefile,v 1.61 2010/12/16 17:47:54 jruoho Exp $ # @(#)Makefile 8.2 (Berkeley) 12/13/93 MAN= _DIAGASSERT.3 __CONCAT.3 __UNCONST.3 CMSG_DATA.3 \ @@ -14,7 +14,13 @@ MLINKS+=__CONCAT.3 __STRING.3 MLINKS+=__UNCONST.3 __UNVOLATILE.3 -MLINKS+=attribute.3 __packed.3 \ +MLINKS+=attribute.3 __dead.3 \ + attribute.3 __pure.3 \ + attribute.3 __constfunc.3 \ + attribute.3 __noinline.3 \ + attribute.3 __unused.3 \ + attribute.3 __used.3 \ + attribute.3 __packed.3 \ attribute.3 __aligned.3 \ attribute.3 __section.3 MLINKS+=bitstring.3 bit_alloc.3 \ Index: src/share/man/man3/attribute.3 diff -u src/share/man/man3/attribute.3:1.4 src/share/man/man3/attribute.3:1.5 --- src/share/man/man3/attribute.3:1.4 Thu Dec 16 15:55:41 2010 +++ src/share/man/man3/attribute.3 Thu Dec 16 17:47:54 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: attribute.3,v 1.4 2010/12/16 15:55:41 jruoho Exp $ +.\ $NetBSD: attribute.3,v 1.5 2010/12/16 17:47:54 jruoho Exp $ .\ .\
CVS commit: src/tests/sbin/resize_ffs
Module Name:src
Committed By: riz
Date: Thu Dec 16 17:50:13 UTC 2010
Modified Files:
src/tests/sbin/resize_ffs: t_grow.sh t_shrink.sh
Log Message:
Reduce the number of tests run automatically, as they apparently go
quite slowly when run under qemu.
Also, change the switch variable from RESIZE_FFS_BIG_TESTS to
RESIZE_FFS_ALL_TESTS, and only check if it's set or not.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/tests/sbin/resize_ffs/t_grow.sh \
src/tests/sbin/resize_ffs/t_shrink.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/sbin/resize_ffs/t_grow.sh
diff -u src/tests/sbin/resize_ffs/t_grow.sh:1.5 src/tests/sbin/resize_ffs/t_grow.sh:1.6
--- src/tests/sbin/resize_ffs/t_grow.sh:1.5 Thu Dec 16 17:16:07 2010
+++ src/tests/sbin/resize_ffs/t_grow.sh Thu Dec 16 17:50:13 2010
@@ -1,4 +1,4 @@
-# $NetBSD: t_grow.sh,v 1.5 2010/12/16 17:16:07 riz Exp $
+# $NetBSD: t_grow.sh,v 1.6 2010/12/16 17:50:13 riz Exp $
#
# Copyright (c) 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -97,6 +97,7 @@
atf_add_test_case grow_16M_v1_16384
atf_add_test_case grow_16M_v1_32768
atf_add_test_case grow_16M_v1_65536
+if [ ${RESIZE_FFS_ALL_TESTS-X} != X ]; then
atf_add_test_case grow_24M_v1_4096
atf_add_test_case grow_24M_v1_8192
atf_add_test_case grow_24M_v1_16384
@@ -107,7 +108,6 @@
atf_add_test_case grow_32M_v1_16384
atf_add_test_case grow_32M_v1_32768
atf_add_test_case grow_32M_v1_65536
-if [ X${RESIZE_FFS_BIG_TESTS} != X ]; then
atf_add_test_case grow_48M_v1_4096
atf_add_test_case grow_48M_v1_8192
atf_add_test_case grow_48M_v1_16384
Index: src/tests/sbin/resize_ffs/t_shrink.sh
diff -u src/tests/sbin/resize_ffs/t_shrink.sh:1.5 src/tests/sbin/resize_ffs/t_shrink.sh:1.6
--- src/tests/sbin/resize_ffs/t_shrink.sh:1.5 Thu Dec 16 17:16:07 2010
+++ src/tests/sbin/resize_ffs/t_shrink.sh Thu Dec 16 17:50:13 2010
@@ -1,4 +1,4 @@
-# $NetBSD: t_shrink.sh,v 1.5 2010/12/16 17:16:07 riz Exp $
+# $NetBSD: t_shrink.sh,v 1.6 2010/12/16 17:50:13 riz Exp $
#
# Copyright (c) 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -91,12 +91,12 @@
atf_add_test_case shrink_24M_16M_v1_16384
atf_add_test_case shrink_24M_16M_v1_32768
atf_add_test_case shrink_24M_16M_v1_65536
+if [ ${RESIZE_FFS_ALL_TESTS-X} != X ]; then
atf_add_test_case shrink_32M_24M_v1_4096
atf_add_test_case shrink_32M_24M_v1_8192
atf_add_test_case shrink_32M_24M_v1_16384
atf_add_test_case shrink_32M_24M_v1_32768
atf_add_test_case shrink_32M_24M_v1_65536
-if [ X${RESIZE_FFS_BIG_TESTS} != X ]; then
atf_add_test_case shrink_48M_16M_v1_4096
atf_add_test_case shrink_48M_16M_v1_8192
atf_add_test_case shrink_48M_16M_v1_16384
CVS commit: src
Module Name:src Committed By: jruoho Date: Thu Dec 16 17:50:39 UTC 2010 Modified Files: src/lib/libc/ssp: __builtin_object_size.3 src/share/man/man3: attribute.3 Log Message: Reference __builtin_object_size(3) and attribute(3) with each other. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/lib/libc/ssp/__builtin_object_size.3 cvs rdiff -u -r1.5 -r1.6 src/share/man/man3/attribute.3 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/ssp/__builtin_object_size.3 diff -u src/lib/libc/ssp/__builtin_object_size.3:1.5 src/lib/libc/ssp/__builtin_object_size.3:1.6 --- src/lib/libc/ssp/__builtin_object_size.3:1.5 Thu Apr 22 13:41:40 2010 +++ src/lib/libc/ssp/__builtin_object_size.3 Thu Dec 16 17:50:39 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: __builtin_object_size.3,v 1.5 2010/04/22 13:41:40 jruoho Exp $ +.\ $NetBSD: __builtin_object_size.3,v 1.6 2010/12/16 17:50:39 jruoho Exp $ .\ .\ Copyright (c) 2007 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -28,7 +28,7 @@ .\ POSSIBILITY OF SUCH DAMAGE. .\ .\ -.Dd April 22, 2010 +.Dd December 16, 2010 .Dt __BUILTIN_OBJECT_SIZE 3 .Os .Sh NAME @@ -78,6 +78,7 @@ .Dv \*[Am] 2 != 0 . .Sh SEE ALSO .Xr gcc 1 , +.Xr attribute 3 , .Xr ssp 3 .Sh HISTORY The Index: src/share/man/man3/attribute.3 diff -u src/share/man/man3/attribute.3:1.5 src/share/man/man3/attribute.3:1.6 --- src/share/man/man3/attribute.3:1.5 Thu Dec 16 17:47:54 2010 +++ src/share/man/man3/attribute.3 Thu Dec 16 17:50:39 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: attribute.3,v 1.5 2010/12/16 17:47:54 jruoho Exp $ +.\ $NetBSD: attribute.3,v 1.6 2010/12/16 17:50:39 jruoho Exp $ .\ .\ Copyright (c) 2010 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -224,6 +224,7 @@ .El .Sh SEE ALSO .Xr gcc 1 , +.Xr __builtin_object_size 3 , .Xr cdefs 3 , .Xr c 7 .Sh CAVEATS
CVS commit: src/share/man/man4
Module Name:src Committed By: wiz Date: Thu Dec 16 18:29:47 UTC 2010 Modified Files: src/share/man/man4: vlan.4 vr.4 Log Message: Mention vlan(4) support in vr(4). To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/share/man/man4/vlan.4 cvs rdiff -u -r1.8 -r1.9 src/share/man/man4/vr.4 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/man4/vlan.4 diff -u src/share/man/man4/vlan.4:1.30 src/share/man/man4/vlan.4:1.31 --- src/share/man/man4/vlan.4:1.30 Sat Nov 15 21:37:12 2008 +++ src/share/man/man4/vlan.4 Thu Dec 16 18:29:47 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: vlan.4,v 1.30 2008/11/15 21:37:12 bouyer Exp $ +.\ $NetBSD: vlan.4,v 1.31 2010/12/16 18:29:47 wiz Exp $ .\ .\ Copyright (c) 2000 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -27,7 +27,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd November 15, 2008 +.Dd December 16, 2010 .Dt VLAN 4 .Os .Sh NAME @@ -136,6 +136,8 @@ .It .Xr vge 4 .It +.Xr vr 4 +.It .Xr wm 4 .It .Xr xi 4 Index: src/share/man/man4/vr.4 diff -u src/share/man/man4/vr.4:1.8 src/share/man/man4/vr.4:1.9 --- src/share/man/man4/vr.4:1.8 Mon Oct 19 18:41:09 2009 +++ src/share/man/man4/vr.4 Thu Dec 16 18:29:47 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: vr.4,v 1.8 2009/10/19 18:41:09 bouyer Exp $ +.\ $NetBSD: vr.4,v 1.9 2010/12/16 18:29:47 wiz Exp $ .\ .\ Copyright (c) 2000 Manuel Bouyer .\ All rights reserved. @@ -23,7 +23,7 @@ .\ INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\ -.Dd December 23, 2003 +.Dd December 16, 2010 .Dt VR 4 .Os .Sh NAME @@ -32,7 +32,8 @@ .Sh SYNOPSIS .Cd vr* at pci? dev ? function ? .Pp -Configuration of PHYs are necessary. See +Configuration of PHYs are necessary. +See .Xr mii 4 . .Sh DESCRIPTION The @@ -51,10 +52,12 @@ .Xr ifconfig 8 using the standard .Xr ifmedia 4 -mechanism. Refer to those manual pages for more information. +mechanism. +Refer to those manual pages for more information. .Sh SEE ALSO .Xr ifmedia 4 , .Xr mii 4 , .Xr netintro 4 , .Xr pci 4 , +.Xr vlan 4 , .Xr ifconfig 8
CVS commit: src/include
Module Name:src Committed By: christos Date: Thu Dec 16 18:36:48 UTC 2010 Modified Files: src/include: time.h Log Message: Provide a re-entrant and thread-safe set of timezone API's that don't require locking and can operate on user-specified timezones as opposed to having to alter the environment to change a timezone. This work was presented to the tzcode folks and it was generally accepted, but there seems to be a lot of inertia. To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 src/include/time.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/include/time.h diff -u src/include/time.h:1.39 src/include/time.h:1.40 --- src/include/time.h:1.39 Wed May 13 22:37:36 2009 +++ src/include/time.h Thu Dec 16 13:36:47 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: time.h,v 1.39 2009/05/14 02:37:36 ginsbach Exp $ */ +/* $NetBSD: time.h,v 1.40 2010/12/16 18:36:47 christos Exp $ */ /* * Copyright (c) 1989, 1993 @@ -174,6 +174,9 @@ #endif #if defined(_NETBSD_SOURCE) + +typedef struct __state *timezone_t; + #ifndef __LIBC12_SOURCE__ time_t time2posix(time_t) __RENAME(__time2posix50); time_t posix2time(time_t) __RENAME(__posix2time50); @@ -181,10 +184,25 @@ time_t timeoff(struct tm *, long) __RENAME(__timeoff50); time_t timelocal(struct tm *) __RENAME(__timelocal50); struct tm *offtime(const time_t *, long) __RENAME(__offtime50); -#endif -#ifndef __LIBC12_SOURCE__ void tzsetwall(void) __RENAME(__tzsetwall50); -#endif + +struct tm *offtime_r(const time_t *, long, struct tm *) __RENAME(__offtime_r50); +struct tm *localtime_rz(const timezone_t, const time_t * __restrict, +struct tm * __restrict) __RENAME(__localtime_rz50); +char *ctime_rz(const timezone_t, const time_t *, char *) __RENAME(__ctime_rz50); +time_t mktime_z(const timezone_t, struct tm *) __RENAME(__mktime_z50); +time_t timelocal_z(const timezone_t, struct tm *) __RENAME(__timelocal_z50); +time_t time2posix_z(const timezone_t, time_t) __RENAME(__time2posix_z50); +time_t posix2time_z(const timezone_t, time_t) __RENAME(__posix2time_z50); +timezone_t tzalloc(const char *) __RENAME(__tzalloc50); +void tzfree(const timezone_t) __RENAME(__tzfree50); +const char *tzgetname(const timezone_t, int) __RENAME(__tzgetname50); +#endif + +size_t strftime_z(const timezone_t, char * __restrict, size_t, +const char * __restrict, const struct tm * __restrict) +__attribute__((__format__(__strftime__, 4, 0))); + #endif /* _NETBSD_SOURCE */ __END_DECLS
CVS commit: src/lib/libc
Module Name:src Committed By: christos Date: Thu Dec 16 18:38:07 UTC 2010 Modified Files: src/lib/libc: shlib_version src/lib/libc/compat/include: time.h src/lib/libc/include: namespace.h src/lib/libc/time: Makefile.inc ctime.3 localtime.c offtime.3 strftime.3 strftime.c time2posix.3 Log Message: Provide a re-entrant and thread-safe set of timezone API's that don't require locking and can operate on user-specified timezones as opposed to having to alter the environment to change a timezone. This work was presented to the tzcode folks and it was generally accepted, but there seems to be a lot of inertia. To generate a diff of this commit: cvs rdiff -u -r1.219 -r1.220 src/lib/libc/shlib_version cvs rdiff -u -r1.2 -r1.3 src/lib/libc/compat/include/time.h cvs rdiff -u -r1.145 -r1.146 src/lib/libc/include/namespace.h cvs rdiff -u -r1.13 -r1.14 src/lib/libc/time/Makefile.inc cvs rdiff -u -r1.35 -r1.36 src/lib/libc/time/ctime.3 cvs rdiff -u -r1.48 -r1.49 src/lib/libc/time/localtime.c cvs rdiff -u -r1.1 -r1.2 src/lib/libc/time/offtime.3 cvs rdiff -u -r1.26 -r1.27 src/lib/libc/time/strftime.3 cvs rdiff -u -r1.20 -r1.21 src/lib/libc/time/strftime.c cvs rdiff -u -r1.15 -r1.16 src/lib/libc/time/time2posix.3 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/shlib_version diff -u src/lib/libc/shlib_version:1.219 src/lib/libc/shlib_version:1.220 --- src/lib/libc/shlib_version:1.219 Fri Sep 24 05:21:53 2010 +++ src/lib/libc/shlib_version Thu Dec 16 13:38:06 2010 @@ -1,4 +1,4 @@ -# $NetBSD: shlib_version,v 1.219 2010/09/24 09:21:53 tnozaki Exp $ +# $NetBSD: shlib_version,v 1.220 2010/12/16 18:38:06 christos Exp $ # Remember to update distrib/sets/lists/base/shl.* when changing # # things we wish to do on next major version bump: @@ -31,4 +31,4 @@ # it's insufficient bitwidth to implement all ctype class. # see isblank's comment in ctype.h. major=12 -minor=174 +minor=175 Index: src/lib/libc/compat/include/time.h diff -u src/lib/libc/compat/include/time.h:1.2 src/lib/libc/compat/include/time.h:1.3 --- src/lib/libc/compat/include/time.h:1.2 Sat Jan 10 21:46:25 2009 +++ src/lib/libc/compat/include/time.h Thu Dec 16 13:38:06 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: time.h,v 1.2 2009/01/11 02:46:25 christos Exp $ */ +/* $NetBSD: time.h,v 1.3 2010/12/16 18:38:06 christos Exp $ */ /* * Copyright (c) 1989, 1993 @@ -86,9 +86,21 @@ struct tm *gmtime_r(const int32_t * __restrict, struct tm * __restrict); struct tm *localtime_r(const int32_t * __restrict, struct tm * __restrict); struct tm *offtime(const int32_t *, long); +struct tm *offtime_r(const int32_t *, long, struct tm *); int32_t timelocal(struct tm *); int32_t timegm(struct tm *); int32_t timeoff(struct tm *, long); int32_t time2posix(int32_t); int32_t posix2time(int32_t); +struct tm *localtime_rz(const timezone_t, const int32_t * __restrict, +struct tm * __restrict); +char *ctime_rz(const timezone_t, const int32_t *, char *); +int32_t mktime_z(const timezone_t, struct tm *); +int32_t timelocal_z(const timezone_t, struct tm *); +int32_t time2posix_z(const timezone_t, int32_t); +int32_t posix2time_z(const timezone_t, int32_t); +timezone_t tzalloc(const char *); +void tzfree(const timezone_t); +const char *tzgetname(const timezone_t, int); + #endif /* !_COMPAT_TIME_H_ */ Index: src/lib/libc/include/namespace.h diff -u src/lib/libc/include/namespace.h:1.145 src/lib/libc/include/namespace.h:1.146 --- src/lib/libc/include/namespace.h:1.145 Wed Nov 17 08:19:32 2010 +++ src/lib/libc/include/namespace.h Thu Dec 16 13:38:06 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: namespace.h,v 1.145 2010/11/17 13:19:32 tron Exp $ */ +/* $NetBSD: namespace.h,v 1.146 2010/12/16 18:38:06 christos Exp $ */ /*- * Copyright (c) 1997-2004 The NetBSD Foundation, Inc. @@ -221,6 +221,7 @@ #define csetexpandtc _csetexpandtc #define ctermid _ctermid #define ctime_r _ctime_r +#define ctime_rz _ctime_rz #define daemon _daemon #define dbopen _dbopen #define devname _devname @@ -432,12 +433,14 @@ #define llabs _llabs #define lldiv _lldiv #define localtime_r _localtime_r +#define localtime_rz _localtime_rz #define lockf _lockf #define lrand48 _lrand48 #define lseek _lseek #define mergesort _mergesort #define mi_vector_hash _mi_vector_hash #define mkstemp _mkstemp +#define mktime_z _mktime_z #define mmap _mmap #define mpool_close _mpool_close #define mpool_filter _mpool_filter @@ -474,6 +477,7 @@ #define pollts _pollts #define popen _popen #define posix2time _posix2time +#define posix2time_z _posix2time_z #define pread _pread #define pselect _pselect #define psignal _psignal @@ -579,6 +583,7 @@ #define strcasecmp _strcasecmp #define strdup _strdup #define stresep _stresep +#define strftime_z _strftime_z #define strndup _strndup #define strncasecmp
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: christos Date: Thu Dec 16 18:42:51 UTC 2010 Modified Files: src/distrib/sets/lists/base: ad.mips64eb ad.mips64el md.amd64 md.sparc64 shl.mi src/distrib/sets/lists/comp: md.amd64 md.sparc64 mi shl.mi Log Message: sets for tzcode enhancements To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 src/distrib/sets/lists/base/ad.mips64eb cvs rdiff -u -r1.31 -r1.32 src/distrib/sets/lists/base/ad.mips64el cvs rdiff -u -r1.105 -r1.106 src/distrib/sets/lists/base/md.amd64 cvs rdiff -u -r1.99 -r1.100 src/distrib/sets/lists/base/md.sparc64 cvs rdiff -u -r1.565 -r1.566 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.87 -r1.88 src/distrib/sets/lists/comp/md.amd64 cvs rdiff -u -r1.75 -r1.76 src/distrib/sets/lists/comp/md.sparc64 cvs rdiff -u -r1.1548 -r1.1549 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.147 -r1.148 src/distrib/sets/lists/comp/shl.mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/ad.mips64eb diff -u src/distrib/sets/lists/base/ad.mips64eb:1.33 src/distrib/sets/lists/base/ad.mips64eb:1.34 --- src/distrib/sets/lists/base/ad.mips64eb:1.33 Sun Dec 12 11:27:24 2010 +++ src/distrib/sets/lists/base/ad.mips64eb Thu Dec 16 13:42:48 2010 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips64eb,v 1.33 2010/12/12 16:27:24 adam Exp $ +# $NetBSD: ad.mips64eb,v 1.34 2010/12/16 18:42:48 christos Exp $ ./libexec/ld.elf_so-64base-compat-shlib compat,pic ./libexec/ld.elf_so-o32base-sysutil-bin compat,pic ./usr/lib/64 base-compat-lib @@ -66,7 +66,7 @@ ./usr/lib/64/libbz2.so.1 base-compat-shlib compat,pic ./usr/lib/64/libbz2.so.1.1 base-compat-shlib compat,pic ./usr/lib/64/libc.so.12base-compat-shlib compat,pic -./usr/lib/64/libc.so.12.174 base-compat-shlib compat,pic +./usr/lib/64/libc.so.12.175 base-compat-shlib compat,pic ./usr/lib/64/libcom_err.so.6 base-compat-shlib compat,pic,kerberos ./usr/lib/64/libcom_err.so.6.0 base-compat-shlib compat,pic,kerberos ./usr/lib/64/libcrypt.so.1 base-compat-shlib compat,pic @@ -319,7 +319,7 @@ ./usr/lib/o32/libbz2.so.1 base-compat-shlib compat,pic ./usr/lib/o32/libbz2.so.1.1 base-compat-shlib compat,pic ./usr/lib/o32/libc.so.12 base-compat-shlib compat,pic -./usr/lib/o32/libc.so.12.174 base-compat-shlib compat,pic +./usr/lib/o32/libc.so.12.175 base-compat-shlib compat,pic ./usr/lib/o32/libcom_err.so.6 base-compat-shlib compat,pic,kerberos ./usr/lib/o32/libcom_err.so.6.0 base-compat-shlib compat,pic,kerberos ./usr/lib/o32/libcrypt.so.1 base-compat-shlib compat,pic Index: src/distrib/sets/lists/base/ad.mips64el diff -u src/distrib/sets/lists/base/ad.mips64el:1.31 src/distrib/sets/lists/base/ad.mips64el:1.32 --- src/distrib/sets/lists/base/ad.mips64el:1.31 Sun Dec 12 11:27:25 2010 +++ src/distrib/sets/lists/base/ad.mips64el Thu Dec 16 13:42:48 2010 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips64el,v 1.31 2010/12/12 16:27:25 adam Exp $ +# $NetBSD: ad.mips64el,v 1.32 2010/12/16 18:42:48 christos Exp $ ./libexec/ld.elf_so-64base-compat-shlib compat,pic ./libexec/ld.elf_so-o32base-sysutil-bin compat,pic ./usr/lib/64 base-compat-lib @@ -66,7 +66,7 @@ ./usr/lib/64/libbz2.so.1 base-compat-shlib compat,pic ./usr/lib/64/libbz2.so.1.1 base-compat-shlib compat,pic ./usr/lib/64/libc.so.12base-compat-shlib compat,pic -./usr/lib/64/libc.so.12.174 base-compat-shlib compat,pic +./usr/lib/64/libc.so.12.175 base-compat-shlib compat,pic ./usr/lib/64/libcom_err.so.6 base-compat-shlib compat,pic,kerberos ./usr/lib/64/libcom_err.so.6.0 base-compat-shlib compat,pic,kerberos ./usr/lib/64/libcrypt.so.1 base-compat-shlib compat,pic @@ -319,7 +319,7 @@ ./usr/lib/o32/libbz2.so.1 base-compat-shlib compat,pic ./usr/lib/o32/libbz2.so.1.1 base-compat-shlib compat,pic ./usr/lib/o32/libc.so.12 base-compat-shlib compat,pic -./usr/lib/o32/libc.so.12.174 base-compat-shlib compat,pic +./usr/lib/o32/libc.so.12.175 base-compat-shlib compat,pic ./usr/lib/o32/libcom_err.so.6 base-compat-shlib compat,pic,kerberos ./usr/lib/o32/libcom_err.so.6.0 base-compat-shlib compat,pic,kerberos ./usr/lib/o32/libcrypt.so.1 base-compat-shlib compat,pic Index: src/distrib/sets/lists/base/md.amd64 diff -u src/distrib/sets/lists/base/md.amd64:1.105 src/distrib/sets/lists/base/md.amd64:1.106 --- src/distrib/sets/lists/base/md.amd64:1.105 Sun Dec 12 11:27:25 2010 +++ src/distrib/sets/lists/base/md.amd64 Thu Dec 16 13:42:49 2010 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.105 2010/12/12 16:27:25 adam Exp $ +# $NetBSD: md.amd64,v 1.106 2010/12/16 18:42:49 christos Exp $ ./dev/lms0 base-obsolete obsolete ./dev/mms0 base-obsolete obsolete ./libexec/ld.elf_so-i386 base-sys-shlib compat,pic @@ -69,7 +69,7 @@ ./usr/lib/i386/libbz2.so.1 base-compat-shlib compat,pic ./usr/lib/i386/libbz2.so.1.1 base-compat-shlib compat,pic
CVS commit: src/doc
Module Name:src Committed By: christos Date: Thu Dec 16 18:44:29 UTC 2010 Modified Files: src/doc: CHANGES Log Message: mention new tzcode To generate a diff of this commit: cvs rdiff -u -r1.1473 -r1.1474 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1473 src/doc/CHANGES:1.1474 --- src/doc/CHANGES:1.1473 Sun Dec 12 11:13:37 2010 +++ src/doc/CHANGES Thu Dec 16 13:44:29 2010 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1473 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1474 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -810,3 +810,7 @@ the command name, like pkill(1) and pgrep(1). [mrg 20101205] bnx(4): Add support for Broadcom BCM5709S (SerDes) chip. [jym 20101210] openldap: Import 2.4.23. [adam 20101212] + libc: Provide a re-entrant and thread-safe set of timezone API's that + don't require locking and can operate on user-specified + timezones as opposed to having to alter the environment + to change a timezone. [christos 20101216]
CVS commit: src/share/man/man7
Module Name:src Committed By: jruoho Date: Thu Dec 16 18:45:38 UTC 2010 Modified Files: src/share/man/man7: operator.7 Log Message: Xref iso646(3). To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/share/man/man7/operator.7 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/man7/operator.7 diff -u src/share/man/man7/operator.7:1.7 src/share/man/man7/operator.7:1.8 --- src/share/man/man7/operator.7:1.7 Thu Apr 9 03:47:16 2009 +++ src/share/man/man7/operator.7 Thu Dec 16 18:45:38 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: operator.7,v 1.7 2009/04/09 03:47:16 joerg Exp $ +.\ $NetBSD: operator.7,v 1.8 2010/12/16 18:45:38 jruoho Exp $ .\ .\ Copyright (c) 1989, 1990, 1993 .\ The Regents of the University of California. All rights reserved. @@ -36,7 +36,8 @@ .Nm operator .Nd C operator precedence and associativity .Sh DESCRIPTION -.Bl -column ! ~ ++ -- - (type) * \*[Am] sizeof Associativity +.Bl -column \ +! ~ ++ -- - (type) * \*[Am] sizeof Associativity -offset indent .It Sy Operator Associativity .It \() [] -\*[Gt] . left to right .It ! ~ ++ -- - (type) * \*[Am] sizeof right to left @@ -54,6 +55,8 @@ .It \= += -= etc. right to left .It \, left to right .El +.Sh SEE ALSO +.Xr iso646 3 .Sh FILES .Bl -tag -width /usr/share/misc/operator -compact .It Pa /usr/share/misc/operator
CVS commit: src/share/man/man3
Module Name:src Committed By: pgoyette Date: Thu Dec 16 18:51:39 UTC 2010 Modified Files: src/share/man/man3: iso646.3 Log Message: Fix typo - or_eq is |= and not != To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/share/man/man3/iso646.3 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/man3/iso646.3 diff -u src/share/man/man3/iso646.3:1.2 src/share/man/man3/iso646.3:1.3 --- src/share/man/man3/iso646.3:1.2 Fri May 14 02:45:39 2010 +++ src/share/man/man3/iso646.3 Thu Dec 16 18:51:39 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: iso646.3,v 1.2 2010/05/14 02:45:39 joerg Exp $ +.\ $NetBSD: iso646.3,v 1.3 2010/12/16 18:51:39 pgoyette Exp $ .\ .\ Copyright (c) 2010 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -49,7 +49,7 @@ .It Li 6. Ta Em not Ta \! .It Li 7. Ta Em not_eq Ta \*[Ne] .It Li 8. Ta Em or Ta \*[Ba]\*[Ba] -.It Li 9. Ta Em or_eq Ta \!\= +.It Li 9. Ta Em or_eq Ta \[Ba]\= .It Li 10. Ta Em xor Ta \^ .It Li 11. Ta Em xor_eq Ta \^\= .El
CVS commit: src/share/man/man7
Module Name:src Committed By: wiz Date: Thu Dec 16 19:13:27 UTC 2010 Modified Files: src/share/man/man7: operator.7 Log Message: Sort sections To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/share/man/man7/operator.7 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/man7/operator.7 diff -u src/share/man/man7/operator.7:1.8 src/share/man/man7/operator.7:1.9 --- src/share/man/man7/operator.7:1.8 Thu Dec 16 18:45:38 2010 +++ src/share/man/man7/operator.7 Thu Dec 16 19:13:26 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: operator.7,v 1.8 2010/12/16 18:45:38 jruoho Exp $ +.\ $NetBSD: operator.7,v 1.9 2010/12/16 19:13:26 wiz Exp $ .\ .\ Copyright (c) 1989, 1990, 1993 .\ The Regents of the University of California. All rights reserved. @@ -55,9 +55,9 @@ .It \= += -= etc. right to left .It \, left to right .El -.Sh SEE ALSO -.Xr iso646 3 .Sh FILES .Bl -tag -width /usr/share/misc/operator -compact .It Pa /usr/share/misc/operator .El +.Sh SEE ALSO +.Xr iso646 3
CVS commit: src/libexec/ld.elf_so
Module Name:src Committed By: wiz Date: Thu Dec 16 19:25:41 UTC 2010 Modified Files: src/libexec/ld.elf_so: ld.elf_so.1 Log Message: Note that $ORIGIN kernel support (in kern/kern_exec.c) is currently disabled. Info from sk...@. Bump date. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/libexec/ld.elf_so/ld.elf_so.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/libexec/ld.elf_so/ld.elf_so.1 diff -u src/libexec/ld.elf_so/ld.elf_so.1:1.12 src/libexec/ld.elf_so/ld.elf_so.1:1.13 --- src/libexec/ld.elf_so/ld.elf_so.1:1.12 Sun May 25 19:48:35 2008 +++ src/libexec/ld.elf_so/ld.elf_so.1 Thu Dec 16 19:25:41 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: ld.elf_so.1,v 1.12 2008/05/25 19:48:35 wiz Exp $ +.\ $NetBSD: ld.elf_so.1,v 1.13 2010/12/16 19:25:41 wiz Exp $ .\ .\ Copyright (c) 2001 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -27,7 +27,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd May 18, 2007 +.Dd December 16, 2010 .Dt LD.ELF_SO 1 .Os .Sh NAME @@ -108,6 +108,9 @@ Currently unimplemented. .It $ORIGIN The directory of the main object. +Implemented in +.Nm +but the kernel support is currently disabled. .It $OSNAME The value of the .Dv kern.ostype
CVS commit: src/share/man/man3
Module Name:src Committed By: pgoyette Date: Thu Dec 16 19:30:44 UTC 2010 Modified Files: src/share/man/man3: iso646.3 Log Message: Get this right (don't need to \ escape the [Ba]) and update the date To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/share/man/man3/iso646.3 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/man3/iso646.3 diff -u src/share/man/man3/iso646.3:1.3 src/share/man/man3/iso646.3:1.4 --- src/share/man/man3/iso646.3:1.3 Thu Dec 16 18:51:39 2010 +++ src/share/man/man3/iso646.3 Thu Dec 16 19:30:44 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: iso646.3,v 1.3 2010/12/16 18:51:39 pgoyette Exp $ +.\ $NetBSD: iso646.3,v 1.4 2010/12/16 19:30:44 pgoyette Exp $ .\ .\ Copyright (c) 2010 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -27,7 +27,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd March 21, 2010 +.Dd December 16, 2010 .Dt ISO646 3 .Os .Sh NAME @@ -49,7 +49,7 @@ .It Li 6. Ta Em not Ta \! .It Li 7. Ta Em not_eq Ta \*[Ne] .It Li 8. Ta Em or Ta \*[Ba]\*[Ba] -.It Li 9. Ta Em or_eq Ta \[Ba]\= +.It Li 9. Ta Em or_eq Ta \[Ba]\= .It Li 10. Ta Em xor Ta \^ .It Li 11. Ta Em xor_eq Ta \^\= .El
CVS commit: src/share/man/man3
Module Name:src Committed By: pgoyette Date: Thu Dec 16 19:31:47 UTC 2010 Modified Files: src/share/man/man3: iso646.3 Log Message: Darn - can't tytpe today! To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/share/man/man3/iso646.3 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/man3/iso646.3 diff -u src/share/man/man3/iso646.3:1.4 src/share/man/man3/iso646.3:1.5 --- src/share/man/man3/iso646.3:1.4 Thu Dec 16 19:30:44 2010 +++ src/share/man/man3/iso646.3 Thu Dec 16 19:31:47 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: iso646.3,v 1.4 2010/12/16 19:30:44 pgoyette Exp $ +.\ $NetBSD: iso646.3,v 1.5 2010/12/16 19:31:47 pgoyette Exp $ .\ .\ Copyright (c) 2010 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -49,7 +49,7 @@ .It Li 6. Ta Em not Ta \! .It Li 7. Ta Em not_eq Ta \*[Ne] .It Li 8. Ta Em or Ta \*[Ba]\*[Ba] -.It Li 9. Ta Em or_eq Ta \[Ba]\= +.It Li 9. Ta Em or_eq Ta \*[Ba]\= .It Li 10. Ta Em xor Ta \^ .It Li 11. Ta Em xor_eq Ta \^\= .El
CVS commit: src/libexec/ld.elf_so
Module Name:src
Committed By: skrll
Date: Thu Dec 16 19:35:38 UTC 2010
Modified Files:
src/libexec/ld.elf_so: load.c
Log Message:
Remove incorrect comment.
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/libexec/ld.elf_so/load.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/ld.elf_so/load.c
diff -u src/libexec/ld.elf_so/load.c:1.38 src/libexec/ld.elf_so/load.c:1.39
--- src/libexec/ld.elf_so/load.c:1.38 Sat Oct 16 10:27:07 2010
+++ src/libexec/ld.elf_so/load.c Thu Dec 16 19:35:38 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: load.c,v 1.38 2010/10/16 10:27:07 skrll Exp $ */
+/* $NetBSD: load.c,v 1.39 2010/12/16 19:35:38 skrll Exp $ */
/*
* Copyright 1996 John D. Polstra.
@@ -40,7 +40,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: load.c,v 1.38 2010/10/16 10:27:07 skrll Exp $);
+__RCSID($NetBSD: load.c,v 1.39 2010/12/16 19:35:38 skrll Exp $);
#endif /* not lint */
#include err.h
@@ -236,8 +236,7 @@
val.s, name);
break;
}
- /* XXX: This can mess up debuggers, cause we lie about
- * what we loaded in the needed objects */
+
for (j = 0; j RTLD_MAX_LIBRARY
x-entry[i].library[j] != NULL; j++) {
o = _rtld_load_library(x-entry[i].library[j], obj,
CVS commit: src/libexec/ld.elf_so
Module Name:src
Committed By: skrll
Date: Thu Dec 16 19:59:40 UTC 2010
Modified Files:
src/libexec/ld.elf_so: load.c rtld.c
Log Message:
s/rdbg/dbg/ in a few places.
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/libexec/ld.elf_so/load.c
cvs rdiff -u -r1.132 -r1.133 src/libexec/ld.elf_so/rtld.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/ld.elf_so/load.c
diff -u src/libexec/ld.elf_so/load.c:1.39 src/libexec/ld.elf_so/load.c:1.40
--- src/libexec/ld.elf_so/load.c:1.39 Thu Dec 16 19:35:38 2010
+++ src/libexec/ld.elf_so/load.c Thu Dec 16 19:59:39 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: load.c,v 1.39 2010/12/16 19:35:38 skrll Exp $ */
+/* $NetBSD: load.c,v 1.40 2010/12/16 19:59:39 skrll Exp $ */
/*
* Copyright 1996 John D. Polstra.
@@ -40,7 +40,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: load.c,v 1.39 2010/12/16 19:35:38 skrll Exp $);
+__RCSID($NetBSD: load.c,v 1.40 2010/12/16 19:59:39 skrll Exp $);
#endif /* not lint */
#include err.h
@@ -170,12 +170,12 @@
#ifdef RTLD_LOADER
if (mode RTLD_MAIN !obj-mainref) {
obj-mainref = 1;
- rdbg((adding %p (%s) to _rtld_list_main, obj, obj-path));
+ dbg((adding %p (%s) to _rtld_list_main, obj, obj-path));
_rtld_objlist_push_tail(_rtld_list_main, obj);
}
if (mode RTLD_GLOBAL !obj-globalref) {
obj-globalref = 1;
- rdbg((adding %p (%s) to _rtld_list_global, obj, obj-path));
+ dbg((adding %p (%s) to _rtld_list_global, obj, obj-path));
_rtld_objlist_push_tail(_rtld_list_global, obj);
}
#endif
Index: src/libexec/ld.elf_so/rtld.c
diff -u src/libexec/ld.elf_so/rtld.c:1.132 src/libexec/ld.elf_so/rtld.c:1.133
--- src/libexec/ld.elf_so/rtld.c:1.132 Fri Oct 29 15:08:17 2010
+++ src/libexec/ld.elf_so/rtld.c Thu Dec 16 19:59:39 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rtld.c,v 1.132 2010/10/29 15:08:17 christos Exp $ */
+/* $NetBSD: rtld.c,v 1.133 2010/12/16 19:59:39 skrll Exp $ */
/*
* Copyright 1996 John D. Polstra.
@@ -40,7 +40,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: rtld.c,v 1.132 2010/10/29 15:08:17 christos Exp $);
+__RCSID($NetBSD: rtld.c,v 1.133 2010/12/16 19:59:39 skrll Exp $);
#endif /* not lint */
#include err.h
@@ -660,7 +660,7 @@
if (!obj-mainref) {
if (_rtld_objlist_find(obj-dldags, root))
return;
- rdbg((add %p (%s) to %p (%s) DAG, obj, obj-path, root,
+ dbg((add %p (%s) to %p (%s) DAG, obj, obj-path, root,
root-path));
_rtld_objlist_push_tail(obj-dldags, root);
_rtld_objlist_push_tail(root-dagmembers, obj);
CVS commit: src/lib/libc/time
Module Name:src
Committed By: christos
Date: Thu Dec 16 21:53:56 UTC 2010
Modified Files:
src/lib/libc/time: Makefile.inc
Log Message:
add the 3 missing man pages.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/lib/libc/time/Makefile.inc
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/time/Makefile.inc
diff -u src/lib/libc/time/Makefile.inc:1.14 src/lib/libc/time/Makefile.inc:1.15
--- src/lib/libc/time/Makefile.inc:1.14 Thu Dec 16 13:38:07 2010
+++ src/lib/libc/time/Makefile.inc Thu Dec 16 16:53:56 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.14 2010/12/16 18:38:07 christos Exp $
+# $NetBSD: Makefile.inc,v 1.15 2010/12/16 21:53:56 christos Exp $
.PATH: ${.CURDIR}/time
@@ -20,6 +20,9 @@
ctime.3 localtime_rz.3 \
ctime.3 mktime.3 \
ctime.3 mktime_z.3 \
+ ctime.3 tzalloc.3 \
+ ctime.3 tzfree.3 \
+ ctime.3 tzgettime.3 \
getdate.3 getdate_err.3 \
offtime.3 offtime_r.3 \
offtime.3 timeoff.3 \
CVS commit: src/lib/libc/time
Module Name:src
Committed By: christos
Date: Thu Dec 16 22:18:37 UTC 2010
Modified Files:
src/lib/libc/time: Makefile.inc
Log Message:
it is getname not time.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/lib/libc/time/Makefile.inc
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/time/Makefile.inc
diff -u src/lib/libc/time/Makefile.inc:1.15 src/lib/libc/time/Makefile.inc:1.16
--- src/lib/libc/time/Makefile.inc:1.15 Thu Dec 16 16:53:56 2010
+++ src/lib/libc/time/Makefile.inc Thu Dec 16 17:18:37 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.15 2010/12/16 21:53:56 christos Exp $
+# $NetBSD: Makefile.inc,v 1.16 2010/12/16 22:18:37 christos Exp $
.PATH: ${.CURDIR}/time
@@ -22,7 +22,7 @@
ctime.3 mktime_z.3 \
ctime.3 tzalloc.3 \
ctime.3 tzfree.3 \
- ctime.3 tzgettime.3 \
+ ctime.3 tzgetname.3 \
getdate.3 getdate_err.3 \
offtime.3 offtime_r.3 \
offtime.3 timeoff.3 \
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: christos Date: Thu Dec 16 22:19:38 UTC 2010 Modified Files: src/distrib/sets/lists/comp: mi Log Message: add missing files. To generate a diff of this commit: cvs rdiff -u -r1.1549 -r1.1550 src/distrib/sets/lists/comp/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1549 src/distrib/sets/lists/comp/mi:1.1550 --- src/distrib/sets/lists/comp/mi:1.1549 Thu Dec 16 13:42:49 2010 +++ src/distrib/sets/lists/comp/mi Thu Dec 16 17:19:37 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1549 2010/12/16 18:42:49 christos Exp $ +# $NetBSD: mi,v 1.1550 2010/12/16 22:19:37 christos Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -7315,6 +7315,7 @@ ./usr/share/man/cat3/mkstemp.0 comp-c-catman .cat ./usr/share/man/cat3/mktemp.0 comp-c-catman .cat ./usr/share/man/cat3/mktime.0 comp-c-catman .cat +./usr/share/man/cat3/mktime_z.0 comp-c-catman .cat ./usr/share/man/cat3/modf.0 comp-c-catman .cat ./usr/share/man/cat3/moncontrol.0 comp-c-catman .cat ./usr/share/man/cat3/monstartup.0 comp-c-catman .cat @@ -13304,6 +13305,7 @@ ./usr/share/man/html3/mkstemp.html comp-c-htmlman html ./usr/share/man/html3/mktemp.html comp-c-htmlman html ./usr/share/man/html3/mktime.html comp-c-htmlman html +./usr/share/man/html3/mktime_Z.html comp-c-htmlman html ./usr/share/man/html3/modf.html comp-c-htmlman html ./usr/share/man/html3/moncontrol.html comp-c-htmlman html ./usr/share/man/html3/monstartup.html comp-c-htmlman html @@ -14255,6 +14257,7 @@ ./usr/share/man/html3/strerror_r.html comp-c-htmlman html ./usr/share/man/html3/stresep.html comp-c-htmlman html ./usr/share/man/html3/strfmon.html comp-c-htmlman html +./usr/share/man/html3/strftime.html comp-c-htmlman html ./usr/share/man/html3/strftime_z.html comp-c-htmlman html ./usr/share/man/html3/string.html comp-c-htmlman html ./usr/share/man/html3/string_to_flags.html comp-c-htmlman html
CVS commit: src/libexec/ld.elf_so
Module Name:src
Committed By: joerg
Date: Thu Dec 16 22:47:28 UTC 2010
Modified Files:
src/libexec/ld.elf_so: Makefile rtld.c
Removed Files:
src/libexec/ld.elf_so: xenv.c
Log Message:
Don't use normal environment handling functions from libc, but iterate
once over the array and clean out entries as needed.
To generate a diff of this commit:
cvs rdiff -u -r1.99 -r1.100 src/libexec/ld.elf_so/Makefile
cvs rdiff -u -r1.133 -r1.134 src/libexec/ld.elf_so/rtld.c
cvs rdiff -u -r1.2 -r0 src/libexec/ld.elf_so/xenv.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/ld.elf_so/Makefile
diff -u src/libexec/ld.elf_so/Makefile:1.99 src/libexec/ld.elf_so/Makefile:1.100
--- src/libexec/ld.elf_so/Makefile:1.99 Sun Dec 5 00:56:06 2010
+++ src/libexec/ld.elf_so/Makefile Thu Dec 16 22:47:27 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.99 2010/12/05 00:56:06 joerg Exp $
+# $NetBSD: Makefile,v 1.100 2010/12/16 22:47:27 joerg Exp $
#
# NOTE: when changing ld.so, ensure that ldd still compiles.
#
@@ -58,7 +58,7 @@
CLIBOBJ!= cd ${NETBSDSRCDIR}/lib/libc ${PRINTOBJDIR}
-SRCS+= rtld.c reloc.c symbol.c xenv.c xmalloc.c xprintf.c debug.c \
+SRCS+= rtld.c reloc.c symbol.c xmalloc.c xprintf.c debug.c \
map_object.c load.c search.c headers.c paths.c expand.c
.if ${USE_FORT} == yes
Index: src/libexec/ld.elf_so/rtld.c
diff -u src/libexec/ld.elf_so/rtld.c:1.133 src/libexec/ld.elf_so/rtld.c:1.134
--- src/libexec/ld.elf_so/rtld.c:1.133 Thu Dec 16 19:59:39 2010
+++ src/libexec/ld.elf_so/rtld.c Thu Dec 16 22:47:27 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rtld.c,v 1.133 2010/12/16 19:59:39 skrll Exp $ */
+/* $NetBSD: rtld.c,v 1.134 2010/12/16 22:47:27 joerg Exp $ */
/*
* Copyright 1996 John D. Polstra.
@@ -40,7 +40,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: rtld.c,v 1.133 2010/12/16 19:59:39 skrll Exp $);
+__RCSID($NetBSD: rtld.c,v 1.134 2010/12/16 22:47:27 joerg Exp $);
#endif /* not lint */
#include err.h
@@ -312,20 +312,21 @@
*pAUX_phent, *pAUX_phnum, *pAUX_euid, *pAUX_egid,
*pAUX_ruid, *pAUX_rgid;
const AuxInfo *pAUX_pagesz;
- char **env;
+ char **env, **oenvp;
const AuxInfo *aux;
const AuxInfo *auxp;
Elf_Addr *const osp = sp;
boolbind_now = 0;
- const char *ld_bind_now;
+ const char *ld_bind_now, *ld_preload, *ld_library_path;
const char**argv;
const char *execname;
long argc;
const char **real___progname;
const Obj_Entry **real___mainprog_obj;
char ***real_environ;
-#if defined(RTLD_DEBUG)
+#ifdef DEBUG
int i = 0;
+ const char *ld_debug;
#endif
/*
@@ -428,24 +429,68 @@
((pAUX_egid ? (gid_t)pAUX_egid-a_v : getegid()) ==
(pAUX_rgid ? (gid_t)pAUX_rgid-a_v : getgid()));
- ld_bind_now = getenv(LD_BIND_NOW);
+#ifdef DEBUG
+ ld_debug = NULL;
+#endif
+ ld_bind_now = NULL;
+ ld_library_path = NULL;
+ ld_preload = NULL;
+ /*
+ * Inline avoid using normal getenv/unsetenv here as the libc
+ * code is quite a bit more complicated.
+ */
+ for (oenvp = env; *env != NULL; ++env) {
+ static const char bind_var[] = LD_BIND_NOW=;
+ static const char debug_var[] = LD_DEBUG=;
+ static const char path_var[] = LD_LIBRARY_PATH=;
+ static const char preload_var[] = LD_PRELOAD=;
+#define LEN(x) (sizeof(x) - 1)
+
+ if ((*env)[0] != 'L' || (*env)[1] != 'D') {
+ /*
+ * Special case to skip most entries without
+ * the more expensive calls to strncmp.
+ */
+ *oenvp++ = *env;
+ } else if (strncmp(*env, debug_var, LEN(debug_var)) == 0) {
+ if (_rtld_trust) {
+#ifdef DEBUG
+ld_debug = *env + LEN(debug_var);
+#endif
+*oenvp++ = *env;
+ }
+ } else if (strncmp(*env, bind_var, LEN(bind_var)) == 0) {
+ ld_bind_now = *env + LEN(bind_var);
+ } else if (strncmp(*env, path_var, LEN(path_var)) == 0) {
+ if (_rtld_trust) {
+ld_library_path = *env + LEN(path_var);
+*oenvp++ = *env;
+ }
+ } else if (strncmp(*env, preload_var, LEN(preload_var)) == 0) {
+ if (_rtld_trust) {
+ld_preload = *env + LEN(preload_var);
+*oenvp++ = *env;
+ }
+ } else {
+ *oenvp++ = *env;
+ }
+#undef LEN
+ }
+ *oenvp++ = NULL;
+
if (ld_bind_now != NULL *ld_bind_now != '\0')
bind_now = true;
if (_rtld_trust) {
#ifdef DEBUG
- const char *ld_debug = getenv(LD_DEBUG);
#ifdef RTLD_DEBUG
debug = 0;
#endif
if (ld_debug != NULL *ld_debug != '\0')
debug = 1;
#endif
- _rtld_add_paths(execname, _rtld_paths,
- getenv(LD_LIBRARY_PATH));
+ _rtld_add_paths(execname, _rtld_paths, ld_library_path);
} else {
execname = NULL;
- if (xunsetenv(LD_DEBUG) || xunsetenv(LD_LIBRARY_PATH))
- _rtld_die();
}
_rtld_process_hints(execname, _rtld_paths, _rtld_xforms,
_PATH_LD_HINTS);
@@ -512,17 +557,15 @@
_rtld_objmain-mainref = 1;
_rtld_objlist_push_tail(_rtld_list_main, _rtld_objmain);
- if (_rtld_trust) {
+ if
CVS commit: src
Module Name:src
Committed By: joerg
Date: Thu Dec 16 22:52:32 UTC 2010
Modified Files:
src/lib/libc/gen: errlist.awk
src/libexec/ld.elf_so: Makefile xprintf.c
Log Message:
Replace use of errlist with a single concatenated version and an offset
array. This requires less storage and avoids one runtime relocation per
errno value.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/lib/libc/gen/errlist.awk
cvs rdiff -u -r1.100 -r1.101 src/libexec/ld.elf_so/Makefile
cvs rdiff -u -r1.20 -r1.21 src/libexec/ld.elf_so/xprintf.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/gen/errlist.awk
diff -u src/lib/libc/gen/errlist.awk:1.3 src/lib/libc/gen/errlist.awk:1.4
--- src/lib/libc/gen/errlist.awk:1.3 Sun Dec 12 22:34:44 2010
+++ src/lib/libc/gen/errlist.awk Thu Dec 16 22:52:32 2010
@@ -1,5 +1,5 @@
#! /usr/bin/awk -f
-# $NetBSD: errlist.awk,v 1.3 2010/12/12 22:34:44 joerg Exp $
+# $NetBSD: errlist.awk,v 1.4 2010/12/16 22:52:32 joerg Exp $
#
# Copyright (c) 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -37,6 +37,8 @@
#
function tabs(desc) {
l = length(desc) + 3;
+ if (concat)
+ l++
if (l 16)
return \t\t\t\t;
else if (l 24)
@@ -50,14 +52,25 @@
}
function perror(name, number, desc)
{
- printf(\t\%s\,%s/* %d - %s */\n, desc, tabs(desc), number, name);
+ if (!concat) {
+ printf(\t\%s\,%s/* %d - %s */\n, desc, tabs(desc), number, name);
+ } else {
+ offsets[number] = offset;
+ offset += length(desc) + 1;
+ printf(\t\%s\\0\%s/* %d - %s */\n, desc, tabs(desc), number, name);
+ }
}
BEGIN {
printf(/* Automatically generated file; do not edit */\n);
printf(#include sys/cdefs.h\n);
- printf(__RCSID(\$NetBSD: errlist.awk,v 1.3 2010/12/12 22:34:44 joerg Exp $\);\n);
+ printf(__RCSID(\$NetBSD: errlist.awk,v 1.4 2010/12/16 22:52:32 joerg Exp $\);\n);
printf(#include errno.h\n);
- printf(static const char *const errlist[] = {\n);
+ if (!concat) {
+ printf(static const char *const errlist[] = {\n);
+ } else {
+ printf(static const char concat_errlist[] = {\n);
+ offset = 0;
+ }
perror(ENOERROR, 0, Undefined error: 0);
errno = 1;
}
@@ -81,6 +94,20 @@
}
END {
printf(};\n\n);
- printf(const int sys_nerr = sizeof(errlist) / sizeof(errlist[0]);\n);
- printf(const char * const *sys_errlist = errlist;\n);
+ if (!concat) {
+ printf(const int sys_nerr = sizeof(errlist) / sizeof(errlist[0]);\n);
+ printf(const char * const *sys_errlist = errlist;\n);
+ } else {
+ printf(static const int concat_nerr = %d;\n, errno);
+ printf(static const unsigned short concat_offset[] = {\n);
+ offsets[errno++] = offset;
+ for (j = 0; j errno; j++) {
+ printf(\t%d,\n, offsets[j]);
+ }
+ printf(};\n);
+ if (offset 65535) {
+ printf(Total errlist size doesn't fit into 16bit\n) /dev/stderr;
+ exit(1);
+ }
+ }
}
Index: src/libexec/ld.elf_so/Makefile
diff -u src/libexec/ld.elf_so/Makefile:1.100 src/libexec/ld.elf_so/Makefile:1.101
--- src/libexec/ld.elf_so/Makefile:1.100 Thu Dec 16 22:47:27 2010
+++ src/libexec/ld.elf_so/Makefile Thu Dec 16 22:52:32 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.100 2010/12/16 22:47:27 joerg Exp $
+# $NetBSD: Makefile,v 1.101 2010/12/16 22:52:32 joerg Exp $
#
# NOTE: when changing ld.so, ensure that ldd still compiles.
#
@@ -69,10 +69,18 @@
.PATH.c: ${NETBSDSRCDIR}/lib/libc/stdlib
SRCS+= exit.c
+errlist_concat.h: ${NETBSDSRCDIR}/lib/libc/gen/errlist.awk ${NETBSDSRCDIR}/sys/sys/errno.h
+ ${TOOL_AWK} -v concat=1 -f ${.ALLSRC} ${.TARGET}.tmp \
+ mv -f ${.TARGET}.tmp ${.TARGET}
+
+xprintf.c: errlist_concat.h
+
+CLEANFILES+= errlist_concat.h
+
BINDIR= ${SHLINKINSTALLDIR}
CPPFLAGS+= -DLIBDIR=\${LIBDIR}\ -D_PATH_RTLD=\${BINDIR}/${PROG}\
-CPPFLAGS+= -I${.CURDIR}
+CPPFLAGS+= -I${.CURDIR} -I.
CPPFLAGS+= -DRTLD_LOADER
CPPFLAGS+= -D_RTLD_SOURCE
CPPFLAGS+= -DCOMBRELOC
Index: src/libexec/ld.elf_so/xprintf.c
diff -u src/libexec/ld.elf_so/xprintf.c:1.20 src/libexec/ld.elf_so/xprintf.c:1.21
--- src/libexec/ld.elf_so/xprintf.c:1.20 Tue May 19 20:44:52 2009
+++ src/libexec/ld.elf_so/xprintf.c Thu Dec 16 22:52:32 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: xprintf.c,v 1.20 2009/05/19 20:44:52 christos Exp $ */
+/* $NetBSD: xprintf.c,v 1.21 2010/12/16 22:52:32 joerg Exp $ */
/*
* Copyright 1996 Matt Thomas m...@3am-software.com
@@ -29,7 +29,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: xprintf.c,v 1.20 2009/05/19 20:44:52 christos Exp $);
+__RCSID($NetBSD: xprintf.c,v 1.21 2010/12/16 22:52:32 joerg Exp $);
#endif /* not lint */
#include string.h
@@ -243,16 +243,18 @@
va_end(ap);
}
+#include errlist_concat.h
+
const char *
xstrerror(int error)
{
- if (error = sys_nerr || error 0) {
+ if (error = concat_nerr || error 0) {
static char buf[128];
xsnprintf(buf, sizeof(buf), Unknown error: %d, error);
return buf;
}
- return sys_errlist[error];
+ return concat_errlist +
CVS commit: src/gnu/usr.bin/groff/src
Module Name:src
Committed By: joerg
Date: Thu Dec 16 22:54:23 UTC 2010
Modified Files:
src/gnu/usr.bin/groff/src/devices: Makefile.inc
src/gnu/usr.bin/groff/src/devices/grodvi: Makefile
src/gnu/usr.bin/groff/src/devices/grohtml: Makefile
src/gnu/usr.bin/groff/src/devices/grolbp: Makefile
src/gnu/usr.bin/groff/src/devices/grolj4: Makefile
src/gnu/usr.bin/groff/src/devices/grops: Makefile
src/gnu/usr.bin/groff/src/devices/grotty: Makefile
src/gnu/usr.bin/groff/src/preproc: Makefile.inc
src/gnu/usr.bin/groff/src/preproc/eqn: Makefile
src/gnu/usr.bin/groff/src/preproc/grn: Makefile
src/gnu/usr.bin/groff/src/preproc/html: Makefile
src/gnu/usr.bin/groff/src/preproc/pic: Makefile
src/gnu/usr.bin/groff/src/preproc/refer: Makefile
src/gnu/usr.bin/groff/src/preproc/soelim: Makefile
src/gnu/usr.bin/groff/src/preproc/tbl: Makefile
src/gnu/usr.bin/groff/src/roff: Makefile.inc
src/gnu/usr.bin/groff/src/roff/groff: Makefile
src/gnu/usr.bin/groff/src/roff/troff: Makefile
src/gnu/usr.bin/groff/src/utils: Makefile.inc
src/gnu/usr.bin/groff/src/utils/addftinfo: Makefile
src/gnu/usr.bin/groff/src/utils/hpftodit: Makefile
src/gnu/usr.bin/groff/src/utils/indxbib: Makefile
src/gnu/usr.bin/groff/src/utils/lkbib: Makefile
src/gnu/usr.bin/groff/src/utils/lookbib: Makefile
src/gnu/usr.bin/groff/src/utils/pfbtops: Makefile
src/gnu/usr.bin/groff/src/utils/tfmtodit: Makefile
Log Message:
Push C++ library linkage into the shared Makefile.inc fragments.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/gnu/usr.bin/groff/src/devices/Makefile.inc
cvs rdiff -u -r1.4 -r1.5 src/gnu/usr.bin/groff/src/devices/grodvi/Makefile
cvs rdiff -u -r1.5 -r1.6 src/gnu/usr.bin/groff/src/devices/grohtml/Makefile
cvs rdiff -u -r1.5 -r1.6 src/gnu/usr.bin/groff/src/devices/grolbp/Makefile
cvs rdiff -u -r1.5 -r1.6 src/gnu/usr.bin/groff/src/devices/grolj4/Makefile
cvs rdiff -u -r1.4 -r1.5 src/gnu/usr.bin/groff/src/devices/grops/Makefile
cvs rdiff -u -r1.4 -r1.5 src/gnu/usr.bin/groff/src/devices/grotty/Makefile
cvs rdiff -u -r1.3 -r1.4 src/gnu/usr.bin/groff/src/preproc/Makefile.inc
cvs rdiff -u -r1.8 -r1.9 src/gnu/usr.bin/groff/src/preproc/eqn/Makefile
cvs rdiff -u -r1.5 -r1.6 src/gnu/usr.bin/groff/src/preproc/grn/Makefile
cvs rdiff -u -r1.4 -r1.5 src/gnu/usr.bin/groff/src/preproc/html/Makefile
cvs rdiff -u -r1.9 -r1.10 src/gnu/usr.bin/groff/src/preproc/pic/Makefile
cvs rdiff -u -r1.9 -r1.10 src/gnu/usr.bin/groff/src/preproc/refer/Makefile
cvs rdiff -u -r1.4 -r1.5 src/gnu/usr.bin/groff/src/preproc/soelim/Makefile
cvs rdiff -u -r1.4 -r1.5 src/gnu/usr.bin/groff/src/preproc/tbl/Makefile
cvs rdiff -u -r1.3 -r1.4 src/gnu/usr.bin/groff/src/roff/Makefile.inc
cvs rdiff -u -r1.4 -r1.5 src/gnu/usr.bin/groff/src/roff/groff/Makefile
cvs rdiff -u -r1.10 -r1.11 src/gnu/usr.bin/groff/src/roff/troff/Makefile
cvs rdiff -u -r1.3 -r1.4 src/gnu/usr.bin/groff/src/utils/Makefile.inc
cvs rdiff -u -r1.4 -r1.5 src/gnu/usr.bin/groff/src/utils/addftinfo/Makefile
cvs rdiff -u -r1.5 -r1.6 src/gnu/usr.bin/groff/src/utils/hpftodit/Makefile
cvs rdiff -u -r1.6 -r1.7 src/gnu/usr.bin/groff/src/utils/indxbib/Makefile
cvs rdiff -u -r1.4 -r1.5 src/gnu/usr.bin/groff/src/utils/lkbib/Makefile
cvs rdiff -u -r1.4 -r1.5 src/gnu/usr.bin/groff/src/utils/lookbib/Makefile
cvs rdiff -u -r1.3 -r1.4 src/gnu/usr.bin/groff/src/utils/pfbtops/Makefile
cvs rdiff -u -r1.4 -r1.5 src/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/gnu/usr.bin/groff/src/devices/Makefile.inc
diff -u src/gnu/usr.bin/groff/src/devices/Makefile.inc:1.3 src/gnu/usr.bin/groff/src/devices/Makefile.inc:1.4
--- src/gnu/usr.bin/groff/src/devices/Makefile.inc:1.3 Mon Jun 30 18:47:47 2003
+++ src/gnu/usr.bin/groff/src/devices/Makefile.inc Thu Dec 16 22:54:18 2010
@@ -1,5 +1,8 @@
-# $NetBSD: Makefile.inc,v 1.3 2003/06/30 18:47:47 wiz Exp $
+# $NetBSD: Makefile.inc,v 1.4 2010/12/16 22:54:18 joerg Exp $
# $FreeBSD: src/gnu/usr.bin/groff/src/devices/Makefile.inc,v 1.1 2001/04/17 12:37:02 ru Exp $
+DPADD+= ${LIBDRIVER} ${LIBGROFF} ${LIBM} ${LIBSUPCXX}
+LDADD+= ${LIBDRIVER} ${LIBGROFF} -lm -lsupc++
+
.include ../../Makefile.inc
Index: src/gnu/usr.bin/groff/src/devices/grodvi/Makefile
diff -u src/gnu/usr.bin/groff/src/devices/grodvi/Makefile:1.4 src/gnu/usr.bin/groff/src/devices/grodvi/Makefile:1.5
--- src/gnu/usr.bin/groff/src/devices/grodvi/Makefile:1.4 Mon Oct 9 08:32:53 2006
+++ src/gnu/usr.bin/groff/src/devices/grodvi/Makefile Thu Dec 16 22:54:18 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/10/09 08:32:53 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2010/12/16 22:54:18 joerg Exp $
# $FreeBSD: src/gnu/usr.bin/groff/src/devices/grodvi/Makefile,v 1.4 2003/05/01
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: joerg Date: Thu Dec 16 23:01:57 UTC 2010 Modified Files: src/distrib/sets/lists/comp: mi Log Message: Fix up mktime_z.3 entries To generate a diff of this commit: cvs rdiff -u -r1.1550 -r1.1551 src/distrib/sets/lists/comp/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1550 src/distrib/sets/lists/comp/mi:1.1551 --- src/distrib/sets/lists/comp/mi:1.1550 Thu Dec 16 22:19:37 2010 +++ src/distrib/sets/lists/comp/mi Thu Dec 16 23:01:56 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1550 2010/12/16 22:19:37 christos Exp $ +# $NetBSD: mi,v 1.1551 2010/12/16 23:01:56 joerg Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -13305,7 +13305,7 @@ ./usr/share/man/html3/mkstemp.html comp-c-htmlman html ./usr/share/man/html3/mktemp.html comp-c-htmlman html ./usr/share/man/html3/mktime.html comp-c-htmlman html -./usr/share/man/html3/mktime_Z.html comp-c-htmlman html +./usr/share/man/html3/mktime_z.html comp-c-htmlman html ./usr/share/man/html3/modf.html comp-c-htmlman html ./usr/share/man/html3/moncontrol.html comp-c-htmlman html ./usr/share/man/html3/monstartup.html comp-c-htmlman html @@ -19283,6 +19283,7 @@ ./usr/share/man/man3/mkstemp.3 comp-c-man .man ./usr/share/man/man3/mktemp.3 comp-c-man .man ./usr/share/man/man3/mktime.3 comp-c-man .man +./usr/share/man/man3/mktime_z.3 comp-c-man .man ./usr/share/man/man3/modf.3 comp-c-man .man ./usr/share/man/man3/moncontrol.3 comp-c-man .man ./usr/share/man/man3/monstartup.3 comp-c-man .man
CVS commit: src/external/apache2/mDNSResponder/dist
Module Name:src Committed By: joerg Date: Fri Dec 17 00:23:58 UTC 2010 Modified Files: src/external/apache2/mDNSResponder/dist/Clients: dns-sd.c src/external/apache2/mDNSResponder/dist/mDNSPosix: PosixDaemon.c src/external/apache2/mDNSResponder/dist/mDNSShared: dnssd_clientlib.c Log Message: Kill use of __DATE__ and __TIME__ in SCCS strings. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/apache2/mDNSResponder/dist/Clients/dns-sd.c cvs rdiff -u -r1.4 -r1.5 \ src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientlib.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/Clients/dns-sd.c diff -u src/external/apache2/mDNSResponder/dist/Clients/dns-sd.c:1.1.1.1 src/external/apache2/mDNSResponder/dist/Clients/dns-sd.c:1.2 --- src/external/apache2/mDNSResponder/dist/Clients/dns-sd.c:1.1.1.1 Tue Sep 29 22:14:03 2009 +++ src/external/apache2/mDNSResponder/dist/Clients/dns-sd.c Fri Dec 17 00:23:58 2010 @@ -1226,7 +1226,7 @@ // NOT static -- otherwise the compiler may optimize it out // The @(#) pattern is a special prefix the what command looks for -const char VersionString_SCCS[] = @(#) dns-sd STRINGIFY(mDNSResponderVersion) ( __DATE__ __TIME__ ); +const char VersionString_SCCS[] = @(#) dns-sd STRINGIFY(mDNSResponderVersion); #if _BUILDING_XCODE_PROJECT_ // If the process crashes, then this string will be magically included in the automatically-generated crash log Index: src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c diff -u src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c:1.4 src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c:1.5 --- src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c:1.4 Sat Oct 24 04:04:40 2009 +++ src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c Fri Dec 17 00:23:58 2010 @@ -364,9 +364,9 @@ // For convenience when using the strings command, this is the last thing in the file #if mDNSResponderVersion 1 -mDNSexport const char mDNSResponderVersionString_SCCS[] = @(#) mDNSResponder- STRINGIFY(mDNSResponderVersion) ( __DATE__ __TIME__ ); +mDNSexport const char mDNSResponderVersionString_SCCS[] = @(#) mDNSResponder- STRINGIFY(mDNSResponderVersion); #elif MDNS_VERSIONSTR_NODTS mDNSexport const char mDNSResponderVersionString_SCCS[] = @(#) mDNSResponder (Engineering Build); #else -mDNSexport const char mDNSResponderVersionString_SCCS[] = @(#) mDNSResponder (Engineering Build) ( __DATE__ __TIME__ ); +mDNSexport const char mDNSResponderVersionString_SCCS[] = @(#) mDNSResponder (Engineering Build); #endif Index: src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientlib.c diff -u src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientlib.c:1.1.1.1 src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientlib.c:1.2 --- src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientlib.c:1.1.1.1 Tue Sep 29 22:14:14 2009 +++ src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientlib.c Fri Dec 17 00:23:58 2010 @@ -436,4 +436,4 @@ // NOT static -- otherwise the compiler may optimize it out // The @(#) pattern is a special prefix the what command looks for -const char VersionString_SCCS_libdnssd[] = @(#) libdns_sd STRINGIFY(mDNSResponderVersion) ( __DATE__ __TIME__ ); +const char VersionString_SCCS_libdnssd[] = @(#) libdns_sd STRINGIFY(mDNSResponderVersion);
CVS commit: src/sys/rump/librump/rumpkern
Module Name:src
Committed By: joerg
Date: Fri Dec 17 00:53:17 UTC 2010
Modified Files:
src/sys/rump/librump/rumpkern: Makefile.rumpkern
Log Message:
Support MKREPRO
To generate a diff of this commit:
cvs rdiff -u -r1.103 -r1.104 src/sys/rump/librump/rumpkern/Makefile.rumpkern
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/librump/rumpkern/Makefile.rumpkern
diff -u src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.103 src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.104
--- src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.103 Fri Nov 26 09:25:39 2010
+++ src/sys/rump/librump/rumpkern/Makefile.rumpkern Fri Dec 17 00:53:16 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rumpkern,v 1.103 2010/11/26 09:25:39 pooka Exp $
+# $NetBSD: Makefile.rumpkern,v 1.104 2010/12/17 00:53:16 joerg Exp $
#
.include ${RUMPTOP}/Makefile.rump
@@ -31,9 +31,17 @@
CPPFLAGS.rump.c+= -DRUMP_SMP
.endif
+MKREPRO?=no
+
+.if ${MKREPRO} == yes
+_NVFLAGS=-r
+.else
+_NVFLAGS=
+.endif
+
vers.c: ${RUMPTOP}/../conf/newvers.sh ${RUMPTOP}/../conf/osrelease.sh ${RUMPTOP}/../sys/param.h
${_MKMSG_CREATE} vers.c
- ${HOST_SH} ${RUMPTOP}/../conf/newvers.sh -i RUMP-ROAST -n
+ ${HOST_SH} ${RUMPTOP}/../conf/newvers.sh -i RUMP-ROAST -n ${_NVFLAGS}
SRCS+= vers.c
CLEANFILES+= vers.c version
CVS commit: src/lib/libc/time
Module Name:src Committed By: wiz Date: Fri Dec 17 01:29:45 UTC 2010 Modified Files: src/lib/libc/time: tzset.3 Log Message: Use more markup. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/lib/libc/time/tzset.3 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/time/tzset.3 diff -u src/lib/libc/time/tzset.3:1.24 src/lib/libc/time/tzset.3:1.25 --- src/lib/libc/time/tzset.3:1.24 Thu Dec 31 22:49:16 2009 +++ src/lib/libc/time/tzset.3 Fri Dec 17 01:29:45 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: tzset.3,v 1.24 2009/12/31 22:49:16 mlelstv Exp $ +.\ $NetBSD: tzset.3,v 1.25 2010/12/17 01:29:45 wiz Exp $ .Dd April 1, 2001 .Dt TZSET 3 .Os @@ -260,7 +260,7 @@ .Xr tzfile 5 .Sh STANDARDS The -tzset() +.Fn tzset function conforms to .St -p1003.1-88 . .\ @(#)newtzset.3 8.2
CVS commit: src/lib/libc/time
Module Name:src Committed By: wiz Date: Fri Dec 17 01:30:14 UTC 2010 Modified Files: src/lib/libc/time: time2posix.3 Log Message: Sort SEE ALSO, add a serial comma. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/lib/libc/time/time2posix.3 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/time/time2posix.3 diff -u src/lib/libc/time/time2posix.3:1.16 src/lib/libc/time/time2posix.3:1.17 --- src/lib/libc/time/time2posix.3:1.16 Thu Dec 16 18:38:07 2010 +++ src/lib/libc/time/time2posix.3 Fri Dec 17 01:30:14 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: time2posix.3,v 1.16 2010/12/16 18:38:07 christos Exp $ +.\ $NetBSD: time2posix.3,v 1.17 2010/12/17 01:30:14 wiz Exp $ .Dd December 4, 2010 .Dt TIME2POSIX 3 .Os @@ -66,7 +66,7 @@ The .Fn time2posix , .Fn time2posix_z , -.Fn posix2time +.Fn posix2time , and .Fn posix2time_z functions are provided to address this @@ -141,10 +141,10 @@ .Xr localtime 3 , .Xr localtime_r 3 , .Xr localtime_rz 3 , -.Xr tzalloc 3 , .Xr mktime 3 , .Xr mktime_z 3 , -.Xr time 3 +.Xr time 3 , +.Xr tzalloc 3 .\ @(#)time2posix.3 7.7 .\ This file is in the public domain, so clarified as of .\ 1996-06-05 by Arthur David Olson.
CVS commit: src/lib/libc/time
Module Name:src Committed By: wiz Date: Fri Dec 17 01:30:50 UTC 2010 Modified Files: src/lib/libc/time: ctime.3 Log Message: Sort ERRORS. Fix a typo. Readd macro usage lost in previous. Remove trailing whitespace. To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.37 src/lib/libc/time/ctime.3 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/time/ctime.3 diff -u src/lib/libc/time/ctime.3:1.36 src/lib/libc/time/ctime.3:1.37 --- src/lib/libc/time/ctime.3:1.36 Thu Dec 16 18:38:07 2010 +++ src/lib/libc/time/ctime.3 Fri Dec 17 01:30:50 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: ctime.3,v 1.36 2010/12/16 18:38:07 christos Exp $ +.\ $NetBSD: ctime.3,v 1.37 2010/12/17 01:30:50 wiz Exp $ .Dd December 14, 2010 .Dt CTIME 3 .Os @@ -59,7 +59,7 @@ .Fn tzfree const timezone_t tz .Sh DESCRIPTION .Fn ctime -converts a +converts a .Tp time_t , pointed to by .Fa clock , @@ -79,7 +79,7 @@ .Fn ctime_r is similar to .Fn ctime , -except it places the result of the convertion on the +except it places the result of the conversion on the .Fa buf argument which should be 26 or more bytes long, instead of using a global static buffer. @@ -143,7 +143,8 @@ .Pp .Fn asctime converts a time value contained in a -``tm'' structure to a string, +.Dq tm +structure to a string, as shown in the above example, and returns a pointer to the string. .Pp @@ -223,13 +224,13 @@ multiple timezones at the same time by using separate .Ft timezone_t objects allocated by -.Fn tzalloc +.Fn tzalloc and calling the .Dq z variants of the functions. .Pp .Fn tzgetname -returns the name for the given +returns the name for the given .Fa tz . If .Fa isdst @@ -237,7 +238,7 @@ .Va 0 , the call is equivalent to .Va tzname[0] . -If +If .Fa isdst is set to .Va 1 @@ -276,7 +277,7 @@ created. There is no guarantee that these fields will continue to exist in this form in future releases of this code. -The +The .Fa tm_zone field will become invalid and point to freed storage if the corresponding .Va struct tm @@ -384,10 +385,10 @@ .Fn mktime_z will fail when: .Bl -tag -width Er -.It Bq Er EOVERFLOW -The result cannot be represented. .It Bq Er EINVAL The result cannot be represented. +.It Bq Er EOVERFLOW +The result cannot be represented. .El .Pp All functions that return values except their
CVS commit: src/sys/arch/alpha/alpha
Module Name:src Committed By: joerg Date: Fri Dec 17 02:36:36 UTC 2010 Modified Files: src/sys/arch/alpha/alpha: cpu.c ipifuncs.c Log Message: Fix build by pulling in uvm/uvm_extern.h. To generate a diff of this commit: cvs rdiff -u -r1.89 -r1.90 src/sys/arch/alpha/alpha/cpu.c cvs rdiff -u -r1.44 -r1.45 src/sys/arch/alpha/alpha/ipifuncs.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/alpha/alpha/cpu.c diff -u src/sys/arch/alpha/alpha/cpu.c:1.89 src/sys/arch/alpha/alpha/cpu.c:1.90 --- src/sys/arch/alpha/alpha/cpu.c:1.89 Wed Dec 15 01:32:31 2010 +++ src/sys/arch/alpha/alpha/cpu.c Fri Dec 17 02:36:35 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.c,v 1.89 2010/12/15 01:32:31 matt Exp $ */ +/* $NetBSD: cpu.c,v 1.90 2010/12/17 02:36:35 joerg Exp $ */ /*- * Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc. @@ -59,7 +59,7 @@ #include sys/cdefs.h /* RCS ID Copyright macro defns */ -__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.89 2010/12/15 01:32:31 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.90 2010/12/17 02:36:35 joerg Exp $); #include opt_ddb.h #include opt_multiprocessor.h @@ -72,6 +72,8 @@ #include sys/atomic.h #include sys/cpu.h +#include uvm/uvm_extern.h + #include machine/autoconf.h #include machine/cpuvar.h #include machine/rpb.h Index: src/sys/arch/alpha/alpha/ipifuncs.c diff -u src/sys/arch/alpha/alpha/ipifuncs.c:1.44 src/sys/arch/alpha/alpha/ipifuncs.c:1.45 --- src/sys/arch/alpha/alpha/ipifuncs.c:1.44 Wed Dec 15 01:32:31 2010 +++ src/sys/arch/alpha/alpha/ipifuncs.c Fri Dec 17 02:36:35 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: ipifuncs.c,v 1.44 2010/12/15 01:32:31 matt Exp $ */ +/* $NetBSD: ipifuncs.c,v 1.45 2010/12/17 02:36:35 joerg Exp $ */ /*- * Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc. @@ -32,7 +32,7 @@ #include sys/cdefs.h /* RCS ID Copyright macro defns */ -__KERNEL_RCSID(0, $NetBSD: ipifuncs.c,v 1.44 2010/12/15 01:32:31 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: ipifuncs.c,v 1.45 2010/12/17 02:36:35 joerg Exp $); /* * Interprocessor interrupt handlers. @@ -48,6 +48,8 @@ #include sys/intr.h #include sys/xcall.h +#include uvm/uvm_extern.h + #include machine/alpha_cpu.h #include machine/alpha.h #include machine/cpuvar.h
CVS commit: xsrc/external/mit
Module Name:xsrc
Committed By: mrg
Date: Fri Dec 17 04:19:50 UTC 2010
Modified Files:
xsrc/external/mit/xf86-video-crime/dist/src: crime_driver.c
xsrc/external/mit/xf86-video-newport/dist/src: newport.h
newport_driver.c
Log Message:
apply some #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) 6 around the code
that uses features no longer part of xorg-server 1.9.
seems to fix sgimips builds.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
xsrc/external/mit/xf86-video-crime/dist/src/crime_driver.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-newport/dist/src/newport.h
cvs rdiff -u -r1.7 -r1.8 \
xsrc/external/mit/xf86-video-newport/dist/src/newport_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-crime/dist/src/crime_driver.c
diff -u xsrc/external/mit/xf86-video-crime/dist/src/crime_driver.c:1.8 xsrc/external/mit/xf86-video-crime/dist/src/crime_driver.c:1.9
--- xsrc/external/mit/xf86-video-crime/dist/src/crime_driver.c:1.8 Wed Nov 24 02:54:07 2010
+++ xsrc/external/mit/xf86-video-crime/dist/src/crime_driver.c Fri Dec 17 04:19:50 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: crime_driver.c,v 1.8 2010/11/24 02:54:07 mrg Exp $ */
+/* $NetBSD: crime_driver.c,v 1.9 2010/12/17 04:19:50 mrg Exp $ */
/*
* Copyright (c) 2008 Michael Lorenz
* All rights reserved.
@@ -55,8 +55,10 @@
/* for visuals */
#include fb.h
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) 6
#include xf86Resources.h
#include xf86RAC.h
+#endif
#ifdef XvExtension
#include xf86xv.h
@@ -396,8 +398,10 @@
fPtr-pEnt = xf86GetEntityInfo(pScrn-entityList[0]);
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) 6
pScrn-racMemFlags = RAC_FB | RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT;
pScrn-racIoFlags = pScrn-racMemFlags;
+#endif
dev = xf86FindOptionValue(fPtr-pEnt-device-options, device);
fPtr-fd = crime_open(dev);
Index: xsrc/external/mit/xf86-video-newport/dist/src/newport.h
diff -u xsrc/external/mit/xf86-video-newport/dist/src/newport.h:1.2 xsrc/external/mit/xf86-video-newport/dist/src/newport.h:1.3
--- xsrc/external/mit/xf86-video-newport/dist/src/newport.h:1.2 Sat Feb 14 03:09:50 2009
+++ xsrc/external/mit/xf86-video-newport/dist/src/newport.h Fri Dec 17 04:19:50 2010
@@ -23,7 +23,9 @@
#include xf86.h
#include xf86_OSproc.h
#include compiler.h
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) 6
#include xf86Resources.h
+#endif
#include xf86cmap.h
Index: xsrc/external/mit/xf86-video-newport/dist/src/newport_driver.c
diff -u xsrc/external/mit/xf86-video-newport/dist/src/newport_driver.c:1.7 xsrc/external/mit/xf86-video-newport/dist/src/newport_driver.c:1.8
--- xsrc/external/mit/xf86-video-newport/dist/src/newport_driver.c:1.7 Wed Nov 24 02:54:08 2010
+++ xsrc/external/mit/xf86-video-newport/dist/src/newport_driver.c Fri Dec 17 04:19:50 2010
@@ -262,7 +262,9 @@
Bool foundScreen = FALSE;
GDevPtr *devSections;
GDevPtr dev = NULL;
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) 6
resRange range[] = { {ResExcMemBlock ,0,0}, _END };
+#endif
unsigned probedIDs[NEWPORT_MAX_BOARDS];
memType base;
if ((numDevSections = xf86MatchDevice(NEWPORT_DRIVER_NAME, devSections)) = 0)
@@ -306,9 +308,11 @@
TRUE);
base = (NEWPORT_BASE_ADDR0
+ busID * NEWPORT_BASE_OFFSET);
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) 6
RANGE(range[0], base, base +
sizeof(NewportRegs),
ResExcMemBlock);
+#endif
pScrn = (void *)xf86ConfigFbEntity(NULL,
0, entity, NULL, NULL, NULL, NULL);
/* Allocate a ScrnInfoRec */
CVS commit: [matt-nb5-mips64] src/sys/arch/evbmips/rmixl
Module Name:src Committed By: matt Date: Fri Dec 17 04:49:25 UTC 2010 Modified Files: src/sys/arch/evbmips/rmixl [matt-nb5-mips64]: machdep.c Log Message: When doing MP, make sure the TLB is global mode (shared among all threads). To generate a diff of this commit: cvs rdiff -u -r1.1.2.30 -r1.1.2.31 src/sys/arch/evbmips/rmixl/machdep.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/evbmips/rmixl/machdep.c diff -u src/sys/arch/evbmips/rmixl/machdep.c:1.1.2.30 src/sys/arch/evbmips/rmixl/machdep.c:1.1.2.31 --- src/sys/arch/evbmips/rmixl/machdep.c:1.1.2.30 Tue Aug 17 00:52:33 2010 +++ src/sys/arch/evbmips/rmixl/machdep.c Fri Dec 17 04:49:24 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.1.2.30 2010/08/17 00:52:33 matt Exp $ */ +/* $NetBSD: machdep.c,v 1.1.2.31 2010/12/17 04:49:24 matt Exp $ */ /* * Copyright 2001, 2002 Wasabi Systems, Inc. @@ -112,7 +112,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.1.2.30 2010/08/17 00:52:33 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.1.2.31 2010/12/17 04:49:24 matt Exp $); #define __INTR_PRIVATE @@ -287,7 +287,13 @@ uint32_t r; extern char edata[], end[]; -#ifndef MULTIPROCESSOR +#ifdef MULTIPROCESSOR + r = rmixl_mfcr(0x400); + r |= __BIT(0); /* enable global TLB mode */ + rmixl_mtcr(0x400, r); /* enable MMU clock gating */ + /* preserve MMU Thread Mode */ + /* TLB is not paritioned (global) */ +#else rmixl_mtcr(0, 1); /* disable all threads except #0 */ rmixl_mtcr(0x400, 0); /* enable MMU clock gating */ /* set single MMU Thread Mode */
CVS commit: src/libexec/ld.elf_so
Module Name:src Committed By: skrll Date: Fri Dec 17 07:04:52 UTC 2010 Modified Files: src/libexec/ld.elf_so: ld.elf_so.1 Log Message: Remove implementation detail. Bump date. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/libexec/ld.elf_so/ld.elf_so.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/libexec/ld.elf_so/ld.elf_so.1 diff -u src/libexec/ld.elf_so/ld.elf_so.1:1.13 src/libexec/ld.elf_so/ld.elf_so.1:1.14 --- src/libexec/ld.elf_so/ld.elf_so.1:1.13 Thu Dec 16 19:25:41 2010 +++ src/libexec/ld.elf_so/ld.elf_so.1 Fri Dec 17 07:04:52 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: ld.elf_so.1,v 1.13 2010/12/16 19:25:41 wiz Exp $ +.\ $NetBSD: ld.elf_so.1,v 1.14 2010/12/17 07:04:52 skrll Exp $ .\ .\ Copyright (c) 2001 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -27,7 +27,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd December 16, 2010 +.Dd December 17, 2010 .Dt LD.ELF_SO 1 .Os .Sh NAME @@ -63,13 +63,6 @@ .Nm is loaded is also supplied. .Pp -Careful use of code allows -.Nm -to relocate itself before proceeding. -Specifically the use of global variables and -large switch statements is not allowed. -The later can cause the output of a jump table that -can use the equivalent of a global variable. .Ss Finding objects Each .Xr elf 5
CVS commit: src
Module Name:src Committed By: jruoho Date: Fri Dec 17 07:10:38 UTC 2010 Modified Files: src/distrib/sets/lists/comp: mi src/share/man/man3: Makefile cdefs.3 Added Files: src/share/man/man3: __insn_barrier.3 Log Message: Add __insn_barrier(3). XXX: Someone more knowledgeable may want to check this. To generate a diff of this commit: cvs rdiff -u -r1.1551 -r1.1552 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.61 -r1.62 src/share/man/man3/Makefile cvs rdiff -u -r0 -r1.1 src/share/man/man3/__insn_barrier.3 cvs rdiff -u -r1.1 -r1.2 src/share/man/man3/cdefs.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1551 src/distrib/sets/lists/comp/mi:1.1552 --- src/distrib/sets/lists/comp/mi:1.1551 Thu Dec 16 23:01:56 2010 +++ src/distrib/sets/lists/comp/mi Fri Dec 17 07:10:37 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1551 2010/12/16 23:01:56 joerg Exp $ +# $NetBSD: mi,v 1.1552 2010/12/17 07:10:37 jruoho Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -4910,6 +4910,7 @@ ./usr/share/man/cat3/__builtin_object_size.0 comp-c-catman .cat ./usr/share/man/cat3/__constfunc.0 comp-c-catman .cat ./usr/share/man/cat3/__dead.0 comp-c-catman .cat +./usr/share/man/cat3/__insn_barrier.0 comp-c-catman .cat ./usr/share/man/cat3/__noinline.0 comp-c-catman .cat ./usr/share/man/cat3/__packed.0 comp-c-catman .cat ./usr/share/man/cat3/__pure.0 comp-c-catman .cat @@ -10994,6 +10995,7 @@ ./usr/share/man/html3/__builtin_object_size.html comp-c-htmlman html ./usr/share/man/html3/__constfunc.html comp-c-htmlman html ./usr/share/man/html3/__dead.html comp-c-htmlman html +./usr/share/man/html3/__insn_barrier.html comp-c-htmlman html ./usr/share/man/html3/__noinline.html comp-c-htmlman html ./usr/share/man/html3/__packed.html comp-c-htmlman html ./usr/share/man/html3/__pure.html comp-c-htmlman html @@ -16878,6 +16880,7 @@ ./usr/share/man/man3/__builtin_object_size.3 comp-c-man .man ./usr/share/man/man3/__constfunc.3 comp-c-man .man ./usr/share/man/man3/__dead.3 comp-c-man .man +./usr/share/man/man3/__insn_barrier.3 comp-c-man .man ./usr/share/man/man3/__noinline.3 comp-c-man .man ./usr/share/man/man3/__packed.3 comp-c-man .man ./usr/share/man/man3/__pure.3 comp-c-man .man Index: src/share/man/man3/Makefile diff -u src/share/man/man3/Makefile:1.61 src/share/man/man3/Makefile:1.62 --- src/share/man/man3/Makefile:1.61 Thu Dec 16 17:47:54 2010 +++ src/share/man/man3/Makefile Fri Dec 17 07:10:38 2010 @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.61 2010/12/16 17:47:54 jruoho Exp $ +# $NetBSD: Makefile,v 1.62 2010/12/17 07:10:38 jruoho Exp $ # @(#)Makefile 8.2 (Berkeley) 12/13/93 MAN= _DIAGASSERT.3 __CONCAT.3 __UNCONST.3 CMSG_DATA.3 \ - __arraycount.3 assert.3 attribute.3 bits.3 bitstring.3 \ + __arraycount.3 __insn_barrier.3 \ + assert.3 attribute.3 bits.3 bitstring.3 \ cdefs.3 dirent.3 dlfcn.3 dl_iterate_phdr.3 end.3 \ fast_divide32.3 ffs32.3 gcq.3 \ ilog2.3 intro.3 inttypes.3 iso646.3 \ Index: src/share/man/man3/cdefs.3 diff -u src/share/man/man3/cdefs.3:1.1 src/share/man/man3/cdefs.3:1.2 --- src/share/man/man3/cdefs.3:1.1 Thu Dec 16 10:19:14 2010 +++ src/share/man/man3/cdefs.3 Fri Dec 17 07:10:38 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: cdefs.3,v 1.1 2010/12/16 10:19:14 jruoho Exp $ +.\ $NetBSD: cdefs.3,v 1.2 2010/12/17 07:10:38 jruoho Exp $ .\ .\ Copyright (c) 2010 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -27,7 +27,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd December 16, 2010 +.Dd December 17, 2010 .Dt CDEFS 3 .Os .Sh NAME @@ -54,10 +54,11 @@ .Tn C99 . .It Macros and definitions specific to compilers, preprocessors, and linkers; see -.Xr attribute 3 , .Xr __CONCAT 3 , +.Xr __UNCONST 3 , +.Xr __insn_barrier 3 , and -.Xr __UNCONST 3 . +.Xr attribute 3 . .It Utility macros provided for convenience; see .Xr __arraycount 3 @@ -87,7 +88,7 @@ */ #include sys/cdefs.h -__RCSID($NetBSD: cdefs.3,v 1.1 2010/12/16 10:19:14 jruoho Exp $); +__RCSID($NetBSD: cdefs.3,v 1.2 2010/12/17 07:10:38 jruoho Exp $); .Ed .Pp It is possible to identify the Added files: Index: src/share/man/man3/__insn_barrier.3 diff -u /dev/null src/share/man/man3/__insn_barrier.3:1.1 --- /dev/null Fri Dec 17 07:10:38 2010 +++ src/share/man/man3/__insn_barrier.3 Fri Dec 17 07:10:38 2010 @@ -0,0 +1,64 @@ +.\ $NetBSD: __insn_barrier.3,v 1.1 2010/12/17 07:10:38 jruoho Exp $ +.\ +.\ Copyright (c) 2010 Jukka Ruohonen jruoho...@iki.fi +.\ All rights reserved. +.\ +.\ Redistribution and use in source and binary forms, with or without +.\ modification, are permitted provided that the following conditions +.\ are met: +.\ 1. Redistributions of source code must retain the above
CVS commit: src/share/man/man7
Module Name:src Committed By: jruoho Date: Fri Dec 17 07:25:34 UTC 2010 Modified Files: src/share/man/man7: c.7 Log Message: Note __func__ and restrict. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/share/man/man7/c.7 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/man7/c.7 diff -u src/share/man/man7/c.7:1.8 src/share/man/man7/c.7:1.9 --- src/share/man/man7/c.7:1.8 Thu Dec 16 08:43:01 2010 +++ src/share/man/man7/c.7 Fri Dec 17 07:25:33 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: c.7,v 1.8 2010/12/16 08:43:01 jruoho Exp $ +.\ $NetBSD: c.7,v 1.9 2010/12/17 07:25:33 jruoho Exp $ .\ .\ Copyright (C) 2007, 2010 Gabor Kovesdan. All rights reserved. .\ @@ -25,7 +25,7 @@ .\ .\ $FreeBSD: src/share/man/man7/c99.7,v 1.1 2010/06/17 12:05:47 gabor Exp $ .\ -.Dd December 16, 2010 +.Dd December 17, 2010 .Dt C 7 .Os .Sh NAME @@ -137,6 +137,12 @@ .It Some new preprocessor features. .It +A predefined identifier +.Em __func__ +and a +.Em restrict +type qualifier. +.It New variables can be declared anywhere, not just in the beginning of the program or program blocks. .It
