CVS commit: src/tools/binutils
Module Name:src
Committed By: skrll
Date: Wed Oct 14 07:30:47 UTC 2009
Modified Files:
src/tools/binutils: Makefile
Log Message:
Only brand newer binutils.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/tools/binutils/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/binutils/Makefile
diff -u src/tools/binutils/Makefile:1.16 src/tools/binutils/Makefile:1.17
--- src/tools/binutils/Makefile:1.16 Mon Oct 12 08:00:41 2009
+++ src/tools/binutils/Makefile Wed Oct 14 07:30:47 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2009/10/12 08:00:41 skrll Exp $
+# $NetBSD: Makefile,v 1.17 2009/10/14 07:30:47 skrll Exp $
.include bsd.own.mk
@@ -6,11 +6,13 @@
.if $(HAVE_BINUTILS) == 219
GNUHOSTDIST= ${.CURDIR}/../../external/gpl3/binutils/dist
-.endif
BRANDING?= \
--with-pkgversion=NetBSD Binutils \
--with-bugurl=http://www.NetBSD.org/support/send-pr.html;
+.else
+BRANDING?=
+.endif
CONFIGURE_ARGS= --target=${MACHINE_GNU_PLATFORM} --disable-nls \
--program-transform-name=s,^,${MACHINE_GNU_PLATFORM}-, \
CVS commit: [netbsd-5] src
Module Name:src
Committed By: sborrill
Date: Wed Oct 14 09:13:54 UTC 2009
Modified Files:
src/include [netbsd-5]: util.h
src/lib/libutil [netbsd-5]: opendisk.c
Log Message:
Pull up the following revisions(s) (requested by pooka in ticket #1089):
include/util.h: revision 1.53
lib/libutil/opendisk.c: revision 1.12
Fix the open routine function pointer prototype of opendisk1() to match
the prototype of open().
To generate a diff of this commit:
cvs rdiff -u -r1.49.12.1 -r1.49.12.2 src/include/util.h
cvs rdiff -u -r1.10.6.1 -r1.10.6.2 src/lib/libutil/opendisk.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/include/util.h
diff -u src/include/util.h:1.49.12.1 src/include/util.h:1.49.12.2
--- src/include/util.h:1.49.12.1 Mon Oct 5 11:46:21 2009
+++ src/include/util.h Wed Oct 14 09:13:54 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: util.h,v 1.49.12.1 2009/10/05 11:46:21 sborrill Exp $ */
+/* $NetBSD: util.h,v 1.49.12.2 2009/10/14 09:13:54 sborrill Exp $ */
/*-
* Copyright (c) 1995
@@ -81,7 +81,7 @@
void logwtmpx(const char *, const char *, const char *, int, int);
int opendisk(const char *, int, char *, size_t, int);
int opendisk1(const char *, int, char *, size_t, int,
- int (*)(const char *, int, mode_t));
+ int (*)(const char *, int, ...));
int openpty(int *, int *, char *, struct termios *,
struct winsize *);
time_t parsedate(const char *, const time_t *, const int *);
Index: src/lib/libutil/opendisk.c
diff -u src/lib/libutil/opendisk.c:1.10.6.1 src/lib/libutil/opendisk.c:1.10.6.2
--- src/lib/libutil/opendisk.c:1.10.6.1 Mon Oct 5 11:46:21 2009
+++ src/lib/libutil/opendisk.c Wed Oct 14 09:13:54 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: opendisk.c,v 1.10.6.1 2009/10/05 11:46:21 sborrill Exp $ */
+/* $NetBSD: opendisk.c,v 1.10.6.2 2009/10/14 09:13:54 sborrill Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include sys/cdefs.h
#if defined(LIBC_SCCS) !defined(lint)
-__RCSID($NetBSD: opendisk.c,v 1.10.6.1 2009/10/05 11:46:21 sborrill Exp $);
+__RCSID($NetBSD: opendisk.c,v 1.10.6.2 2009/10/14 09:13:54 sborrill Exp $);
#endif
#include sys/param.h
@@ -46,7 +46,7 @@
static int
__opendisk(const char *path, int flags, char *buf, size_t buflen, int iscooked,
- int (*ofn)(const char *, int, mode_t))
+ int (*ofn)(const char *, int, ...))
{
int f, rawpart;
@@ -92,12 +92,12 @@
opendisk(const char *path, int flags, char *buf, size_t buflen, int iscooked)
{
- return __opendisk(path, flags, buf, buflen, iscooked, (void *)open);
+ return __opendisk(path, flags, buf, buflen, iscooked, open);
}
int
opendisk1(const char *path, int flags, char *buf, size_t buflen, int iscooked,
- int (*ofn)(const char *, int, mode_t))
+ int (*ofn)(const char *, int, ...))
{
return __opendisk(path, flags, buf, buflen, iscooked, ofn);
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: sborrill Date: Wed Oct 14 09:14:17 UTC 2009 Modified Files: src/doc [netbsd-5]: CHANGES-5.1 Log Message: Ticket 1089 To generate a diff of this commit: cvs rdiff -u -r1.1.2.100 -r1.1.2.101 src/doc/CHANGES-5.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.1 diff -u src/doc/CHANGES-5.1:1.1.2.100 src/doc/CHANGES-5.1:1.1.2.101 --- src/doc/CHANGES-5.1:1.1.2.100 Sun Oct 11 18:04:30 2009 +++ src/doc/CHANGES-5.1 Wed Oct 14 09:14:16 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1,v 1.1.2.100 2009/10/11 18:04:30 sborrill Exp $ +# $NetBSD: CHANGES-5.1,v 1.1.2.101 2009/10/14 09:14:16 sborrill Exp $ A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1 release: @@ -14119,3 +14119,10 @@ this there is a simple local-user panic in ureadc(). [dsl, ticket #1087] +include/util.h 1.53 +lib/libutil/opendisk.c1.12 + + Fix the open routine function pointer prototype of opendisk1() + to match the prototype of open(). + [pooka, ticket #1089] +
CVS commit: [netbsd-5] src/crypto/dist/heimdal/lib/krb5
Module Name:src Committed By: sborrill Date: Wed Oct 14 09:17:13 UTC 2009 Modified Files: src/crypto/dist/heimdal/lib/krb5 [netbsd-5]: krb5_get_in_cred.3 Log Message: Pull up the following revisions(s) (requested by joerg in ticket #1090): crypto/dist/heimdal/lib/krb5/krb5_get_in_cred.3:revision 1.2 Fix man page markup. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.1.8.1 \ src/crypto/dist/heimdal/lib/krb5/krb5_get_in_cred.3 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/heimdal/lib/krb5/krb5_get_in_cred.3 diff -u src/crypto/dist/heimdal/lib/krb5/krb5_get_in_cred.3:1.1 src/crypto/dist/heimdal/lib/krb5/krb5_get_in_cred.3:1.1.8.1 --- src/crypto/dist/heimdal/lib/krb5/krb5_get_in_cred.3:1.1 Sat Mar 22 08:37:14 2008 +++ src/crypto/dist/heimdal/lib/krb5/krb5_get_in_cred.3 Wed Oct 14 09:17:13 2009 @@ -30,7 +30,7 @@ .\ SUCH DAMAGE. .\ .\ $Heimdal: krb5_get_in_cred.3 17593 2006-05-29 14:55:18Z lha $ -.\ $NetBSD: krb5_get_in_cred.3,v 1.1 2008/03/22 08:37:14 mlelstv Exp $ +.\ $NetBSD: krb5_get_in_cred.3,v 1.1.8.1 2009/10/14 09:17:13 sborrill Exp $ .\ .Dd May 31, 2003 .Dt KRB5_GET_IN_TKT 3 @@ -170,7 +170,7 @@ .Nm krb5_get_in_tkt_with_password uses the clients password to authenticate. If the password argument is -.DV NULL +.Dv NULL the user user queried with the default password query function. .Pp .Nm krb5_get_in_tkt_with_keytab
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: sborrill Date: Wed Oct 14 09:18:33 UTC 2009 Modified Files: src/doc [netbsd-5]: CHANGES-5.1 Log Message: Pull up the following revisions(s) (requested by joerg in ticket #1090): crypto/dist/heimdal/lib/krb5/krb5_get_in_cred.3:revision 1.2 Fix man page markup. To generate a diff of this commit: cvs rdiff -u -r1.1.2.101 -r1.1.2.102 src/doc/CHANGES-5.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.1 diff -u src/doc/CHANGES-5.1:1.1.2.101 src/doc/CHANGES-5.1:1.1.2.102 --- src/doc/CHANGES-5.1:1.1.2.101 Wed Oct 14 09:14:16 2009 +++ src/doc/CHANGES-5.1 Wed Oct 14 09:18:32 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1,v 1.1.2.101 2009/10/14 09:14:16 sborrill Exp $ +# $NetBSD: CHANGES-5.1,v 1.1.2.102 2009/10/14 09:18:32 sborrill Exp $ A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1 release: @@ -14126,3 +14126,8 @@ to match the prototype of open(). [pooka, ticket #1089] +crypto/dist/heimdal/lib/krb5/krb5_get_in_cred.3 1.2 + + Fix man page markup. + [joerg, ticket #1090] +
CVS commit: [netbsd-5] src
Module Name:src
Committed By: sborrill
Date: Wed Oct 14 09:31:28 UTC 2009
Modified Files:
src/include [netbsd-5]: dlfcn.h
src/lib/libc/dlfcn [netbsd-5]: dlfcn_elf.c
src/libexec/ld.elf_so [netbsd-5]: reloc.c rtld.c rtld.h symbol.c
Log Message:
Pull up the following revisions(s) (requested by pooka in ticket #1088):
include/dlfcn.h:revision 1.20
lib/libc/dlfcn/dlfcn_elf.c: revision 1.6
libexec/ld.elf_so/reloc.c: revision 1.97
libexec/ld.elf_so/rtld.c: revision 1.125
libexec/ld.elf_so/rtld.h: revision 1.81
libexec/ld.elf_so/symbol.c: revision 1.48
Add Solarisa-like dlinfo() interface to the ELF dynamic linker.
Implement RTLD_DI_LINKMAP which returns a pointer to the linkmap
chain at the given object. Other Solaris queries are currently
unimplemented.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.19.8.1 src/include/dlfcn.h
cvs rdiff -u -r1.5 -r1.5.32.1 src/lib/libc/dlfcn/dlfcn_elf.c
cvs rdiff -u -r1.96 -r1.96.4.1 src/libexec/ld.elf_so/reloc.c
cvs rdiff -u -r1.123 -r1.123.2.1 src/libexec/ld.elf_so/rtld.c
cvs rdiff -u -r1.79 -r1.79.4.1 src/libexec/ld.elf_so/rtld.h
cvs rdiff -u -r1.47 -r1.47.4.1 src/libexec/ld.elf_so/symbol.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/include/dlfcn.h
diff -u src/include/dlfcn.h:1.19 src/include/dlfcn.h:1.19.8.1
--- src/include/dlfcn.h:1.19 Mon Apr 28 20:22:54 2008
+++ src/include/dlfcn.h Wed Oct 14 09:31:28 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: dlfcn.h,v 1.19 2008/04/28 20:22:54 martin Exp $ */
+/* $NetBSD: dlfcn.h,v 1.19.8.1 2009/10/14 09:31:28 sborrill Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -54,6 +54,7 @@
#if defined(_NETBSD_SOURCE)
int dladdr(const void * __restrict, Dl_info * __restrict);
int dlctl(void *, int, void *);
+int dlinfo(void *, int, void *);
#endif
__aconst char *dlerror(void);
__END_DECLS
@@ -88,4 +89,23 @@
#endif /* 0 */
#endif /* defined(_NETBSD_SOURCE) */
+/*
+ * dlinfo() commands
+ *
+ * From Solarisa: http://docs.sun.com/app/docs/doc/816-5168/dlinfo-3c?a=view
+ */
+#if defined(_NETBSD_SOURCE)
+#define RTLD_DI_LINKMAP 3
+#if 0
+#define RTLD_DI_ARGSINFO 1
+#define RTLD_DI_CONFIGADDR 2
+#define RTLD_DI_LMID 4
+#define RTLD_DI_SERINFO 5
+#define RTLD_DI_SERINFOSIZE 6
+#define RTLD_DI_ORIGIN 7
+#define RTLD_DI_GETSIGNAL 8
+#define RTLD_DI_SETSIGNAL 9
+#endif
+#endif /* _NETBSD_SOURCE */
+
#endif /* !defined(_DLFCN_H_) */
Index: src/lib/libc/dlfcn/dlfcn_elf.c
diff -u src/lib/libc/dlfcn/dlfcn_elf.c:1.5 src/lib/libc/dlfcn/dlfcn_elf.c:1.5.32.1
--- src/lib/libc/dlfcn/dlfcn_elf.c:1.5 Sun Jul 18 17:26:19 2004
+++ src/lib/libc/dlfcn/dlfcn_elf.c Wed Oct 14 09:31:27 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: dlfcn_elf.c,v 1.5 2004/07/18 17:26:19 thorpej Exp $ */
+/* $NetBSD: dlfcn_elf.c,v 1.5.32.1 2009/10/14 09:31:27 sborrill Exp $ */
/*
* Copyright (c) 2000 Takuya SHIOZAKI
@@ -27,7 +27,7 @@
#include sys/cdefs.h
#if defined(LIBC_SCCS) !defined(lint)
-__RCSID($NetBSD: dlfcn_elf.c,v 1.5 2004/07/18 17:26:19 thorpej Exp $);
+__RCSID($NetBSD: dlfcn_elf.c,v 1.5.32.1 2009/10/14 09:31:27 sborrill Exp $);
#endif /* LIBC_SCCS and not lint */
#include namespace.h
@@ -37,12 +37,14 @@
#undef dlsym
#undef dlerror
#undef dladdr
+#undef dfinfo
#define dlopen ___dlopen
#define dlclose ___dlclose
#define dlsym ___dlsym
#define dlerror ___dlerror
#define dladdr ___dladdr
+#define dlinfo ___dlinfo
#define ELFSIZE ARCH_ELFSIZE
#include rtld.h
@@ -53,12 +55,14 @@
__weak_alias(dlsym,___dlsym)
__weak_alias(dlerror,___dlerror)
__weak_alias(dladdr,___dladdr)
+__weak_alias(dlinfo,___dlinfo)
__weak_alias(__dlopen,___dlopen)
__weak_alias(__dlclose,___dlclose)
__weak_alias(__dlsym,___dlsym)
__weak_alias(__dlerror,___dlerror)
__weak_alias(__dladdr,___dladdr)
+__weak_alias(__dlinfo,___dlinfo)
#endif
/*
@@ -112,3 +116,11 @@
return 0;
}
+
+/*ARGSUSED*/
+int
+dlinfo(void *handle, int req, void *v)
+{
+
+ return -1;
+}
Index: src/libexec/ld.elf_so/reloc.c
diff -u src/libexec/ld.elf_so/reloc.c:1.96 src/libexec/ld.elf_so/reloc.c:1.96.4.1
--- src/libexec/ld.elf_so/reloc.c:1.96 Tue Jul 29 16:27:01 2008
+++ src/libexec/ld.elf_so/reloc.c Wed Oct 14 09:31:27 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: reloc.c,v 1.96 2008/07/29 16:27:01 matt Exp $ */
+/* $NetBSD: reloc.c,v 1.96.4.1 2009/10/14 09:31:27 sborrill Exp $ */
/*
* Copyright 1996 John D. Polstra.
@@ -39,7 +39,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: reloc.c,v 1.96 2008/07/29 16:27:01 matt Exp $);
+__RCSID($NetBSD: reloc.c,v 1.96.4.1 2009/10/14 09:31:27 sborrill Exp $);
#endif /* not lint */
#include err.h
@@ -210,6 +210,7 @@
obj-dlerror = dlerror;
obj-dlclose = dlclose;
obj-dladdr = dladdr;
+ obj-dlinfo = dlinfo;
dbg((fixing up PLTGOT));
/* Set the special PLTGOT entries. */
Index:
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: sborrill Date: Wed Oct 14 09:32:05 UTC 2009 Modified Files: src/doc [netbsd-5]: CHANGES-5.1 Log Message: Ticket 1088 To generate a diff of this commit: cvs rdiff -u -r1.1.2.102 -r1.1.2.103 src/doc/CHANGES-5.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.1 diff -u src/doc/CHANGES-5.1:1.1.2.102 src/doc/CHANGES-5.1:1.1.2.103 --- src/doc/CHANGES-5.1:1.1.2.102 Wed Oct 14 09:18:32 2009 +++ src/doc/CHANGES-5.1 Wed Oct 14 09:32:05 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1,v 1.1.2.102 2009/10/14 09:18:32 sborrill Exp $ +# $NetBSD: CHANGES-5.1,v 1.1.2.103 2009/10/14 09:32:05 sborrill Exp $ A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1 release: @@ -14131,3 +14131,17 @@ Fix man page markup. [joerg, ticket #1090] +include/dlfcn.h 1.20 +lib/libc/dlfcn/dlfcn_elf.c 1.6 +libexec/ld.elf_so/reloc.c 1.97 +libexec/ld.elf_so/rtld.c 1.125 +libexec/ld.elf_so/rtld.h 1.81 +libexec/ld.elf_so/symbol.c 1.48 + + Add Solarisa-like dlinfo() interface to the ELF dynamic + linker. Implement RTLD_DI_LINKMAP which returns a pointer + to the linkmap chain at the given object. Other Solaris + queries are currently unimplemented. + + [pooka, ticket #1088] +
CVS commit: src/sys/ufs/ufs
Module Name:src Committed By: hannken Date: Wed Oct 14 09:40:27 UTC 2009 Modified Files: src/sys/ufs/ufs: ufs_vnops.c Log Message: ufs_rmdir(): move fstrans_done() after vput(). No more unlinked and zero-sized directory inodes in snapshots. To generate a diff of this commit: cvs rdiff -u -r1.179 -r1.180 src/sys/ufs/ufs/ufs_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/ufs/ufs/ufs_vnops.c diff -u src/sys/ufs/ufs/ufs_vnops.c:1.179 src/sys/ufs/ufs/ufs_vnops.c:1.180 --- src/sys/ufs/ufs/ufs_vnops.c:1.179 Fri Jul 3 21:17:42 2009 +++ src/sys/ufs/ufs/ufs_vnops.c Wed Oct 14 09:40:27 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: ufs_vnops.c,v 1.179 2009/07/03 21:17:42 elad Exp $ */ +/* $NetBSD: ufs_vnops.c,v 1.180 2009/10/14 09:40:27 hannken Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -66,7 +66,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ufs_vnops.c,v 1.179 2009/07/03 21:17:42 elad Exp $); +__KERNEL_RCSID(0, $NetBSD: ufs_vnops.c,v 1.180 2009/10/14 09:40:27 hannken Exp $); #if defined(_KERNEL_OPT) #include opt_ffs.h @@ -1590,9 +1590,9 @@ #endif out: VN_KNOTE(vp, NOTE_DELETE); - fstrans_done(dvp-v_mount); vput(dvp); vput(vp); + fstrans_done(dvp-v_mount); return (error); }
CVS commit: src/tests/util/sh
Module Name:src
Committed By: jmmv
Date: Wed Oct 14 13:02:04 UTC 2009
Modified Files:
src/tests/util/sh: t_expand.sh
Log Message:
Add test cases for prefix $@ suffix expansion. From PR bin/33956.
This issue was fixed a while ago but the tests described in the report
were never written as proper test cases.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/util/sh/t_expand.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/util/sh/t_expand.sh
diff -u src/tests/util/sh/t_expand.sh:1.2 src/tests/util/sh/t_expand.sh:1.3
--- src/tests/util/sh/t_expand.sh:1.2 Wed Apr 30 13:11:00 2008
+++ src/tests/util/sh/t_expand.sh Wed Oct 14 13:02:03 2009
@@ -1,6 +1,6 @@
-# $NetBSD: t_expand.sh,v 1.2 2008/04/30 13:11:00 martin Exp $
+# $NetBSD: t_expand.sh,v 1.3 2009/10/14 13:02:03 jmmv Exp $
#
-# Copyright (c) 2007 The NetBSD Foundation, Inc.
+# Copyright (c) 2007, 2009 The NetBSD Foundation, Inc.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -29,6 +29,19 @@
# This file tests the functions in expand.c.
#
+delim_argv() {
+ str=
+ while [ $# -gt 0 ]; do
+ if [ -z ${str} ]; then
+ str=$1
+ else
+ str=${str} $1
+ fi
+shift
+ done
+ echo ${str}
+}
+
atf_test_case dollar_at
dollar_at_head() {
atf_set descr Somewhere between 2.0.2 and 3.0 the expansion \
@@ -52,6 +65,23 @@
atf_check_equal '0' '$n_args'
}
+atf_test_case dollar_at_with_text
+dollar_at_with_text_head() {
+ atf_set descr Test \$@ expansion when it is surrounded by text \
+ within the quotes. PR bin/33956.
+}
+dollar_at_with_text_body() {
+ set --
+ atf_check_equal '' $(delim_argv $@)
+ atf_check_equal 'foobar' $(delim_argv f...@bar)
+ atf_check_equal 'foo bar' $(delim_argv foo $@ bar)
+
+ set -- a b c
+ atf_check_equal 'a b c' $(delim_argv $@)
+ atf_check_equal 'fooa b cbar' $(delim_argv f...@bar)
+ atf_check_equal 'foo a b c bar' $(delim_argv foo $@ bar)
+}
+
atf_test_case strip
strip_head() {
atf_set descr Checks that the %% operator works and strips \
@@ -79,6 +109,7 @@
atf_init_test_cases() {
atf_add_test_case dollar_at
+ atf_add_test_case dollar_at_with_text
atf_add_test_case strip
atf_add_test_case arithmetic
}
CVS commit: src/sys/rump/librump
Module Name:src
Committed By: pooka
Date: Wed Oct 14 17:17:00 UTC 2009
Added Files:
src/sys/rump/librump: makerumpif.sh
src/sys/rump/librump/rumpkern: rumpkern.ifspec
src/sys/rump/librump/rumpnet: rumpnet.ifspec
src/sys/rump/librump/rumpvfs: rumpvfs.ifspec
Log Message:
Create rump public interfaces from description tables. This allows
us to control and wrap all entry points from userspace into rump.
This in turn is necessary for the upcoming rump cpu scheduler.
For each interface foo a public wrapper called rump_foo is
created. It calls the internal implementation rumppriv_foo. In
case foo is to be called from inside of rump kernel space, the
private interface rumppriv_foo is used -- the userspace wrapper
prototypes are not even exported into the rump kernel namespace.
Needless to say, the rump kernel internal interfaces are not exported
for users.
Now, three classes of interfaces fight for control of rump:
+ the noble local control interfaces (which this commit addresses)
+ the insidious rump system calls (which are generated from syscalls.master)
+ and the evil vnode interfaces (which are generated from vnode_if.src)
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/rump/librump/makerumpif.sh
cvs rdiff -u -r0 -r1.1 src/sys/rump/librump/rumpkern/rumpkern.ifspec
cvs rdiff -u -r0 -r1.1 src/sys/rump/librump/rumpnet/rumpnet.ifspec
cvs rdiff -u -r0 -r1.1 src/sys/rump/librump/rumpvfs/rumpvfs.ifspec
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/sys/rump/librump/makerumpif.sh
diff -u /dev/null src/sys/rump/librump/makerumpif.sh:1.1
--- /dev/null Wed Oct 14 17:17:00 2009
+++ src/sys/rump/librump/makerumpif.sh Wed Oct 14 17:17:00 2009
@@ -0,0 +1,204 @@
+#!/bin/sh
+#
+# $NetBSD: makerumpif.sh,v 1.1 2009/10/14 17:17:00 pooka Exp $
+#
+# Copyright (c) 2009 Antti Kantee. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#notice, this list of conditions and the following disclaimer in the
+#documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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.
+#
+
+#
+# This reads a rump component interface description and creates:
+# 1: rump private prototypes for internal calls
+# 2: public prototypes for calls outside of rump
+# 3: public interface implementations which run the rump scheduler
+# and call the private interface
+#
+
+usage ()
+{
+
+ echo usage: $0 spec
+ exit 1
+}
+
+boom ()
+{
+
+ echo $*
+ exit 1
+}
+
+[ $# != 1 ] usage
+
+MYDIR=`pwd`
+while [ ! -f Makefile.rump ]; do
+ [ `pwd` = '/' ] boom Could not find rump topdir.
+ cd ..
+done
+RUMPTOP=`pwd`
+cd ${MYDIR}
+
+sed -e '
+:again
+ /\\$/{
+ N
+ s/[ ]*\\\n[ ]*/ /
+ b again
+ }
+' ${1} | awk -F\| -v rumptop=${RUMPTOP} '
+function fileheaders(file, srcstr)
+{
+ printf(/*\t$NetBSD: makerumpif.sh,v 1.1 2009/10/14 17:17:00 pooka Exp $\t*/\n\n) file
+ printf(/*\n * Automatically generated. DO NOT EDIT.\n) file
+ genstr = $NetBSD: makerumpif.sh,v 1.1 2009/10/14 17:17:00 pooka Exp $
+ gsub(\\$, , genstr)
+ printf( * from: %s\n, srcstr) file
+ printf( * by: %s\n, genstr) file
+ printf( */\n) file
+}
+
+function die(str)
+{
+
+ print str
+ exit(1)
+}
+
+NR == 1 {
+ sub(;[^\\$]*\\$, )
+ sub(\\$, )
+ fromstr = $0
+ next
+}
+
+$1 == NAME{myname = $2;next}
+$1 == PUBHDR{pubhdr = rumptop / $2;next}
+$1 == PRIVHDR{privhdr = rumptop / $2;next}
+$1 == WRAPPERS{gencalls = rumptop / $2;next}
+
+/^;/{next}
+/\\$/{sub(\\\n, );getline nextline;$0 = $0 nextline}
+/^[ \t]*$/{next}
+{
+ if (NF != 3 NF != 4) {
+ die(error: unexpected number of fields\n)
+ }
+ if (NF == 4) {
+ if ($4 == WEAK)
+ isweak = 1
+ else
+ die(error: unexpected fourth field);
+ } else {
+ isweak = 0
+ }
+ if (!myname)
+ die(name not specified);
+ if (!pubhdr)
+ die(public header not specified);
+ if (!privhdr)
+ die(private header not
CVS commit: src/lib/libc/net
Module Name:src
Committed By: joerg
Date: Wed Oct 14 17:24:03 UTC 2009
Modified Files:
src/lib/libc/net: nsdispatch.3
Log Message:
Do not nest displays, use lists instead. Discussed with wiz.
Fix markup.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/lib/libc/net/nsdispatch.3
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/net/nsdispatch.3
diff -u src/lib/libc/net/nsdispatch.3:1.28 src/lib/libc/net/nsdispatch.3:1.29
--- src/lib/libc/net/nsdispatch.3:1.28 Thu May 8 13:01:42 2008
+++ src/lib/libc/net/nsdispatch.3 Wed Oct 14 17:24:03 2009
@@ -1,4 +1,4 @@
-.\ $NetBSD: nsdispatch.3,v 1.28 2008/05/08 13:01:42 lukem Exp $
+.\ $NetBSD: nsdispatch.3,v 1.29 2009/10/14 17:24:03 joerg Exp $
.\
.\ Copyright (c) 1997, 1998, 1999, 2004, 2005, 2008
.\ The NetBSD Foundation, Inc.
@@ -67,7 +67,8 @@
is an array of
.Fa ns_dtab
structures, which have the following format:
-.Bd -ragged -offset indent
+.Bl -item -offset indent
+.It
.Bd -literal
typedef struct {
const char *src;
@@ -75,7 +76,7 @@
void *cb_data;
} ns_dtab;
.Ed
-.Pp
+.It
The
.Fa dtab
array should consist of one entry for each source type that has a
@@ -96,9 +97,8 @@
.Fa cb ,
and
.Fa cb_data .
-.Pp
+.It
The callback function signature is described by the typedef:
-.Pp
.Bd -ragged -offset indent
.Ft typedef int
.Fo \*(lp*nss_method\*(rp
@@ -106,7 +106,6 @@
.Fa void *cbdata
.Fa va_list ap
.Fc ;
-.Pp
.Bl -tag -width cbdata
.It Fa cbrv
The
@@ -131,7 +130,7 @@
.Ft va_list .
.El
.Ed
-.Ed
+.El
.Pp
.Fa database
and
@@ -155,14 +154,15 @@
It is an array of
.Fa ns_src
structures, which have the following format:
-.Bd -ragged -offset indent
+.Bl -item -offset indent
+.It
.Bd -literal
typedef struct {
const char *src;
uint32_t flags;
} ns_src;
.Ed
-.Pp
+.It
The
.Fa defaults
array should consist of one entry for each source to consult by default
@@ -185,7 +185,7 @@
and
.Fa flags
set to 0.
-.Pp
+.It
Some invokers of
.Fn nsdispatch
(such as
@@ -202,13 +202,13 @@
The return value of
.Fn nsdispatch
will be the result of the final callback function invoked.
-.Pp
+.It
For convenience, a global variable defined as:
.Dl extern const ns_src __nsdefaultsrc[];
exists which contains a single default entry for
.Sq files
for use by callers which don't require complicated default rules.
-.Ed
+.El
.Pp
.Fa ...
are optional extra arguments, which
@@ -229,7 +229,8 @@
.Fn nsdispatch
function loads callback functions from the run-time link-editor's search
path using the following naming convention:
-.Bd -ragged -offset indent
+.Bl -item -offset indent
+.It
.Bd -literal
nss_\*[Lt]source\*[Gt].so.\*[Lt]version\*[Gt]
.Ed
@@ -243,7 +244,7 @@
.Dv NSS_MODULE_INTERFACE_VERSION ,
which has the value 0.
.El
-.Ed
+.El
.Pp
When a module is loaded,
.Fn nsdispatch
@@ -317,7 +318,8 @@
The
.Ft ns_mtab
structures have the following format:
-.Bd -ragged -offset indent
+.Bl -item -offset indent
+.It
.Bd -literal
typedef struct {
const char *database;
@@ -326,7 +328,7 @@
void *mdata;
} ns_mtab;
.Ed
-.Pp
+.It
The
.Fa mtab
array should consist of one entry for each callback function (method)
@@ -344,13 +346,13 @@
as a pointer to arbitrary data to be passed to the callback function as its
.Fa cbdata
argument.
-.Ed
+.El
.\
.Ss Valid source types
While there is support for arbitrary sources, the following
#defines for commonly implemented sources are provided:
.Bl -column NSSRC_COMPAT COMPAT -offset indent
-.Sy #define Value
+.It Sy #define Value
.It NSSRC_FILES files
.It NSSRC_DNS dns
.It NSSRC_NIS nis
@@ -365,7 +367,7 @@
While there is support for arbitrary databases, the following
#defines for currently implemented system databases are provided:
.Bl -column NSDB_PASSWD_COMPAT PASSWD_COMPAT -offset indent
-.Sy #define Value
+.It Sy #define Value
.It NSDB_HOSTS hosts
.It NSDB_GROUP group
.It NSDB_GROUP_COMPAT group_compat
@@ -384,7 +386,7 @@
The callback functions should return one of the following values
depending upon status of the lookup:
.Bl -column NS_NOTFOUND -offset indent
-.Sy Return value Status code
+.It Sy Return value Status code
.It NS_SUCCESS The requested entry was found.
.It NS_NOTFOUND The entry is not present at this source.
.It NS_TRYAGAIN The source is busy, and may respond to retries.
CVS commit: src/sys/rump/librump
Module Name:src
Committed By: pooka
Date: Wed Oct 14 17:26:09 UTC 2009
Modified Files:
src/sys/rump/librump: makerumpif.sh
Log Message:
adjust whitespace a bit
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/librump/makerumpif.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/librump/makerumpif.sh
diff -u src/sys/rump/librump/makerumpif.sh:1.1 src/sys/rump/librump/makerumpif.sh:1.2
--- src/sys/rump/librump/makerumpif.sh:1.1 Wed Oct 14 17:17:00 2009
+++ src/sys/rump/librump/makerumpif.sh Wed Oct 14 17:26:09 2009
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: makerumpif.sh,v 1.1 2009/10/14 17:17:00 pooka Exp $
+# $NetBSD: makerumpif.sh,v 1.2 2009/10/14 17:26:09 pooka Exp $
#
# Copyright (c) 2009 Antti Kantee. All rights reserved.
#
@@ -67,9 +67,9 @@
' ${1} | awk -F\| -v rumptop=${RUMPTOP} '
function fileheaders(file, srcstr)
{
- printf(/*\t$NetBSD: makerumpif.sh,v 1.1 2009/10/14 17:17:00 pooka Exp $\t*/\n\n) file
+ printf(/*\t$NetBSD: makerumpif.sh,v 1.2 2009/10/14 17:26:09 pooka Exp $\t*/\n\n) file
printf(/*\n * Automatically generated. DO NOT EDIT.\n) file
- genstr = $NetBSD: makerumpif.sh,v 1.1 2009/10/14 17:17:00 pooka Exp $
+ genstr = $NetBSD: makerumpif.sh,v 1.2 2009/10/14 17:26:09 pooka Exp $
gsub(\\$, , genstr)
printf( * from: %s\n, srcstr) file
printf( * by: %s\n, genstr) file
@@ -139,7 +139,7 @@
printf(\n#include rump/rump.h\n) gencalls
printf(#include rump/%s\n\n, pubfile) gencalls
printf(#include \%s\\n\n, privfile) gencalls
- printf(void __dead\nrump_%s_unavailable(void);\n, \
+ printf(void __dead rump_%s_unavailable(void);\n, \
myname) gencalls
printf(void __dead\nrump_%s_unavailable(void)\n{\n, \
myname) gencalls
@@ -152,6 +152,8 @@
funname = $2
sub([ \t]*$, , funname)
funargs = $3
+ sub([ \t]*$, , funargs)
+
printf(%s rump_%s(%s);\n, funtype, funname, funargs) pubhdr
printf(%s rumppriv_%s(%s);\n, funtype, funname, funargs) privhdr
@@ -183,7 +185,7 @@
printf()\n{\n) gencalls
if (!voidret) {
- printf(\t%s rv;\n, $1) gencalls
+ printf(\t%s rv;\n, funtype) gencalls
}
printf(\n\t) gencalls
if (!voidret)
CVS commit: src/sys/rump
Module Name:src Committed By: pooka Date: Wed Oct 14 17:28:14 UTC 2009 Added Files: src/sys/rump/include/rump: rumpkern_if_pub.h rumpnet_if_pub.h rumpvfs_if_pub.h src/sys/rump/librump/rumpkern: rumpkern_if_priv.h rumpkern_if_wrappers.c src/sys/rump/librump/rumpnet: rumpnet_if_priv.h rumpnet_if_wrappers.c src/sys/rump/librump/rumpvfs: rumpvfs_if_priv.h rumpvfs_if_wrappers.c Log Message: generate rump local interfaces To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/rump/include/rump/rumpkern_if_pub.h \ src/sys/rump/include/rump/rumpnet_if_pub.h \ src/sys/rump/include/rump/rumpvfs_if_pub.h cvs rdiff -u -r0 -r1.1 src/sys/rump/librump/rumpkern/rumpkern_if_priv.h \ src/sys/rump/librump/rumpkern/rumpkern_if_wrappers.c cvs rdiff -u -r0 -r1.1 src/sys/rump/librump/rumpnet/rumpnet_if_priv.h \ src/sys/rump/librump/rumpnet/rumpnet_if_wrappers.c cvs rdiff -u -r0 -r1.1 src/sys/rump/librump/rumpvfs/rumpvfs_if_priv.h \ src/sys/rump/librump/rumpvfs/rumpvfs_if_wrappers.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/sys/rump/include/rump/rumpkern_if_pub.h diff -u /dev/null src/sys/rump/include/rump/rumpkern_if_pub.h:1.1 --- /dev/null Wed Oct 14 17:28:14 2009 +++ src/sys/rump/include/rump/rumpkern_if_pub.h Wed Oct 14 17:28:13 2009 @@ -0,0 +1,27 @@ +/* $NetBSD: rumpkern_if_pub.h,v 1.1 2009/10/14 17:28:13 pooka Exp $ */ + +/* + * Automatically generated. DO NOT EDIT. + * from: NetBSD: rumpkern.ifspec,v 1.1 2009/10/14 17:17:00 pooka Exp + * by: NetBSD: makerumpif.sh,v 1.2 2009/10/14 17:26:09 pooka Exp + */ + +void rump_reboot(int); +int rump_getversion(void); +int rump_module_init(struct modinfo *, prop_dictionary_t); +int rump_module_fini(struct modinfo *); +struct uio * rump_uio_setup(void *, size_t, off_t, enum rump_uiorw); +size_t rump_uio_getresid(struct uio *); +off_t rump_uio_getoff(struct uio *); +size_t rump_uio_free(struct uio *); +kauth_cred_t rump_cred_create(uid_t, gid_t, size_t, gid_t *); +kauth_cred_t rump_cred_suserget(void); +void rump_cred_put(kauth_cred_t); +struct lwp * rump_newproc_switch(void); +struct lwp * rump_setup_curlwp(pid_t, lwpid_t, int); +struct lwp * rump_get_curlwp(void); +void rump_set_curlwp(struct lwp *); +void rump_clear_curlwp(void); +int rump_sysproxy_set(rump_sysproxy_t, void *); +int rump_sysproxy_socket_setup_client(int); +int rump_sysproxy_socket_setup_server(int); Index: src/sys/rump/include/rump/rumpnet_if_pub.h diff -u /dev/null src/sys/rump/include/rump/rumpnet_if_pub.h:1.1 --- /dev/null Wed Oct 14 17:28:14 2009 +++ src/sys/rump/include/rump/rumpnet_if_pub.h Wed Oct 14 17:28:13 2009 @@ -0,0 +1,9 @@ +/* $NetBSD: rumpnet_if_pub.h,v 1.1 2009/10/14 17:28:13 pooka Exp $ */ + +/* + * Automatically generated. DO NOT EDIT. + * from: NetBSD: rumpnet.ifspec,v 1.1 2009/10/14 17:17:00 pooka Exp + * by: NetBSD: makerumpif.sh,v 1.2 2009/10/14 17:26:09 pooka Exp + */ + +int rump_virtif_create(int); Index: src/sys/rump/include/rump/rumpvfs_if_pub.h diff -u /dev/null src/sys/rump/include/rump/rumpvfs_if_pub.h:1.1 --- /dev/null Wed Oct 14 17:28:14 2009 +++ src/sys/rump/include/rump/rumpvfs_if_pub.h Wed Oct 14 17:28:13 2009 @@ -0,0 +1,42 @@ +/* $NetBSD: rumpvfs_if_pub.h,v 1.1 2009/10/14 17:28:13 pooka Exp $ */ + +/* + * Automatically generated. DO NOT EDIT. + * from: NetBSD: rumpvfs.ifspec,v 1.1 2009/10/14 17:17:00 pooka Exp + * by: NetBSD: makerumpif.sh,v 1.2 2009/10/14 17:26:09 pooka Exp + */ + +void rump_getvninfo(struct vnode *, enum vtype *, off_t *, dev_t *); +struct vfsops * rump_vfslist_iterate(struct vfsops *); +struct vfsops * rump_vfs_getopsbyname(const char *); +struct vattr * rump_vattr_init(void); +void rump_vattr_settype(struct vattr *, enum vtype); +void rump_vattr_setmode(struct vattr *, mode_t); +void rump_vattr_setrdev(struct vattr *, dev_t); +void rump_vattr_free(struct vattr *); +void rump_vp_incref(struct vnode *); +int rump_vp_getref(struct vnode *); +void rump_vp_rele(struct vnode *); +void rump_vp_interlock(struct vnode *); +int rump_etfs_register(const char *, const char *, enum rump_etfs_type); +int rump_etfs_register_withsize(const char *, const char *, enum rump_etfs_type, uint64_t, uint64_t); +int rump_etfs_remove(const char *); +void rump_freecn(struct componentname *, int); +int rump_checksavecn(struct componentname *); +int rump_namei(uint32_t, uint32_t, const char *, struct vnode **, struct vnode **, struct componentname **); +struct componentname * rump_makecn(u_long, u_long, const char *, size_t, kauth_cred_t, struct lwp *); +int rump_vfs_unmount(struct mount *, int); +int rump_vfs_root(struct mount *, struct vnode **, int); +int rump_vfs_statvfs(struct mount *, struct statvfs *); +int rump_vfs_sync(struct mount *, int, kauth_cred_t); +int rump_vfs_fhtovp(struct mount *, struct fid *, struct vnode **); +int rump_vfs_vptofh(struct vnode *, struct
CVS commit: src/sys/rump
Module Name:src
Committed By: pooka
Date: Wed Oct 14 17:29:20 UTC 2009
Modified Files:
src/sys/rump/fs/lib/libsyspuffs: Makefile puffs_rumpglue.c
src/sys/rump/include/rump: Makefile rump.h
src/sys/rump/librump/rumpkern: Makefile.rumpkern emul.c rump.c
rump_private.h sysproxy_socket.c
src/sys/rump/librump/rumpkern/arch/i386: rumpcpu.c
src/sys/rump/librump/rumpnet: Makefile.rumpnet rump_net_private.h
src/sys/rump/librump/rumpvfs: Makefile.rumpvfs compat.c rump_vfs.c
rump_vfs_private.h rumpfs.c
src/sys/rump/net/lib/libvirtif: if_virt.c
src/sys/rump/net/rumptest: Makefile
Log Message:
Adjust rump sources for external/internal interfaces.
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/fs/lib/libsyspuffs/Makefile
cvs rdiff -u -r1.9 -r1.10 src/sys/rump/fs/lib/libsyspuffs/puffs_rumpglue.c
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/include/rump/Makefile
cvs rdiff -u -r1.30 -r1.31 src/sys/rump/include/rump/rump.h
cvs rdiff -u -r1.50 -r1.51 src/sys/rump/librump/rumpkern/Makefile.rumpkern
cvs rdiff -u -r1.98 -r1.99 src/sys/rump/librump/rumpkern/emul.c
cvs rdiff -u -r1.121 -r1.122 src/sys/rump/librump/rumpkern/rump.c
cvs rdiff -u -r1.28 -r1.29 src/sys/rump/librump/rumpkern/rump_private.h
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/librump/rumpkern/sysproxy_socket.c
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/librump/rumpkern/arch/i386/rumpcpu.c
cvs rdiff -u -r1.7 -r1.8 src/sys/rump/librump/rumpnet/Makefile.rumpnet
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/librump/rumpnet/rump_net_private.h
cvs rdiff -u -r1.16 -r1.17 src/sys/rump/librump/rumpvfs/Makefile.rumpvfs
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/librump/rumpvfs/compat.c
cvs rdiff -u -r1.30 -r1.31 src/sys/rump/librump/rumpvfs/rump_vfs.c
cvs rdiff -u -r1.6 -r1.7 src/sys/rump/librump/rumpvfs/rump_vfs_private.h
cvs rdiff -u -r1.27 -r1.28 src/sys/rump/librump/rumpvfs/rumpfs.c
cvs rdiff -u -r1.12 -r1.13 src/sys/rump/net/lib/libvirtif/if_virt.c
cvs rdiff -u -r1.5 -r1.6 src/sys/rump/net/rumptest/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/rump/fs/lib/libsyspuffs/Makefile
diff -u src/sys/rump/fs/lib/libsyspuffs/Makefile:1.3 src/sys/rump/fs/lib/libsyspuffs/Makefile:1.4
--- src/sys/rump/fs/lib/libsyspuffs/Makefile:1.3 Tue Jul 29 13:17:43 2008
+++ src/sys/rump/fs/lib/libsyspuffs/Makefile Wed Oct 14 17:29:19 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/07/29 13:17:43 pooka Exp $
+# $NetBSD: Makefile,v 1.4 2009/10/14 17:29:19 pooka Exp $
#
.PATH: ${.CURDIR}/../../../../fs/puffs
@@ -11,7 +11,7 @@
SRCS+= puffs_rumpglue.c
-CPPFLAGS+= -DPUFFSDEBUG -DPUTTERDEBUG
+CPPFLAGS+= -DPUFFSDEBUG -DPUTTERDEBUG -I${RUMPTOP}/librump/rumpvfs
.include bsd.lib.mk
.include bsd.klinks.mk
Index: src/sys/rump/fs/lib/libsyspuffs/puffs_rumpglue.c
diff -u src/sys/rump/fs/lib/libsyspuffs/puffs_rumpglue.c:1.9 src/sys/rump/fs/lib/libsyspuffs/puffs_rumpglue.c:1.10
--- src/sys/rump/fs/lib/libsyspuffs/puffs_rumpglue.c:1.9 Thu Jan 8 03:27:10 2009
+++ src/sys/rump/fs/lib/libsyspuffs/puffs_rumpglue.c Wed Oct 14 17:29:19 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: puffs_rumpglue.c,v 1.9 2009/01/08 03:27:10 pooka Exp $ */
+/* $NetBSD: puffs_rumpglue.c,v 1.10 2009/10/14 17:29:19 pooka Exp $ */
/*
* Copyright (c) 2008 Antti Kantee. All Rights Reserved.
@@ -29,7 +29,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: puffs_rumpglue.c,v 1.9 2009/01/08 03:27:10 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: puffs_rumpglue.c,v 1.10 2009/10/14 17:29:19 pooka Exp $);
#include sys/param.h
#include sys/conf.h
@@ -44,6 +44,8 @@
#include rump/rump.h
#include rump/rumpuser.h
+#include rump_vfs_private.h
+
void putterattach(void); /* XXX: from autoconf */
dev_type_open(puttercdopen);
@@ -161,7 +163,7 @@
}
int
-rump_syspuffs_glueinit(int fd, int *newfd)
+rumppriv_syspuffs_glueinit(int fd, int *newfd)
{
struct ptargs *pap;
int rv;
Index: src/sys/rump/include/rump/Makefile
diff -u src/sys/rump/include/rump/Makefile:1.1 src/sys/rump/include/rump/Makefile:1.2
--- src/sys/rump/include/rump/Makefile:1.1 Mon Nov 17 08:54:39 2008
+++ src/sys/rump/include/rump/Makefile Wed Oct 14 17:29:19 2009
@@ -1,8 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2008/11/17 08:54:39 pooka Exp $
+# $NetBSD: Makefile,v 1.2 2009/10/14 17:29:19 pooka Exp $
INCSDIR= /usr/include/rump
INCS= rump.h rump_namei.h rump_syscalls.h rumpdefs.h rumpuser.h
INCS+= rumpvnode_if.h
+INCS+= rumpkern_if_pub.h rumpvfs_if_pub.h rumpnet_if_pub.h
+
.include bsd.kinc.mk
Index: src/sys/rump/include/rump/rump.h
diff -u src/sys/rump/include/rump/rump.h:1.30 src/sys/rump/include/rump/rump.h:1.31
--- src/sys/rump/include/rump/rump.h:1.30 Tue Oct 13 20:08:08 2009
+++ src/sys/rump/include/rump/rump.h Wed Oct 14 17:29:19 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: rump.h,v 1.30 2009/10/13 20:08:08 pooka Exp $
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: pooka Date: Wed Oct 14 17:30:51 UTC 2009 Modified Files: src/distrib/sets/lists/comp: mi Log Message: add rump public interface headers To generate a diff of this commit: cvs rdiff -u -r1.1328 -r1.1329 src/distrib/sets/lists/comp/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1328 src/distrib/sets/lists/comp/mi:1.1329 --- src/distrib/sets/lists/comp/mi:1.1328 Mon Oct 12 18:04:55 2009 +++ src/distrib/sets/lists/comp/mi Wed Oct 14 17:30:50 2009 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1328 2009/10/12 18:04:55 njoly Exp $ +# $NetBSD: mi,v 1.1329 2009/10/14 17:30:50 pooka Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -1886,8 +1886,11 @@ ./usr/include/rump/rump_namei.h comp-c-include ./usr/include/rump/rump_syscalls.h comp-c-include ./usr/include/rump/rumpdefs.h comp-c-include +./usr/include/rump/rumpkern_if_pub.h comp-c-include +./usr/include/rump/rumpnet_if_pub.h comp-c-include ./usr/include/rump/rumpuser.h comp-c-include ./usr/include/rump/rumpvnode_if.h comp-c-include +./usr/include/rump/rumpvfs_if_pub.h comp-c-include ./usr/include/rump/ukfs.h comp-c-include ./usr/include/sa.hcomp-obsolete obsolete ./usr/include/sched.hcomp-c-include
CVS commit: src/crypto/dist/heimdal/lib/gssapi
Module Name:src Committed By: joerg Date: Wed Oct 14 17:33:56 UTC 2009 Modified Files: src/crypto/dist/heimdal/lib/gssapi: gssapi.3 Log Message: Use proper markup. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/crypto/dist/heimdal/lib/gssapi/gssapi.3 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/heimdal/lib/gssapi/gssapi.3 diff -u src/crypto/dist/heimdal/lib/gssapi/gssapi.3:1.2 src/crypto/dist/heimdal/lib/gssapi/gssapi.3:1.3 --- src/crypto/dist/heimdal/lib/gssapi/gssapi.3:1.2 Sat Mar 22 08:37:11 2008 +++ src/crypto/dist/heimdal/lib/gssapi/gssapi.3 Wed Oct 14 17:33:56 2009 @@ -30,7 +30,7 @@ .\ SUCH DAMAGE. .\ .\ $Heimdal: gssapi.3 22071 2007-11-14 20:04:50Z lha $ -.\ $NetBSD: gssapi.3,v 1.2 2008/03/22 08:37:11 mlelstv Exp $ +.\ $NetBSD: gssapi.3,v 1.3 2009/10/14 17:33:56 joerg Exp $ .\ .Dd April 20, 2005 .Dt GSSAPI 3 @@ -54,57 +54,52 @@ .Em libgssapi . Declarations for these functions may be obtained from the include file .Pa gssapi/gssapi.h . -.sp 2 -.nf -.ta \w'gss_inquire_names_for_mech'u+2n +\w'Description goes here'u -\fIName/Page\fP \fIDescription\fP -.ta \w'gss_inquire_names_for_mech'u+2n +\w'Description goes here'u+6nC -.sp 5p -gss_accept_sec_context.3 -gss_acquire_cred.3 -gss_add_cred.3 -gss_add_oid_set_member.3 -gss_canonicalize_name.3 -gss_compare_name.3 -gss_context_time.3 -gss_create_empty_oid_set.3 -gss_delete_sec_context.3 -gss_display_name.3 -gss_display_status.3 -gss_duplicate_name.3 -gss_export_name.3 -gss_export_sec_context.3 -gss_get_mic.3 -gss_import_name.3 -gss_import_sec_context.3 -gss_indicate_mechs.3 -gss_init_sec_context.3 -gss_inquire_context.3 -gss_inquire_cred.3 -gss_inquire_cred_by_mech.3 -gss_inquire_mechs_for_name.3 -gss_inquire_names_for_mech.3 -gss_krb5_ccache_name.3 -gss_krb5_compat_des3_mic.3 -gss_krb5_copy_ccache.3 -gss_krb5_extract_authz_data_from_sec_context.3 -gss_krb5_import_ccache.3 -gss_process_context_token.3 -gss_release_buffer.3 -gss_release_cred.3 -gss_release_name.3 -gss_release_oid_set.3 -gss_seal.3 -gss_sign.3 -gss_test_oid_set_member.3 -gss_unseal.3 -gss_unwrap.3 -gss_verify.3 -gss_verify_mic.3 -gss_wrap.3 -gss_wrap_size_limit.3 -.ta -.Fi +.Bl -column -compact +.It Sy Name/Page +.It Xr gss_accept_sec_context 3 +.It Xr gss_acquire_cred 3 +.It Xr gss_add_cred 3 +.It Xr gss_add_oid_set_member 3 +.It Xr gss_canonicalize_name 3 +.It Xr gss_compare_name 3 +.It Xr gss_context_time 3 +.It Xr gss_create_empty_oid_set 3 +.It Xr gss_delete_sec_context 3 +.It Xr gss_display_name 3 +.It Xr gss_display_status 3 +.It Xr gss_duplicate_name 3 +.It Xr gss_export_name 3 +.It Xr gss_export_sec_context 3 +.It Xr gss_get_mic 3 +.It Xr gss_import_name 3 +.It Xr gss_import_sec_context 3 +.It Xr gss_indicate_mechs 3 +.It Xr gss_init_sec_context 3 +.It Xr gss_inquire_context 3 +.It Xr gss_inquire_cred 3 +.It Xr gss_inquire_cred_by_mech 3 +.It Xr gss_inquire_mechs_for_name 3 +.It Xr gss_inquire_names_for_mech 3 +.It Xr gss_krb5_ccache_name 3 +.It Xr gss_krb5_compat_des3_mic 3 +.It Xr gss_krb5_copy_ccache 3 +.It Xr gss_krb5_extract_authz_data_from_sec_context 3 +.It Xr gss_krb5_import_ccache 3 +.It Xr gss_process_context_token 3 +.It Xr gss_release_buffer 3 +.It Xr gss_release_cred 3 +.It Xr gss_release_name 3 +.It Xr gss_release_oid_set 3 +.It Xr gss_seal 3 +.It Xr gss_sign 3 +.It Xr gss_test_oid_set_member 3 +.It Xr gss_unseal 3 +.It Xr gss_unwrap 3 +.It Xr gss_verify 3 +.It Xr gss_verify_mic 3 +.It Xr gss_wrap 3 +.It Xr gss_wrap_size_limit 3 +.El .Sh COMPATIBILITY The .Nm Heimdal
CVS commit: src/sys/rump/net/rumptest
Module Name:src Committed By: pooka Date: Wed Oct 14 17:34:08 UTC 2009 Modified Files: src/sys/rump/net/rumptest: Makefile Log Message: This wasn't supposed to go in -- the tree is under temporary component boundary breakage. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/rump/net/rumptest/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/rump/net/rumptest/Makefile diff -u src/sys/rump/net/rumptest/Makefile:1.6 src/sys/rump/net/rumptest/Makefile:1.7 --- src/sys/rump/net/rumptest/Makefile:1.6 Wed Oct 14 17:29:20 2009 +++ src/sys/rump/net/rumptest/Makefile Wed Oct 14 17:34:08 2009 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2009/10/14 17:29:20 pooka Exp $ +# $NetBSD: Makefile,v 1.7 2009/10/14 17:34:08 pooka Exp $ # PROG= rumptest_net @@ -13,6 +13,4 @@ # use protocol families provided by host kernel sockets #LDADD= -lrump -lrumpnet -lrumpnet_sockin -lrumpuser -lpthread -LDADD+= -lrumpvfs - .include bsd.prog.mk
CVS commit: src/dist/pppd/chat
Module Name:src Committed By: joerg Date: Wed Oct 14 17:35:41 UTC 2009 Modified Files: src/dist/pppd/chat: chat.8 Log Message: Fix markup. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/dist/pppd/chat/chat.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/dist/pppd/chat/chat.8 diff -u src/dist/pppd/chat/chat.8:1.4 src/dist/pppd/chat/chat.8:1.5 --- src/dist/pppd/chat/chat.8:1.4 Mon May 4 19:52:34 2009 +++ src/dist/pppd/chat/chat.8 Wed Oct 14 17:35:41 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: chat.8,v 1.4 2009/05/04 19:52:34 wiz Exp $ +.\ $NetBSD: chat.8,v 1.5 2009/10/14 17:35:41 joerg Exp $ .\ .\ -*- nroff -*- .\ manual page [] for chat 1.8 @@ -423,7 +423,7 @@ should send an EOT character to the remote. This is normally the End-of-file character sequence. A return character is not sent following the EOT. -.PR +.PP The EOT sequence may be embedded into the send string using the sequence \fI^D\fR. .SH GENERATING BREAK
CVS commit: src/external/bsd/openldap/man
Module Name:src Committed By: joerg Date: Wed Oct 14 17:37:07 UTC 2009 Modified Files: src/external/bsd/openldap/man: ldap.conf.5 Log Message: Fix markup To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/bsd/openldap/man/ldap.conf.5 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/openldap/man/ldap.conf.5 diff -u src/external/bsd/openldap/man/ldap.conf.5:1.2 src/external/bsd/openldap/man/ldap.conf.5:1.3 --- src/external/bsd/openldap/man/ldap.conf.5:1.2 Wed Aug 13 04:44:59 2008 +++ src/external/bsd/openldap/man/ldap.conf.5 Wed Oct 14 17:37:07 2009 @@ -139,7 +139,6 @@ of the search. .RE .TP -.TP .B HOST name[:port] ... Specifies the name(s) of an LDAP server(s) to which the .I LDAP
CVS commit: src/usr.bin/hexdump
Module Name:src Committed By: joerg Date: Wed Oct 14 17:44:59 UTC 2009 Modified Files: src/usr.bin/hexdump: hexdump.1 Log Message: Do not use .Xo/.Xc to workaround ancient groff limits. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/usr.bin/hexdump/hexdump.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/hexdump/hexdump.1 diff -u src/usr.bin/hexdump/hexdump.1:1.18 src/usr.bin/hexdump/hexdump.1:1.19 --- src/usr.bin/hexdump/hexdump.1:1.18 Thu Aug 7 11:14:03 2003 +++ src/usr.bin/hexdump/hexdump.1 Wed Oct 14 17:44:59 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: hexdump.1,v 1.18 2003/08/07 11:14:03 agc Exp $ +.\ $NetBSD: hexdump.1,v 1.19 2009/10/14 17:44:59 joerg Exp $ .\ .\ Copyright (c) 1989, 1990, 1993 .\ The Regents of the University of California. All rights reserved. @@ -251,13 +251,9 @@ .Bl -tag -width Xc,_Xc,_Xc,_Xc,_Xc,_Xc -offset indent .It Li \%_c , \%_p , \%_u , \%c One byte counts only. -.It Xo -.Li \%d , \%i , \%o , \%u , \%X , \%x -.Xc +.It Li \%d , \%i , \%o , \%u , \%X , \%x Four byte default, one, two, four and eight byte counts supported. -.It Xo -.Li \%E , \%e , \%f , \%G , \%g -.Xc +.It Li \%E , \%e , \%f , \%G , \%g Eight byte default, four byte counts supported. .El .Pp
CVS commit: src/dist/pf/share/man/man5
Module Name:src
Committed By: joerg
Date: Wed Oct 14 17:44:25 UTC 2009
Modified Files:
src/dist/pf/share/man/man5: pf.conf.5
Log Message:
Do not use .Xo/.Xc to workaround ancient groff limits.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/dist/pf/share/man/man5/pf.conf.5
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/dist/pf/share/man/man5/pf.conf.5
diff -u src/dist/pf/share/man/man5/pf.conf.5:1.15 src/dist/pf/share/man/man5/pf.conf.5:1.16
--- src/dist/pf/share/man/man5/pf.conf.5:1.15 Sun Mar 22 14:29:35 2009
+++ src/dist/pf/share/man/man5/pf.conf.5 Wed Oct 14 17:44:25 2009
@@ -1,4 +1,4 @@
-.\ $NetBSD: pf.conf.5,v 1.15 2009/03/22 14:29:35 perry Exp $
+.\ $NetBSD: pf.conf.5,v 1.16 2009/10/14 17:44:25 joerg Exp $
.\ $OpenBSD: pf.conf.5,v 1.383 2007/07/17 16:27:38 jmc Exp $
.\
.\ Copyright (c) 2002, Daniel Hartmeier
@@ -1407,13 +1407,8 @@
.Xr pfctl 8 ,
see the file
.Em /etc/protocols .
-.It Xo
-.Ar from Aq Ar source
-.Ar port Aq Ar source
-.Ar os Aq Ar source
-.Ar to Aq Ar dest
-.Ar port Aq Ar dest
-.Xc
+.It Ar from Ao Ar source Ac Ar port Ao Ar source Ac Ar os Ao Ar source Ac \
+Ar to Ao Ar dest Ac Ar port Aq Ar dest
This rule applies only to packets with the specified source and destination
addresses and ports.
.Pp
@@ -1592,11 +1587,8 @@
block out proto { tcp, udp } all
pass out proto { tcp, udp } all user { \*(Lt 1000, dhartmei }
.Ed
-.It Xo Ar flags Aq Ar a
-.Pf / Ns Aq Ar b
-.No \*(Ba / Ns Aq Ar b
-.No \*(Ba any
-.Xc
+.It Ar flags Ao Ar a Ac Pf / Ns Ao Ar b Ac No \*(Ba / Ns \
+Ao Ar b Ac No \*(Ba any
This rule only applies to TCP packets that have the flags
.Aq Ar a
set out of set
@@ -1648,12 +1640,8 @@
.Ar reassemble tcp
will also not be recoverable from intermediate packets.
Such connections will stall and time out.
-.It Xo Ar icmp-type Aq Ar type
-.Ar code Aq Ar code
-.Xc
-.It Xo Ar icmp6-type Aq Ar type
-.Ar code Aq Ar code
-.Xc
+.It Ar icmp-type Ao Ar type Ac Ar code Ao Ar code Ac
+.It Ar icmp6-type Ao Ar type Ac Ar code Ao Ar code Ac
This rule only applies to ICMP or ICMPv6 packets with the specified type
and code.
Text names for ICMP types and codes are listed in
@@ -1669,9 +1657,7 @@
.Ar icmp6-type
.Pc
must match.
-.It Xo Ar tos Aq Ar string
-.No \*(Ba Aq Ar number
-.Xc
+.It Ar tos Ao Ar string Ac No \*(Ba Aq Ar number
This rule applies to packets with the specified
.Em TOS
bits set.
@@ -1747,10 +1733,7 @@
The macro expansion for the
.Ar label
directive occurs only at configuration file parse time, not during runtime.
-.It Xo Ar queue Aq Ar queue
-.No \*(Ba ( Aq Ar queue ,
-.Aq Ar queue )
-.Xc
+.It Ar queue Ao Ar queue Ac No \*(Ba ( Ao Ar queue Ac , Aq Ar queue )
Packets matching this rule will be assigned to the specified queue.
If two queues are given, packets which have a
.Em TOS
@@ -2030,9 +2013,7 @@
.\ Prevent state changes for states created by this rule from appearing on the
.\ .Xr pfsync 4
.\ interface.
-.It Xo Aq Ar timeout
-.Aq Ar seconds
-.Xc
+.It Ao Ar timeout Ac Aq Ar seconds
Changes the timeout values used for states created by this rule.
For a list of all valid timeout names, see
.Sx OPTIONS
@@ -2089,9 +2070,7 @@
.It Ar max-src-conn Aq Ar number
Limits the maximum number of simultaneous TCP connections which have
completed the 3-way handshake that a single host can make.
-.It Xo Ar max-src-conn-rate Aq Ar number
-.No / Aq Ar seconds
-.Xc
+.It Ar max-src-conn-rate Ao Ar number Ac No / Aq Ar seconds
Limit the rate of new connections over a time interval.
The connection rate is an approximation calculated as a moving average.
.El
@@ -2372,10 +2351,7 @@
.It Ar anchor Aq Ar name
Evaluates the filter rules in the specified
.Ar anchor .
-.It Xo Ar load anchor
-.Aq Ar name
-.Ar from Aq Ar file
-.Xc
+.It Ar load anchor Ao Ar name Ac Ar from Aq Ar file
Loads the rules from the specified file into the
anchor
.Ar name .
CVS commit: [netbsd-5] src/distrib/sets/lists
Module Name:src Committed By: snj Date: Wed Oct 14 18:10:21 UTC 2009 Modified Files: src/distrib/sets/lists/base [netbsd-5]: mi src/distrib/sets/lists/xbase [netbsd-5]: mi Log Message: Apply patch (requested by mrg in ticket #1062): Move entry for /usr/X11R7/lib/X11/xkb/compiled to the xbase set, fixing non-X11 builds. To generate a diff of this commit: cvs rdiff -u -r1.780.2.13 -r1.780.2.14 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.69.2.4 -r1.69.2.5 src/distrib/sets/lists/xbase/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.780.2.13 src/distrib/sets/lists/base/mi:1.780.2.14 --- src/distrib/sets/lists/base/mi:1.780.2.13 Sat Oct 10 19:53:24 2009 +++ src/distrib/sets/lists/base/mi Wed Oct 14 18:10:21 2009 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.780.2.13 2009/10/10 19:53:24 sborrill Exp $ +# $NetBSD: mi,v 1.780.2.14 2009/10/14 18:10:21 snj Exp $ # # Note: Don't delete entries from here - mark them as obsolete instead, # unless otherwise stated below. @@ -591,7 +591,6 @@ ./usr/X11R7/lib/X11/xedit/lisp/progmodes base-x11-root ./usr/X11R7/lib/X11/xkbbase-x11-root ./usr/X11R7/lib/X11/xkb/compat base-x11-root -./usr/X11R7/lib/X11/xkb/compiled base-x11-root xorg ./usr/X11R7/lib/X11/xkb/geometry base-x11-root ./usr/X11R7/lib/X11/xkb/geometry/digital -obsolete- obsolete ./usr/X11R7/lib/X11/xkb/geometry/digital_vndr base-x11-root Index: src/distrib/sets/lists/xbase/mi diff -u src/distrib/sets/lists/xbase/mi:1.69.2.4 src/distrib/sets/lists/xbase/mi:1.69.2.5 --- src/distrib/sets/lists/xbase/mi:1.69.2.4 Thu Sep 17 04:24:27 2009 +++ src/distrib/sets/lists/xbase/mi Wed Oct 14 18:10:21 2009 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.69.2.4 2009/09/17 04:24:27 snj Exp $ +# $NetBSD: mi,v 1.69.2.5 2009/10/14 18:10:21 snj Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -1568,6 +1568,7 @@ ./usr/X11R7/lib/X11/xkb/compat/pc98 -unknown- xorg ./usr/X11R7/lib/X11/xkb/compat/xfree86 -unknown- xorg ./usr/X11R7/lib/X11/xkb/compat/xtest -unknown- xorg +./usr/X11R7/lib/X11/xkb/compiled -unknown- xorg ./usr/X11R7/lib/X11/xkb/geometry.dir -unknown- xorg ./usr/X11R7/lib/X11/xkb/geometry/README -unknown- xorg ./usr/X11R7/lib/X11/xkb/geometry/amiga -unknown- xorg
CVS commit: [netbsd-5] src/usr.bin/printf
Module Name:src
Committed By: sborrill
Date: Wed Oct 14 18:12:55 UTC 2009
Modified Files:
src/usr.bin/printf [netbsd-5]: printf.c
Log Message:
Pull up the following revisions(s) (requested by christos in ticket #1091):
usr.bin/printf/printf.c:revision 1.34
Avoid segv on printf '%*s' 666.
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.33.4.1 src/usr.bin/printf/printf.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/printf/printf.c
diff -u src/usr.bin/printf/printf.c:1.33 src/usr.bin/printf/printf.c:1.33.4.1
--- src/usr.bin/printf/printf.c:1.33 Mon Jul 21 14:19:24 2008
+++ src/usr.bin/printf/printf.c Wed Oct 14 18:12:55 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: printf.c,v 1.33 2008/07/21 14:19:24 lukem Exp $ */
+/* $NetBSD: printf.c,v 1.33.4.1 2009/10/14 18:12:55 sborrill Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = @(#)printf.c 8.2 (Berkeley) 3/22/95;
#else
-__RCSID($NetBSD: printf.c,v 1.33 2008/07/21 14:19:24 lukem Exp $);
+__RCSID($NetBSD: printf.c,v 1.33.4.1 2009/10/14 18:12:55 sborrill Exp $);
#endif
#endif /* not lint */
@@ -155,7 +155,7 @@
gargv = ++argv;
#define SKIP1 #-+ 0
-#define SKIP2 *0123456789
+#define SKIP2 0123456789
do {
/*
* Basic algorithm is to scan the format string for conversion
@@ -185,13 +185,23 @@
/* skip to field width */
fmt += strspn(fmt, SKIP1);
- fieldwidth = *fmt == '*' ? getwidth() : -1;
+ if (*fmt == '*') {
+fmt++;
+fieldwidth = getwidth();
+ } else
+fieldwidth = -1;
/* skip to possible '.', get following precision */
fmt += strspn(fmt, SKIP2);
- if (*fmt == '.')
-++fmt;
- precision = *fmt == '*' ? getwidth() : -1;
+ if (*fmt == '.') {
+fmt++;
+if (*fmt == '*') {
+ fmt++;
+ precision = getwidth();
+} else
+ precision = -1;
+ } else
+precision = -1;
fmt += strspn(fmt, SKIP2);
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: sborrill Date: Wed Oct 14 18:13:21 UTC 2009 Modified Files: src/doc [netbsd-5]: CHANGES-5.1 Log Message: Ticket 1091 To generate a diff of this commit: cvs rdiff -u -r1.1.2.103 -r1.1.2.104 src/doc/CHANGES-5.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.1 diff -u src/doc/CHANGES-5.1:1.1.2.103 src/doc/CHANGES-5.1:1.1.2.104 --- src/doc/CHANGES-5.1:1.1.2.103 Wed Oct 14 09:32:05 2009 +++ src/doc/CHANGES-5.1 Wed Oct 14 18:13:21 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1,v 1.1.2.103 2009/10/14 09:32:05 sborrill Exp $ +# $NetBSD: CHANGES-5.1,v 1.1.2.104 2009/10/14 18:13:21 sborrill Exp $ A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1 release: @@ -14145,3 +14145,8 @@ [pooka, ticket #1088] +usr.bin/printf/printf.c1.34 + + Avoid segv on printf '%*s' 666. + [christos, ticket #1091] +
CVS commit: src/sys/rump/librump
Module Name:src
Committed By: pooka
Date: Wed Oct 14 18:14:48 UTC 2009
Modified Files:
src/sys/rump/librump: makerumpif.sh
Log Message:
Actually, adjust previous a bit: instead of preserving the names
of the external interfaces and namespacing the internal ones to
rumppriv, put the external ones in a rump_pub namespace. While
this requires adjusting all of the external callers of these
interfaces, it is the right thing to do in the long run, since it
clarifies the structure.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/librump/makerumpif.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/librump/makerumpif.sh
diff -u src/sys/rump/librump/makerumpif.sh:1.2 src/sys/rump/librump/makerumpif.sh:1.3
--- src/sys/rump/librump/makerumpif.sh:1.2 Wed Oct 14 17:26:09 2009
+++ src/sys/rump/librump/makerumpif.sh Wed Oct 14 18:14:48 2009
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: makerumpif.sh,v 1.2 2009/10/14 17:26:09 pooka Exp $
+# $NetBSD: makerumpif.sh,v 1.3 2009/10/14 18:14:48 pooka Exp $
#
# Copyright (c) 2009 Antti Kantee. All rights reserved.
#
@@ -67,9 +67,9 @@
' ${1} | awk -F\| -v rumptop=${RUMPTOP} '
function fileheaders(file, srcstr)
{
- printf(/*\t$NetBSD: makerumpif.sh,v 1.2 2009/10/14 17:26:09 pooka Exp $\t*/\n\n) file
+ printf(/*\t$NetBSD: makerumpif.sh,v 1.3 2009/10/14 18:14:48 pooka Exp $\t*/\n\n) file
printf(/*\n * Automatically generated. DO NOT EDIT.\n) file
- genstr = $NetBSD: makerumpif.sh,v 1.2 2009/10/14 17:26:09 pooka Exp $
+ genstr = $NetBSD: makerumpif.sh,v 1.3 2009/10/14 18:14:48 pooka Exp $
gsub(\\$, , genstr)
printf( * from: %s\n, srcstr) file
printf( * by: %s\n, genstr) file
@@ -154,8 +154,8 @@
funargs = $3
sub([ \t]*$, , funargs)
- printf(%s rump_%s(%s);\n, funtype, funname, funargs) pubhdr
- printf(%s rumppriv_%s(%s);\n, funtype, funname, funargs) privhdr
+ printf(%s rump_pub_%s(%s);\n, funtype, funname, funargs) pubhdr
+ printf(%s rump_%s(%s);\n, funtype, funname, funargs) privhdr
if (funtype == void)
voidret = 1
@@ -166,7 +166,7 @@
else
voidarg = 0
- printf(\n%s\nrump_%s(, funtype, funname) gencalls
+ printf(\n%s\nrump_pub_%s(, funtype, funname) gencalls
if (!voidarg) {
narg = split(funargs, argv, ,)
for (i = 1; i = narg; i++) {
@@ -190,7 +190,7 @@
printf(\n\t) gencalls
if (!voidret)
printf(rv = ) gencalls
- printf(rumppriv_%s(, funname) gencalls
+ printf(rump_%s(, funname) gencalls
for (i = 1; i = narg; i++) {
printf(arg%i, i) gencalls
if (i narg)
@@ -201,6 +201,6 @@
printf(\n\treturn rv;\n) gencalls
printf(}\n) gencalls
if (isweak)
- printf(__weak_alias(rumppriv_%s,rump_%s_unavailable);\n, \
+ printf(__weak_alias(rump_%s,rump_%s_unavailable);\n, \
funname, myname) gencalls
}'
CVS commit: src/sys/rump
Module Name:src Committed By: pooka Date: Wed Oct 14 18:16:41 UTC 2009 Modified Files: src/sys/rump/include/rump: rumpkern_if_pub.h rumpnet_if_pub.h rumpvfs_if_pub.h src/sys/rump/librump/rumpkern: rumpkern_if_priv.h rumpkern_if_wrappers.c src/sys/rump/librump/rumpnet: rumpnet_if_priv.h rumpnet_if_wrappers.c src/sys/rump/librump/rumpvfs: rumpvfs_if_priv.h rumpvfs_if_wrappers.c Log Message: regen: put all public interfaces created by ifspec into a rump_pub namespace To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/rump/include/rump/rumpkern_if_pub.h \ src/sys/rump/include/rump/rumpnet_if_pub.h \ src/sys/rump/include/rump/rumpvfs_if_pub.h cvs rdiff -u -r1.1 -r1.2 src/sys/rump/librump/rumpkern/rumpkern_if_priv.h \ src/sys/rump/librump/rumpkern/rumpkern_if_wrappers.c cvs rdiff -u -r1.1 -r1.2 src/sys/rump/librump/rumpnet/rumpnet_if_priv.h \ src/sys/rump/librump/rumpnet/rumpnet_if_wrappers.c cvs rdiff -u -r1.1 -r1.2 src/sys/rump/librump/rumpvfs/rumpvfs_if_priv.h \ src/sys/rump/librump/rumpvfs/rumpvfs_if_wrappers.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/rump/include/rump/rumpkern_if_pub.h diff -u src/sys/rump/include/rump/rumpkern_if_pub.h:1.1 src/sys/rump/include/rump/rumpkern_if_pub.h:1.2 --- src/sys/rump/include/rump/rumpkern_if_pub.h:1.1 Wed Oct 14 17:28:13 2009 +++ src/sys/rump/include/rump/rumpkern_if_pub.h Wed Oct 14 18:16:41 2009 @@ -1,27 +1,27 @@ -/* $NetBSD: rumpkern_if_pub.h,v 1.1 2009/10/14 17:28:13 pooka Exp $ */ +/* $NetBSD: rumpkern_if_pub.h,v 1.2 2009/10/14 18:16:41 pooka Exp $ */ /* * Automatically generated. DO NOT EDIT. * from: NetBSD: rumpkern.ifspec,v 1.1 2009/10/14 17:17:00 pooka Exp - * by: NetBSD: makerumpif.sh,v 1.2 2009/10/14 17:26:09 pooka Exp + * by: NetBSD: makerumpif.sh,v 1.3 2009/10/14 18:14:48 pooka Exp */ -void rump_reboot(int); -int rump_getversion(void); -int rump_module_init(struct modinfo *, prop_dictionary_t); -int rump_module_fini(struct modinfo *); -struct uio * rump_uio_setup(void *, size_t, off_t, enum rump_uiorw); -size_t rump_uio_getresid(struct uio *); -off_t rump_uio_getoff(struct uio *); -size_t rump_uio_free(struct uio *); -kauth_cred_t rump_cred_create(uid_t, gid_t, size_t, gid_t *); -kauth_cred_t rump_cred_suserget(void); -void rump_cred_put(kauth_cred_t); -struct lwp * rump_newproc_switch(void); -struct lwp * rump_setup_curlwp(pid_t, lwpid_t, int); -struct lwp * rump_get_curlwp(void); -void rump_set_curlwp(struct lwp *); -void rump_clear_curlwp(void); -int rump_sysproxy_set(rump_sysproxy_t, void *); -int rump_sysproxy_socket_setup_client(int); -int rump_sysproxy_socket_setup_server(int); +void rump_pub_reboot(int); +int rump_pub_getversion(void); +int rump_pub_module_init(struct modinfo *, prop_dictionary_t); +int rump_pub_module_fini(struct modinfo *); +struct uio * rump_pub_uio_setup(void *, size_t, off_t, enum rump_uiorw); +size_t rump_pub_uio_getresid(struct uio *); +off_t rump_pub_uio_getoff(struct uio *); +size_t rump_pub_uio_free(struct uio *); +kauth_cred_t rump_pub_cred_create(uid_t, gid_t, size_t, gid_t *); +kauth_cred_t rump_pub_cred_suserget(void); +void rump_pub_cred_put(kauth_cred_t); +struct lwp * rump_pub_newproc_switch(void); +struct lwp * rump_pub_setup_curlwp(pid_t, lwpid_t, int); +struct lwp * rump_pub_get_curlwp(void); +void rump_pub_set_curlwp(struct lwp *); +void rump_pub_clear_curlwp(void); +int rump_pub_sysproxy_set(rump_sysproxy_t, void *); +int rump_pub_sysproxy_socket_setup_client(int); +int rump_pub_sysproxy_socket_setup_server(int); Index: src/sys/rump/include/rump/rumpnet_if_pub.h diff -u src/sys/rump/include/rump/rumpnet_if_pub.h:1.1 src/sys/rump/include/rump/rumpnet_if_pub.h:1.2 --- src/sys/rump/include/rump/rumpnet_if_pub.h:1.1 Wed Oct 14 17:28:13 2009 +++ src/sys/rump/include/rump/rumpnet_if_pub.h Wed Oct 14 18:16:41 2009 @@ -1,9 +1,9 @@ -/* $NetBSD: rumpnet_if_pub.h,v 1.1 2009/10/14 17:28:13 pooka Exp $ */ +/* $NetBSD: rumpnet_if_pub.h,v 1.2 2009/10/14 18:16:41 pooka Exp $ */ /* * Automatically generated. DO NOT EDIT. * from: NetBSD: rumpnet.ifspec,v 1.1 2009/10/14 17:17:00 pooka Exp - * by: NetBSD: makerumpif.sh,v 1.2 2009/10/14 17:26:09 pooka Exp + * by: NetBSD: makerumpif.sh,v 1.3 2009/10/14 18:14:48 pooka Exp */ -int rump_virtif_create(int); +int rump_pub_virtif_create(int); Index: src/sys/rump/include/rump/rumpvfs_if_pub.h diff -u src/sys/rump/include/rump/rumpvfs_if_pub.h:1.1 src/sys/rump/include/rump/rumpvfs_if_pub.h:1.2 --- src/sys/rump/include/rump/rumpvfs_if_pub.h:1.1 Wed Oct 14 17:28:13 2009 +++ src/sys/rump/include/rump/rumpvfs_if_pub.h Wed Oct 14 18:16:41 2009 @@ -1,42 +1,42 @@ -/* $NetBSD: rumpvfs_if_pub.h,v 1.1 2009/10/14 17:28:13 pooka Exp $ */ +/* $NetBSD: rumpvfs_if_pub.h,v 1.2 2009/10/14 18:16:41 pooka Exp $ */ /* * Automatically generated. DO NOT
CVS commit: src/sys/rump
Module Name:src
Committed By: pooka
Date: Wed Oct 14 18:18:53 UTC 2009
Modified Files:
src/sys/rump/fs/lib/libsyspuffs: puffs_rumpglue.c
src/sys/rump/include/rump: rump.h
src/sys/rump/librump/rumpkern: emul.c rump.c sysproxy_socket.c
src/sys/rump/librump/rumpkern/arch/i386: rumpcpu.c
src/sys/rump/librump/rumpuser: rumpuser_dl.c
src/sys/rump/librump/rumpvfs: compat.c rump_vfs.c rumpfs.c
src/sys/rump/net/lib/libvirtif: if_virt.c
Log Message:
rumppriv goes back to rump per internal interface naming change.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/rump/fs/lib/libsyspuffs/puffs_rumpglue.c
cvs rdiff -u -r1.31 -r1.32 src/sys/rump/include/rump/rump.h
cvs rdiff -u -r1.99 -r1.100 src/sys/rump/librump/rumpkern/emul.c
cvs rdiff -u -r1.122 -r1.123 src/sys/rump/librump/rumpkern/rump.c
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/librump/rumpkern/sysproxy_socket.c
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/librump/rumpkern/arch/i386/rumpcpu.c
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/librump/rumpuser/rumpuser_dl.c
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/librump/rumpvfs/compat.c
cvs rdiff -u -r1.31 -r1.32 src/sys/rump/librump/rumpvfs/rump_vfs.c
cvs rdiff -u -r1.28 -r1.29 src/sys/rump/librump/rumpvfs/rumpfs.c
cvs rdiff -u -r1.13 -r1.14 src/sys/rump/net/lib/libvirtif/if_virt.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/rump/fs/lib/libsyspuffs/puffs_rumpglue.c
diff -u src/sys/rump/fs/lib/libsyspuffs/puffs_rumpglue.c:1.10 src/sys/rump/fs/lib/libsyspuffs/puffs_rumpglue.c:1.11
--- src/sys/rump/fs/lib/libsyspuffs/puffs_rumpglue.c:1.10 Wed Oct 14 17:29:19 2009
+++ src/sys/rump/fs/lib/libsyspuffs/puffs_rumpglue.c Wed Oct 14 18:18:53 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: puffs_rumpglue.c,v 1.10 2009/10/14 17:29:19 pooka Exp $ */
+/* $NetBSD: puffs_rumpglue.c,v 1.11 2009/10/14 18:18:53 pooka Exp $ */
/*
* Copyright (c) 2008 Antti Kantee. All Rights Reserved.
@@ -29,7 +29,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: puffs_rumpglue.c,v 1.10 2009/10/14 17:29:19 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: puffs_rumpglue.c,v 1.11 2009/10/14 18:18:53 pooka Exp $);
#include sys/param.h
#include sys/conf.h
@@ -163,7 +163,7 @@
}
int
-rumppriv_syspuffs_glueinit(int fd, int *newfd)
+rump_syspuffs_glueinit(int fd, int *newfd)
{
struct ptargs *pap;
int rv;
Index: src/sys/rump/include/rump/rump.h
diff -u src/sys/rump/include/rump/rump.h:1.31 src/sys/rump/include/rump/rump.h:1.32
--- src/sys/rump/include/rump/rump.h:1.31 Wed Oct 14 17:29:19 2009
+++ src/sys/rump/include/rump/rump.h Wed Oct 14 18:18:53 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: rump.h,v 1.31 2009/10/14 17:29:19 pooka Exp $ */
+/* $NetBSD: rump.h,v 1.32 2009/10/14 18:18:53 pooka Exp $ */
/*
* Copyright (c) 2007 Antti Kantee. All Rights Reserved.
@@ -65,10 +65,6 @@
/* rumpkern */
enum rump_uiorw { RUMPUIO_READ, RUMPUIO_WRITE };
typedef int (*rump_sysproxy_t)(int, void *, uint8_t *, size_t, register_t *);
-#define rump_cred_suserput(c) rump_cred_put(c)
-/* COMPAT_NETHACK */
-#define WizardMode() rump_cred_suserget()
-#define YASD(cred) rump_cred_suserput(cred)
/* rumpvfs */
#define RUMPCN_FREECRED 0x02
Index: src/sys/rump/librump/rumpkern/emul.c
diff -u src/sys/rump/librump/rumpkern/emul.c:1.99 src/sys/rump/librump/rumpkern/emul.c:1.100
--- src/sys/rump/librump/rumpkern/emul.c:1.99 Wed Oct 14 17:29:19 2009
+++ src/sys/rump/librump/rumpkern/emul.c Wed Oct 14 18:18:53 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: emul.c,v 1.99 2009/10/14 17:29:19 pooka Exp $ */
+/* $NetBSD: emul.c,v 1.100 2009/10/14 18:18:53 pooka Exp $ */
/*
* Copyright (c) 2007 Antti Kantee. All Rights Reserved.
@@ -28,7 +28,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: emul.c,v 1.99 2009/10/14 17:29:19 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: emul.c,v 1.100 2009/10/14 18:18:53 pooka Exp $);
#include sys/param.h
#include sys/malloc.h
@@ -439,7 +439,7 @@
k = kmem_alloc(sizeof(struct kthdesc), KM_SLEEP);
k-f = func;
k-arg = arg;
- k-mylwp = l = rumppriv_setup_curlwp(0, rump_nextlid(), 0);
+ k-mylwp = l = rump_setup_curlwp(0, rump_nextlid(), 0);
if (flags KTHREAD_MPSAFE)
l-l_pflag |= LP_MPSAFE;
rv = rumpuser_thread_create(threadbouncer, k, thrname);
@@ -457,7 +457,7 @@
if ((curlwp-l_pflag LP_MPSAFE) == 0)
KERNEL_UNLOCK_ONE(NULL);
- rumppriv_clear_curlwp();
+ rump_clear_curlwp();
rumpuser_thread_exit();
}
@@ -731,7 +731,7 @@
cpu_reboot(int howto, char *bootstr)
{
- rumppriv_reboot(howto);
+ rump_reboot(howto);
/* this function is __dead, we must exit */
rumpuser_exit(0);
Index: src/sys/rump/librump/rumpkern/rump.c
diff -u src/sys/rump/librump/rumpkern/rump.c:1.122 src/sys/rump/librump/rumpkern/rump.c:1.123
--- src/sys/rump/librump/rumpkern/rump.c:1.122 Wed Oct 14 17:29:19 2009
+++ src/sys/rump/librump/rumpkern/rump.c Wed Oct 14 18:18:53 2009
@@
CVS commit: src/crypto/dist/ipsec-tools/src/racoon
Module Name:src
Committed By: joerg
Date: Wed Oct 14 18:22:04 UTC 2009
Modified Files:
src/crypto/dist/ipsec-tools/src/racoon: racoon.conf.5
Log Message:
Don't use .Xo/.Xc to work around ancient groff limits.
Set only one list type.
To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 \
src/crypto/dist/ipsec-tools/src/racoon/racoon.conf.5
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/racoon.conf.5
diff -u src/crypto/dist/ipsec-tools/src/racoon/racoon.conf.5:1.58 src/crypto/dist/ipsec-tools/src/racoon/racoon.conf.5:1.59
--- src/crypto/dist/ipsec-tools/src/racoon/racoon.conf.5:1.58 Tue Sep 1 12:22:09 2009
+++ src/crypto/dist/ipsec-tools/src/racoon/racoon.conf.5 Wed Oct 14 18:22:04 2009
@@ -1,4 +1,4 @@
-.\ $NetBSD: racoon.conf.5,v 1.58 2009/09/01 12:22:09 tteras Exp $
+.\ $NetBSD: racoon.conf.5,v 1.59 2009/10/14 18:22:04 joerg Exp $
.\
.\ Id: racoon.conf.5,v 1.54 2006/08/22 18:17:17 manubsd Exp
.\
@@ -375,11 +375,7 @@
.\
.Ss Remote Nodes Specifications
.Bl -tag -width Ds -compact
-.It Xo
-.Ic remote Ar name
-.Bq Ic inherit Ar parent_name
-.Ic { Ar statements Ic }
-.Xc
+.It Ic remote Ar name Bo Ic inherit Ar parent_name Bc Ic { Ar statements Ic }
Specifies the IKE phase 1 parameters for each remote node.
.Pp
If connection is initiated using racoonctl, a unique match using the
@@ -394,7 +390,7 @@
or more acceptable remote configurations.
When determining if a remote
specification is matching the following information is checked:
-.Bl -bullet -tag -width Ds -compact
+.Bl -bullet -width Ds -compact
.It
The remote IP is checked against
.Ic remote_address .
@@ -457,10 +453,7 @@
Means to use SIT_IDENTITY_ONLY as specified in RFC 2407.
You can omit this statement.
.\
-.It Xo
-.Ic my_identifier Bq Ar qualifier
-.Ar idtype ... ;
-.Xc
+.It Ic my_identifier Bo Ar qualifier Bc Ar idtype ... ;
Specifies the identifier sent to the remote host
and the type to use in the phase 1 negotiation.
.Ic address, fqdn , user_fqdn , keyid ,
@@ -485,10 +478,7 @@
The type is a USER_FQDN (user fully-qualified domain name).
.It Ic my_identifier Ic fqdn Ar string ;
The type is a FQDN (fully-qualified domain name).
-.It Xo
-.Ic my_identifier Ic keyid Bq Ic file
-.Ar file ;
-.Xc
+.It Ic my_identifier Ic keyid Bo Ic file Bc Ar file ;
The type is a KEY_ID, read from the file.
.It Ic my_identifier Ic keyid Ic tag Ar string ;
The type is a KEY_ID, specified in the quoted string.
@@ -904,9 +894,7 @@
only with sainfos who have the same number.
Defaults to 0.
.\
-.It Xo
-.Ic proposal { Ar sub-substatements Ic }
-.Xc
+.It Ic proposal { Ar sub-substatements Ic }
.Bl -tag -width Ds -compact
.\
.It Ic encryption_algorithm Ar algorithm ;
@@ -970,12 +958,8 @@
.El
.El
.Pp
-.It Xo
-.Ic remote ( Ar address | Ic anonymous )
-.Bq Bq Ar port
-.Bq Ic inherit Ar parent
-.Ic { Ar statements Ic }
-.Xc
+.It Ic remote Po Ar address | Ic anonymous Pc Bo Bo Ar port Bc Bc \
+Bo Ic inherit Ar parent Bc Ic { Ar statements Ic }
Deprecated format of specifying a remote block.
This will be removed in future.
It is a remnant from time when remote block was decided
@@ -991,10 +975,10 @@
.\
.Ss Sainfo Specifications
.Bl -tag -width Ds -compact
-.It Xo
-.Ic sainfo ( Ar local_id | Ic anonymous ) ( Ar remote_id | Ic clientaddr | Ic anonymous ) [ from Ar idtype [ Ar string ] ] [ Ic group Ar string ]
-.Ic { Ar statements Ic }
-.Xc
+.It Ic sainfo Po Ar local_id | Ic anonymous Pc \
+Po Ar remote_id | Ic clientaddr | Ic anonymous Pc \
+Bo Ic from Ar idtype Bo Ar string Bc Bc Bo Ic group Ar string Bc \
+Ic { Ar statements Ic }
Defines the parameters of the IKE phase 2 (IPsec-SA establishment).
.Pp
The
CVS commit: src
Module Name:src
Committed By: pooka
Date: Wed Oct 14 18:22:50 UTC 2009
Modified Files:
src/lib/libp2k: p2k.c
src/lib/libukfs: ukfs.c
src/tests/fs/ffs: t_renamerace.c
src/tests/syscall: t_cmsg.c
src/usr.sbin/puffs/rump_lfs: rump_lfs.c
Log Message:
Adjust names of external rump control interfaces to match the
new rump_pub namespace.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/lib/libp2k/p2k.c
cvs rdiff -u -r1.39 -r1.40 src/lib/libukfs/ukfs.c
cvs rdiff -u -r1.8 -r1.9 src/tests/fs/ffs/t_renamerace.c
cvs rdiff -u -r1.7 -r1.8 src/tests/syscall/t_cmsg.c
cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/puffs/rump_lfs/rump_lfs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libp2k/p2k.c
diff -u src/lib/libp2k/p2k.c:1.22 src/lib/libp2k/p2k.c:1.23
--- src/lib/libp2k/p2k.c:1.22 Tue Oct 13 20:06:38 2009
+++ src/lib/libp2k/p2k.c Wed Oct 14 18:22:50 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: p2k.c,v 1.22 2009/10/13 20:06:38 pooka Exp $ */
+/* $NetBSD: p2k.c,v 1.23 2009/10/14 18:22:50 pooka Exp $ */
/*
* Copyright (c) 2007, 2008, 2009 Antti Kantee. All Rights Reserved.
@@ -108,14 +108,14 @@
puffs_cred_getgroups(pcr, groups, ngroups);
/* LINTED: ngroups is ok */
- return rump_cred_create(uid, gid, ngroups, groups);
+ return rump_pub_cred_create(uid, gid, ngroups, groups);
}
static __inline void
cred_destroy(kauth_cred_t cred)
{
- rump_cred_put(cred);
+ rump_pub_cred_put(cred);
}
static struct componentname *
@@ -125,15 +125,15 @@
cred = cred_create(pcn-pcn_cred);
/* LINTED: prehistoric types in first two args */
- return rump_makecn(pcn-pcn_nameiop, pcn-pcn_flags | myflags,
- pcn-pcn_name, pcn-pcn_namelen, cred, rump_get_curlwp());
+ return rump_pub_makecn(pcn-pcn_nameiop, pcn-pcn_flags | myflags,
+ pcn-pcn_name, pcn-pcn_namelen, cred, rump_pub_get_curlwp());
}
static __inline void
freecn(struct componentname *cnp, int flags)
{
- rump_freecn(cnp, flags | RUMPCN_FREECRED);
+ rump_pub_freecn(cnp, flags | RUMPCN_FREECRED);
}
static void
@@ -143,7 +143,7 @@
lwpid_t lid;
puffs_cc_getcaller(puffs_cc_getcc(pu), pid, lid);
- rump_setup_curlwp(pid, lid, 1);
+ rump_pub_setup_curlwp(pid, lid, 1);
}
/*ARGSUSED*/
@@ -151,7 +151,7 @@
clearlwp(struct puffs_usermount *pu)
{
- rump_clear_curlwp();
+ rump_pub_clear_curlwp();
}
static __inline struct p2k_vp_hash *
@@ -189,14 +189,14 @@
hl = gethash(p2m, vp);
if (p2n) {
- rump_vp_rele(vp);
+ rump_pub_vp_rele(vp);
} else {
if (p2n_storage)
p2n = p2n_storage;
else
p2n = malloc(sizeof(*p2n));
if (!p2n) {
- rump_vp_rele(vp);
+ rump_pub_vp_rele(vp);
return NULL;
}
memset(p2n, 0, sizeof(*p2n));
@@ -456,7 +456,7 @@
{
struct mount *mp = ukfs_getmp(puffs_getspecific(pu));
- return rump_vfs_statvfs(mp, sbp);
+ return rump_pub_vfs_statvfs(mp, sbp);
}
/*ARGSUSED*/
@@ -467,16 +467,16 @@
struct p2k_mount *p2m = ukfs_getspecific(fs);
int error = 0;
- rump_clear_curlwp(); /* ukfs does its own curlwp tricks */
+ rump_pub_clear_curlwp(); /* ukfs does its own curlwp tricks */
- rump_vp_rele(p2m-p2m_rvp);
+ rump_pub_vp_rele(p2m-p2m_rvp);
if (ukfs_release(fs, 0) != 0) {
ukfs_release(fs, UKFS_RELFLAG_FORCE);
error = 0;
}
p2m-p2m_ukfs = NULL;
- rump_setup_curlwp(0, 1, 1);
+ rump_pub_setup_curlwp(0, 1, 1);
return error;
}
@@ -489,7 +489,7 @@
int rv;
cred = cred_create(pcr);
- rv = rump_vfs_sync(mp, waitfor, (kauth_cred_t)cred);
+ rv = rump_pub_vfs_sync(mp, waitfor, (kauth_cred_t)cred);
cred_destroy(cred);
return rv;
@@ -509,7 +509,7 @@
uint64_t rdev; /* XXX: allows running this on NetBSD 5.0 */
int rv;
- rv = rump_vfs_fhtovp(mp, fid, vp);
+ rv = rump_pub_vfs_fhtovp(mp, fid, vp);
if (rv)
return rv;
RUMP_VOP_UNLOCK(vp, 0);
@@ -519,7 +519,7 @@
return ENOMEM;
puffs_newinfo_setcookie(pni, p2n);
- rump_getvninfo(vp, vtype, vsize, (void *)rdev);
+ rump_pub_getvninfo(vp, vtype, vsize, (void *)rdev);
puffs_newinfo_setvtype(pni, vtype);
puffs_newinfo_setsize(pni, vsize);
/* LINTED: yea, it'll lose accuracy, but that's life */
@@ -535,7 +535,7 @@
{
struct vnode *vp = cookie;
- return rump_vfs_vptofh(vp, fid, fidsize);
+ return rump_pub_vfs_vptofh(vp, fid, fidsize);
}
/*ARGSUSED*/
@@ -556,7 +556,7 @@
RUMP_VOP_LOCK(dvp, LK_EXCLUSIVE);
rv = RUMP_VOP_LOOKUP(dvp, vp, cn);
RUMP_VOP_UNLOCK(dvp, 0);
- if (rump_checksavecn(cn)) {
+ if (rump_pub_checksavecn(cn)) {
/*
* XXX: detect RENAME by SAVESTART, both src and targ lookups
*
@@ -612,7 +612,7 @@
}
puffs_newinfo_setcookie(pni, p2n);
- rump_getvninfo(vp, vtype, vsize, (void *)rdev);
+ rump_pub_getvninfo(vp, vtype, vsize, (void *)rdev);
puffs_newinfo_setvtype(pni, vtype);
puffs_newinfo_setsize(pni, vsize);
/* LINTED: yea, it'll lose accuracy, but that's life */
@@ -628,14 +628,14 @@
/*LINTED*/
return
CVS commit: [netbsd-5] src/crypto/dist/heimdal/lib/krb5
Module Name:src Committed By: sborrill Date: Wed Oct 14 18:30:32 UTC 2009 Modified Files: src/crypto/dist/heimdal/lib/krb5 [netbsd-5]: krb5_get_creds.3 krb5_keytab.3 Log Message: Pull up the following revisions(s) (requested by joerg in ticket #1090): crypto/dist/heimdal/lib/krb5/krb5_keytab.3: revision 1.10 crypto/dist/heimdal/lib/krb5/krb5_get_creds.3: revision 1.2 Fix markup (remainder of pullup request). To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.1.8.1 \ src/crypto/dist/heimdal/lib/krb5/krb5_get_creds.3 cvs rdiff -u -r1.9 -r1.9.8.1 src/crypto/dist/heimdal/lib/krb5/krb5_keytab.3 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/heimdal/lib/krb5/krb5_get_creds.3 diff -u src/crypto/dist/heimdal/lib/krb5/krb5_get_creds.3:1.1 src/crypto/dist/heimdal/lib/krb5/krb5_get_creds.3:1.1.8.1 --- src/crypto/dist/heimdal/lib/krb5/krb5_get_creds.3:1.1 Sat Mar 22 08:37:14 2008 +++ src/crypto/dist/heimdal/lib/krb5/krb5_get_creds.3 Wed Oct 14 18:30:32 2009 @@ -30,7 +30,7 @@ .\ SUCH DAMAGE. .\ .\ $Heimdal: krb5_get_creds.3 22071 2007-11-14 20:04:50Z lha $ -.\ $NetBSD: krb5_get_creds.3,v 1.1 2008/03/22 08:37:14 mlelstv Exp $ +.\ $NetBSD: krb5_get_creds.3,v 1.1.8.1 2009/10/14 18:30:32 sborrill Exp $ .\ .Dd June 15, 2006 .Dt KRB5_GET_CREDS 3 @@ -134,7 +134,7 @@ and .Fn krb5_get_creds_opt_set_options adds and sets options to the -.Fi krb5_get_creds_opt +.Vt krb5_get_creds_opt structure . The possible options to set are .Bl -tag -width KRB5_GC_USER_USER -compact Index: src/crypto/dist/heimdal/lib/krb5/krb5_keytab.3 diff -u src/crypto/dist/heimdal/lib/krb5/krb5_keytab.3:1.9 src/crypto/dist/heimdal/lib/krb5/krb5_keytab.3:1.9.8.1 --- src/crypto/dist/heimdal/lib/krb5/krb5_keytab.3:1.9 Sat Mar 22 08:37:14 2008 +++ src/crypto/dist/heimdal/lib/krb5/krb5_keytab.3 Wed Oct 14 18:30:32 2009 @@ -30,7 +30,7 @@ .\ SUCH DAMAGE. .\ .\ $Heimdal: krb5_keytab.3 22071 2007-11-14 20:04:50Z lha $ -.\ $NetBSD: krb5_keytab.3,v 1.9 2008/03/22 08:37:14 mlelstv Exp $ +.\ $NetBSD: krb5_keytab.3,v 1.9.8.1 2009/10/14 18:30:32 sborrill Exp $ .\ .Dd August 12, 2005 .Dt KRB5_KEYTAB 3 @@ -204,7 +204,7 @@ For compatibility with other Kerberos implemtation .Li WRFILE and -.LI JAVA14 +.Li JAVA14 is also accepted. .Li WRFILE has the same format as @@ -380,7 +380,7 @@ function .Fn krb5_kt_compare is used, so the wildcard rules applies to the argument of -.F krb5_kt_get_entry +.Fn krb5_kt_get_entry too. On success the returne entry must be freed with .Fn krb5_kt_free_entry .
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: sborrill Date: Wed Oct 14 18:33:48 UTC 2009 Modified Files: src/doc [netbsd-5]: CHANGES-5.1 Log Message: Remainder of ticket 1090 (+ whitespace changes) To generate a diff of this commit: cvs rdiff -u -r1.1.2.105 -r1.1.2.106 src/doc/CHANGES-5.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.1 diff -u src/doc/CHANGES-5.1:1.1.2.105 src/doc/CHANGES-5.1:1.1.2.106 --- src/doc/CHANGES-5.1:1.1.2.105 Wed Oct 14 18:17:01 2009 +++ src/doc/CHANGES-5.1 Wed Oct 14 18:33:48 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1,v 1.1.2.105 2009/10/14 18:17:01 snj Exp $ +# $NetBSD: CHANGES-5.1,v 1.1.2.106 2009/10/14 18:33:48 sborrill Exp $ A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1 release: @@ -14128,6 +14128,8 @@ [pooka, ticket #1089] crypto/dist/heimdal/lib/krb5/krb5_get_in_cred.3 1.2 +crypto/dist/heimdal/lib/krb5/krb5_keytab.3 1.10 +crypto/dist/heimdal/lib/krb5/krb5_get_creds.3 1.2 Fix man page markup. [joerg, ticket #1090] @@ -14143,7 +14145,6 @@ linker. Implement RTLD_DI_LINKMAP which returns a pointer to the linkmap chain at the given object. Other Solaris queries are currently unimplemented. - [pooka, ticket #1088] usr.bin/printf/printf.c1.34
CVS commit: src/crypto/dist/ipsec-tools/src/setkey
Module Name:src
Committed By: joerg
Date: Wed Oct 14 18:34:14 UTC 2009
Modified Files:
src/crypto/dist/ipsec-tools/src/setkey: setkey.8
Log Message:
Do not use .Xo/.Xc to work around ancient groff limits.
Fix markup.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/crypto/dist/ipsec-tools/src/setkey/setkey.8
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/dist/ipsec-tools/src/setkey/setkey.8
diff -u src/crypto/dist/ipsec-tools/src/setkey/setkey.8:1.20 src/crypto/dist/ipsec-tools/src/setkey/setkey.8:1.21
--- src/crypto/dist/ipsec-tools/src/setkey/setkey.8:1.20 Fri Oct 6 12:02:27 2006
+++ src/crypto/dist/ipsec-tools/src/setkey/setkey.8 Wed Oct 14 18:34:14 2009
@@ -1,4 +1,4 @@
-.\ $NetBSD: setkey.8,v 1.20 2006/10/06 12:02:27 manu Exp $
+.\ $NetBSD: setkey.8,v 1.21 2009/10/14 18:34:14 joerg Exp $
.\
.\ Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
.\ All rights reserved.
@@ -160,98 +160,51 @@
.Pq Sq #
are treated as comment lines.
.Bl -tag -width Ds
-.It Xo
-.Li add
-.Op Fl 46n
-.Ar src Ar dst Ar protocol Ar spi
-.Op Ar extensions
-.Ar algorithm ...
-.Li ;
-.Xc
+.It Li add Oo Fl 46n Oc Ar src Ar dst Ar protocol Ar spi \
+Oo Ar extensions Oc Ar algorithm ... Li ;
Add an SAD entry.
.Li add
can fail for multiple reasons, including when the key length does
not match the specified algorithm.
.\
-.It Xo
-.Li get
-.Op Fl 46n
-.Ar src Ar dst Ar protocol Ar spi
-.Li ;
-.Xc
+.It Li get Oo Fl 46n Oc Ar src Ar dst Ar protocol Ar spi Li ;
Show an SAD entry.
.\
-.It Xo
-.Li delete
-.Op Fl 46n
-.Ar src Ar dst Ar protocol Ar spi
-.Li ;
-.Xc
+.It Li delete Oo Fl 46n Oc Ar src Ar dst Ar protocol Ar spi Li ;
Remove an SAD entry.
.\
-.It Xo
-.Li deleteall
-.Op Fl 46n
-.Ar src Ar dst Ar protocol
-.Li ;
-.Xc
+.It Li deleteall Oo Fl 46n Oc Ar src Ar dst Ar protocol Li ;
Remove all SAD entries that match the specification.
.\
-.It Xo
-.Li flush
-.Op Ar protocol
-.Li ;
-.Xc
+.It Li flush Oo Ar protocol Oc Li ;
Clear all SAD entries matched by the options.
.Fl F
on the command line achieves the same functionality.
.\
-.It Xo
-.Li dump
-.Op Ar protocol
-.Li ;
-.Xc
+.It Li dump Oo Ar protocol Oc Li ;
Dumps all SAD entries matched by the options.
.Fl D
on the command line achieves the same functionality.
.\
-.It Xo
-.Li spdadd
-.Op Fl 46n
-.Ar src_range Ar dst_range Ar upperspec Ar label Ar policy
-.Li ;
-.Xc
+.It Li spdadd Oo Fl 46n Oc Ar src_range Ar dst_range Ar upperspec \
+Ar label Ar policy Li ;
Add an SPD entry.
.\
-.It Xo
-.Li spdadd tagged
-.Ar tag Ar policy
-.Li ;
-.Xc
+.It Li spdadd tagged Ar tag Ar policy Li ;
Add an SPD entry based on a PF tag.
.Ar tag
must be a string surrounded by double quotes.
.\
-.It Xo
-.Li spddelete
-.Op Fl 46n
-.Ar src_range Ar dst_range Ar upperspec Fl P Ar direction
-.Li ;
-.Xc
+.It Li spddelete Oo Fl 46n Oc Ar src_range Ar dst_range Ar upperspec \
+Fl P Ar direction Li ;
Delete an SPD entry.
.\
-.It Xo
-.Li spdflush
-.Li ;
-.Xc
+.It Li spdflush Li ;
Clear all SPD entries.
.Fl FP
on the command line achieves the same functionality.
.\
-.It Xo
-.Li spddump
-.Li ;
-.Xc
+.It Li spddump Li ;
Dumps all SPD entries.
.Fl DP
on the command line achieves the same functionality.
@@ -391,10 +344,7 @@
Specify an encryption algorithm
.Ar ealgo
for ESP.
-.It Xo
-.Fl E Ar ealgo Ar key
-.Fl A Ar aalgo Ar key
-.Xc
+.It Fl E Ar ealgo Ar key Fl A Ar aalgo Ar key
Specify an encryption algorithm
.Ar ealgo ,
as well as a payload authentication algorithm
@@ -526,13 +476,15 @@
.It Ar policy
.Ar policy
is in one of the following three formats:
-.Bd -literal -offset indent
-.It Fl P Ar direction [priority specification] Li discard
-.It Fl P Ar direction [priority specification] Li none
-.It Xo Fl P Ar direction [priority specification] Li ipsec
+.Bl -item -compact
+.It
+.Fl P Ar direction [priority specification] Li discard
+.It
+.Fl P Ar direction [priority specification] Li none
+.It
+.Fl P Ar direction [priority specification] Li ipsec
.Ar protocol/mode/src-dst/level Op ...
-.Xc
-.Ed
+.El
.Pp
You must specify the direction of its policy as
.Ar direction .
@@ -559,14 +511,10 @@
be printed the first time a priority specification is used.
Policy priority takes one of the following formats:
.Bl -tag -width discard
-.It Xo
-.Ar {priority,prio} offset
-.Xc
+.It Ar {priority,prio} offset
.Ar offset
is an integer in the range from \-2147483647 to 214783648.
-.It Xo
-.Ar {priority,prio} base {+,\-} offset
-.Xc
+.It Ar {priority,prio} base {+,\-} offset
.Ar base
is either
.Li low (\-1073741824) ,
CVS commit: [netbsd-5-0] src/usr.bin/printf
Module Name:src
Committed By: sborrill
Date: Wed Oct 14 18:37:30 UTC 2009
Modified Files:
src/usr.bin/printf [netbsd-5-0]: printf.c
Log Message:
Pull up the following revisions(s) (requested by christos in ticket #1091):
usr.bin/printf/printf.c:revision 1.34
Avoid segv on printf '%*s' 666.
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.33.8.1 src/usr.bin/printf/printf.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/printf/printf.c
diff -u src/usr.bin/printf/printf.c:1.33 src/usr.bin/printf/printf.c:1.33.8.1
--- src/usr.bin/printf/printf.c:1.33 Mon Jul 21 14:19:24 2008
+++ src/usr.bin/printf/printf.c Wed Oct 14 18:37:30 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: printf.c,v 1.33 2008/07/21 14:19:24 lukem Exp $ */
+/* $NetBSD: printf.c,v 1.33.8.1 2009/10/14 18:37:30 sborrill Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = @(#)printf.c 8.2 (Berkeley) 3/22/95;
#else
-__RCSID($NetBSD: printf.c,v 1.33 2008/07/21 14:19:24 lukem Exp $);
+__RCSID($NetBSD: printf.c,v 1.33.8.1 2009/10/14 18:37:30 sborrill Exp $);
#endif
#endif /* not lint */
@@ -155,7 +155,7 @@
gargv = ++argv;
#define SKIP1 #-+ 0
-#define SKIP2 *0123456789
+#define SKIP2 0123456789
do {
/*
* Basic algorithm is to scan the format string for conversion
@@ -185,13 +185,23 @@
/* skip to field width */
fmt += strspn(fmt, SKIP1);
- fieldwidth = *fmt == '*' ? getwidth() : -1;
+ if (*fmt == '*') {
+fmt++;
+fieldwidth = getwidth();
+ } else
+fieldwidth = -1;
/* skip to possible '.', get following precision */
fmt += strspn(fmt, SKIP2);
- if (*fmt == '.')
-++fmt;
- precision = *fmt == '*' ? getwidth() : -1;
+ if (*fmt == '.') {
+fmt++;
+if (*fmt == '*') {
+ fmt++;
+ precision = getwidth();
+} else
+ precision = -1;
+ } else
+precision = -1;
fmt += strspn(fmt, SKIP2);
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: sborrill Date: Wed Oct 14 18:40:01 UTC 2009 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.2 Log Message: Ticket 1091 To generate a diff of this commit: cvs rdiff -u -r1.1.2.17 -r1.1.2.18 src/doc/CHANGES-5.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.0.2 diff -u src/doc/CHANGES-5.0.2:1.1.2.17 src/doc/CHANGES-5.0.2:1.1.2.18 --- src/doc/CHANGES-5.0.2:1.1.2.17 Mon Oct 12 10:52:18 2009 +++ src/doc/CHANGES-5.0.2 Wed Oct 14 18:40:01 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.2,v 1.1.2.17 2009/10/12 10:52:18 sborrill Exp $ +# $NetBSD: CHANGES-5.0.2,v 1.1.2.18 2009/10/14 18:40:01 sborrill Exp $ A complete list of changes from the NetBSD 5.0.1 release to the NetBSD 5.0.2 release: @@ -318,3 +318,8 @@ this there is a simple local-user panic in ureadc(). [dsl, ticket #1087] +usr.bin/printf/printf.c1.34 + + Avoid segv on printf '%*s' 666. + [christos, ticket #1091] +
CVS commit: src/sys/arch/xen/xen
Module Name:src
Committed By: bouyer
Date: Wed Oct 14 18:54:01 UTC 2009
Modified Files:
src/sys/arch/xen/xen: xbdback_xenbus.c
Log Message:
Don't pass a NULL arg to DIOCCACHESYNC, sd(4) dereferences it.
Pass a pointer to a int initialized to 1, so that a DIOCCACHESYNC will be
forced on sd(4).
Should fix dom0 panic reported by Sarton O'Brien.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/xen/xen/xbdback_xenbus.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/xen/xen/xbdback_xenbus.c
diff -u src/sys/arch/xen/xen/xbdback_xenbus.c:1.25 src/sys/arch/xen/xen/xbdback_xenbus.c:1.26
--- src/sys/arch/xen/xen/xbdback_xenbus.c:1.25 Wed Sep 23 17:48:55 2009
+++ src/sys/arch/xen/xen/xbdback_xenbus.c Wed Oct 14 18:54:00 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: xbdback_xenbus.c,v 1.25 2009/09/23 17:48:55 bouyer Exp $ */
+/* $NetBSD: xbdback_xenbus.c,v 1.26 2009/10/14 18:54:00 bouyer Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: xbdback_xenbus.c,v 1.25 2009/09/23 17:48:55 bouyer Exp $);
+__KERNEL_RCSID(0, $NetBSD: xbdback_xenbus.c,v 1.26 2009/10/14 18:54:00 bouyer Exp $);
#include sys/types.h
#include sys/param.h
@@ -1316,9 +1316,10 @@
if (xbd_io-xio_operation == BLKIF_OP_FLUSH_DISKCACHE) {
int error;
+ int force = 1;
struct xbdback_instance *xbdi = xbd_io-xio_xbdi;
- error = VOP_IOCTL(xbdi-xbdi_vp, DIOCCACHESYNC, NULL, FWRITE,
+ error = VOP_IOCTL(xbdi-xbdi_vp, DIOCCACHESYNC, force, FWRITE,
kauth_cred_get());
if (error) {
aprint_error(xbdback %s: DIOCCACHESYNC returned %d\n,
CVS commit: src
Module Name:src
Committed By: apb
Date: Wed Oct 14 19:03:12 UTC 2009
Modified Files:
src: build.sh
Log Message:
Bomb if TOOLDIR, DESTDIR, or RELEASEDIR changes after we have created the
top level object directory. This can happen if /etc/mk.conf overrides
values passed to build.sh in the environment or on the command line.
To generate a diff of this commit:
cvs rdiff -u -r1.214 -r1.215 src/build.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/build.sh
diff -u src/build.sh:1.214 src/build.sh:1.215
--- src/build.sh:1.214 Sat Oct 3 19:19:59 2009
+++ src/build.sh Wed Oct 14 19:03:12 2009
@@ -1,5 +1,5 @@
#! /usr/bin/env sh
-# $NetBSD: build.sh,v 1.214 2009/10/03 19:19:59 apb Exp $
+# $NetBSD: build.sh,v 1.215 2009/10/14 19:03:12 apb Exp $
#
# Copyright (c) 2001-2009 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -1144,23 +1144,38 @@
${runcmd} cd ${TOP}
fi
- # Find TOOLDIR, DESTDIR, RELEASEDIR, and RELEASEMACHINEDIR.
+ # Find TOOLDIR, DESTDIR, and RELEASEDIR, according to getmakevar,
+ # and bomb if they have changed from the values we had from the
+ # command line or environment.
+ #
# This must be done after creating the top-level object directory.
#
- TOOLDIR=$(getmakevar TOOLDIR)
- statusmsg TOOLDIR path: ${TOOLDIR}
- DESTDIR=$(getmakevar DESTDIR)
- RELEASEDIR=$(getmakevar RELEASEDIR)
+ for var in TOOLDIR DESTDIR RELEASEDIR
+ do
+ eval oldval=\\$${var}\
+ newval=$(getmakevar $var)
+ if ! $do_expertmode; then
+ : ${__SRC_TOP_OBJ__:=$(getmakevar __SRC_TOP_OBJ__)}
+ case $var in
+ DESTDIR)
+: ${newval:=${_SRC_TOP_OBJ_}/destdir.${MACHINE}}
+;;
+ RELEASEDIR)
+: ${newval:=${_SRC_TOP_OBJ_}/releasedir}
+;;
+ esac
+ fi
+ if [ -n $oldval ] [ $oldval != $newval ]; then
+ bomb Value of ${var} has changed \
+(was \${oldval}\, now \${newval}\)
+ fi
+ eval ${var}=\\${newval}\
+ eval export ${var}
+ statusmsg ${var} path: ${newval}
+ done
+
+ # RELEASEMACHINEDIR is just a subdir name, e.g. i386.
RELEASEMACHINEDIR=$(getmakevar RELEASEMACHINEDIR)
- if ! $do_expertmode; then
- _SRC_TOP_OBJ_=$(getmakevar _SRC_TOP_OBJ_)
- : ${DESTDIR:=${_SRC_TOP_OBJ_}/destdir.${MACHINE}}
- : ${RELEASEDIR:=${_SRC_TOP_OBJ_}/releasedir}
- makeenv=${makeenv} DESTDIR RELEASEDIR
- fi
- export TOOLDIR DESTDIR RELEASEDIR
- statusmsg DESTDIR path: ${DESTDIR}
- statusmsg RELEASEDIR path: ${RELEASEDIR}
# Check validity of TOOLDIR and DESTDIR.
#
@@ -1298,7 +1313,7 @@
eval cat EOF ${makewrapout}
#! ${HOST_SH}
# Set proper variables to allow easy make building of a NetBSD subtree.
-# Generated from: \$NetBSD: build.sh,v 1.214 2009/10/03 19:19:59 apb Exp $
+# Generated from: \$NetBSD: build.sh,v 1.215 2009/10/14 19:03:12 apb Exp $
# with these arguments: ${_args}
#
CVS commit: src/external/bsd/bind/bin/nslookup
Module Name:src Committed By: joerg Date: Wed Oct 14 19:08:56 UTC 2009 Modified Files: src/external/bsd/bind/bin/nslookup: nslookup.8 Log Message: Do not use .Xo/.Xc to work around ancient groff limits. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/bsd/bind/bin/nslookup/nslookup.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/bind/bin/nslookup/nslookup.8 diff -u src/external/bsd/bind/bin/nslookup/nslookup.8:1.1 src/external/bsd/bind/bin/nslookup/nslookup.8:1.2 --- src/external/bsd/bind/bin/nslookup/nslookup.8:1.1 Sun Apr 12 03:46:06 2009 +++ src/external/bsd/bind/bin/nslookup/nslookup.8 Wed Oct 14 19:08:55 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: nslookup.8,v 1.1 2009/04/12 03:46:06 christos Exp $ +.\ $NetBSD: nslookup.8,v 1.2 2009/10/14 19:08:55 joerg Exp $ .\ .\ .\ ++Copyright++ 1985, 1989 @@ -164,12 +164,8 @@ The name of the root server can be changed with the .Dq Ic set root command. -.It Xo Ic finger Op Ar name -.Op Ic \*[Gt] Ar filename -.Xc -.It Xo Ic finger Op Ar name -.Op Ic \*[Gt]\*[Gt] Ar filename -.Xc +.It Ic finger Oo Ar name Oc Op Ic \*[Gt] Ar filename +.It Ic finger Oo Ar name Oc Op Ic \*[Gt]\*[Gt] Ar filename Connects with the finger server on the current host. The current host is defined when a previous lookup for a host was successful and returned address information (see the @@ -182,12 +178,8 @@ and .Ic \*[Gt]\*[Gt] can be used to redirect output in the usual manner. -.It Xo Ic ls Op Ar option -.Ar domain Op Ic \*[Gt] Ar filename -.Xc -.It Xo Ic ls Op Ar option -.Ar domain Op Ic \*[Gt]\*[Gt] Ar filename -.Xc +.It Ic ls Oo Ar option Oc Ar domain Op Ic \*[Gt] Ar filename +.It Ic ls Oo Ar option Oc Ar domain Op Ic \*[Gt]\*[Gt] Ar filename List the information available for .Ar domain , optionally creating or appending to @@ -230,10 +222,7 @@ Prints a brief summary of commands. .It Ic exit Exits the program. -.It Xo -.Ic set -.Ar keyword Ns Op = Ns Ar value -.Xc +.It Ic set Ar keyword Ns Op = Ns Ar value This command is used to change state information that affects the lookups. Valid keywords are: .Bl -tag -width class=v @@ -260,9 +249,7 @@ .Dv IN ; abbreviation = .Ic cl ) -.It Xo -.Oo Ic no Oc Ns Ic debug -.Xc +.It Oo Ic no Oc Ns Ic debug Turn debugging mode on. A lot more information is printed about the packet sent to the server and the resulting answer. @@ -271,9 +258,7 @@ .Ic nodebug ; abbreviation = .Oo Ic no Oc Ns Ic deb ) -.It Xo -.Oo Ic no Oc Ns Ic d2 -.Xc +.It Oo Ic no Oc Ns Ic d2 Turn exhaustive debugging mode on. Essentially all fields of every packet are printed. .Pp @@ -306,14 +291,7 @@ .Ev LOCALDOMAIN ; abbreviation = .Ic do ) -.It Xo -.Sm off -.Ic srchlist No = -.Ar name1 No / -.Ar name2 No / -.Ar ... -.Sm on -.Xc +.It Ic srchlist Ns No = Ns Ar name1 Ns No / Ns Ar name2 Ns No / Ns Ar ... Change the default domain name to .Ar name1 and the domain search list @@ -344,9 +322,7 @@ .Ev LOCALDOMAIN ; abbreviation = .Ic srchl ) -.It Xo -.Oo Ic no Oc Ns Ic defname -.Xc +.It Oo Ic no Oc Ns Ic defname If set, append the default domain name to a single-component lookup request (i.e., one that does not contain a period). .Pp @@ -354,9 +330,7 @@ .Ic defname ; abbreviation = .Oo Ic no Oc Ns Ic defname ) -.It Xo -.Oo Ic no Oc Ns Ic search -.Xc +.It Oo Ic no Oc Ns Ic search If the lookup request contains at least one period but .Em doesn't end with a trailing period, append the domain names in the domain search list @@ -413,9 +387,7 @@ .Dv A ; abbreviations = .Ic q , ty ) -.It Xo -.Oo Ic no Oc Ns Ic recurse -.Xc +.It Oo Ic no Oc Ns Ic recurse Tell the name server to query other servers if it does not have the information. .Pp @@ -453,18 +425,14 @@ .Pp (Default = 5 seconds; abbreviation = .Ic ti ) -.It Xo -.Oo Ic no Oc Ns Ic vc -.Xc +.It Oo Ic no Oc Ns Ic vc Always use a virtual circuit when sending requests to the server. .Pp (Default = .Ic novc ; abbreviation = .Oo Ic no Oc Ns Ic v ) -.It Xo -.Oo Ic no Oc Ns Ic ignoretc -.Xc +.It Oo Ic no Oc Ns Ic ignoretc Ignore packet truncation errors. .Pp (Default =
CVS commit: src/sys/rump/net/rumptest
Module Name:src
Committed By: pooka
Date: Wed Oct 14 19:14:39 UTC 2009
Modified Files:
src/sys/rump/net/rumptest: rumptest_net.c
Log Message:
use rump_pub
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/rump/net/rumptest/rumptest_net.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/rump/net/rumptest/rumptest_net.c
diff -u src/sys/rump/net/rumptest/rumptest_net.c:1.10 src/sys/rump/net/rumptest/rumptest_net.c:1.11
--- src/sys/rump/net/rumptest/rumptest_net.c:1.10 Fri Mar 27 13:46:34 2009
+++ src/sys/rump/net/rumptest/rumptest_net.c Wed Oct 14 19:14:39 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: rumptest_net.c,v 1.10 2009/03/27 13:46:34 pooka Exp $ */
+/* $NetBSD: rumptest_net.c,v 1.11 2009/10/14 19:14:39 pooka Exp $ */
/*
* Copyright (c) 2008 Antti Kantee. All Rights Reserved.
@@ -84,7 +84,7 @@
uint8_t *bp = m_rtmsg.m_space;
int s, rv;
- if ((rv = rump_virtif_create(0)) != 0) {
+ if ((rv = rump_pub_virtif_create(0)) != 0) {
printf(could not configure interface %d\n, rv);
exit(1);
}
CVS commit: src/sys/kern
Module Name:src Committed By: dsl Date: Wed Oct 14 19:25:39 UTC 2009 Modified Files: src/sys/kern: tty_pty.c Log Message: Error out of ptcread() if the uio length supplied is zero before the code has a chance to panic in ureadc(). To generate a diff of this commit: cvs rdiff -u -r1.118 -r1.119 src/sys/kern/tty_pty.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/kern/tty_pty.c diff -u src/sys/kern/tty_pty.c:1.118 src/sys/kern/tty_pty.c:1.119 --- src/sys/kern/tty_pty.c:1.118 Sun Oct 11 08:08:32 2009 +++ src/sys/kern/tty_pty.c Wed Oct 14 19:25:39 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: tty_pty.c,v 1.118 2009/10/11 08:08:32 dsl Exp $ */ +/* $NetBSD: tty_pty.c,v 1.119 2009/10/14 19:25:39 dsl Exp $ */ /* * Copyright (c) 1982, 1986, 1989, 1993 @@ -37,7 +37,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: tty_pty.c,v 1.118 2009/10/11 08:08:32 dsl Exp $); +__KERNEL_RCSID(0, $NetBSD: tty_pty.c,v 1.119 2009/10/14 19:25:39 dsl Exp $); #include opt_ptm.h @@ -586,6 +586,9 @@ int error = 0, cc; int c; + if (uio-uio_resid = 0) + return EINVAL; + /* * We want to block until the slave * is open, and there's something to read;
CVS commit: [netbsd-5] src/etc
Module Name:src Committed By: sborrill Date: Wed Oct 14 20:05:08 UTC 2009 Modified Files: src/etc [netbsd-5]: Makefile Removed Files: src/etc [netbsd-5]: audit-packages.conf Log Message: Pull up the following additional revisions(s) required by ticket #784: etc/Makefile: revision 1.365 etc/audit-packages.conf:remove Fix update release build (pointed out by tsutsui). To generate a diff of this commit: cvs rdiff -u -r1.359.2.4 -r1.359.2.5 src/etc/Makefile cvs rdiff -u -r1.1 -r0 src/etc/audit-packages.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/Makefile diff -u src/etc/Makefile:1.359.2.4 src/etc/Makefile:1.359.2.5 --- src/etc/Makefile:1.359.2.4 Tue Sep 15 06:01:40 2009 +++ src/etc/Makefile Wed Oct 14 20:05:08 2009 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.359.2.4 2009/09/15 06:01:40 snj Exp $ +# $NetBSD: Makefile,v 1.359.2.5 2009/10/14 20:05:08 sborrill Exp $ # from: @(#)Makefile 8.7 (Berkeley) 5/25/95 # Environment variables without default values: @@ -88,7 +88,7 @@ BINOWN= root BINGRP= wheel UTMPGRP= utmp -BIN1+= audit-packages.conf bootptab changelist csh.cshrc csh.login \ +BIN1+= bootptab changelist csh.cshrc csh.login \ csh.logout daily daily.conf dm.conf envsys.conf floppytab ftpchroot \ ftpusers gettytab group hosts hosts.lpd inetd.conf lkm.conf \ locate.conf login.conf mailer.conf man.conf monthly monthly.conf \
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: sborrill Date: Wed Oct 14 20:06:28 UTC 2009 Modified Files: src/doc [netbsd-5]: CHANGES-5.1 Log Message: Additional changes required by ticket 784 To generate a diff of this commit: cvs rdiff -u -r1.1.2.106 -r1.1.2.107 src/doc/CHANGES-5.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.1 diff -u src/doc/CHANGES-5.1:1.1.2.106 src/doc/CHANGES-5.1:1.1.2.107 --- src/doc/CHANGES-5.1:1.1.2.106 Wed Oct 14 18:33:48 2009 +++ src/doc/CHANGES-5.1 Wed Oct 14 20:06:27 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1,v 1.1.2.106 2009/10/14 18:33:48 sborrill Exp $ +# $NetBSD: CHANGES-5.1,v 1.1.2.107 2009/10/14 20:06:27 sborrill Exp $ A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1 release: @@ -675,6 +675,8 @@ distrib/sets/lists/base/mi patch distrib/sets/lists/etc/mi patch distrib/sets/lists/man/mi patch +etc/Makefile 1.365 +etc/audit-packages.confremoved external/bsd/pkg_install/Makefile.inc patch external/bsd/pkg_install/prepare-import.sh patch external/bsd/pkg_install/dist/add/add.h pkg_install-20090528
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: sborrill Date: Wed Oct 14 20:42:42 UTC 2009 Modified Files: src/doc [netbsd-5]: CHANGES-5.1 Log Message: Ticket 1084 To generate a diff of this commit: cvs rdiff -u -r1.1.2.107 -r1.1.2.108 src/doc/CHANGES-5.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.1 diff -u src/doc/CHANGES-5.1:1.1.2.107 src/doc/CHANGES-5.1:1.1.2.108 --- src/doc/CHANGES-5.1:1.1.2.107 Wed Oct 14 20:06:27 2009 +++ src/doc/CHANGES-5.1 Wed Oct 14 20:42:42 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1,v 1.1.2.107 2009/10/14 20:06:27 sborrill Exp $ +# $NetBSD: CHANGES-5.1,v 1.1.2.108 2009/10/14 20:42:42 sborrill Exp $ A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1 release: @@ -14154,3 +14154,28 @@ Avoid segv on printf '%*s' 666. [christos, ticket #1091] +usr.bin/sort/Makefile1.6-1.8 +usr.bin/sort/append.c1.15-1.22 +usr.bin/sort/fields.c1.20-1.30 +usr.bin/sort/files.c1.27-1.40 +usr.bin/sort/fsort.c1.33-1.45 +usr.bin/sort/fsort.h1.14-1.17 +usr.bin/sort/init.c1.19-1.23 +usr.bin/sort/msort.c1.19-1.28 +usr.bin/sort/radix_sort.c 1.1-1.4 +usr.bin/sort/sort.11.27-1.29 +usr.bin/sort/sort.c1.47-1.56 +usr.bin/sort/sort.h1.20-1.30 +usr.bin/sort/tmp.c1.14-1.15 + + Only use radix sort for in-memory sort, always merge temporary files. + Use a local radixsort() function so we can pass record length. + Avoid use of weight tables for key compares. + Fix generation of keys for numbers, negate value for reverse sort. + Write file in reverse-key order for 'sort -n'. + 'sort -S' now does a posix sort (sort matching keys by record data). + Ensure merge sort doesn't have too many temporary files open. + Fixes: PR#18614 PR#27257 PR#25551 PR#22182 PR#31095 PR#30504 + PR#36816 PR#37860 PR#39308 PR#42094 + [dsl, ticket #1084] +
CVS commit: src/lib/libc/stdio
Module Name:src Committed By: roy Date: Wed Oct 14 20:54:51 UTC 2009 Modified Files: src/lib/libc/stdio: fgetstr.c Log Message: Store the allocated buffer against FILE, plugging a memory leak. Fixes PR bin/42183. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/lib/libc/stdio/fgetstr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/stdio/fgetstr.c diff -u src/lib/libc/stdio/fgetstr.c:1.6 src/lib/libc/stdio/fgetstr.c:1.7 --- src/lib/libc/stdio/fgetstr.c:1.6 Thu Sep 24 20:38:53 2009 +++ src/lib/libc/stdio/fgetstr.c Wed Oct 14 20:54:51 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: fgetstr.c,v 1.6 2009/09/24 20:38:53 roy Exp $ */ +/* $NetBSD: fgetstr.c,v 1.7 2009/10/14 20:54:51 roy Exp $ */ /* * Copyright (c) 2009 The NetBSD Foundation, Inc. @@ -28,7 +28,7 @@ */ #include sys/cdefs.h -__RCSID($NetBSD: fgetstr.c,v 1.6 2009/09/24 20:38:53 roy Exp $); +__RCSID($NetBSD: fgetstr.c,v 1.7 2009/10/14 20:54:51 roy Exp $); #include namespace.h @@ -64,7 +64,10 @@ errno = EOVERFLOW; goto error; } + fp-_lb._base = (unsigned char *)p; fp-_lb._size = (int)size; + if (*lenp == 0) + return NULL; if (*lenp SIZE_MAX) return p; error:
CVS commit: src/sbin/fdisk
Module Name:src Committed By: joerg Date: Wed Oct 14 22:00:55 UTC 2009 Modified Files: src/sbin/fdisk: fdisk.8 Log Message: Do not use .Xo / .Xc without a good reason. To generate a diff of this commit: cvs rdiff -u -r1.62 -r1.63 src/sbin/fdisk/fdisk.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/fdisk/fdisk.8 diff -u src/sbin/fdisk/fdisk.8:1.62 src/sbin/fdisk/fdisk.8:1.63 --- src/sbin/fdisk/fdisk.8:1.62 Mon Aug 10 02:56:23 2009 +++ src/sbin/fdisk/fdisk.8 Wed Oct 14 22:00:55 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: fdisk.8,v 1.62 2009/08/10 02:56:23 yamt Exp $ +.\ $NetBSD: fdisk.8,v 1.63 2009/10/14 22:00:55 joerg Exp $ .\ .Dd August 10, 2009 .Dt FDISK 8 @@ -429,17 +429,11 @@ .It Em bootmenu is the menu prompt output by the interactive boot code for this partition. This line is omitted if the prompt is not defined. -.It Xo -.Em start , -.Em size -.Xc +.It Em start , Em size are the start address and size of the partition in sectors. .It Em MB is the size of the partition in megabytes. -.It Xo -.Em first , -.Em next -.Xc +.It Em first , Em next are the bounds of this partition displayed as cylinder/head/sector. If the partition starts (or ends) on a cylinder boundary the head and sector values are omitted. @@ -472,11 +466,7 @@ .Em sector .in -4 .Bl -tag -width bootmenu -.It Xo -.Em cylinder , -.Em head , -.Em sector -.Xc +.It Em cylinder , Em head , Em sector are the beginning or ending address of a partition. .Pp .Em Note:
CVS commit: src/usr.sbin/pstat
Module Name:src Committed By: joerg Date: Wed Oct 14 22:59:11 UTC 2009 Modified Files: src/usr.sbin/pstat: pstat.8 Log Message: Fix markup. To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 src/usr.sbin/pstat/pstat.8 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/pstat/pstat.8 diff -u src/usr.sbin/pstat/pstat.8:1.37 src/usr.sbin/pstat/pstat.8:1.38 --- src/usr.sbin/pstat/pstat.8:1.37 Thu Dec 28 04:17:51 2006 +++ src/usr.sbin/pstat/pstat.8 Wed Oct 14 22:59:11 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: pstat.8,v 1.37 2006/12/28 04:17:51 xtraeme Exp $ +.\ $NetBSD: pstat.8,v 1.38 2009/10/14 22:59:11 joerg Exp $ .\ .\ Copyright (c) 1980, 1991, 1993, 1994 .\ The Regents of the University of California. All rights reserved. @@ -229,11 +229,7 @@ by a two line header. The first line consists of the following: .Pp -.Df I -.No *** MOUNT Em fstype from -on -.Em on fsflags -.De +.No *** MOUNT Em fstype from Li on Em on fsflags .Pp where .Em fstype @@ -383,8 +379,8 @@ .Xr fs 5 , .Xr iostat 8 .Rs -.Rt Tn UNIX Rt Implementation , -.Ra K. Thompson +.%T Tn UNIX Implementation +.%A K. Thompson .Re .Sh HISTORY The
CVS commit: src/share/man/man4
Module Name:src
Committed By: joerg
Date: Wed Oct 14 23:10:27 UTC 2009
Modified Files:
src/share/man/man4: bluetooth.4
Log Message:
Indentation is an argument, not another option.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/share/man/man4/bluetooth.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/bluetooth.4
diff -u src/share/man/man4/bluetooth.4:1.16 src/share/man/man4/bluetooth.4:1.17
--- src/share/man/man4/bluetooth.4:1.16 Fri Sep 25 19:47:09 2009
+++ src/share/man/man4/bluetooth.4 Wed Oct 14 23:10:27 2009
@@ -1,4 +1,4 @@
-.\ $NetBSD: bluetooth.4,v 1.16 2009/09/25 19:47:09 plunky Exp $
+.\ $NetBSD: bluetooth.4,v 1.17 2009/10/14 23:10:27 joerg Exp $
.\
.\ Copyright (c) 2006 Itronix Inc.
.\ All rights reserved.
@@ -51,7 +51,7 @@
structure which contains a Bluetooth Device Address (BDADDR).
This consists of a six byte string in least significant byte
first order.
-.Bd -literal -offset -indent
+.Bd -literal -offset indent
struct sockaddr_bt {
uint8_t bt_len;
sa_family_t bt_family;
CVS commit: src/share/man/man4
Module Name:src Committed By: joerg Date: Wed Oct 14 23:18:39 UTC 2009 Modified Files: src/share/man/man4: envsys.4 Log Message: Do not indent twice. Do not use compact mode, it makes the list harder to read. To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.44 src/share/man/man4/envsys.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/envsys.4 diff -u src/share/man/man4/envsys.4:1.43 src/share/man/man4/envsys.4:1.44 --- src/share/man/man4/envsys.4:1.43 Sat Jun 13 16:08:25 2009 +++ src/share/man/man4/envsys.4 Wed Oct 14 23:18:39 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: envsys.4,v 1.43 2009/06/13 16:08:25 pgoyette Exp $ +.\ $NetBSD: envsys.4,v 1.44 2009/10/14 23:18:39 joerg Exp $ .\ .\ Copyright (c) 2007 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -66,7 +66,7 @@ .Xr ioctl 2 types are available: .Pp -.Bl -tag -width XX -compact +.Bl -tag -width XX .It Dv ENVSYS_GETDICTIONARY Pq prop_dictionary_t .Pp This @@ -236,9 +236,9 @@ The values will be set to defaults, the ones that the driver uses. .Pp Only one object is allowed on this dictionary: -.Bd -literal -offset -ident - \*[Lt]key\*[Gt]envsys-remove-props\*[Lt]/key\*[Gt] - \*[Lt]true/\*[Gt] +.Bd -literal -offset ident +\*[Lt]key\*[Gt]envsys-remove-props\*[Lt]/key\*[Gt] +\*[Lt]true/\*[Gt] .Ed .Pp It is a boolean object and must be set to
CVS commit: src/sys/rump/dev/wip/librumpusbhc
Module Name:src
Committed By: pooka
Date: Wed Oct 14 23:29:42 UTC 2009
Modified Files:
src/sys/rump/dev/wip/librumpusbhc: rumpusbhc.c
Log Message:
whoops, restore probing of ugen{0..3} instead of just ugen2
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/rump/dev/wip/librumpusbhc/rumpusbhc.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/rump/dev/wip/librumpusbhc/rumpusbhc.c
diff -u src/sys/rump/dev/wip/librumpusbhc/rumpusbhc.c:1.7 src/sys/rump/dev/wip/librumpusbhc/rumpusbhc.c:1.8
--- src/sys/rump/dev/wip/librumpusbhc/rumpusbhc.c:1.7 Tue Oct 13 18:36:48 2009
+++ src/sys/rump/dev/wip/librumpusbhc/rumpusbhc.c Wed Oct 14 23:29:42 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpusbhc.c,v 1.7 2009/10/13 18:36:48 pooka Exp $ */
+/* $NetBSD: rumpusbhc.c,v 1.8 2009/10/14 23:29:42 pooka Exp $ */
/*
* Copyright (c) 2009 Antti Kantee. All Rights Reserved.
@@ -61,7 +61,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rumpusbhc.c,v 1.7 2009/10/13 18:36:48 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: rumpusbhc.c,v 1.8 2009/10/14 23:29:42 pooka Exp $);
#include sys/param.h
#include sys/bus.h
@@ -130,12 +130,10 @@
/* probe ugen0 through ugen3 */
struct cfdata rumpusbhc_cfdata[] = {
-#if 0
{ rumpusbhc, rumpusbhc, 0, FSTATE_NOTFOUND, NULL, 0, rumpusbhcpar},
{ rumpusbhc, rumpusbhc, 1, FSTATE_NOTFOUND, NULL, 0, rumpusbhcpar},
- { rumpusbhc, rumpusbhc, 3, FSTATE_NOTFOUND, NULL, 0, rumpusbhcpar},
-#endif
{ rumpusbhc, rumpusbhc, 2, FSTATE_NOTFOUND, NULL, 0, rumpusbhcpar},
+ { rumpusbhc, rumpusbhc, 3, FSTATE_NOTFOUND, NULL, 0, rumpusbhcpar},
};
#define UGENDEV_BASESTR /dev/ugen
CVS commit: src/share/man/man4
Module Name:src
Committed By: joerg
Date: Wed Oct 14 23:32:42 UTC 2009
Modified Files:
src/share/man/man4: lmc.4
Log Message:
Garbage collect !NetBSD documentation.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/share/man/man4/lmc.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/lmc.4
diff -u src/share/man/man4/lmc.4:1.16 src/share/man/man4/lmc.4:1.17
--- src/share/man/man4/lmc.4:1.16 Wed May 27 19:23:59 2009
+++ src/share/man/man4/lmc.4 Wed Oct 14 23:32:42 2009
@@ -53,224 +53,34 @@
.\ * PLEASE DO NOT UN-IFDEF THIS FILE! *
.\ * * * * * * * * * * * * * * * * * * * * *
.\
-.\ $NetBSD: lmc.4,v 1.16 2009/05/27 19:23:59 snj Exp $
+.\ $NetBSD: lmc.4,v 1.17 2009/10/14 23:32:42 joerg Exp $
.\
.Dd April 11, 2006
.Dt LMC 4
.Os
-.\ Os sets \*(oS or \*[operating-system]
-.\ substring works differently before Groff version 1.19
-.ie (\n(.y 19) .nr ssfix 1
-.el .nr ssfix 0
-.\ Is the OS name FreeBSD?
-.ie \*[operating-system] .ds aa \*(oS
-.el .ds aa \*[operating-system]
-.substring aa (0+\n[ssfix] (6+\n[ssfix])
-.ie \*(aaFreeBSD .nr fbsd 1
-.el .nr fbsd 0
-.\ Is the OS name NetBSD?
-.ie \*[operating-system] .ds aa \*(oS
-.el .ds aa \*[operating-system]
-.substring aa (0+\n[ssfix]) (5+\n[ssfix])
-.ie \*(aaNetBSD .nr nbsd 1
-.el .nr nbsd 0
-.\ Is the OS name OpenBSD?
-.ie \*[operating-system] .ds aa \*(oS
-.el .ds aa \*[operating-system]
-.substring aa (0+\n[ssfix]) (7+\n[ssfix])
-.ie \*(aaOpenBSD .nr obsd 1
-.el .nr obsd 0
-.\ Is the OS name BSDI?
-.ie \*[operating-system] .ds aa \*(oS
-.el .ds aa \*[operating-system]
-.substring aa (0+\n[ssfix]) (4+\n[ssfix])
-.ie \*(aaBSDI .nr bsdi 1
-.el .nr bsdi 0
-.\ Is the OS name BSD (i.e. Linux)?
-.ie \*[operating-system] .ds aa \*(oS
-.el .ds aa \*[operating-system]
-.ie \*(aaBSD .nr linux 1
-.el .nr linux 0
-.\ If no operating system matched then select all OSs.
-.if !(\n[fbsd] : \n[nbsd] : \n[obsd] : \n[bsdi] : \n[linux]) \{\
-.nr allos 1
-.nr fbsd 1
-.nr nbsd 1
-.nr obsd 1
-.nr bsdi 1
-.nr linux 1 \}
-.\
.Sh NAME
-.\
.Nm lmc
.Nd device driver for
.Tn LMC
(and some
.Tn SBE )
wide-area network interface cards
-.\
.Sh SYNOPSIS
-.if \n[allos] .Ss FreeBSD Synopsis
-.if \n[fbsd] \{\
-The driver can be loaded into a kernel at boot-time by adding
-.Bd -unfilled -offset indent -compact
-.Cd if_lmc_load=YES
-.Ed
-to
-.Pa /boot/loader.conf ;
-see
-.Xr loader.conf 5 .
-.Pp
-The driver can be loaded into a running kernel after boot-time with
-.Xr kldload 8 .
-.Bd -unfilled -offset indent -compact
-.Ic kldload if_lmc
-.Ed
-.Ic securelevel
-must be 0 to load modules after boot-time; see
-.Xr init 8 .
-.Pp
-The driver can be built into a kernel by adding the following to
-.Pa /sys/ARCH/conf/YOURKERNEL :
-.Bd -unfilled -offset indent -compact
-.Cd device lmc
-.Cd device sppp
-.Cd device bpf
-.Cd device pf # for altq
-.Cd options ALTQ
-.Cd options ALTQ_HFSC # for altq example
-.Cd options NETGRAPH
-.Cd options DEVICE_POLLING
-.Ed
-.Pp
-The driver can send and receive raw IP packets even if
-neither SPPP nor Netgraph are configured into the kernel.
-.\} \ FreeBSD Synopsis
-.if \n[allos] .Ss NetBSD OpenBSD Synopsis
-.if (\n[nbsd] : \n[obsd]) \{\
This driver is built into the GENERIC kernel so it should just work.
.Pp
The driver can be built into a kernel by adding the following to
.Pa /sys/arch/ARCH/conf/YOURKERNEL :
.Bd -unfilled -offset indent -compact
.Cd lmc* at pci?
-.if \n[nbsd] \{\
.Cd options ALTQ
-.Cd options ALTQ_HFSC # for altq example\}
-.if \n[obsd] \{\
-.Cd option ALTQ
-.Cd option ALTQ_HFSC # for altq example\}
+.Cd options ALTQ_HFSC # for altq example
.Cd pseudo-device sppp
.Cd pseudo-device bpfilter
.Ed
.Pp
The driver can send and receive raw IP packets even if
SPPP is not configured into the kernel.
-.\} \ NetBSD OpenBSD Synopsis
-.if \n[allos] .Ss BSD/OS Synopsis
-.if \n[bsdi] \{\
-The driver can be built into a custom kernel by adding the following to
-.Pa /sys/i386/conf/YOURKERNEL :
-.Bd -unfilled -offset indent -compact
-.Cd lmc* at pci?
-.Cd options PPP
-.Cd options FR
-.Cd options CISCO_HDLC
-.Cd pseudo-device bpfilter 16
-.Ed
-.Pp
-The driver can send and receive raw IP packets even if
-P2P is not configured into the kernel.
-.\} \ BSD/OS Synopsis
-.if \n[allos] .Ss Linux Synopsis
-.if \n[linux] \{\
-Configure the driver and line protocol for your kernel with
-.Bd -unfilled -offset indent -compact
-.Ic make menuconfig
-.Ed
-Navigating through the menus, select this device driver and the
-GenericHDLC layer as loadable kernel modules or built into the kernel:
-.Bd -unfilled -offset indent -compact
-.Ic Device Drivers ---
-.Ic Networking Support ---
-.Ic Wan interfaces ---
-.Ed
-.Pp
-Selecting LanMedia support selects the GenericHDLC and SyncPPP layers:
-.Bd -unfilled -offset indent -compact
-.Ic M LanMedia (and some SBE) WAN card support
-.Ic [*] Use NAPI to
CVS commit: src/crypto/dist/ipsec-tools/src/libipsec
Module Name:src
Committed By: joerg
Date: Wed Oct 14 23:36:55 UTC 2009
Modified Files:
src/crypto/dist/ipsec-tools/src/libipsec: ipsec_set_policy.3
Log Message:
Do not use .Xo/.Xc to workaround ancient groff limits.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 \
src/crypto/dist/ipsec-tools/src/libipsec/ipsec_set_policy.3
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/libipsec/ipsec_set_policy.3
diff -u src/crypto/dist/ipsec-tools/src/libipsec/ipsec_set_policy.3:1.13 src/crypto/dist/ipsec-tools/src/libipsec/ipsec_set_policy.3:1.14
--- src/crypto/dist/ipsec-tools/src/libipsec/ipsec_set_policy.3:1.13 Sat Sep 9 16:22:09 2006
+++ src/crypto/dist/ipsec-tools/src/libipsec/ipsec_set_policy.3 Wed Oct 14 23:36:55 2009
@@ -1,4 +1,4 @@
-.\ $NetBSD: ipsec_set_policy.3,v 1.13 2006/09/09 16:22:09 manu Exp $
+.\ $NetBSD: ipsec_set_policy.3,v 1.14 2009/10/14 23:36:55 joerg Exp $
.\
.\ $KAME: ipsec_set_policy.3,v 1.16 2003/01/06 21:59:03 sumikawa Exp $
.\
@@ -124,14 +124,10 @@
support policy priorities (Linux \*[Gt]= 2.6.6).
It takes one of the following formats:
.Bl -tag -width discard
-.It Xo
-.Ar {priority,prio} offset
-.Xc
+.It Ar {priority,prio} offset
.Ar offset
is an integer in the range -2147483647..214783648.
-.It Xo
-.Ar {priority,prio} base {+,-} offset
-.Xc
+.It Ar {priority,prio} base {+,-} offset
.Ar base
is either
.Li low (-1073741824) ,
@@ -162,12 +158,7 @@
means to bypass the IPsec processing.
.Pq the packet will be transmitted in clear .
This is for privileged sockets.
-.It Xo
-.Ar direction
-.Bq Ar priority specification
-.Li ipsec
-.Ar request ...
-.Xc
+.It Ar direction Bo Ar priority specification Bc Li ipsec Ar request ...
.Li ipsec
means that the matching packets are subject to IPsec processing.
.Li ipsec
@@ -175,16 +166,7 @@
.Ar request
strings, which are formatted as below:
.Bl -tag -width discard
-.It Xo
-.Ar protocol
-.Li /
-.Ar mode
-.Li /
-.Ar src
-.Li -
-.Ar dst
-.Op Ar /level
-.Xc
+.It Ar protocol Li / Ar mode Li / Ar src Li - Ar dst Op Ar /level
.Ar protocol
is either
.Li ah ,
CVS commit: src/crypto/dist/heimdal
Module Name:src Committed By: joerg Date: Wed Oct 14 23:37:34 UTC 2009 Modified Files: src/crypto/dist/heimdal/admin: ktutil.8 src/crypto/dist/heimdal/kadmin: kadmin.8 kadmind.8 src/crypto/dist/heimdal/kcm: kcm.8 src/crypto/dist/heimdal/kdc: hprop.8 hpropd.8 kdc.8 kstash.8 string2key.8 src/crypto/dist/heimdal/kpasswd: kpasswdd.8 src/crypto/dist/heimdal/kuser: kgetcred.1 kimpersonate.1 kinit.1 klist.1 src/crypto/dist/heimdal/lib/kadm5: iprop-log.8 iprop.8 Log Message: Do not work around ancient groff limits with .Xo/.Xc. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/crypto/dist/heimdal/admin/ktutil.8 cvs rdiff -u -r1.9 -r1.10 src/crypto/dist/heimdal/kadmin/kadmin.8 cvs rdiff -u -r1.10 -r1.11 src/crypto/dist/heimdal/kadmin/kadmind.8 cvs rdiff -u -r1.1 -r1.2 src/crypto/dist/heimdal/kcm/kcm.8 cvs rdiff -u -r1.10 -r1.11 src/crypto/dist/heimdal/kdc/hprop.8 \ src/crypto/dist/heimdal/kdc/hpropd.8 cvs rdiff -u -r1.13 -r1.14 src/crypto/dist/heimdal/kdc/kdc.8 cvs rdiff -u -r1.7 -r1.8 src/crypto/dist/heimdal/kdc/kstash.8 \ src/crypto/dist/heimdal/kdc/string2key.8 cvs rdiff -u -r1.8 -r1.9 src/crypto/dist/heimdal/kpasswd/kpasswdd.8 cvs rdiff -u -r1.7 -r1.8 src/crypto/dist/heimdal/kuser/kgetcred.1 cvs rdiff -u -r1.1 -r1.2 src/crypto/dist/heimdal/kuser/kimpersonate.1 cvs rdiff -u -r1.10 -r1.11 src/crypto/dist/heimdal/kuser/kinit.1 \ src/crypto/dist/heimdal/kuser/klist.1 cvs rdiff -u -r1.1 -r1.2 src/crypto/dist/heimdal/lib/kadm5/iprop-log.8 \ src/crypto/dist/heimdal/lib/kadm5/iprop.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/dist/heimdal/admin/ktutil.8 diff -u src/crypto/dist/heimdal/admin/ktutil.8:1.8 src/crypto/dist/heimdal/admin/ktutil.8:1.9 --- src/crypto/dist/heimdal/admin/ktutil.8:1.8 Sat Mar 22 08:36:49 2008 +++ src/crypto/dist/heimdal/admin/ktutil.8 Wed Oct 14 23:37:33 2009 @@ -30,7 +30,7 @@ .\ SUCH DAMAGE. .\ .\ $Heimdal: ktutil.8 14792 2005-04-14 16:43:57Z lha $ -.\ $NetBSD: ktutil.8,v 1.8 2008/03/22 08:36:49 mlelstv Exp $ +.\ $NetBSD: ktutil.8,v 1.9 2009/10/14 23:37:33 joerg Exp $ .\ .Dd April 14, 2005 .Dt KTUTIL 8 @@ -54,72 +54,43 @@ is a program for managing keytabs. Supported options: .Bl -tag -width Ds -.It Xo -.Fl v , -.Fl -verbose -.Xc +.It Fl v , Fl -verbose Verbose output. .El .Pp .Ar command can be one of the following: -.Bl -tag -width srvconvert -.It add Xo -.Op Fl p Ar principal -.Op Fl -principal= Ns Ar principal -.Op Fl V Ar kvno -.Op Fl -kvno= Ns Ar kvno -.Op Fl e Ar enctype -.Op Fl -enctype= Ns Ar enctype -.Op Fl w Ar password -.Op Fl -password= Ns Ar password -.Op Fl r -.Op Fl -random -.Op Fl s -.Op Fl -no-salt -.Op Fl H -.Op Fl -hex -.Xc +.Bl -tag -width srvconvert -width srvconvert +.It add Oo Fl p Ar principal Oc Oo Fl -principal= Ns Ar principal Oc \ +Oo Fl V Ar kvno Oc Oo Fl -kvno= Ns Ar kvno Oc Oo Fl e Ar enctype Oc \ +Oo Fl -enctype= Ns Ar enctype Oc Oo Fl w Ar password Oc \ +Oo Fl -password= Ns Ar password Oc Oo Fl r Oc Oo Fl -random Oc \ +Oo Fl s Oc Oo Fl -no-salt Oc Oo Fl H Oc Op Fl -hex Adds a key to the keytab. Options that are not specified will be prompted for. This requires that you know the password or the hex key of the principal to add; if what you really want is to add a new principal to the keytab, you should consider the .Ar get command, which talks to the kadmin server. -.It change Xo -.Op Fl r Ar realm -.Op Fl -realm= Ns Ar realm -.Op Fl -a Ar host -.Op Fl -admin-server= Ns Ar host -.Op Fl -s Ar port -.Op Fl -server-port= Ns Ar port -.Xc +.It change Oo Fl r Ar realm Oc Oo Fl -realm= Ns Ar realm Oc \ +Oo Fl -a Ar host Oc Oo Fl -admin-server= Ns Ar host Oc \ +Oo Fl -s Ar port Oc Op Fl -server-port= Ns Ar port Update one or several keys to new versions. By default, use the admin server for the realm of a keytab entry. Otherwise it will use the values specified by the options. .Pp If no principals are given, all the ones in the keytab are updated. -.It copy Xo -.Ar keytab-src -.Ar keytab-dest -.Xc +.It copy Ar keytab-src Ar keytab-dest Copies all the entries from .Ar keytab-src to .Ar keytab-dest . -.It get Xo -.Op Fl p Ar admin principal -.Op Fl -principal= Ns Ar admin principal -.Op Fl e Ar enctype -.Op Fl -enctypes= Ns Ar enctype -.Op Fl r Ar realm -.Op Fl -realm= Ns Ar realm -.Op Fl a Ar admin server -.Op Fl -admin-server= Ns Ar admin server -.Op Fl s Ar server port -.Op Fl -server-port= Ns Ar server port -.Ar principal ... -.Xc +.It get Oo Fl p Ar admin principal Oc \ +Oo Fl -principal= Ns Ar admin principal Oc Oo Fl e Ar enctype Oc \ +Oo Fl -enctypes= Ns Ar enctype Oc Oo Fl r Ar realm Oc \ +Oo Fl -realm= Ns Ar realm Oc Oo Fl a Ar admin server Oc \ +Oo Fl -admin-server= Ns Ar admin server Oc Oo Fl s Ar server port Oc \ +Oo Fl -server-port= Ns Ar server port Oc Ar principal ... For each .Ar principal ,
CVS commit: src/share/man/man5
Module Name:src Committed By: joerg Date: Wed Oct 14 23:40:05 UTC 2009 Modified Files: src/share/man/man5: login.conf.5 Log Message: Fix and improve markup. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/share/man/man5/login.conf.5 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/man5/login.conf.5 diff -u src/share/man/man5/login.conf.5:1.22 src/share/man/man5/login.conf.5:1.23 --- src/share/man/man5/login.conf.5:1.22 Tue Nov 18 13:04:04 2008 +++ src/share/man/man5/login.conf.5 Wed Oct 14 23:40:05 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: login.conf.5,v 1.22 2008/11/18 13:04:04 reed Exp $ +.\ $NetBSD: login.conf.5,v 1.23 2009/10/14 23:40:05 joerg Exp $ .\ .\ Copyright (c) 1995,1996,1997 Berkeley Software Design, Inc. .\ All rights reserved. @@ -83,7 +83,7 @@ from the value. The types are described after the capability table. .Bl -column minpasswordlen program default -.Sy Name Type Default Description +.It Sy Name Type Default Description .\ .sp .It Sy copyright Ta file Ta Ta @@ -116,7 +116,7 @@ by .Sq Li \! . Patterns can contain the -.Xr sh 1 -style +.Xr sh 1 Ns -style .Sq Li * and .Sq Li \?
CVS commit: src/share/man/man8
Module Name:src Committed By: joerg Date: Wed Oct 14 23:49:50 UTC 2009 Modified Files: src/share/man/man8: compat_sunos.8 Log Message: Simplify markup. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/share/man/man8/compat_sunos.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/compat_sunos.8 diff -u src/share/man/man8/compat_sunos.8:1.18 src/share/man/man8/compat_sunos.8:1.19 --- src/share/man/man8/compat_sunos.8:1.18 Wed Dec 10 12:06:25 2003 +++ src/share/man/man8/compat_sunos.8 Wed Oct 14 23:49:50 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: compat_sunos.8,v 1.18 2003/12/10 12:06:25 agc Exp $ +.\ $NetBSD: compat_sunos.8,v 1.19 2009/10/14 23:49:50 joerg Exp $ .\ .\ Copyright (c) 1984 Theo de Raadt .\ All rights reserved. @@ -60,26 +60,20 @@ On your .Nx machine, do the following: -.Pp -.Bl -enum -offset 123 -compact +.Bl -enum -offset 123 .It .Li mkdir -p /emul/sunos/usr/lib /emul/sunos/usr/5lib -.fi -.Pp .It .Li cp SunOS:/usr/lib/lib*.so.*.* NetBSD:/emul/sunos/usr/lib -.Pp .It .Li cp SunOS:/usr/5lib/lib*.so.*.* NetBSD:/emul/sunos/usr/5lib -.Pp .It .Li cp SunOS:/usr/lib/ld.so NetBSD:/emul/sunos/usr/lib/ld.so -.Pp .It If you ever expect to use YP, you will want to create a link: -.nf -.Li ln -s /var/run/ypbind.lock /etc/ypbind.lock -.fi +.Bd -literal -compact +ln -s /var/run/ypbind.lock /etc/ypbind.lock +.Ed .El .Pp Alternatively, you can use an NFS mount to accomplish the same @@ -87,15 +81,11 @@ On your .Nx machine, do the following: -.Pp -.Bl -enum -offset 123 -compact -.Pp +.Bl -enum -offset 123 .It .Li mkdir -p /emul/sunos/usr -.Pp .It .Li mount SunOS:/usr /emul/sunos/usr -.fi .El .Pp This will place the
CVS commit: src/share/examples/rump/wirelessconf
Module Name:src
Committed By: pooka
Date: Wed Oct 14 23:51:22 UTC 2009
Modified Files:
src/share/examples/rump/wirelessconf: Makefile wirelessconf.c
Log Message:
WARNS + make compile
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/share/examples/rump/wirelessconf/Makefile \
src/share/examples/rump/wirelessconf/wirelessconf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/examples/rump/wirelessconf/Makefile
diff -u src/share/examples/rump/wirelessconf/Makefile:1.1 src/share/examples/rump/wirelessconf/Makefile:1.2
--- src/share/examples/rump/wirelessconf/Makefile:1.1 Mon Oct 5 13:07:28 2009
+++ src/share/examples/rump/wirelessconf/Makefile Wed Oct 14 23:51:22 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2009/10/05 13:07:28 pooka Exp $
+# $NetBSD: Makefile,v 1.2 2009/10/14 23:51:22 pooka Exp $
#
PROG= wirelessconf
@@ -11,5 +11,6 @@
DBG= -g
NOMAN=
+WARNS= 4
.include bsd.prog.mk
Index: src/share/examples/rump/wirelessconf/wirelessconf.c
diff -u src/share/examples/rump/wirelessconf/wirelessconf.c:1.1 src/share/examples/rump/wirelessconf/wirelessconf.c:1.2
--- src/share/examples/rump/wirelessconf/wirelessconf.c:1.1 Mon Oct 5 13:07:28 2009
+++ src/share/examples/rump/wirelessconf/wirelessconf.c Wed Oct 14 23:51:22 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: wirelessconf.c,v 1.1 2009/10/05 13:07:28 pooka Exp $ */
+/* $NetBSD: wirelessconf.c,v 1.2 2009/10/14 23:51:22 pooka Exp $ */
/*
* Copyright (c) 2009 Antti Kantee. All Rights Reserved.
@@ -46,7 +46,7 @@
#define RUMFW /libdata/firmware/rum/rum-rt2573
int
-main()
+main(void)
{
extern int rumpns_boothowto;
struct ifreq ifr;
@@ -57,7 +57,7 @@
printf(\ndevice autoconfiguration finished\n);
printf(tira-if-su ...\n);
- if (rump_etfs_register(RUMFW, RUMFW, RUMP_ETFS_REG) != 0)
+ if (rump_pub_etfs_register(RUMFW, RUMFW, RUMP_ETFS_REG) != 0)
errx(1, firmware etfs registration failed);
/* rum? shouldn't that be marsala? */
CVS commit: src/share/examples/rump/sdread
Module Name:src Committed By: pooka Date: Wed Oct 14 23:51:52 UTC 2009 Modified Files: src/share/examples/rump/sdread: Makefile Log Message: WARNS To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/share/examples/rump/sdread/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/examples/rump/sdread/Makefile diff -u src/share/examples/rump/sdread/Makefile:1.2 src/share/examples/rump/sdread/Makefile:1.3 --- src/share/examples/rump/sdread/Makefile:1.2 Tue Oct 13 18:41:06 2009 +++ src/share/examples/rump/sdread/Makefile Wed Oct 14 23:51:52 2009 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2009/10/13 18:41:06 pooka Exp $ +# $NetBSD: Makefile,v 1.3 2009/10/14 23:51:52 pooka Exp $ # PROG= sdread @@ -10,5 +10,6 @@ DBG= -g NOMAN= +WARNS= 4 .include bsd.prog.mk
CVS commit: src/share/man/man9
Module Name:src Committed By: joerg Date: Wed Oct 14 23:55:26 UTC 2009 Modified Files: src/share/man/man9: callback.9 Log Message: Fix markup. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/share/man/man9/callback.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/callback.9 diff -u src/share/man/man9/callback.9:1.1 src/share/man/man9/callback.9:1.2 --- src/share/man/man9/callback.9:1.1 Mon Oct 5 23:44:10 2009 +++ src/share/man/man9/callback.9 Wed Oct 14 23:55:26 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: callback.9,v 1.1 2009/10/05 23:44:10 rmind Exp $ +.\ $NetBSD: callback.9,v 1.2 2009/10/14 23:55:26 joerg Exp $ .\ .\ Copyright (c) 2009 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -104,6 +104,7 @@ The value of .Fa arg will be passed to the callback functions. +.El .Sh CODE REFERENCES This section describes places within the .Nx
CVS commit: src/crypto/dist/heimdal/admin
Module Name:src Committed By: joerg Date: Thu Oct 15 00:07:45 UTC 2009 Modified Files: src/crypto/dist/heimdal/admin: ktutil.8 Log Message: Fix redundancy. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/crypto/dist/heimdal/admin/ktutil.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/dist/heimdal/admin/ktutil.8 diff -u src/crypto/dist/heimdal/admin/ktutil.8:1.9 src/crypto/dist/heimdal/admin/ktutil.8:1.10 --- src/crypto/dist/heimdal/admin/ktutil.8:1.9 Wed Oct 14 23:37:33 2009 +++ src/crypto/dist/heimdal/admin/ktutil.8 Thu Oct 15 00:07:45 2009 @@ -30,7 +30,7 @@ .\ SUCH DAMAGE. .\ .\ $Heimdal: ktutil.8 14792 2005-04-14 16:43:57Z lha $ -.\ $NetBSD: ktutil.8,v 1.9 2009/10/14 23:37:33 joerg Exp $ +.\ $NetBSD: ktutil.8,v 1.10 2009/10/15 00:07:45 joerg Exp $ .\ .Dd April 14, 2005 .Dt KTUTIL 8 @@ -60,7 +60,7 @@ .Pp .Ar command can be one of the following: -.Bl -tag -width srvconvert -width srvconvert +.Bl -tag -width srvconvert .It add Oo Fl p Ar principal Oc Oo Fl -principal= Ns Ar principal Oc \ Oo Fl V Ar kvno Oc Oo Fl -kvno= Ns Ar kvno Oc Oo Fl e Ar enctype Oc \ Oo Fl -enctype= Ns Ar enctype Oc Oo Fl w Ar password Oc \
CVS commit: src/dist/ipf/man
Module Name:src Committed By: joerg Date: Thu Oct 15 00:16:29 UTC 2009 Modified Files: src/dist/ipf/man: ipfilter.4 ipmon.5 ippool.5 Log Message: Fix markup. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 src/dist/ipf/man/ipfilter.4 \ src/dist/ipf/man/ipmon.5 cvs rdiff -u -r1.2 -r1.3 src/dist/ipf/man/ippool.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/dist/ipf/man/ipfilter.4 diff -u src/dist/ipf/man/ipfilter.4:1.1.1.1 src/dist/ipf/man/ipfilter.4:1.2 --- src/dist/ipf/man/ipfilter.4:1.1.1.1 Sun Mar 28 08:56:21 2004 +++ src/dist/ipf/man/ipfilter.4 Thu Oct 15 00:16:28 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: ipfilter.4,v 1.1.1.1 2004/03/28 08:56:21 martti Exp $ +.\ $NetBSD: ipfilter.4,v 1.2 2009/10/15 00:16:28 joerg Exp $ .\ .TH IP\ FILTER 4 .SH NAME @@ -78,7 +78,7 @@ packets (and bytes!) used for accounting .IP packets passed -.lP +.IP packets logged .IP attempts to log which failed (buffer full) Index: src/dist/ipf/man/ipmon.5 diff -u src/dist/ipf/man/ipmon.5:1.1.1.1 src/dist/ipf/man/ipmon.5:1.2 --- src/dist/ipf/man/ipmon.5:1.1.1.1 Sun Mar 28 08:56:23 2004 +++ src/dist/ipf/man/ipmon.5 Thu Oct 15 00:16:28 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: ipmon.5,v 1.1.1.1 2004/03/28 08:56:23 martti Exp $ +.\ $NetBSD: ipmon.5,v 1.2 2009/10/15 00:16:28 joerg Exp $ .\ .TH IPMON 5 .SH NAME @@ -40,7 +40,6 @@ .fi .PP In addition, lines that start with a # are considered to be comments. -.TP .SH OVERVIEW .PP The ipmon configuration file is used for defining rules to be executed when Index: src/dist/ipf/man/ippool.5 diff -u src/dist/ipf/man/ippool.5:1.2 src/dist/ipf/man/ippool.5:1.3 --- src/dist/ipf/man/ippool.5:1.2 Thu Apr 20 08:37:33 2006 +++ src/dist/ipf/man/ippool.5 Thu Oct 15 00:16:29 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: ippool.5,v 1.2 2006/04/20 08:37:33 pavel Exp $ +.\ $NetBSD: ippool.5,v 1.3 2009/10/15 00:16:29 joerg Exp $ .\ .TH IPPOOL 5 .SH NAME @@ -57,7 +57,6 @@ of a mixture of netmask sizes, from 0 to 32. .PP At this point in time, only IPv4 addressing is supported. -.TP .SH OVERVIEW .PP The IP pool configuration file provides for defining two different mechanisms
CVS commit: src/sys/rump/librump
Module Name:src
Committed By: pooka
Date: Thu Oct 15 00:28:47 UTC 2009
Modified Files:
src/sys/rump/librump/rumpkern: Makefile.rumpkern emul.c locks.c
ltsleep.c misc_stub.c percpu.c rump.c rump_private.h
src/sys/rump/librump/rumpkern/arch/i386: rumpcpu.c
src/sys/rump/librump/rumpuser: rumpuser_int.h rumpuser_pth.c
Added Files:
src/sys/rump/librump/rumpkern: scheduler.c
Log Message:
Add initial work on a rump virtual cpu scheduler. This is necessary
for kernel code which has been written to avoid MP contention by
using cpu-local storage (most prominently, select and pool_cache).
Instead of always assuming rump_cpu, the scheduler must now be run
(and unrun) on all entry points into rump. Likewise, rumpuser
unruns and re-runs the scheduler around each potentially blocking
operation. As an optimization, I modified some locking primitives
to try to get the lock without blocking before releasing the cpu.
Also, ltsleep was modified to assume that it is never called without
the biglock held and made to use the biglock as the sleep interlock.
Otherwise there is just too much drama with deadlocks. If some
kernel code wants to call ltsleep without the biglock, then, *snif*,
it's no longer supported and rump and should be modified to support
newstyle locks anyway.
To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/sys/rump/librump/rumpkern/Makefile.rumpkern
cvs rdiff -u -r1.100 -r1.101 src/sys/rump/librump/rumpkern/emul.c
cvs rdiff -u -r1.28 -r1.29 src/sys/rump/librump/rumpkern/locks.c
cvs rdiff -u -r1.18 -r1.19 src/sys/rump/librump/rumpkern/ltsleep.c
cvs rdiff -u -r1.23 -r1.24 src/sys/rump/librump/rumpkern/misc_stub.c
cvs rdiff -u -r1.5 -r1.6 src/sys/rump/librump/rumpkern/percpu.c
cvs rdiff -u -r1.123 -r1.124 src/sys/rump/librump/rumpkern/rump.c
cvs rdiff -u -r1.30 -r1.31 src/sys/rump/librump/rumpkern/rump_private.h
cvs rdiff -u -r0 -r1.1 src/sys/rump/librump/rumpkern/scheduler.c
cvs rdiff -u -r1.5 -r1.6 src/sys/rump/librump/rumpkern/arch/i386/rumpcpu.c
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/librump/rumpuser/rumpuser_int.h
cvs rdiff -u -r1.35 -r1.36 src/sys/rump/librump/rumpuser/rumpuser_pth.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/rump/librump/rumpkern/Makefile.rumpkern
diff -u src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.51 src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.52
--- src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.51 Wed Oct 14 17:29:19 2009
+++ src/sys/rump/librump/rumpkern/Makefile.rumpkern Thu Oct 15 00:28:46 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rumpkern,v 1.51 2009/10/14 17:29:19 pooka Exp $
+# $NetBSD: Makefile.rumpkern,v 1.52 2009/10/15 00:28:46 pooka Exp $
#
.include ${RUMPTOP}/Makefile.rump
@@ -15,7 +15,7 @@
# Source modules, first the ones specifically implemented for librump.
#
SRCS= rump.c emul.c intr.c locks.c ltsleep.c percpu.c pool.c \
- sleepq.c sysproxy_socket.c vm.c
+ scheduler.c sleepq.c sysproxy_socket.c vm.c
SRCS+= rumpkern_if_wrappers.c
@@ -71,8 +71,9 @@
#
# If archdir exists, it is required to provide:
# 1) kobj_reloc() and kobj_machdep()
-# 2) ...?
-# 3) PROFIT!
+# 2) rump_cpu_bootstrap()
+# 3) ...?
+# 4) PROFIT!
#
#
@@ -90,7 +91,7 @@
.include ${ARCHDIR}/Makefile.inc
.PATH: ${ARCHDIR}
.else
-SRCS+= kobj_stubs.c
+SRCS+= kobj_stubs.c rumpcpu_generic.c
.endif
# include libkern source files
Index: src/sys/rump/librump/rumpkern/emul.c
diff -u src/sys/rump/librump/rumpkern/emul.c:1.100 src/sys/rump/librump/rumpkern/emul.c:1.101
--- src/sys/rump/librump/rumpkern/emul.c:1.100 Wed Oct 14 18:18:53 2009
+++ src/sys/rump/librump/rumpkern/emul.c Thu Oct 15 00:28:46 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: emul.c,v 1.100 2009/10/14 18:18:53 pooka Exp $ */
+/* $NetBSD: emul.c,v 1.101 2009/10/15 00:28:46 pooka Exp $ */
/*
* Copyright (c) 2007 Antti Kantee. All Rights Reserved.
@@ -28,7 +28,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: emul.c,v 1.100 2009/10/14 18:18:53 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: emul.c,v 1.101 2009/10/15 00:28:46 pooka Exp $);
#include sys/param.h
#include sys/malloc.h
@@ -73,7 +73,6 @@
dev_t rootdev;
int physmem = 256*256; /* 256 * 1024*1024 / 4k, PAGE_SIZE not always set */
int doing_shutdown;
-int ncpu = 1;
const int schedppq = 1;
int hardclock_ticks;
bool mp_online = false;
@@ -370,14 +369,18 @@
void (*f)(void *);
void *thrarg;
+ /* schedule ourselves first */
f = k-f;
thrarg = k-arg;
rumpuser_set_curlwp(k-mylwp);
- kmem_free(k, sizeof(struct kthdesc));
+ rump_schedule();
+ kmem_free(k, sizeof(struct kthdesc));
if ((curlwp-l_pflag LP_MPSAFE) == 0)
KERNEL_LOCK(1, NULL);
+
f(thrarg);
+
panic(unreachable, should kthread_exit());
}
@@ -458,6 +461,7 @@
if ((curlwp-l_pflag LP_MPSAFE) == 0)
KERNEL_UNLOCK_ONE(NULL);
rump_clear_curlwp();
+ rump_unschedule();
rumpuser_thread_exit();
CVS commit: src/sys/rump/librump
Module Name:src
Committed By: pooka
Date: Thu Oct 15 00:29:19 UTC 2009
Modified Files:
src/sys/rump/librump: makerumpif.sh
Log Message:
Generate scheduling points in rump_pub calls.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/librump/makerumpif.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/librump/makerumpif.sh
diff -u src/sys/rump/librump/makerumpif.sh:1.3 src/sys/rump/librump/makerumpif.sh:1.4
--- src/sys/rump/librump/makerumpif.sh:1.3 Wed Oct 14 18:14:48 2009
+++ src/sys/rump/librump/makerumpif.sh Thu Oct 15 00:29:19 2009
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: makerumpif.sh,v 1.3 2009/10/14 18:14:48 pooka Exp $
+# $NetBSD: makerumpif.sh,v 1.4 2009/10/15 00:29:19 pooka Exp $
#
# Copyright (c) 2009 Antti Kantee. All rights reserved.
#
@@ -67,9 +67,9 @@
' ${1} | awk -F\| -v rumptop=${RUMPTOP} '
function fileheaders(file, srcstr)
{
- printf(/*\t$NetBSD: makerumpif.sh,v 1.3 2009/10/14 18:14:48 pooka Exp $\t*/\n\n) file
+ printf(/*\t$NetBSD: makerumpif.sh,v 1.4 2009/10/15 00:29:19 pooka Exp $\t*/\n\n) file
printf(/*\n * Automatically generated. DO NOT EDIT.\n) file
- genstr = $NetBSD: makerumpif.sh,v 1.3 2009/10/14 18:14:48 pooka Exp $
+ genstr = $NetBSD: makerumpif.sh,v 1.4 2009/10/15 00:29:19 pooka Exp $
gsub(\\$, , genstr)
printf( * from: %s\n, srcstr) file
printf( * by: %s\n, genstr) file
@@ -138,6 +138,7 @@
printf(#include sys/systm.h\n) gencalls
printf(\n#include rump/rump.h\n) gencalls
printf(#include rump/%s\n\n, pubfile) gencalls
+ printf(#include \rump_private.h\\n, privfile) gencalls
printf(#include \%s\\n\n, privfile) gencalls
printf(void __dead rump_%s_unavailable(void);\n, \
myname) gencalls
@@ -187,7 +188,7 @@
if (!voidret) {
printf(\t%s rv;\n, funtype) gencalls
}
- printf(\n\t) gencalls
+ printf(\n\trump_schedule();\n\t) gencalls
if (!voidret)
printf(rv = ) gencalls
printf(rump_%s(, funname) gencalls
@@ -196,7 +197,7 @@
if (i narg)
printf(, ) gencalls
}
- printf();\n) gencalls
+ printf();\n\trump_unschedule();\n) gencalls
if (!voidret)
printf(\n\treturn rv;\n) gencalls
printf(}\n) gencalls
CVS commit: src/sys/kern
Module Name:src
Committed By: pooka
Date: Thu Oct 15 00:29:40 UTC 2009
Modified Files:
src/sys/kern: vnode_if.sh
Log Message:
Generate scheduling points around rump vnode operations.
To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/sys/kern/vnode_if.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/vnode_if.sh
diff -u src/sys/kern/vnode_if.sh:1.52 src/sys/kern/vnode_if.sh:1.53
--- src/sys/kern/vnode_if.sh:1.52 Tue Sep 29 11:51:02 2009
+++ src/sys/kern/vnode_if.sh Thu Oct 15 00:29:40 2009
@@ -29,7 +29,7 @@
* SUCH DAMAGE.
*/
-SCRIPT_ID='$NetBSD: vnode_if.sh,v 1.52 2009/09/29 11:51:02 pooka Exp $'
+SCRIPT_ID='$NetBSD: vnode_if.sh,v 1.53 2009/10/15 00:29:40 pooka Exp $'
# Script to produce VFS front-end sugar.
#
@@ -294,7 +294,8 @@
#include sys/buf.h
#include sys/vnode.h
#include sys/lock.h'
-[ ! -z ${rump} ] echo '#include rump/rumpvnode_if.h'
+[ ! -z ${rump} ] echo '#include rump/rumpvnode_if.h' \
+ echo '#include rump_private.h'
echo
const struct vnodeop_desc ${rump}vop_default_desc = {
@@ -402,10 +403,14 @@
}
}
printf(\tmpsafe = (%s%s-v_vflag VV_MPSAFE);\n, argname[0], arg0special);
+ if (rump)
+ printf(\trump_schedule();\n);
printf(\tif (!mpsafe) { KERNEL_LOCK(1, curlwp); }\n);
printf(\terror = (VCALL(%s%s, VOFFSET(%s), a));\n,
argname[0], arg0special, name);
printf(\tif (!mpsafe) { KERNEL_UNLOCK_ONE(curlwp); }\n);
+ if (rump)
+ printf(\trump_unschedule();\n);
if (willmake != -1) {
printf(#ifdef DIAGNOSTIC\n);
printf(\tif (error == 0)\n\
CVS commit: src/sys/rump
Module Name:src Committed By: pooka Date: Thu Oct 15 00:31:25 UTC 2009 Modified Files: src/sys/rump/include/rump: rumpkern_if_pub.h rumpnet_if_pub.h rumpvfs_if_pub.h src/sys/rump/librump/rumpkern: rumpkern_if_priv.h rumpkern_if_wrappers.c src/sys/rump/librump/rumpnet: rumpnet_if_priv.h rumpnet_if_wrappers.c src/sys/rump/librump/rumpvfs: rumpvfs_if_priv.h rumpvfs_if_wrappers.c Log Message: regen: scheduling points in rump_pub wrappers To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/rump/include/rump/rumpkern_if_pub.h \ src/sys/rump/include/rump/rumpnet_if_pub.h \ src/sys/rump/include/rump/rumpvfs_if_pub.h cvs rdiff -u -r1.2 -r1.3 src/sys/rump/librump/rumpkern/rumpkern_if_priv.h \ src/sys/rump/librump/rumpkern/rumpkern_if_wrappers.c cvs rdiff -u -r1.2 -r1.3 src/sys/rump/librump/rumpnet/rumpnet_if_priv.h \ src/sys/rump/librump/rumpnet/rumpnet_if_wrappers.c cvs rdiff -u -r1.2 -r1.3 src/sys/rump/librump/rumpvfs/rumpvfs_if_priv.h \ src/sys/rump/librump/rumpvfs/rumpvfs_if_wrappers.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/rump/include/rump/rumpkern_if_pub.h diff -u src/sys/rump/include/rump/rumpkern_if_pub.h:1.2 src/sys/rump/include/rump/rumpkern_if_pub.h:1.3 --- src/sys/rump/include/rump/rumpkern_if_pub.h:1.2 Wed Oct 14 18:16:41 2009 +++ src/sys/rump/include/rump/rumpkern_if_pub.h Thu Oct 15 00:31:25 2009 @@ -1,9 +1,9 @@ -/* $NetBSD: rumpkern_if_pub.h,v 1.2 2009/10/14 18:16:41 pooka Exp $ */ +/* $NetBSD: rumpkern_if_pub.h,v 1.3 2009/10/15 00:31:25 pooka Exp $ */ /* * Automatically generated. DO NOT EDIT. * from: NetBSD: rumpkern.ifspec,v 1.1 2009/10/14 17:17:00 pooka Exp - * by: NetBSD: makerumpif.sh,v 1.3 2009/10/14 18:14:48 pooka Exp + * by: NetBSD: makerumpif.sh,v 1.4 2009/10/15 00:29:19 pooka Exp */ void rump_pub_reboot(int); Index: src/sys/rump/include/rump/rumpnet_if_pub.h diff -u src/sys/rump/include/rump/rumpnet_if_pub.h:1.2 src/sys/rump/include/rump/rumpnet_if_pub.h:1.3 --- src/sys/rump/include/rump/rumpnet_if_pub.h:1.2 Wed Oct 14 18:16:41 2009 +++ src/sys/rump/include/rump/rumpnet_if_pub.h Thu Oct 15 00:31:25 2009 @@ -1,9 +1,9 @@ -/* $NetBSD: rumpnet_if_pub.h,v 1.2 2009/10/14 18:16:41 pooka Exp $ */ +/* $NetBSD: rumpnet_if_pub.h,v 1.3 2009/10/15 00:31:25 pooka Exp $ */ /* * Automatically generated. DO NOT EDIT. * from: NetBSD: rumpnet.ifspec,v 1.1 2009/10/14 17:17:00 pooka Exp - * by: NetBSD: makerumpif.sh,v 1.3 2009/10/14 18:14:48 pooka Exp + * by: NetBSD: makerumpif.sh,v 1.4 2009/10/15 00:29:19 pooka Exp */ int rump_pub_virtif_create(int); Index: src/sys/rump/include/rump/rumpvfs_if_pub.h diff -u src/sys/rump/include/rump/rumpvfs_if_pub.h:1.2 src/sys/rump/include/rump/rumpvfs_if_pub.h:1.3 --- src/sys/rump/include/rump/rumpvfs_if_pub.h:1.2 Wed Oct 14 18:16:41 2009 +++ src/sys/rump/include/rump/rumpvfs_if_pub.h Thu Oct 15 00:31:25 2009 @@ -1,9 +1,9 @@ -/* $NetBSD: rumpvfs_if_pub.h,v 1.2 2009/10/14 18:16:41 pooka Exp $ */ +/* $NetBSD: rumpvfs_if_pub.h,v 1.3 2009/10/15 00:31:25 pooka Exp $ */ /* * Automatically generated. DO NOT EDIT. * from: NetBSD: rumpvfs.ifspec,v 1.1 2009/10/14 17:17:00 pooka Exp - * by: NetBSD: makerumpif.sh,v 1.3 2009/10/14 18:14:48 pooka Exp + * by: NetBSD: makerumpif.sh,v 1.4 2009/10/15 00:29:19 pooka Exp */ void rump_pub_getvninfo(struct vnode *, enum vtype *, off_t *, dev_t *); Index: src/sys/rump/librump/rumpkern/rumpkern_if_priv.h diff -u src/sys/rump/librump/rumpkern/rumpkern_if_priv.h:1.2 src/sys/rump/librump/rumpkern/rumpkern_if_priv.h:1.3 --- src/sys/rump/librump/rumpkern/rumpkern_if_priv.h:1.2 Wed Oct 14 18:16:41 2009 +++ src/sys/rump/librump/rumpkern/rumpkern_if_priv.h Thu Oct 15 00:31:25 2009 @@ -1,9 +1,9 @@ -/* $NetBSD: rumpkern_if_priv.h,v 1.2 2009/10/14 18:16:41 pooka Exp $ */ +/* $NetBSD: rumpkern_if_priv.h,v 1.3 2009/10/15 00:31:25 pooka Exp $ */ /* * Automatically generated. DO NOT EDIT. * from: NetBSD: rumpkern.ifspec,v 1.1 2009/10/14 17:17:00 pooka Exp - * by: NetBSD: makerumpif.sh,v 1.3 2009/10/14 18:14:48 pooka Exp + * by: NetBSD: makerumpif.sh,v 1.4 2009/10/15 00:29:19 pooka Exp */ void rump_reboot(int); Index: src/sys/rump/librump/rumpkern/rumpkern_if_wrappers.c diff -u src/sys/rump/librump/rumpkern/rumpkern_if_wrappers.c:1.2 src/sys/rump/librump/rumpkern/rumpkern_if_wrappers.c:1.3 --- src/sys/rump/librump/rumpkern/rumpkern_if_wrappers.c:1.2 Wed Oct 14 18:16:41 2009 +++ src/sys/rump/librump/rumpkern/rumpkern_if_wrappers.c Thu Oct 15 00:31:25 2009 @@ -1,9 +1,9 @@ -/* $NetBSD: rumpkern_if_wrappers.c,v 1.2 2009/10/14 18:16:41 pooka Exp $ */ +/* $NetBSD: rumpkern_if_wrappers.c,v 1.3 2009/10/15 00:31:25 pooka Exp $ */ /* * Automatically generated. DO NOT EDIT. * from: NetBSD: rumpkern.ifspec,v 1.1 2009/10/14 17:17:00 pooka Exp - * by: NetBSD:
CVS commit: src/sys/rump
Module Name:src
Committed By: pooka
Date: Thu Oct 15 00:32:11 UTC 2009
Modified Files:
src/sys/rump/include/rump: rumpvnode_if.h
src/sys/rump/librump/rumpvfs: rumpvnode_if.c
Log Message:
regen: scheduling points
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/include/rump/rumpvnode_if.h
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/librump/rumpvfs/rumpvnode_if.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/rump/include/rump/rumpvnode_if.h
diff -u src/sys/rump/include/rump/rumpvnode_if.h:1.3 src/sys/rump/include/rump/rumpvnode_if.h:1.4
--- src/sys/rump/include/rump/rumpvnode_if.h:1.3 Tue Sep 29 11:54:52 2009
+++ src/sys/rump/include/rump/rumpvnode_if.h Thu Oct 15 00:32:11 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpvnode_if.h,v 1.3 2009/09/29 11:54:52 pooka Exp $ */
+/* $NetBSD: rumpvnode_if.h,v 1.4 2009/10/15 00:32:11 pooka Exp $ */
/*
* Warning: DO NOT EDIT! This file is automatically generated!
@@ -7,7 +7,7 @@
* Created from the file:
* NetBSD: vnode_if.src,v 1.58 2008/11/15 19:08:12 pooka Exp
* by the script:
- * NetBSD: vnode_if.sh,v 1.52 2009/09/29 11:51:02 pooka Exp
+ * NetBSD: vnode_if.sh,v 1.53 2009/10/15 00:29:40 pooka Exp
*/
/*
Index: src/sys/rump/librump/rumpvfs/rumpvnode_if.c
diff -u src/sys/rump/librump/rumpvfs/rumpvnode_if.c:1.2 src/sys/rump/librump/rumpvfs/rumpvnode_if.c:1.3
--- src/sys/rump/librump/rumpvfs/rumpvnode_if.c:1.2 Tue Sep 29 11:54:52 2009
+++ src/sys/rump/librump/rumpvfs/rumpvnode_if.c Thu Oct 15 00:32:11 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpvnode_if.c,v 1.2 2009/09/29 11:54:52 pooka Exp $ */
+/* $NetBSD: rumpvnode_if.c,v 1.3 2009/10/15 00:32:11 pooka Exp $ */
/*
* Warning: DO NOT EDIT! This file is automatically generated!
@@ -7,7 +7,7 @@
* Created from the file:
* NetBSD: vnode_if.src,v 1.58 2008/11/15 19:08:12 pooka Exp
* by the script:
- * NetBSD: vnode_if.sh,v 1.52 2009/09/29 11:51:02 pooka Exp
+ * NetBSD: vnode_if.sh,v 1.53 2009/10/15 00:29:40 pooka Exp
*/
/*
@@ -40,7 +40,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rumpvnode_if.c,v 1.2 2009/09/29 11:54:52 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: rumpvnode_if.c,v 1.3 2009/10/15 00:32:11 pooka Exp $);
#include sys/param.h
#include sys/mount.h
@@ -48,6 +48,7 @@
#include sys/vnode.h
#include sys/lock.h
#include rump/rumpvnode_if.h
+#include rump_private.h
const struct vnodeop_desc rump_vop_default_desc = {
0,
@@ -85,9 +86,11 @@
a.a_desc = VDESC(rump_vop_bwrite);
a.a_bp = bp;
mpsafe = (bp-b_vp-v_vflag VV_MPSAFE);
+ rump_schedule();
if (!mpsafe) { KERNEL_LOCK(1, curlwp); }
error = (VCALL(bp-b_vp, VOFFSET(rump_vop_bwrite), a));
if (!mpsafe) { KERNEL_UNLOCK_ONE(curlwp); }
+ rump_unschedule();
return error;
}
@@ -120,9 +123,11 @@
a.a_vpp = vpp;
a.a_cnp = cnp;
mpsafe = (dvp-v_vflag VV_MPSAFE);
+ rump_schedule();
if (!mpsafe) { KERNEL_LOCK(1, curlwp); }
error = (VCALL(dvp, VOFFSET(rump_vop_lookup), a));
if (!mpsafe) { KERNEL_UNLOCK_ONE(curlwp); }
+ rump_unschedule();
#ifdef DIAGNOSTIC
if (error == 0)
KASSERT((*vpp)-v_size != VSIZENOTSET
@@ -160,9 +165,11 @@
a.a_cnp = cnp;
a.a_vap = vap;
mpsafe = (dvp-v_vflag VV_MPSAFE);
+ rump_schedule();
if (!mpsafe) { KERNEL_LOCK(1, curlwp); }
error = (VCALL(dvp, VOFFSET(rump_vop_create), a));
if (!mpsafe) { KERNEL_UNLOCK_ONE(curlwp); }
+ rump_unschedule();
#ifdef DIAGNOSTIC
if (error == 0)
KASSERT((*vpp)-v_size != VSIZENOTSET
@@ -200,9 +207,11 @@
a.a_cnp = cnp;
a.a_vap = vap;
mpsafe = (dvp-v_vflag VV_MPSAFE);
+ rump_schedule();
if (!mpsafe) { KERNEL_LOCK(1, curlwp); }
error = (VCALL(dvp, VOFFSET(rump_vop_mknod), a));
if (!mpsafe) { KERNEL_UNLOCK_ONE(curlwp); }
+ rump_unschedule();
#ifdef DIAGNOSTIC
if (error == 0)
KASSERT((*vpp)-v_size != VSIZENOTSET
@@ -238,9 +247,11 @@
a.a_mode = mode;
a.a_cred = cred;
mpsafe = (vp-v_vflag VV_MPSAFE);
+ rump_schedule();
if (!mpsafe) { KERNEL_LOCK(1, curlwp); }
error = (VCALL(vp, VOFFSET(rump_vop_open), a));
if (!mpsafe) { KERNEL_UNLOCK_ONE(curlwp); }
+ rump_unschedule();
return error;
}
@@ -271,9 +282,11 @@
a.a_fflag = fflag;
a.a_cred = cred;
mpsafe = (vp-v_vflag VV_MPSAFE);
+ rump_schedule();
if (!mpsafe) { KERNEL_LOCK(1, curlwp); }
error = (VCALL(vp, VOFFSET(rump_vop_close), a));
if (!mpsafe) { KERNEL_UNLOCK_ONE(curlwp); }
+ rump_unschedule();
return error;
}
@@ -304,9 +317,11 @@
a.a_mode = mode;
a.a_cred = cred;
mpsafe = (vp-v_vflag VV_MPSAFE);
+ rump_schedule();
if (!mpsafe) { KERNEL_LOCK(1, curlwp); }
error = (VCALL(vp, VOFFSET(rump_vop_access), a));
if (!mpsafe) { KERNEL_UNLOCK_ONE(curlwp); }
+ rump_unschedule();
return error;
}
@@ -337,9 +352,11 @@
a.a_vap = vap;
a.a_cred = cred;
mpsafe = (vp-v_vflag VV_MPSAFE);
+ rump_schedule();
if (!mpsafe) { KERNEL_LOCK(1, curlwp); }
error = (VCALL(vp,
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Thu Oct 15 00:33:37 UTC 2009 Modified Files: src/sys/rump/include/rump: rumpuser.h Log Message: Add prototype for wait operation variants which do not drop any resources (because they should be holding any in the first place). To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/sys/rump/include/rump/rumpuser.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/rump/include/rump/rumpuser.h diff -u src/sys/rump/include/rump/rumpuser.h:1.28 src/sys/rump/include/rump/rumpuser.h:1.29 --- src/sys/rump/include/rump/rumpuser.h:1.28 Fri Oct 9 14:41:36 2009 +++ src/sys/rump/include/rump/rumpuser.h Thu Oct 15 00:33:37 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: rumpuser.h,v 1.28 2009/10/09 14:41:36 pooka Exp $ */ +/* $NetBSD: rumpuser.h,v 1.29 2009/10/15 00:33:37 pooka Exp $ */ /* * Copyright (c) 2007 Antti Kantee. All Rights Reserved. @@ -120,6 +120,7 @@ void rumpuser_mutex_init(struct rumpuser_mtx **); void rumpuser_mutex_recursive_init(struct rumpuser_mtx **); void rumpuser_mutex_enter(struct rumpuser_mtx *); +void rumpuser_mutex_enter_nowrap(struct rumpuser_mtx *); int rumpuser_mutex_tryenter(struct rumpuser_mtx *); void rumpuser_mutex_exit(struct rumpuser_mtx *); void rumpuser_mutex_destroy(struct rumpuser_mtx *); @@ -141,6 +142,7 @@ void rumpuser_cv_init(struct rumpuser_cv **); void rumpuser_cv_destroy(struct rumpuser_cv *); void rumpuser_cv_wait(struct rumpuser_cv *, struct rumpuser_mtx *); +void rumpuser_cv_wait_nowrap(struct rumpuser_cv *, struct rumpuser_mtx *); int rumpuser_cv_timedwait(struct rumpuser_cv *, struct rumpuser_mtx *, struct timespec *); void rumpuser_cv_signal(struct rumpuser_cv *);
CVS commit: src/sys/rump/librump/rumpvfs
Module Name:src Committed By: pooka Date: Thu Oct 15 00:34:06 UTC 2009 Modified Files: src/sys/rump/librump/rumpvfs: rump_vfs.c Log Message: rump_cpu is now a pointer To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/sys/rump/librump/rumpvfs/rump_vfs.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/rump/librump/rumpvfs/rump_vfs.c diff -u src/sys/rump/librump/rumpvfs/rump_vfs.c:1.32 src/sys/rump/librump/rumpvfs/rump_vfs.c:1.33 --- src/sys/rump/librump/rumpvfs/rump_vfs.c:1.32 Wed Oct 14 18:18:53 2009 +++ src/sys/rump/librump/rumpvfs/rump_vfs.c Thu Oct 15 00:34:05 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: rump_vfs.c,v 1.32 2009/10/14 18:18:53 pooka Exp $ */ +/* $NetBSD: rump_vfs.c,v 1.33 2009/10/15 00:34:05 pooka Exp $ */ /* * Copyright (c) 2008 Antti Kantee. All Rights Reserved. @@ -29,7 +29,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: rump_vfs.c,v 1.32 2009/10/14 18:18:53 pooka Exp $); +__KERNEL_RCSID(0, $NetBSD: rump_vfs.c,v 1.33 2009/10/15 00:34:05 pooka Exp $); #include sys/param.h #include sys/buf.h @@ -89,7 +89,7 @@ rumpblk_init(); - cache_cpu_init(rump_cpu); + cache_cpu_init(rump_cpu); vfsinit(); bufinit(); wapbl_init();
CVS commit: src/lib/libc/stdio
Module Name:src
Committed By: roy
Date: Thu Oct 15 00:36:24 UTC 2009
Modified Files:
src/lib/libc/stdio: fgetstr.c
Log Message:
Handle errors from getdelim better.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/lib/libc/stdio/fgetstr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/stdio/fgetstr.c
diff -u src/lib/libc/stdio/fgetstr.c:1.7 src/lib/libc/stdio/fgetstr.c:1.8
--- src/lib/libc/stdio/fgetstr.c:1.7 Wed Oct 14 20:54:51 2009
+++ src/lib/libc/stdio/fgetstr.c Thu Oct 15 00:36:24 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: fgetstr.c,v 1.7 2009/10/14 20:54:51 roy Exp $ */
+/* $NetBSD: fgetstr.c,v 1.8 2009/10/15 00:36:24 roy Exp $ */
/*
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: fgetstr.c,v 1.7 2009/10/14 20:54:51 roy Exp $);
+__RCSID($NetBSD: fgetstr.c,v 1.8 2009/10/15 00:36:24 roy Exp $);
#include namespace.h
@@ -58,17 +58,15 @@
p = (char *)fp-_lb._base;
size = fp-_lb._size;
*lenp = __getdelim(p, size, sep, fp);
+ fp-_lb._base = (unsigned char *)p;
/* The struct size variable is only an int . */
if (size INT_MAX) {
fp-_lb._size = INT_MAX;
errno = EOVERFLOW;
goto error;
}
- fp-_lb._base = (unsigned char *)p;
fp-_lb._size = (int)size;
- if (*lenp == 0)
- return NULL;
- if (*lenp SIZE_MAX)
+ if (*lenp != 0 *lenp SIZE_MAX - 1)
return p;
error:
*lenp = 0;
CVS commit: src/external/gpl2/lvm2/dist/man
Module Name:src Committed By: joerg Date: Thu Oct 15 00:59:01 UTC 2009 Modified Files: src/external/gpl2/lvm2/dist/man: vgrename.8 Log Message: Fix markup. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/gpl2/lvm2/dist/man/vgrename.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl2/lvm2/dist/man/vgrename.8 diff -u src/external/gpl2/lvm2/dist/man/vgrename.8:1.2 src/external/gpl2/lvm2/dist/man/vgrename.8:1.3 --- src/external/gpl2/lvm2/dist/man/vgrename.8:1.2 Wed Feb 18 12:16:13 2009 +++ src/external/gpl2/lvm2/dist/man/vgrename.8 Thu Oct 15 00:59:01 2009 @@ -1,4 +1,4 @@ -.\$NetBSD: vgrename.8,v 1.2 2009/02/18 12:16:13 haad Exp $ +.\$NetBSD: vgrename.8,v 1.3 2009/10/15 00:59:01 joerg Exp $ .\ .TH VGRENAME 8 LVM TOOLS 2.02.44-cvs (02-17-09) Sistina Software UK \ -*- nroff -*- .SH NAME @@ -24,18 +24,18 @@ .SH Examples vgrename /dev/vg02 /dev/my_volume_group renames existing volume group vg02 to my_volume_group. -.TP +.PP vgrename vg02 my_volume_group does the same. -.TP +.PP vgrename Zvlifi-Ep3t-e0Ng-U42h-o0ye-KHu1-nl7Ns4 VolGroup00_tmp changes the name of the Volume Group with UUID Zvlifi-Ep3t-e0Ng-U42h-o0ye-KHu1-nl7Ns4 to VolGroup00_tmp. - +.PP All the Volume Groups visible to a system need to have different names. Otherwise many LVM2 commands will refuse to run or give warning messages. - +.PP This situation could arise when disks are moved between machines. If a disk is connected and it contains a Volume Group with the same name as the Volume Group containing your root filesystem the machine might @@ -43,7 +43,6 @@ different UUIDs (unless the disk was cloned) so you can rename one of the conflicting Volume Groups with \fBvgrename\fP. -.TP .SH SEE ALSO .BR lvm (8), .BR vgchange (8),
CVS commit: src/usr.sbin/ntp/ntpq
Module Name:src Committed By: joerg Date: Thu Oct 15 01:24:37 UTC 2009 Modified Files: src/usr.sbin/ntp/ntpq: ntpq.8 Log Message: Fix markup. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/usr.sbin/ntp/ntpq/ntpq.8 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/ntp/ntpq/ntpq.8 diff -u src/usr.sbin/ntp/ntpq/ntpq.8:1.21 src/usr.sbin/ntp/ntpq/ntpq.8:1.22 --- src/usr.sbin/ntp/ntpq/ntpq.8:1.21 Sat Jun 13 12:02:09 2009 +++ src/usr.sbin/ntp/ntpq/ntpq.8 Thu Oct 15 01:24:37 2009 @@ -96,9 +96,7 @@ These are described following. .sp .IR ? [command_keyword] -.sp 1x help [command_keyword] -A -.Ql \? +A `\?' by itself will print a list of all the command keywords known to this incarnation of [= prog-name =] .
CVS commit: src/usr.sbin/ntp
Module Name:src Committed By: joerg Date: Thu Oct 15 01:28:10 UTC 2009 Modified Files: src/usr.sbin/ntp/ntpdc: ntpdc.8 src/usr.sbin/ntp/ntpq: ntpq.8 Log Message: Expand [= prog-name =] in man pages. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/usr.sbin/ntp/ntpdc/ntpdc.8 cvs rdiff -u -r1.22 -r1.23 src/usr.sbin/ntp/ntpq/ntpq.8 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/ntp/ntpdc/ntpdc.8 diff -u src/usr.sbin/ntp/ntpdc/ntpdc.8:1.18 src/usr.sbin/ntp/ntpdc/ntpdc.8:1.19 --- src/usr.sbin/ntp/ntpdc/ntpdc.8:1.18 Sat Jun 13 12:02:09 2009 +++ src/usr.sbin/ntp/ntpdc/ntpdc.8 Thu Oct 15 01:28:10 2009 @@ -17,7 +17,7 @@ .SH DESCRIPTION This manual page documents, briefly, the \fBntpdc\fP command. The -[= prog-name =] +ntpdc utility program is used to query an NTP daemon about its current state and to request changes in that state. It uses NTP mode 7 control message formats described in the source code. @@ -26,12 +26,12 @@ arguments. Extensive state and statistics information is available through the -[= prog-name =] +ntpdc interface. In addition, nearly all the configuration options which can be specified at startup using ntpd's configuration file may also be specified at run time using -[= prog-name =] . +ntpdc. .SH OPTIONS Index: src/usr.sbin/ntp/ntpq/ntpq.8 diff -u src/usr.sbin/ntp/ntpq/ntpq.8:1.22 src/usr.sbin/ntp/ntpq/ntpq.8:1.23 --- src/usr.sbin/ntp/ntpq/ntpq.8:1.22 Thu Oct 15 01:24:37 2009 +++ src/usr.sbin/ntp/ntpq/ntpq.8 Thu Oct 15 01:28:10 2009 @@ -17,7 +17,7 @@ .SH DESCRIPTION This manual page documents, briefly, the \fBntpq\fP command. The -[= prog-name =] +ntpq utility program is used to query NTP servers which implement the standard NTP mode 6 control message formats defined in Appendix B of the NTPv3 specification RFC1305, requesting @@ -31,31 +31,31 @@ variables can be assembled, with raw and pretty-printed output options being available. The -[= prog-name =] +ntpq utility can also obtain and print a list of peers in a common format by sending multiple queries to the server. If one or more request options is included on the command line when -[= prog-name =] +ntpq is executed, each of the requests will be sent to the NTP servers running on each of the hosts given as command line arguments, or on localhost by default. If no request options are given, -[= prog-name =] +ntpq will attempt to read commands from the standard input and execute these on the NTP server running on the first host given on the command line, again defaulting to localhost when no other host is specified. The -[= prog-name =] +ntpq utility will prompt for commands if the standard input is a terminal device. The -[= prog-name =] +ntpq utility uses NTP mode 6 packets to communicate with the NTP server, and hence can be used to query any compatible server on the network which permits it. @@ -63,7 +63,7 @@ this communication will be somewhat unreliable, especially over large distances in terms of network topology. The -[= prog-name =] +ntpq utility makes one attempt to retransmit requests, and will time requests out if the remote host is not heard from within a suitable timeout @@ -78,7 +78,7 @@ cause the specified query (queries) to be sent to the indicated host(s) immediately. Otherwise, -[= prog-name =] +ntpq will attempt to read interactive format commands from the standard input. .Ss Internal Commands @@ -90,7 +90,7 @@ A number of interactive format commands are executed entirely within the -[= prog-name =] +ntpq utility itself and do not result in NTP mode 6 requests being sent to a server. These are described following. @@ -99,14 +99,14 @@ A `\?' by itself will print a list of all the command keywords known to this incarnation of -[= prog-name =] . +ntpq. A .Ql \? followed by a command keyword will print function and usage information about the command. This command is probably a better source of information about -[= prog-name =] +ntpq than this manual page. .sp @@ -125,7 +125,7 @@ is ignored, and can be omitted, in requests to the server to read variables. The -[= prog-name =] +ntpq utility maintains an internal list in which data to be included in control messages can be assembled, and sent using the .Ic readlist @@ -148,13 +148,13 @@ .sp .IR authenticate [ yes | no ] Normally -[= prog-name =] +ntpq does not authenticate requests unless they are write requests. The command .Ql authenticate yes causes -[= prog-name =] +ntpq to send authentication with all requests it makes. Authenticated requests causes some servers to handle @@ -165,19 +165,19 @@ The command .Ql authenticate causes -[= prog-name =] +ntpq to display whether or not -[= prog-name =] +ntpq is currently autheinticating requests. .sp .IR cooked Causes output from query commands to be cooked, so that
CVS commit: src/sys/rump/librump/rumpkern
Module Name:src
Committed By: pooka
Date: Thu Oct 15 01:29:07 UTC 2009
Added Files:
src/sys/rump/librump/rumpkern: rumpcpu_generic.c
Log Message:
forgot to commit with previous batch
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/rump/librump/rumpkern/rumpcpu_generic.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/sys/rump/librump/rumpkern/rumpcpu_generic.c
diff -u /dev/null src/sys/rump/librump/rumpkern/rumpcpu_generic.c:1.1
--- /dev/null Thu Oct 15 01:29:07 2009
+++ src/sys/rump/librump/rumpkern/rumpcpu_generic.c Thu Oct 15 01:29:06 2009
@@ -0,0 +1,43 @@
+/* $NetBSD: rumpcpu_generic.c,v 1.1 2009/10/15 01:29:06 pooka Exp $ */
+
+/*
+ * Copyright (c) 2009 Antti Kantee. All Rights Reserved.
+ *
+ * Development of this software was supported by the
+ * Finnish Cultural Foundation
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include sys/cdefs.h
+__KERNEL_RCSID(0, $NetBSD: rumpcpu_generic.c,v 1.1 2009/10/15 01:29:06 pooka Exp $);
+
+#include sys/param.h
+
+#include rump_private.h
+
+void
+rump_cpu_bootstrap(struct cpu_info *ci)
+{
+
+ /* nada */
+}
CVS commit: src/sys/rump/include/machine
Module Name:src Committed By: pooka Date: Thu Oct 15 01:35:23 UTC 2009 Modified Files: src/sys/rump/include/machine: cpu.h Log Message: adjust for new rump_cpu To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/rump/include/machine/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/rump/include/machine/cpu.h diff -u src/sys/rump/include/machine/cpu.h:1.9 src/sys/rump/include/machine/cpu.h:1.10 --- src/sys/rump/include/machine/cpu.h:1.9 Tue Jan 6 13:20:34 2009 +++ src/sys/rump/include/machine/cpu.h Thu Oct 15 01:35:23 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.h,v 1.9 2009/01/06 13:20:34 pooka Exp $ */ +/* $NetBSD: cpu.h,v 1.10 2009/10/15 01:35:23 pooka Exp $ */ /* * Copyright (c) 2007 Antti Kantee. All Rights Reserved. @@ -72,8 +72,8 @@ void __syncicache(void *, size_t); #endif -extern struct cpu_info rump_cpu; -#define curcpu() (rump_cpu) +extern struct cpu_info *rump_cpu; +#define curcpu() (rump_cpu) #define cpu_number() 0 /* XXX: good enuf? */ struct lwp *rump_get_curlwp(void); /* XXX */
CVS commit: src/sys/rump/include/machine
Module Name:src Committed By: pooka Date: Thu Oct 15 01:50:08 UTC 2009 Modified Files: src/sys/rump/include/machine: cpu.h Log Message: fix previous to make sense To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/rump/include/machine/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/rump/include/machine/cpu.h diff -u src/sys/rump/include/machine/cpu.h:1.10 src/sys/rump/include/machine/cpu.h:1.11 --- src/sys/rump/include/machine/cpu.h:1.10 Thu Oct 15 01:35:23 2009 +++ src/sys/rump/include/machine/cpu.h Thu Oct 15 01:50:08 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.h,v 1.10 2009/10/15 01:35:23 pooka Exp $ */ +/* $NetBSD: cpu.h,v 1.11 2009/10/15 01:50:08 pooka Exp $ */ /* * Copyright (c) 2007 Antti Kantee. All Rights Reserved. @@ -72,13 +72,12 @@ void __syncicache(void *, size_t); #endif -extern struct cpu_info *rump_cpu; -#define curcpu() (rump_cpu) -#define cpu_number() 0 /* XXX: good enuf? */ - struct lwp *rump_get_curlwp(void); /* XXX */ #define curlwp rump_get_curlwp() +#define curcpu() (curlwp-l_cpu) +#define cpu_number() 0 /* XXX: not good enuf */ + #endif /* !_LOCORE */ #endif /* _SYS_RUMP_CPU_H_ */
CVS commit: src/usr.sbin/postinstall
Module Name:src Committed By: joerg Date: Thu Oct 15 02:15:20 UTC 2009 Modified Files: src/usr.sbin/postinstall: postinstall.8 Log Message: Explicitly request literal mode after .Xr. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/usr.sbin/postinstall/postinstall.8 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/postinstall/postinstall.8 diff -u src/usr.sbin/postinstall/postinstall.8:1.13 src/usr.sbin/postinstall/postinstall.8:1.14 --- src/usr.sbin/postinstall/postinstall.8:1.13 Sat Oct 4 08:07:38 2008 +++ src/usr.sbin/postinstall/postinstall.8 Thu Oct 15 02:15:19 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: postinstall.8,v 1.13 2008/10/04 08:07:38 apb Exp $ +.\ $NetBSD: postinstall.8,v 1.14 2009/10/15 02:15:19 joerg Exp $ .\ .\ Copyright (c) 2005-2008 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -126,7 +126,7 @@ .Bl -tag -width usageXX -offset indent .It Cm check Perform post-installation checks on items. -.It Cm diff Op Xr diff 1 options +.It Cm diff Op Xr diff 1 Li options Similar to .Cm check , but also show the differences between the files.
CVS commit: src/dist/dhcp/common
Module Name:src Committed By: joerg Date: Thu Oct 15 02:18:22 UTC 2009 Modified Files: src/dist/dhcp/common: dhcp-options.5 Log Message: Kill bad tab in markup. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/dist/dhcp/common/dhcp-options.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/dist/dhcp/common/dhcp-options.5 diff -u src/dist/dhcp/common/dhcp-options.5:1.6 src/dist/dhcp/common/dhcp-options.5:1.7 --- src/dist/dhcp/common/dhcp-options.5:1.6 Thu Aug 11 17:13:21 2005 +++ src/dist/dhcp/common/dhcp-options.5 Thu Oct 15 02:18:22 2009 @@ -1,4 +1,4 @@ -.\ $Id: dhcp-options.5,v 1.6 2005/08/11 17:13:21 drochner Exp $ +.\ $Id: dhcp-options.5,v 1.7 2009/10/15 02:18:22 joerg Exp $ .\ .\ Copyright (c) 2004 by Internet Systems Consortium, Inc. (ISC) .\ Copyright (c) 1996-2003 by Internet Software Consortium @@ -1421,7 +1421,7 @@ 10.0.1.0 255.255.255.0 net-1-rtr.example.com 1, 10.2.0.0 255.255.224.0 net-2-0-rtr.example.com 3; -.fi +.fi .SH VENDOR ENCAPSULATED OPTIONS The DHCP protocol defines the \fB vendor-encapsulated-options\fR option, which allows vendors to define their own options that will be
CVS commit: src/usr.bin/find
Module Name:src
Committed By: joerg
Date: Thu Oct 15 02:26:38 UTC 2009
Modified Files:
src/usr.bin/find: find.1
Log Message:
Use -compact + explicit .Pp instead of .sp with negative line length.
To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 src/usr.bin/find/find.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/find/find.1
diff -u src/usr.bin/find/find.1:1.67 src/usr.bin/find/find.1:1.68
--- src/usr.bin/find/find.1:1.67 Sun Jan 4 12:13:56 2009
+++ src/usr.bin/find/find.1 Thu Oct 15 02:26:38 2009
@@ -1,4 +1,4 @@
-.\ $NetBSD: find.1,v 1.67 2009/01/04 12:13:56 wiz Exp $
+.\ $NetBSD: find.1,v 1.68 2009/10/15 02:26:38 joerg Exp $
.\
.\ Copyright (c) 1990, 1993
.\ The Regents of the University of California. All rights reserved.
@@ -179,22 +179,25 @@
Does not list mount points to other file systems.
.El
.Sh PRIMARIES
-.Bl -tag -width Ds
+.Bl -tag -width Ds -compact
.It Ic -amin Ar n
True if the difference between the file last access time and the time
.Nm
was started, rounded up to the next full minute, is
.Ar n
minutes.
+.Pp
.It Ic -anewer Ar file
True if the current file has a more recent last access time than
.Ar file .
+.Pp
.It Ic -atime Ar n
True if the difference between the file last access time and the time
.Nm
was started, rounded up to the next full 24-hour period, is
.Ar n
24-hour periods.
+.Pp
.It Ic -cmin Ar n
True if the difference between the time of last change of file status
information and the time
@@ -202,9 +205,11 @@
was started, rounded up to the next full minute, is
.Ar n
minutes.
+.Pp
.It Ic -cnewer Ar file
True if the current file has a more recent last change time than
.Ar file .
+.Pp
.It Ic -ctime Ar n
True if the difference between the time of last change of file status
information and the time
@@ -212,6 +217,7 @@
was started, rounded up to the next full 24-hour period, is
.Ar n
24-hour periods.
+.Pp
.It Ic -delete
Delete found files and/or directories.
Always returns True.
@@ -226,11 +232,11 @@
Depth-first traversal processing is implied by this option.
This can also be invoked as
.Ic -rm .
+.Pp
.It Ic -empty
True if the current file or directory is empty.
-.\ The .sp below is probably not the right way to get the desired effect.
+.Pp
.It Ic -exec Ar utility Oo argument ... Oc No ;
-.sp -1l
.It Ic -exec Ar utility Oo argument ... Oc No {} +
Execute the specified
.Ar utility
@@ -274,6 +280,7 @@
.Ar utility
does not exceed
.Dv ARG_MAX .
+.Pp
.It Ic -execdir Ar utility Oo argument ... Oc No ;
The
.Ic -execdir
@@ -291,6 +298,7 @@
Set aggregation
.Pq Do \+ Dc termination
is not supported.
+.Pp
.It Ic -exit Op Ar n
This primary causes
.Nm
@@ -299,6 +307,7 @@
If no value is specified, the exit value will be 0, else
.Ar n .
Note that other primaries will be evaluated and acted upon before exiting.
+.Pp
.It Ic -false
This primary always evaluates to false.
This can be used following a primary that caused the
@@ -308,6 +317,7 @@
primary so it can continue to the next expression (using an
.Cm -or
operator, for example).
+.Pp
.It Ic -flags Oo Fl Oc Ns Ar flags
If
.Ar flags
@@ -331,8 +341,10 @@
(See
.Xr chflags 1
for more information about file flags.)
+.Pp
.It Ic -follow
Follow symbolic links.
+.Pp
.It Ic -fprint Ar filename
This primary always evaluates to true.
This creates
@@ -342,6 +354,7 @@
It writes the pathname of the current file to this file, followed
by a newline character.
The file will be empty if no files are matched.
+.Pp
.It Ic -fstype Ar type
True if the file is contained in a file system of type
.Ar type .
@@ -362,6 +375,7 @@
.Nm
is being executed, and the latter matches any file system which is
mounted read-only.
+.Pp
.It Ic -group Ar gname
True if the file belongs to the group
.Ar gname .
@@ -370,14 +384,17 @@
is numeric and there is no such group name, then
.Ar gname
is treated as a group id.
+.Pp
.It Ic -iname Ar pattern
True if the last component of the pathname being examined
matches
.Ar pattern .
Case insensitive.
+.Pp
.It Ic -inum Ar n
True if the file has inode number
.Ar n .
+.Pp
.It Ic -iregex Ar regexp
True if the path name of the current file matches the case-insensitive
basic regular expression
@@ -385,13 +402,16 @@
.Ar regexp .
This is a match on the whole path, not a search for the regular expression
within the path.
+.Pp
.It Ic -links Ar n
True if the file has
.Ar n
links.
+.Pp
.It Ic -rm
This is an alias for
.Ic -delete .
+.Pp
.It Ic -ls
This primary always evaluates to true.
The following information for the current file is written to standard output:
@@ -404,24 +424,29 @@
.Dq -\*[Gt] .
The format is identical to that produced by
.Dq ls -dgils .
+.Pp
.It Ic -maxdepth Ar n
True if the current search depth is less than or equal to what is specified in
.Ar n .
+.Pp
.It Ic -mindepth Ar n
CVS commit: src/usr.bin/make
Module Name:src Committed By: joerg Date: Thu Oct 15 02:27:44 UTC 2009 Modified Files: src/usr.bin/make: make.1 Log Message: Do not work around ancient groff limits with .Xo/.Xc. To generate a diff of this commit: cvs rdiff -u -r1.163 -r1.164 src/usr.bin/make/make.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/make/make.1 diff -u src/usr.bin/make/make.1:1.163 src/usr.bin/make/make.1:1.164 --- src/usr.bin/make/make.1:1.163 Fri Oct 2 07:43:15 2009 +++ src/usr.bin/make/make.1 Thu Oct 15 02:27:44 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: make.1,v 1.163 2009/10/02 07:43:15 wiz Exp $ +.\ $NetBSD: make.1,v 1.164 2009/10/15 02:27:44 joerg Exp $ .\ .\ Copyright (c) 1990, 1993 .\ The Regents of the University of California. All rights reserved. @@ -947,10 +947,7 @@ See also .Ql Cm \:[...@] . .Sm off -.It Cm \:S No \/ Ar old_string Xo -.No \/ Ar new_string -.No \/ Op Cm 1gW -.Xc +.It Cm \:S No \/ Ar old_string No \/ Ar new_string No \/ Op Cm 1gW .Sm on Modify the first occurrence of .Ar old_string @@ -1005,10 +1002,7 @@ .Pq Ql \$ , not a preceding dollar sign as is usual. .Sm off -.It Cm \:C No \/ Ar pattern Xo -.No \/ Ar replacement -.No \/ Op Cm 1gW -.Xc +.It Cm \:C No \/ Ar pattern No \/ Ar replacement No \/ Op Cm 1gW .Sm on The .Cm \:C @@ -1096,10 +1090,8 @@ .Pq Ql \$ , not a preceding dollar sign as is usual. .Sm off -.It Cm \:@ Ar temp Cm @ Xo -.Ar string Cm @ +.It Cm \:@ Ar temp Cm @ Ar string Cm @ .Sm on -.Xc This is the loop expansion mechanism from the OSF Development Environment (ODE) make. Unlike @@ -1296,79 +1288,39 @@ .It Ic .undef Ar variable Un-define the specified global variable. Only global variables may be un-defined. -.It Xo -.Ic \.if -.Oo \! Oc Ns Ar expression -.Op Ar operator expression ... -.Xc +.It Ic \.if Oo \! Oc Ns Ar expression Op Ar operator expression ... Test the value of an expression. -.It Xo -.Ic .ifdef -.Oo \! Oc Ns Ar variable -.Op Ar operator variable ... -.Xc +.It Ic .ifdef Oo \! Oc Ns Ar variable Op Ar operator variable ... Test the value of a variable. -.It Xo -.Ic .ifndef -.Oo \! Oc Ns Ar variable -.Op Ar operator variable ... -.Xc +.It Ic .ifndef Oo \! Oc Ns Ar variable Op Ar operator variable ... Test the value of a variable. -.It Xo -.Ic .ifmake -.Oo \! Oc Ns Ar target -.Op Ar operator target ... -.Xc +.It Ic .ifmake Oo \! Oc Ns Ar target Op Ar operator target ... Test the target being built. -.It Xo -.Ic .ifnmake -.Oo \! Ns Oc Ar target -.Op Ar operator target ... -.Xc +.It Ic .ifnmake Oo \! Ns Oc Ar target Op Ar operator target ... Test the target being built. .It Ic .else Reverse the sense of the last conditional. -.It Xo -.Ic .elif -.Oo \! Ns Oc Ar expression -.Op Ar operator expression ... -.Xc +.It Ic .elif Oo \! Ns Oc Ar expression Op Ar operator expression ... A combination of .Ql Ic .else followed by .Ql Ic .if . -.It Xo -.Ic .elifdef -.Oo \! Oc Ns Ar variable -.Op Ar operator variable ... -.Xc +.It Ic .elifdef Oo \! Oc Ns Ar variable Op Ar operator variable ... A combination of .Ql Ic .else followed by .Ql Ic .ifdef . -.It Xo -.Ic .elifndef -.Oo \! Oc Ns Ar variable -.Op Ar operator variable ... -.Xc +.It Ic .elifndef Oo \! Oc Ns Ar variable Op Ar operator variable ... A combination of .Ql Ic .else followed by .Ql Ic .ifndef . -.It Xo -.Ic .elifmake -.Oo \! Oc Ns Ar target -.Op Ar operator target ... -.Xc +.It Ic .elifmake Oo \! Oc Ns Ar target Op Ar operator target ... A combination of .Ql Ic .else followed by .Ql Ic .ifmake . -.It Xo -.Ic .elifnmake -.Oo \! Oc Ns Ar target -.Op Ar operator target ... -.Xc +.It Ic .elifnmake Oo \! Oc Ns Ar target Op Ar operator target ... A combination of .Ql Ic .else followed by @@ -1488,13 +1440,7 @@ The syntax of a for loop is: .Pp .Bl -tag -compact -width Ds -.It Xo -.Ic \.for -.Ar variable -.Op Ar variable ... -.Ic in -.Ar expression -.Xc +.It Ic \.for Ar variable Oo Ar variable ... Oc Ic in Ar expression .It Aq make-rules .It Ic \.endfor .El
CVS commit: src
Module Name:src
Committed By: enami
Date: Thu Oct 15 03:21:45 UTC 2009
Modified Files:
src: build.sh
Log Message:
There is no variable called __SRC_TOP_OBJ__. Use the correct one instead.
To generate a diff of this commit:
cvs rdiff -u -r1.215 -r1.216 src/build.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/build.sh
diff -u src/build.sh:1.215 src/build.sh:1.216
--- src/build.sh:1.215 Wed Oct 14 19:03:12 2009
+++ src/build.sh Thu Oct 15 03:21:45 2009
@@ -1,5 +1,5 @@
#! /usr/bin/env sh
-# $NetBSD: build.sh,v 1.215 2009/10/14 19:03:12 apb Exp $
+# $NetBSD: build.sh,v 1.216 2009/10/15 03:21:45 enami Exp $
#
# Copyright (c) 2001-2009 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -1155,7 +1155,7 @@
eval oldval=\\$${var}\
newval=$(getmakevar $var)
if ! $do_expertmode; then
- : ${__SRC_TOP_OBJ__:=$(getmakevar __SRC_TOP_OBJ__)}
+ : ${_SRC_TOP_OBJ_:=$(getmakevar _SRC_TOP_OBJ_)}
case $var in
DESTDIR)
: ${newval:=${_SRC_TOP_OBJ_}/destdir.${MACHINE}}
@@ -1313,7 +1313,7 @@
eval cat EOF ${makewrapout}
#! ${HOST_SH}
# Set proper variables to allow easy make building of a NetBSD subtree.
-# Generated from: \$NetBSD: build.sh,v 1.215 2009/10/14 19:03:12 apb Exp $
+# Generated from: \$NetBSD: build.sh,v 1.216 2009/10/15 03:21:45 enami Exp $
# with these arguments: ${_args}
#
