CVS commit: src
Module Name:src
Committed By: pooka
Date: Tue Dec 14 08:04:15 UTC 2010
Modified Files:
src/common/lib/libprop: prop_kern.c
src/usr.sbin/envstat: Makefile envstat.c
Log Message:
Use a consistent approach for rump kernel calls made by libs.
Should investigate a dynamic approach in the future.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/common/lib/libprop/prop_kern.c
cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/envstat/Makefile
cvs rdiff -u -r1.83 -r1.84 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/common/lib/libprop/prop_kern.c
diff -u src/common/lib/libprop/prop_kern.c:1.13 src/common/lib/libprop/prop_kern.c:1.14
--- src/common/lib/libprop/prop_kern.c:1.13 Sun Oct 11 12:13:45 2009
+++ src/common/lib/libprop/prop_kern.c Tue Dec 14 08:04:14 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: prop_kern.c,v 1.13 2009/10/11 12:13:45 bad Exp $ */
+/* $NetBSD: prop_kern.c,v 1.14 2010/12/14 08:04:14 pooka Exp $ */
/*-
* Copyright (c) 2006, 2009 The NetBSD Foundation, Inc.
@@ -43,6 +43,11 @@
#include stdlib.h
#include stdio.h
+#ifdef RUMP_ACTION
+#include rump/rump_syscalls.h
+#define ioctl(a,b,c) rump_sys_ioctl(a,b,c)
+#endif
+
static int
_prop_object_externalize_to_pref(prop_object_t obj, struct plistref *pref, char **bufp)
{
Index: src/usr.sbin/envstat/Makefile
diff -u src/usr.sbin/envstat/Makefile:1.9 src/usr.sbin/envstat/Makefile:1.10
--- src/usr.sbin/envstat/Makefile:1.9 Mon Dec 13 18:00:38 2010
+++ src/usr.sbin/envstat/Makefile Tue Dec 14 08:04:14 2010
@@ -1,8 +1,12 @@
-# $NetBSD: Makefile,v 1.9 2010/12/13 18:00:38 pooka Exp $
+# $NetBSD: Makefile,v 1.10 2010/12/14 08:04:14 pooka Exp $
RUMPPRG= envstat
SRCS+= envstat.c config.c config_yacc.y config_lex.l
+.PATH: ${.CURDIR}/../../common/lib/libprop
+CPPFLAGS+= -DRUMP_ACTION
+RUMPSRCS+= prop_kern.c
+
LDADD= -lprop
DPADD= ${LIBPROP}
Index: src/usr.sbin/envstat/envstat.c
diff -u src/usr.sbin/envstat/envstat.c:1.83 src/usr.sbin/envstat/envstat.c:1.84
--- src/usr.sbin/envstat/envstat.c:1.83 Mon Dec 13 18:00:38 2010
+++ src/usr.sbin/envstat/envstat.c Tue Dec 14 08:04:14 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: envstat.c,v 1.83 2010/12/13 18:00:38 pooka Exp $ */
+/* $NetBSD: envstat.c,v 1.84 2010/12/14 08:04:14 pooka Exp $ */
/*-
* Copyright (c) 2007, 2008 Juan Romero Pardines.
@@ -27,7 +27,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: envstat.c,v 1.83 2010/12/13 18:00:38 pooka Exp $);
+__RCSID($NetBSD: envstat.c,v 1.84 2010/12/14 08:04:14 pooka Exp $);
#endif /* not lint */
#include stdio.h
@@ -117,20 +117,6 @@
static int sysmonfd; /* fd of /dev/sysmon */
-/* sneak in between ioctl() */
-int
-ioctl(int fd, unsigned long request, ...)
-{
- va_list ap;
- int rv;
-
- va_start(ap, request);
- rv = prog_ioctl(fd, request, va_arg(ap, void *));
- va_end(ap);
-
- return rv;
-}
-
int main(int argc, char **argv)
{
prop_dictionary_t dict;
CVS commit: src/share/man/man9
Module Name:src Committed By: jruoho Date: Tue Dec 14 09:09:52 UTC 2010 Modified Files: src/share/man/man9: secmodel_securelevel.9 Log Message: Note specifically that kernel modules can be loaded at securelevel 0. In addition, some markup improvements. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/share/man/man9/secmodel_securelevel.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/secmodel_securelevel.9 diff -u src/share/man/man9/secmodel_securelevel.9:1.7 src/share/man/man9/secmodel_securelevel.9:1.8 --- src/share/man/man9/secmodel_securelevel.9:1.7 Fri Oct 2 20:31:19 2009 +++ src/share/man/man9/secmodel_securelevel.9 Tue Dec 14 09:09:52 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: secmodel_securelevel.9,v 1.7 2009/10/02 20:31:19 elad Exp $ +.\ $NetBSD: secmodel_securelevel.9,v 1.8 2010/12/14 09:09:52 jruoho Exp $ .\ .\ Copyright (c) 2006 Elad Efrat e...@netbsd.org .\ Copyright (c) 2000 Hugh Graham @@ -26,7 +26,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 July 10, 2009 +.Dd December 14, 2009 .Dt SECMODEL_SECURELEVEL 9 .Os .Sh NAME @@ -45,88 +45,99 @@ .Xr init 8 can lower it. .Pp -.Nm -provides four levels of securelevel, defined as follows: +Four security levels are provided. .Bl -tag -width flag .It \-1 Em Permanently insecure mode -.Bl -hyphen -compact +.Bl -bullet .It Don't raise the securelevel on boot .El .It \ 0 Em Insecure mode -.Bl -hyphen -compact +.Bl -bullet .It The init process (PID 1) may not be traced or accessed by .Xr ptrace 2 or procfs. .It -Immutable and append-only file flags may be changed -.It -All devices may be read or written subject to their permissions -.It -GPIO pins can be set and device drivers can be attached to them +Immutable and append-only file flags may be changed by +.Xr chflags 1 +or by other means. +.It +All devices may be read or written subject to their permissions. +.It +All +.Xr gpio 4 +pins can be set and device drivers can be attached to them. +.It +On architectures that support +.Xr module 4 , +kernel modules can be loaded and unloaded. .El .It \ 1 Em Secure mode -.Bl -hyphen -compact +.Bl -bullet .It -All effects of securelevel 0 +All effects of securelevel 0. .It +The +.Xr kmem 4 +memory files .Pa /dev/mem and .Pa /dev/kmem -may not be written to +may not be written to. .It -Raw disk devices of mounted file systems are read-only +Raw disk devices of mounted file systems are read-only. .It -Immutable and append-only file flags may not be removed +Immutable and append-only file flags may not be removed. .It -Kernel modules may not be loaded or unloaded +Kernel modules may not be loaded or unloaded. .It The .Va net.inet.ip.sourceroute .Xr sysctl 8 -variable may not be changed +variable may not be changed. .It Adding or removing .Xr sysctl 9 -nodes is denied +nodes is denied. .It -The RTC offset may not be changed +The RTC offset may not be changed. .It -Set-id coredump settings may not be altered +Set-id coredump settings may not be altered. .It Attaching the IP-based kernel debugger, .Xr ipkdb 4 , -is not allowed +is not allowed. .It Device .Dq pass-thru -requests that may be used to perform raw disk and/or memory access are denied +requests that may be used to perform raw disk and/or memory access are denied. .It +The .Em iopl and .Em ioperm -calls are denied +calls are denied. .It -Access to unmanaged memory is denied +Access to unmanaged memory is denied. .It -Only GPIO pins that have been set at securelevel 0 can be accessed +Only GPIO pins that have been set at securelevel 0 can be accessed. .El .It \ 2 Em Highly secure mode -.Bl -hyphen -compact +.Bl -bullet .It -All effects of securelevel 1 +All effects of securelevel 1. .It -Raw disk devices are always read-only whether mounted or not +Raw disk devices are always read-only whether mounted or not. .It New disks may not be mounted, and existing mounts may only be downgraded -from read-write to read-only +from read-write to read-only. .It -The system clock may not be set backwards or close to overflow +The system clock may not be set backwards or close to overflow. .It -Per-process coredump name may not be changed +Per-process coredump name may not be changed. .It -Packet filtering and NAT rules may not be altered +Packet filtering and NAT rules may not be altered. .El .El .Pp
CVS commit: src/external/cddl/osnet/lib/libzpool
Module Name:src
Committed By: haad
Date: Tue Dec 14 09:19:15 UTC 2010
Modified Files:
src/external/cddl/osnet/lib/libzpool: Makefile
Log Message:
Use only cas versions of 64 bit atomic ops.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/cddl/osnet/lib/libzpool/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/lib/libzpool/Makefile
diff -u src/external/cddl/osnet/lib/libzpool/Makefile:1.4 src/external/cddl/osnet/lib/libzpool/Makefile:1.5
--- src/external/cddl/osnet/lib/libzpool/Makefile:1.4 Sun Feb 21 01:46:35 2010
+++ src/external/cddl/osnet/lib/libzpool/Makefile Tue Dec 14 09:19:14 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2010/02/21 01:46:35 darran Exp $
+# $NetBSD: Makefile,v 1.5 2010/12/14 09:19:14 haad Exp $
.include ${.CURDIR}/../../dist/uts/common/Makefile.files
.include ../../Makefile.zfs
@@ -13,6 +13,7 @@
DPADD= ${LIBPTHREAD} ${LIBZ}
LDADD= -lpthread -lz
CPPFLAGS+= -std=c99
+#CPPFLAGS+=-Wall -Wno-unknown-pragmas
# Local stuff
SRCS= kernel.c kernel2.c
@@ -26,7 +27,7 @@
.if ${MACHINE_ARCH} == i386
CPPFLAGS+= -D__HAVE_ATOMIC64_OPS # add NetBSD 64 add operations on i386
.PATH: ${NETBSDSRCDIR}/common/lib/libc/atomic
-SRCS+= atomic_add_64_cas.c atomic_add_64_nv_cas.c atomic_inc_64_add.c atomic_dec_64_add.c
+SRCS+= atomic_add_64_cas.c atomic_add_64_nv_cas.c atomic_inc_64_cas.c atomic_dec_64_cas.c
.endif
print:
CVS commit: src/share/man/man7
Module Name:src Committed By: jruoho Date: Tue Dec 14 09:21:30 UTC 2010 Modified Files: src/share/man/man7: orders.7 Log Message: Xref number(1) and units(1). To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/share/man/man7/orders.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/orders.7 diff -u src/share/man/man7/orders.7:1.1 src/share/man/man7/orders.7:1.2 --- src/share/man/man7/orders.7:1.1 Tue Nov 30 20:19:31 2010 +++ src/share/man/man7/orders.7 Tue Dec 14 09:21:30 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: orders.7,v 1.1 2010/11/30 20:19:31 jruoho Exp $ +.\ $NetBSD: orders.7,v 1.2 2010/12/14 09:21:30 jruoho Exp $ .\ .\ Copyright (c) 2010 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -27,14 +27,14 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd November 30, 2010 +.Dd December 14, 2010 .Dt ORDERS 7 .Os .Sh NAME .Nm orders .Nd orders of magnitude .Sh DESCRIPTION -The following table lists common multiple of bytes. +The following table lists common multiples of bytes. .Bl -column -offset 2n \ Kilobyte Prefix Power of 2 Power of 10 .It Sy Name Ta Sy Prefix Ta Sy Power of 2 Ta Sy Power of 10 @@ -52,27 +52,27 @@ .Bl -column -offset 2n \ Septillionth Order Prefix Symbol Decimal .It Sy Name Ta Sy Order Ta Sy Prefix Ta Sy Symbol Ta Sy Decimal -.It Septillionth Ta -24 Ta yocto Ta y Ta 0.0001 -.It Sextillionth Ta -21 Ta zepto Ta z Ta 0.1 -.It Quintillionth Ta -18 Ta atto Ta a Ta 0.01 -.It Quadrillionth Ta -15 Ta femto Ta f Ta 0.001 -.It Trillionth Ta -12 Ta pico Ta p Ta 0.0001 -.It Billionth Ta -9 Ta nano Ta n Ta 0.1 -.It Millionth Ta -6 Ta micro Ta mu Ta 0.01 -.It Thousandth Ta -3 Ta milli Ta m Ta 0.001 -.It Hundredth Ta -2 Ta centi Ta c Ta 0.01 -.It Tenth Ta -1 Ta deci Ta d Ta 0.1 -.It One Ta 0 Ta - Ta - Ta 1 -.It Ten Ta 1 Ta deca Ta da Ta 10 -.It Hundred Ta 2 Ta hecto Ta h Ta 100 -.It Thousand Ta 3 Ta kilo Ta k Ta 1000 -.It Million Ta 6 Ta mega Ta M Ta 100 -.It Billion Ta 9 Ta giga Ta G Ta 1 0 -.It Trillion Ta 12 Ta tera Ta T Ta 1 -.It Quadrillion Ta 15 Ta peta Ta P Ta 1000 -.It Quintillion Ta 18 Ta exa Ta E Ta 100 -.It Sextillion Ta 21 Ta zetta Ta Z Ta 10 -.It Septillion Ta 24 Ta yotta Ta Y Ta 1 +.It Septillionth Ta 10^-24 Ta yocto Ta y Ta 0.0001 +.It Sextillionth Ta 10^-21 Ta zepto Ta z Ta 0.1 +.It Quintillionth Ta 10^-18 Ta atto Ta a Ta 0.01 +.It Quadrillionth Ta 10^-15 Ta femto Ta f Ta 0.001 +.It Trillionth Ta 10^-12 Ta pico Ta p Ta 0.0001 +.It Billionth Ta 10^-9 Ta nano Ta n Ta 0.1 +.It Millionth Ta 10^-6 Ta micro Ta mu Ta 0.01 +.It Thousandth Ta 10^-3 Ta milli Ta m Ta 0.001 +.It Hundredth Ta 10^-2 Ta centi Ta c Ta 0.01 +.It Tenth Ta 10^-1 Ta deci Ta d Ta 0.1 +.It One Ta 10^0 Ta - Ta - Ta 1 +.It Ten Ta 10^1 Ta deca Ta da Ta 10 +.It Hundred Ta 10^2 Ta hecto Ta h Ta 100 +.It Thousand Ta 10^3 Ta kilo Ta k Ta 1000 +.It Million Ta 10^6 Ta mega Ta M Ta 100 +.It Billion Ta 10^9 Ta giga Ta G Ta 1 0 +.It Trillion Ta 10^12 Ta tera Ta T Ta 1 +.It Quadrillion Ta 10^15 Ta peta Ta P Ta 1000 +.It Quintillion Ta 10^18 Ta exa Ta E Ta 100 +.It Sextillion Ta 10^21 Ta zetta Ta Z Ta 10 +.It Septillion Ta 10^24 Ta yotta Ta Y Ta 1 .El .Sh STANDARDS There have been various attempts to standardize the set of binary prefixes. @@ -85,3 +85,6 @@ and .Dq yobi , but the adoption has been slow at best. +.Sh SEE ALSO +.Xr number 1 , +.Xr units 1
CVS commit: src/usr.bin/rump_allserver
Module Name:src Committed By: wiz Date: Tue Dec 14 09:39:53 UTC 2010 Modified Files: src/usr.bin/rump_allserver: rump_allserver.1 Log Message: Fix Xr and use Sx. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/usr.bin/rump_allserver/rump_allserver.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/rump_allserver/rump_allserver.1 diff -u src/usr.bin/rump_allserver/rump_allserver.1:1.1 src/usr.bin/rump_allserver/rump_allserver.1:1.2 --- src/usr.bin/rump_allserver/rump_allserver.1:1.1 Mon Dec 13 19:36:34 2010 +++ src/usr.bin/rump_allserver/rump_allserver.1 Tue Dec 14 09:39:53 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: rump_allserver.1,v 1.1 2010/12/13 19:36:34 pooka Exp $ +.\ $NetBSD: rump_allserver.1,v 1.2 2010/12/14 09:39:53 wiz Exp $ .\ .\ Copyright (c) 2010 Antti Kantee. All rights reserved. .\ @@ -81,7 +81,8 @@ .It Fl m Ar module Load and link a kernel module after the rump kernel is initialized. For this to work, the rump kernel must include the vfs faction, -since the module is loaded using kernel vfs code (see EXAMPLES). +since the module is loaded using kernel vfs code (see +.Sx EXAMPLES ) . .It Fl s Do not detach from the terminal. By default, @@ -93,7 +94,7 @@ After use, .Nm can be made to exit using -.Xr rump.halt . +.Xr rump.halt 1 . .Sh EXAMPLES Start a server and load the tmpfs file system module, and halt the server immediately afterwards:
CVS commit: src/share/man/man4
Module Name:src Committed By: wiz Date: Tue Dec 14 09:46:51 UTC 2010 Modified Files: src/share/man/man4: module.4 Log Message: Wording. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/share/man/man4/module.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/module.4 diff -u src/share/man/man4/module.4:1.4 src/share/man/man4/module.4:1.5 --- src/share/man/man4/module.4:1.4 Mon Dec 13 19:22:01 2010 +++ src/share/man/man4/module.4 Tue Dec 14 09:46:51 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: module.4,v 1.4 2010/12/13 19:22:01 jruoho Exp $ +.\ $NetBSD: module.4,v 1.5 2010/12/14 09:46:51 wiz Exp $ .\ .\ Copyright (c) 1993 Christopher G. Demetriou .\ All rights reserved. @@ -88,7 +88,7 @@ is that the device nodes must exist for the devices to be accessed. These need to be created manually, after the driver module has been successfully loaded. -Majority of the device driver modules do not however +The majority of the device driver modules however does not need any manual intervention to function properly. .Ss Execution Interpreters Execution Interpreters can be loaded to provide support for executing
CVS commit: src/share/man/man7
Module Name:src Committed By: wiz Date: Tue Dec 14 09:51:02 UTC 2010 Modified Files: src/share/man/man7: orders.7 Log Message: Sort SECTIONS, fix xref. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/share/man/man7/orders.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/orders.7 diff -u src/share/man/man7/orders.7:1.2 src/share/man/man7/orders.7:1.3 --- src/share/man/man7/orders.7:1.2 Tue Dec 14 09:21:30 2010 +++ src/share/man/man7/orders.7 Tue Dec 14 09:51:01 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: orders.7,v 1.2 2010/12/14 09:21:30 jruoho Exp $ +.\ $NetBSD: orders.7,v 1.3 2010/12/14 09:51:01 wiz Exp $ .\ .\ Copyright (c) 2010 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -74,6 +74,9 @@ .It Sextillion Ta 10^21 Ta zetta Ta Z Ta 10 .It Septillion Ta 10^24 Ta yotta Ta Y Ta 1 .El +.Sh SEE ALSO +.Xr units 1 , +.Xr number 6 .Sh STANDARDS There have been various attempts to standardize the set of binary prefixes. Organizations such as International Electrotechnical Commission @@ -85,6 +88,3 @@ and .Dq yobi , but the adoption has been slow at best. -.Sh SEE ALSO -.Xr number 1 , -.Xr units 1
CVS commit: src/distrib/sets/lists/tests
Module Name:src Committed By: skrll Date: Tue Dec 14 10:02:02 UTC 2010 Modified Files: src/distrib/sets/lists/tests: mi Log Message: bah set lists. expect this lot back soon(ish). To generate a diff of this commit: cvs rdiff -u -r1.173 -r1.174 src/distrib/sets/lists/tests/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.173 src/distrib/sets/lists/tests/mi:1.174 --- src/distrib/sets/lists/tests/mi:1.173 Tue Dec 14 05:57:31 2010 +++ src/distrib/sets/lists/tests/mi Tue Dec 14 10:02:02 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.173 2010/12/14 05:57:31 skrll Exp $ +# $NetBSD: mi,v 1.174 2010/12/14 10:02:02 skrll Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -380,8 +380,6 @@ ./usr/libdata/debug/usr/tests/lib/libutil/t_sockaddr_snprintf.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/libexec tests-lib-debug ./usr/libdata/debug/usr/tests/libexec/ld.elf_sotests-libexec-debug -./usr/libdata/debug/usr/tests/libexec/ld.elf_so/h_df_1_noopen1.debug tests-libexec-debug debug,atf -./usr/libdata/debug/usr/tests/libexec/ld.elf_so/h_df_1_noopen2.debug tests-libexec-debug debug,atf ./usr/libdata/debug/usr/tests/libexec/ld.elf_so/t_dlerror-cleared.debug tests-libexec-debug debug,atf ./usr/libdata/debug/usr/tests/libexec/ld.elf_so/t_dlerror-false.debug tests-libexec-debug debug,atf ./usr/libdata/debug/usr/tests/libexec/ld.elf_so/t_dlinfo.debug tests-libexec-debug debug,atf @@ -1613,9 +1611,6 @@ ./usr/tests/libexec/Atffile tests-lib-tests atf ./usr/tests/libexec/ld.elf_so tests-libexec-tests ./usr/tests/libexec/ld.elf_so/Atffile tests-libexec-tests atf -./usr/tests/libexec/ld.elf_so/h_df_1_noopen1 tests-libexec-tests atf -./usr/tests/libexec/ld.elf_so/h_df_1_noopen2 tests-libexec-tests atf -./usr/tests/libexec/ld.elf_so/t_df_1_noopen tests-libexec-tests atf ./usr/tests/libexec/ld.elf_so/t_dlerror-cleared tests-libexec-tests atf ./usr/tests/libexec/ld.elf_so/t_dlerror-false tests-libexec-tests atf ./usr/tests/libexec/ld.elf_so/t_dlinfo tests-libexec-tests atf
CVS commit: src/sbin/ifconfig
Module Name:src
Committed By: pooka
Date: Tue Dec 14 10:51:51 UTC 2010
Modified Files:
src/sbin/ifconfig: ifconfig.c
Log Message:
A few weeks ago when i added linkstr support I didn't know that
the string parser gives a proplib object which isn't a terminated
string. Fix that mistake now.
To generate a diff of this commit:
cvs rdiff -u -r1.224 -r1.225 src/sbin/ifconfig/ifconfig.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/ifconfig/ifconfig.c
diff -u src/sbin/ifconfig/ifconfig.c:1.224 src/sbin/ifconfig/ifconfig.c:1.225
--- src/sbin/ifconfig/ifconfig.c:1.224 Mon Dec 13 17:35:08 2010
+++ src/sbin/ifconfig/ifconfig.c Tue Dec 14 10:51:51 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ifconfig.c,v 1.224 2010/12/13 17:35:08 pooka Exp $ */
+/* $NetBSD: ifconfig.c,v 1.225 2010/12/14 10:51:51 pooka Exp $ */
/*-
* Copyright (c) 1997, 1998, 2000 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@
#ifndef lint
__COPYRIGHT(@(#) Copyright (c) 1983, 1993\
The Regents of the University of California. All rights reserved.);
-__RCSID($NetBSD: ifconfig.c,v 1.224 2010/12/13 17:35:08 pooka Exp $);
+__RCSID($NetBSD: ifconfig.c,v 1.225 2010/12/14 10:51:51 pooka Exp $);
#endif /* not lint */
#include sys/param.h
@@ -1316,9 +1316,9 @@
setlinkstr(prop_dictionary_t env, prop_dictionary_t oenv)
{
struct ifdrv ifdrv;
- const char *linkstr;
size_t linkstrlen;
prop_data_t data;
+ char *linkstr;
data = (prop_data_t)prop_dictionary_get(env, linkstr);
if (data == NULL) {
@@ -1326,7 +1326,12 @@
return -1;
}
linkstrlen = prop_data_size(data)+1;
- linkstr = prop_data_data_nocopy(data);
+
+ linkstr = malloc(linkstrlen);
+ if (linkstr == NULL)
+ err(EXIT_FAILURE, malloc linkstr space);
+ if (getargstr(env, linkstr, linkstr, linkstrlen) == -1)
+ errx(EXIT_FAILURE, getargstr linkstr failed);
ifdrv.ifd_cmd = 0;
ifdrv.ifd_len = linkstrlen;
@@ -1334,6 +1339,7 @@
if (direct_ioctl(env, SIOCSLINKSTR, ifdrv) == -1)
err(EXIT_FAILURE, SIOCSLINKSTR);
+ free(linkstr);
return 0;
}
CVS commit: src
Module Name:src
Committed By: pooka
Date: Tue Dec 14 11:03:17 UTC 2010
Modified Files:
src/distrib/sets/lists/tests: mi
src/tests/net/icmp: Makefile
Added Files:
src/tests/net/icmp: t_ping2.sh
Log Message:
Add another version of the simple ping test, this time written as a
shell script and using rump_server, rump.ifconfig and rump.ping.
XXX: uses rump_allserver for now, though, since i noticed a problem
where the rump kernel syscall vector does not get updated for
dlopen()'d libraries (and hence if you dlopen librumpnet.so, socket()
still gives ENOSYS). Me be fixink it later.
To generate a diff of this commit:
cvs rdiff -u -r1.174 -r1.175 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.2 -r1.3 src/tests/net/icmp/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/net/icmp/t_ping2.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.174 src/distrib/sets/lists/tests/mi:1.175
--- src/distrib/sets/lists/tests/mi:1.174 Tue Dec 14 10:02:02 2010
+++ src/distrib/sets/lists/tests/mi Tue Dec 14 11:03:17 2010
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.174 2010/12/14 10:02:02 skrll Exp $
+# $NetBSD: mi,v 1.175 2010/12/14 11:03:17 pooka Exp $
#
# Note: don't delete entries from here - mark them as obsolete instead.
#
@@ -1628,6 +1628,7 @@
./usr/tests/net/icmp/Atffile tests-net-tests atf
./usr/tests/net/icmp/t_forward tests-net-tests atf
./usr/tests/net/icmp/t_ping tests-net-tests atf
+./usr/tests/net/icmp/t_ping2 tests-net-tests atf
./usr/tests/net/if tests-net-tests
./usr/tests/net/if/Atffile tests-net-tests atf
./usr/tests/net/if/t_compat tests-net-tests atf
Index: src/tests/net/icmp/Makefile
diff -u src/tests/net/icmp/Makefile:1.2 src/tests/net/icmp/Makefile:1.3
--- src/tests/net/icmp/Makefile:1.2 Mon Aug 9 15:08:43 2010
+++ src/tests/net/icmp/Makefile Tue Dec 14 11:03:17 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2010/08/09 15:08:43 pooka Exp $
+# $NetBSD: Makefile,v 1.3 2010/12/14 11:03:17 pooka Exp $
#
.include bsd.own.mk
@@ -8,6 +8,8 @@
TESTS_C= t_forward
TESTS_C+= t_ping
+TESTS_SH= t_ping2
+
LDADD+= -lrumpnet_shmif -lrumpnet_netinet -lrumpnet_net -lrumpnet
LDADD+= -lrump -lrumpuser -lpthread
Added files:
Index: src/tests/net/icmp/t_ping2.sh
diff -u /dev/null src/tests/net/icmp/t_ping2.sh:1.1
--- /dev/null Tue Dec 14 11:03:17 2010
+++ src/tests/net/icmp/t_ping2.sh Tue Dec 14 11:03:17 2010
@@ -0,0 +1,75 @@
+# $NetBSD: t_ping2.sh,v 1.1 2010/12/14 11:03:17 pooka Exp $
+#
+# Copyright (c) 2010 The NetBSD Foundation, Inc.
+# 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
+#
+
+atf_test_case basic cleanup
+basic_head()
+{
+
+ atf_set descr Checks that a simple ping works
+}
+
+docfg ()
+{
+
+ sock=${1}
+ addr=${2}
+
+ atf-check -s exit:0 \
+ env RUMP_SERVER=${sock} rump.ifconfig shmif0 create
+ atf-check -s exit:0 \
+ env RUMP_SERVER=${sock} rump.ifconfig shmif0 linkstr bus
+ atf-check -s exit:0 \
+ env RUMP_SERVER=${sock} rump.ifconfig shmif0 inet ${addr}
+}
+
+basic_body()
+{
+
+ atf-check -s exit:0 rump_allserver unix://commsock1
+ atf-check -s exit:0 rump_allserver unix://commsock2
+
+ docfg unix://commsock1 1.2.3.4
+ docfg unix://commsock2 1.2.3.5
+
+ atf-check -s exit:0 -o ignore \
+ env RUMP_SERVER=unix://commsock1 rump.ping -c 1 1.2.3.5
+ atf-check -s exit:0 -o ignore \
+ env RUMP_SERVER=unix://commsock2 rump.ping -c 1 1.2.3.5
+}
+
+basic_cleanup()
+{
+
+ env RUMP_SERVER=unix://commsock1 rump.halt
+ env RUMP_SERVER=unix://commsock2 rump.halt
+}
+
+atf_init_test_cases()
+{
+
+ atf_add_test_case basic
CVS commit: src
Module Name:src Committed By: jruoho Date: Tue Dec 14 13:00:35 UTC 2010 Modified Files: src/lib/libc/stdlib: strsuftoll.3 src/share/man/man7: orders.7 Log Message: Reference strsuftoll(3) and orders(7) with each other. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/lib/libc/stdlib/strsuftoll.3 cvs rdiff -u -r1.3 -r1.4 src/share/man/man7/orders.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/libc/stdlib/strsuftoll.3 diff -u src/lib/libc/stdlib/strsuftoll.3:1.10 src/lib/libc/stdlib/strsuftoll.3:1.11 --- src/lib/libc/stdlib/strsuftoll.3:1.10 Sat May 1 08:35:52 2010 +++ src/lib/libc/stdlib/strsuftoll.3 Tue Dec 14 13:00:34 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: strsuftoll.3,v 1.10 2010/05/01 08:35:52 jruoho Exp $ +.\ $NetBSD: strsuftoll.3,v 1.11 2010/12/14 13:00:34 jruoho Exp $ .\ .\ Copyright (c) 2002,2007 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 1, 2010 +.Dd December 14, 2010 .Dt STRSUFTOLL 3 .Os .Sh NAME @@ -120,7 +120,8 @@ .El .Sh SEE ALSO .Xr errx 3 , -.Xr strtoll 3 +.Xr strtoll 3 , +.Xr orders 7 .Sh BUGS At least few limitations should be mentioned: .Bl -bullet Index: src/share/man/man7/orders.7 diff -u src/share/man/man7/orders.7:1.3 src/share/man/man7/orders.7:1.4 --- src/share/man/man7/orders.7:1.3 Tue Dec 14 09:51:01 2010 +++ src/share/man/man7/orders.7 Tue Dec 14 13:00:35 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: orders.7,v 1.3 2010/12/14 09:51:01 wiz Exp $ +.\ $NetBSD: orders.7,v 1.4 2010/12/14 13:00:35 jruoho Exp $ .\ .\ Copyright (c) 2010 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -76,6 +76,7 @@ .El .Sh SEE ALSO .Xr units 1 , +.Xr strsuftoll 3 , .Xr number 6 .Sh STANDARDS There have been various attempts to standardize the set of binary prefixes.
CVS commit: src/libexec/httpd
Module Name:src Committed By: tls Date: Tue Dec 14 13:27:39 UTC 2010 Modified Files: src/libexec/httpd: cgi-bozo.c Log Message: When invoking a content handler specified via -C, set the REDIRECT_STATUS CGI variable to 200. This approximates the Apache behavior which is required by phpcgi in PHP 5.3 (and by some compilations of older PHP versions). I have a revolutionary idea. Perhaps instead of imposing bizarre requirements on other programs in the name of security, the PHP developers should make their own code compile with oh, I don't know, maybe -Wuninitialized. That might have an effect on the security of systems using PHP rather than on the security of such systems... ...excuse me, got to go now, I think my airquotes just wore out. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/libexec/httpd/cgi-bozo.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/httpd/cgi-bozo.c diff -u src/libexec/httpd/cgi-bozo.c:1.18 src/libexec/httpd/cgi-bozo.c:1.19 --- src/libexec/httpd/cgi-bozo.c:1.18 Mon Sep 20 23:11:38 2010 +++ src/libexec/httpd/cgi-bozo.c Tue Dec 14 13:27:39 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: cgi-bozo.c,v 1.18 2010/09/20 23:11:38 mrg Exp $ */ +/* $NetBSD: cgi-bozo.c,v 1.19 2010/12/14 13:27:39 tls Exp $ */ /* $eterna: cgi-bozo.c,v 1.38 2010/09/20 22:25:00 mrg Exp $ */ @@ -408,6 +408,12 @@ if (request-hr_remoteaddr *request-hr_remoteaddr) bozo_setenv(httpd, REMOTE_ADDR, request-hr_remoteaddr, curenvp++); + /* + * XXX Apache does this when invoking content handlers, and PHP + * XXX 5.3 requires it as a security measure. + */ + if (cgihandler) + bozo_setenv(httpd, REDIRECT_STATUS, 200, curenvp++); bozo_auth_cgi_setenv(request, curenvp); free(file);
CVS commit: src/share/man/man7
Module Name:src Committed By: jruoho Date: Tue Dec 14 13:32:14 UTC 2010 Modified Files: src/share/man/man7: orders.7 Log Message: Fix small format error. Noted by pgoye...@. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/share/man/man7/orders.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/orders.7 diff -u src/share/man/man7/orders.7:1.4 src/share/man/man7/orders.7:1.5 --- src/share/man/man7/orders.7:1.4 Tue Dec 14 13:00:35 2010 +++ src/share/man/man7/orders.7 Tue Dec 14 13:32:14 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: orders.7,v 1.4 2010/12/14 13:00:35 jruoho Exp $ +.\ $NetBSD: orders.7,v 1.5 2010/12/14 13:32:14 jruoho Exp $ .\ .\ Copyright (c) 2010 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -67,7 +67,7 @@ .It Hundred Ta 10^2 Ta hecto Ta h Ta 100 .It Thousand Ta 10^3 Ta kilo Ta k Ta 1000 .It Million Ta 10^6 Ta mega Ta M Ta 100 -.It Billion Ta 10^9 Ta giga Ta G Ta 1 0 +.It Billion Ta 10^9 Ta giga Ta G Ta 10 .It Trillion Ta 10^12 Ta tera Ta T Ta 1 .It Quadrillion Ta 10^15 Ta peta Ta P Ta 1000 .It Quintillion Ta 10^18 Ta exa Ta E Ta 100
CVS commit: src/external/cddl/osnet
Module Name:src
Committed By: tron
Date: Tue Dec 14 14:08:43 UTC 2010
Modified Files:
src/external/cddl/osnet/dev/fbt: fbt.c
src/external/cddl/osnet/dist/uts/common/sys: debug.h note.h
Log Message:
Get DTrace to build again.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/cddl/osnet/dev/fbt/fbt.c
cvs rdiff -u -r1.1.1.2 -r1.2 \
src/external/cddl/osnet/dist/uts/common/sys/debug.h
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/cddl/osnet/dist/uts/common/sys/note.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dev/fbt/fbt.c
diff -u src/external/cddl/osnet/dev/fbt/fbt.c:1.6 src/external/cddl/osnet/dev/fbt/fbt.c:1.7
--- src/external/cddl/osnet/dev/fbt/fbt.c:1.6 Mon May 3 09:28:38 2010
+++ src/external/cddl/osnet/dev/fbt/fbt.c Tue Dec 14 14:08:42 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: fbt.c,v 1.6 2010/05/03 09:28:38 darran Exp $ */
+/* $NetBSD: fbt.c,v 1.7 2010/12/14 14:08:42 tron Exp $ */
/*
* CDDL HEADER START
@@ -72,6 +72,7 @@
#include sys/dtrace.h
#include sys/dtrace_bsd.h
#include sys/kern_ctf.h
+#include sys/dtrace_impl.h
mod_ctf_t *modptr;
Index: src/external/cddl/osnet/dist/uts/common/sys/debug.h
diff -u src/external/cddl/osnet/dist/uts/common/sys/debug.h:1.1.1.2 src/external/cddl/osnet/dist/uts/common/sys/debug.h:1.2
--- src/external/cddl/osnet/dist/uts/common/sys/debug.h:1.1.1.2 Sat Feb 27 22:31:53 2010
+++ src/external/cddl/osnet/dist/uts/common/sys/debug.h Tue Dec 14 14:08:42 2010
@@ -47,11 +47,13 @@
#if defined(__STDC__)
extern int assfail(const char *, const char *, int);
#define VERIFY(EX) ((void)((EX) || assfail(#EX, __FILE__, __LINE__)))
+#ifndef ASSERT
#if DEBUG
#define ASSERT(EX) ((void)((EX) || assfail(#EX, __FILE__, __LINE__)))
#else
#define ASSERT(x) ((void)0)
#endif
+#endif
#else /* defined(__STDC__) */
extern int assfail();
#define VERIFY(EX) ((void)((EX) || assfail(EX, __FILE__, __LINE__)))
Index: src/external/cddl/osnet/dist/uts/common/sys/note.h
diff -u src/external/cddl/osnet/dist/uts/common/sys/note.h:1.1.1.1 src/external/cddl/osnet/dist/uts/common/sys/note.h:1.2
--- src/external/cddl/osnet/dist/uts/common/sys/note.h:1.1.1.1 Fri Aug 7 18:33:48 2009
+++ src/external/cddl/osnet/dist/uts/common/sys/note.h Tue Dec 14 14:08:42 2010
@@ -39,7 +39,7 @@
#ifndef _SYS_NOTE_H
#define _SYS_NOTE_H
-#pragma ident %Z%%M% %I% %E% SMI
+/* #pragma ident %Z%%M% %I% %E% SMI */
#ifdef __cplusplus
extern C {
CVS commit: src/usr.bin/sdpquery
Module Name:src
Committed By: plunky
Date: Tue Dec 14 15:18:20 UTC 2010
Modified Files:
src/usr.bin/sdpquery: print.c
Log Message:
on reflection we can use uintmax_t here instead of trying to decode
the value manually, as only 17 bits are defined and the value is
unlikely to exceed UINTMAX_MAX (would only prevent decoding)
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/sdpquery/print.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/sdpquery/print.c
diff -u src/usr.bin/sdpquery/print.c:1.6 src/usr.bin/sdpquery/print.c:1.7
--- src/usr.bin/sdpquery/print.c:1.6 Mon Dec 13 21:08:37 2010
+++ src/usr.bin/sdpquery/print.c Tue Dec 14 15:18:20 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: print.c,v 1.6 2010/12/13 21:08:37 plunky Exp $ */
+/* $NetBSD: print.c,v 1.7 2010/12/14 15:18:20 plunky Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: print.c,v 1.6 2010/12/13 21:08:37 plunky Exp $);
+__RCSID($NetBSD: print.c,v 1.7 2010/12/14 15:18:20 plunky Exp $);
#include ctype.h
#include iconv.h
@@ -1375,45 +1375,39 @@
static void
print_character_repertoires(sdp_data_t *data)
{
- sdp_data_t d;
- uint32_t v0, v1, v2, v3;
+ uintmax_t v;
/*
- * we have no uint128 type, so need to decode it manually
+ * we have no uint128 type so use uintmax as only
+ * only 17-bits are currently defined, and if the
+ * value is out of bounds it will be printed anyway
*/
-
- if (sdp_data_type(data) != SDP_DATA_UINT128)
+ if (sdp_data_type(data) != SDP_DATA_UINT128
+ || !sdp_get_uint(data, v))
return;
- sdp_get_data(data, d);
- v0 = be32dec(d.next + 1);
- v1 = be32dec(d.next + 5);
- v2 = be32dec(d.next + 9);
- v3 = be32dec(d.next + 13);
-
if (Nflag)
- printf((0x%08x%08x%08x%08x), v0, v1, v2, v3);
+ printf((0x%016jx), v);
printf(\n);
-
- if (v0 (1 0)) printf(ISO-8859-1\n);
- if (v0 (1 1)) printf(ISO-8859-2\n);
- if (v0 (1 2)) printf(ISO-8859-3\n);
- if (v0 (1 3)) printf(ISO-8859-4\n);
- if (v0 (1 4)) printf(ISO-8859-5\n);
- if (v0 (1 5)) printf(ISO-8859-6\n);
- if (v0 (1 6)) printf(ISO-8859-7\n);
- if (v0 (1 7)) printf(ISO-8859-8\n);
- if (v0 (1 8)) printf(ISO-8859-9\n);
- if (v0 (1 9)) printf(ISO-8859-10\n);
- if (v0 (110)) printf(ISO-8859-13\n);
- if (v0 (111)) printf(ISO-8859-14\n);
- if (v0 (112)) printf(ISO-8859-15\n);
- if (v0 (113)) printf(GB18030\n);
- if (v0 (114)) printf(JIS X0208-1990, JIS X0201-1976\n);
- if (v0 (115)) printf(KSC 5601-1992\n);
- if (v0 (116)) printf(Big5\n);
- if (v0 (117)) printf(TIS-620\n);
+ if (v (1 0)) printf(ISO-8859-1\n);
+ if (v (1 1)) printf(ISO-8859-2\n);
+ if (v (1 2)) printf(ISO-8859-3\n);
+ if (v (1 3)) printf(ISO-8859-4\n);
+ if (v (1 4)) printf(ISO-8859-5\n);
+ if (v (1 5)) printf(ISO-8859-6\n);
+ if (v (1 6)) printf(ISO-8859-7\n);
+ if (v (1 7)) printf(ISO-8859-8\n);
+ if (v (1 8)) printf(ISO-8859-9\n);
+ if (v (1 9)) printf(ISO-8859-10\n);
+ if (v (110)) printf(ISO-8859-13\n);
+ if (v (111)) printf(ISO-8859-14\n);
+ if (v (112)) printf(ISO-8859-15\n);
+ if (v (113)) printf(GB18030\n);
+ if (v (114)) printf(JIS X0208-1990, JIS X0201-1976\n);
+ if (v (115)) printf(KSC 5601-1992\n);
+ if (v (116)) printf(Big5\n);
+ if (v (117)) printf(TIS-620\n);
}
static void
CVS commit: src/sys/arch/i386/include
Module Name:src Committed By: haad Date: Tue Dec 14 15:50:07 UTC 2010 Modified Files: src/sys/arch/i386/include: types.h Log Message: Revert change made in revision 1.66 by ad@ this is not true and 64bit atomic ops should be enabled in libc by default. To generate a diff of this commit: cvs rdiff -u -r1.68 -r1.69 src/sys/arch/i386/include/types.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/include/types.h diff -u src/sys/arch/i386/include/types.h:1.68 src/sys/arch/i386/include/types.h:1.69 --- src/sys/arch/i386/include/types.h:1.68 Tue Sep 21 00:18:05 2010 +++ src/sys/arch/i386/include/types.h Tue Dec 14 15:50:07 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: types.h,v 1.68 2010/09/21 00:18:05 jym Exp $ */ +/* $NetBSD: types.h,v 1.69 2010/12/14 15:50:07 haad Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -107,12 +107,12 @@ #define __HAVE_SYSCALL_INTERN #define __HAVE_MINIMAL_EMUL #define __HAVE_OLD_DISKLABEL +#define __HAVE_ATOMIC64_OPS #define __HAVE_ATOMIC_AS_MEMBAR #define __HAVE_CPU_LWP_SETPRIVATE #define __HAVE_INTR_CONTROL #if defined(_KERNEL) -#define __HAVE_ATOMIC64_OPS /* not true for i486 in userspace */ #define __HAVE_RAS #endif
CVS commit: src
Module Name:src Committed By: jruoho Date: Tue Dec 14 16:18:16 UTC 2010 Modified Files: src/distrib/sets/lists/man: mi src/share/man/man4: Makefile src/share/man/man7: Makefile intro.7 Added Files: src/share/man/man7: module.7 Removed Files: src/share/man/man4: module.4 Log Message: By majority vote, move module(4) to the section 7. To generate a diff of this commit: cvs rdiff -u -r1.1267 -r1.1268 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.538 -r1.539 src/share/man/man4/Makefile cvs rdiff -u -r1.5 -r0 src/share/man/man4/module.4 cvs rdiff -u -r1.25 -r1.26 src/share/man/man7/Makefile cvs rdiff -u -r1.17 -r1.18 src/share/man/man7/intro.7 cvs rdiff -u -r0 -r1.1 src/share/man/man7/module.7 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.1267 src/distrib/sets/lists/man/mi:1.1268 --- src/distrib/sets/lists/man/mi:1.1267 Mon Dec 13 19:36:34 2010 +++ src/distrib/sets/lists/man/mi Tue Dec 14 16:18:16 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1267 2010/12/13 19:36:34 pooka Exp $ +# $NetBSD: mi,v 1.1268 2010/12/14 16:18:16 jruoho Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -1241,7 +1241,7 @@ ./usr/share/man/cat4/mk48txx.0 man-sys-catman .cat ./usr/share/man/cat4/mlx.0 man-sys-catman .cat ./usr/share/man/cat4/mly.0 man-sys-catman .cat -./usr/share/man/cat4/module.0 man-sys-catman .cat +./usr/share/man/cat4/module.0 man-obsolete obsolete ./usr/share/man/cat4/mpls.0 man-sys-catman .cat ./usr/share/man/cat4/mpt.0 man-sys-catman .cat ./usr/share/man/cat4/mpu.0 man-sys-catman .cat @@ -1979,6 +1979,7 @@ ./usr/share/man/cat7/mandoc.0 man-obsolete obsolete ./usr/share/man/cat7/mdoc.0 man-groff-catman .cat,groff ./usr/share/man/cat7/miscellaneous.0 man-obsolete obsolete +./usr/share/man/cat7/module.0 man-reference-catman .cat ./usr/share/man/cat7/msafer.0 man-obsolete obsolete ./usr/share/man/cat7/nls.0 man-reference-catman .cat ./usr/share/man/cat7/orders.0 man-reference-catman .cat @@ -3923,7 +3924,7 @@ ./usr/share/man/html4/mk48txx.html man-sys-htmlman html ./usr/share/man/html4/mlx.html man-sys-htmlman html ./usr/share/man/html4/mly.html man-sys-htmlman html -./usr/share/man/html4/module.html man-sys-htmlman html +./usr/share/man/html4/module.html man-obsolete obsolete ./usr/share/man/html4/mpls.html man-sys-htmlman html ./usr/share/man/html4/mpt.html man-sys-htmlman html ./usr/share/man/html4/mpu.html man-sys-htmlman html @@ -4599,6 +4600,7 @@ ./usr/share/man/html7/lint.html man-reference-htmlman html ./usr/share/man/html7/mailaddr.html man-reference-htmlman html ./usr/share/man/html7/mdoc.html man-groff-htmlman html,groff +./usr/share/man/html7/module.html man-reference-htmlman html ./usr/share/man/html7/nls.html man-reference-htmlman html ./usr/share/man/html7/orders.html man-reference-htmlman html ./usr/share/man/html7/pcap-filter.html man-netutil-htmlman html @@ -6461,7 +6463,7 @@ ./usr/share/man/man4/mk48txx.4 man-sys-man .man ./usr/share/man/man4/mlx.4 man-sys-man .man ./usr/share/man/man4/mly.4 man-sys-man .man -./usr/share/man/man4/module.4 man-sys-man .man +./usr/share/man/man4/module.4 man-obsolete obsolete ./usr/share/man/man4/mpls.4 man-sys-man .man ./usr/share/man/man4/mpt.4 man-sys-man .man ./usr/share/man/man4/mpu.4 man-sys-man .man @@ -7198,6 +7200,7 @@ ./usr/share/man/man7/mailaddr.7 man-reference-man .man ./usr/share/man/man7/mandoc.7 man-obsolete obsolete ./usr/share/man/man7/mdoc.7 man-groff-man .man,groff +./usr/share/man/man7/module.7 man-reference-man .man ./usr/share/man/man7/msafer.7 man-obsolete obsolete ./usr/share/man/man7/nls.7 man-reference-man .man ./usr/share/man/man7/orders.7 man-reference-man .man Index: src/share/man/man4/Makefile diff -u src/share/man/man4/Makefile:1.538 src/share/man/man4/Makefile:1.539 --- src/share/man/man4/Makefile:1.538 Sun Dec 12 19:29:01 2010 +++ src/share/man/man4/Makefile Tue Dec 14 16:18:15 2010 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.538 2010/12/12 19:29:01 pgoyette Exp $ +# $NetBSD: Makefile,v 1.539 2010/12/14 16:18:15 jruoho Exp $ # @(#)Makefile 8.1 (Berkeley) 6/18/93 MAN= aac.4 ac97.4 acardide.4 aceride.4 acphy.4 \ @@ -37,7 +37,7 @@ kloader.4 kse.4 ksyms.4 kttcp.4 \ lc.4 ld.4 lii.4 lo.4 lxtphy.4 \ mainbus.4 makphy.4 mbe.4 mca.4 mcclock.4 md.4 mfb.4 mfi.4 mhzc.4 \ - midi.4 mii.4 mk48txx.4 mlx.4 mly.4 module.4 mpls.4 mpt.4 mpu.4 mtd.4 \ + midi.4 mii.4 mk48txx.4 mlx.4 mly.4 mpls.4 mpt.4 mpu.4 mtd.4 \ mtio.4 multicast.4 mvsata.4 \ nadb.4 ne.4 neo.4 netintro.4 nfe.4 nfsmb.4 njata.4 njs.4 \ nsclpcsio.4 nside.4 nsp.4 nsphy.4 nsphyter.4 ntwoc.4 null.4 nsmb.4 \ Index: src/share/man/man7/Makefile diff -u src/share/man/man7/Makefile:1.25
CVS commit: src
Module Name:src Committed By: jruoho Date: Tue Dec 14 16:24:00 UTC 2010 Modified Files: src/lib/libc/sys: modctl.2 src/sbin/modload: modload.8 src/sbin/modstat: modstat.8 src/sbin/modunload: modunload.8 src/share/man/man7: sysctl.7 src/share/man/man9: module.9 Log Message: Fix xref; module(4) - module(7). To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/lib/libc/sys/modctl.2 cvs rdiff -u -r1.39 -r1.40 src/sbin/modload/modload.8 cvs rdiff -u -r1.7 -r1.8 src/sbin/modstat/modstat.8 cvs rdiff -u -r1.19 -r1.20 src/sbin/modunload/modunload.8 cvs rdiff -u -r1.52 -r1.53 src/share/man/man7/sysctl.7 cvs rdiff -u -r1.24 -r1.25 src/share/man/man9/module.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/sys/modctl.2 diff -u src/lib/libc/sys/modctl.2:1.7 src/lib/libc/sys/modctl.2:1.8 --- src/lib/libc/sys/modctl.2:1.7 Mon Dec 13 10:07:46 2010 +++ src/lib/libc/sys/modctl.2 Tue Dec 14 16:23:59 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: modctl.2,v 1.7 2010/12/13 10:07:46 jruoho Exp $ +.\ $NetBSD: modctl.2,v 1.8 2010/12/14 16:23:59 jruoho Exp $ .\ .\ Copyright (c) 2009 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -24,7 +24,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd December 13, 2010 +.Dd December 14, 2010 .Dt MODCTL 2 .Os .Sh NAME @@ -270,7 +270,7 @@ information. .El .Sh SEE ALSO -.Xr module 4 , +.Xr module 7 , .Xr module 9 .Sh HISTORY The Index: src/sbin/modload/modload.8 diff -u src/sbin/modload/modload.8:1.39 src/sbin/modload/modload.8:1.40 --- src/sbin/modload/modload.8:1.39 Mon Dec 13 10:07:47 2010 +++ src/sbin/modload/modload.8 Tue Dec 14 16:23:59 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: modload.8,v 1.39 2010/12/13 10:07:47 jruoho Exp $ +.\ $NetBSD: modload.8,v 1.40 2010/12/14 16:23:59 jruoho Exp $ .\ .\ Copyright (c) 1993 Christopher G. Demetriou .\ All rights reserved. @@ -32,7 +32,7 @@ .\ .\ Id: LICENSE,v 1.2 2000/06/14 15:57:33 cgd Exp .\ -.Dd December 13, 2010 +.Dd December 14, 2010 .Dt MODLOAD 8 .Os .Sh NAME @@ -126,7 +126,7 @@ utility exits with a status of 0 on success and with a nonzero status if an error occurs. .Sh SEE ALSO -.Xr module 4 , +.Xr module 7 , .Xr modstat 8 , .Xr modunload 8 .Sh HISTORY Index: src/sbin/modstat/modstat.8 diff -u src/sbin/modstat/modstat.8:1.7 src/sbin/modstat/modstat.8:1.8 --- src/sbin/modstat/modstat.8:1.7 Mon Dec 13 10:07:47 2010 +++ src/sbin/modstat/modstat.8 Tue Dec 14 16:23:59 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: modstat.8,v 1.7 2010/12/13 10:07:47 jruoho Exp $ +.\ $NetBSD: modstat.8,v 1.8 2010/12/14 16:23:59 jruoho Exp $ .\ .\ Copyright (c) 1993 Christopher G. Demetriou .\ All rights reserved. @@ -32,7 +32,7 @@ .\ .\ Id: LICENSE,v 1.2 2000/06/14 15:57:33 cgd Exp .\ -.Dd December 13, 2010 +.Dd December 14, 2010 .Dt MODSTAT 8 .Os .Sh NAME @@ -84,7 +84,7 @@ utility exits with a status of 0 on success and with a nonzero status if an error occurs. .Sh SEE ALSO -.Xr module 4 , +.Xr module 7 , .Xr modload 8 , .Xr modunload 8 .Sh HISTORY Index: src/sbin/modunload/modunload.8 diff -u src/sbin/modunload/modunload.8:1.19 src/sbin/modunload/modunload.8:1.20 --- src/sbin/modunload/modunload.8:1.19 Mon Dec 13 10:07:47 2010 +++ src/sbin/modunload/modunload.8 Tue Dec 14 16:24:00 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: modunload.8,v 1.19 2010/12/13 10:07:47 jruoho Exp $ +.\ $NetBSD: modunload.8,v 1.20 2010/12/14 16:24:00 jruoho Exp $ .\ .\ Copyright (c) 1993 Christopher G. Demetriou .\ All rights reserved. @@ -32,7 +32,7 @@ .\ .\ Id: LICENSE,v 1.2 2000/06/14 15:57:33 cgd Exp .\ -.Dd December 13, 2010 +.Dd December 14, 2010 .Dt MODUNLOAD 8 .Os .Sh NAME @@ -61,7 +61,7 @@ utility exits with a status of 0 on success and with a nonzero status if an error occurs. .Sh SEE ALSO -.Xr module 4 , +.Xr module 7 , .Xr modload 8 , .Xr modstat 8 .Sh HISTORY Index: src/share/man/man7/sysctl.7 diff -u src/share/man/man7/sysctl.7:1.52 src/share/man/man7/sysctl.7:1.53 --- src/share/man/man7/sysctl.7:1.52 Sat Dec 11 19:55:53 2010 +++ src/share/man/man7/sysctl.7 Tue Dec 14 16:23:59 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: sysctl.7,v 1.52 2010/12/11 19:55:53 jruoho Exp $ +.\ $NetBSD: sysctl.7,v 1.53 2010/12/14 16:23:59 jruoho Exp $ .\ .\ Copyright (c) 1993 .\ The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\ .\ @(#)sysctl.3 8.4 (Berkeley) 5/9/95 .\ -.Dd December 11, 2010 +.Dd December 14, 2010 .Dt SYSCTL 7 .Os .Sh NAME @@ -700,7 +700,7 @@ .It Li kern.module.autoload A boolean that controls whether kernel modules are loaded automatically. See -.Xr module 9 +.Xr module 7 for additional details. .It Li kern.module.verbose A boolean that enables or disables verbose Index: src/share/man/man9/module.9 diff -u src/share/man/man9/module.9:1.24
CVS commit: src/sys/nfs
Module Name:src
Committed By: cegger
Date: Tue Dec 14 16:25:19 UTC 2010
Modified Files:
src/sys/nfs: nfs_vnops.c
Log Message:
back out rev. 1.285. The problem I try to hunt down
in PR 42455 is not in the network stack as shown by PR 44206.
To generate a diff of this commit:
cvs rdiff -u -r1.287 -r1.288 src/sys/nfs/nfs_vnops.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/nfs/nfs_vnops.c
diff -u src/sys/nfs/nfs_vnops.c:1.287 src/sys/nfs/nfs_vnops.c:1.288
--- src/sys/nfs/nfs_vnops.c:1.287 Tue Nov 30 10:43:05 2010
+++ src/sys/nfs/nfs_vnops.c Tue Dec 14 16:25:18 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_vnops.c,v 1.287 2010/11/30 10:43:05 dholland Exp $ */
+/* $NetBSD: nfs_vnops.c,v 1.288 2010/12/14 16:25:18 cegger Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -39,7 +39,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: nfs_vnops.c,v 1.287 2010/11/30 10:43:05 dholland Exp $);
+__KERNEL_RCSID(0, $NetBSD: nfs_vnops.c,v 1.288 2010/12/14 16:25:18 cegger Exp $);
#ifdef _KERNEL_OPT
#include opt_nfs.h
@@ -1369,14 +1369,6 @@
if (v3) {
wccflag = NFSV3_WCCCHK;
nfsm_wcc_data(vp, wccflag, NAC_NOTRUNC, !error);
-
- /* Diagnostic check: The KASSERT hits when PR 42455
- * is reproduced.
- */
- if (ctx.nwc_mbufcount = 2) {
-KASSERT(mb-m_next != NULL);
- }
-
if (!error) {
nfsm_dissect(tl, u_int32_t *, 2 * NFSX_UNSIGNED
+ NFSX_V3WRITEVERF);
CVS commit: src/share/man/man8
Module Name:src Committed By: jruoho Date: Tue Dec 14 16:39:33 UTC 2010 Modified Files: src/share/man/man8: intro.8 Log Message: Remove Xref to format(8) as it is available only on VAX and HP300. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/share/man/man8/intro.8 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/man8/intro.8 diff -u src/share/man/man8/intro.8:1.9 src/share/man/man8/intro.8:1.10 --- src/share/man/man8/intro.8:1.9 Thu Aug 7 10:31:21 2003 +++ src/share/man/man8/intro.8 Tue Dec 14 16:39:33 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: intro.8,v 1.9 2003/08/07 10:31:21 agc Exp $ +.\ $NetBSD: intro.8,v 1.10 2010/12/14 16:39:33 jruoho Exp $ .\ .\ Copyright (c) 1983, 1991, 1993 .\ The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\ .\ @(#)intro.8 8.2 (Berkeley) 12/11/93 .\ -.Dd September 22, 2002 +.Dd December 14, 2010 .Dt INTRO 8 .Os .Sh NAME @@ -49,11 +49,6 @@ .Pq Xr dump 8 , and recover files when disks die an untimely death .Pq Xr restore 8 . -The -.Xr format 8 -manual -for the specific architecture the system is running on should be -consulted when formatting disks and tapes. Network related services like .Xr inetd 8 and
CVS commit: src/usr.bin/rump_allserver
Module Name:src
Committed By: pooka
Date: Tue Dec 14 16:40:05 UTC 2010
Modified Files:
src/usr.bin/rump_allserver: rump_allserver.1 rump_allserver.c
Log Message:
Add -d which can be used to register host-backed block devices in
the rump kernel.
It would be cool if this, and the other options, could be specified
in a config file (plist or other).
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/rump_allserver/rump_allserver.1
cvs rdiff -u -r1.8 -r1.9 src/usr.bin/rump_allserver/rump_allserver.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/rump_allserver/rump_allserver.1
diff -u src/usr.bin/rump_allserver/rump_allserver.1:1.2 src/usr.bin/rump_allserver/rump_allserver.1:1.3
--- src/usr.bin/rump_allserver/rump_allserver.1:1.2 Tue Dec 14 09:39:53 2010
+++ src/usr.bin/rump_allserver/rump_allserver.1 Tue Dec 14 16:40:05 2010
@@ -1,4 +1,4 @@
-.\ $NetBSD: rump_allserver.1,v 1.2 2010/12/14 09:39:53 wiz Exp $
+.\ $NetBSD: rump_allserver.1,v 1.3 2010/12/14 16:40:05 pooka Exp $
.\
.\ Copyright (c) 2010 Antti Kantee. All rights reserved.
.\
@@ -33,6 +33,7 @@
.Sh SYNOPSIS
.Nm
.Op Fl s
+.Op Fl d Ar drivespec
.Op Fl l Ar library
.Op Fl m Ar module
.Ar url
@@ -59,6 +60,30 @@
At execution time it is possible to load components from the command
line as described in the options section.
.Bl -tag -width indent
+.It Fl d Ar drivespec
+The argument
+.Ar drivespec
+maps a host file a block device in the rump fs namespace.
+The string
+.Ar drivespec
+must be of comma-separated
+.Dq name=value
+format and must contain the following tokens:
+.Bl -tag -width hostpath1234
+.It Ar key
+Block device path in rump namespace.
+This must be specified according to the rules for a key in
+.Xr rump_etfs 3 .
+.It Ar hostpath
+Host file used for storage.
+If the file does not exist, it will be created.
+.It Ar size
+Size of the mapping.
+The host file will be truncated to the size indicated.
+Similar to
+.Xr dd 1 ,
+this argument accepts a suffix as the multiplier for the number.
+.El
.It Fl l Ar library
Call
.Fn dlopen
@@ -102,6 +127,15 @@
$ rump_server -lrumpvfs -m /modules/tmpfs.kmod unix://sock
$ env RUMP_SERVER=unix://sock rump.halt
.Ed
+.Pp
+Start a server with the one gigabyte host file
+.Pa dk.img
+mapped as the block device
+.Pa /dev/dk
+in the rump kernel.
+.Bd -literal -offset indent
+$ rump_allserver -d key=/dev/dk,hostpath=dk.img,size=1g unix://sock
+.Ed
.Sh SEE ALSO
.Xr rump.halt 1 ,
.Xr dlopen 3 ,
Index: src/usr.bin/rump_allserver/rump_allserver.c
diff -u src/usr.bin/rump_allserver/rump_allserver.c:1.8 src/usr.bin/rump_allserver/rump_allserver.c:1.9
--- src/usr.bin/rump_allserver/rump_allserver.c:1.8 Mon Dec 13 14:26:22 2010
+++ src/usr.bin/rump_allserver/rump_allserver.c Tue Dec 14 16:40:05 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rump_allserver.c,v 1.8 2010/12/13 14:26:22 pooka Exp $ */
+/* $NetBSD: rump_allserver.c,v 1.9 2010/12/14 16:40:05 pooka Exp $ */
/*-
* Copyright (c) 2010 Antti Kantee. All Rights Reserved.
@@ -27,7 +27,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: rump_allserver.c,v 1.8 2010/12/13 14:26:22 pooka Exp $);
+__RCSID($NetBSD: rump_allserver.c,v 1.9 2010/12/14 16:40:05 pooka Exp $);
#endif /* !lint */
#include sys/types.h
@@ -40,6 +40,7 @@
#include dlfcn.h
#include err.h
#include errno.h
+#include fcntl.h
#include semaphore.h
#include stdio.h
#include stdlib.h
@@ -50,7 +51,8 @@
usage(void)
{
- fprintf(stderr, usage: %s [args] bindurl\n, getprogname());
+ fprintf(stderr, usage: %s [-d drivespec]Â [-l libs] [-m modules]Â [-s]
+ bindurl\n, getprogname());
exit(1);
}
@@ -72,20 +74,88 @@
sem_post(sigsem);
}
+static const char *const disktokens[] = {
+#define DKEY 0
+ key,
+#define DFILE 1
+ hostpath,
+#define DSIZE 2
+ size,
+ NULL
+};
+
+struct etfsreg {
+ const char *key;
+ const char *hostpath;
+ off_t flen;
+ enum rump_etfs_type type;
+};
+
int
main(int argc, char *argv[])
{
const char *serverurl;
char **modarray = NULL;
unsigned nmods = 0, curmod = 0, i;
+ struct etfsreg *etfs = NULL;
+ unsigned netfs = 0, curetfs = 0;
int error;
int ch, sflag;
setprogname(argv[0]);
sflag = 0;
- while ((ch = getopt(argc, argv, l:m:s)) != -1) {
+ while ((ch = getopt(argc, argv, d:l:m:s)) != -1) {
switch (ch) {
+ case 'd': {
+ char *options, *value;
+ char *key, *hostpath;
+ long long flen;
+
+ flen = 0;
+ key = hostpath = NULL;
+ options = optarg;
+ while (*options) {
+switch (getsubopt(options,
+__UNCONST(disktokens), value)) {
+case DKEY:
+ key = value;
+ break;
+case DFILE:
+ hostpath = value;
+ break;
+case DSIZE:
+ /* XXX: off_t max? */
+ flen = strsuftoll(-d size, value,
+ 0, LLONG_MAX);
+ break;
+default:
+ fprintf(stderr, invalid dtoken\n);
+ usage();
+ break;
+}
+ }
+
+ if (key ==
CVS commit: src/sys/nfs
Module Name:src
Committed By: cegger
Date: Tue Dec 14 16:58:59 UTC 2010
Modified Files:
src/sys/nfs: nfs_vnops.c
Log Message:
Initialize mutex and cv after sanity checks
To generate a diff of this commit:
cvs rdiff -u -r1.288 -r1.289 src/sys/nfs/nfs_vnops.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/nfs/nfs_vnops.c
diff -u src/sys/nfs/nfs_vnops.c:1.288 src/sys/nfs/nfs_vnops.c:1.289
--- src/sys/nfs/nfs_vnops.c:1.288 Tue Dec 14 16:25:18 2010
+++ src/sys/nfs/nfs_vnops.c Tue Dec 14 16:58:58 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_vnops.c,v 1.288 2010/12/14 16:25:18 cegger Exp $ */
+/* $NetBSD: nfs_vnops.c,v 1.289 2010/12/14 16:58:58 cegger Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -39,7 +39,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: nfs_vnops.c,v 1.288 2010/12/14 16:25:18 cegger Exp $);
+__KERNEL_RCSID(0, $NetBSD: nfs_vnops.c,v 1.289 2010/12/14 16:58:58 cegger Exp $);
#ifdef _KERNEL_OPT
#include opt_nfs.h
@@ -1278,10 +1278,6 @@
int rlen, commit;
#endif
- mutex_init(ctx.nwc_lock, MUTEX_DRIVER, IPL_VM);
- cv_init(ctx.nwc_cv, nfsmblk);
- ctx.nwc_mbufcount = 1;
-
if (vp-v_mount-mnt_flag MNT_RDONLY) {
panic(writerpc readonly vp %p, vp);
}
@@ -1292,7 +1288,12 @@
#endif
tsiz = uiop-uio_resid;
if (uiop-uio_offset + tsiz nmp-nm_maxfilesize)
- return (EFBIG);
+ return EFBIG;
+
+ mutex_init(ctx.nwc_lock, MUTEX_DRIVER, IPL_VM);
+ cv_init(ctx.nwc_cv, nfsmblk);
+ ctx.nwc_mbufcount = 1;
+
retry:
origresid = uiop-uio_resid;
KASSERT(origresid == uiop-uio_iov-iov_len);
CVS commit: src/distrib/utils/x_ifconfig
Module Name:src
Committed By: hannken
Date: Tue Dec 14 17:07:08 UTC 2010
Modified Files:
src/distrib/utils/x_ifconfig: Makefile
Log Message:
Make the definition of CRUNCHOPS independent of SMALLPROG_INET6 / USE_INET6.
Distrib/sparc64/instfs now builds again.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/distrib/utils/x_ifconfig/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/x_ifconfig/Makefile
diff -u src/distrib/utils/x_ifconfig/Makefile:1.31 src/distrib/utils/x_ifconfig/Makefile:1.32
--- src/distrib/utils/x_ifconfig/Makefile:1.31 Mon Dec 13 21:47:32 2010
+++ src/distrib/utils/x_ifconfig/Makefile Tue Dec 14 17:07:08 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2010/12/13 21:47:32 pooka Exp $
+# $NetBSD: Makefile,v 1.32 2010/12/14 17:07:08 hannken Exp $
# Build a smaller ifconfig (i.e. for boot media)
.include bsd.own.mk
@@ -8,8 +8,9 @@
SRCDIR= ${.CURDIR}/../../../sbin/ifconfig
+CPPFLAGS+= -DCRUNCHOPS
.if defined(SMALLPROG_INET6) (${USE_INET6} != no)
-CPPFLAGS+= -DINET6 -DCRUNCHOPS
+CPPFLAGS+= -DINET6
SRCS+= af_inet6.c
.endif
CVS commit: src
Module Name:src Committed By: jruoho Date: Tue Dec 14 17:09:28 UTC 2010 Modified Files: src/distrib/sets/lists/comp: mi src/share/man/man3: Makefile Added Files: src/share/man/man3: makedev.3 Log Message: Add a manual page for the makedev(), major(), and minor() macros. Taken from FreeBSD. Written by Ed Schouten. To generate a diff of this commit: cvs rdiff -u -r1.1541 -r1.1542 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.57 -r1.58 src/share/man/man3/Makefile cvs rdiff -u -r0 -r1.1 src/share/man/man3/makedev.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.1541 src/distrib/sets/lists/comp/mi:1.1542 --- src/distrib/sets/lists/comp/mi:1.1541 Mon Dec 13 21:15:30 2010 +++ src/distrib/sets/lists/comp/mi Tue Dec 14 17:09:27 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1541 2010/12/13 21:15:30 pooka Exp $ +# $NetBSD: mi,v 1.1542 2010/12/14 17:09:27 jruoho Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -7235,7 +7235,9 @@ ./usr/share/man/cat3/magic_load.0 comp-c-catman .cat ./usr/share/man/cat3/magic_open.0 comp-c-catman .cat ./usr/share/man/cat3/magic_setflags.0 comp-c-catman .cat +./usr/share/man/cat3/major.0 comp-c-catman .cat ./usr/share/man/cat3/makecontext.0 comp-c-catman .cat +./usr/share/man/cat3/makedev.0 comp-c-catman .cat ./usr/share/man/cat3/malloc.0 comp-c-catman .cat ./usr/share/man/cat3/man.0 comp-mdocml-catman .cat ./usr/share/man/cat3/math.0 comp-c-catman .cat @@ -7290,6 +7292,7 @@ ./usr/share/man/cat3/mergesort.0 comp-c-catman .cat ./usr/share/man/cat3/meta.0 comp-c-catman .cat ./usr/share/man/cat3/mi_vector_hash.0 comp-c-catman .cat +./usr/share/man/cat3/minor.0 comp-c-catman .cat ./usr/share/man/cat3/mkdtemp.0 comp-c-catman .cat ./usr/share/man/cat3/mkstemp.0 comp-c-catman .cat ./usr/share/man/cat3/mktemp.0 comp-c-catman .cat @@ -13199,7 +13202,9 @@ ./usr/share/man/html3/magic_load.html comp-c-htmlman html ./usr/share/man/html3/magic_open.html comp-c-htmlman html ./usr/share/man/html3/magic_setflags.html comp-c-htmlman html +./usr/share/man/html3/major.html comp-c-htmlman html ./usr/share/man/html3/makecontext.html comp-c-htmlman html +./usr/share/man/html3/makedev.html comp-c-htmlman html ./usr/share/man/html3/malloc.html comp-c-htmlman html ./usr/share/man/html3/man.html comp-mdocml-htmlman html ./usr/share/man/html3/math.html comp-c-htmlman html @@ -13253,6 +13258,7 @@ ./usr/share/man/html3/mergesort.html comp-c-htmlman html ./usr/share/man/html3/meta.html comp-c-htmlman html ./usr/share/man/html3/mi_vector_hash.html comp-c-htmlman html +./usr/share/man/html3/minor.html comp-c-htmlman html ./usr/share/man/html3/mkdtemp.html comp-c-htmlman html ./usr/share/man/html3/mkstemp.html comp-c-htmlman html ./usr/share/man/html3/mktemp.html comp-c-htmlman html @@ -19149,7 +19155,9 @@ ./usr/share/man/man3/magic_load.3 comp-c-man .man ./usr/share/man/man3/magic_open.3 comp-c-man .man ./usr/share/man/man3/magic_setflags.3 comp-c-man .man +./usr/share/man/man3/major.3 comp-c-man .man ./usr/share/man/man3/makecontext.3 comp-c-man .man +./usr/share/man/man3/makedev.3 comp-c-man .man ./usr/share/man/man3/malloc.3 comp-c-man .man ./usr/share/man/man3/man.3 comp-mdocml-man .man ./usr/share/man/man3/math.3 comp-c-man .man @@ -19204,6 +19212,7 @@ ./usr/share/man/man3/mergesort.3 comp-c-man .man ./usr/share/man/man3/meta.3 comp-c-man .man ./usr/share/man/man3/mi_vector_hash.3 comp-c-man .man +./usr/share/man/man3/minor.3 comp-c-man .man ./usr/share/man/man3/mkdtemp.3 comp-c-man .man ./usr/share/man/man3/mkstemp.3 comp-c-man .man ./usr/share/man/man3/mktemp.3 comp-c-man .man Index: src/share/man/man3/Makefile diff -u src/share/man/man3/Makefile:1.57 src/share/man/man3/Makefile:1.58 --- src/share/man/man3/Makefile:1.57 Sun Oct 24 06:57:04 2010 +++ src/share/man/man3/Makefile Tue Dec 14 17:09:27 2010 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.57 2010/10/24 06:57:04 jruoho Exp $ +# $NetBSD: Makefile,v 1.58 2010/12/14 17:09:27 jruoho Exp $ # @(#)Makefile 8.2 (Berkeley) 12/13/93 MAN= _DIAGASSERT.3 __CONCAT.3 __UNCONST.3 CMSG_DATA.3 \ @@ -6,7 +6,7 @@ dlfcn.3 dl_iterate_phdr.3 end.3 \ fast_divide32.3 ffs32.3 gcq.3 \ ilog2.3 intro.3 inttypes.3 iso646.3 \ - offsetof.3 queue.3 rbtree.3 sigevent.3 \ + makedev.3 offsetof.3 queue.3 rbtree.3 sigevent.3 \ stdarg.3 stdbool.3 stddef.3 stdint.3 stdlib.3 sysexits.3 \ tgmath.3 timeradd.3 timeval.3 tree.3 types.3 varargs.3 @@ -35,6 +35,8 @@ MLINKS+=ffs32.3 ffs64.3 \ ffs32.3 fls32.3 \ ffs32.3 fls64.3 +MLINKS+=makedev.3 major.3 \ + makedev.3 minor.3 MLINKS+=gcq.3 GCQ_INIT.3 \ gcq.3 GCQ_INIT_HEAD.3 \ gcq.3 gcq_init.3 \ Added files: Index: src/share/man/man3/makedev.3
CVS commit: src/sys/fs/msdosfs
Module Name:src
Committed By: hannken
Date: Tue Dec 14 17:17:03 UTC 2010
Modified Files:
src/sys/fs/msdosfs: msdosfs_vfsops.c
Log Message:
msdosfs_sync: check for dead vnode (denode == NULL) before testing denode flags.
To generate a diff of this commit:
cvs rdiff -u -r1.87 -r1.88 src/sys/fs/msdosfs/msdosfs_vfsops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/fs/msdosfs/msdosfs_vfsops.c
diff -u src/sys/fs/msdosfs/msdosfs_vfsops.c:1.87 src/sys/fs/msdosfs/msdosfs_vfsops.c:1.88
--- src/sys/fs/msdosfs/msdosfs_vfsops.c:1.87 Wed Jul 21 17:52:10 2010
+++ src/sys/fs/msdosfs/msdosfs_vfsops.c Tue Dec 14 17:17:02 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: msdosfs_vfsops.c,v 1.87 2010/07/21 17:52:10 hannken Exp $ */
+/* $NetBSD: msdosfs_vfsops.c,v 1.88 2010/12/14 17:17:02 hannken Exp $ */
/*-
* Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
@@ -48,7 +48,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: msdosfs_vfsops.c,v 1.87 2010/07/21 17:52:10 hannken Exp $);
+__KERNEL_RCSID(0, $NetBSD: msdosfs_vfsops.c,v 1.88 2010/12/14 17:17:02 hannken Exp $);
#if defined(_KERNEL_OPT)
#include opt_compat_netbsd.h
@@ -977,7 +977,7 @@
mutex_enter(vp-v_interlock);
dep = VTODE(vp);
if (waitfor == MNT_LAZY || vp-v_type == VNON ||
- (((dep-de_flag
+ dep == NULL || (((dep-de_flag
(DE_ACCESS | DE_CREATE | DE_UPDATE | DE_MODIFIED)) == 0)
(LIST_EMPTY(vp-v_dirtyblkhd)
UVM_OBJ_IS_CLEAN(vp-v_uobj {
CVS commit: src/share/man/man3
Module Name:src Committed By: jruoho Date: Tue Dec 14 17:27:32 UTC 2010 Modified Files: src/share/man/man3: tgmath.3 Log Message: Remove functions/macros that are not in tgmath.h in NetBSD. Use .Xr instead of .Fn for those functions/macros that have a manual page. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/share/man/man3/tgmath.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/tgmath.3 diff -u src/share/man/man3/tgmath.3:1.5 src/share/man/man3/tgmath.3:1.6 --- src/share/man/man3/tgmath.3:1.5 Fri May 14 02:45:02 2010 +++ src/share/man/man3/tgmath.3 Tue Dec 14 17:27:32 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: tgmath.3,v 1.5 2010/05/14 02:45:02 joerg Exp $ +.\ $NetBSD: tgmath.3,v 1.6 2010/12/14 17:27:32 jruoho Exp $ .\ .\ Copyright (c) 2004 Stefan Farfeleder .\ All rights reserved. @@ -26,7 +26,7 @@ .\ .\ $FreeBSD: src/share/man/man3/tgmath.3,v 1.3 2007/12/15 02:40:10 das Exp $ .\ -.Dd April 14, 2010 +.Dd December 14, 2010 .Dt TGMATH 3 .Os .Sh NAME @@ -88,44 +88,44 @@ Otherwise, the real equivalent is called. .Bl -column -offset indent \ COMPLEX FUNCTION COMPLEX FUNCTION COMPLEX FUNCTION -.It Sy MACRO Ta Sy REAL FUNCTION Ta Sy COMPLEX FUNCTION -.It Fn acos Ta Fn acos Ta Fn cacos -.It Fn asin Ta Fn asin Ta Fn casin -.It Fn atan Ta Fn atan Ta Fn catan -.It Fn acosh Ta Fn acosh Ta Fn cacosh -.It Fn asinh Ta Fn asinh Ta Fn casinh -.It Fn atanh Ta Fn atanh Ta Fn catanh -.It Fn cos Ta Fn cos Ta Fn ccos -.It Fn sin Ta Fn sin Ta Fn csin -.It Fn tan Ta Fn tan Ta Fn ctan -.It Fn cosh Ta Fn cosh Ta Fn ccosh -.It Fn sinh Ta Fn sinh Ta Fn csinh -.It Fn tanh Ta Fn tanh Ta Fn ctanh -.It Fn exp Ta Fn exp Ta Fn cexp -.It Fn log Ta Fn log Ta Fn clog -.It Fn pow Ta Fn pow Ta Fn cpow -.It Fn sqrt Ta Fn sqrt Ta Fn csqrt -.It Fn fabs Ta Fn fabs Ta Fn cabs +.It Sy Macro Ta Sy Real function Ta Sy Complex function +.It Fn acos Ta Xr acos 3 Ta Xr cacos 3 +.It Fn asin Ta Xr asin 3 Ta Xr casin 3 +.It Fn atan Ta Xr atan 3 Ta Xr catan 3 +.It Fn acosh Ta Xr acosh 3 Ta Xr cacosh 3 +.It Fn asinh Ta Xr asinh 3 Ta Xr casinh 3 +.It Fn atanh Ta Xr atanh 3 Ta Xr catanh 3 +.It Fn cos Ta Xr cos 3 Ta Xr ccos 3 +.It Fn sin Ta Xr sin 3 Ta Xr csin 3 +.It Fn tan Ta Xr tan 3 Ta Xr ctan 3 +.It Fn cosh Ta Xr cosh 3 Ta Xr ccosh 3 +.It Fn sinh Ta Xr sinh 3 Ta Xr csinh 3 +.It Fn tanh Ta Xr tanh 3 Ta Xr ctanh 3 +.It Fn exp Ta Xr exp 3 Ta Xr cexp 3 +.It Fn log Ta Xr log 3 Ta Xr clog 3 +.It Fn pow Ta Xr pow 3 Ta Xr cpow 3 +.It Fn sqrt Ta Xr sqrt 3 Ta Xr csqrt 3 +.It Fn fabs Ta Xr fabs 3 Ta Xr cabs 3 .El .Pp No complex functions exist for the following macros, so passing a complex value to a generic argument invokes undefined behaviour: .Bl -column -offset indent .Fn nexttoward .Fn nexttoward .Fn nexttoward -.It Fn atan2 Ta Fn fma Ta Fn llround Ta Fn remainder -.It Fn cbrt Ta Fn fmax Ta Fn log10 Ta Fn remquo -.It Fn ceil Ta Fn fmin Ta Fn log1p Ta Fn rint -.It Fn copysign Ta Fn fmod Ta Fn log2 Ta Fn round -.It Fn erf Ta Fn frexp Ta Fn logb Ta Fn scalbn -.It Fn erfc Ta Fn hypot Ta Fn lrint Ta Fn scalbln -.It Fn exp2 Ta Fn ilogb Ta Fn lround Ta Fn tgamma -.It Fn expm1 Ta Fn ldexp Ta Fn nextbyint Ta Fn trunc -.It Fn fdim Ta Fn lgamma Ta Fn nextafter -.It Fn floor Ta Fn llrint Ta Fn nexttoward +.It Xr atan2 3 Ta Fn fma Ta Fn llround Ta Xr remainder 3 +.It Xr cbrt 3 Ta Xr fmax 3 Ta Xr log10 3 Ta Fn remquo +.It Xr ceil 3 Ta Xr fmin 3 Ta Xr log1p 3 Ta Xr rint 3 +.It Xr copysign 3 Ta Xr fmod 3 Ta Xr log2 3 Ta Xr round 3 +.It Xr erf 3 Ta Xr frexp 3 Ta Xr logb 3 Ta Xr scalbn 3 +.It Xr erfc 3 Ta Xr hypot 3 Ta Xr lrint 3 Ta Fn tgamma +.It Xr exp2 3 Ta Xr ilogb 3 Ta Fn lround Ta Xr trunc 3 +.It Xr expm1 3 Ta Xr ldexp 3 Ta Xr nextafter 3 +.It Xr fdim 3 Ta Xr lgamma 3 Ta +.It Xr floor 3 Ta Xr llrint 3 Ta .El .Pp The following macros always expand to a complex function: .Bl -column -offset indent .Fn cimag .Fn cimag .Fn cimag .Fn cimag .Fn cimag -.It Fn carg Ta Fn cimag Ta Fn conj Ta Fn cproj Ta Fn creal +.It Xr carg 3 Ta Xr cimag 3 Ta Xr conj 3 Ta Fn cproj Xr creal 3 .El .Pp This header includes
CVS commit: src/tests/dev/cgd
Module Name:src
Committed By: pooka
Date: Tue Dec 14 17:48:32 UTC 2010
Modified Files:
src/tests/dev/cgd: Makefile t_cgd.sh
Added Files:
src/tests/dev/cgd: paramsfile
Removed Files:
src/tests/dev/cgd/h_img2cgd: Makefile cgd.conf img2cgd.c
Log Message:
Retire the old C helper in h_img2cgd since we can now write everything
with a shellscript in terms of rump.cgdconfig and dd.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/dev/cgd/Makefile \
src/tests/dev/cgd/t_cgd.sh
cvs rdiff -u -r0 -r1.1 src/tests/dev/cgd/paramsfile
cvs rdiff -u -r1.2 -r0 src/tests/dev/cgd/h_img2cgd/Makefile
cvs rdiff -u -r1.1 -r0 src/tests/dev/cgd/h_img2cgd/cgd.conf \
src/tests/dev/cgd/h_img2cgd/img2cgd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/dev/cgd/Makefile
diff -u src/tests/dev/cgd/Makefile:1.1 src/tests/dev/cgd/Makefile:1.2
--- src/tests/dev/cgd/Makefile:1.1 Thu Nov 11 22:38:47 2010
+++ src/tests/dev/cgd/Makefile Tue Dec 14 17:48:31 2010
@@ -1,18 +1,12 @@
-# $NetBSD: Makefile,v 1.1 2010/11/11 22:38:47 pooka Exp $
+# $NetBSD: Makefile,v 1.2 2010/12/14 17:48:31 pooka Exp $
#
.include bsd.own.mk
TESTSDIR= ${TESTSBASE}/dev/cgd
+FILES= paramsfile
+FILESDIR= ${TESTSDIR}
TESTS_SH= t_cgd
-SUBDIR= h_img2cgd
-
-LDADD+= -lrumpdev_cgd -lrumpdev -lrumpvfs
-LDADD+= -lrump
-LDADD+= -lrumpuser -lpthread
-
-NOMAN=
-
.include bsd.test.mk
Index: src/tests/dev/cgd/t_cgd.sh
diff -u src/tests/dev/cgd/t_cgd.sh:1.1 src/tests/dev/cgd/t_cgd.sh:1.2
--- src/tests/dev/cgd/t_cgd.sh:1.1 Thu Nov 11 22:38:47 2010
+++ src/tests/dev/cgd/t_cgd.sh Tue Dec 14 17:48:31 2010
@@ -1,4 +1,4 @@
-# $NetBSD: t_cgd.sh,v 1.1 2010/11/11 22:38:47 pooka Exp $
+# $NetBSD: t_cgd.sh,v 1.2 2010/12/14 17:48:31 pooka Exp $
#
# Copyright (c) 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -36,13 +36,22 @@
{
d=$(atf_get_srcdir)
+ atf_check -s exit:0 \
+ rump_allserver -d key=/dev/dk,hostpath=dk.img,size=1m unix://csock
+
+ export RUMP_SERVER=unix://csock
atf_check -s exit:0 sh -c echo 12345 | \
- $d/h_img2cgd/h_img2cgd $d/h_img2cgd/cgd.conf write \
- enc.img $d/h_img2cgd/cgd.conf
- atf_check -s exit:0 sh -c echo 12345 | \
- $d/h_img2cgd/h_img2cgd $d/h_img2cgd/cgd.conf read \
- enc.img clear.txt
- atf_check -s exit:0 cmp clear.txt $d/h_img2cgd/cgd.conf
+ rump.cgdconfig -p cgd0 /dev/dk ${d}/paramsfile
+ atf_check -s exit:0 -e ignore dd if=${d}/t_cgd rof=/dev/rcgd0d count=2
+ atf_check -s exit:0 -e ignore dd if=${d}/t_cgd of=testfile count=2
+ atf_check -s exit:0 -e ignore -o file:testfile \
+ dd rif=/dev/rcgd0d count=2
+}
+
+basic_cleanup()
+{
+
+ env RUMP_SERVER=unix://csock rump.halt
}
atf_test_case wrongpass
@@ -57,13 +66,22 @@
{
d=$(atf_get_srcdir)
+ atf_check -s exit:0 \
+ rump_allserver -d key=/dev/dk,hostpath=dk.img,size=1m unix://csock
+
+ export RUMP_SERVER=unix://csock
atf_check -s exit:0 sh -c echo 12345 | \
- $d/h_img2cgd/h_img2cgd $d/h_img2cgd/cgd.conf write \
- enc.img $d/h_img2cgd/cgd.conf
+ rump.cgdconfig -p cgd0 /dev/dk ${d}/paramsfile
+ atf_check -s exit:0 -e ignore dd if=${d}/t_cgd rof=/dev/rcgd0d count=2
+
+ # unconfig and reconfig cgd
+ atf_check -s exit:0 rump.cgdconfig -u cgd0
atf_check -s exit:0 sh -c echo 54321 | \
- $d/h_img2cgd/h_img2cgd $d/h_img2cgd/cgd.conf read \
- enc.img clear.txt
- atf_check -s not-exit:0 cmp -s clear.txt $d/h_img2cgd/cgd.conf
+ rump.cgdconfig -p cgd0 /dev/dk ${d}/paramsfile
+
+ atf_check -s exit:0 -e ignore dd if=${d}/t_cgd of=testfile count=2
+ atf_check -s exit:0 -e ignore -o not-file:testfile \
+ dd rif=/dev/rcgd0d count=2
}
atf_init_test_cases()
Added files:
Index: src/tests/dev/cgd/paramsfile
diff -u /dev/null src/tests/dev/cgd/paramsfile:1.1
--- /dev/null Tue Dec 14 17:48:32 2010
+++ src/tests/dev/cgd/paramsfile Tue Dec 14 17:48:31 2010
@@ -0,0 +1,8 @@
+algorithm aes-cbc;
+iv-method encblkno1;
+keylength 128;
+verify_method none;
+keygen pkcs5_pbkdf2/sha1 {
+iterations 42;
+salt gKajcCnHR7sR1k1RKQ9Q0uY=;
+};
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: pooka Date: Tue Dec 14 17:52:06 UTC 2010 Modified Files: src/distrib/sets/lists/base: mi src/distrib/sets/lists/comp: mi src/distrib/sets/lists/tests: mi Log Message: add new, remove obsolete To generate a diff of this commit: cvs rdiff -u -r1.904 -r1.905 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.1542 -r1.1543 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.175 -r1.176 src/distrib/sets/lists/tests/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/mi diff -u src/distrib/sets/lists/base/mi:1.904 src/distrib/sets/lists/base/mi:1.905 --- src/distrib/sets/lists/base/mi:1.904 Mon Dec 13 21:15:30 2010 +++ src/distrib/sets/lists/base/mi Tue Dec 14 17:52:06 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.904 2010/12/13 21:15:30 pooka Exp $ +# $NetBSD: mi,v 1.905 2010/12/14 17:52:06 pooka Exp $ # # Note: Don't delete entries from here - mark them as obsolete instead, # unless otherwise stated below. @@ -206,6 +206,7 @@ ./sbin/brconfig base-netutil-root ./sbin/ccdconfigbase-sysutil-root ./sbin/cgdconfigbase-sysutil-root crypto +./sbin/rump.cgdconfigbase-sysutil-root crypto ./sbin/clri base-sysutil-root ./sbin/dhclient base-dhclient-root ./sbin/dhclient-scriptbase-dhclient-root Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1542 src/distrib/sets/lists/comp/mi:1.1543 --- src/distrib/sets/lists/comp/mi:1.1542 Tue Dec 14 17:09:27 2010 +++ src/distrib/sets/lists/comp/mi Tue Dec 14 17:52:06 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1542 2010/12/14 17:09:27 jruoho Exp $ +# $NetBSD: mi,v 1.1543 2010/12/14 17:52:06 pooka Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -2954,6 +2954,7 @@ ./usr/libdata/debug/sbin/brconfig.debug comp-netutil-debug debug ./usr/libdata/debug/sbin/ccdconfig.debug comp-sysutil-debug debug ./usr/libdata/debug/sbin/cgdconfig.debug comp-sysutil-debug crypto,debug +./usr/libdata/debug/sbin/rump.cgdconfig.debug comp-sysutil-debug crypto,debug ./usr/libdata/debug/sbin/clri.debug comp-sysutil-debug debug ./usr/libdata/debug/sbin/dhclient.debug comp-dhclient-debug debug ./usr/libdata/debug/sbin/dhcpcd.debug comp-dhcpcd-debug debug Index: src/distrib/sets/lists/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.175 src/distrib/sets/lists/tests/mi:1.176 --- src/distrib/sets/lists/tests/mi:1.175 Tue Dec 14 11:03:17 2010 +++ src/distrib/sets/lists/tests/mi Tue Dec 14 17:52:06 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.175 2010/12/14 11:03:17 pooka Exp $ +# $NetBSD: mi,v 1.176 2010/12/14 17:52:06 pooka Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -216,8 +216,8 @@ ./usr/libdata/debug/usr/tests/dev/audio tests-fs-debug ./usr/libdata/debug/usr/tests/dev/audio/h_pad.debug tests-fs-debug debug,atf ./usr/libdata/debug/usr/tests/dev/cgd tests-fs-debug -./usr/libdata/debug/usr/tests/dev/cgd/h_img2cgd tests-fs-debug -./usr/libdata/debug/usr/tests/dev/cgd/h_img2cgd/h_img2cgd.debug tests-fs-debug debug,atf +./usr/libdata/debug/usr/tests/dev/cgd/h_img2cgd tests-obsolete obsolete +./usr/libdata/debug/usr/tests/dev/cgd/h_img2cgd/h_img2cgd.debug tests-obsolete obsolete ./usr/libdata/debug/usr/tests/dev/md tests-fs-debug ./usr/libdata/debug/usr/tests/dev/md/h_mdserv.debug tests-fs-debug debug,atf ./usr/libdata/debug/usr/tests/dev/scsipi tests-fs-debug @@ -1038,9 +1038,10 @@ ./usr/tests/dev/cgdtests-fs-tests ./usr/tests/dev/cgd/Atffile tests-fs-tests atf ./usr/tests/dev/cgd/t_cgd tests-fs-tests atf -./usr/tests/dev/cgd/h_img2cgdtests-fs-tests -./usr/tests/dev/cgd/h_img2cgd/h_img2cgd tests-fs-tests atf -./usr/tests/dev/cgd/h_img2cgd/cgd.conf tests-fs-tests atf +./usr/tests/dev/cgd/paramsfile tests-fs-tests atf +./usr/tests/dev/cgd/h_img2cgdtests-obsolete obsolete +./usr/tests/dev/cgd/h_img2cgd/h_img2cgd tests-obsolete obsolete +./usr/tests/dev/cgd/h_img2cgd/cgd.conf tests-obsolete obsolete ./usr/tests/dev/mdtests-fs-tests ./usr/tests/dev/md/Atffile tests-fs-tests atf ./usr/tests/dev/md/h_mdserv tests-fs-tests atf
CVS commit: src/crypto/dist/ipsec-tools/src/racoon
Module Name:src
Committed By: tteras
Date: Tue Dec 14 17:57:32 UTC 2010
Modified Files:
src/crypto/dist/ipsec-tools/src/racoon: ipsec_doi.c
Log Message:
From Roman Hoog Antink r...@open.ch: Fix possible null derefence.
To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/crypto/dist/ipsec-tools/src/racoon/ipsec_doi.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/ipsec_doi.c
diff -u src/crypto/dist/ipsec-tools/src/racoon/ipsec_doi.c:1.45 src/crypto/dist/ipsec-tools/src/racoon/ipsec_doi.c:1.46
--- src/crypto/dist/ipsec-tools/src/racoon/ipsec_doi.c:1.45 Mon Oct 11 14:16:30 2010
+++ src/crypto/dist/ipsec-tools/src/racoon/ipsec_doi.c Tue Dec 14 17:57:31 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ipsec_doi.c,v 1.45 2010/10/11 14:16:30 vanhu Exp $ */
+/* $NetBSD: ipsec_doi.c,v 1.46 2010/12/14 17:57:31 tteras Exp $ */
/* Id: ipsec_doi.c,v 1.55 2006/08/17 09:20:41 vanhu Exp */
@@ -4166,9 +4166,14 @@
u_int8_t *prefixlen;
u_int16_t *ul_proto;
{
- struct ipsecdoi_id_b *id_b = (struct ipsecdoi_id_b *)buf-v;
+ struct ipsecdoi_id_b *id_b = NULL;
u_int plen = 0;
+ if (buf == NULL)
+ return ISAKMP_INTERNAL_ERROR;
+
+ id_b = (struct ipsecdoi_id_b *)buf-v;
+
/*
* When a ID payload of subnet type with a IP address of full bit
* masked, it has to be processed as host address.
CVS commit: src/share/man/man7
Module Name:src Committed By: pgoyette Date: Tue Dec 14 18:51:56 UTC 2010 Modified Files: src/share/man/man7: module.7 Log Message: Per private email (to myself and core@), cgd has agreed I'm happy to assign all copyright to this file, ... So replace original 4-clause cgd with a 2-clause NetBSD. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/share/man/man7/module.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/module.7 diff -u src/share/man/man7/module.7:1.1 src/share/man/man7/module.7:1.2 --- src/share/man/man7/module.7:1.1 Tue Dec 14 16:18:15 2010 +++ src/share/man/man7/module.7 Tue Dec 14 18:51:56 2010 @@ -1,6 +1,6 @@ -.\ $NetBSD: module.7,v 1.1 2010/12/14 16:18:15 jruoho Exp $ +.\ $NetBSD: module.7,v 1.2 2010/12/14 18:51:56 pgoyette Exp $ .\ -.\ Copyright (c) 1993 Christopher G. Demetriou +.\ Copyright (c) 2010 The NetBSD Foundation, Inc. .\ All rights reserved. .\ .\ Redistribution and use in source and binary forms, with or without @@ -11,26 +11,18 @@ .\ 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. -.\ 3. All advertising materials mentioning features or use of this software -.\must display the following acknowledgement: -.\ This product includes software developed for the -.\ NetBSD Project. See http://www.NetBSD.org/ for -.\ information about NetBSD. -.\ 4. The name of the author may not be used to endorse or promote products -.\derived from this software without specific prior written permission. .\ -.\ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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. -.\ -.\ Id: LICENSE,v 1.2 2000/06/14 15:57:33 cgd Exp +.\ THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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 14, 2010 .Dt MODULE 7
CVS commit: src/bin/dd
Module Name:src
Committed By: pooka
Date: Tue Dec 14 19:03:21 UTC 2010
Modified Files:
src/bin/dd: args.c
Log Message:
Make compile on non-NetBSD.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/bin/dd/args.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/dd/args.c
diff -u src/bin/dd/args.c:1.29 src/bin/dd/args.c:1.30
--- src/bin/dd/args.c:1.29 Thu Dec 9 10:24:56 2010
+++ src/bin/dd/args.c Tue Dec 14 19:03:21 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: args.c,v 1.29 2010/12/09 10:24:56 enami Exp $ */
+/* $NetBSD: args.c,v 1.30 2010/12/14 19:03:21 pooka Exp $ */
/*-
* Copyright (c) 1991, 1993, 1994
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = @(#)args.c 8.3 (Berkeley) 4/2/94;
#else
-__RCSID($NetBSD: args.c,v 1.29 2010/12/09 10:24:56 enami Exp $);
+__RCSID($NetBSD: args.c,v 1.30 2010/12/14 19:03:21 pooka Exp $);
#endif
#endif /* not lint */
@@ -55,7 +55,9 @@
#include dd.h
#include extern.h
-#ifndef SMALL
+#if !defined(SMALL) defined(__NetBSD__)
+#define _HAVE_RUMPOPS
+
#include rump/rumpclient.h
#endif
@@ -76,7 +78,7 @@
static void f_skip(char *);
static void f_progress(char *);
-#ifndef SMALL
+#ifdef _HAVE_RUMPOPS
static void f_rif(char *);
static void f_rof(char *);
#endif
@@ -98,7 +100,7 @@
{ obs, f_obs, C_OBS, C_BS|C_OBS },
{ of, f_of, C_OF, C_OF|C_ROF },
{ progress, f_progress, 0, 0 },
-#ifndef SMALL
+#ifdef _HAVE_RUMPOPS
{ rif, f_rif, C_RIF|C_RUMP, C_RIF|C_IF },
{ rof, f_rof, C_ROF|C_RUMP, C_ROF|C_OF },
#endif
@@ -199,7 +201,7 @@
* errx(1, seek offsets cannot be larger than %d, INT_MAX);
*/
-#ifndef SMALL
+#ifdef _HAVE_RUMPOPS
if (ddflags C_RUMP)
if (rumpclient_init() == -1)
err(1, rumpclient init failed);
@@ -276,7 +278,7 @@
out.name = arg;
}
-#ifndef SMALL
+#ifdef _HAVE_RUMPOPS
#include rump/rump.h
#include rump/rump_syscalls.h
CVS commit: src/bin/dd
Module Name:src
Committed By: pooka
Date: Tue Dec 14 19:04:05 UTC 2010
Modified Files:
src/bin/dd: dd.c
Log Message:
remove some leftover development garbage
To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/bin/dd/dd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/dd/dd.c
diff -u src/bin/dd/dd.c:1.44 src/bin/dd/dd.c:1.45
--- src/bin/dd/dd.c:1.44 Mon Nov 22 21:04:27 2010
+++ src/bin/dd/dd.c Tue Dec 14 19:04:05 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: dd.c,v 1.44 2010/11/22 21:04:27 pooka Exp $ */
+/* $NetBSD: dd.c,v 1.45 2010/12/14 19:04:05 pooka Exp $ */
/*-
* Copyright (c) 1991, 1993, 1994
@@ -43,7 +43,7 @@
#if 0
static char sccsid[] = @(#)dd.c 8.5 (Berkeley) 4/2/94;
#else
-__RCSID($NetBSD: dd.c,v 1.44 2010/11/22 21:04:27 pooka Exp $);
+__RCSID($NetBSD: dd.c,v 1.45 2010/12/14 19:04:05 pooka Exp $);
#endif
#endif /* not lint */
@@ -100,8 +100,6 @@
.op_write = write,
};
-#include rump/rumpclient.h
-
int
main(int argc, char *argv[])
{
CVS commit: src/tests/net/icmp
Module Name:src Committed By: pooka Date: Tue Dec 14 19:08:23 UTC 2010 Modified Files: src/tests/net/icmp: t_ping2.sh Log Message: use ping -n, since technically we don't have dns To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tests/net/icmp/t_ping2.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/net/icmp/t_ping2.sh diff -u src/tests/net/icmp/t_ping2.sh:1.1 src/tests/net/icmp/t_ping2.sh:1.2 --- src/tests/net/icmp/t_ping2.sh:1.1 Tue Dec 14 11:03:17 2010 +++ src/tests/net/icmp/t_ping2.sh Tue Dec 14 19:08:22 2010 @@ -1,4 +1,4 @@ -# $NetBSD: t_ping2.sh,v 1.1 2010/12/14 11:03:17 pooka Exp $ +# $NetBSD: t_ping2.sh,v 1.2 2010/12/14 19:08:22 pooka Exp $ # # Copyright (c) 2010 The NetBSD Foundation, Inc. # All rights reserved. @@ -56,9 +56,9 @@ docfg unix://commsock2 1.2.3.5 atf-check -s exit:0 -o ignore \ - env RUMP_SERVER=unix://commsock1 rump.ping -c 1 1.2.3.5 + env RUMP_SERVER=unix://commsock1 rump.ping -n -c 1 1.2.3.5 atf-check -s exit:0 -o ignore \ - env RUMP_SERVER=unix://commsock2 rump.ping -c 1 1.2.3.5 + env RUMP_SERVER=unix://commsock2 rump.ping -n -c 1 1.2.3.5 } basic_cleanup()
CVS commit: src/usr.bin/rump_allserver
Module Name:src Committed By: pooka Date: Tue Dec 14 19:52:14 UTC 2010 Modified Files: src/usr.bin/rump_allserver: rump_allserver.1 Log Message: Add an example for a server listening on a tcp port. also, bump date to avoid problems with wizd To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/usr.bin/rump_allserver/rump_allserver.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/rump_allserver/rump_allserver.1 diff -u src/usr.bin/rump_allserver/rump_allserver.1:1.3 src/usr.bin/rump_allserver/rump_allserver.1:1.4 --- src/usr.bin/rump_allserver/rump_allserver.1:1.3 Tue Dec 14 16:40:05 2010 +++ src/usr.bin/rump_allserver/rump_allserver.1 Tue Dec 14 19:52:14 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: rump_allserver.1,v 1.3 2010/12/14 16:40:05 pooka Exp $ +.\ $NetBSD: rump_allserver.1,v 1.4 2010/12/14 19:52:14 pooka Exp $ .\ .\ Copyright (c) 2010 Antti Kantee. All rights reserved. .\ @@ -23,7 +23,7 @@ .\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\ SUCH DAMAGE. .\ -.Dd December 13, 2010 +.Dd December 14, 2010 .Dt RUMP_SERVER 1 .Os .Sh NAME @@ -136,6 +136,11 @@ .Bd -literal -offset indent $ rump_allserver -d key=/dev/dk,hostpath=dk.img,size=1g unix://sock .Ed +.Pp +Start a server which listens on INADDR_ANY port 3755 +.Bd -literal -offset indent +$ rump_server tcp://0:3755/ +.Ed .Sh SEE ALSO .Xr rump.halt 1 , .Xr dlopen 3 ,
CVS commit: src/sbin/resize_ffs
Module Name:src
Committed By: riz
Date: Tue Dec 14 20:45:22 UTC 2010
Modified Files:
src/sbin/resize_ffs: resize_ffs.c
Log Message:
Be explicit about byteswapped and ffsv2 file systems being currently
unsupported, while catching up to some changes in my local tree which
will hopefully support them at some time in the future.
Also, change device variable to special, to reflect the fact
that resize_ffs will work on a plain file.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sbin/resize_ffs/resize_ffs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/resize_ffs/resize_ffs.c
diff -u src/sbin/resize_ffs/resize_ffs.c:1.22 src/sbin/resize_ffs/resize_ffs.c:1.23
--- src/sbin/resize_ffs/resize_ffs.c:1.22 Tue Dec 14 04:04:20 2010
+++ src/sbin/resize_ffs/resize_ffs.c Tue Dec 14 20:45:22 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: resize_ffs.c,v 1.22 2010/12/14 04:04:20 riz Exp $ */
+/* $NetBSD: resize_ffs.c,v 1.23 2010/12/14 20:45:22 riz Exp $ */
/* From sources sent on February 17, 2003 */
/*-
* As its sole author, I explicitly place this code in the public
@@ -64,7 +64,7 @@
/* new size of filesystem, in sectors */
static uint32_t newsize;
-/* fd open onto disk device */
+/* fd open onto disk device or file */
static int fd;
/* must we break up big I/O operations - see checksmallio() */
@@ -131,6 +131,10 @@
#define NSPB(fs) ((fs)-fs_old_nspf (fs)-fs_fragshift)
#define NSPF(fs) ((fs)-fs_old_nspf)
+/* global flags */
+int is_ufs2 = 0;
+int needswap = 0;
+
static void usage(void) __dead;
/*
@@ -1873,7 +1877,7 @@
int SFlag;
size_t i;
- char *device;
+ char *special;
char reply[5];
newsize = 0;
@@ -1905,10 +1909,10 @@
usage();
}
- device = *argv;
+ special = *argv;
if (ExpertFlag == 0) {
- printf(It's required to manually run fsck on filesystem device
+ printf(It's required to manually run fsck on filesystem
before you can resize it\n\n
Did you run fsck on your disk (Yes/No) ? );
fgets(reply, (int)sizeof(reply), stdin);
@@ -1918,13 +1922,13 @@
}
}
- fd = open(device, O_RDWR, 0);
+ fd = open(special, O_RDWR, 0);
if (fd 0)
- err(EXIT_FAILURE, Can't open `%s', device);
+ err(EXIT_FAILURE, Can't open `%s', special);
checksmallio();
if (SFlag == 0) {
- newsize = get_dev_size(device);
+ newsize = get_dev_size(special);
if (newsize == 0)
err(EXIT_FAILURE,
Can't resize filesystem, newsize not known.);
@@ -1934,10 +1938,25 @@
newsb = (struct fs *) (SBLOCKSIZE + (char *) sbbuf);
for (where = search[i = 0]; search[i] != -1; where = search[++i]) {
readat(where / DEV_BSIZE, oldsb, SBLOCKSIZE);
- if (where == SBLOCK_UFS2 (oldsb-fs_magic == FS_UFS1_MAGIC))
- continue;
- if (oldsb-fs_magic == FS_UFS1_MAGIC)
+ switch (oldsb-fs_magic) {
+ case FS_UFS2_MAGIC:
+ /* FALLTHROUGH */
+ is_ufs2 = 1;
+ case FS_UFS1_MAGIC:
+ needswap = 0;
+ break;
+ case FS_UFS2_MAGIC_SWAPPED:
+ is_ufs2 = 1;
+ /* FALLTHROUGH */
+ case FS_UFS1_MAGIC_SWAPPED:
+ needswap = 1;
break;
+ default:
+ continue;
+ }
+ if (!is_ufs2 where == SBLOCK_UFS2)
+ continue;
+ break;
}
if (where == (off_t)-1)
errx(EXIT_FAILURE, Bad magic number);
@@ -1953,6 +1972,11 @@
/* any others? */
printf(Resizing with ffsv1 superblock\n);
}
+ if (is_ufs2)
+ errx(EXIT_FAILURE, ffsv2 file systems currently unsupported.);
+ if (needswap)
+ errx(EXIT_FAILURE, Swapped byte order file system detected
+ - currently unsupported.);
oldsb-fs_qbmask = ~(int64_t) oldsb-fs_bmask;
oldsb-fs_qfmask = ~(int64_t) oldsb-fs_fmask;
if (oldsb-fs_ipg % INOPB(oldsb)) {
@@ -1982,6 +2006,6 @@
usage(void)
{
- (void)fprintf(stderr, usage: %s [-y] [-s size] device\n, getprogname());
+ (void)fprintf(stderr, usage: %s [-y] [-s size] special\n, getprogname());
exit(EXIT_FAILURE);
}
CVS commit: src/usr.sbin/ldpd
Module Name:src
Committed By: christos
Date: Tue Dec 14 21:32:43 UTC 2010
Modified Files:
src/usr.sbin/ldpd: ldp_command.c
Log Message:
fix uninitialized variable by elimination.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/ldpd/ldp_command.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/ldpd/ldp_command.c
diff -u src/usr.sbin/ldpd/ldp_command.c:1.1 src/usr.sbin/ldpd/ldp_command.c:1.2
--- src/usr.sbin/ldpd/ldp_command.c:1.1 Wed Dec 8 02:20:14 2010
+++ src/usr.sbin/ldpd/ldp_command.c Tue Dec 14 16:32:43 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ldp_command.c,v 1.1 2010/12/08 07:20:14 kefren Exp $ */
+/* $NetBSD: ldp_command.c,v 1.2 2010/12/14 21:32:43 christos Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -284,43 +284,47 @@
int
command_match(struct com_func *cf, int s, char *orig, char *next)
{
- int i, matched = 0, last_match;
+ size_t i, len;
+ int last_match = -1;
+ const char *msg = NULL;
- if (orig == NULL || orig[0] == '\0') {
- send_prompt(s);
- return 0;
- }
+ if (orig == NULL || orig[0] == '\0')
+ goto out;
if (!strcmp(orig, ?)) {
- for (i=0; cf[i].func != NULL; i++) {
+ for (i = 0; cf[i].func != NULL; i++) {
snprintf(sendspace, MAXSEND, \t%s\n, cf[i].com);
writestr(s, sendspace);
}
- send_prompt(s);
- return 0;
+ goto out;
}
- for (i=0; cf[i].func != NULL; i++)
- if(strncasecmp(orig, cf[i].com, strlen(orig)) == 0) {
- matched++;
- last_match = i;
+ len = strlen(orig);
+ for (i = 0; cf[i].func != NULL; i++) {
+ if (strncasecmp(orig, cf[i].com, len) == 0) {
+ if (last_match != -1) {
+msg = Ambiguous;
+goto out;
+ } else
+last_match = i;
}
- if (!matched) {
- writestr(s, Unknown command. Use ? for help\n);
- send_prompt(s);
- return 0;
}
- if (matched 1) {
- writestr(s, Ambiguous command. Use ? for help\n);
- send_prompt(s);
- return 0;
+ if (last_match == -1) {
+ msg = Unknown;
+ goto out;
}
- if(cf[last_match].func(s, next) != 0)
+ if (cf[last_match].func(s, next) != 0)
send_prompt(s);
return 1;
-
+out:
+ if (msg) {
+ writestr(s, msg);
+ writestr(s, command. Use ? for help\n);
+ }
+ send_prompt(s);
+ return 0;
}
/*
CVS commit: src/sbin/resize_ffs
Module Name:src
Committed By: wiz
Date: Tue Dec 14 21:49:22 UTC 2010
Modified Files:
src/sbin/resize_ffs: resize_ffs.8 resize_ffs.c
Log Message:
filesystem - file system.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sbin/resize_ffs/resize_ffs.8
cvs rdiff -u -r1.23 -r1.24 src/sbin/resize_ffs/resize_ffs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/resize_ffs/resize_ffs.8
diff -u src/sbin/resize_ffs/resize_ffs.8:1.5 src/sbin/resize_ffs/resize_ffs.8:1.6
--- src/sbin/resize_ffs/resize_ffs.8:1.5 Sun Oct 31 11:39:46 2010
+++ src/sbin/resize_ffs/resize_ffs.8 Tue Dec 14 21:49:21 2010
@@ -1,4 +1,4 @@
-.\ $NetBSD: resize_ffs.8,v 1.5 2010/10/31 11:39:46 wiz Exp $
+.\ $NetBSD: resize_ffs.8,v 1.6 2010/12/14 21:49:21 wiz Exp $
.\
.\ As its sole author, I explicitly place this man page in the public
.\ domain. Anyone may use it in any way for any purpose (though I would
@@ -145,4 +145,4 @@
Has no intelligence whatever when it comes to allocating blocks to copy
data into when shrinking.
.Pp
-Doesn't work with FFSv2 filesystems.
+Doesn't work with FFSv2 file systems.
Index: src/sbin/resize_ffs/resize_ffs.c
diff -u src/sbin/resize_ffs/resize_ffs.c:1.23 src/sbin/resize_ffs/resize_ffs.c:1.24
--- src/sbin/resize_ffs/resize_ffs.c:1.23 Tue Dec 14 20:45:22 2010
+++ src/sbin/resize_ffs/resize_ffs.c Tue Dec 14 21:49:21 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: resize_ffs.c,v 1.23 2010/12/14 20:45:22 riz Exp $ */
+/* $NetBSD: resize_ffs.c,v 1.24 2010/12/14 21:49:21 wiz Exp $ */
/* From sources sent on February 17, 2003 */
/*-
* As its sole author, I explicitly place this code in the public
@@ -13,9 +13,9 @@
/*
* resize_ffs:
*
- * Resize a filesystem. Is capable of both growing and shrinking.
+ * Resize a file system. Is capable of both growing and shrinking.
*
- * Usage: resize_ffs [-s newsize] [-y] filesystem
+ * Usage: resize_ffs [-s newsize] [-y] file_system
*
* Example: resize_ffs -s 29574 /dev/rsd1e
*
@@ -27,7 +27,7 @@
* definitions (which in at least a few cases depend on the lexical
* scoping gcc provides, so they can't be trivially moved outside).
*
- * It will not do anything useful with filesystems in other than
+ * It will not do anything useful with file systems in other than
* host-native byte order. This really should be fixed (it's largely
* a historical accident; the original version of this program is
* older than bi-endian support in FFS).
@@ -61,7 +61,7 @@
#include strings.h
#include unistd.h
-/* new size of filesystem, in sectors */
+/* new size of file system, in sectors */
static uint32_t newsize;
/* fd open onto disk device or file */
@@ -584,8 +584,8 @@
* takes up more than a whole block (is the csum info allowed to begin
* partway through a block and continue into the following block?).
*
- * If we wrap off the end of the filesystem back to the beginning, we
- * can end up searching the end of the filesystem twice. I ignore
+ * If we wrap off the end of the file system back to the beginning, we
+ * can end up searching the end of the file system twice. I ignore
* this inefficiency, since if that happens we're going to croak with
* a no-space error anyway, so it happens at most once.
*/
@@ -782,9 +782,9 @@
return;
}
/* We must be growing. Check to see that the new csum area fits
- * within the filesystem. I think this can never happen, since for
+ * within the file system. I think this can never happen, since for
* the csum area to grow, we must be adding at least one cg, so the
- * old csum area can't be this close to the end of the new filesystem.
+ * old csum area can't be this close to the end of the new file system.
* But it's a cheap check. */
/* XXX what if csum info is at end of cg and grows into next cg, what
* if it spills over onto the next cg's backup superblock? Can this
@@ -867,7 +867,7 @@
return (t);
}
/*
- * Grow the filesystem.
+ * Grow the file system.
*/
static void
grow(void)
@@ -902,7 +902,7 @@
newsb-fs_ncg = howmany(newsb-fs_old_ncyl, newsb-fs_old_cpg);
/* Does the last cg end before the end of its inode area? There is no
* reason why this couldn't be handled, but it would complicate a lot
- * of code (in all filesystem code - fsck, kernel, etc) because of the
+ * of code (in all file system code - fsck, kernel, etc) because of the
* potential partial inode area, and the gain in space would be
* minimal, at most the pre-sb data area. */
if (cgdmin(newsb, newsb-fs_ncg - 1) newsb-fs_size) {
@@ -962,7 +962,7 @@
/*
* Call (*fn)() for each inode, passing the inode and its inumber. The
* number of cylinder groups is pased in, so this can be used to map
- * over either the old or the new filesystem's set of inodes.
+ * over either the old or the new file system's set of inodes.
*/
static void
map_inodes(void
CVS commit: src/external/bsd/bind/dist/lib/dns
Module Name:src
Committed By: christos
Date: Tue Dec 14 23:16:39 UTC 2010
Modified Files:
src/external/bsd/bind/dist/lib/dns: openssl_link.c
Log Message:
handle openssl versions less 1.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/bind/dist/lib/dns/openssl_link.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/bind/dist/lib/dns/openssl_link.c
diff -u src/external/bsd/bind/dist/lib/dns/openssl_link.c:1.2 src/external/bsd/bind/dist/lib/dns/openssl_link.c:1.3
--- src/external/bsd/bind/dist/lib/dns/openssl_link.c:1.2 Sun Dec 27 12:27:29 2009
+++ src/external/bsd/bind/dist/lib/dns/openssl_link.c Tue Dec 14 18:16:39 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: openssl_link.c,v 1.2 2009/12/27 17:27:29 christos Exp $ */
+/* $NetBSD: openssl_link.c,v 1.3 2010/12/14 23:16:39 christos Exp $ */
/*
* Portions Copyright (C) 2004-2009 Internet Systems Consortium, Inc. (ISC)
@@ -98,7 +98,11 @@
return (result == ISC_R_SUCCESS ? num : -1);
}
+#if OPENSSL_VERSION_NUMBER 0x1000L
+static void
+#else
static int
+#endif
entropy_add(const void *buf, int num, double entropy) {
/*
* Do nothing. The only call to this provides no useful data anyway.
@@ -106,7 +110,9 @@
UNUSED(buf);
UNUSED(num);
UNUSED(entropy);
+#if OPENSSL_VERSION_NUMBER = 0x1000L
return 0;
+#endif
}
static void
CVS commit: src/external/bsd/bind
Module Name:src
Committed By: christos
Date: Tue Dec 14 23:17:21 UTC 2010
Modified Files:
src/external/bsd/bind: Makefile.inc
Log Message:
Handle NetBSD-5 and 4 lack of atomics by disabling threads.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/bind/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/external/bsd/bind/Makefile.inc
diff -u src/external/bsd/bind/Makefile.inc:1.6 src/external/bsd/bind/Makefile.inc:1.7
--- src/external/bsd/bind/Makefile.inc:1.6 Sat Nov 6 17:32:49 2010
+++ src/external/bsd/bind/Makefile.inc Tue Dec 14 18:17:20 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.6 2010/11/06 21:32:49 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.7 2010/12/14 23:17:20 christos Exp $
.if !defined(BIND9_MAKEFILE_INC)
BIND9_MAKEFILE_INC=yes
@@ -17,7 +17,11 @@
NAMED_USE_OPENSSL?=yes
.endif
+.if exists(/usr/include/sys/atomic.h)
NAMED_USE_PTHREADS?=yes
+.else
+NAMED_USE_PTHREADS?=no
+.endif
IDIST= ${NETBSDSRCDIR}/external/bsd/bind/dist
BIND_SRCDIR= ${NETBSDSRCDIR}/external/bsd/bind
@@ -89,7 +93,11 @@
LDADD+= -lcrypto
DPADD+= ${LIBCRYPTO}
.else
-LIBDPLIBS+= crypto ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypto
+.if exists(${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypto)
+LIBDPLIBS+= crypto ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypt)
+.else
+LIBDPLIBS+= crypto ${NETBSDSRCDIR}/lib/libcrypto
+.endif
.endif
.endif
CVS commit: src/external/bsd/bind/include/isc
Module Name:src
Committed By: christos
Date: Tue Dec 14 23:19:23 UTC 2010
Modified Files:
src/external/bsd/bind/include/isc: atomic.h platform.h
Log Message:
handle lack of sys/atomic.h
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/bind/include/isc/atomic.h
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/bind/include/isc/platform.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/bind/include/isc/atomic.h
diff -u src/external/bsd/bind/include/isc/atomic.h:1.1 src/external/bsd/bind/include/isc/atomic.h:1.2
--- src/external/bsd/bind/include/isc/atomic.h:1.1 Sat Apr 11 23:46:09 2009
+++ src/external/bsd/bind/include/isc/atomic.h Tue Dec 14 18:19:23 2010
@@ -1,9 +1,13 @@
-/* $NetBSD: atomic.h,v 1.1 2009/04/12 03:46:09 christos Exp $ */
+/* $NetBSD: atomic.h,v 1.2 2010/12/14 23:19:23 christos Exp $ */
#ifndef ISC_ATOMIC_H
#define ISC_ATOMIC_H 1
+#ifdef ISC_PLATFORM_USE_THREADS
#include sys/atomic.h
+#else
+#define ISC_NO_ATOMIC
+#endif
#include isc/types.h
/*
@@ -12,15 +16,27 @@
*/
static __inline isc_int32_t
isc_atomic_xadd(isc_int32_t *p, isc_int32_t val) {
+#ifdef ISC_NO_ATOMIC
+ isc_int32_t oval = *p;
+ *p = val;
+ return oval;
+#else
return (isc_int32_t)atomic_add_32_nv((volatile uint32_t *)p,
(uint32_t)val) - val;
+#endif
}
#ifdef ISC_PLATFORM_HAVEXADDQ
static __inline isc_int64_t
isc_atomic_xaddq(isc_int64_t *p, isc_int64_t val) {
+#ifdef ISC_NO_ATOMIC
+ isc_int64_t oval = *p;
+ *p = val;
+ return oval;
+#else
return (isc_int64_t)atomic_add_64_nv((volatile uint64_t *)p,
(uint64_t)val) - val;
+#endif
}
#endif
@@ -29,7 +45,11 @@
*/
static __inline void
isc_atomic_store(isc_int32_t *p, isc_int32_t val) {
+#ifdef ISC_NO_ATOMIC
+ *p = val;
+#else
(void)atomic_swap_32((volatile uint32_t *)p, (uint32_t)val);
+#endif
}
/*
@@ -39,8 +59,15 @@
*/
static __inline__ isc_int32_t
isc_atomic_cmpxchg(isc_int32_t *p, isc_int32_t cmpval, isc_int32_t val) {
+#ifdef ISC_NO_ATOMIC
+ isc_int32_t oval = *p;
+ if (oval == val)
+ *p = val;
+ return oval;
+#else
return (isc_int32_t) atomic_cas_32((volatile uint32_t *)p,
(uint32_t)cmpval, (uint32_t)val);
+#endif
}
#endif /* ISC_ATOMIC_H */
Index: src/external/bsd/bind/include/isc/platform.h
diff -u src/external/bsd/bind/include/isc/platform.h:1.7 src/external/bsd/bind/include/isc/platform.h:1.8
--- src/external/bsd/bind/include/isc/platform.h:1.7 Thu Dec 2 09:52:19 2010
+++ src/external/bsd/bind/include/isc/platform.h Tue Dec 14 18:19:23 2010
@@ -25,7 +25,9 @@
/*
* Platform-dependent defines.
*/
+#ifdef ISC_PLATFORM_USE_THREADS
#include sys/atomic.h
+#endif
/***
*** Network.
CVS commit: src/sys/arch/vax/include
Module Name:src Committed By: matt Date: Tue Dec 14 23:27:37 UTC 2010 Modified Files: src/sys/arch/vax/include: cpu.h Log Message: Switch to use sys/device_if.h To generate a diff of this commit: cvs rdiff -u -r1.90 -r1.91 src/sys/arch/vax/include/cpu.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/vax/include/cpu.h diff -u src/sys/arch/vax/include/cpu.h:1.90 src/sys/arch/vax/include/cpu.h:1.91 --- src/sys/arch/vax/include/cpu.h:1.90 Sat Nov 13 02:23:27 2010 +++ src/sys/arch/vax/include/cpu.h Tue Dec 14 23:27:37 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.h,v 1.90 2010/11/13 02:23:27 matt Exp $ */ +/* $NetBSD: cpu.h,v 1.91 2010/12/14 23:27:37 matt Exp $ */ /* * Copyright (c) 1994 Ludd, University of Lule}, Sweden @@ -48,7 +48,7 @@ #include sys/cdefs.h #include sys/queue.h -#include sys/device.h +#include sys/device_if.h #include sys/cpu_data.h #include machine/mtpr.h
CVS commit: src/sys/modules/dtrace
Module Name:src
Committed By: haad
Date: Tue Dec 14 23:27:48 UTC 2010
Modified Files:
src/sys/modules/dtrace/dtrace: Makefile
src/sys/modules/dtrace/fbt: Makefile
src/sys/modules/dtrace/sdt: Makefile
Log Message:
Disable errors reported by unknown pragmas in dtrace module.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/modules/dtrace/dtrace/Makefile
cvs rdiff -u -r1.2 -r1.3 src/sys/modules/dtrace/fbt/Makefile
cvs rdiff -u -r1.3 -r1.4 src/sys/modules/dtrace/sdt/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/modules/dtrace/dtrace/Makefile
diff -u src/sys/modules/dtrace/dtrace/Makefile:1.2 src/sys/modules/dtrace/dtrace/Makefile:1.3
--- src/sys/modules/dtrace/dtrace/Makefile:1.2 Sat Mar 13 22:23:47 2010
+++ src/sys/modules/dtrace/dtrace/Makefile Tue Dec 14 23:27:47 2010
@@ -27,6 +27,8 @@
CPPFLAGS+= -DSMP -DDEBUG
+CPPFLAGS+= -Wno-unknown-pragmas
+
EXPORT_SYMS= dtrace_register \
dtrace_unregister \
dtrace_probe_lookup
Index: src/sys/modules/dtrace/fbt/Makefile
diff -u src/sys/modules/dtrace/fbt/Makefile:1.2 src/sys/modules/dtrace/fbt/Makefile:1.3
--- src/sys/modules/dtrace/fbt/Makefile:1.2 Sat Mar 13 22:29:33 2010
+++ src/sys/modules/dtrace/fbt/Makefile Tue Dec 14 23:27:48 2010
@@ -11,4 +11,6 @@
-I${NETBSDSRCDIR}/external/cddl/osnet/dev/sdt \
-I${NETBSDSRCDIR}/external/cddl/osnet/dist/uts/common
+CPPFLAGS+= -Wno-unknown-pragmas
+
.include bsd.kmodule.mk
Index: src/sys/modules/dtrace/sdt/Makefile
diff -u src/sys/modules/dtrace/sdt/Makefile:1.3 src/sys/modules/dtrace/sdt/Makefile:1.4
--- src/sys/modules/dtrace/sdt/Makefile:1.3 Sat Mar 13 22:29:34 2010
+++ src/sys/modules/dtrace/sdt/Makefile Tue Dec 14 23:27:48 2010
@@ -11,4 +11,6 @@
-I${NETBSDSRCDIR}/external/cddl/osnet/dev/sdt \
-I${NETBSDSRCDIR}/external/cddl/osnet/dist/uts/common
+CPPFLAGS+= -Wno-unknown-pragmas
+
.include bsd.kmodule.mk
CVS commit: src/sys/arch/vax/include
Module Name:src Committed By: matt Date: Tue Dec 14 23:29:02 UTC 2010 Modified Files: src/sys/arch/vax/include: psl.h Log Message: Since CLKF_BASEPRI isn't used any more, merge its test into CLKF_INTR which results in a simplier comparision. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/vax/include/psl.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/vax/include/psl.h diff -u src/sys/arch/vax/include/psl.h:1.11 src/sys/arch/vax/include/psl.h:1.12 --- src/sys/arch/vax/include/psl.h:1.11 Tue Aug 5 15:56:04 2008 +++ src/sys/arch/vax/include/psl.h Tue Dec 14 23:29:02 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: psl.h,v 1.11 2008/08/05 15:56:04 matt Exp $ */ +/* $NetBSD: psl.h,v 1.12 2010/12/14 23:29:02 matt Exp $ */ /* * Rewritten for the VAX port. Based on Berkeley code. /IC @@ -102,11 +102,10 @@ /* * Macros to decode processor status word. */ -#define CLKF_USERMODE(framep) framep)-ps) (PSL_U)) == PSL_U) -#define CLKF_BASEPRI(framep) framep)-ps) (PSL_IPL1F)) PSL_IPL02) +#define CLKF_USERMODE(framep) (((framep)-ps PSL_U) == PSL_U) #define CLKF_PC(framep) ((framep)-pc) -#define CLKF_INTR(framep) (framep)-ps) (PSL_IS)) == PSL_IS) \ -!CLKF_BASEPRI(framep)) +#define CLKF_INTR(framep) (((framep)-ps (PSL_IS|PSL_IPL1F)) \ += (PSL_IPL02|PSL_IS)) #define PSL2IPL(ps) ((ps) 16) #endif
CVS commit: src/sys/arch/vax/include
Module Name:src Committed By: matt Date: Tue Dec 14 23:29:33 UTC 2010 Modified Files: src/sys/arch/vax/include: scb.h Log Message: Include sys/evcnt.h since sys/cpu.h no includes sys/device.h To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/vax/include/scb.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/vax/include/scb.h diff -u src/sys/arch/vax/include/scb.h:1.12 src/sys/arch/vax/include/scb.h:1.13 --- src/sys/arch/vax/include/scb.h:1.12 Wed Feb 20 16:37:52 2008 +++ src/sys/arch/vax/include/scb.h Tue Dec 14 23:29:33 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: scb.h,v 1.12 2008/02/20 16:37:52 matt Exp $ */ +/* $NetBSD: scb.h,v 1.13 2010/12/14 23:29:33 matt Exp $ */ /* * Copyright (c) 1994 Ludd, University of Lule}, Sweden. @@ -29,9 +29,12 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ + #ifndef _VAX_SCB_H #define _VAX_SCB_H +#include sys/evcnt.h + /* * Definition of the System Control Block. More about it can be * found in the Vax Architecture Reference Manual, section 6.6.
CVS commit: src/sys/arch/vax
Module Name:src Committed By: matt Date: Tue Dec 14 23:38:31 UTC 2010 Modified Files: src/sys/arch/vax/bi: bi_mainbus.c bi_nmi.c src/sys/arch/vax/if: if_le.c if_le_vsbus.c if_ze.c src/sys/arch/vax/mba: hp.c mba.c src/sys/arch/vax/uba: uba_cmi.c uba_dma.c uba_mainbus.c uba_sbi.c uba_ubi.c Log Message: Cleanup includes. Change machine/XXX.h to sys/XXX.h for bus, cpu, intr. Remove unneeded includes. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/arch/vax/bi/bi_mainbus.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/vax/bi/bi_nmi.c cvs rdiff -u -r1.36 -r1.37 src/sys/arch/vax/if/if_le.c cvs rdiff -u -r1.27 -r1.28 src/sys/arch/vax/if/if_le_vsbus.c cvs rdiff -u -r1.16 -r1.17 src/sys/arch/vax/if/if_ze.c cvs rdiff -u -r1.47 -r1.48 src/sys/arch/vax/mba/hp.c cvs rdiff -u -r1.38 -r1.39 src/sys/arch/vax/mba/mba.c cvs rdiff -u -r1.14 -r1.15 src/sys/arch/vax/uba/uba_cmi.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/vax/uba/uba_dma.c cvs rdiff -u -r1.9 -r1.10 src/sys/arch/vax/uba/uba_mainbus.c cvs rdiff -u -r1.28 -r1.29 src/sys/arch/vax/uba/uba_sbi.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/vax/uba/uba_ubi.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/vax/bi/bi_mainbus.c diff -u src/sys/arch/vax/bi/bi_mainbus.c:1.10 src/sys/arch/vax/bi/bi_mainbus.c:1.11 --- src/sys/arch/vax/bi/bi_mainbus.c:1.10 Tue Mar 11 05:34:02 2008 +++ src/sys/arch/vax/bi/bi_mainbus.c Tue Dec 14 23:38:30 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: bi_mainbus.c,v 1.10 2008/03/11 05:34:02 matt Exp $ */ +/* $NetBSD: bi_mainbus.c,v 1.11 2010/12/14 23:38:30 matt Exp $ */ /* * Copyright (c) 1999 Ludd, University of Lule}, Sweden. * All rights reserved. @@ -31,17 +31,18 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: bi_mainbus.c,v 1.10 2008/03/11 05:34:02 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: bi_mainbus.c,v 1.11 2010/12/14 23:38:30 matt Exp $); + +#define _VAX_BUS_DMA_PRIVATE #include sys/param.h #include sys/device.h +#include sys/bus.h +#include sys/cpu.h -#define _VAX_BUS_DMA_PRIVATE -#include machine/bus.h #include machine/nexus.h #include machine/sid.h #include machine/scb.h -#include machine/cpu.h #include machine/mainbus.h #include dev/bi/bivar.h Index: src/sys/arch/vax/bi/bi_nmi.c diff -u src/sys/arch/vax/bi/bi_nmi.c:1.7 src/sys/arch/vax/bi/bi_nmi.c:1.8 --- src/sys/arch/vax/bi/bi_nmi.c:1.7 Tue Mar 11 05:34:02 2008 +++ src/sys/arch/vax/bi/bi_nmi.c Tue Dec 14 23:38:30 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: bi_nmi.c,v 1.7 2008/03/11 05:34:02 matt Exp $ */ +/* $NetBSD: bi_nmi.c,v 1.8 2010/12/14 23:38:30 matt Exp $ */ /* * Copyright (c) 1999 Ludd, University of Lule}, Sweden. * All rights reserved. @@ -31,18 +31,19 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: bi_nmi.c,v 1.7 2008/03/11 05:34:02 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: bi_nmi.c,v 1.8 2010/12/14 23:38:30 matt Exp $); + +#define _VAX_BUS_DMA_PRIVATE #include sys/param.h -#include sys/device.h #include sys/systm.h +#include sys/bus.h +#include sys/cpu.h +#include sys/device.h -#define _VAX_BUS_DMA_PRIVATE -#include machine/bus.h #include machine/nexus.h #include machine/sid.h #include machine/scb.h -#include machine/cpu.h #include machine/ka88.h #include dev/bi/bivar.h Index: src/sys/arch/vax/if/if_le.c diff -u src/sys/arch/vax/if/if_le.c:1.36 src/sys/arch/vax/if/if_le.c:1.37 --- src/sys/arch/vax/if/if_le.c:1.36 Tue Jan 19 22:06:23 2010 +++ src/sys/arch/vax/if/if_le.c Tue Dec 14 23:38:30 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: if_le.c,v 1.36 2010/01/19 22:06:23 pooka Exp $ */ +/* $NetBSD: if_le.c,v 1.37 2010/12/14 23:38:30 matt Exp $ */ /*- * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. @@ -65,15 +65,15 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: if_le.c,v 1.36 2010/01/19 22:06:23 pooka Exp $); +__KERNEL_RCSID(0, $NetBSD: if_le.c,v 1.37 2010/12/14 23:38:30 matt Exp $); #include opt_inet.h #include sys/param.h +#include sys/cpu.h +#include sys/device.h #include sys/syslog.h #include sys/socket.h -#include sys/device.h -#include sys/reboot.h #include uvm/uvm_extern.h @@ -86,7 +86,6 @@ #include netinet/if_inarp.h #endif -#include machine/cpu.h #include machine/nexus.h #include machine/scb.h #include machine/mainbus.h Index: src/sys/arch/vax/if/if_le_vsbus.c diff -u src/sys/arch/vax/if/if_le_vsbus.c:1.27 src/sys/arch/vax/if/if_le_vsbus.c:1.28 --- src/sys/arch/vax/if/if_le_vsbus.c:1.27 Tue Jan 19 22:06:23 2010 +++ src/sys/arch/vax/if/if_le_vsbus.c Tue Dec 14 23:38:30 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: if_le_vsbus.c,v 1.27 2010/01/19 22:06:23 pooka Exp $ */ +/* $NetBSD: if_le_vsbus.c,v 1.28 2010/12/14 23:38:30 matt Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -64,15 +64,15 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: if_le_vsbus.c,v 1.27 2010/01/19 22:06:23 pooka Exp $);
CVS commit: src/external/cddl/osnet/lib/libzpool
Module Name:src
Committed By: haad
Date: Tue Dec 14 23:39:11 UTC 2010
Modified Files:
src/external/cddl/osnet/lib/libzpool: Makefile
Log Message:
Do not built 64b atomic ops to libzpool they are in libc again.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/cddl/osnet/lib/libzpool/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/lib/libzpool/Makefile
diff -u src/external/cddl/osnet/lib/libzpool/Makefile:1.5 src/external/cddl/osnet/lib/libzpool/Makefile:1.6
--- src/external/cddl/osnet/lib/libzpool/Makefile:1.5 Tue Dec 14 09:19:14 2010
+++ src/external/cddl/osnet/lib/libzpool/Makefile Tue Dec 14 23:39:11 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2010/12/14 09:19:14 haad Exp $
+# $NetBSD: Makefile,v 1.6 2010/12/14 23:39:11 haad Exp $
.include ${.CURDIR}/../../dist/uts/common/Makefile.files
.include ../../Makefile.zfs
@@ -23,13 +23,6 @@
SRCS+= ${ZFS_SHARED_OBJS:C/.o$/.c/}
SRCS+= taskq.c util.c list.o u8_textprep.o
-# Add opensolaris atomic functions and use fakedones if we do not support them
-.if ${MACHINE_ARCH} == i386
-CPPFLAGS+= -D__HAVE_ATOMIC64_OPS # add NetBSD 64 add operations on i386
-.PATH: ${NETBSDSRCDIR}/common/lib/libc/atomic
-SRCS+= atomic_add_64_cas.c atomic_add_64_nv_cas.c atomic_inc_64_cas.c atomic_dec_64_cas.c
-.endif
-
print:
echo ${LIST_SRCS} ${LIST_OBJS}
CVS commit: src/external/bsd/bind/dist/lib/dns
Module Name:src
Committed By: christos
Date: Tue Dec 14 23:43:32 UTC 2010
Modified Files:
src/external/bsd/bind/dist/lib/dns: name.c
Log Message:
Wrong rfc mentioned
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r1.2 src/external/bsd/bind/dist/lib/dns/name.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/bind/dist/lib/dns/name.c
diff -u src/external/bsd/bind/dist/lib/dns/name.c:1.1.1.3 src/external/bsd/bind/dist/lib/dns/name.c:1.2
--- src/external/bsd/bind/dist/lib/dns/name.c:1.1.1.3 Thu Aug 5 16:12:13 2010
+++ src/external/bsd/bind/dist/lib/dns/name.c Tue Dec 14 18:43:32 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: name.c,v 1.1.1.3 2010/08/05 20:12:13 christos Exp $ */
+/* $NetBSD: name.c,v 1.2 2010/12/14 23:43:32 christos Exp $ */
/*
* Copyright (C) 2004-2010 Internet Systems Consortium, Inc. (ISC)
@@ -320,7 +320,7 @@
return (ISC_FALSE);
/*
- * RFC292/RFC1123 hostname.
+ * RFC952/RFC1123 hostname.
*/
while (ndata (name-ndata + name-length)) {
n = *ndata++;
CVS commit: src/sys/arch/vax/vax
Module Name:src Committed By: matt Date: Tue Dec 14 23:44:50 UTC 2010 Modified Files: src/sys/arch/vax/vax: autoconf.c bus_mem.c cfl.c clock.c cmi.c compat_13_machdep.c compat_16_machdep.c conf.c core_machdep.c crl.c ctu.c db_machdep.c disksubr.c gencons.c ibcs2_machdep.c ka410.c ka43.c ka46.c ka48.c ka49.c ka53.c ka610.c ka630.c ka6400.c ka650.c ka660.c ka670.c ka680.c ka730.c ka750.c ka780.c ka820.c ka860.c ka88.c locore.c machdep.c multicpu.c nmi_mainbus.c pmap.c sbi.c scb.c sgmap.c sig_machdep.c ubi.c vm_machdep.c xmi_mainbus.c Log Message: Cleanups includes. Change machine/XXX.h to sys/XXX.h Remove unneeded includes. To generate a diff of this commit: cvs rdiff -u -r1.91 -r1.92 src/sys/arch/vax/vax/autoconf.c cvs rdiff -u -r1.12 -r1.13 src/sys/arch/vax/vax/bus_mem.c \ src/sys/arch/vax/vax/cmi.c src/sys/arch/vax/vax/ibcs2_machdep.c cvs rdiff -u -r1.19 -r1.20 src/sys/arch/vax/vax/cfl.c \ src/sys/arch/vax/vax/sig_machdep.c cvs rdiff -u -r1.54 -r1.55 src/sys/arch/vax/vax/clock.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/vax/vax/compat_13_machdep.c \ src/sys/arch/vax/vax/compat_16_machdep.c src/sys/arch/vax/vax/ubi.c cvs rdiff -u -r1.66 -r1.67 src/sys/arch/vax/vax/conf.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/vax/vax/core_machdep.c cvs rdiff -u -r1.28 -r1.29 src/sys/arch/vax/vax/crl.c \ src/sys/arch/vax/vax/ka780.c cvs rdiff -u -r1.30 -r1.31 src/sys/arch/vax/vax/ctu.c \ src/sys/arch/vax/vax/multicpu.c cvs rdiff -u -r1.56 -r1.57 src/sys/arch/vax/vax/db_machdep.c cvs rdiff -u -r1.51 -r1.52 src/sys/arch/vax/vax/disksubr.c cvs rdiff -u -r1.50 -r1.51 src/sys/arch/vax/vax/gencons.c cvs rdiff -u -r1.32 -r1.33 src/sys/arch/vax/vax/ka410.c cvs rdiff -u -r1.34 -r1.35 src/sys/arch/vax/vax/ka43.c cvs rdiff -u -r1.24 -r1.25 src/sys/arch/vax/vax/ka46.c cvs rdiff -u -r1.20 -r1.21 src/sys/arch/vax/vax/ka48.c cvs rdiff -u -r1.17 -r1.18 src/sys/arch/vax/vax/ka49.c \ src/sys/arch/vax/vax/scb.c cvs rdiff -u -r1.15 -r1.16 src/sys/arch/vax/vax/ka53.c \ src/sys/arch/vax/vax/ka670.c src/sys/arch/vax/vax/sgmap.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/vax/vax/ka610.c \ src/sys/arch/vax/vax/xmi_mainbus.c cvs rdiff -u -r1.29 -r1.30 src/sys/arch/vax/vax/ka630.c cvs rdiff -u -r1.14 -r1.15 src/sys/arch/vax/vax/ka6400.c \ src/sys/arch/vax/vax/ka88.c cvs rdiff -u -r1.35 -r1.36 src/sys/arch/vax/vax/ka650.c \ src/sys/arch/vax/vax/sbi.c cvs rdiff -u -r1.9 -r1.10 src/sys/arch/vax/vax/ka660.c cvs rdiff -u -r1.16 -r1.17 src/sys/arch/vax/vax/ka680.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/vax/vax/ka730.c cvs rdiff -u -r1.43 -r1.44 src/sys/arch/vax/vax/ka750.c cvs rdiff -u -r1.52 -r1.53 src/sys/arch/vax/vax/ka820.c cvs rdiff -u -r1.33 -r1.34 src/sys/arch/vax/vax/ka860.c cvs rdiff -u -r1.78 -r1.79 src/sys/arch/vax/vax/locore.c cvs rdiff -u -r1.179 -r1.180 src/sys/arch/vax/vax/machdep.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/vax/vax/nmi_mainbus.c cvs rdiff -u -r1.178 -r1.179 src/sys/arch/vax/vax/pmap.c cvs rdiff -u -r1.112 -r1.113 src/sys/arch/vax/vax/vm_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/vax/vax/autoconf.c diff -u src/sys/arch/vax/vax/autoconf.c:1.91 src/sys/arch/vax/vax/autoconf.c:1.92 --- src/sys/arch/vax/vax/autoconf.c:1.91 Thu Jul 1 19:50:12 2010 +++ src/sys/arch/vax/vax/autoconf.c Tue Dec 14 23:44:49 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: autoconf.c,v 1.91 2010/07/01 19:50:12 ragge Exp $ */ +/* $NetBSD: autoconf.c,v 1.92 2010/12/14 23:44:49 matt Exp $ */ /* * Copyright (c) 1994 Ludd, University of Lule}, Sweden. @@ -31,16 +31,16 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: autoconf.c,v 1.91 2010/07/01 19:50:12 ragge Exp $); +__KERNEL_RCSID(0, $NetBSD: autoconf.c,v 1.92 2010/12/14 23:44:49 matt Exp $); #include opt_compat_netbsd.h #include opt_cputype.h #include sys/param.h -#include sys/types.h #include sys/systm.h +#include sys/bus.h +#include sys/cpu.h #include sys/device.h -#include sys/reboot.h #include sys/disk.h #include sys/buf.h #include sys/bufq.h @@ -49,10 +49,7 @@ #include uvm/uvm_extern.h -#include machine/cpu.h #include machine/sid.h -#include machine/param.h -#include machine/vmparam.h #include machine/nexus.h #include machine/ioa.h #include machine/ka820.h @@ -60,7 +57,6 @@ #include machine/ka650.h #include machine/clock.h #include machine/rpb.h -#include machine/bus.h #include machine/mainbus.h #include vax/vax/gencons.h Index: src/sys/arch/vax/vax/bus_mem.c diff -u src/sys/arch/vax/vax/bus_mem.c:1.12 src/sys/arch/vax/vax/bus_mem.c:1.13 --- src/sys/arch/vax/vax/bus_mem.c:1.12 Thu Nov 24 13:08:34 2005 +++ src/sys/arch/vax/vax/bus_mem.c Tue Dec 14 23:44:49 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: bus_mem.c,v 1.12 2005/11/24 13:08:34 yamt Exp $ */ +/* $NetBSD: bus_mem.c,v 1.13 2010/12/14 23:44:49 matt Exp $ */ /* * Copyright (c) 1998
CVS commit: src/sys/arch/evbmips/adm5120
Module Name:src
Committed By: matt
Date: Wed Dec 15 00:04:28 UTC 2010
Modified Files:
src/sys/arch/evbmips/adm5120: machdep.c
Log Message:
Make this compilee again.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/evbmips/adm5120/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/adm5120/machdep.c
diff -u src/sys/arch/evbmips/adm5120/machdep.c:1.17 src/sys/arch/evbmips/adm5120/machdep.c:1.18
--- src/sys/arch/evbmips/adm5120/machdep.c:1.17 Wed May 19 20:41:59 2010
+++ src/sys/arch/evbmips/adm5120/machdep.c Wed Dec 15 00:04:28 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.17 2010/05/19 20:41:59 christos Exp $ */
+/* $NetBSD: machdep.c,v 1.18 2010/12/15 00:04:28 matt Exp $ */
/*-
* Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
@@ -107,7 +107,7 @@
*/
#include sys/cdefs.h /* RCS ID Copyright macro defns */
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.17 2010/05/19 20:41:59 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.18 2010/12/15 00:04:28 matt Exp $);
#include opt_ddb.h
#include opt_kgdb.h
@@ -308,11 +308,9 @@
mach_init(int argc, char **argv, void *a2, void *a3)
{
struct adm5120_config *admc = adm5120_configuration;
- struct pcb *pcb0;
uint32_t memsize;
vaddr_t kernend;
u_long first, last;
- vaddr_t v;
extern char edata[], end[]; /* XXX */
CVS commit: src/sys/arch/mips
Module Name:src Committed By: matt Date: Wed Dec 15 00:05:47 UTC 2010 Modified Files: src/sys/arch/mips/adm5120: adm5120_extio.c adm5120_obio.c src/sys/arch/mips/atheros: arbus.c Log Message: Make these compile again. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/mips/adm5120/adm5120_extio.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/mips/adm5120/adm5120_obio.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/mips/atheros/arbus.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/mips/adm5120/adm5120_extio.c diff -u src/sys/arch/mips/adm5120/adm5120_extio.c:1.2 src/sys/arch/mips/adm5120/adm5120_extio.c:1.3 --- src/sys/arch/mips/adm5120/adm5120_extio.c:1.2 Fri Oct 24 22:16:26 2008 +++ src/sys/arch/mips/adm5120/adm5120_extio.c Wed Dec 15 00:05:47 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: adm5120_extio.c,v 1.2 2008/10/24 22:16:26 dyoung Exp $ */ +/* $NetBSD: adm5120_extio.c,v 1.3 2010/12/15 00:05:47 matt Exp $ */ /*- * Copyright (c) 2007 David Young. All rights reserved. @@ -65,7 +65,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: adm5120_extio.c,v 1.2 2008/10/24 22:16:26 dyoung Exp $); +__KERNEL_RCSID(0, $NetBSD: adm5120_extio.c,v 1.3 2010/12/15 00:05:47 matt Exp $); #include sys/param.h #include sys/systm.h @@ -408,7 +408,7 @@ if (ea-ea_cfio != EXTIOCF_CFIO_DEFAULT) aprint_normal( cfio); if (ea-ea_addr != EXTIOCF_ADDR_DEFAULT) - aprint_normal( addr 0x%lx, ea-ea_addr); + aprint_normal( addr 0x% PRIxBUSADDR, ea-ea_addr); if (ea-ea_gpio_mask != EXTIOCF_GPIO_MASK_DEFAULT) aprint_normal( gpio_mask 0x%02x, ea-ea_gpio_mask); Index: src/sys/arch/mips/adm5120/adm5120_obio.c diff -u src/sys/arch/mips/adm5120/adm5120_obio.c:1.1 src/sys/arch/mips/adm5120/adm5120_obio.c:1.2 --- src/sys/arch/mips/adm5120/adm5120_obio.c:1.1 Tue Mar 20 08:52:03 2007 +++ src/sys/arch/mips/adm5120/adm5120_obio.c Wed Dec 15 00:05:47 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: adm5120_obio.c,v 1.1 2007/03/20 08:52:03 dyoung Exp $ */ +/* $NetBSD: adm5120_obio.c,v 1.2 2010/12/15 00:05:47 matt Exp $ */ /*- * Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko. @@ -66,7 +66,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: adm5120_obio.c,v 1.1 2007/03/20 08:52:03 dyoung Exp $); +__KERNEL_RCSID(0, $NetBSD: adm5120_obio.c,v 1.2 2010/12/15 00:05:47 matt Exp $); #include sys/param.h #include sys/systm.h @@ -186,7 +186,7 @@ if (pnp != NULL) aprint_normal(%s at %s, oa-oba_name, pnp); if (oa-oba_addr != OBIOCF_ADDR_DEFAULT) - aprint_normal( addr 0x%lx, oa-oba_addr); + aprint_normal( addr 0x% PRIxBUSADDR, oa-oba_addr); if (oa-oba_gpio_mask != OBIOCF_GPIO_MASK_DEFAULT) aprint_normal( gpio_mask 0x%02x, oa-oba_gpio_mask); Index: src/sys/arch/mips/atheros/arbus.c diff -u src/sys/arch/mips/atheros/arbus.c:1.10 src/sys/arch/mips/atheros/arbus.c:1.11 --- src/sys/arch/mips/atheros/arbus.c:1.10 Mon Sep 4 05:17:26 2006 +++ src/sys/arch/mips/atheros/arbus.c Wed Dec 15 00:05:46 2010 @@ -1,4 +1,4 @@ -/* $Id: arbus.c,v 1.10 2006/09/04 05:17:26 gdamore Exp $ */ +/* $Id: arbus.c,v 1.11 2010/12/15 00:05:46 matt Exp $ */ /* * Copyright (c) 2006 Urbana-Champaign Independent Media Center. * Copyright (c) 2006 Garrett D'Amore. @@ -41,7 +41,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: arbus.c,v 1.10 2006/09/04 05:17:26 gdamore Exp $); +__KERNEL_RCSID(0, $NetBSD: arbus.c,v 1.11 2010/12/15 00:05:46 matt Exp $); #include locators.h #include sys/param.h @@ -150,7 +150,7 @@ aprint_normal(%s at %s, aa-aa_name, pnp); if (aa-aa_addr) - aprint_normal( addr 0x%lx, aa-aa_addr); + aprint_normal( addr 0x% PRIxBUSADDR, aa-aa_addr); if (aa-aa_cirq = 0) aprint_normal( cpu irq %d, aa-aa_cirq);
CVS commit: src/sys/arch/mips/atheros
Module Name:src Committed By: matt Date: Wed Dec 15 00:06:47 UTC 2010 Modified Files: src/sys/arch/mips/atheros: ar5312.c Log Message: make this compile again. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/mips/atheros/ar5312.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/mips/atheros/ar5312.c diff -u src/sys/arch/mips/atheros/ar5312.c:1.6 src/sys/arch/mips/atheros/ar5312.c:1.7 --- src/sys/arch/mips/atheros/ar5312.c:1.6 Fri Jan 22 08:56:05 2010 +++ src/sys/arch/mips/atheros/ar5312.c Wed Dec 15 00:06:47 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: ar5312.c,v 1.6 2010/01/22 08:56:05 martin Exp $ */ +/* $NetBSD: ar5312.c,v 1.7 2010/12/15 00:06:47 matt Exp $ */ /* * Copyright (c) 2006 Urbana-Champaign Independent Media Center. @@ -52,6 +52,7 @@ #include opt_memsize.h #include sys/param.h #include sys/systm.h +#include sys/device.h #include sys/kernel.h #include sys/buf.h
CVS commit: src/sys/dev
Module Name:src Committed By: matt Date: Wed Dec 15 00:08:44 UTC 2010 Modified Files: src/sys/dev/bi: bi.c src/sys/dev/qbus: ts.c Log Message: Need to include sys/device.h since vax's sys/cpu.h doesn't. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/sys/dev/bi/bi.c cvs rdiff -u -r1.27 -r1.28 src/sys/dev/qbus/ts.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/bi/bi.c diff -u src/sys/dev/bi/bi.c:1.24 src/sys/dev/bi/bi.c:1.25 --- src/sys/dev/bi/bi.c:1.24 Tue Mar 11 05:34:01 2008 +++ src/sys/dev/bi/bi.c Wed Dec 15 00:08:43 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: bi.c,v 1.24 2008/03/11 05:34:01 matt Exp $ */ +/* $NetBSD: bi.c,v 1.25 2010/12/15 00:08:43 matt Exp $ */ /* * Copyright (c) 1996 Ludd, University of Lule}, Sweden. * All rights reserved. @@ -41,13 +41,14 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: bi.c,v 1.24 2008/03/11 05:34:01 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: bi.c,v 1.25 2010/12/15 00:08:43 matt Exp $); #include sys/param.h #include sys/systm.h #include sys/bus.h #include sys/cpu.h +#include sys/device.h #include dev/bi/bireg.h #include dev/bi/bivar.h Index: src/sys/dev/qbus/ts.c diff -u src/sys/dev/qbus/ts.c:1.27 src/sys/dev/qbus/ts.c:1.28 --- src/sys/dev/qbus/ts.c:1.27 Tue Jan 13 13:35:53 2009 +++ src/sys/dev/qbus/ts.c Wed Dec 15 00:08:43 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: ts.c,v 1.27 2009/01/13 13:35:53 yamt Exp $ */ +/* $NetBSD: ts.c,v 1.28 2010/12/15 00:08:43 matt Exp $ */ /*- * Copyright (c) 1991 The Regents of the University of California. @@ -66,7 +66,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ts.c,v 1.27 2009/01/13 13:35:53 yamt Exp $); +__KERNEL_RCSID(0, $NetBSD: ts.c,v 1.28 2010/12/15 00:08:43 matt Exp $); #undef TSDEBUG @@ -84,6 +84,7 @@ #include sys/buf.h #include sys/bufq.h #include sys/conf.h +#include sys/device.h #include sys/errno.h #include sys/file.h #include sys/syslog.h
CVS commit: src/usr.sbin/traceroute
Module Name:src
Committed By: pooka
Date: Wed Dec 15 00:09:42 UTC 2010
Modified Files:
src/usr.sbin/traceroute: Makefile traceroute.c
Added Files:
src/usr.sbin/traceroute: prog_ops.h traceroute_hostops.c
traceroute_rumpops.c
Log Message:
Use RUMPPRG. I think it's safe to say there's not going to be a
new upstream version of traceroute to import.
AS# lookup is still done using host networking. Rationale: the
relevance to where that data comes from with respect to network
tracing is zero (be it socket, local file, db, whatever).
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/usr.sbin/traceroute/Makefile
cvs rdiff -u -r0 -r1.1 src/usr.sbin/traceroute/prog_ops.h \
src/usr.sbin/traceroute/traceroute_hostops.c \
src/usr.sbin/traceroute/traceroute_rumpops.c
cvs rdiff -u -r1.75 -r1.76 src/usr.sbin/traceroute/traceroute.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/traceroute/Makefile
diff -u src/usr.sbin/traceroute/Makefile:1.16 src/usr.sbin/traceroute/Makefile:1.17
--- src/usr.sbin/traceroute/Makefile:1.16 Wed Apr 22 15:23:09 2009
+++ src/usr.sbin/traceroute/Makefile Wed Dec 15 00:09:41 2010
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.16 2009/04/22 15:23:09 lukem Exp $
+# $NetBSD: Makefile,v 1.17 2010/12/15 00:09:41 pooka Exp $
WARNS?= 1 # XXX: out of date third-party program
USE_FORT?= yes # network client
-PROG= traceroute
+RUMPPRG=traceroute
MAN= traceroute.8
CPPFLAGS+=-DHAVE_MALLOC_H=1 -DHAVE_SYS_SELECT_H=1 -DHAVE_SYS_SOCKIO_H=1
@@ -21,6 +21,10 @@
SRCS= traceroute.c ifaddrlist.c
SRCS+= version.c as.c
+.PATH: ${.CURDIR}/../../lib/libc/net
+RUMPSRCS= getifaddrs.c
+CPPFLAGS+= -DRUMP_ACTION
+
AWKS= median.awk mean.awk
.include bsd.prog.mk
Index: src/usr.sbin/traceroute/traceroute.c
diff -u src/usr.sbin/traceroute/traceroute.c:1.75 src/usr.sbin/traceroute/traceroute.c:1.76
--- src/usr.sbin/traceroute/traceroute.c:1.75 Fri Jul 2 12:13:11 2010
+++ src/usr.sbin/traceroute/traceroute.c Wed Dec 15 00:09:41 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: traceroute.c,v 1.75 2010/07/02 12:13:11 kefren Exp $ */
+/* $NetBSD: traceroute.c,v 1.76 2010/12/15 00:09:41 pooka Exp $ */
/*
* Copyright (c) 1988, 1989, 1991, 1994, 1995, 1996, 1997
@@ -29,7 +29,7 @@
#else
__COPYRIGHT(@(#) Copyright (c) 1988, 1989, 1991, 1994, 1995, 1996, 1997\
The Regents of the University of California. All rights reserved.);
-__RCSID($NetBSD: traceroute.c,v 1.75 2010/07/02 12:13:11 kefren Exp $);
+__RCSID($NetBSD: traceroute.c,v 1.76 2010/12/15 00:09:41 pooka Exp $);
#endif
#endif
@@ -222,6 +222,7 @@
#include arpa/inet.h
#include ctype.h
+#include err.h
#include errno.h
#ifdef HAVE_MALLOC_H
#include malloc.h
@@ -245,6 +246,7 @@
#include ifaddrlist.h
#include as.h
+#include prog_ops.h
/* Maximum number of gateways (include room for one noop) */
#define NGATEWAYS ((int)((MAX_IPOPTLEN - IPOPT_MINOFF - 1) / sizeof(u_int32_t)))
@@ -453,7 +455,10 @@
setprogname(argv[0]);
prog = getprogname();
- if ((s = socket(AF_INET, SOCK_RAW, IPPROTO_ICMP)) 0) {
+ if (prog_init prog_init() == -1)
+ err(1, init failed);
+
+ if ((s = prog_socket(AF_INET, SOCK_RAW, IPPROTO_ICMP)) 0) {
Fprintf(stderr, %s: icmp socket: %s\n, prog, strerror(errno));
exit(1);
}
@@ -463,7 +468,7 @@
* running our traceroute code will forgive us.
*/
#ifndef __hpux
- sndsock = socket(AF_INET, SOCK_RAW, IPPROTO_RAW);
+ sndsock = prog_socket(AF_INET, SOCK_RAW, IPPROTO_RAW);
#else
sndsock = socket(AF_INET, SOCK_RAW, IPPROTO_RAW
useicmp ? IPPROTO_ICMP : IPPROTO_UDP);
@@ -476,7 +481,7 @@
/* Revert to non-privileged user after opening sockets */
setuid(getuid());
- (void) sysctl(mib, sizeof(mib)/sizeof(mib[0]), max_ttl, size,
+ (void) prog_sysctl(mib, sizeof(mib)/sizeof(mib[0]), max_ttl, size,
NULL, 0);
opterr = 0;
@@ -711,7 +716,7 @@
}
if (options SO_DEBUG)
- (void)setsockopt(s, SOL_SOCKET, SO_DEBUG, (char *)on,
+ (void)prog_setsockopt(s, SOL_SOCKET, SO_DEBUG, (char *)on,
sizeof(on));
#ifdef IPSEC
#ifdef IPSEC_POLICY_IPSEC
@@ -727,19 +732,19 @@
{
int level = IPSEC_LEVEL_AVAIL;
- (void)setsockopt(s, IPPROTO_IP, IP_ESP_TRANS_LEVEL, level,
+ (void)prog_setsockopt(s, IPPROTO_IP, IP_ESP_TRANS_LEVEL, level,
sizeof(level));
- (void)setsockopt(s, IPPROTO_IP, IP_ESP_NETWORK_LEVEL, level,
+ (void)prog_setsockopt(s, IPPROTO_IP, IP_ESP_NETWORK_LEVEL, level,
sizeof(level));
#ifdef IP_AUTH_TRANS_LEVEL
- (void)setsockopt(s, IPPROTO_IP, IP_AUTH_TRANS_LEVEL, level,
+ (void)prog_setsockopt(s, IPPROTO_IP, IP_AUTH_TRANS_LEVEL, level,
sizeof(level));
#else
- (void)setsockopt(s, IPPROTO_IP, IP_AUTH_LEVEL, level,
+ (void)prog_setsockopt(s, IPPROTO_IP, IP_AUTH_LEVEL, level,
sizeof(level));
#endif
#ifdef IP_AUTH_NETWORK_LEVEL
- (void)setsockopt(s, IPPROTO_IP, IP_AUTH_NETWORK_LEVEL, level,
+
CVS commit: src/tests/usr.sbin/traceroute
Module Name:src
Committed By: pooka
Date: Wed Dec 15 00:13:52 UTC 2010
Added Files:
src/tests/usr.sbin/traceroute: Makefile t_traceroute.sh
Log Message:
Add simple tests for traceroute. The test bootstraps a three-node
network with one router in the middle and checks traceroute from
one endpoint to another with both UDP and ICMP.
(i guess these test networking at least as much as traceroute
itself, but then again that's not a bad thing)
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/tests/usr.sbin/traceroute/Makefile \
src/tests/usr.sbin/traceroute/t_traceroute.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/tests/usr.sbin/traceroute/Makefile
diff -u /dev/null src/tests/usr.sbin/traceroute/Makefile:1.1
--- /dev/null Wed Dec 15 00:13:52 2010
+++ src/tests/usr.sbin/traceroute/Makefile Wed Dec 15 00:13:52 2010
@@ -0,0 +1,10 @@
+# $NetBSD: Makefile,v 1.1 2010/12/15 00:13:52 pooka Exp $
+#
+
+.include bsd.own.mk
+
+TESTSDIR= ${TESTSBASE}/usr.sbin/traceroute
+
+TESTS_SH= t_traceroute
+
+.include bsd.test.mk
Index: src/tests/usr.sbin/traceroute/t_traceroute.sh
diff -u /dev/null src/tests/usr.sbin/traceroute/t_traceroute.sh:1.1
--- /dev/null Wed Dec 15 00:13:52 2010
+++ src/tests/usr.sbin/traceroute/t_traceroute.sh Wed Dec 15 00:13:52 2010
@@ -0,0 +1,123 @@
+# $NetBSD: t_traceroute.sh,v 1.1 2010/12/15 00:13:52 pooka Exp $
+#
+# Copyright (c) 2010 The NetBSD Foundation, Inc.
+# 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
+#
+
+atf_test_case basic cleanup
+basic_head()
+{
+
+ atf_set descr Does a simple three-hop traceroute
+}
+
+cfgendpt ()
+{
+
+ sock=${1}
+ addr=${2}
+ route=${3}
+ bus=${4}
+
+ export RUMP_SERVER=${sock}
+ atf-check -s exit:0 rump.ifconfig shmif0 create
+ atf-check -s exit:0 rump.ifconfig shmif0 linkstr ${bus}
+ atf-check -s exit:0 rump.ifconfig shmif0 inet ${addr} netmask 0xff00
+ atf-check -s exit:0 -o ignore rump.route add default ${route}
+}
+
+threeservers()
+{
+
+ atf-check -s exit:0 rump_allserver unix://commsock1
+ atf-check -s exit:0 rump_allserver unix://commsock2
+ atf-check -s exit:0 rump_allserver unix://commsock3
+
+ # configure endpoints
+ cfgendpt unix://commsock1 1.2.3.4 1.2.3.1 bus1
+ cfgendpt unix://commsock3 2.3.4.5 2.3.4.1 bus2
+
+ # configure the router
+ export RUMP_SERVER=unix://commsock2
+ atf-check -s exit:0 rump.ifconfig shmif0 create
+ atf-check -s exit:0 rump.ifconfig shmif0 linkstr bus1
+ atf-check -s exit:0 rump.ifconfig shmif0 inet 1.2.3.1 netmask 0xff00
+
+ atf-check -s exit:0 rump.ifconfig shmif1 create
+ atf-check -s exit:0 rump.ifconfig shmif1 linkstr bus2
+ atf-check -s exit:0 rump.ifconfig shmif1 inet 2.3.4.1 netmask 0xff00
+}
+
+threecleanup()
+{
+ env RUMP_SERVER=unix://commsock1 rump.halt
+ env RUMP_SERVER=unix://commsock2 rump.halt
+ env RUMP_SERVER=unix://commsock3 rump.halt
+}
+
+threetests()
+{
+
+ threeservers
+ env RUMP_SERVER=unix://commsock1 atf-check -s exit:0 \
+ -o save:tmpfile -e ignore rump.traceroute ${1} -n 2.3.4.5
+ atf-check -o inline:'1.2.3.1\n2.3.4.5\n' awk '{print $2}' tmpfile
+ env RUMP_SERVER=unix://commsock3 atf-check -s exit:0 \
+ -o save:tmpfile -e ignore rump.traceroute ${1} -n 1.2.3.4
+ atf-check -o inline:'2.3.4.1\n1.2.3.4\n' awk '{print $2}' tmpfile
+}
+
+basic_body()
+{
+ threetests
+}
+
+basic_cleanup()
+{
+ threecleanup
+}
+
+atf_test_case basic_icmp cleanup
+basic_icmp_head()
+{
+
+ atf_set descr Does an ICMP-based three-hop traceroute
+}
+
+basic_icmp_body()
+{
+ threetests -I
+}
+
+basic_icmp_cleanup()
+{
+ threecleanup
+}
+
+atf_init_test_cases()
+{
+
+ atf_add_test_case basic
+ atf_add_test_case
CVS commit: src/distrib/sets/lists/tests
Module Name:src Committed By: pooka Date: Wed Dec 15 00:17:34 UTC 2010 Modified Files: src/distrib/sets/lists/tests: mi Log Message: +traceroute tp To generate a diff of this commit: cvs rdiff -u -r1.176 -r1.177 src/distrib/sets/lists/tests/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.176 src/distrib/sets/lists/tests/mi:1.177 --- src/distrib/sets/lists/tests/mi:1.176 Tue Dec 14 17:52:06 2010 +++ src/distrib/sets/lists/tests/mi Wed Dec 15 00:17:34 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.176 2010/12/14 17:52:06 pooka Exp $ +# $NetBSD: mi,v 1.177 2010/12/15 00:17:34 pooka Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -427,6 +427,7 @@ ./usr/libdata/debug/usr/tests/syscall tests-syscall-debug ./usr/libdata/debug/usr/tests/syscall/t_cmsg.debug tests-syscall-debug debug,atf ./usr/libdata/debug/usr/tests/syscall/t_timer.debug tests-syscall-debug debug,atf +./usr/libdata/debug/usr/tests/usr.sbin tests-sbin-tests ./usr/libdata/debug/usr/tests/util tests-util-debug ./usr/libdata/debug/usr/tests/util/df tests-util-debug ./usr/libdata/debug/usr/tests/util/df/h_df.debug tests-util-debug debug @@ -1685,6 +1686,10 @@ ./usr/tests/syscall/Atffile tests-syscall-tests atf ./usr/tests/syscall/t_cmsg tests-syscall-tests atf ./usr/tests/syscall/t_timer tests-syscall-tests atf +./usr/tests/usr.sbintests-util-tests +./usr/tests/usr.sbin/traceroute tests-util-tests +./usr/tests/usr.sbin/traceroute/Atffile tests-util-tests atf +./usr/tests/usr.sbin/traceroute/t_traceroute tests-util-tests atf ./usr/tests/utiltests-util-tests ./usr/tests/util/Atffile tests-util-tests ./usr/tests/util/awktests-util-tests
CVS commit: src/etc/mtree
Module Name:src Committed By: pooka Date: Wed Dec 15 00:18:37 UTC 2010 Modified Files: src/etc/mtree: NetBSD.dist.tests Log Message: don't create h_img2cgd dirs anymore since they'll just be harvested by obsolete To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/etc/mtree/NetBSD.dist.tests Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/mtree/NetBSD.dist.tests diff -u src/etc/mtree/NetBSD.dist.tests:1.2 src/etc/mtree/NetBSD.dist.tests:1.3 --- src/etc/mtree/NetBSD.dist.tests:1.2 Mon Dec 13 13:41:41 2010 +++ src/etc/mtree/NetBSD.dist.tests Wed Dec 15 00:18:37 2010 @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.tests,v 1.2 2010/12/13 13:41:41 pooka Exp $ +# $NetBSD: NetBSD.dist.tests,v 1.3 2010/12/15 00:18:37 pooka Exp $ ./usr/libdata/debug/usr/tests ./usr/libdata/debug/usr/tests/atf @@ -15,7 +15,6 @@ ./usr/libdata/debug/usr/tests/dev ./usr/libdata/debug/usr/tests/dev/audio ./usr/libdata/debug/usr/tests/dev/cgd -./usr/libdata/debug/usr/tests/dev/cgd/h_img2cgd ./usr/libdata/debug/usr/tests/dev/md ./usr/libdata/debug/usr/tests/dev/scsipi ./usr/libdata/debug/usr/tests/dev/sysmon @@ -101,7 +100,6 @@ ./usr/tests/dev ./usr/tests/dev/audio ./usr/tests/dev/cgd -./usr/tests/dev/cgd/h_img2cgd ./usr/tests/dev/md ./usr/tests/dev/scsipi ./usr/tests/dev/sysmon
CVS commit: src/etc/mtree
Module Name:src Committed By: pooka Date: Wed Dec 15 00:19:05 UTC 2010 Modified Files: src/etc/mtree: NetBSD.dist.tests Log Message: usr.sbin/traceroute To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/etc/mtree/NetBSD.dist.tests Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/mtree/NetBSD.dist.tests diff -u src/etc/mtree/NetBSD.dist.tests:1.3 src/etc/mtree/NetBSD.dist.tests:1.4 --- src/etc/mtree/NetBSD.dist.tests:1.3 Wed Dec 15 00:18:37 2010 +++ src/etc/mtree/NetBSD.dist.tests Wed Dec 15 00:19:05 2010 @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.tests,v 1.3 2010/12/15 00:18:37 pooka Exp $ +# $NetBSD: NetBSD.dist.tests,v 1.4 2010/12/15 00:19:05 pooka Exp $ ./usr/libdata/debug/usr/tests ./usr/libdata/debug/usr/tests/atf @@ -81,6 +81,7 @@ ./usr/libdata/debug/usr/tests/sbin ./usr/libdata/debug/usr/tests/sbin/resize_ffs ./usr/libdata/debug/usr/tests/syscall +./usr/libdata/debug/usr/tests/usr.sbin ./usr/libdata/debug/usr/tests/util ./usr/libdata/debug/usr/tests/util/df ./usr/libdata/debug/usr/tests/util/id @@ -172,6 +173,8 @@ ./usr/tests/sys ./usr/tests/sys/rc ./usr/tests/syscall +./usr/tests/usr.sbin +./usr/tests/usr.sbin/traceroute ./usr/tests/util ./usr/tests/util/awk ./usr/tests/util/bzip2
CVS commit: src/external/cddl/osnet/dist/uts/common/sys
Module Name:src
Committed By: haad
Date: Wed Dec 15 00:58:58 UTC 2010
Modified Files:
src/external/cddl/osnet/dist/uts/common/sys: note.h
Log Message:
Revert last commit it's not needed anymore.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/cddl/osnet/dist/uts/common/sys/note.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dist/uts/common/sys/note.h
diff -u src/external/cddl/osnet/dist/uts/common/sys/note.h:1.2 src/external/cddl/osnet/dist/uts/common/sys/note.h:1.3
--- src/external/cddl/osnet/dist/uts/common/sys/note.h:1.2 Tue Dec 14 14:08:42 2010
+++ src/external/cddl/osnet/dist/uts/common/sys/note.h Wed Dec 15 00:58:58 2010
@@ -39,7 +39,7 @@
#ifndef _SYS_NOTE_H
#define _SYS_NOTE_H
-/* #pragma ident %Z%%M% %I% %E% SMI */
+#pragma ident %Z%%M% %I% %E% SMI
#ifdef __cplusplus
extern C {
CVS commit: src/sys/arch/alpha/pci
Module Name:src Committed By: matt Date: Wed Dec 15 01:27:19 UTC 2010 Modified Files: src/sys/arch/alpha/pci: a12c.c a12c_dma.c a12c_pci.c apecs.c apecs_bus_io.c apecs_bus_mem.c apecs_dma.c apecs_pci.c cia.c cia_bwx_bus_io.c cia_bwx_bus_mem.c cia_dma.c cia_pci.c cia_swiz_bus_io.c cia_swiz_bus_mem.c dwlpx.c dwlpx_bus_io.c dwlpx_bus_mem.c dwlpx_dma.c dwlpx_pci.c irongate_bus_io.c irongate_bus_mem.c irongate_dma.c irongate_pci.c lca.c lca_bus_io.c lca_bus_mem.c lca_dma.c lca_pci.c mcpcia_bus_io.c mcpcia_bus_mem.c mcpcia_dma.c mcpcia_pci.c pci_1000.c pci_1000a.c pci_2100_a50.c pci_550.c pci_6600.c pci_a12.c pci_alphabook1.c pci_axppci_33.c pci_eb164.c pci_eb64plus.c pci_eb66.c pci_kn20aa.c pci_kn300.c pci_kn8ae.c pci_machdep.c pci_sgmap_pte32.c pci_sgmap_pte64.c pci_up1000.c tsp_bus_io.c tsp_bus_mem.c tsp_dma.c tsp_pci.c ttwoga_dma.c Log Message: Remove unneeded includes of uvm/uvm_extern.h To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/sys/arch/alpha/pci/a12c.c \ src/sys/arch/alpha/pci/pci_1000.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/alpha/pci/a12c_dma.c \ src/sys/arch/alpha/pci/a12c_pci.c src/sys/arch/alpha/pci/irongate_pci.c \ src/sys/arch/alpha/pci/pci_sgmap_pte32.c \ src/sys/arch/alpha/pci/pci_sgmap_pte64.c \ src/sys/arch/alpha/pci/tsp_bus_io.c cvs rdiff -u -r1.50 -r1.51 src/sys/arch/alpha/pci/apecs.c \ src/sys/arch/alpha/pci/pci_kn20aa.c cvs rdiff -u -r1.9 -r1.10 src/sys/arch/alpha/pci/apecs_bus_io.c \ src/sys/arch/alpha/pci/apecs_bus_mem.c \ src/sys/arch/alpha/pci/lca_bus_io.c src/sys/arch/alpha/pci/lca_bus_mem.c \ src/sys/arch/alpha/pci/tsp_bus_mem.c src/sys/arch/alpha/pci/tsp_dma.c cvs rdiff -u -r1.18 -r1.19 src/sys/arch/alpha/pci/apecs_dma.c \ src/sys/arch/alpha/pci/lca_pci.c src/sys/arch/alpha/pci/mcpcia_dma.c cvs rdiff -u -r1.22 -r1.23 src/sys/arch/alpha/pci/apecs_pci.c cvs rdiff -u -r1.69 -r1.70 src/sys/arch/alpha/pci/cia.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/alpha/pci/cia_bwx_bus_io.c \ src/sys/arch/alpha/pci/cia_bwx_bus_mem.c \ src/sys/arch/alpha/pci/mcpcia_bus_io.c \ src/sys/arch/alpha/pci/mcpcia_bus_mem.c cvs rdiff -u -r1.25 -r1.26 src/sys/arch/alpha/pci/cia_dma.c cvs rdiff -u -r1.29 -r1.30 src/sys/arch/alpha/pci/cia_pci.c cvs rdiff -u -r1.15 -r1.16 src/sys/arch/alpha/pci/cia_swiz_bus_io.c \ src/sys/arch/alpha/pci/dwlpx_pci.c cvs rdiff -u -r1.16 -r1.17 src/sys/arch/alpha/pci/cia_swiz_bus_mem.c cvs rdiff -u -r1.34 -r1.35 src/sys/arch/alpha/pci/dwlpx.c cvs rdiff -u -r1.12 -r1.13 src/sys/arch/alpha/pci/dwlpx_bus_io.c \ src/sys/arch/alpha/pci/dwlpx_bus_mem.c cvs rdiff -u -r1.19 -r1.20 src/sys/arch/alpha/pci/dwlpx_dma.c \ src/sys/arch/alpha/pci/pci_6600.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/alpha/pci/irongate_bus_io.c cvs rdiff -u -r1.8 -r1.9 src/sys/arch/alpha/pci/irongate_bus_mem.c \ src/sys/arch/alpha/pci/mcpcia_pci.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/alpha/pci/irongate_dma.c \ src/sys/arch/alpha/pci/ttwoga_dma.c cvs rdiff -u -r1.47 -r1.48 src/sys/arch/alpha/pci/lca.c cvs rdiff -u -r1.20 -r1.21 src/sys/arch/alpha/pci/lca_dma.c \ src/sys/arch/alpha/pci/pci_eb64plus.c src/sys/arch/alpha/pci/pci_eb66.c cvs rdiff -u -r1.23 -r1.24 src/sys/arch/alpha/pci/pci_1000a.c cvs rdiff -u -r1.36 -r1.37 src/sys/arch/alpha/pci/pci_2100_a50.c cvs rdiff -u -r1.32 -r1.33 src/sys/arch/alpha/pci/pci_550.c \ src/sys/arch/alpha/pci/pci_kn300.c cvs rdiff -u -r1.11 -r1.12 src/sys/arch/alpha/pci/pci_a12.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/alpha/pci/pci_alphabook1.c cvs rdiff -u -r1.33 -r1.34 src/sys/arch/alpha/pci/pci_axppci_33.c cvs rdiff -u -r1.40 -r1.41 src/sys/arch/alpha/pci/pci_eb164.c cvs rdiff -u -r1.24 -r1.25 src/sys/arch/alpha/pci/pci_kn8ae.c cvs rdiff -u -r1.17 -r1.18 src/sys/arch/alpha/pci/pci_machdep.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/alpha/pci/pci_up1000.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/alpha/pci/tsp_pci.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/pci/a12c.c diff -u src/sys/arch/alpha/pci/a12c.c:1.21 src/sys/arch/alpha/pci/a12c.c:1.22 --- src/sys/arch/alpha/pci/a12c.c:1.21 Sat Mar 14 21:04:02 2009 +++ src/sys/arch/alpha/pci/a12c.c Wed Dec 15 01:27:18 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: a12c.c,v 1.21 2009/03/14 21:04:02 dsl Exp $ */ +/* $NetBSD: a12c.c,v 1.22 2010/12/15 01:27:18 matt Exp $ */ /* [Notice revision 2.2] * Copyright (c) 1997, 1998 Avalon Computer Systems, Inc. @@ -38,7 +38,7 @@ #include opt_avalon_a12.h /* Config options headers */ #include sys/cdefs.h /* RCS ID Copyright macro defns */ -__KERNEL_RCSID(0, $NetBSD: a12c.c,v 1.21 2009/03/14 21:04:02 dsl Exp $); +__KERNEL_RCSID(0, $NetBSD: a12c.c,v 1.22 2010/12/15 01:27:18 matt Exp $); #include sys/param.h #include sys/systm.h @@
CVS commit: src/sys/arch/alpha/common
Module Name:src Committed By: matt Date: Wed Dec 15 01:28:24 UTC 2010 Modified Files: src/sys/arch/alpha/common: sgmap_typedep.c Log Message: include uvm/uvm_extern.h here instead To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.37 src/sys/arch/alpha/common/sgmap_typedep.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/common/sgmap_typedep.c diff -u src/sys/arch/alpha/common/sgmap_typedep.c:1.36 src/sys/arch/alpha/common/sgmap_typedep.c:1.37 --- src/sys/arch/alpha/common/sgmap_typedep.c:1.36 Thu Oct 7 19:39:30 2010 +++ src/sys/arch/alpha/common/sgmap_typedep.c Wed Dec 15 01:28:24 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: sgmap_typedep.c,v 1.36 2010/10/07 19:39:30 hans Exp $ */ +/* $NetBSD: sgmap_typedep.c,v 1.37 2010/12/15 01:28:24 matt Exp $ */ /*- * Copyright (c) 1997, 1998, 2001 The NetBSD Foundation, Inc. @@ -31,10 +31,12 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(1, $NetBSD: sgmap_typedep.c,v 1.36 2010/10/07 19:39:30 hans Exp $); +__KERNEL_RCSID(1, $NetBSD: sgmap_typedep.c,v 1.37 2010/12/15 01:28:24 matt Exp $); #include opt_ddb.h +#include uvm/uvm_extern.h + #ifdef SGMAP_DEBUG int __C(SGMAP_TYPE,_debug) = 0; #endif
CVS commit: src/sys/arch/alpha
Module Name:src Committed By: matt Date: Wed Dec 15 01:29:38 UTC 2010 Modified Files: src/sys/arch/alpha/include: userret.h src/sys/arch/alpha/isa: isa_machdep.c isadma_bounce.c src/sys/arch/alpha/tc: tc_bus_mem.c tc_dma_3000_500.c tc_sgmap.c Log Message: rework uvm/uvm_extern.h includes. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/alpha/include/userret.h cvs rdiff -u -r1.18 -r1.19 src/sys/arch/alpha/isa/isa_machdep.c cvs rdiff -u -r1.9 -r1.10 src/sys/arch/alpha/isa/isadma_bounce.c cvs rdiff -u -r1.30 -r1.31 src/sys/arch/alpha/tc/tc_bus_mem.c cvs rdiff -u -r1.15 -r1.16 src/sys/arch/alpha/tc/tc_dma_3000_500.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/alpha/tc/tc_sgmap.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/include/userret.h diff -u src/sys/arch/alpha/include/userret.h:1.8 src/sys/arch/alpha/include/userret.h:1.9 --- src/sys/arch/alpha/include/userret.h:1.8 Mon Apr 28 20:23:11 2008 +++ src/sys/arch/alpha/include/userret.h Wed Dec 15 01:29:37 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: userret.h,v 1.8 2008/04/28 20:23:11 martin Exp $ */ +/* $NetBSD: userret.h,v 1.9 2010/12/15 01:29:37 matt Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -91,6 +91,7 @@ #define _ALPHA_USERRET_H_ #include sys/userret.h +#include uvm/uvm_extern.h /* * Define the code needed before returning to user mode, for Index: src/sys/arch/alpha/isa/isa_machdep.c diff -u src/sys/arch/alpha/isa/isa_machdep.c:1.18 src/sys/arch/alpha/isa/isa_machdep.c:1.19 --- src/sys/arch/alpha/isa/isa_machdep.c:1.18 Sat Mar 14 21:04:02 2009 +++ src/sys/arch/alpha/isa/isa_machdep.c Wed Dec 15 01:29:37 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: isa_machdep.c,v 1.18 2009/03/14 21:04:02 dsl Exp $ */ +/* $NetBSD: isa_machdep.c,v 1.19 2010/12/15 01:29:37 matt Exp $ */ /* * Copyright (c) 1995, 1996 Carnegie-Mellon University. @@ -33,7 +33,7 @@ #include sys/cdefs.h /* RCS ID Copyright macro defns */ -__KERNEL_RCSID(0, $NetBSD: isa_machdep.c,v 1.18 2009/03/14 21:04:02 dsl Exp $); +__KERNEL_RCSID(0, $NetBSD: isa_machdep.c,v 1.19 2010/12/15 01:29:37 matt Exp $); #include sys/types.h #include sys/param.h @@ -42,8 +42,6 @@ #include sys/errno.h #include sys/device.h -#include uvm/uvm_extern.h - #include dev/isa/isavar.h #include vga_isa.h Index: src/sys/arch/alpha/isa/isadma_bounce.c diff -u src/sys/arch/alpha/isa/isadma_bounce.c:1.9 src/sys/arch/alpha/isa/isadma_bounce.c:1.10 --- src/sys/arch/alpha/isa/isadma_bounce.c:1.9 Sat Mar 14 14:45:52 2009 +++ src/sys/arch/alpha/isa/isadma_bounce.c Wed Dec 15 01:29:37 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: isadma_bounce.c,v 1.9 2009/03/14 14:45:52 dsl Exp $ */ +/* $NetBSD: isadma_bounce.c,v 1.10 2010/12/15 01:29:37 matt Exp $ */ /*- * Copyright (c) 1996, 1997, 1998, 2000 The NetBSD Foundation, Inc. @@ -32,7 +32,7 @@ #include sys/cdefs.h /* RCS ID Copyright macro defns */ -__KERNEL_RCSID(0, $NetBSD: isadma_bounce.c,v 1.9 2009/03/14 14:45:52 dsl Exp $); +__KERNEL_RCSID(0, $NetBSD: isadma_bounce.c,v 1.10 2010/12/15 01:29:37 matt Exp $); #include sys/param.h #include sys/systm.h @@ -48,8 +48,6 @@ #include dev/isa/isareg.h #include dev/isa/isavar.h -#include uvm/uvm_extern.h - extern paddr_t avail_end; /* Index: src/sys/arch/alpha/tc/tc_bus_mem.c diff -u src/sys/arch/alpha/tc/tc_bus_mem.c:1.30 src/sys/arch/alpha/tc/tc_bus_mem.c:1.31 --- src/sys/arch/alpha/tc/tc_bus_mem.c:1.30 Sat Mar 14 21:04:03 2009 +++ src/sys/arch/alpha/tc/tc_bus_mem.c Wed Dec 15 01:29:37 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: tc_bus_mem.c,v 1.30 2009/03/14 21:04:03 dsl Exp $ */ +/* $NetBSD: tc_bus_mem.c,v 1.31 2010/12/15 01:29:37 matt Exp $ */ /* * Copyright (c) 1996 Carnegie-Mellon University. @@ -33,7 +33,7 @@ #include sys/cdefs.h /* RCS ID Copyright macro defns */ -__KERNEL_RCSID(0, $NetBSD: tc_bus_mem.c,v 1.30 2009/03/14 21:04:03 dsl Exp $); +__KERNEL_RCSID(0, $NetBSD: tc_bus_mem.c,v 1.31 2010/12/15 01:29:37 matt Exp $); #include sys/param.h #include sys/systm.h @@ -41,8 +41,6 @@ #include sys/syslog.h #include sys/device.h -#include uvm/uvm_extern.h - #include machine/bus.h #include dev/tc/tcvar.h Index: src/sys/arch/alpha/tc/tc_dma_3000_500.c diff -u src/sys/arch/alpha/tc/tc_dma_3000_500.c:1.15 src/sys/arch/alpha/tc/tc_dma_3000_500.c:1.16 --- src/sys/arch/alpha/tc/tc_dma_3000_500.c:1.15 Sat Mar 14 15:36:00 2009 +++ src/sys/arch/alpha/tc/tc_dma_3000_500.c Wed Dec 15 01:29:38 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: tc_dma_3000_500.c,v 1.15 2009/03/14 15:36:00 dsl Exp $ */ +/* $NetBSD: tc_dma_3000_500.c,v 1.16 2010/12/15 01:29:38 matt Exp $ */ /*- * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. @@ -32,7 +32,7 @@ #include sys/cdefs.h /* RCS ID Copyright macro defns */ -__KERNEL_RCSID(0, $NetBSD: tc_dma_3000_500.c,v 1.15 2009/03/14 15:36:00 dsl Exp $); +__KERNEL_RCSID(0, $NetBSD:
CVS commit: src/sys/arch/alpha/alpha
Module Name:src Committed By: matt Date: Wed Dec 15 01:32:31 UTC 2010 Modified Files: src/sys/arch/alpha/alpha: core_machdep.c cpu.c db_interface.c ipifuncs.c kgdb_machdep.c Log Message: remove unneeded uvm/uvm_extern.h includes To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/alpha/alpha/core_machdep.c cvs rdiff -u -r1.88 -r1.89 src/sys/arch/alpha/alpha/cpu.c cvs rdiff -u -r1.32 -r1.33 src/sys/arch/alpha/alpha/db_interface.c cvs rdiff -u -r1.43 -r1.44 src/sys/arch/alpha/alpha/ipifuncs.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/alpha/alpha/kgdb_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/alpha/alpha/core_machdep.c diff -u src/sys/arch/alpha/alpha/core_machdep.c:1.3 src/sys/arch/alpha/alpha/core_machdep.c:1.4 --- src/sys/arch/alpha/alpha/core_machdep.c:1.3 Sat Nov 21 05:35:40 2009 +++ src/sys/arch/alpha/alpha/core_machdep.c Wed Dec 15 01:32:31 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: core_machdep.c,v 1.3 2009/11/21 05:35:40 rmind Exp $ */ +/* $NetBSD: core_machdep.c,v 1.4 2010/12/15 01:32:31 matt Exp $ */ /* * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University. @@ -29,7 +29,7 @@ #include sys/cdefs.h /* RCS ID Copyright macro defns */ -__KERNEL_RCSID(0, $NetBSD: core_machdep.c,v 1.3 2009/11/21 05:35:40 rmind Exp $); +__KERNEL_RCSID(0, $NetBSD: core_machdep.c,v 1.4 2010/12/15 01:32:31 matt Exp $); #include sys/param.h #include sys/systm.h @@ -42,8 +42,6 @@ #include sys/exec_aout.h -#include uvm/uvm_extern.h - #include machine/cpu.h #include machine/alpha.h #include machine/pmap.h Index: src/sys/arch/alpha/alpha/cpu.c diff -u src/sys/arch/alpha/alpha/cpu.c:1.88 src/sys/arch/alpha/alpha/cpu.c:1.89 --- src/sys/arch/alpha/alpha/cpu.c:1.88 Thu Nov 26 00:19:11 2009 +++ src/sys/arch/alpha/alpha/cpu.c Wed Dec 15 01:32:31 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.c,v 1.88 2009/11/26 00:19:11 matt Exp $ */ +/* $NetBSD: cpu.c,v 1.89 2010/12/15 01:32:31 matt 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.88 2009/11/26 00:19:11 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.89 2010/12/15 01:32:31 matt Exp $); #include opt_ddb.h #include opt_multiprocessor.h @@ -72,8 +72,6 @@ #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/db_interface.c diff -u src/sys/arch/alpha/alpha/db_interface.c:1.32 src/sys/arch/alpha/alpha/db_interface.c:1.33 --- src/sys/arch/alpha/alpha/db_interface.c:1.32 Tue Jun 8 06:14:57 2010 +++ src/sys/arch/alpha/alpha/db_interface.c Wed Dec 15 01:32:31 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: db_interface.c,v 1.32 2010/06/08 06:14:57 mrg Exp $ */ +/* $NetBSD: db_interface.c,v 1.33 2010/12/15 01:32:31 matt Exp $ */ /* * Mach Operating System @@ -52,15 +52,13 @@ #include sys/cdefs.h /* RCS ID Copyright macro defns */ -__KERNEL_RCSID(0, $NetBSD: db_interface.c,v 1.32 2010/06/08 06:14:57 mrg Exp $); +__KERNEL_RCSID(0, $NetBSD: db_interface.c,v 1.33 2010/12/15 01:32:31 matt Exp $); #include sys/param.h #include sys/proc.h #include sys/reboot.h #include sys/systm.h -#include uvm/uvm_extern.h - #include dev/cons.h #include machine/alpha.h Index: src/sys/arch/alpha/alpha/ipifuncs.c diff -u src/sys/arch/alpha/alpha/ipifuncs.c:1.43 src/sys/arch/alpha/alpha/ipifuncs.c:1.44 --- src/sys/arch/alpha/alpha/ipifuncs.c:1.43 Wed Jun 23 13:52:26 2010 +++ src/sys/arch/alpha/alpha/ipifuncs.c Wed Dec 15 01:32:31 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: ipifuncs.c,v 1.43 2010/06/23 13:52:26 rmind Exp $ */ +/* $NetBSD: ipifuncs.c,v 1.44 2010/12/15 01:32:31 matt 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.43 2010/06/23 13:52:26 rmind Exp $); +__KERNEL_RCSID(0, $NetBSD: ipifuncs.c,v 1.44 2010/12/15 01:32:31 matt Exp $); /* * Interprocessor interrupt handlers. @@ -48,8 +48,6 @@ #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 Index: src/sys/arch/alpha/alpha/kgdb_machdep.c diff -u src/sys/arch/alpha/alpha/kgdb_machdep.c:1.6 src/sys/arch/alpha/alpha/kgdb_machdep.c:1.7 --- src/sys/arch/alpha/alpha/kgdb_machdep.c:1.6 Sun Jan 11 23:20:37 2009 +++ src/sys/arch/alpha/alpha/kgdb_machdep.c Wed Dec 15 01:32:31 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: kgdb_machdep.c,v 1.6 2009/01/11 23:20:37 cegger Exp $ */ +/* $NetBSD: kgdb_machdep.c,v 1.7 2010/12/15 01:32:31 matt Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ #include
CVS commit: src/sys/arch/alpha/alpha
Module Name:src Committed By: matt Date: Wed Dec 15 01:33:37 UTC 2010 Modified Files: src/sys/arch/alpha/alpha: genassym.cf Log Message: Remove unneeded uvm/uvm.h include To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/arch/alpha/alpha/genassym.cf 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/genassym.cf diff -u src/sys/arch/alpha/alpha/genassym.cf:1.18 src/sys/arch/alpha/alpha/genassym.cf:1.19 --- src/sys/arch/alpha/alpha/genassym.cf:1.18 Thu Dec 10 05:10:00 2009 +++ src/sys/arch/alpha/alpha/genassym.cf Wed Dec 15 01:33:37 2010 @@ -1,4 +1,4 @@ -# $NetBSD: genassym.cf,v 1.18 2009/12/10 05:10:00 rmind Exp $ +# $NetBSD: genassym.cf,v 1.19 2010/12/15 01:33:37 matt Exp $ # # Copyright (c) 1982, 1990, 1993 @@ -80,7 +80,6 @@ include machine/rpb.h include machine/vmparam.h -include uvm/uvm.h include uvm/uvm_extern.h # general constants
CVS commit: src/external/bsd/bind
Module Name:src
Committed By: christos
Date: Wed Dec 15 02:08:16 UTC 2010
Modified Files:
src/external/bsd/bind: Makefile.inc
Log Message:
Use the source dir atomic.h
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/bind/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/external/bsd/bind/Makefile.inc
diff -u src/external/bsd/bind/Makefile.inc:1.7 src/external/bsd/bind/Makefile.inc:1.8
--- src/external/bsd/bind/Makefile.inc:1.7 Tue Dec 14 18:17:20 2010
+++ src/external/bsd/bind/Makefile.inc Tue Dec 14 21:08:16 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.7 2010/12/14 23:17:20 christos Exp $
+# $NetBSD: Makefile.inc,v 1.8 2010/12/15 02:08:16 christos Exp $
.if !defined(BIND9_MAKEFILE_INC)
BIND9_MAKEFILE_INC=yes
@@ -17,7 +17,7 @@
NAMED_USE_OPENSSL?=yes
.endif
-.if exists(/usr/include/sys/atomic.h)
+.if exists(${NETBSDSRCDIR}/sys/sys/atomic.h)
NAMED_USE_PTHREADS?=yes
.else
NAMED_USE_PTHREADS?=no
CVS commit: src/doc
Module Name:src Committed By: christos Date: Wed Dec 15 02:59:05 UTC 2010 Modified Files: src/doc: 3RDPARTY Log Message: put real openssl version. To generate a diff of this commit: cvs rdiff -u -r1.794 -r1.795 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.794 src/doc/3RDPARTY:1.795 --- src/doc/3RDPARTY:1.794 Sun Dec 12 11:13:37 2010 +++ src/doc/3RDPARTY Tue Dec 14 21:59:05 2010 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.794 2010/12/12 16:13:37 adam Exp $ +# $NetBSD: 3RDPARTY,v 1.795 2010/12/15 02:59:05 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -817,7 +817,7 @@ Package: OpenSSL Version: SNAP-20091226 -Current Vers: 0.9.8n/1.0.0 +Current Vers: 0.9.8n/1.1.0 [snapshot-20091226] Maintainer: The OpenSSL Project Archive Site: ftp://ftp.openssl.org/source/ Home Page: http://www.openssl.org/
CVS commit: src/external/bsd/bind
Module Name:src
Committed By: enami
Date: Wed Dec 15 07:36:52 UTC 2010
Modified Files:
src/external/bsd/bind: Makefile.inc
Log Message:
Fix typo.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/bind/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/external/bsd/bind/Makefile.inc
diff -u src/external/bsd/bind/Makefile.inc:1.8 src/external/bsd/bind/Makefile.inc:1.9
--- src/external/bsd/bind/Makefile.inc:1.8 Wed Dec 15 02:08:16 2010
+++ src/external/bsd/bind/Makefile.inc Wed Dec 15 07:36:51 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.8 2010/12/15 02:08:16 christos Exp $
+# $NetBSD: Makefile.inc,v 1.9 2010/12/15 07:36:51 enami Exp $
.if !defined(BIND9_MAKEFILE_INC)
BIND9_MAKEFILE_INC=yes
@@ -94,7 +94,7 @@
DPADD+= ${LIBCRYPTO}
.else
.if exists(${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypto)
-LIBDPLIBS+= crypto ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypt)
+LIBDPLIBS+= crypto ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypto
.else
LIBDPLIBS+= crypto ${NETBSDSRCDIR}/lib/libcrypto
.endif
