CVS commit: src/usr.bin/find
Module Name:src Committed By: uwe Date: Mon Nov 2 07:03:48 UTC 2020 Modified Files: src/usr.bin/find: find.1 Log Message: Use \*q to refer to ascii quote to save fontlock from confusion. To generate a diff of this commit: cvs rdiff -u -r1.92 -r1.93 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.92 src/usr.bin/find/find.1:1.93 --- src/usr.bin/find/find.1:1.92 Sun Nov 1 21:11:49 2020 +++ src/usr.bin/find/find.1 Mon Nov 2 07:03:48 2020 @@ -1,4 +1,4 @@ -.\" $NetBSD: find.1,v 1.92 2020/11/01 21:11:49 kim Exp $ +.\" $NetBSD: find.1,v 1.93 2020/11/02 07:03:48 uwe Exp $ .\" .\" Copyright (c) 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -141,7 +141,7 @@ is skipped. The delimiting characters include single .Pq Dq \&' and double -.Pq Dq \&" +.Pq Dq \&\*q quotes, backslash .Pq Dq \e , space, tab, and newline characters.
CVS commit: src
Module Name:src Committed By: khorben Date: Mon Nov 2 06:40:11 UTC 2020 Modified Files: src/distrib/sets/lists/man: mi src/external/bsd/pam-u2f/bin/pamu2fcfg: Makefile src/external/bsd/pam-u2f/lib/security/pam-u2f: Makefile Added Files: src/external/bsd/pam-u2f/bin/pamu2fcfg: pamu2fcfg.1 src/external/bsd/pam-u2f/lib/security/pam-u2f: pam_u2f.8 Log Message: PR/55747: Tobias Nygren: Install manpages for pam-u2f I have generated the manual pages and referenced them into the sets. It would probably help to add a Makefile rule, indicating how to generate the manual pages again. Tested with "build.sh release" on amd64. Reviewed by Tobias Nygren before the commit. To generate a diff of this commit: cvs rdiff -u -r1.1707 -r1.1708 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.2 -r1.3 src/external/bsd/pam-u2f/bin/pamu2fcfg/Makefile cvs rdiff -u -r0 -r1.1 src/external/bsd/pam-u2f/bin/pamu2fcfg/pamu2fcfg.1 cvs rdiff -u -r1.3 -r1.4 \ src/external/bsd/pam-u2f/lib/security/pam-u2f/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/bsd/pam-u2f/lib/security/pam-u2f/pam_u2f.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/man/mi diff -u src/distrib/sets/lists/man/mi:1.1707 src/distrib/sets/lists/man/mi:1.1708 --- src/distrib/sets/lists/man/mi:1.1707 Tue Oct 27 08:57:10 2020 +++ src/distrib/sets/lists/man/mi Mon Nov 2 06:40:11 2020 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1707 2020/10/27 08:57:10 ryo Exp $ +# $NetBSD: mi,v 1.1708 2020/11/02 06:40:11 khorben Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -421,6 +421,7 @@ ./usr/share/man/cat1/openssl_x509v3_config.0 man-obsolete obsolete ./usr/share/man/cat1/page.0 man-util-catman .cat ./usr/share/man/cat1/pagesize.0 man-util-catman .cat +./usr/share/man/cat1/pamu2fcfg.0 man-util-catman .cat ./usr/share/man/cat1/passwd.0 man-util-catman .cat ./usr/share/man/cat1/paste.0 man-util-catman .cat ./usr/share/man/cat1/patch.0 man-util-catman .cat @@ -2940,6 +2941,7 @@ ./usr/share/man/cat8/pam_self.0 man-sysutil-catman pam,.cat ./usr/share/man/cat8/pam_skey.0 man-sysutil-catman skey,pam,.cat ./usr/share/man/cat8/pam_ssh.0 man-sysutil-catman pam,.cat +./usr/share/man/cat8/pam_u2f.0 man-sysutil-catman pam,.cat ./usr/share/man/cat8/pam_unix.0 man-sysutil-catman pam,.cat ./usr/share/man/cat8/paxctl.0 man-sysutil-catman .cat ./usr/share/man/cat8/pc532/MAKEDEV.0 man-obsolete obsolete @@ -3707,6 +3709,7 @@ ./usr/share/man/html1/openssl_x509v3_config.html man-obsolete obsolete ./usr/share/man/html1/page.html man-util-htmlman html ./usr/share/man/html1/pagesize.html man-util-htmlman html +./usr/share/man/html1/pamu2fcfg.html man-util-htmlman html ./usr/share/man/html1/passwd.html man-util-htmlman html ./usr/share/man/html1/paste.html man-util-htmlman html ./usr/share/man/html1/patch.html man-util-htmlman html @@ -5933,6 +5936,7 @@ ./usr/share/man/html8/pam_self.html man-sysutil-htmlman pam,html ./usr/share/man/html8/pam_skey.html man-sysutil-htmlman skey,pam,html ./usr/share/man/html8/pam_ssh.html man-sysutil-htmlman pam,html +./usr/share/man/html8/pam_u2f.html man-sysutil-htmlman pam,html ./usr/share/man/html8/pam_unix.html man-sysutil-htmlman pam,html ./usr/share/man/html8/paxctl.html man-sysutil-htmlman html ./usr/share/man/html8/pcictl.html man-sysutil-htmlman html @@ -6635,6 +6639,7 @@ ./usr/share/man/man1/openssl_x509v3_config.1 man-obsolete obsolete ./usr/share/man/man1/page.1 man-util-man .man ./usr/share/man/man1/pagesize.1 man-util-man .man +./usr/share/man/man1/pamu2fcfg.1 man-util-man .man ./usr/share/man/man1/passwd.1 man-util-man .man ./usr/share/man/man1/paste.1 man-util-man .man ./usr/share/man/man1/patch.1 man-util-man .man @@ -9154,6 +9159,7 @@ ./usr/share/man/man8/pam_self.8 man-sysutil-man .man,pam ./usr/share/man/man8/pam_skey.8 man-sysutil-man skey,.man,pam ./usr/share/man/man8/pam_ssh.8 man-sysutil-man .man,pam +./usr/share/man/man8/pam_u2f.8 man-sysutil-man .man,pam ./usr/share/man/man8/pam_unix.8 man-sysutil-man .man,pam ./usr/share/man/man8/paxctl.8 man-sysutil-man .man ./usr/share/man/man8/pc532/MAKEDEV.8 man-obsolete obsolete Index: src/external/bsd/pam-u2f/bin/pamu2fcfg/Makefile diff -u src/external/bsd/pam-u2f/bin/pamu2fcfg/Makefile:1.2 src/external/bsd/pam-u2f/bin/pamu2fcfg/Makefile:1.3 --- src/external/bsd/pam-u2f/bin/pamu2fcfg/Makefile:1.2 Wed Mar 4 17:32:27 2020 +++ src/external/bsd/pam-u2f/bin/pamu2fcfg/Makefile Mon Nov 2 06:40:11 2020 @@ -1,6 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2020/03/04 17:32:27 christos Exp $ - -NOMAN= +# $NetBSD: Makefile,v 1.3 2020/11/02 06:40:11 khorben Exp $ .include Index: src/external/bsd/pam-u2f/lib/security/pam-u2f/Makefile diff -u
CVS commit: xsrc/external/mit/libepoxy/include
Module Name:xsrc Committed By: mrg Date: Mon Nov 2 06:25:35 UTC 2020 Modified Files: xsrc/external/mit/libepoxy/include: config.h Log Message: ensure PLATFORM_HAS_EGL and ENABLE_EGL are set consistently. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/libepoxy/include/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/libepoxy/include/config.h diff -u xsrc/external/mit/libepoxy/include/config.h:1.2 xsrc/external/mit/libepoxy/include/config.h:1.3 --- xsrc/external/mit/libepoxy/include/config.h:1.2 Mon Nov 2 04:47:22 2020 +++ xsrc/external/mit/libepoxy/include/config.h Mon Nov 2 06:25:35 2020 @@ -10,8 +10,10 @@ /* build WGL tests */ /* #undef BUILD_WGL */ +#if 0 /* in Makefile */ /* Whether EGL support is enabled */ #define ENABLE_EGL 1 +#endif /* Whether GLX support is enabled */ #define ENABLE_GLX 1
CVS commit: src/external/mit/xorg/lib/libepoxy
Module Name:src
Committed By: mrg
Date: Mon Nov 2 06:25:24 UTC 2020
Modified Files:
src/external/mit/xorg/lib/libepoxy: Makefile
Log Message:
ensure PLATFORM_HAS_EGL and ENABLE_EGL are set consistently.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/lib/libepoxy/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/libepoxy/Makefile
diff -u src/external/mit/xorg/lib/libepoxy/Makefile:1.7 src/external/mit/xorg/lib/libepoxy/Makefile:1.8
--- src/external/mit/xorg/lib/libepoxy/Makefile:1.7 Mon Nov 2 04:48:54 2020
+++ src/external/mit/xorg/lib/libepoxy/Makefile Mon Nov 2 06:25:24 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2020/11/02 04:48:54 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2020/11/02 06:25:24 mrg Exp $
.include
@@ -17,11 +17,12 @@ SRCS= \
SRCS+= \
dispatch_egl.c \
egl_generated_dispatch.c
-CPPFLAGS+= -DENABLE_EGL=1
EGL=1
.else
EGL=0
.endif
+CPPFLAGS+= -DPLATFORM_HAS_EGL=${EGL}
+CPPFLAGS+= -DENABLE_EGL=${EGL}
INCSDIR=${X11INCDIR}/epoxy
INCS= \
CVS commit: src/external/mit/xorg/lib/libepoxy
Module Name:src
Committed By: mrg
Date: Mon Nov 2 04:48:54 UTC 2020
Modified Files:
src/external/mit/xorg/lib/libepoxy: Makefile
Log Message:
adjust for libepoxy 1.5.4.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/lib/libepoxy/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/libepoxy/Makefile
diff -u src/external/mit/xorg/lib/libepoxy/Makefile:1.6 src/external/mit/xorg/lib/libepoxy/Makefile:1.7
--- src/external/mit/xorg/lib/libepoxy/Makefile:1.6 Wed Jul 10 21:32:22 2019
+++ src/external/mit/xorg/lib/libepoxy/Makefile Mon Nov 2 04:48:54 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2019/07/10 21:32:22 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2020/11/02 04:48:54 mrg Exp $
.include
@@ -17,7 +17,7 @@ SRCS= \
SRCS+= \
dispatch_egl.c \
egl_generated_dispatch.c
-CPPFLAGS+= -DPLATFORM_HAS_EGL=1
+CPPFLAGS+= -DENABLE_EGL=1
EGL=1
.else
EGL=0
@@ -36,10 +36,11 @@ CPPFLAGS+= ${X11FLAGS.CONNECTION}
PKGCONFIG= epoxy
PKGCONFIG_SED_FLAGS= \
--e "s,@DLOPEN_LIBS@,," \
--e "s,@epoxy_has_glx@,1," \
--e "s,@epoxy_has_egl@,${EGL}," \
--e "s,@epoxy_has_wgl@,0,"
+ -e "s,@DLOPEN_LIBS@,," \
+ -e "s,@epoxy_has_glx@,1," \
+ -e "s,@epoxy_has_egl@,${EGL}," \
+ -e "s,@epoxy_has_wgl@,0," \
+ -e "s,@GL_REQS@, gl egl,"
.include
.include
CVS commit: xsrc/external/mit/libepoxy
Module Name:xsrc Committed By: mrg Date: Mon Nov 2 04:47:22 UTC 2020 Modified Files: xsrc/external/mit/libepoxy/dist: configure xsrc/external/mit/libepoxy/include: config.h xsrc/external/mit/libepoxy/src: egl_generated.h egl_generated_dispatch.c gl_generated.h gl_generated_dispatch.c glx_generated.h glx_generated_dispatch.c Log Message: new generated files for libepoxy 1.5.4. update the fake configure version. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/libepoxy/dist/configure cvs rdiff -u -r1.1 -r1.2 xsrc/external/mit/libepoxy/include/config.h cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/libepoxy/src/egl_generated.h \ xsrc/external/mit/libepoxy/src/gl_generated.h \ xsrc/external/mit/libepoxy/src/glx_generated.h cvs rdiff -u -r1.4 -r1.5 \ xsrc/external/mit/libepoxy/src/egl_generated_dispatch.c cvs rdiff -u -r1.5 -r1.6 \ xsrc/external/mit/libepoxy/src/gl_generated_dispatch.c \ xsrc/external/mit/libepoxy/src/glx_generated_dispatch.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. diffs are larger than 1MB and have been omitted
CVS commit: xsrc/external/mit/libepoxy/dist
Module Name:xsrc
Committed By: mrg
Date: Mon Nov 2 04:46:30 UTC 2020
Modified Files:
xsrc/external/mit/libepoxy/dist/src: dispatch_common.c
dispatch_common.h
Removed Files:
xsrc/external/mit/libepoxy/dist: .gitignore
xsrc/external/mit/libepoxy/dist/test: egl_and_glx_different_pointers.c
Log Message:
merge libepoxy 1.5.4.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/libepoxy/dist/.gitignore
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/libepoxy/dist/src/dispatch_common.c
cvs rdiff -u -r1.7 -r1.8 \
xsrc/external/mit/libepoxy/dist/src/dispatch_common.h
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/libepoxy/dist/test/egl_and_glx_different_pointers.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libepoxy/dist/src/dispatch_common.c
diff -u xsrc/external/mit/libepoxy/dist/src/dispatch_common.c:1.4 xsrc/external/mit/libepoxy/dist/src/dispatch_common.c:1.5
--- xsrc/external/mit/libepoxy/dist/src/dispatch_common.c:1.4 Tue Jul 9 21:55:21 2019
+++ xsrc/external/mit/libepoxy/dist/src/dispatch_common.c Mon Nov 2 04:46:29 2020
@@ -41,7 +41,7 @@
* \section features_sec Features
*
* - Automatically initializes as new GL functions are used.
- * - GL 4.4 core and compatibility context support.
+ * - GL 4.6 core and compatibility context support.
* - GLES 1/2/3 context support.
* - Knows about function aliases so (e.g.) `glBufferData()` can be
* used with `GL_ARB_vertex_buffer_object` implementations, along
@@ -173,30 +173,33 @@
#include "dispatch_common.h"
-#ifdef __APPLE__
+#if defined(__APPLE__)
#define GLX_LIB "/opt/X11/lib/libGL.1.dylib"
-#elif defined(ANDROID)
+#define OPENGL_LIB "/System/Library/Frameworks/OpenGL.framework/Versions/Current/OpenGL"
+#define GLES1_LIB "libGLESv1_CM.so"
+#define GLES2_LIB "libGLESv2.so"
+#elif defined(__ANDROID__)
#define GLX_LIB "libGLESv2.so"
-#else
-#ifdef __NetBSD__
+#elif __NetBSD__
#define GLX_LIB "libGL.so"
-#else
-#define GLX_LIB "libGL.so.1"
-#endif
#endif
#if defined(ANDROID) || defined(__NetBSD__)
#define EGL_LIB "libEGL.so"
#define GLES1_LIB "libGLESv1_CM.so"
#define GLES2_LIB "libGLESv2.so"
-#elif defined _WIN32
+#elif defined(_WIN32)
#define EGL_LIB "libEGL.dll"
#define GLES1_LIB "libGLES_CM.dll"
#define GLES2_LIB "libGLESv2.dll"
+#define OPENGL_LIB "OPENGL32"
#else
+#define GLVND_GLX_LIB "libGLX.so.1"
+#define GLX_LIB "libGL.so.1"
#define EGL_LIB "libEGL.so.1"
#define GLES1_LIB "libGLESv1_CM.so.1"
#define GLES2_LIB "libGLESv2.so.2"
+#define OPENGL_LIB "libOpenGL.so.0"
#endif
#ifdef __GNUC__
@@ -230,13 +233,18 @@ struct api {
pthread_mutex_t mutex;
#endif
-/* dlopen() return value for libGL.so.1. */
+/*
+ * dlopen() return value for the GLX API. This is libGLX.so.1 if the
+ * runtime is glvnd-enabled, else libGL.so.1
+ */
void *glx_handle;
/*
- * dlopen() return value for OS X's GL library.
+ * dlopen() return value for the desktop GL library.
*
- * On linux, glx_handle is used instead.
+ * On Windows this is OPENGL32. On OSX this is classic libGL. On Linux
+ * this is either libOpenGL (if the runtime is glvnd-enabled) or
+ * classic libGL.so.1
*/
void *gl_handle;
@@ -290,14 +298,13 @@ library_init(void)
}
static bool
-get_dlopen_handle(void **handle, const char *lib_name, bool exit_on_fail)
+get_dlopen_handle(void **handle, const char *lib_name, bool exit_on_fail, bool load)
{
if (*handle)
return true;
if (!library_initialized) {
-fprintf(stderr,
-"Attempting to dlopen() while in the dynamic linker.\n");
+fputs("Attempting to dlopen() while in the dynamic linker.\n", stderr);
abort();
}
@@ -306,11 +313,15 @@ get_dlopen_handle(void **handle, const c
#else
pthread_mutex_lock();
if (!*handle) {
-*handle = dlopen(lib_name, RTLD_LAZY | RTLD_LOCAL);
+int flags = RTLD_LAZY | RTLD_LOCAL;
+if (!load)
+flags |= RTLD_NOLOAD;
+
+*handle = dlopen(lib_name, flags);
if (!*handle) {
if (exit_on_fail) {
fprintf(stderr, "Couldn't open %s: %s\n", lib_name, dlerror());
-exit(1);
+abort();
} else {
(void)dlerror();
}
@@ -323,15 +334,11 @@ get_dlopen_handle(void **handle, const c
}
static void *
-do_dlsym(void **handle, const char *lib_name, const char *name,
- bool exit_on_fail)
+do_dlsym(void **handle, const char *name, bool exit_on_fail)
{
void *result;
const char *error = "";
-if (!get_dlopen_handle(handle, lib_name, exit_on_fail))
-return NULL;
-
#ifdef _WIN32
result = GetProcAddress(*handle, name);
#else
@@ -340,8 +347,8 @@ do_dlsym(void **handle, const char *lib_
CVS import: xsrc/external/mit/libepoxy/dist
Module Name:xsrc Committed By: mrg Date: Mon Nov 2 04:43:18 UTC 2020 Update of /cvsroot/xsrc/external/mit/libepoxy/dist In directory ivanova.netbsd.org:/tmp/cvs-serv11039 Log Message: initial import of libepoxy-1.5.4 Status: Vendor Tag: xorg Release Tags: libepoxy-1-5-4 U xsrc/external/mit/libepoxy/dist/.appveyor.yml U xsrc/external/mit/libepoxy/dist/.dir-locals.el U xsrc/external/mit/libepoxy/dist/.editorconfig U xsrc/external/mit/libepoxy/dist/.travis.yml U xsrc/external/mit/libepoxy/dist/COPYING U xsrc/external/mit/libepoxy/dist/Makefile.am U xsrc/external/mit/libepoxy/dist/README.md U xsrc/external/mit/libepoxy/dist/autogen.sh U xsrc/external/mit/libepoxy/dist/configure.ac U xsrc/external/mit/libepoxy/dist/epoxy.pc.in U xsrc/external/mit/libepoxy/dist/meson.build U xsrc/external/mit/libepoxy/dist/meson_options.txt N xsrc/external/mit/libepoxy/dist/.travis/Dockerfile N xsrc/external/mit/libepoxy/dist/.travis/epoxy-ci-linux.sh N xsrc/external/mit/libepoxy/dist/.travis/epoxy-ci-osx.sh N xsrc/external/mit/libepoxy/dist/.travis/run-docker.sh U xsrc/external/mit/libepoxy/dist/cross/fedora-mingw64.txt U xsrc/external/mit/libepoxy/dist/doc/Doxyfile.in U xsrc/external/mit/libepoxy/dist/doc/meson.build U xsrc/external/mit/libepoxy/dist/include/epoxy/Makefile.am U xsrc/external/mit/libepoxy/dist/include/epoxy/common.h U xsrc/external/mit/libepoxy/dist/include/epoxy/egl.h U xsrc/external/mit/libepoxy/dist/include/epoxy/gl.h U xsrc/external/mit/libepoxy/dist/include/epoxy/glx.h U xsrc/external/mit/libepoxy/dist/include/epoxy/meson.build U xsrc/external/mit/libepoxy/dist/include/epoxy/wgl.h U xsrc/external/mit/libepoxy/dist/registry/README.md U xsrc/external/mit/libepoxy/dist/registry/egl.xml U xsrc/external/mit/libepoxy/dist/registry/gl.xml U xsrc/external/mit/libepoxy/dist/registry/glx.xml U xsrc/external/mit/libepoxy/dist/registry/wgl.xml U xsrc/external/mit/libepoxy/dist/src/Makefile.am C xsrc/external/mit/libepoxy/dist/src/dispatch_common.c C xsrc/external/mit/libepoxy/dist/src/dispatch_common.h U xsrc/external/mit/libepoxy/dist/src/dispatch_egl.c U xsrc/external/mit/libepoxy/dist/src/dispatch_glx.c U xsrc/external/mit/libepoxy/dist/src/dispatch_wgl.c U xsrc/external/mit/libepoxy/dist/src/gen_dispatch.py U xsrc/external/mit/libepoxy/dist/src/meson.build U xsrc/external/mit/libepoxy/dist/test/.gitignore U xsrc/external/mit/libepoxy/dist/test/Makefile.am N xsrc/external/mit/libepoxy/dist/test/cgl_core.c N xsrc/external/mit/libepoxy/dist/test/cgl_epoxy_api.c U xsrc/external/mit/libepoxy/dist/test/dlwrap.c U xsrc/external/mit/libepoxy/dist/test/dlwrap.h U xsrc/external/mit/libepoxy/dist/test/egl_common.c U xsrc/external/mit/libepoxy/dist/test/egl_common.h N xsrc/external/mit/libepoxy/dist/test/egl_epoxy_api.c U xsrc/external/mit/libepoxy/dist/test/egl_gl.c U xsrc/external/mit/libepoxy/dist/test/egl_has_extension_nocontext.c U xsrc/external/mit/libepoxy/dist/test/egl_without_glx.c N xsrc/external/mit/libepoxy/dist/test/gl_version.c U xsrc/external/mit/libepoxy/dist/test/glx_alias_prefer_same_name.c U xsrc/external/mit/libepoxy/dist/test/glx_beginend.c U xsrc/external/mit/libepoxy/dist/test/glx_common.c U xsrc/external/mit/libepoxy/dist/test/glx_common.h U xsrc/external/mit/libepoxy/dist/test/glx_gles2.c U xsrc/external/mit/libepoxy/dist/test/glx_glxgetprocaddress_nocontext.c U xsrc/external/mit/libepoxy/dist/test/glx_has_extension_nocontext.c U xsrc/external/mit/libepoxy/dist/test/glx_public_api.c U xsrc/external/mit/libepoxy/dist/test/glx_public_api_core.c U xsrc/external/mit/libepoxy/dist/test/glx_static.c U xsrc/external/mit/libepoxy/dist/test/headerguards.c U xsrc/external/mit/libepoxy/dist/test/khronos_typedefs.c U xsrc/external/mit/libepoxy/dist/test/khronos_typedefs.h U xsrc/external/mit/libepoxy/dist/test/khronos_typedefs_nonepoxy.c U xsrc/external/mit/libepoxy/dist/test/meson.build U xsrc/external/mit/libepoxy/dist/test/miscdefines.c U xsrc/external/mit/libepoxy/dist/test/wgl_common.c U xsrc/external/mit/libepoxy/dist/test/wgl_common.h U xsrc/external/mit/libepoxy/dist/test/wgl_core_and_exts.c U xsrc/external/mit/libepoxy/dist/test/wgl_per_context_funcptrs.c U xsrc/external/mit/libepoxy/dist/test/wgl_usefontbitmaps.c 2 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/libepoxy/dist
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: mrg Date: Mon Nov 2 00:29:49 UTC 2020 Modified Files: src/distrib/sets/lists/tests: mi src/distrib/sets/lists/xbase: mi Log Message: add missing files (one from me, one from someone else :-) To generate a diff of this commit: cvs rdiff -u -r1.955 -r1.956 src/distrib/sets/lists/tests/mi cvs rdiff -u -r1.160 -r1.161 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/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.955 src/distrib/sets/lists/tests/mi:1.956 --- src/distrib/sets/lists/tests/mi:1.955 Sun Nov 1 22:31:28 2020 +++ src/distrib/sets/lists/tests/mi Mon Nov 2 00:29:49 2020 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.955 2020/11/01 22:31:28 christos Exp $ +# $NetBSD: mi,v 1.956 2020/11/02 00:29:49 mrg Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -4590,6 +4590,7 @@ ./usr/tests/usr.bin/col/rlf2.in tests-usr.bin-tests compattestfile,atf ./usr/tests/usr.bin/col/rlf3.in tests-usr.bin-tests compattestfile,atf ./usr/tests/usr.bin/col/t_col tests-usr.bin-tests compattestfile,atf +./usr/tests/usr.bin/config/t_configtests-usr.bin-tests compattestfile,atf ./usr/tests/usr.bin/cpio tests-usr.bin-tests compattestfile,atf ./usr/tests/usr.bin/cpio/Atffiletests-usr.bin-tests compattestfile,atf ./usr/tests/usr.bin/cpio/Kyuafiletests-usr.bin-tests compattestfile,atf,kyua Index: src/distrib/sets/lists/xbase/mi diff -u src/distrib/sets/lists/xbase/mi:1.160 src/distrib/sets/lists/xbase/mi:1.161 --- src/distrib/sets/lists/xbase/mi:1.160 Wed Oct 28 08:10:08 2020 +++ src/distrib/sets/lists/xbase/mi Mon Nov 2 00:29:49 2020 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.160 2020/10/28 08:10:08 nia Exp $ +# $NetBSD: mi,v 1.161 2020/11/02 00:29:49 mrg Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -896,6 +896,7 @@ ./usr/X11R7/lib/X11/xkb/symbols/dvorak xbase-obsolete obsolete ./usr/X11R7/lib/X11/xkb/symbols/dz xbase-xkeyboard-config-lib xorg ./usr/X11R7/lib/X11/xkb/symbols/ee xbase-xkeyboard-config-lib xorg +./usr/X11R7/lib/X11/xkb/symbols/eg xbase-xkeyboard-config-lib xorg ./usr/X11R7/lib/X11/xkb/symbols/el xbase-obsolete obsolete ./usr/X11R7/lib/X11/xkb/symbols/empty xbase-xkeyboard-config-lib xorg ./usr/X11R7/lib/X11/xkb/symbols/en_US xbase-obsolete obsolete
CVS commit: src/external/mit/xorg/lib/xkeyboard-config
Module Name:src
Committed By: mrg
Date: Mon Nov 2 00:25:46 UTC 2020
Modified Files:
src/external/mit/xorg/lib/xkeyboard-config: Makefile
Log Message:
transform @xkb_base@ instead of __xkb_base__ now.
should fix build issues reported on -current.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 \
src/external/mit/xorg/lib/xkeyboard-config/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/xkeyboard-config/Makefile
diff -u src/external/mit/xorg/lib/xkeyboard-config/Makefile:1.13 src/external/mit/xorg/lib/xkeyboard-config/Makefile:1.14
--- src/external/mit/xorg/lib/xkeyboard-config/Makefile:1.13 Mon Mar 11 06:25:55 2019
+++ src/external/mit/xorg/lib/xkeyboard-config/Makefile Mon Nov 2 00:25:46 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2019/03/11 06:25:55 mrg Exp $
+# $NetBSD: Makefile,v 1.14 2020/11/02 00:25:46 mrg Exp $
.include
@@ -12,7 +12,7 @@ NOOBJ= # defined
PKGCONFIG= xkeyboard-config
X11EXTRAMANTRANSFORMS+= \
- __xkb_base__ ${X11LIBDIR}/xkb
+ @xkb_base@ ${X11LIBDIR}/xkb
.include
.include
CVS commit: src/usr.bin/make
Module Name:src
Committed By: rillig
Date: Sun Nov 1 23:17:40 UTC 2020
Modified Files:
src/usr.bin/make: var.c
Log Message:
make(1): extract ApplyModifiersIndirect from ApplyModifiers
To generate a diff of this commit:
cvs rdiff -u -r1.640 -r1.641 src/usr.bin/make/var.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/make/var.c
diff -u src/usr.bin/make/var.c:1.640 src/usr.bin/make/var.c:1.641
--- src/usr.bin/make/var.c:1.640 Sun Nov 1 22:48:41 2020
+++ src/usr.bin/make/var.c Sun Nov 1 23:17:40 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.640 2020/11/01 22:48:41 rillig Exp $ */
+/* $NetBSD: var.c,v 1.641 2020/11/01 23:17:40 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -130,7 +130,7 @@
#include "metachar.h"
/* "@(#)var.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.640 2020/11/01 22:48:41 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.641 2020/11/01 23:17:40 rillig Exp $");
#define VAR_DEBUG1(fmt, arg1) DEBUG1(VAR, fmt, arg1)
#define VAR_DEBUG2(fmt, arg1, arg2) DEBUG2(VAR, fmt, arg1, arg2)
@@ -3254,6 +3254,83 @@ ApplyModifier(const char **pp, ApplyModi
}
}
+static char *ApplyModifiers(const char **, char *, char, char, Var *,
+ VarExprFlags *, GNode *, VarEvalFlags, void **);
+
+typedef enum ApplyModifiersIndirectResult {
+AMIR_CONTINUE,
+AMIR_APPLY_MODS,
+AMIR_OUT
+} ApplyModifiersIndirectResult;
+
+/* While expanding a variable expression, expand and apply indirect
+ * modifiers. */
+static ApplyModifiersIndirectResult
+ApplyModifiersIndirect(
+ ApplyModifiersState *const st,
+ const char **inout_p,
+ void **const out_freeIt
+) {
+const char *p = *inout_p;
+const char *nested_p = p;
+void *freeIt;
+const char *rval;
+char c;
+
+(void)Var_Parse(_p, st->ctxt, st->eflags, , );
+/* TODO: handle errors */
+
+/*
+ * If we have not parsed up to st->endc or ':', we are not
+ * interested. This means the expression ${VAR:${M_1}${M_2}}
+ * is not accepted, but ${VAR:${M_1}:${M_2}} is.
+ */
+if (rval[0] != '\0' &&
+ (c = *nested_p) != '\0' && c != ':' && c != st->endc) {
+ if (DEBUG(LINT))
+ Parse_Error(PARSE_FATAL,
+ "Missing delimiter ':' after indirect modifier \"%.*s\"",
+ (int)(nested_p - p), p);
+
+ free(freeIt);
+ /* XXX: apply_mods doesn't sound like "not interested". */
+ /* XXX: Why is the indirect modifier parsed again by
+ * apply_mods? If any, p should be advanced to nested_p. */
+ return AMIR_APPLY_MODS;
+}
+
+VAR_DEBUG3("Indirect modifier \"%s\" from \"%.*s\"\n",
+ rval, (int)(size_t)(nested_p - p), p);
+
+p = nested_p;
+
+if (rval[0] != '\0') {
+ const char *rval_pp = rval;
+ st->val = ApplyModifiers(_pp, st->val, '\0', '\0', st->v,
+>exprFlags, st->ctxt, st->eflags, out_freeIt);
+ if (st->val == var_Error
+ || (st->val == varUndefined && !(st->eflags & VARE_UNDEFERR))
+ || *rval_pp != '\0') {
+ free(freeIt);
+ *inout_p = p;
+ return AMIR_OUT; /* error already reported */
+ }
+}
+free(freeIt);
+
+if (*p == ':')
+ p++;
+else if (*p == '\0' && st->endc != '\0') {
+ Error("Unclosed variable specification after complex "
+ "modifier (expecting '%c') for %s", st->endc, st->v->name);
+ *inout_p = p;
+ return AMIR_OUT;
+}
+
+*inout_p = p;
+return AMIR_CONTINUE;
+}
+
/* Apply any modifiers (such as :Mpattern or :@var@loop@ or :Q or ::=value). */
static char *
ApplyModifiers(
@@ -3287,64 +3364,13 @@ ApplyModifiers(
while (*p != '\0' && *p != endc) {
if (*p == '$') {
- /*
- * We may have some complex modifiers in a variable.
- */
- const char *nested_p = p;
- void *freeIt;
- const char *rval;
- char c;
-
- (void)Var_Parse(_p, st.ctxt, st.eflags, , );
- /* TODO: handle errors */
-
- /*
- * If we have not parsed up to st.endc or ':', we are not
- * interested. This means the expression ${VAR:${M_1}${M_2}}
- * is not accepted, but ${VAR:${M_1}:${M_2}} is.
- */
- if (rval[0] != '\0' &&
- (c = *nested_p) != '\0' && c != ':' && c != st.endc) {
- if (DEBUG(LINT))
- Parse_Error(PARSE_FATAL,
-"Missing delimiter ':' after indirect modifier \"%.*s\"",
-(int)(nested_p - p), p);
-
- free(freeIt);
- /* XXX: apply_mods doesn't sound like "not interested". */
- /* XXX: Why is the indirect modifier parsed again by
- * apply_mods? If any, p should be advanced to nested_p. */
- goto apply_mods;
- }
-
- VAR_DEBUG3("Indirect modifier \"%s\" from \"%.*s\"\n",
- rval, (int)(size_t)(nested_p - p), p);
-
- p = nested_p;
-
- if (rval[0] != '\0') {
- const char *rval_pp = rval;
- st.val = ApplyModifiers(_pp, st.val, '\0', '\0', v,
- , ctxt, eflags, out_freeIt);
- if (st.val == var_Error
- || (st.val == varUndefined && !(st.eflags & VARE_UNDEFERR))
- ||
CVS commit: src/usr.bin/make
Module Name:src
Committed By: rillig
Date: Sun Nov 1 22:48:41 UTC 2020
Modified Files:
src/usr.bin/make: var.c
Log Message:
make(1): rename local variable in ApplyModifiers
To generate a diff of this commit:
cvs rdiff -u -r1.639 -r1.640 src/usr.bin/make/var.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/make/var.c
diff -u src/usr.bin/make/var.c:1.639 src/usr.bin/make/var.c:1.640
--- src/usr.bin/make/var.c:1.639 Sun Nov 1 22:12:54 2020
+++ src/usr.bin/make/var.c Sun Nov 1 22:48:41 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.639 2020/11/01 22:12:54 rillig Exp $ */
+/* $NetBSD: var.c,v 1.640 2020/11/01 22:48:41 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -130,7 +130,7 @@
#include "metachar.h"
/* "@(#)var.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.639 2020/11/01 22:12:54 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.640 2020/11/01 22:48:41 rillig Exp $");
#define VAR_DEBUG1(fmt, arg1) DEBUG1(VAR, fmt, arg1)
#define VAR_DEBUG2(fmt, arg1, arg2) DEBUG2(VAR, fmt, arg1, arg2)
@@ -2951,7 +2951,7 @@ ApplyModifier_Assign(const char **pp, Ap
const char *op = mod + 1;
if (op[0] == '=')
-goto ok;
+ goto ok;
if ((op[0] == '!' || op[0] == '+' || op[0] == '?') && op[1] == '=')
goto ok;
return AMR_UNKNOWN; /* "::" */
@@ -3105,15 +3105,12 @@ ApplyModifier_SysV(const char **pp, Appl
if (res != VPR_OK)
return AMR_CLEANUP;
+/* The SysV modifier lasts until the end of the variable expression. */
res = ParseModifierPart(pp, st->endc, st->eflags, st,
, NULL, NULL, NULL);
if (res != VPR_OK)
return AMR_CLEANUP;
-/*
- * SYSV modifications happen through the whole
- * string. Note the pattern is anchored at the end.
- */
(*pp)--;
if (lhs[0] == '\0' && st->val[0] == '\0') {
st->newVal = st->val; /* special case */
@@ -3261,17 +3258,18 @@ ApplyModifier(const char **pp, ApplyModi
static char *
ApplyModifiers(
const char **pp, /* the parsing position, updated upon return */
-char *val, /* the current value of the variable */
+char *const val, /* the current value of the expression */
char const startc, /* '(' or '{', or '\0' for indirect modifiers */
char const endc, /* ')' or '}', or '\0' for indirect modifiers */
Var * const v,
VarExprFlags *exprFlags,
GNode * const ctxt, /* for looking up and modifying variables */
VarEvalFlags const eflags,
-void ** const freePtr /* free this after using the return value */
+void ** const out_freeIt /* free this after using the return value */
) {
ApplyModifiersState st = {
- startc, endc, v, ctxt, eflags, val,
+ startc, endc, v, ctxt, eflags,
+ val, /* .val */
var_Error, /* .newVal */
' ', /* .sep */
FALSE, /* .oneBigWord */
@@ -3327,7 +3325,7 @@ ApplyModifiers(
if (rval[0] != '\0') {
const char *rval_pp = rval;
st.val = ApplyModifiers(_pp, st.val, '\0', '\0', v,
- , ctxt, eflags, freePtr);
+ , ctxt, eflags, out_freeIt);
if (st.val == var_Error
|| (st.val == varUndefined && !(st.eflags & VARE_UNDEFERR))
|| *rval_pp != '\0') {
@@ -3377,14 +3375,14 @@ ApplyModifiers(
LogAfterApply(, p, mod);
if (st.newVal != st.val) {
- if (*freePtr) {
+ if (*out_freeIt) {
free(st.val);
- *freePtr = NULL;
+ *out_freeIt = NULL;
}
st.val = st.newVal;
if (st.val != var_Error && st.val != varUndefined &&
st.val != emptyString) {
- *freePtr = st.val;
+ *out_freeIt = st.val;
}
}
if (*p == '\0' && st.endc != '\0') {
@@ -3411,8 +3409,8 @@ bad_modifier:
cleanup:
*pp = p;
-free(*freePtr);
-*freePtr = NULL;
+free(*out_freeIt);
+*out_freeIt = NULL;
*exprFlags = st.exprFlags;
return var_Error;
}
CVS commit: src/distrib/sets/lists/tests
Module Name:src Committed By: christos Date: Sun Nov 1 22:31:28 UTC 2020 Modified Files: src/distrib/sets/lists/tests: mi Log Message: Add tests for col To generate a diff of this commit: cvs rdiff -u -r1.954 -r1.955 src/distrib/sets/lists/tests/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.954 src/distrib/sets/lists/tests/mi:1.955 --- src/distrib/sets/lists/tests/mi:1.954 Sat Oct 31 07:30:56 2020 +++ src/distrib/sets/lists/tests/mi Sun Nov 1 17:31:28 2020 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.954 2020/10/31 11:30:56 rillig Exp $ +# $NetBSD: mi,v 1.955 2020/11/01 22:31:28 christos Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -4578,8 +4578,19 @@ ./usr/tests/usr.bin/config/support/conf tests-usr.bin-tests compattestfile,atf ./usr/tests/usr.bin/config/support/conf/Makefile.kern.inc tests-usr.bin-tests compattestfile,atf ./usr/tests/usr.bin/config/support/conf/files tests-usr.bin-tests compattestfile,atf -./usr/tests/usr.bin/config/t_config tests-usr.bin-tests compattestfile,atf -./usr/tests/usr.bin/cpiotests-usr.bin-tests compattestfile,atf +./usr/tests/usr.bin/config/t_confi g tests-usr.bin-tests compattestfile,atf +./usr/tests/usr.bin/col tests-usr.bin-tests compattestfile,atf +./usr/tests/usr.bin/col/Atffile tests-usr.bin-tests compattestfile,atf +./usr/tests/usr.bin/col/hlf.in tests-usr.bin-tests compattestfile,atf +./usr/tests/usr.bin/col/hlf2.in tests-usr.bin-tests compattestfile,atf +./usr/tests/usr.bin/col/nl.in tests-usr.bin-tests compattestfile,atf +./usr/tests/usr.bin/col/nl2.in tests-usr.bin-tests compattestfile,atf +./usr/tests/usr.bin/col/nl3.in tests-usr.bin-tests compattestfile,atf +./usr/tests/usr.bin/col/rlf.in tests-usr.bin-tests compattestfile,atf +./usr/tests/usr.bin/col/rlf2.in tests-usr.bin-tests compattestfile,atf +./usr/tests/usr.bin/col/rlf3.in tests-usr.bin-tests compattestfile,atf +./usr/tests/usr.bin/col/t_col tests-usr.bin-tests compattestfile,atf +./usr/tests/usr.bin/cpio tests-usr.bin-tests compattestfile,atf ./usr/tests/usr.bin/cpio/Atffiletests-usr.bin-tests compattestfile,atf ./usr/tests/usr.bin/cpio/Kyuafiletests-usr.bin-tests compattestfile,atf,kyua ./usr/tests/usr.bin/cpio/h_cpio tests-usr.bin-tests compattestfile,atf
CVS commit: src/etc/mtree
Module Name:src Committed By: christos Date: Sun Nov 1 22:29:14 UTC 2020 Modified Files: src/etc/mtree: NetBSD.dist.tests Log Message: Add col tests To generate a diff of this commit: cvs rdiff -u -r1.181 -r1.182 src/etc/mtree/NetBSD.dist.tests Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/mtree/NetBSD.dist.tests diff -u src/etc/mtree/NetBSD.dist.tests:1.181 src/etc/mtree/NetBSD.dist.tests:1.182 --- src/etc/mtree/NetBSD.dist.tests:1.181 Thu Oct 15 13:44:44 2020 +++ src/etc/mtree/NetBSD.dist.tests Sun Nov 1 17:29:13 2020 @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.tests,v 1.181 2020/10/15 17:44:44 mgorny Exp $ +# $NetBSD: NetBSD.dist.tests,v 1.182 2020/11/01 22:29:13 christos Exp $ ./usr/libdata/debug/usr/tests ./usr/libdata/debug/usr/tests/atf @@ -417,6 +417,7 @@ ./usr/tests/usr.bin/config/support/arch/regress ./usr/tests/usr.bin/config/support/arch/regress/conf ./usr/tests/usr.bin/config/support/conf +./usr/tests/usr.bin/col ./usr/tests/usr.bin/cpio ./usr/tests/usr.bin/cut ./usr/tests/usr.bin/diff
CVS commit: src/usr.bin/make/unit-tests
Module Name:src
Committed By: rillig
Date: Sun Nov 1 22:28:53 UTC 2020
Modified Files:
src/usr.bin/make/unit-tests: varmod-sysv.exp varmod-sysv.mk
Log Message:
make(1): add another test case for the SysV modifier
The "special case" in ApplyModifier_SysV looks redundant since in
SysVMatch, the empty word does not match anything.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/usr.bin/make/unit-tests/varmod-sysv.exp
cvs rdiff -u -r1.10 -r1.11 src/usr.bin/make/unit-tests/varmod-sysv.mk
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/unit-tests/varmod-sysv.exp
diff -u src/usr.bin/make/unit-tests/varmod-sysv.exp:1.4 src/usr.bin/make/unit-tests/varmod-sysv.exp:1.5
--- src/usr.bin/make/unit-tests/varmod-sysv.exp:1.4 Sun Nov 1 22:10:57 2020
+++ src/usr.bin/make/unit-tests/varmod-sysv.exp Sun Nov 1 22:28:52 2020
@@ -1,5 +1,5 @@
make: Unfinished modifier for word203 ('=' missing)
-make: "varmod-sysv.mk" line 203: Malformed conditional (${word203:L:from${:D=}to})
+make: "varmod-sysv.mk" line 210: Malformed conditional (${word203:L:from${:D=}to})
make: Fatal errors encountered -- cannot continue
make: stopped in unit-tests
exit status 1
Index: src/usr.bin/make/unit-tests/varmod-sysv.mk
diff -u src/usr.bin/make/unit-tests/varmod-sysv.mk:1.10 src/usr.bin/make/unit-tests/varmod-sysv.mk:1.11
--- src/usr.bin/make/unit-tests/varmod-sysv.mk:1.10 Sun Nov 1 22:10:57 2020
+++ src/usr.bin/make/unit-tests/varmod-sysv.mk Sun Nov 1 22:28:52 2020
@@ -1,4 +1,4 @@
-# $NetBSD: varmod-sysv.mk,v 1.10 2020/11/01 22:10:57 rillig Exp $
+# $NetBSD: varmod-sysv.mk,v 1.11 2020/11/01 22:28:52 rillig Exp $
#
# Tests for the ${VAR:from=to} variable modifier, which replaces the suffix
# "from" with "to". It can also use '%' as a wildcard.
@@ -74,13 +74,20 @@
. error
.endif
-# If the variable is empty, it is debatable whether it consists of a single
-# empty word, or no word at all. The :from=to modifier treats it as no
-# word at all.
+# If the variable value is empty, it is debatable whether it consists of a
+# single empty word, or no word at all. The :from=to modifier treats it as
+# no word at all.
.if ${:L:=suffix} != ""
. error
.endif
+# If the variable value is empty, it is debatable whether it consists of a
+# single empty word, or no word at all. The :from=to modifier treats it as
+# no word at all.
+.if ${:L:%=suffix} != ""
+. error
+.endif
+
# Before 2020-07-19, an ampersand could be used in the replacement part
# of a SysV substitution modifier, and it was replaced with the whole match,
# just like in the :S modifier.
CVS commit: src/tests/usr.bin
Module Name:src
Committed By: christos
Date: Sun Nov 1 22:28:33 UTC 2020
Modified Files:
src/tests/usr.bin: Makefile
Added Files:
src/tests/usr.bin/col: Makefile hlf.in hlf2.in nl.in nl2.in nl3.in
rlf.in rlf2.in rlf3.in t_col.sh
Log Message:
Add unit-tests for col from FreeBSD
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/tests/usr.bin/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/usr.bin/col/Makefile \
src/tests/usr.bin/col/hlf.in src/tests/usr.bin/col/hlf2.in \
src/tests/usr.bin/col/nl.in src/tests/usr.bin/col/nl2.in \
src/tests/usr.bin/col/nl3.in src/tests/usr.bin/col/rlf.in \
src/tests/usr.bin/col/rlf2.in src/tests/usr.bin/col/rlf3.in \
src/tests/usr.bin/col/t_col.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/usr.bin/Makefile
diff -u src/tests/usr.bin/Makefile:1.33 src/tests/usr.bin/Makefile:1.34
--- src/tests/usr.bin/Makefile:1.33 Fri Jul 3 00:25:28 2020
+++ src/tests/usr.bin/Makefile Sun Nov 1 17:28:32 2020
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.33 2020/07/03 04:25:28 jruoho Exp $
+# $NetBSD: Makefile,v 1.34 2020/11/01 22:28:32 christos Exp $
#
.include
TESTSDIR= ${TESTSBASE}/usr.bin
-TESTS_SUBDIRS= awk basename bzip2 cc cmp config cpio cut \
+TESTS_SUBDIRS= awk basename bzip2 cc cmp config cpio col cut \
diff dirname find fstat gdb grep gzip id indent \
infocmp jot ld locale m4 make mixerctl mkdep nbperf \
netpgpverify patch pkill pr printf pwhash rump_server \
Added files:
Index: src/tests/usr.bin/col/Makefile
diff -u /dev/null src/tests/usr.bin/col/Makefile:1.1
--- /dev/null Sun Nov 1 17:28:33 2020
+++ src/tests/usr.bin/col/Makefile Sun Nov 1 17:28:32 2020
@@ -0,0 +1,19 @@
+# $FreeBSD: head/usr.bin/col/tests/Makefile 366577 2020-10-09 15:27:37Z markj $
+
+PACKAGE= tests
+
+TESTSDIR= ${TESTSBASE}/usr.bin/col
+TESTS_SH= t_col
+
+FILESDIR= ${TESTSDIR}
+FILES+= \
+ hlf.in \
+ hlf2.in \
+ nl.in \
+ nl2.in \
+ nl3.in \
+ rlf.in \
+ rlf2.in \
+ rlf3.in
+
+.include
Index: src/tests/usr.bin/col/hlf.in
diff -u /dev/null src/tests/usr.bin/col/hlf.in:1.1
--- /dev/null Sun Nov 1 17:28:33 2020
+++ src/tests/usr.bin/col/hlf.in Sun Nov 1 17:28:32 2020
@@ -0,0 +1,2 @@
+a
+a8f8f
Index: src/tests/usr.bin/col/hlf2.in
diff -u /dev/null src/tests/usr.bin/col/hlf2.in:1.1
--- /dev/null Sun Nov 1 17:28:33 2020
+++ src/tests/usr.bin/col/hlf2.in Sun Nov 1 17:28:32 2020
@@ -0,0 +1 @@
+a9f
Index: src/tests/usr.bin/col/nl.in
diff -u /dev/null src/tests/usr.bin/col/nl.in:1.1
--- /dev/null Sun Nov 1 17:28:33 2020
+++ src/tests/usr.bin/col/nl.in Sun Nov 1 17:28:32 2020
@@ -0,0 +1,2 @@
+a
+b
Index: src/tests/usr.bin/col/nl2.in
diff -u /dev/null src/tests/usr.bin/col/nl2.in:1.1
--- /dev/null Sun Nov 1 17:28:33 2020
+++ src/tests/usr.bin/col/nl2.in Sun Nov 1 17:28:32 2020
@@ -0,0 +1,2 @@
+a
+b
\ No newline at end of file
Index: src/tests/usr.bin/col/nl3.in
diff -u /dev/null src/tests/usr.bin/col/nl3.in:1.1
--- /dev/null Sun Nov 1 17:28:33 2020
+++ src/tests/usr.bin/col/nl3.in Sun Nov 1 17:28:32 2020
@@ -0,0 +1,4 @@
+a
+
+b
+
Index: src/tests/usr.bin/col/rlf.in
diff -u /dev/null src/tests/usr.bin/col/rlf.in:1.1
--- /dev/null Sun Nov 1 17:28:33 2020
+++ src/tests/usr.bin/col/rlf.in Sun Nov 1 17:28:32 2020
@@ -0,0 +1,2 @@
+a
+ 7b
Index: src/tests/usr.bin/col/rlf2.in
diff -u /dev/null src/tests/usr.bin/col/rlf2.in:1.1
--- /dev/null Sun Nov 1 17:28:33 2020
+++ src/tests/usr.bin/col/rlf2.in Sun Nov 1 17:28:32 2020
@@ -0,0 +1,2 @@
+a
+ 7b
Index: src/tests/usr.bin/col/rlf3.in
diff -u /dev/null src/tests/usr.bin/col/rlf3.in:1.1
--- /dev/null Sun Nov 1 17:28:33 2020
+++ src/tests/usr.bin/col/rlf3.in Sun Nov 1 17:28:32 2020
@@ -0,0 +1 @@
+a b
Index: src/tests/usr.bin/col/t_col.sh
diff -u /dev/null src/tests/usr.bin/col/t_col.sh:1.1
--- /dev/null Sun Nov 1 17:28:33 2020
+++ src/tests/usr.bin/col/t_col.sh Sun Nov 1 17:28:32 2020
@@ -0,0 +1,114 @@
+#!/usr/bin/atf-sh
+# $FreeBSD: head/usr.bin/col/tests/col_test.sh 366577 2020-10-09 15:27:37Z markj $
+
+atf_test_case nl
+
+nl_head()
+{
+ atf_set "descr" "testing just newlines"
+}
+nl_body()
+{
+ atf_check \
+ -o inline:"a\nb\n" \
+ -e empty \
+ -s exit:0 \
+ col < $(atf_get_srcdir)/nl.in
+
+ atf_check \
+ -o inline:"a\nb\n" \
+ -e empty \
+ -s exit:0 \
+ col -f < $(atf_get_srcdir)/nl.in
+
+ atf_check \
+ -o inline:"a\nb\n" \
+ -e empty \
+ -s exit:0 \
+ col < $(atf_get_srcdir)/nl2.in
+
+ atf_check \
+ -o inline:"a\nb\n" \
+ -e empty \
+ -s exit:0 \
+ col -f < $(atf_get_srcdir)/nl2.in
+
+ atf_check \
+ -o inline:"a\n\nb\n\n" \
+ -e empty \
+ -s exit:0 \
+ col < $(atf_get_srcdir)/nl3.in
+}
+
+atf_test_case rlf
+
+rlf_head()
+{
+ atf_set "descr" "testing reverse line feed"
+}
+rlf_body()
+{
+ atf_check \
+ -o inline:"a b\n" \
+ -e empty \
+ -s exit:0 \
+ col < $(atf_get_srcdir)/rlf.in
+
+ atf_check \
+ -o inline:"a
CVS commit: src/usr.bin/col
Module Name:src Committed By: christos Date: Sun Nov 1 22:27:15 UTC 2020 Modified Files: src/usr.bin/col: Makefile col.1 col.c Log Message: Replace col with the FreeBSD version that adds wide char support To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/usr.bin/col/Makefile cvs rdiff -u -r1.10 -r1.11 src/usr.bin/col/col.1 cvs rdiff -u -r1.18 -r1.19 src/usr.bin/col/col.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/col/Makefile diff -u src/usr.bin/col/Makefile:1.5 src/usr.bin/col/Makefile:1.6 --- src/usr.bin/col/Makefile:1.5 Tue Apr 14 18:15:18 2009 +++ src/usr.bin/col/Makefile Sun Nov 1 17:27:15 2020 @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.5 2009/04/14 22:15:18 lukem Exp $ +# $NetBSD: Makefile,v 1.6 2020/11/01 22:27:15 christos Exp $ # @(#)Makefile 8.1 (Berkeley) 6/6/93 +WARNS=6 PROG= col .include Index: src/usr.bin/col/col.1 diff -u src/usr.bin/col/col.1:1.10 src/usr.bin/col/col.1:1.11 --- src/usr.bin/col/col.1:1.10 Thu Mar 22 03:58:18 2012 +++ src/usr.bin/col/col.1 Sun Nov 1 17:27:15 2020 @@ -1,5 +1,4 @@ -.\" $NetBSD: col.1,v 1.10 2012/03/22 07:58:18 wiz Exp $ -.\" +.\" $NetBSD: col.1,v 1.11 2020/11/01 22:27:15 christos Exp $ .\" Copyright (c) 1990, 1993 .\" The Regents of the University of California. All rights reserved. .\" @@ -31,8 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)col.1 8.1 (Berkeley) 6/29/93 +.\" $FreeBSD: head/usr.bin/col/col.1 366913 2020-10-21 16:30:34Z fernape $ .\" -.Dd February 22, 1999 +.Dd November 1, 2020 .Dt COL 1 .Os .Sh NAME @@ -40,23 +40,21 @@ .Nd filter reverse line feeds from input .Sh SYNOPSIS .Nm -.Op Fl bfpx +.Op Fl bfhpx .Op Fl l Ar num .Sh DESCRIPTION +The .Nm -filters out reverse (and half reverse) line feeds so that the output is +utility filters out reverse (and half reverse) line feeds so that the output is in the correct order with only forward and half forward line feeds, and replaces white-space characters with tabs where possible. -This can be useful in processing the output of -.Xr nroff 1 -and -.Xr tbl 1 . .Pp +The .Nm -reads from the standard input and writes to the standard output. +utility reads from the standard input and writes to the standard output. .Pp The options are as follows: -.Bl -tag -width "-l num " +.Bl -tag -width indent .It Fl b Do not output any backspaces, printing only the last character written to each column position. @@ -64,6 +62,13 @@ written to each column position. Forward half line feeds are permitted (``fine'' mode). Normally characters printed on a half line boundary are printed on the following line. +.It Fl h +Do not output multiple spaces instead of tabs (default). +.It Fl l Ar num +Buffer at least +.Ar num +lines in memory. +By default, 128 lines are buffered. .It Fl p Force unknown control sequences to be passed through unchanged. Normally, @@ -72,25 +77,35 @@ will filter out any control sequences fr recognized and interpreted by itself, which are listed below. .It Fl x Output multiple spaces instead of tabs. -.It Fl l Ar num -Buffer at least -.Ar num -lines in memory. -By default, 128 lines are buffered. .El .Pp -The control sequences for carriage motion that +In the input stream, .Nm -understands and their decimal values are listed in the following -table: +understands both the escape sequences of the form escape-digit +mandated by +.St -susv2 +and the traditional +.Bx +format escape-control-character. +The control sequences for carriage motion and their ASCII values +are as follows: .Pp .Bl -tag -width "carriage return" -compact +.It ESC\-BELL +reverse line feed (escape then bell). .It ESC\-7 -reverse line feed (escape then 7) +reverse line feed (escape then 7). +.It ESC\-BACKSPACE +half reverse line feed (escape then backspace). .It ESC\-8 -half reverse line feed (escape then 8) +half reverse line feed (escape then 8). +.It ESC\-TAB +half forward line feed (escape than tab). .It ESC\-9 -half forward line feed (escape then 9) +half forward line feed (escape then 9). +In +.Fl f +mode, this sequence may also occur in the output stream. .It backspace moves back one column (8); ignored in the first column .It carriage return @@ -100,7 +115,7 @@ forward line feed (10); also does carria .It shift in shift to normal character set (15) .It shift out -shift to alternative character set (14) +shift to alternate character set (14) .It space moves forward one column (32) .It tab @@ -112,27 +127,46 @@ reverse line feed (11) All unrecognized control characters and escape sequences are discarded. .Pp +The .Nm -keeps track of the character set as characters are read and makes +utility keeps track of the character set as characters are read and makes sure the character set is correct when they are output. .Pp If the input attempts to back up to the last flushed line, .Nm will display a warning message. +.Sh ENVIRONMENT
CVS commit: src/usr.bin/make
Module Name:src
Committed By: rillig
Date: Sun Nov 1 22:12:55 UTC 2020
Modified Files:
src/usr.bin/make: var.c
Log Message:
make(1): rename local variables in ApplyModifier_SysV
To generate a diff of this commit:
cvs rdiff -u -r1.638 -r1.639 src/usr.bin/make/var.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/make/var.c
diff -u src/usr.bin/make/var.c:1.638 src/usr.bin/make/var.c:1.639
--- src/usr.bin/make/var.c:1.638 Sun Nov 1 21:28:42 2020
+++ src/usr.bin/make/var.c Sun Nov 1 22:12:54 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.638 2020/11/01 21:28:42 rillig Exp $ */
+/* $NetBSD: var.c,v 1.639 2020/11/01 22:12:54 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -130,7 +130,7 @@
#include "metachar.h"
/* "@(#)var.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.638 2020/11/01 21:28:42 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.639 2020/11/01 22:12:54 rillig Exp $");
#define VAR_DEBUG1(fmt, arg1) DEBUG1(VAR, fmt, arg1)
#define VAR_DEBUG2(fmt, arg1, arg2) DEBUG2(VAR, fmt, arg1, arg2)
@@ -3018,7 +3018,8 @@ ok:
return AMR_OK;
}
-/* remember current value */
+/* :_=...
+ * remember current value */
static ApplyModifierResult
ApplyModifier_Remember(const char **pp, ApplyModifiersState *st)
{
@@ -3040,7 +3041,8 @@ ApplyModifier_Remember(const char **pp,
return AMR_OK;
}
-/* Apply the given function to each word of the variable value. */
+/* Apply the given function to each word of the variable value,
+ * for a single-letter modifier such as :H, :T. */
static ApplyModifierResult
ApplyModifier_WordFunc(const char **pp, ApplyModifiersState *st,
ModifyWordsCallback modifyWord)
@@ -3078,24 +3080,23 @@ ApplyModifier_SysV(const char **pp, Appl
Boolean eqFound = FALSE;
/*
- * First we make a pass through the string trying
- * to verify it is a SYSV-make-style translation:
- * it must be: =)
+ * First we make a pass through the string trying to verify it is a
+ * SysV-make-style translation. It must be: =
*/
-int nest = 1;
-const char *next = mod;
-while (*next != '\0' && nest > 0) {
- if (*next == '=') {
+int depth = 1;
+const char *p = mod;
+while (*p != '\0' && depth > 0) {
+ if (*p == '=') { /* XXX: should also test depth == 1 */
eqFound = TRUE;
/* continue looking for st->endc */
- } else if (*next == st->endc)
- nest--;
- else if (*next == st->startc)
- nest++;
- if (nest > 0)
- next++;
+ } else if (*p == st->endc)
+ depth--;
+ else if (*p == st->startc)
+ depth++;
+ if (depth > 0)
+ p++;
}
-if (*next != st->endc || !eqFound)
+if (*p != st->endc || !eqFound)
return AMR_UNKNOWN;
*pp = mod;
CVS commit: src/usr.bin/make/unit-tests
Module Name:src
Committed By: rillig
Date: Sun Nov 1 22:10:57 UTC 2020
Modified Files:
src/usr.bin/make/unit-tests: varmod-sysv.exp varmod-sysv.mk
Log Message:
make(1): add tests for parsing the SysV variable modifier
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/make/unit-tests/varmod-sysv.exp
cvs rdiff -u -r1.9 -r1.10 src/usr.bin/make/unit-tests/varmod-sysv.mk
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/unit-tests/varmod-sysv.exp
diff -u src/usr.bin/make/unit-tests/varmod-sysv.exp:1.3 src/usr.bin/make/unit-tests/varmod-sysv.exp:1.4
--- src/usr.bin/make/unit-tests/varmod-sysv.exp:1.3 Tue Oct 6 21:05:21 2020
+++ src/usr.bin/make/unit-tests/varmod-sysv.exp Sun Nov 1 22:10:57 2020
@@ -1 +1,5 @@
-exit status 0
+make: Unfinished modifier for word203 ('=' missing)
+make: "varmod-sysv.mk" line 203: Malformed conditional (${word203:L:from${:D=}to})
+make: Fatal errors encountered -- cannot continue
+make: stopped in unit-tests
+exit status 1
Index: src/usr.bin/make/unit-tests/varmod-sysv.mk
diff -u src/usr.bin/make/unit-tests/varmod-sysv.mk:1.9 src/usr.bin/make/unit-tests/varmod-sysv.mk:1.10
--- src/usr.bin/make/unit-tests/varmod-sysv.mk:1.9 Sat Oct 31 11:06:24 2020
+++ src/usr.bin/make/unit-tests/varmod-sysv.mk Sun Nov 1 22:10:57 2020
@@ -1,4 +1,4 @@
-# $NetBSD: varmod-sysv.mk,v 1.9 2020/10/31 11:06:24 rillig Exp $
+# $NetBSD: varmod-sysv.mk,v 1.10 2020/11/01 22:10:57 rillig Exp $
#
# Tests for the ${VAR:from=to} variable modifier, which replaces the suffix
# "from" with "to". It can also use '%' as a wildcard.
@@ -196,6 +196,25 @@
. error
.endif
+# This is not a SysV modifier since the nested variable expression expands
+# to an empty string. The '=' in it should be irrelevant during parsing.
+# As of 2020-11-01, this seemingly correct modifier leads to a parse error.
+# XXX
+.if ${word203:L:from${:D=}to}
+. error
+.endif
+
+# XXX: This specially constructed case demonstrates that the SysV modifier
+# lasts longer than expected. The whole expression initially has the value
+# "fromto}...". The next modifier is a SysV modifier. ApplyModifier_SysV
+# parses the modifier as "from${:D=}to", ending at the '}'. Next, the two
+# parts of the modifier are parsed using ParseModifierPart, which scans
+# differently, properly handling nested variable expressions. The two parts
+# are now "fromto}..." and "replaced".
+.if "${:Ufromto\}...:from${:D=}to}...=replaced}" != "replaced"
+. error
+.endif
+
# As of 2020-10-06, the right-hand side of the SysV modifier is expanded
# twice. The first expansion happens in ApplyModifier_SysV, where the
# modifier is split into its two parts. The second expansion happens
CVS commit: src/usr.bin/make
Module Name:src
Committed By: rillig
Date: Sun Nov 1 21:28:42 UTC 2020
Modified Files:
src/usr.bin/make: var.c
Log Message:
make(1): reduce number of nested parentheses in ApplyModifier_Assign
To generate a diff of this commit:
cvs rdiff -u -r1.637 -r1.638 src/usr.bin/make/var.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/make/var.c
diff -u src/usr.bin/make/var.c:1.637 src/usr.bin/make/var.c:1.638
--- src/usr.bin/make/var.c:1.637 Sun Nov 1 18:48:13 2020
+++ src/usr.bin/make/var.c Sun Nov 1 21:28:42 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.637 2020/11/01 18:48:13 rillig Exp $ */
+/* $NetBSD: var.c,v 1.638 2020/11/01 21:28:42 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -130,7 +130,7 @@
#include "metachar.h"
/* "@(#)var.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.637 2020/11/01 18:48:13 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.638 2020/11/01 21:28:42 rillig Exp $");
#define VAR_DEBUG1(fmt, arg1) DEBUG1(VAR, fmt, arg1)
#define VAR_DEBUG2(fmt, arg1, arg2) DEBUG2(VAR, fmt, arg1, arg2)
@@ -2949,11 +2949,13 @@ ApplyModifier_Assign(const char **pp, Ap
const char *mod = *pp;
const char *op = mod + 1;
-if (!(op[0] == '=' ||
- (op[1] == '=' &&
- (op[0] == '!' || op[0] == '+' || op[0] == '?'
- return AMR_UNKNOWN; /* "::" */
+if (op[0] == '=')
+goto ok;
+if ((op[0] == '!' || op[0] == '+' || op[0] == '?') && op[1] == '=')
+ goto ok;
+return AMR_UNKNOWN; /* "::" */
+ok:
if (st->v->name[0] == '\0') {
*pp = mod + 1;
CVS commit: src/usr.bin/find
Module Name:src Committed By: kim Date: Sun Nov 1 21:11:49 UTC 2020 Modified Files: src/usr.bin/find: find.1 Log Message: Bump date (for "-not") To generate a diff of this commit: cvs rdiff -u -r1.91 -r1.92 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.91 src/usr.bin/find/find.1:1.92 --- src/usr.bin/find/find.1:1.91 Sun Nov 1 16:47:29 2020 +++ src/usr.bin/find/find.1 Sun Nov 1 21:11:49 2020 @@ -1,4 +1,4 @@ -.\" $NetBSD: find.1,v 1.91 2020/11/01 16:47:29 wiz Exp $ +.\" $NetBSD: find.1,v 1.92 2020/11/01 21:11:49 kim Exp $ .\" .\" Copyright (c) 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -32,7 +32,7 @@ .\" .\" from: @(#)find.1 8.7 (Berkeley) 5/9/95 .\" -.Dd June 13, 2016 +.Dd November 1, 2020 .Dt FIND 1 .Os .Sh NAME
CVS commit: src/sys/arch/riscv
Module Name:src
Committed By: skrll
Date: Sun Nov 1 21:09:48 UTC 2020
Modified Files:
src/sys/arch/riscv/include: sysreg.h
src/sys/arch/riscv/riscv: trap.c
Log Message:
Update CAUSE_* defines to reflect riscv-privileged-20190608.pdf
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/riscv/include/sysreg.h
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/riscv/riscv/trap.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/riscv/include/sysreg.h
diff -u src/sys/arch/riscv/include/sysreg.h:1.5 src/sys/arch/riscv/include/sysreg.h:1.6
--- src/sys/arch/riscv/include/sysreg.h:1.5 Sat Mar 14 16:12:16 2020
+++ src/sys/arch/riscv/include/sysreg.h Sun Nov 1 21:09:48 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: sysreg.h,v 1.5 2020/03/14 16:12:16 skrll Exp $ */
+/* $NetBSD: sysreg.h,v 1.6 2020/11/01 21:09:48 skrll Exp $ */
/*
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -155,18 +155,24 @@ riscvreg_status_set(uint32_t __mask)
}
// Cause register
-#define CAUSE_MISALIGNED_FETCH 0
-#define CAUSE_FAULT_FETCH 1
+#define CAUSE_FETCH_MISALIGNED 0
+#define CAUSE_FETCH_ACCESS 1
#define CAUSE_ILLEGAL_INSTRUCTION 2
-#define CAUSE_PRIVILEGED_INSTRUCTION 3
-#define CAUSE_MISALIGNED_LOAD 4
-#define CAUSE_FAULT_LOAD 5
-#define CAUSE_MISALIGNED_STORE 6
-#define CAUSE_FAULT_STORE 7
+#define CAUSE_BREAKPOINT 3
+#define CAUSE_LOAD_MISALIGNED 4
+#define CAUSE_LOAD_ACCESS 5
+#define CAUSE_STORE_MISALIGNED 6
+#define CAUSE_STORE_ACCESS 7
#define CAUSE_SYSCALL 8
-#define CAUSE_BREAKPOINT 9
-#define CAUSE_FP_DISABLED 10
-#define CAUSE_ACCELERATOR_DISABLED 12
+#define CAUSE_USER_ECALL 8
+#define CAUSE_SUPERVISOR_ECALL 9
+/* 10 is reserved */
+#define CAUSE_MACHINE_ECALL 11
+#define CAUSE_FETCH_PAGE_FAULT 12
+#define CAUSE_LOAD_PAGE_FAULT 13
+/* 14 is Reserved */
+#define CAUSE_STORE_PAGE_FAULT 15
+/* >= 16 is reserved */
static inline uint64_t
riscvreg_cycle_read(void)
Index: src/sys/arch/riscv/riscv/trap.c
diff -u src/sys/arch/riscv/riscv/trap.c:1.9 src/sys/arch/riscv/riscv/trap.c:1.10
--- src/sys/arch/riscv/riscv/trap.c:1.9 Sun Nov 1 21:06:22 2020
+++ src/sys/arch/riscv/riscv/trap.c Sun Nov 1 21:09:48 2020
@@ -32,7 +32,7 @@
#define __PMAP_PRIVATE
#define __UFETCHSTORE_PRIVATE
-__RCSID("$NetBSD: trap.c,v 1.9 2020/11/01 21:06:22 skrll Exp $");
+__RCSID("$NetBSD: trap.c,v 1.10 2020/11/01 21:09:48 skrll Exp $");
#include
#include
@@ -46,27 +46,24 @@ __RCSID("$NetBSD: trap.c,v 1.9 2020/11/0
#include
-#define INSTRUCTION_TRAP_MASK (__BIT(CAUSE_PRIVILEGED_INSTRUCTION) \
-|__BIT(CAUSE_ILLEGAL_INSTRUCTION))
+#define INSTRUCTION_TRAP_MASK (__BIT(CAUSE_ILLEGAL_INSTRUCTION))
-#define FAULT_TRAP_MASK (__BIT(CAUSE_FAULT_FETCH) \
-|__BIT(CAUSE_FAULT_LOAD) \
-|__BIT(CAUSE_FAULT_STORE))
-
-#define MISALIGNED_TRAP_MASK (__BIT(CAUSE_MISALIGNED_FETCH) \
-|__BIT(CAUSE_MISALIGNED_LOAD) \
-|__BIT(CAUSE_MISALIGNED_STORE))
+#define FAULT_TRAP_MASK (__BIT(CAUSE_FETCH_ACCESS) \
+|__BIT(CAUSE_LOAD_ACCESS) \
+|__BIT(CAUSE_STORE_ACCESS))
+
+#define MISALIGNED_TRAP_MASK (__BIT(CAUSE_FETCH_MISALIGNED) \
+|__BIT(CAUSE_LOAD_MISALIGNED) \
+|__BIT(CAUSE_STORE_MISALIGNED))
static const char * const causenames[] = {
- [CAUSE_MISALIGNED_FETCH] = "misaligned fetch",
- [CAUSE_MISALIGNED_LOAD] = "misaligned load",
- [CAUSE_MISALIGNED_STORE] = "misaligned store",
- [CAUSE_FAULT_FETCH] = "fetch",
- [CAUSE_FAULT_LOAD] = "load",
- [CAUSE_FAULT_STORE] = "store",
- [CAUSE_FP_DISABLED] = "fp disabled",
+ [CAUSE_FETCH_MISALIGNED] = "misaligned fetch",
+ [CAUSE_LOAD_MISALIGNED] = "misaligned load",
+ [CAUSE_STORE_MISALIGNED] = "misaligned store",
+ [CAUSE_FETCH_ACCESS] = "fetch",
+ [CAUSE_LOAD_ACCESS] = "load",
+ [CAUSE_STORE_ACCESS] = "store",
[CAUSE_ILLEGAL_INSTRUCTION] = "illegal instruction",
- [CAUSE_PRIVILEGED_INSTRUCTION] = "privileged instruction",
[CAUSE_BREAKPOINT] = "breakpoint",
};
@@ -220,11 +217,11 @@ cpu_trapsignal(struct trapframe *tf, ksi
static inline vm_prot_t
get_faulttype(register_t cause)
{
- if (cause == CAUSE_FAULT_LOAD)
+ if (cause == CAUSE_LOAD_ACCESS)
return VM_PROT_READ;
- if (cause == CAUSE_FAULT_STORE)
+ if (cause == CAUSE_STORE_ACCESS)
return VM_PROT_READ | VM_PROT_WRITE;
- KASSERT(cause == CAUSE_FAULT_FETCH);
+ KASSERT(cause == CAUSE_FETCH_ACCESS);
return VM_PROT_READ | VM_PROT_EXECUTE;
}
@@ -256,12 +253,12 @@ trap_pagefault_fixup(struct trapframe *t
attr |= VM_PAGEMD_REFERENCED;
}
#if 0 /* XXX Outdated */
- if (cause == CAUSE_FAULT_STORE) {
+ if (cause == CAUSE_STORE_ACCESS) {
if ((npte & PTE_NW) != 0) {
npte &= ~PTE_NW;
attr |= VM_PAGEMD_MODIFIED;
}
- } else if (cause == CAUSE_FAULT_FETCH) {
+ } else if (cause == CAUSE_FETCH_ACCESS) {
if ((npte & PTE_NX) != 0) {
npte &= ~PTE_NX;
attr |= VM_PAGEMD_EXECPAGE;
@@ -349,9 +346,8 @@ static bool
CVS commit: src/sys/arch/riscv/riscv
Module Name:src
Committed By: skrll
Date: Sun Nov 1 21:06:22 UTC 2020
Modified Files:
src/sys/arch/riscv/riscv: trap.c
Log Message:
Remove unused variable
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/riscv/riscv/trap.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/riscv/riscv/trap.c
diff -u src/sys/arch/riscv/riscv/trap.c:1.8 src/sys/arch/riscv/riscv/trap.c:1.9
--- src/sys/arch/riscv/riscv/trap.c:1.8 Sun Nov 1 20:56:24 2020
+++ src/sys/arch/riscv/riscv/trap.c Sun Nov 1 21:06:22 2020
@@ -32,7 +32,7 @@
#define __PMAP_PRIVATE
#define __UFETCHSTORE_PRIVATE
-__RCSID("$NetBSD: trap.c,v 1.8 2020/11/01 20:56:24 skrll Exp $");
+__RCSID("$NetBSD: trap.c,v 1.9 2020/11/01 21:06:22 skrll Exp $");
#include
#include
@@ -422,7 +422,6 @@ cpu_trap(struct trapframe *tf, register_
void
cpu_ast(struct trapframe *tf)
{
- struct cpu_info * const ci = curcpu();
atomic_swap_uint(>l_md.md_astpending, 0);
CVS commit: src/sys/arch/riscv/riscv
Module Name:src
Committed By: skrll
Date: Sun Nov 1 21:01:49 UTC 2020
Modified Files:
src/sys/arch/riscv/riscv: clock_machdep.c
Log Message:
Don't shadow 'hz'
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/riscv/riscv/clock_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/riscv/riscv/clock_machdep.c
diff -u src/sys/arch/riscv/riscv/clock_machdep.c:1.1 src/sys/arch/riscv/riscv/clock_machdep.c:1.2
--- src/sys/arch/riscv/riscv/clock_machdep.c:1.1 Sat Mar 28 16:13:56 2015
+++ src/sys/arch/riscv/riscv/clock_machdep.c Sun Nov 1 21:01:49 2020
@@ -29,7 +29,7 @@
#include
-__RCSID("$NetBSD: clock_machdep.c,v 1.1 2015/03/28 16:13:56 matt Exp $");
+__RCSID("$NetBSD: clock_machdep.c,v 1.2 2020/11/01 21:01:49 skrll Exp $");
#include
#include
@@ -40,6 +40,6 @@ cpu_initclocks(void)
}
void
-setstatclockrate(int hz)
+setstatclockrate(int newhz)
{
}
CVS commit: src/sys/sys
Module Name:src Committed By: christos Date: Sun Nov 1 21:00:20 UTC 2020 Modified Files: src/sys/sys: sleeptab.h Log Message: Use __nothing for empty macro To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/sys/sleeptab.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/sys/sleeptab.h diff -u src/sys/sys/sleeptab.h:1.1 src/sys/sys/sleeptab.h:1.2 --- src/sys/sys/sleeptab.h:1.1 Sun Nov 1 15:55:15 2020 +++ src/sys/sys/sleeptab.h Sun Nov 1 16:00:20 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: sleeptab.h,v 1.1 2020/11/01 20:55:15 christos Exp $ */ +/* $NetBSD: sleeptab.h,v 1.2 2020/11/01 21:00:20 christos Exp $ */ /*- * Copyright (c) 2002, 2006, 2007, 2008, 2009, 2019, 2020 @@ -78,7 +78,7 @@ sleepq_hashlock(wchan_t wchan) return mp; } -#define sleepq_destroy(a) +#define sleepq_destroy(a) __nothing #endif
CVS commit: src/sys/rump
Module Name:src
Committed By: christos
Date: Sun Nov 1 20:58:38 UTC 2020
Modified Files:
src/sys/rump/include/rump-sys: kern.h
src/sys/rump/librump/rumpkern: intr.c scheduler.c sleepq.c
Added Files:
src/sys/rump/include/sys: sleeptab.h
Log Message:
PR/55664: Ruslan Nikolaev: Fix:
1. A race condition (bug) in sys/rump/librump/rumpkern/intr.c since
rumpuser_cv_signal() is called without holding a mutex
2. sleepq is implemented using a single (global) conditional
variable; that should be done per each sleepq separately
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/include/rump-sys/kern.h
cvs rdiff -u -r0 -r1.1 src/sys/rump/include/sys/sleeptab.h
cvs rdiff -u -r1.55 -r1.56 src/sys/rump/librump/rumpkern/intr.c
cvs rdiff -u -r1.51 -r1.52 src/sys/rump/librump/rumpkern/scheduler.c
cvs rdiff -u -r1.20 -r1.21 src/sys/rump/librump/rumpkern/sleepq.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-sys/kern.h
diff -u src/sys/rump/include/rump-sys/kern.h:1.4 src/sys/rump/include/rump-sys/kern.h:1.5
--- src/sys/rump/include/rump-sys/kern.h:1.4 Fri Aug 10 17:44:59 2018
+++ src/sys/rump/include/rump-sys/kern.h Sun Nov 1 15:58:38 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: kern.h,v 1.4 2018/08/10 21:44:59 pgoyette Exp $ */
+/* $NetBSD: kern.h,v 1.5 2020/11/01 20:58:38 christos Exp $ */
/*
* Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved.
@@ -174,6 +174,7 @@ void rump_syscall_boot_establish(const s
void rump_schedlock_cv_wait(struct rumpuser_cv *);
int rump_schedlock_cv_timedwait(struct rumpuser_cv *,
const struct timespec *);
+void rump_schedlock_cv_signal(struct cpu_info *, struct rumpuser_cv *);
void rump_user_schedule(int, void *);
void rump_user_unschedule(int, int *, void *);
Index: src/sys/rump/librump/rumpkern/intr.c
diff -u src/sys/rump/librump/rumpkern/intr.c:1.55 src/sys/rump/librump/rumpkern/intr.c:1.56
--- src/sys/rump/librump/rumpkern/intr.c:1.55 Mon Dec 16 17:47:55 2019
+++ src/sys/rump/librump/rumpkern/intr.c Sun Nov 1 15:58:38 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.c,v 1.55 2019/12/16 22:47:55 ad Exp $ */
+/* $NetBSD: intr.c,v 1.56 2020/11/01 20:58:38 christos Exp $ */
/*
* Copyright (c) 2008-2010, 2015 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.55 2019/12/16 22:47:55 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.56 2020/11/01 20:58:38 christos Exp $");
#include
#include
@@ -464,7 +464,7 @@ rump_softint_run(struct cpu_info *ci)
for (i = 0; i < SOFTINT_COUNT; i++) {
if (!TAILQ_EMPTY(_lvl[i].si_pending))
- rumpuser_cv_signal(si_lvl[i].si_cv);
+ rump_schedlock_cv_signal(ci, si_lvl[i].si_cv);
}
}
Index: src/sys/rump/librump/rumpkern/scheduler.c
diff -u src/sys/rump/librump/rumpkern/scheduler.c:1.51 src/sys/rump/librump/rumpkern/scheduler.c:1.52
--- src/sys/rump/librump/rumpkern/scheduler.c:1.51 Sat Mar 14 14:08:39 2020
+++ src/sys/rump/librump/rumpkern/scheduler.c Sun Nov 1 15:58:38 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: scheduler.c,v 1.51 2020/03/14 18:08:39 ad Exp $ */
+/* $NetBSD: scheduler.c,v 1.52 2020/11/01 20:58:38 christos Exp $ */
/*
* Copyright (c) 2010, 2011 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: scheduler.c,v 1.51 2020/03/14 18:08:39 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scheduler.c,v 1.52 2020/11/01 20:58:38 christos Exp $");
#include
#include
@@ -179,6 +179,16 @@ rump_scheduler_init(int numcpu)
mutex_init(_lock, MUTEX_DEFAULT, IPL_SCHED);
}
+void
+rump_schedlock_cv_signal(struct cpu_info *ci, struct rumpuser_cv *cv)
+{
+ struct rumpcpu *rcpu = cpuinfo_to_rumpcpu(ci);
+
+ rumpuser_mutex_enter_nowrap(rcpu->rcpu_mtx);
+ rumpuser_cv_signal(cv);
+ rumpuser_mutex_exit(rcpu->rcpu_mtx);
+}
+
/*
* condvar ops using scheduler lock as the rumpuser interlock.
*/
Index: src/sys/rump/librump/rumpkern/sleepq.c
diff -u src/sys/rump/librump/rumpkern/sleepq.c:1.20 src/sys/rump/librump/rumpkern/sleepq.c:1.21
--- src/sys/rump/librump/rumpkern/sleepq.c:1.20 Sat Apr 25 11:42:15 2020
+++ src/sys/rump/librump/rumpkern/sleepq.c Sun Nov 1 15:58:38 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: sleepq.c,v 1.20 2020/04/25 15:42:15 bouyer Exp $ */
+/* $NetBSD: sleepq.c,v 1.21 2020/11/01 20:58:38 christos Exp $ */
/*
* Copyright (c) 2008 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sleepq.c,v 1.20 2020/04/25 15:42:15 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sleepq.c,v 1.21 2020/11/01 20:58:38 christos Exp $");
#include
#include
@@ -40,25 +40,20 @@ __KERNEL_RCSID(0, "$NetBSD: sleepq.c,v 1
#include
syncobj_t sleep_syncobj;
-static kcondvar_t sq_cv;
-static int
-sqinit1(void)
+void
+sleepq_init(sleepq_t *sq)
{
- cv_init(_cv, "sleepq");
-
- return 0;
+
CVS commit: src/sys/sys
Module Name:src Committed By: christos Date: Sun Nov 1 20:56:13 UTC 2020 Modified Files: src/sys/sys: sleepq.h Log Message: turned sleepq_destroy this into a macro To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 src/sys/sys/sleepq.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/sys/sleepq.h diff -u src/sys/sys/sleepq.h:1.33 src/sys/sys/sleepq.h:1.34 --- src/sys/sys/sleepq.h:1.33 Sun Nov 1 15:55:15 2020 +++ src/sys/sys/sleepq.h Sun Nov 1 15:56:13 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: sleepq.h,v 1.33 2020/11/01 20:55:15 christos Exp $ */ +/* $NetBSD: sleepq.h,v 1.34 2020/11/01 20:56:13 christos Exp $ */ /*- * Copyright (c) 2002, 2006, 2007, 2008, 2009, 2019, 2020 @@ -48,7 +48,6 @@ typedef struct sleepq sleepq_t; void sleepq_init(sleepq_t *); -void sleepq_destroy(sleepq_t *); void sleepq_remove(sleepq_t *, lwp_t *); void sleepq_enqueue(sleepq_t *, wchan_t, const char *, struct syncobj *, bool);
CVS commit: src/sys/arch/riscv/riscv
Module Name:src
Committed By: skrll
Date: Sun Nov 1 20:56:24 UTC 2020
Modified Files:
src/sys/arch/riscv/riscv: trap.c
Log Message:
Typo in a trap name
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/riscv/riscv/trap.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/riscv/riscv/trap.c
diff -u src/sys/arch/riscv/riscv/trap.c:1.7 src/sys/arch/riscv/riscv/trap.c:1.8
--- src/sys/arch/riscv/riscv/trap.c:1.7 Tue Jun 30 16:20:02 2020
+++ src/sys/arch/riscv/riscv/trap.c Sun Nov 1 20:56:24 2020
@@ -32,7 +32,7 @@
#define __PMAP_PRIVATE
#define __UFETCHSTORE_PRIVATE
-__RCSID("$NetBSD: trap.c,v 1.7 2020/06/30 16:20:02 maxv Exp $");
+__RCSID("$NetBSD: trap.c,v 1.8 2020/11/01 20:56:24 skrll Exp $");
#include
#include
@@ -59,7 +59,7 @@ __RCSID("$NetBSD: trap.c,v 1.7 2020/06/3
static const char * const causenames[] = {
[CAUSE_MISALIGNED_FETCH] = "misaligned fetch",
- [CAUSE_MISALIGNED_LOAD] = "mialigned load",
+ [CAUSE_MISALIGNED_LOAD] = "misaligned load",
[CAUSE_MISALIGNED_STORE] = "misaligned store",
[CAUSE_FAULT_FETCH] = "fetch",
[CAUSE_FAULT_LOAD] = "load",
CVS commit: src/sys
Module Name:src
Committed By: christos
Date: Sun Nov 1 20:55:16 UTC 2020
Modified Files:
src/sys/kern: kern_condvar.c
src/sys/sys: sleepq.h
Added Files:
src/sys/sys: sleeptab.h
Log Message:
PR/55664: Ruslan Nikolaev: Split out sleepq guts and turnstiles not used
in rump into a separate header file. Add a sleepq_destroy() empty hook.
To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/sys/kern/kern_condvar.c
cvs rdiff -u -r1.32 -r1.33 src/sys/sys/sleepq.h
cvs rdiff -u -r0 -r1.1 src/sys/sys/sleeptab.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/kern/kern_condvar.c
diff -u src/sys/kern/kern_condvar.c:1.52 src/sys/kern/kern_condvar.c:1.53
--- src/sys/kern/kern_condvar.c:1.52 Sun May 10 23:59:33 2020
+++ src/sys/kern/kern_condvar.c Sun Nov 1 15:55:15 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_condvar.c,v 1.52 2020/05/11 03:59:33 riastradh Exp $ */
+/* $NetBSD: kern_condvar.c,v 1.53 2020/11/01 20:55:15 christos Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008, 2019, 2020 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_condvar.c,v 1.52 2020/05/11 03:59:33 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_condvar.c,v 1.53 2020/11/01 20:55:15 christos Exp $");
#include
#include
@@ -102,6 +102,7 @@ void
cv_destroy(kcondvar_t *cv)
{
+ sleepq_destroy(CV_SLEEPQ(cv));
#ifdef DIAGNOSTIC
KASSERT(cv_is_valid(cv));
KASSERT(!cv_has_waiters(cv));
Index: src/sys/sys/sleepq.h
diff -u src/sys/sys/sleepq.h:1.32 src/sys/sys/sleepq.h:1.33
--- src/sys/sys/sleepq.h:1.32 Thu Oct 22 20:25:45 2020
+++ src/sys/sys/sleepq.h Sun Nov 1 15:55:15 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: sleepq.h,v 1.32 2020/10/23 00:25:45 thorpej Exp $ */
+/* $NetBSD: sleepq.h,v 1.33 2020/11/01 20:55:15 christos Exp $ */
/*-
* Copyright (c) 2002, 2006, 2007, 2008, 2009, 2019, 2020
@@ -45,20 +45,10 @@
* Generic sleep queues.
*/
-#define SLEEPTAB_HASH_SHIFT 7
-#define SLEEPTAB_HASH_SIZE (1 << SLEEPTAB_HASH_SHIFT)
-#define SLEEPTAB_HASH_MASK (SLEEPTAB_HASH_SIZE - 1)
-#define SLEEPTAB_HASH(wchan) (((uintptr_t)(wchan) >> 8) & SLEEPTAB_HASH_MASK)
-
-LIST_HEAD(sleepq, lwp);
-
typedef struct sleepq sleepq_t;
-typedef struct sleeptab {
- sleepq_t st_queue[SLEEPTAB_HASH_SIZE];
-} sleeptab_t;
-
void sleepq_init(sleepq_t *);
+void sleepq_destroy(sleepq_t *);
void sleepq_remove(sleepq_t *, lwp_t *);
void sleepq_enqueue(sleepq_t *, wchan_t, const char *, struct syncobj *,
bool);
@@ -73,10 +63,6 @@ void sleepq_changepri(lwp_t *, pri_t);
void sleepq_lendpri(lwp_t *, pri_t);
int sleepq_block(int, bool);
-void sleeptab_init(sleeptab_t *);
-
-extern sleeptab_t sleeptab;
-
#ifdef _KERNEL
typedef union {
kmutex_t lock;
@@ -97,35 +83,6 @@ sleepq_dontsleep(lwp_t *l)
}
/*
- * Find the correct sleep queue for the specified wait channel. This
- * acquires and holds the per-queue interlock.
- */
-static __inline sleepq_t *
-sleeptab_lookup(sleeptab_t *st, wchan_t wchan, kmutex_t **mp)
-{
- extern sleepqlock_t sleepq_locks[SLEEPTAB_HASH_SIZE];
- sleepq_t *sq;
- u_int hash;
-
- hash = SLEEPTAB_HASH(wchan);
- sq = >st_queue[hash];
- *mp = _locks[hash].lock;
- mutex_spin_enter(*mp);
- return sq;
-}
-
-static __inline kmutex_t *
-sleepq_hashlock(wchan_t wchan)
-{
- extern sleepqlock_t sleepq_locks[SLEEPTAB_HASH_SIZE];
- kmutex_t *mp;
-
- mp = _locks[SLEEPTAB_HASH(wchan)].lock;
- mutex_spin_enter(mp);
- return mp;
-}
-
-/*
* Prepare to block on a sleep queue, after which any interlock can be
* safely released.
*/
@@ -143,55 +100,6 @@ sleepq_enter(sleepq_t *sq, lwp_t *l, kmu
}
#endif
-/*
- * Turnstiles, specialized sleep queues for use by kernel locks.
- */
-
-typedef struct turnstile {
- LIST_ENTRY(turnstile) ts_chain; /* link on hash chain */
- struct turnstile *ts_free; /* turnstile free list */
- wchan_t ts_obj; /* lock object */
- sleepq_t ts_sleepq[2]; /* sleep queues */
- u_int ts_waiters[2]; /* count of waiters */
-
- /* priority inheritance */
- pri_t ts_eprio;
- lwp_t *ts_inheritor;
- SLIST_ENTRY(turnstile) ts_pichain;
-} turnstile_t;
-
-LIST_HEAD(tschain, turnstile);
-
-typedef struct tschain tschain_t;
-
-#define TS_READER_Q 0 /* reader sleep queue */
-#define TS_WRITER_Q 1 /* writer sleep queue */
-
-#define TS_WAITERS(ts, q) \
- (ts)->ts_waiters[(q)]
-
-#define TS_ALL_WAITERS(ts) \
- ((ts)->ts_waiters[TS_READER_Q] +\
- (ts)->ts_waiters[TS_WRITER_Q])
-
-#define TS_FIRST(ts, q) (LIST_FIRST(&(ts)->ts_sleepq[(q)]))
-
-#ifdef _KERNEL
-
-void turnstile_init(void);
-turnstile_t *turnstile_lookup(wchan_t);
-void turnstile_ctor(turnstile_t *);
-void turnstile_exit(wchan_t);
-void turnstile_block(turnstile_t *, int, wchan_t, syncobj_t *);
-void turnstile_wakeup(turnstile_t *, int, int, lwp_t *);
-void turnstile_print(volatile void *, void (*)(const char *, ...)
-__printflike(1, 2));
-void
CVS commit: src/usr.bin/make
Module Name:src Committed By: rillig Date: Sun Nov 1 20:24:45 UTC 2020 Modified Files: src/usr.bin/make: make.1 Log Message: make(1): fix manual page regarding numerical comparisons Make uses double, not int, for comparing things. To generate a diff of this commit: cvs rdiff -u -r1.289 -r1.290 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.289 src/usr.bin/make/make.1:1.290 --- src/usr.bin/make/make.1:1.289 Fri Aug 28 17:15:04 2020 +++ src/usr.bin/make/make.1 Sun Nov 1 20:24:45 2020 @@ -1,4 +1,4 @@ -.\" $NetBSD: make.1,v 1.289 2020/08/28 17:15:04 rillig Exp $ +.\" $NetBSD: make.1,v 1.290 2020/11/01 20:24:45 rillig Exp $ .\" .\" Copyright (c) 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" from: @(#)make.1 8.4 (Berkeley) 3/19/94 .\" -.Dd August 28, 2020 +.Dd November 1, 2020 .Dt MAKE 1 .Os .Sh NAME @@ -1871,7 +1871,7 @@ has been defined and has commands associ .Ar Expression may also be an arithmetic or string comparison. Variable expansion is -performed on both sides of the comparison, after which the integral +performed on both sides of the comparison, after which the numerical values are compared. A value is interpreted as hexadecimal if it is preceded by 0x, otherwise it is decimal; octal numbers are not supported. @@ -1881,7 +1881,7 @@ variable expansion, either the left or r .Ql Ic == or .Ql Ic "!=" -operator is not an integral value, then +operator is not a numerical value, then string comparison is performed between the expanded variables. If no relational operator is given, it is assumed that the expanded
CVS commit: src/usr.bin/make/unit-tests
Module Name:src
Committed By: rillig
Date: Sun Nov 1 19:49:28 UTC 2020
Modified Files:
src/usr.bin/make/unit-tests: varmod-match-escape.exp
varmod-match-escape.mk
Log Message:
make(1): add more tests for the variable modifier :M
Despite its popularity and usefulness, the variable modifier :M is
implemented so weirdly that it's not surprising people get confused
about make's parsing and escaping rules.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/usr.bin/make/unit-tests/varmod-match-escape.exp \
src/usr.bin/make/unit-tests/varmod-match-escape.mk
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/unit-tests/varmod-match-escape.exp
diff -u src/usr.bin/make/unit-tests/varmod-match-escape.exp:1.4 src/usr.bin/make/unit-tests/varmod-match-escape.exp:1.5
--- src/usr.bin/make/unit-tests/varmod-match-escape.exp:1.4 Sun Nov 1 19:25:23 2020
+++ src/usr.bin/make/unit-tests/varmod-match-escape.exp Sun Nov 1 19:49:28 2020
@@ -55,4 +55,7 @@ lhs = ":", rhs = "::", op = !=
make: "varmod-match-escape.mk" line 42: warning: XXX: Oops
Global:.MAKEFLAGS = -r -k -d cv -d
Global:.MAKEFLAGS = -r -k -d cv -d 0
-exit status 0
+make: "varmod-match-escape.mk" line 67: Dollar followed by nothing
+make: Fatal errors encountered -- cannot continue
+make: stopped in unit-tests
+exit status 1
Index: src/usr.bin/make/unit-tests/varmod-match-escape.mk
diff -u src/usr.bin/make/unit-tests/varmod-match-escape.mk:1.4 src/usr.bin/make/unit-tests/varmod-match-escape.mk:1.5
--- src/usr.bin/make/unit-tests/varmod-match-escape.mk:1.4 Sun Nov 1 19:25:23 2020
+++ src/usr.bin/make/unit-tests/varmod-match-escape.mk Sun Nov 1 19:49:28 2020
@@ -1,4 +1,4 @@
-# $NetBSD: varmod-match-escape.mk,v 1.4 2020/11/01 19:25:23 rillig Exp $
+# $NetBSD: varmod-match-escape.mk,v 1.5 2020/11/01 19:49:28 rillig Exp $
#
# As of 2020-08-01, the :M and :N modifiers interpret backslashes differently,
# depending on whether there was a variable expression somewhere before the
@@ -44,5 +44,29 @@ VALUES= : :: :\:
.MAKEFLAGS: -d0
+# XXX: As of 2020-11-01, unlike all other variable modifiers, a '$' in the
+# :M and :N modifiers is written as '$$', not as '\$'. This is confusing,
+# undocumented and hopefully not used in practice.
+.if ${:U\$:M$$} != "\$"
+. error
+.endif
+
+# XXX: As of 2020-11-01, unlike all other variable modifiers, '\$' is not
+# parsed as an escaped '$'. Instead, ApplyModifier_Match first scans for
+# the ':' at the end of the modifier, which results in the pattern '\$'.
+# No unescaping takes place since the pattern neither contained '\:' nor
+# '\{' nor '\}'. But the text is expanded, and a lonely '$' at the end
+# is silently discarded. The resulting expanded pattern is thus '\', that
+# is a single backslash.
+.if ${:U\$:M\$} != ""
+. error
+.endif
+
+# In lint mode, the case of a lonely '$' is covered with an error message.
+.MAKEFLAGS: -dL
+.if ${:U\$:M\$} != ""
+. error
+.endif
+
all:
@:;
CVS commit: src/sys/arch/riscv/include
Module Name:src Committed By: skrll Date: Sun Nov 1 19:47:46 UTC 2020 Modified Files: src/sys/arch/riscv/include: pte.h Log Message: Comments from zmcgrew@ To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/riscv/include/pte.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/riscv/include/pte.h diff -u src/sys/arch/riscv/include/pte.h:1.4 src/sys/arch/riscv/include/pte.h:1.5 --- src/sys/arch/riscv/include/pte.h:1.4 Sat Mar 14 16:12:16 2020 +++ src/sys/arch/riscv/include/pte.h Sun Nov 1 19:47:46 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: pte.h,v 1.4 2020/03/14 16:12:16 skrll Exp $ */ +/* $NetBSD: pte.h,v 1.5 2020/11/01 19:47:46 skrll Exp $ */ /* * Copyright (c) 2014, 2019 The NetBSD Foundation, Inc. @@ -59,14 +59,15 @@ typedef __uint32_t pd_entry_t; #define PTE_WIRED __BIT(8) /* Hardware PTE bits. */ -#define PTE_D __BIT(7) -#define PTE_A __BIT(6) -#define PTE_G __BIT(5) -#define PTE_U __BIT(4) -#define PTE_X __BIT(3) -#define PTE_W __BIT(2) -#define PTE_R __BIT(1) -#define PTE_V __BIT(0) +// These are hardware defined bits +#define PTE_D __BIT(7) // Dirty +#define PTE_A __BIT(6) // Accessed +#define PTE_G __BIT(5) // Global +#define PTE_U __BIT(4) // User +#define PTE_X __BIT(3) // eXecute +#define PTE_W __BIT(2) // Write +#define PTE_R __BIT(1) // Read +#define PTE_V __BIT(0) // Valid #define PA_TO_PTE(pa) (((pa) >> PAGE_SHIFT) << PTE_PPN_SHIFT) #define PTE_TO_PA(pte) (((pte) >> PTE_PPN_SHIFT) << PAGE_SHIFT)
CVS commit: src/usr.bin/make/unit-tests
Module Name:src
Committed By: rillig
Date: Sun Nov 1 19:25:23 UTC 2020
Modified Files:
src/usr.bin/make/unit-tests: varmod-match-escape.exp
varmod-match-escape.mk
Log Message:
make(1): add test for surprising parsing result of the :M modifier
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/make/unit-tests/varmod-match-escape.exp \
src/usr.bin/make/unit-tests/varmod-match-escape.mk
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/unit-tests/varmod-match-escape.exp
diff -u src/usr.bin/make/unit-tests/varmod-match-escape.exp:1.3 src/usr.bin/make/unit-tests/varmod-match-escape.exp:1.4
--- src/usr.bin/make/unit-tests/varmod-match-escape.exp:1.3 Sun Nov 1 19:02:22 2020
+++ src/usr.bin/make/unit-tests/varmod-match-escape.exp Sun Nov 1 19:25:23 2020
@@ -1,3 +1,5 @@
+Global:SPECIALS = \: : \\ * \*
+CondParser_Eval: ${SPECIALS:M${:U}\:} != ${SPECIALS:M\:${:U}}
Var_Parse: ${SPECIALS:M${:U}\:} != ${SPECIALS:M\:${:U}} with VARE_UNDEFERR|VARE_WANTRES
Applying ${SPECIALS:M...} to "\: : \\ * \*" (VARE_UNDEFERR|VARE_WANTRES, none, none)
Var_Parse: ${:U}\: with VARE_UNDEFERR|VARE_WANTRES
@@ -24,6 +26,33 @@ VarMatch [\\] [:]
VarMatch [*] [:]
VarMatch [\*] [:]
Result of ${SPECIALS:M\:${:U}} is ":" (VARE_UNDEFERR|VARE_WANTRES, none, none)
-Global:.MAKEFLAGS = -r -k -d v -d
-Global:.MAKEFLAGS = -r -k -d v -d 0
+lhs = ":", rhs = ":", op = !=
+Global:VALUES = : :: :\:
+CondParser_Eval: ${VALUES:M\:${:U\:}} != ${VALUES:M${:U\:}\:}
+Var_Parse: ${VALUES:M\:${:U\:}} != ${VALUES:M${:U\:}\:} with VARE_UNDEFERR|VARE_WANTRES
+Applying ${VALUES:M...} to ": :: :\:" (VARE_UNDEFERR|VARE_WANTRES, none, none)
+Var_Parse: ${:U:} with VARE_UNDEFERR|VARE_WANTRES
+Applying ${:U} to "" (VARE_UNDEFERR|VARE_WANTRES, none, VEF_UNDEF)
+Result of ${:U} is "" (VARE_UNDEFERR|VARE_WANTRES, none, VEF_UNDEF|VEF_DEF)
+Pattern[VALUES] for [: :: :\:] is [:]
+ModifyWords: split ": :: :\:" into 3 words
+VarMatch [:] [:]
+VarMatch [::] [:]
+VarMatch [:\:] [:]
+Result of ${VALUES:M\:${:U\:}} is ":" (VARE_UNDEFERR|VARE_WANTRES, none, none)
+Var_Parse: ${VALUES:M${:U\:}\:} with VARE_UNDEFERR|VARE_WANTRES
+Applying ${VALUES:M...} to ": :: :\:" (VARE_UNDEFERR|VARE_WANTRES, none, none)
+Var_Parse: ${:U\:}\: with VARE_UNDEFERR|VARE_WANTRES
+Applying ${:U...} to "" (VARE_UNDEFERR|VARE_WANTRES, none, VEF_UNDEF)
+Result of ${:U\:} is ":" (VARE_UNDEFERR|VARE_WANTRES, none, VEF_UNDEF|VEF_DEF)
+Pattern[VALUES] for [: :: :\:] is [:\:]
+ModifyWords: split ": :: :\:" into 3 words
+VarMatch [:] [:\:]
+VarMatch [::] [:\:]
+VarMatch [:\:] [:\:]
+Result of ${VALUES:M${:U\:}\:} is "::" (VARE_UNDEFERR|VARE_WANTRES, none, none)
+lhs = ":", rhs = "::", op = !=
+make: "varmod-match-escape.mk" line 42: warning: XXX: Oops
+Global:.MAKEFLAGS = -r -k -d cv -d
+Global:.MAKEFLAGS = -r -k -d cv -d 0
exit status 0
Index: src/usr.bin/make/unit-tests/varmod-match-escape.mk
diff -u src/usr.bin/make/unit-tests/varmod-match-escape.mk:1.3 src/usr.bin/make/unit-tests/varmod-match-escape.mk:1.4
--- src/usr.bin/make/unit-tests/varmod-match-escape.mk:1.3 Sun Nov 1 19:02:22 2020
+++ src/usr.bin/make/unit-tests/varmod-match-escape.mk Sun Nov 1 19:25:23 2020
@@ -1,4 +1,4 @@
-# $NetBSD: varmod-match-escape.mk,v 1.3 2020/11/01 19:02:22 rillig Exp $
+# $NetBSD: varmod-match-escape.mk,v 1.4 2020/11/01 19:25:23 rillig Exp $
#
# As of 2020-08-01, the :M and :N modifiers interpret backslashes differently,
# depending on whether there was a variable expression somewhere before the
@@ -9,11 +9,39 @@
# are unescaped, and in the pattern matching these have the same meaning as
# their plain variants '{', '}' and ':'. In the pattern matching from
# Str_Match, only \*, \? or \[ would make a noticeable difference.
+
+.MAKEFLAGS: -dcv
+
SPECIALS= \: : \\ * \*
-.MAKEFLAGS: -dv
.if ${SPECIALS:M${:U}\:} != ${SPECIALS:M\:${:U}}
. warning unexpected
.endif
+
+# And now both cases combined: A single modifier with both an escaped ':'
+# as well as a variable expression that expands to a ':'.
+#
+# XXX: As of 2020-11-01, when an escaped ':' occurs before the variable
+# expression, the whole modifier text is subject to unescaping '\:' to ':',
+# before the variable expression is expanded. This means that the '\:' in
+# the variable expression is expanded as well, turning ${:U\:} into a simple
+# ${:U:}, which silently expands to an empty string, instead of generating
+# an error message.
+#
+# XXX: As of 2020-11-01, the modifier on the right-hand side of the
+# comparison is parsed differently though. First, the variable expression
+# is parsed, resulting in ':' and needSubst=TRUE. After that, the escaped
+# ':' is seen, and this time, copy=TRUE is not executed but stays copy=FALSE.
+# Therefore the escaped ':' is kept as-is, and the final pattern becomes
+# ':\:'.
+#
+# If ApplyModifier_Match had used the same parsing algorithm as
CVS commit: src/usr.bin/make/unit-tests
Module Name:src
Committed By: rillig
Date: Sun Nov 1 19:02:22 UTC 2020
Modified Files:
src/usr.bin/make/unit-tests: Makefile varmod-match-escape.exp
varmod-match-escape.mk
Log Message:
make(1): move test flags to test varmod-match-escape.mk
To generate a diff of this commit:
cvs rdiff -u -r1.180 -r1.181 src/usr.bin/make/unit-tests/Makefile
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/make/unit-tests/varmod-match-escape.exp \
src/usr.bin/make/unit-tests/varmod-match-escape.mk
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/unit-tests/Makefile
diff -u src/usr.bin/make/unit-tests/Makefile:1.180 src/usr.bin/make/unit-tests/Makefile:1.181
--- src/usr.bin/make/unit-tests/Makefile:1.180 Sat Oct 31 20:30:06 2020
+++ src/usr.bin/make/unit-tests/Makefile Sun Nov 1 19:02:22 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.180 2020/10/31 20:30:06 rillig Exp $
+# $NetBSD: Makefile,v 1.181 2020/11/01 19:02:22 rillig Exp $
#
# Unit tests for make(1)
#
@@ -398,7 +398,6 @@ FLAGS.opt-warnings-as-errors= -W
FLAGS.order= -j1
FLAGS.recursive= -dL
FLAGS.sh-leading-plus= -n
-FLAGS.varmod-match-escape= -dv
FLAGS.varname-empty= -dv '$${:U}=cmdline-u' '=cmline-plain'
# Some tests need extra postprocessing.
@@ -438,7 +437,6 @@ SED_CMDS.varname-dot-shell+= -e 's,\[/[^
# Some tests need an additional round of postprocessing.
POSTPROC.deptgt-suffixes= \
${TOOL_SED} -n -e '/^\#\*\*\* Suffixes/,/^\#\*/p'
-POSTPROC.varmod-match-escape= ${TOOL_SED} -n -e '/^Pattern/p'
POSTPROC.varname= ${TOOL_SED} -n -e '/^MAGIC/p' -e '/^ORDER_/p'
POSTPROC.varname-empty= ${TOOL_SED} -n -e '/^Var_Set/p' -e '/^out:/p'
Index: src/usr.bin/make/unit-tests/varmod-match-escape.exp
diff -u src/usr.bin/make/unit-tests/varmod-match-escape.exp:1.2 src/usr.bin/make/unit-tests/varmod-match-escape.exp:1.3
--- src/usr.bin/make/unit-tests/varmod-match-escape.exp:1.2 Sun Oct 25 17:37:36 2020
+++ src/usr.bin/make/unit-tests/varmod-match-escape.exp Sun Nov 1 19:02:22 2020
@@ -1,5 +1,29 @@
+Var_Parse: ${SPECIALS:M${:U}\:} != ${SPECIALS:M\:${:U}} with VARE_UNDEFERR|VARE_WANTRES
+Applying ${SPECIALS:M...} to "\: : \\ * \*" (VARE_UNDEFERR|VARE_WANTRES, none, none)
+Var_Parse: ${:U}\: with VARE_UNDEFERR|VARE_WANTRES
+Applying ${:U} to "" (VARE_UNDEFERR|VARE_WANTRES, none, VEF_UNDEF)
+Result of ${:U} is "" (VARE_UNDEFERR|VARE_WANTRES, none, VEF_UNDEF|VEF_DEF)
Pattern[SPECIALS] for [\: : \\ * \*] is [\:]
+ModifyWords: split "\: : \\ * \*" into 5 words
+VarMatch [\:] [\:]
+VarMatch [:] [\:]
+VarMatch [\\] [\:]
+VarMatch [*] [\:]
+VarMatch [\*] [\:]
+Result of ${SPECIALS:M${:U}\:} is ":" (VARE_UNDEFERR|VARE_WANTRES, none, none)
+Var_Parse: ${SPECIALS:M\:${:U}} with VARE_UNDEFERR|VARE_WANTRES
+Applying ${SPECIALS:M...} to "\: : \\ * \*" (VARE_UNDEFERR|VARE_WANTRES, none, none)
+Var_Parse: ${:U} with VARE_UNDEFERR|VARE_WANTRES
+Applying ${:U} to "" (VARE_UNDEFERR|VARE_WANTRES, none, VEF_UNDEF)
+Result of ${:U} is "" (VARE_UNDEFERR|VARE_WANTRES, none, VEF_UNDEF|VEF_DEF)
Pattern[SPECIALS] for [\: : \\ * \*] is [:]
-Pattern[.MAKE.DEPENDFILE] for [.depend] is [/dev/null]
-Pattern[.MAKE.DEPENDFILE] for [.depend] is [no*]
+ModifyWords: split "\: : \\ * \*" into 5 words
+VarMatch [\:] [:]
+VarMatch [:] [:]
+VarMatch [\\] [:]
+VarMatch [*] [:]
+VarMatch [\*] [:]
+Result of ${SPECIALS:M\:${:U}} is ":" (VARE_UNDEFERR|VARE_WANTRES, none, none)
+Global:.MAKEFLAGS = -r -k -d v -d
+Global:.MAKEFLAGS = -r -k -d v -d 0
exit status 0
Index: src/usr.bin/make/unit-tests/varmod-match-escape.mk
diff -u src/usr.bin/make/unit-tests/varmod-match-escape.mk:1.2 src/usr.bin/make/unit-tests/varmod-match-escape.mk:1.3
--- src/usr.bin/make/unit-tests/varmod-match-escape.mk:1.2 Sat Oct 24 08:46:08 2020
+++ src/usr.bin/make/unit-tests/varmod-match-escape.mk Sun Nov 1 19:02:22 2020
@@ -1,4 +1,4 @@
-# $NetBSD: varmod-match-escape.mk,v 1.2 2020/10/24 08:46:08 rillig Exp $
+# $NetBSD: varmod-match-escape.mk,v 1.3 2020/11/01 19:02:22 rillig Exp $
#
# As of 2020-08-01, the :M and :N modifiers interpret backslashes differently,
# depending on whether there was a variable expression somewhere before the
@@ -10,11 +10,11 @@
# their plain variants '{', '}' and ':'. In the pattern matching from
# Str_Match, only \*, \? or \[ would make a noticeable difference.
SPECIALS= \: : \\ * \*
-RELEVANT= yes
+.MAKEFLAGS: -dv
.if ${SPECIALS:M${:U}\:} != ${SPECIALS:M\:${:U}}
. warning unexpected
.endif
-RELEVANT= no
+.MAKEFLAGS: -d0
all:
@:;
CVS commit: src/sys
Module Name:src
Committed By: pgoyette
Date: Sun Nov 1 18:51:03 UTC 2020
Modified Files:
src/sys/compat/netbsd32: netbsd32.h netbsd32_core.c
src/sys/kern: compat_stub.c files.kern kern_core.c kern_sig.c
sys_ptrace_common.c
src/sys/modules: Makefile
src/sys/modules/compat_netbsd32: Makefile
src/sys/modules/coredump: Makefile
src/sys/sys: compat_stub.h param.h signalvar.h
Added Files:
src/sys/modules/compat_netbsd32_coredump: Makefile
Log Message:
Separate the compat_netbsd32_coredump from the compat_netbsd32 and
coredump modules, into its own module.
Welcome to 7.99.75 !!!
To generate a diff of this commit:
cvs rdiff -u -r1.133 -r1.134 src/sys/compat/netbsd32/netbsd32.h
cvs rdiff -u -r1.15 -r1.16 src/sys/compat/netbsd32/netbsd32_core.c
cvs rdiff -u -r1.20 -r1.21 src/sys/kern/compat_stub.c
cvs rdiff -u -r1.53 -r1.54 src/sys/kern/files.kern
cvs rdiff -u -r1.33 -r1.34 src/sys/kern/kern_core.c
cvs rdiff -u -r1.394 -r1.395 src/sys/kern/kern_sig.c
cvs rdiff -u -r1.88 -r1.89 src/sys/kern/sys_ptrace_common.c
cvs rdiff -u -r1.247 -r1.248 src/sys/modules/Makefile
cvs rdiff -u -r1.35 -r1.36 src/sys/modules/compat_netbsd32/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/modules/compat_netbsd32_coredump/Makefile
cvs rdiff -u -r1.7 -r1.8 src/sys/modules/coredump/Makefile
cvs rdiff -u -r1.24 -r1.25 src/sys/sys/compat_stub.h
cvs rdiff -u -r1.677 -r1.678 src/sys/sys/param.h
cvs rdiff -u -r1.102 -r1.103 src/sys/sys/signalvar.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/compat/netbsd32/netbsd32.h
diff -u src/sys/compat/netbsd32/netbsd32.h:1.133 src/sys/compat/netbsd32/netbsd32.h:1.134
--- src/sys/compat/netbsd32/netbsd32.h:1.133 Sat May 16 18:31:48 2020
+++ src/sys/compat/netbsd32/netbsd32.h Sun Nov 1 18:51:02 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32.h,v 1.133 2020/05/16 18:31:48 christos Exp $ */
+/* $NetBSD: netbsd32.h,v 1.134 2020/11/01 18:51:02 pgoyette Exp $ */
/*
* Copyright (c) 1998, 2001, 2008, 2015 Matthew R. Green
@@ -1212,6 +1212,7 @@ int netbsd32_kevent(struct lwp *, void *
struct coredump_iostate;
int coredump_netbsd32(struct lwp *, struct coredump_iostate *);
+int real_coredump_netbsd32(struct lwp *, struct coredump_iostate *);
/*
* random other stuff
Index: src/sys/compat/netbsd32/netbsd32_core.c
diff -u src/sys/compat/netbsd32/netbsd32_core.c:1.15 src/sys/compat/netbsd32/netbsd32_core.c:1.16
--- src/sys/compat/netbsd32/netbsd32_core.c:1.15 Wed Nov 20 19:37:53 2019
+++ src/sys/compat/netbsd32/netbsd32_core.c Sun Nov 1 18:51:02 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_core.c,v 1.15 2019/11/20 19:37:53 pgoyette Exp $ */
+/* $NetBSD: netbsd32_core.c,v 1.16 2020/11/01 18:51:02 pgoyette Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -45,22 +45,36 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_core.c,v 1.15 2019/11/20 19:37:53 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_core.c,v 1.16 2020/11/01 18:51:02 pgoyette Exp $");
+#include
+#include
#include
+#include
-#define CORENAME(x) __CONCAT(x,32)
-#define COREINC
+#define DEPS "compat_netbsd32,compat_netbsd32_ptrace,coredump"
-struct coredump_iostate;
+MODULE(MODULE_CLASS_MISC, compat_netbsd32_coredump, DEPS);
-int CORENAME(real_coredump_netbsd)(struct lwp *, struct coredump_iostate *);
+#define CORENAME(x) __CONCAT(x,32)
+#define COREINC
#include "../../kern/core_netbsd.c"
-int
-CORENAME(coredump_netbsd)(struct lwp *l, struct coredump_iostate *iocookie)
+static int
+compat_netbsd32_coredump_modcmd(modcmd_t cmd, void *arg)
{
- return CORENAME(real_coredump_netbsd)(l, iocookie);
-}
+ switch (cmd) {
+ case MODULE_CMD_INIT:
+ MODULE_HOOK_SET(coredump_netbsd32_hook, real_coredump_netbsd32);
+ MODULE_HOOK_SET(coredump_elf32_hook, real_coredump_elf32);
+ return 0;
+ case MODULE_CMD_FINI:
+ MODULE_HOOK_UNSET(coredump_netbsd32_hook);
+ MODULE_HOOK_UNSET(coredump_elf32_hook);
+ return 0;
+ default:
+ return ENOTTY;
+ }
+}
Index: src/sys/kern/compat_stub.c
diff -u src/sys/kern/compat_stub.c:1.20 src/sys/kern/compat_stub.c:1.21
--- src/sys/kern/compat_stub.c:1.20 Mon Oct 19 19:33:02 2020
+++ src/sys/kern/compat_stub.c Sun Nov 1 18:51:02 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_stub.c,v 1.20 2020/10/19 19:33:02 christos Exp $ */
+/* $NetBSD: compat_stub.c,v 1.21 2020/11/01 18:51:02 pgoyette Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -280,6 +280,7 @@ struct coredump_hook_t coredump_hook;
struct coredump_offset_hook_t coredump_offset_hook;
struct coredump_write_hook_t coredump_write_hook;
struct coredump_netbsd_hook_t coredump_netbsd_hook;
+struct coredump_netbsd32_hook_t coredump_netbsd32_hook;
struct coredump_elf32_hook_t coredump_elf32_hook;
struct coredump_elf64_hook_t coredump_elf64_hook;
struct uvm_coredump_walkmap_hook_t
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: pgoyette Date: Sun Nov 1 18:51:34 UTC 2020 Modified Files: src/distrib/sets/lists/debug: module.ad.aarch64 module.ad.arm module.ad.mips module.md.amd64 module.md.sparc64 src/distrib/sets/lists/modules: ad.aarch64 ad.arm ad.mips md.amd64 md.sparc64 Log Message: Update sets lists for new compat_netbsd32_coredump module To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/distrib/sets/lists/debug/module.ad.aarch64 \ src/distrib/sets/lists/debug/module.ad.arm \ src/distrib/sets/lists/debug/module.ad.mips \ src/distrib/sets/lists/debug/module.md.sparc64 cvs rdiff -u -r1.3 -r1.4 src/distrib/sets/lists/debug/module.md.amd64 cvs rdiff -u -r1.7 -r1.8 src/distrib/sets/lists/modules/ad.aarch64 cvs rdiff -u -r1.17 -r1.18 src/distrib/sets/lists/modules/ad.arm cvs rdiff -u -r1.16 -r1.17 src/distrib/sets/lists/modules/ad.mips cvs rdiff -u -r1.90 -r1.91 src/distrib/sets/lists/modules/md.amd64 cvs rdiff -u -r1.11 -r1.12 src/distrib/sets/lists/modules/md.sparc64 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/debug/module.ad.aarch64 diff -u src/distrib/sets/lists/debug/module.ad.aarch64:1.1 src/distrib/sets/lists/debug/module.ad.aarch64:1.2 --- src/distrib/sets/lists/debug/module.ad.aarch64:1.1 Fri May 1 22:21:11 2020 +++ src/distrib/sets/lists/debug/module.ad.aarch64 Sun Nov 1 18:51:34 2020 @@ -1,4 +1,4 @@ -# $NetBSD: module.ad.aarch64,v 1.1 2020/05/01 22:21:11 christos Exp $ +# $NetBSD: module.ad.aarch64,v 1.2 2020/11/01 18:51:34 pgoyette Exp $ ./usr/libdata/debug/@MODULEDIR@/bpfjitmodules-base-kernel kmod,sljit,debug ./usr/libdata/debug/@MODULEDIR@/bpfjit/bpfjit.kmod.debug modules-base-kernel kmod,sljit,debug ./usr/libdata/debug/@MODULEDIR@/compat_netbsd32 modules-base-kernel kmod,debug @@ -27,6 +27,8 @@ ./usr/libdata/debug/@MODULEDIR@/compat_netbsd32_80/compat_netbsd32_80.kmod.debug modules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/compat_netbsd32_90 modules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/compat_netbsd32_90/compat_netbsd32_90.kmod.debug modules-base-kernel kmod,debug +./usr/libdata/debug/@MODULEDIR@/compat_netbsd32_coredump modules-base-kernel kmod,debug +./usr/libdata/debug/@MODULEDIR@/compat_netbsd32_coredump/compat_netbsd32_coredump.kmod.debug modules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/compat_netbsd32_mqueue modules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/compat_netbsd32_mqueue/compat_netbsd32_mqueue.kmod.debug modules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/compat_netbsd32_nfssrv modules-base-kernel kmod,debug Index: src/distrib/sets/lists/debug/module.ad.arm diff -u src/distrib/sets/lists/debug/module.ad.arm:1.1 src/distrib/sets/lists/debug/module.ad.arm:1.2 --- src/distrib/sets/lists/debug/module.ad.arm:1.1 Fri May 1 22:21:11 2020 +++ src/distrib/sets/lists/debug/module.ad.arm Sun Nov 1 18:51:34 2020 @@ -1,4 +1,4 @@ -# $NetBSD: module.ad.arm,v 1.1 2020/05/01 22:21:11 christos Exp $ +# $NetBSD: module.ad.arm,v 1.2 2020/11/01 18:51:34 pgoyette Exp $ ./usr/libdata/debug/@MODULEDIR@/compat_netbsd32 modules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/compat_netbsd32/compat_netbsd32.kmod.debug modules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/compat_netbsd32_09 modules-base-kernel kmod,debug @@ -25,6 +25,8 @@ ./usr/libdata/debug/@MODULEDIR@/compat_netbsd32_80/compat_netbsd32_80.kmod.debug modules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/compat_netbsd32_90 modules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/compat_netbsd32_90/compat_netbsd32_90.kmod.debug modules-base-kernel kmod,debug +./usr/libdata/debug/@MODULEDIR@/compat_netbsd32_coredump modules-base-kernel kmod,debug +./usr/libdata/debug/@MODULEDIR@/compat_netbsd32_coredump/compat_netbsd32_coredump.kmod.debug modules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/compat_netbsd32_mqueue modules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/compat_netbsd32_mqueue/compat_netbsd32_mqueue.kmod.debug modules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/compat_netbsd32_nfssrv modules-base-kernel kmod,debug Index: src/distrib/sets/lists/debug/module.ad.mips diff -u src/distrib/sets/lists/debug/module.ad.mips:1.1 src/distrib/sets/lists/debug/module.ad.mips:1.2 --- src/distrib/sets/lists/debug/module.ad.mips:1.1 Fri May 1 22:21:11 2020 +++ src/distrib/sets/lists/debug/module.ad.mips Sun Nov 1 18:51:34 2020 @@ -1,4 +1,4 @@ -# $NetBSD: module.ad.mips,v 1.1 2020/05/01 22:21:11 christos Exp $ +# $NetBSD: module.ad.mips,v 1.2 2020/11/01 18:51:34 pgoyette Exp $ ./usr/libdata/debug/@MODULEDIR@/compat_netbsd32 modules-base-kernel kmod,arch64,nocompatmodules,debug ./usr/libdata/debug/@MODULEDIR@/compat_netbsd32/compat_netbsd32.kmod.debug
CVS commit: src/usr.bin/make
Module Name:src
Committed By: rillig
Date: Sun Nov 1 18:48:13 UTC 2020
Modified Files:
src/usr.bin/make: var.c
Log Message:
make(1): revert unintended change from previous commit
To generate a diff of this commit:
cvs rdiff -u -r1.636 -r1.637 src/usr.bin/make/var.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/make/var.c
diff -u src/usr.bin/make/var.c:1.636 src/usr.bin/make/var.c:1.637
--- src/usr.bin/make/var.c:1.636 Sun Nov 1 18:45:49 2020
+++ src/usr.bin/make/var.c Sun Nov 1 18:48:13 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.636 2020/11/01 18:45:49 rillig Exp $ */
+/* $NetBSD: var.c,v 1.637 2020/11/01 18:48:13 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -130,7 +130,7 @@
#include "metachar.h"
/* "@(#)var.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.636 2020/11/01 18:45:49 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.637 2020/11/01 18:48:13 rillig Exp $");
#define VAR_DEBUG1(fmt, arg1) DEBUG1(VAR, fmt, arg1)
#define VAR_DEBUG2(fmt, arg1, arg2) DEBUG2(VAR, fmt, arg1, arg2)
@@ -2373,7 +2373,8 @@ ApplyModifier_Match(const char **pp, App
for (p = mod + 1; *p != '\0' && !(*p == ':' && nest == 0); p++) {
if (*p == '\\' &&
(p[1] == ':' || p[1] == st->endc || p[1] == st->startc)) {
- copy = TRUE;
+ if (!needSubst)
+ copy = TRUE;
p++;
continue;
}
CVS commit: src/usr.bin/make
Module Name:src
Committed By: rillig
Date: Sun Nov 1 18:45:49 UTC 2020
Modified Files:
src/usr.bin/make: job.c var.c
Log Message:
make(1): fix indentation of source code
To generate a diff of this commit:
cvs rdiff -u -r1.301 -r1.302 src/usr.bin/make/job.c
cvs rdiff -u -r1.635 -r1.636 src/usr.bin/make/var.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/make/job.c
diff -u src/usr.bin/make/job.c:1.301 src/usr.bin/make/job.c:1.302
--- src/usr.bin/make/job.c:1.301 Sun Nov 1 17:58:17 2020
+++ src/usr.bin/make/job.c Sun Nov 1 18:45:49 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: job.c,v 1.301 2020/11/01 17:58:17 rillig Exp $ */
+/* $NetBSD: job.c,v 1.302 2020/11/01 18:45:49 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -143,7 +143,7 @@
#include "trace.h"
/* "@(#)job.c 8.2 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: job.c,v 1.301 2020/11/01 17:58:17 rillig Exp $");
+MAKE_RCSID("$NetBSD: job.c,v 1.302 2020/11/01 18:45:49 rillig Exp $");
/* A shell defines how the commands are run. All commands for a target are
* written into a single file, which is then given to the shell to execute
@@ -766,7 +766,7 @@ JobPrintCommand(Job *job, char *cmd)
*/
if (!commandShell->hasErrCtl)
-escCmd = EscapeShellDblQuot(cmd);
+ escCmd = EscapeShellDblQuot(cmd);
if (shutUp) {
if (!(job->flags & JOB_SILENT) && !noSpecials &&
Index: src/usr.bin/make/var.c
diff -u src/usr.bin/make/var.c:1.635 src/usr.bin/make/var.c:1.636
--- src/usr.bin/make/var.c:1.635 Sun Nov 1 14:36:25 2020
+++ src/usr.bin/make/var.c Sun Nov 1 18:45:49 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.635 2020/11/01 14:36:25 rillig Exp $ */
+/* $NetBSD: var.c,v 1.636 2020/11/01 18:45:49 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -130,7 +130,7 @@
#include "metachar.h"
/* "@(#)var.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.635 2020/11/01 14:36:25 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.636 2020/11/01 18:45:49 rillig Exp $");
#define VAR_DEBUG1(fmt, arg1) DEBUG1(VAR, fmt, arg1)
#define VAR_DEBUG2(fmt, arg1, arg2) DEBUG2(VAR, fmt, arg1, arg2)
@@ -2373,8 +2373,7 @@ ApplyModifier_Match(const char **pp, App
for (p = mod + 1; *p != '\0' && !(*p == ':' && nest == 0); p++) {
if (*p == '\\' &&
(p[1] == ':' || p[1] == st->endc || p[1] == st->startc)) {
- if (!needSubst)
- copy = TRUE;
+ copy = TRUE;
p++;
continue;
}
CVS commit: src/tests/lib/libc/stdlib
Module Name:src
Committed By: gson
Date: Sun Nov 1 18:19:54 UTC 2020
Modified Files:
src/tests/lib/libc/stdlib: t_mktemp.c
Log Message:
Make the mkstemps_basic and mkostemps_basic test cases not randomly
fail when the replacement string happens to contain the letter "y".
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libc/stdlib/t_mktemp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libc/stdlib/t_mktemp.c
diff -u src/tests/lib/libc/stdlib/t_mktemp.c:1.2 src/tests/lib/libc/stdlib/t_mktemp.c:1.3
--- src/tests/lib/libc/stdlib/t_mktemp.c:1.2 Wed Jul 1 05:37:25 2020
+++ src/tests/lib/libc/stdlib/t_mktemp.c Sun Nov 1 18:19:54 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: t_mktemp.c,v 1.2 2020/07/01 05:37:25 jruoho Exp $ */
+/* $NetBSD: t_mktemp.c,v 1.3 2020/11/01 18:19:54 gson Exp $ */
/*-
* Copyright (c) 2013, 2020 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__RCSID("$NetBSD: t_mktemp.c,v 1.2 2020/07/01 05:37:25 jruoho Exp $");
+__RCSID("$NetBSD: t_mktemp.c,v 1.3 2020/11/01 18:19:54 gson Exp $");
#include
@@ -136,6 +136,7 @@ ATF_TC_HEAD(mkstemps_basic, tc)
ATF_TC_BODY(mkstemps_basic, tc)
{
char template[] = "/tmp/mktemp.XXXyyy";
+ char *suffix = strchr(template, 'y');
struct stat sa;
int fd;
@@ -145,10 +146,7 @@ ATF_TC_BODY(mkstemps_basic, tc)
ATF_REQUIRE(fd != -1);
ATF_REQUIRE(strncmp(template, "/tmp/mktemp.", 12) == 0);
-
- char *str = strchr(template, 'y');
-
- ATF_REQUIRE(strcmp(str, "yyy") == 0);
+ ATF_REQUIRE(strcmp(suffix, "yyy") == 0);
ATF_REQUIRE(write(fd, "X", 1) == 1);
ATF_REQUIRE(fstat(fd, ) == 0);
ATF_REQUIRE(check_mode(sa, 0600, 0) == 0);
@@ -227,6 +225,7 @@ ATF_TC_BODY(mkostemps_basic, tc)
};
char template[] = "/tmp/mktemp.XXXyyy";
+ char *suffix = strchr(template, 'y');
struct stat sa;
size_t i;
int fd;
@@ -239,10 +238,7 @@ ATF_TC_BODY(mkostemps_basic, tc)
ATF_REQUIRE(fd != -1);
ATF_REQUIRE(strncmp(template, "/tmp/mktemp.", 12) == 0);
-
- char *str = strchr(template, 'y');
-
- ATF_REQUIRE(strcmp(str, "yyy") == 0);
+ ATF_REQUIRE(strcmp(suffix, "yyy") == 0);
ATF_REQUIRE(write(fd, "X", 1) == 1);
ATF_REQUIRE(fstat(fd, ) == 0);
ATF_REQUIRE(check_mode(sa, 0600 | flags[i], 0) == 0);
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Sun Nov 1 18:09:23 UTC 2020 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Ticket #1619 To generate a diff of this commit: cvs rdiff -u -r1.1.2.46 -r1.1.2.47 src/doc/CHANGES-8.3 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-8.3 diff -u src/doc/CHANGES-8.3:1.1.2.46 src/doc/CHANGES-8.3:1.1.2.47 --- src/doc/CHANGES-8.3:1.1.2.46 Thu Oct 22 11:33:29 2020 +++ src/doc/CHANGES-8.3 Sun Nov 1 18:09:23 2020 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.3,v 1.1.2.46 2020/10/22 11:33:29 martin Exp $ +# $NetBSD: CHANGES-8.3,v 1.1.2.47 2020/11/01 18:09:23 martin Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -1139,3 +1139,169 @@ xsrc/external/mit/freetype/dist/src/sfnt Fix CVE-2020-15999. [maya, ticket #1618] +external/bsd/tmux/dist/compat/daemon-darwin.c up to 1.1.1.1 +external/bsd/tmux/dist/compat/fdforkpty.c up to 1.1.1.1 +external/bsd/tmux/dist/compat/memmem.c up to 1.1.1.1 +external/bsd/tmux/dist/menu.c up to 1.2 +external/bsd/tmux/dist/window-tree.cup to 1.7 +external/bsd/tmux/dist/mode-tree.c up to 1.6 +external/bsd/tmux/dist/etc/ylwrap up to 1.1.1.1 +external/bsd/tmux/dist/cmd-resize-window.c up to 1.2 +external/bsd/tmux/dist/regsub.c up to 1.3 +external/bsd/tmux/dist/cmd-parse.y up to 1.3 +external/bsd/tmux/dist/window-buffer.c up to 1.6 +external/bsd/tmux/dist/spawn.c up to 1.3 +external/bsd/tmux/dist/README.jaup to 1.1.1.1 +external/bsd/tmux/dist/window-client.c up to 1.6 +external/bsd/tmux/dist/file.c up to 1.1.1.1 +external/bsd/tmux/dist/format-draw.cup to 1.1.1.3 +external/bsd/tmux/dist/cmd-display-menu.c up to 1.1.1.1 +external/bsd/tmux/dist/compat/fparseln.cdelete +external/bsd/tmux/dist/FAQ delete +external/bsd/tmux/dist/TODO delete +external/bsd/tmux/dist/cmd-choose-buffer.c delete +external/bsd/tmux/dist/cmd-choose-client.c delete +external/bsd/tmux/dist/cmd-list.c delete +external/bsd/tmux/dist/cmd-set-hook.c delete +external/bsd/tmux/dist/cmd-string.c delete +external/bsd/tmux/dist/hooks.c delete +external/bsd/tmux/dist/pty.cdelete +external/bsd/tmux/dist/signal.c delete +external/bsd/tmux/dist/window-choose.c delete +external/bsd/tmux/dist/CHANGES up to 1.1.1.6 +external/bsd/tmux/dist/COPYING up to 1.1.1.2 +external/bsd/tmux/dist/Makefile.am up to 1.1.1.6 +external/bsd/tmux/dist/Makefile.in up to 1.1.1.6 +external/bsd/tmux/dist/README up to 1.1.1.4 +external/bsd/tmux/dist/aclocal.m4 up to 1.1.1.4 +external/bsd/tmux/dist/alerts.c up to 1.1.1.5 +external/bsd/tmux/dist/arguments.c up to 1.1.1.9 +external/bsd/tmux/dist/attributes.c up to 1.1.1.9 +external/bsd/tmux/dist/cfg.cup to 1.1.1.12 +external/bsd/tmux/dist/client.c up to 1.10 +external/bsd/tmux/dist/cmd-attach-session.c up to 1.8 +external/bsd/tmux/dist/cmd-bind-key.c up to 1.1.1.9 +external/bsd/tmux/dist/cmd-break-pane.c up to 1.1.1.11 +external/bsd/tmux/dist/cmd-capture-pane.c up to 1.8 +external/bsd/tmux/dist/cmd-choose-tree.cup to 1.1.1.9 +external/bsd/tmux/dist/cmd-command-prompt.c up to 1.1.1.10 +external/bsd/tmux/dist/cmd-confirm-before.c up to 1.1.1.9 +external/bsd/tmux/dist/cmd-copy-mode.c up to 1.1.1.11 +external/bsd/tmux/dist/cmd-detach-client.c up to 1.1.1.8 +external/bsd/tmux/dist/cmd-display-message.cup to 1.10 +external/bsd/tmux/dist/cmd-display-panes.c up to 1.1.1.11 +external/bsd/tmux/dist/cmd-find-window.cup to 1.1.1.10 +external/bsd/tmux/dist/cmd-find.c up to 1.1.1.7 +external/bsd/tmux/dist/cmd-if-shell.c up to 1.10 +external/bsd/tmux/dist/cmd-join-pane.c up to 1.1.1.10 +external/bsd/tmux/dist/cmd-kill-pane.c up to 1.1.1.10 +external/bsd/tmux/dist/cmd-kill-session.c up to 1.1.1.9 +external/bsd/tmux/dist/cmd-kill-window.cup to 1.1.1.8 +external/bsd/tmux/dist/cmd-list-buffers.c up to 1.1.1.8 +external/bsd/tmux/dist/cmd-list-clients.c up to 1.1.1.8 +external/bsd/tmux/dist/cmd-list-keys.c up to 1.1.1.11 +external/bsd/tmux/dist/cmd-list-panes.c up to 1.1.1.8 +external/bsd/tmux/dist/cmd-list-sessions.c up to 1.1.1.9 +external/bsd/tmux/dist/cmd-list-windows.c up to 1.1.1.8 +external/bsd/tmux/dist/cmd-load-buffer.cup to 1.9 +external/bsd/tmux/dist/cmd-lock-server.cup to 1.1.1.8
CVS commit: [netbsd-8] src
Module Name:src Committed By: martin Date: Sun Nov 1 18:08:00 UTC 2020 Modified Files: src/doc [netbsd-8]: 3RDPARTY src/external/bsd/tmux/dist [netbsd-8]: CHANGES COPYING Makefile.am Makefile.in README aclocal.m4 alerts.c arguments.c attributes.c cfg.c client.c cmd-attach-session.c cmd-bind-key.c cmd-break-pane.c cmd-capture-pane.c cmd-choose-tree.c cmd-command-prompt.c cmd-confirm-before.c cmd-copy-mode.c cmd-detach-client.c cmd-display-message.c cmd-display-panes.c cmd-find-window.c cmd-find.c cmd-if-shell.c cmd-join-pane.c cmd-kill-pane.c cmd-kill-session.c cmd-kill-window.c cmd-list-buffers.c cmd-list-clients.c cmd-list-keys.c cmd-list-panes.c cmd-list-sessions.c cmd-list-windows.c cmd-load-buffer.c cmd-lock-server.c cmd-move-window.c cmd-new-session.c cmd-new-window.c cmd-paste-buffer.c cmd-pipe-pane.c cmd-queue.c cmd-refresh-client.c cmd-rename-session.c cmd-rename-window.c cmd-resize-pane.c cmd-respawn-pane.c cmd-respawn-window.c cmd-rotate-window.c cmd-run-shell.c cmd-save-buffer.c cmd-select-layout.c cmd-select-pane.c cmd-select-window.c cmd-send-keys.c cmd-set-environment.c cmd-set-option.c cmd-show-environment.c cmd-show-messages.c cmd-show-options.c cmd-source-file.c cmd-split-window.c cmd-swap-pane.c cmd-swap-window.c cmd-switch-client.c cmd-wait-for.c cmd.c colour.c compat.h configure configure.ac control-notify.c control.c environ.c example_tmux.conf format.c grid-view.c grid.c input-keys.c input.c job.c key-bindings.c key-string.c layout-custom.c layout-set.c layout.c log.c mdoc2man.awk names.c notify.c options-table.c options.c osdep-darwin.c osdep-freebsd.c osdep-linux.c osdep-netbsd.c paste.c proc.c resize.c screen-redraw.c screen-write.c screen.c server-client.c server-fn.c server.c session.c status.c style.c tmux.1 tmux.c tmux.h tty-acs.c tty-keys.c tty-term.c tty.c utf8.c window-clock.c window-copy.c window.c xmalloc.c xmalloc.h xterm-keys.c src/external/bsd/tmux/dist/compat [netbsd-8]: getdtablecount.c imsg-buffer.c imsg.c src/external/bsd/tmux/dist/etc [netbsd-8]: compile config.guess config.sub depcomp install-sh missing src/external/bsd/tmux/usr.bin/tmux [netbsd-8]: Makefile Added Files: src/external/bsd/tmux/dist [netbsd-8]: README.ja cmd-display-menu.c cmd-parse.y cmd-resize-window.c file.c format-draw.c menu.c mode-tree.c regsub.c spawn.c window-buffer.c window-client.c window-tree.c src/external/bsd/tmux/dist/compat [netbsd-8]: daemon-darwin.c fdforkpty.c memmem.c src/external/bsd/tmux/dist/etc [netbsd-8]: ylwrap Removed Files: src/external/bsd/tmux/dist [netbsd-8]: FAQ TODO cmd-choose-buffer.c cmd-choose-client.c cmd-list.c cmd-set-hook.c cmd-string.c hooks.c pty.c signal.c window-choose.c src/external/bsd/tmux/dist/compat [netbsd-8]: fparseln.c Log Message: Pull up the following, requested by christos in ticket #1619: external/bsd/tmux/dist/compat/daemon-darwin.c up to 1.1.1.1 external/bsd/tmux/dist/compat/fdforkpty.c up to 1.1.1.1 external/bsd/tmux/dist/compat/memmem.c up to 1.1.1.1 external/bsd/tmux/dist/menu.c up to 1.2 external/bsd/tmux/dist/window-tree.cup to 1.7 external/bsd/tmux/dist/mode-tree.c up to 1.6 external/bsd/tmux/dist/etc/ylwrap up to 1.1.1.1 external/bsd/tmux/dist/cmd-resize-window.c up to 1.2 external/bsd/tmux/dist/regsub.c up to 1.3 external/bsd/tmux/dist/cmd-parse.y up to 1.3 external/bsd/tmux/dist/window-buffer.c up to 1.6 external/bsd/tmux/dist/spawn.c up to 1.3 external/bsd/tmux/dist/README.jaup to 1.1.1.1 external/bsd/tmux/dist/window-client.c up to 1.6 external/bsd/tmux/dist/file.c up to 1.1.1.1 external/bsd/tmux/dist/format-draw.cup to 1.1.1.3 external/bsd/tmux/dist/cmd-display-menu.c up to 1.1.1.1 external/bsd/tmux/dist/compat/fparseln.cdelete external/bsd/tmux/dist/FAQ delete external/bsd/tmux/dist/TODO delete external/bsd/tmux/dist/cmd-choose-buffer.c delete external/bsd/tmux/dist/cmd-choose-client.c delete external/bsd/tmux/dist/cmd-list.c delete external/bsd/tmux/dist/cmd-set-hook.c delete external/bsd/tmux/dist/cmd-string.c
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Sun Nov 1 18:03:21 UTC 2020 Modified Files: src/doc [netbsd-9]: CHANGES-9.2 Log Message: Tickets #1122, #1124, #1125 To generate a diff of this commit: cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/doc/CHANGES-9.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-9.2 diff -u src/doc/CHANGES-9.2:1.1.2.3 src/doc/CHANGES-9.2:1.1.2.4 --- src/doc/CHANGES-9.2:1.1.2.3 Fri Oct 23 08:41:00 2020 +++ src/doc/CHANGES-9.2 Sun Nov 1 18:03:21 2020 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.2,v 1.1.2.3 2020/10/23 08:41:00 martin Exp $ +# $NetBSD: CHANGES-9.2,v 1.1.2.4 2020/11/01 18:03:21 martin Exp $ A complete list of changes from the NetBSD 9.1 release to the NetBSD 9.2 release: @@ -871,4 +871,148 @@ distrib/notes/common/main(manually e Remove 9.0 release dedication - new releases will not be 9.0 any more. [martin] +external/public-domain/tz/dist/Makefile up to 1.1.1.29 +external/public-domain/tz/dist/NEWS up to 1.1.1.32 +external/public-domain/tz/dist/TZDATA_VERSION up to 1.22 +external/public-domain/tz/dist/asia up to 1.1.1.27 +external/public-domain/tz/dist/europe up to 1.1.1.29 +external/public-domain/tz/dist/version up to 1.1.1.19 +doc/3RDPARTY (apply patch) + Updated tzdata to 2020d. + [kre, ticket #1122] + +sys/kern/kern_time.c1.206 + + Prevent the system clock from being set too low or high. + [nia, ticket #1124] + +external/bsd/tmux/dist/menu.c up to 1.2 +external/bsd/tmux/dist/etc/ylwrap up to 1.1.1.1 +external/bsd/tmux/dist/cmd-resize-window.c up to 1.2 +external/bsd/tmux/dist/regsub.c up to 1.3 +external/bsd/tmux/dist/cmd-parse.y up to 1.3 +external/bsd/tmux/dist/spawn.c up to 1.3 +external/bsd/tmux/dist/file.c up to 1.1.1.1 +external/bsd/tmux/dist/format-draw.cup to 1.1.1.3 +external/bsd/tmux/dist/cmd-display-menu.c up to 1.1.1.1 +external/bsd/tmux/dist/compat/fparseln.cdelete +external/bsd/tmux/dist/TODO delete +external/bsd/tmux/dist/cmd-list.c delete +external/bsd/tmux/dist/cmd-set-hook.c delete +external/bsd/tmux/dist/cmd-string.c delete +external/bsd/tmux/dist/hooks.c delete +external/bsd/tmux/dist/CHANGES up to 1.1.1.6 +external/bsd/tmux/dist/COPYING up to 1.1.1.2 +external/bsd/tmux/dist/Makefile.am up to 1.1.1.6 +external/bsd/tmux/dist/Makefile.in up to 1.1.1.6 +external/bsd/tmux/dist/README up to 1.1.1.4 +external/bsd/tmux/dist/aclocal.m4 up to 1.1.1.4 +external/bsd/tmux/dist/arguments.c up to 1.1.1.9 +external/bsd/tmux/dist/attributes.c up to 1.1.1.9 +external/bsd/tmux/dist/cfg.cup to 1.1.1.12 +external/bsd/tmux/dist/client.c up to 1.10 +external/bsd/tmux/dist/cmd-attach-session.c up to 1.8 +external/bsd/tmux/dist/cmd-bind-key.c up to 1.1.1.9 +external/bsd/tmux/dist/cmd-break-pane.c up to 1.1.1.11 +external/bsd/tmux/dist/cmd-capture-pane.c up to 1.8 +external/bsd/tmux/dist/cmd-choose-tree.cup to 1.1.1.9 +external/bsd/tmux/dist/cmd-command-prompt.c up to 1.1.1.10 +external/bsd/tmux/dist/cmd-confirm-before.c up to 1.1.1.9 +external/bsd/tmux/dist/cmd-copy-mode.c up to 1.1.1.11 +external/bsd/tmux/dist/cmd-display-message.cup to 1.10 +external/bsd/tmux/dist/cmd-display-panes.c up to 1.1.1.11 +external/bsd/tmux/dist/cmd-find-window.cup to 1.1.1.10 +external/bsd/tmux/dist/cmd-find.c up to 1.1.1.7 +external/bsd/tmux/dist/cmd-if-shell.c up to 1.10 +external/bsd/tmux/dist/cmd-join-pane.c up to 1.1.1.10 +external/bsd/tmux/dist/cmd-kill-pane.c up to 1.1.1.10 +external/bsd/tmux/dist/cmd-kill-session.c up to 1.1.1.9 +external/bsd/tmux/dist/cmd-list-keys.c up to 1.1.1.11 +external/bsd/tmux/dist/cmd-list-sessions.c up to 1.1.1.9 +external/bsd/tmux/dist/cmd-load-buffer.cup to 1.9 +external/bsd/tmux/dist/cmd-new-session.cup to 1.8 +external/bsd/tmux/dist/cmd-new-window.c up to 1.8 +external/bsd/tmux/dist/cmd-pipe-pane.c up to 1.1.1.10 +external/bsd/tmux/dist/cmd-queue.c up to 1.6 +external/bsd/tmux/dist/cmd-refresh-client.c up to 1.1.1.11 +external/bsd/tmux/dist/cmd-resize-pane.cup to 1.1.1.12 +external/bsd/tmux/dist/cmd-respawn-pane.c up to 1.1.1.9 +external/bsd/tmux/dist/cmd-respawn-window.c up to 1.1.1.11 +external/bsd/tmux/dist/cmd-rotate-window.c up to 1.1.1.10 +external/bsd/tmux/dist/cmd-run-shell.c up to 1.1.1.11 +external/bsd/tmux/dist/cmd-save-buffer.cup to 1.1.1.11
CVS commit: [netbsd-9] src
Module Name:src Committed By: martin Date: Sun Nov 1 18:01:16 UTC 2020 Modified Files: src/doc [netbsd-9]: 3RDPARTY src/external/bsd/tmux/dist [netbsd-9]: CHANGES COPYING Makefile.am Makefile.in README aclocal.m4 arguments.c attributes.c cfg.c client.c cmd-attach-session.c cmd-bind-key.c cmd-break-pane.c cmd-capture-pane.c cmd-choose-tree.c cmd-command-prompt.c cmd-confirm-before.c cmd-copy-mode.c cmd-display-message.c cmd-display-panes.c cmd-find-window.c cmd-find.c cmd-if-shell.c cmd-join-pane.c cmd-kill-pane.c cmd-kill-session.c cmd-list-keys.c cmd-list-sessions.c cmd-load-buffer.c cmd-new-session.c cmd-new-window.c cmd-pipe-pane.c cmd-queue.c cmd-refresh-client.c cmd-resize-pane.c cmd-respawn-pane.c cmd-respawn-window.c cmd-rotate-window.c cmd-run-shell.c cmd-save-buffer.c cmd-select-layout.c cmd-select-pane.c cmd-select-window.c cmd-send-keys.c cmd-set-option.c cmd-show-messages.c cmd-show-options.c cmd-source-file.c cmd-split-window.c cmd-swap-pane.c cmd-swap-window.c cmd-switch-client.c cmd-wait-for.c cmd.c colour.c compat.h configure configure.ac control-notify.c control.c environ.c example_tmux.conf format.c grid.c input-keys.c input.c job.c key-bindings.c key-string.c layout-custom.c layout-set.c layout.c log.c mdoc2man.awk mode-tree.c notify.c options-table.c options.c osdep-darwin.c osdep-freebsd.c osdep-netbsd.c paste.c proc.c resize.c screen-redraw.c screen-write.c screen.c server-client.c server-fn.c server.c session.c status.c style.c tmux.1 tmux.c tmux.h tty-acs.c tty-keys.c tty-term.c tty.c utf8.c window-buffer.c window-client.c window-clock.c window-copy.c window-tree.c window.c xmalloc.c xmalloc.h src/external/bsd/tmux/usr.bin/tmux [netbsd-9]: Makefile Added Files: src/external/bsd/tmux/dist [netbsd-9]: cmd-display-menu.c cmd-parse.y cmd-resize-window.c file.c format-draw.c menu.c regsub.c spawn.c src/external/bsd/tmux/dist/etc [netbsd-9]: ylwrap Removed Files: src/external/bsd/tmux/dist [netbsd-9]: TODO cmd-list.c cmd-set-hook.c cmd-string.c hooks.c src/external/bsd/tmux/dist/compat [netbsd-9]: fparseln.c Log Message: Pull up the following external/bsd/tmux/dist/menu.c up to 1.2 external/bsd/tmux/dist/etc/ylwrap up to 1.1.1.1 external/bsd/tmux/dist/cmd-resize-window.c up to 1.2 external/bsd/tmux/dist/regsub.c up to 1.3 external/bsd/tmux/dist/cmd-parse.y up to 1.3 external/bsd/tmux/dist/spawn.c up to 1.3 external/bsd/tmux/dist/file.c up to 1.1.1.1 external/bsd/tmux/dist/format-draw.cup to 1.1.1.3 external/bsd/tmux/dist/cmd-display-menu.c up to 1.1.1.1 external/bsd/tmux/dist/compat/fparseln.cdelete external/bsd/tmux/dist/TODO delete external/bsd/tmux/dist/cmd-list.c delete external/bsd/tmux/dist/cmd-set-hook.c delete external/bsd/tmux/dist/cmd-string.c delete external/bsd/tmux/dist/hooks.c delete external/bsd/tmux/dist/CHANGES up to 1.1.1.6 external/bsd/tmux/dist/COPYING up to 1.1.1.2 external/bsd/tmux/dist/Makefile.am up to 1.1.1.6 external/bsd/tmux/dist/Makefile.in up to 1.1.1.6 external/bsd/tmux/dist/README up to 1.1.1.4 external/bsd/tmux/dist/aclocal.m4 up to 1.1.1.4 external/bsd/tmux/dist/arguments.c up to 1.1.1.9 external/bsd/tmux/dist/attributes.c up to 1.1.1.9 external/bsd/tmux/dist/cfg.cup to 1.1.1.12 external/bsd/tmux/dist/client.c up to 1.10 external/bsd/tmux/dist/cmd-attach-session.c up to 1.8 external/bsd/tmux/dist/cmd-bind-key.c up to 1.1.1.9 external/bsd/tmux/dist/cmd-break-pane.c up to 1.1.1.11 external/bsd/tmux/dist/cmd-capture-pane.c up to 1.8 external/bsd/tmux/dist/cmd-choose-tree.cup to 1.1.1.9 external/bsd/tmux/dist/cmd-command-prompt.c up to 1.1.1.10 external/bsd/tmux/dist/cmd-confirm-before.c up to 1.1.1.9 external/bsd/tmux/dist/cmd-copy-mode.c up to 1.1.1.11 external/bsd/tmux/dist/cmd-display-message.cup to 1.10 external/bsd/tmux/dist/cmd-display-panes.c up to 1.1.1.11 external/bsd/tmux/dist/cmd-find-window.cup to 1.1.1.10 external/bsd/tmux/dist/cmd-find.c
CVS commit: src/usr.bin/make
Module Name:src
Committed By: rillig
Date: Sun Nov 1 17:58:18 UTC 2020
Modified Files:
src/usr.bin/make: job.c
Log Message:
make(1): rename JobMatchShell to FindShellByName
The word 'match' was too unspecific.
To generate a diff of this commit:
cvs rdiff -u -r1.300 -r1.301 src/usr.bin/make/job.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/make/job.c
diff -u src/usr.bin/make/job.c:1.300 src/usr.bin/make/job.c:1.301
--- src/usr.bin/make/job.c:1.300 Sun Nov 1 17:47:26 2020
+++ src/usr.bin/make/job.c Sun Nov 1 17:58:17 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: job.c,v 1.300 2020/11/01 17:47:26 rillig Exp $ */
+/* $NetBSD: job.c,v 1.301 2020/11/01 17:58:17 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -143,7 +143,7 @@
#include "trace.h"
/* "@(#)job.c 8.2 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: job.c,v 1.300 2020/11/01 17:47:26 rillig Exp $");
+MAKE_RCSID("$NetBSD: job.c,v 1.301 2020/11/01 17:58:17 rillig Exp $");
/* A shell defines how the commands are run. All commands for a target are
* written into a single file, which is then given to the shell to execute
@@ -2236,7 +2236,7 @@ static void JobSigReset(void)
/* Find a shell in 'shells' given its name, or return NULL. */
static Shell *
-JobMatchShell(const char *name)
+FindShellByName(const char *name)
{
Shell *sh = shells;
const Shell *shellsEnd = sh + sizeof shells / sizeof shells[0];
@@ -2370,7 +2370,7 @@ Job_ParseShell(char *line)
if (path == NULL) {
/*
* If no path was given, the user wants one of the pre-defined shells,
- * yes? So we find the one s/he wants with the help of JobMatchShell
+ * yes? So we find the one s/he wants with the help of FindShellByName
* and set things up the right way. shellPath will be set up by
* Shell_Init.
*/
@@ -2379,7 +2379,7 @@ Job_ParseShell(char *line)
free(words);
return FALSE;
} else {
- if ((sh = JobMatchShell(newShell.name)) == NULL) {
+ if ((sh = FindShellByName(newShell.name)) == NULL) {
Parse_Error(PARSE_WARNING, "%s: No matching shell",
newShell.name);
free(words);
@@ -2415,7 +2415,7 @@ Job_ParseShell(char *line)
shellName = path;
}
if (!fullSpec) {
- if ((sh = JobMatchShell(shellName)) == NULL) {
+ if ((sh = FindShellByName(shellName)) == NULL) {
Parse_Error(PARSE_WARNING, "%s: No matching shell",
shellName);
free(words);
CVS commit: src/doc
Module Name:src Committed By: christos Date: Sun Nov 1 17:54:46 UTC 2020 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new tmux To generate a diff of this commit: cvs rdiff -u -r1.1758 -r1.1759 src/doc/3RDPARTY cvs rdiff -u -r1.2751 -r1.2752 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1758 src/doc/3RDPARTY:1.1759 --- src/doc/3RDPARTY:1.1758 Sun Nov 1 09:25:48 2020 +++ src/doc/3RDPARTY Sun Nov 1 12:54:46 2020 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1758 2020/11/01 14:25:48 roy Exp $ +# $NetBSD: 3RDPARTY,v 1.1759 2020/11/01 17:54:46 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1369,7 +1369,7 @@ perhaps this implementation should be ke purposes. Package: tmux -Version: 3.0a +Version: 3.1c Current Vers: 3.1c Maintainer: Nicholas Marriott Archive site: https://github.com/tmux/tmux Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2751 src/doc/CHANGES:1.2752 --- src/doc/CHANGES:1.2751 Sun Nov 1 09:25:48 2020 +++ src/doc/CHANGES Sun Nov 1 12:54:46 2020 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2751 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2752 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -298,3 +298,4 @@ Changes from NetBSD 9.0 to NetBSD 10.0: ossaudio(3): Added support for the OSSv4 Mixer API [nia 20201017] tzdata updated to 2020d [kre 20201022] dhcpcd: Update to version 9.3.1 [roy 20201101] + tmux(1): Imported 3.1c. [christos 20201101]
CVS commit: src/usr.bin/make
Module Name:src
Committed By: rillig
Date: Sun Nov 1 17:47:26 UTC 2020
Modified Files:
src/usr.bin/make: compat.c job.c make.c make.h
Log Message:
make(1): negate NoExecute to GNode_ShouldExecute
To generate a diff of this commit:
cvs rdiff -u -r1.172 -r1.173 src/usr.bin/make/compat.c
cvs rdiff -u -r1.299 -r1.300 src/usr.bin/make/job.c
cvs rdiff -u -r1.185 -r1.186 src/usr.bin/make/make.c
cvs rdiff -u -r1.178 -r1.179 src/usr.bin/make/make.h
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/compat.c
diff -u src/usr.bin/make/compat.c:1.172 src/usr.bin/make/compat.c:1.173
--- src/usr.bin/make/compat.c:1.172 Sat Oct 31 18:20:00 2020
+++ src/usr.bin/make/compat.c Sun Nov 1 17:47:26 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: compat.c,v 1.172 2020/10/31 18:20:00 rillig Exp $ */
+/* $NetBSD: compat.c,v 1.173 2020/11/01 17:47:26 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -96,7 +96,7 @@
#include "pathnames.h"
/* "@(#)compat.c 8.2 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: compat.c,v 1.172 2020/10/31 18:20:00 rillig Exp $");
+MAKE_RCSID("$NetBSD: compat.c,v 1.173 2020/11/01 17:47:26 rillig Exp $");
static GNode *curTarg = NULL;
static pid_t compatChild;
@@ -274,7 +274,7 @@ Compat_RunCommand(const char *cmdp, GNod
* Print the command before echoing if we're not supposed to be quiet for
* this one. We also print the command if -n given.
*/
-if (!silent || NoExecute(gn)) {
+if (!silent || !GNode_ShouldExecute(gn)) {
printf("%s\n", cmd);
fflush(stdout);
}
@@ -283,7 +283,7 @@ Compat_RunCommand(const char *cmdp, GNod
* If we're not supposed to execute any commands, this is as far as
* we go...
*/
-if (!doIt && NoExecute(gn)) {
+if (!doIt && !GNode_ShouldExecute(gn)) {
return 0;
}
DEBUG1(JOB, "Execute: '%s'\n", cmd);
@@ -548,7 +548,7 @@ Compat_Make(GNode *gn, GNode *pgn)
if (!opts.touchFlag || (gn->type & OP_MAKE)) {
curTarg = gn;
#ifdef USE_META
- if (useMeta && !NoExecute(gn)) {
+ if (useMeta && GNode_ShouldExecute(gn)) {
meta_job_start(NULL, gn);
}
#endif
@@ -561,7 +561,7 @@ Compat_Make(GNode *gn, GNode *pgn)
gn->made = ERROR;
}
#ifdef USE_META
- if (useMeta && !NoExecute(gn)) {
+ if (useMeta && GNode_ShouldExecute(gn)) {
if (meta_job_finish(NULL) != 0)
gn->made = ERROR;
}
Index: src/usr.bin/make/job.c
diff -u src/usr.bin/make/job.c:1.299 src/usr.bin/make/job.c:1.300
--- src/usr.bin/make/job.c:1.299 Sun Nov 1 17:07:03 2020
+++ src/usr.bin/make/job.c Sun Nov 1 17:47:26 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: job.c,v 1.299 2020/11/01 17:07:03 rillig Exp $ */
+/* $NetBSD: job.c,v 1.300 2020/11/01 17:47:26 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -143,7 +143,7 @@
#include "trace.h"
/* "@(#)job.c 8.2 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: job.c,v 1.299 2020/11/01 17:07:03 rillig Exp $");
+MAKE_RCSID("$NetBSD: job.c,v 1.300 2020/11/01 17:47:26 rillig Exp $");
/* A shell defines how the commands are run. All commands for a target are
* written into a single file, which is then given to the shell to execute
@@ -731,7 +731,7 @@ JobPrintCommand(Job *job, char *cmd)
char *cmdStart; /* Start of expanded command */
char *escCmd = NULL; /* Command with quotes/backticks escaped */
-noSpecials = NoExecute(job->node);
+noSpecials = !GNode_ShouldExecute(job->node);
#define DBPRINTF(fmt, arg) if (DEBUG(JOB)) { \
debug_printf(fmt, arg); \
@@ -1142,12 +1142,12 @@ Job_Touch(GNode *gn, Boolean silent)
return;
}
-if (!silent || NoExecute(gn)) {
+if (!silent || !GNode_ShouldExecute(gn)) {
(void)fprintf(stdout, "touch %s\n", gn->name);
(void)fflush(stdout);
}
-if (NoExecute(gn)) {
+if (!GNode_ShouldExecute(gn)) {
return;
}
@@ -1600,7 +1600,7 @@ JobStart(GNode *gn, int flags)
}
free(tfile);
-} else if (NoExecute(gn)) {
+} else if (!GNode_ShouldExecute(gn)) {
/*
* Not executing anything -- just print all the commands to stdout
* in one fell swoop. This will still set up job->tailCmds correctly.
Index: src/usr.bin/make/make.c
diff -u src/usr.bin/make/make.c:1.185 src/usr.bin/make/make.c:1.186
--- src/usr.bin/make/make.c:1.185 Sat Oct 31 18:41:07 2020
+++ src/usr.bin/make/make.c Sun Nov 1 17:47:26 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: make.c,v 1.185 2020/10/31 18:41:07 rillig Exp $ */
+/* $NetBSD: make.c,v 1.186 2020/11/01 17:47:26 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -107,7 +107,7 @@
#include "job.h"
/* "@(#)make.c 8.1 (Berkeley) 6/6/93" */
-MAKE_RCSID("$NetBSD: make.c,v 1.185 2020/10/31 18:41:07 rillig Exp $");
+MAKE_RCSID("$NetBSD: make.c,v 1.186 2020/11/01 17:47:26 rillig Exp $");
/* Sequence # to detect recursion. */
static unsigned
CVS commit: src/usr.bin/make/unit-tests
Module Name:src
Committed By: rillig
Date: Sun Nov 1 17:29:14 UTC 2020
Modified Files:
src/usr.bin/make/unit-tests: job-output-long-lines.mk
Log Message:
make(1): reduce amount of work in test job-output-long-lines.mk
The effect that some of the separator lines start at the end of another
line is still visible.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/make/unit-tests/job-output-long-lines.mk
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/unit-tests/job-output-long-lines.mk
diff -u src/usr.bin/make/unit-tests/job-output-long-lines.mk:1.3 src/usr.bin/make/unit-tests/job-output-long-lines.mk:1.4
--- src/usr.bin/make/unit-tests/job-output-long-lines.mk:1.3 Sat Oct 24 08:50:17 2020
+++ src/usr.bin/make/unit-tests/job-output-long-lines.mk Sun Nov 1 17:29:13 2020
@@ -1,4 +1,4 @@
-# $NetBSD: job-output-long-lines.mk,v 1.3 2020/10/24 08:50:17 rillig Exp $
+# $NetBSD: job-output-long-lines.mk,v 1.4 2020/11/01 17:29:13 rillig Exp $
#
# The jobs may produce long lines of output. A practical case are the echoed
# command lines from compiler invocations, with their many -D options.
@@ -17,16 +17,16 @@
.MAKEFLAGS: -j2
100:= ${:U1:S,1,22,g:S,2,33,g}
-1:= ${100:S,3,44,g:S,4,xx,g}
+5000:= ${100:S,3,44,g:S,4,x,g}
all: job-a job-b
job-a:
-.for i in ${:U:range=100}
- @echo ${1:S,x,a,g}
+.for i in ${:U:range=20}
+ @echo ${5000:S,x,a,g}
.endfor
job-b:
-.for i in ${:U:range=100}
- @echo ${1:S,x,b,g}
+.for i in ${:U:range=20}
+ @echo ${5000:S,x,b,g}
.endfor
CVS commit: [netbsd-9] src/sys/kern
Module Name:src Committed By: martin Date: Sun Nov 1 17:26:01 UTC 2020 Modified Files: src/sys/kern [netbsd-9]: kern_time.c Log Message: Pull up following revision(s) (requested by nia in ticket #1124): sys/kern/kern_time.c: revision 1.206 kern_time: prevent the system clock from being set too low or high currently doing this will drive KUBSAN haywire and possibly cause system lock-ups, so more testing should probably be performed before we let the clock be set too many thousands of years into the future. ditto for negative values, which were being passed by chrony for some reason while my internet connection was being unreliable. this also triggered some interesting KUBSAN reports. To generate a diff of this commit: cvs rdiff -u -r1.197.4.3 -r1.197.4.4 src/sys/kern/kern_time.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/kern/kern_time.c diff -u src/sys/kern/kern_time.c:1.197.4.3 src/sys/kern/kern_time.c:1.197.4.4 --- src/sys/kern/kern_time.c:1.197.4.3 Mon May 18 19:05:32 2020 +++ src/sys/kern/kern_time.c Sun Nov 1 17:26:01 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: kern_time.c,v 1.197.4.3 2020/05/18 19:05:32 martin Exp $ */ +/* $NetBSD: kern_time.c,v 1.197.4.4 2020/11/01 17:26:01 martin Exp $ */ /*- * Copyright (c) 2000, 2004, 2005, 2007, 2008, 2009 The NetBSD Foundation, Inc. @@ -61,7 +61,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: kern_time.c,v 1.197.4.3 2020/05/18 19:05:32 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kern_time.c,v 1.197.4.4 2020/11/01 17:26:01 martin Exp $"); #include #include @@ -138,6 +138,13 @@ settime1(struct proc *p, const struct ti struct timespec delta, now; int s; + /* + * The time being set to an unreasonable value will cause + * unreasonable system behaviour. + */ + if (ts->tv_sec < 0 || ts->tv_sec > (1LL << 36)) + return (EINVAL); + /* WHAT DO WE DO ABOUT PENDING REAL-TIME TIMEOUTS??? */ s = splclock(); nanotime();
CVS commit: [netbsd-9] src
Module Name:src Committed By: martin Date: Sun Nov 1 17:19:35 UTC 2020 Modified Files: src/doc [netbsd-9]: 3RDPARTY src/external/public-domain/tz/dist [netbsd-9]: Makefile NEWS TZDATA_VERSION asia europe version Log Message: Pull up the following, requested by kre in ticket #1122: external/public-domain/tz/dist/Makefile up to 1.1.1.29 external/public-domain/tz/dist/NEWS up to 1.1.1.32 external/public-domain/tz/dist/TZDATA_VERSION up to 1.22 external/public-domain/tz/dist/asia up to 1.1.1.27 external/public-domain/tz/dist/europe up to 1.1.1.29 external/public-domain/tz/dist/version up to 1.1.1.19 doc/3RDPARTY(apply patch) Update tzdata to 2020d To generate a diff of this commit: cvs rdiff -u -r1.1640.2.19 -r1.1640.2.20 src/doc/3RDPARTY cvs rdiff -u -r1.1.1.24.2.4 -r1.1.1.24.2.5 \ src/external/public-domain/tz/dist/Makefile \ src/external/public-domain/tz/dist/europe cvs rdiff -u -r1.1.1.27.2.4 -r1.1.1.27.2.5 \ src/external/public-domain/tz/dist/NEWS cvs rdiff -u -r1.17.2.4 -r1.17.2.5 \ src/external/public-domain/tz/dist/TZDATA_VERSION cvs rdiff -u -r1.1.1.23.2.3 -r1.1.1.23.2.4 \ src/external/public-domain/tz/dist/asia cvs rdiff -u -r1.1.1.14.2.4 -r1.1.1.14.2.5 \ src/external/public-domain/tz/dist/version Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1640.2.19 src/doc/3RDPARTY:1.1640.2.20 --- src/doc/3RDPARTY:1.1640.2.19 Sun Oct 18 18:18:44 2020 +++ src/doc/3RDPARTY Sun Nov 1 17:19:34 2020 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1640.2.19 2020/10/18 18:18:44 martin Exp $ +# $NetBSD: 3RDPARTY,v 1.1640.2.20 2020/11/01 17:19:34 martin Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1398,8 +1398,8 @@ Notes: Added changes from a5 -> a12 manually. Package: tz -Version: tzcode2019b / tzdata2020c -Current Vers: tzcode2020c / tzdata2020c +Version: tzcode2019b / tzdata2020d +Current Vers: tzcode2020d / tzdata2020d Maintainer: Paul Eggert Archive Site: ftp://ftp.iana.org/tz/releases/ Archive Site: ftp://munnari.oz.au/pub/oldtz/ Index: src/external/public-domain/tz/dist/Makefile diff -u src/external/public-domain/tz/dist/Makefile:1.1.1.24.2.4 src/external/public-domain/tz/dist/Makefile:1.1.1.24.2.5 --- src/external/public-domain/tz/dist/Makefile:1.1.1.24.2.4 Sun Oct 18 18:18:44 2020 +++ src/external/public-domain/tz/dist/Makefile Sun Nov 1 17:19:35 2020 @@ -1023,7 +1023,7 @@ tzdata$(VERSION)-rearguard.tar.gz: rearg sed '1s/$$/-rearguard/' \ tzdata$(VERSION)-rearguard.dir/version : The dummy pacificnew pacifies TZUpdater 2.3.1 and earlier. - touch -md 2020-10-12T22:53:00Z \ + TZ=UTC0 touch -mt 202010122253.00 \ tzdata$(VERSION)-rearguard.dir/pacificnew touch -cmr version tzdata$(VERSION)-rearguard.dir/version LC_ALL=C && export LC_ALL && \ Index: src/external/public-domain/tz/dist/europe diff -u src/external/public-domain/tz/dist/europe:1.1.1.24.2.4 src/external/public-domain/tz/dist/europe:1.1.1.24.2.5 --- src/external/public-domain/tz/dist/europe:1.1.1.24.2.4 Sun Oct 18 18:18:44 2020 +++ src/external/public-domain/tz/dist/europe Sun Nov 1 17:19:35 2020 @@ -1029,17 +1029,16 @@ Zone Europe/Prague 0:57:44 - LMT 1850 # Denmark, Faroe Islands, and Greenland # From Jesper Nørgaard Welen (2005-04-26): -# http://www.hum.aau.dk/~poe/tid/tine/DanskTid.htm says that the law -# [introducing standard time] was in effect from 1894-01-01 -# The page http://www.retsinfo.dk/_GETDOCI_/ACCN/A18930008330-REGL +# the law [introducing standard time] was in effect from 1894-01-01 +# The page https://www.retsinformation.dk/eli/lta/1893/83 # confirms this, and states that the law was put forth 1893-03-29. # # The EU [actually, EEC and Euratom] treaty with effect from 1973: -# http://www.retsinfo.dk/_GETDOCI_/ACCN/A19722110030-REGL +# https://www.retsinformation.dk/eli/lta/1972/21100 # # This provoked a new law from 1974 to make possible summer time changes # in subsequent decrees with the law -# http://www.retsinfo.dk/_GETDOCI_/ACCN/A19740022330-REGL +# https://www.retsinformation.dk/eli/lta/1974/223 # # It seems however that no decree was set forward until 1980. I have # not found any decree, but in another related law, the effecting DST @@ -1051,7 +1050,7 @@ Zone Europe/Prague 0:57:44 - LMT 1850 # The law is about the management of the extra hour, concerning # working hours reported and effect on obligatory-rest rules (which # was suspended on that night): -# http://www.retsinfo.dk/_GETDOCI_/ACCN/C19801120554-REGL +# https://web.archive.org/web/20140104053304/https://www.retsinformation.dk/Forms/R0710.aspx?id=60267 # From Jesper Nørgaard
CVS commit: src/usr.bin/make
Module Name:src
Committed By: rillig
Date: Sun Nov 1 17:07:03 UTC 2020
Modified Files:
src/usr.bin/make: job.c
Log Message:
make(1): extract EscapeShellDblQuot from JobPrintCommand
To generate a diff of this commit:
cvs rdiff -u -r1.298 -r1.299 src/usr.bin/make/job.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/make/job.c
diff -u src/usr.bin/make/job.c:1.298 src/usr.bin/make/job.c:1.299
--- src/usr.bin/make/job.c:1.298 Sun Nov 1 16:57:02 2020
+++ src/usr.bin/make/job.c Sun Nov 1 17:07:03 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: job.c,v 1.298 2020/11/01 16:57:02 rillig Exp $ */
+/* $NetBSD: job.c,v 1.299 2020/11/01 17:07:03 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -143,7 +143,7 @@
#include "trace.h"
/* "@(#)job.c 8.2 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: job.c,v 1.298 2020/11/01 16:57:02 rillig Exp $");
+MAKE_RCSID("$NetBSD: job.c,v 1.299 2020/11/01 17:07:03 rillig Exp $");
/* A shell defines how the commands are run. All commands for a target are
* written into a single file, which is then given to the shell to execute
@@ -674,6 +674,24 @@ ParseRunOptions(
*pp = p;
}
+/* Escape a string for a double-quoted string literal in sh, csh and ksh. */
+static char *
+EscapeShellDblQuot(const char *cmd)
+{
+size_t i, j;
+
+/* Worst that could happen is every char needs escaping. */
+char *esc = bmake_malloc(strlen(cmd) * 2 + 1);
+for (i = 0, j = 0; cmd[i] != '\0'; i++, j++) {
+ if (cmd[i] == '$' || cmd[i] == '`' || cmd[i] == '\\' || cmd[i] == '"')
+ esc[j++] = '\\';
+ esc[j] = cmd[i];
+}
+esc[j] = '\0';
+
+return esc;
+}
+
/*-
*---
* JobPrintCommand --
@@ -747,19 +765,8 @@ JobPrintCommand(Job *job, char *cmd)
* and this will need the characters '$ ` \ "' escaped
*/
-if (!commandShell->hasErrCtl) {
- int i, j;
-
- /* Worst that could happen is every char needs escaping. */
- escCmd = bmake_malloc((strlen(cmd) * 2) + 1);
- for (i = 0, j = 0; cmd[i] != '\0'; i++, j++) {
- if (cmd[i] == '$' || cmd[i] == '`' || cmd[i] == '\\' ||
- cmd[i] == '"')
- escCmd[j++] = '\\';
- escCmd[j] = cmd[i];
- }
- escCmd[j] = '\0';
-}
+if (!commandShell->hasErrCtl)
+escCmd = EscapeShellDblQuot(cmd);
if (shutUp) {
if (!(job->flags & JOB_SILENT) && !noSpecials &&
CVS commit: src/usr.bin/make
Module Name:src
Committed By: rillig
Date: Sun Nov 1 16:57:02 UTC 2020
Modified Files:
src/usr.bin/make: job.c
Log Message:
make(1): extract ParseRunOptions from JobPrintCommand
To generate a diff of this commit:
cvs rdiff -u -r1.297 -r1.298 src/usr.bin/make/job.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/make/job.c
diff -u src/usr.bin/make/job.c:1.297 src/usr.bin/make/job.c:1.298
--- src/usr.bin/make/job.c:1.297 Sat Oct 31 11:54:33 2020
+++ src/usr.bin/make/job.c Sun Nov 1 16:57:02 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: job.c,v 1.297 2020/10/31 11:54:33 rillig Exp $ */
+/* $NetBSD: job.c,v 1.298 2020/11/01 16:57:02 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -143,7 +143,7 @@
#include "trace.h"
/* "@(#)job.c 8.2 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: job.c,v 1.297 2020/10/31 11:54:33 rillig Exp $");
+MAKE_RCSID("$NetBSD: job.c,v 1.298 2020/11/01 16:57:02 rillig Exp $");
/* A shell defines how the commands are run. All commands for a target are
* written into a single file, which is then given to the shell to execute
@@ -646,6 +646,34 @@ JobFindPid(int pid, JobState status, Boo
return NULL;
}
+/* Parse leading '@', '-' and '+', which control the exact execution mode. */
+static void
+ParseRunOptions(
+ char **pp,
+ Boolean *out_shutUp, Boolean *out_errOff, Boolean *out_runAlways)
+{
+char *p = *pp;
+*out_shutUp = FALSE;
+*out_errOff = FALSE;
+*out_runAlways = FALSE;
+
+for (;;) {
+ if (*p == '@')
+ *out_shutUp = !DEBUG(LOUD);
+ else if (*p == '-')
+ *out_errOff = TRUE;
+ else if (*p == '+')
+ *out_runAlways = TRUE;
+ else
+ break;
+ p++;
+}
+
+pp_skip_whitespace();
+
+*pp = p;
+}
+
/*-
*---
* JobPrintCommand --
@@ -674,11 +702,12 @@ JobPrintCommand(Job *job, char *cmd)
Boolean noSpecials; /* true if we shouldn't worry about
* inserting special commands into
* the input stream. */
-Boolean shutUp = FALSE; /* true if we put a no echo command
+Boolean shutUp; /* true if we put a no echo command
* into the command file */
-Boolean errOff = FALSE; /* true if we turned error checking
+Boolean errOff; /* true if we turned error checking
* off before printing the command
* and need to turn it back on */
+Boolean runAlways;
const char *cmdTemplate; /* Template to use when printing the
* command */
char *cmdStart; /* Start of expanded command */
@@ -700,33 +729,17 @@ JobPrintCommand(Job *job, char *cmd)
cmdTemplate = "%s\n";
-/*
- * Check for leading @' and -'s to control echoing and error checking.
- */
-while (*cmd == '@' || *cmd == '-' || (*cmd == '+')) {
- switch (*cmd) {
- case '@':
- shutUp = DEBUG(LOUD) ? FALSE : TRUE;
- break;
- case '-':
- errOff = TRUE;
- break;
- case '+':
- if (noSpecials) {
- /*
- * We're not actually executing anything...
- * but this one needs to be - use compat mode just for it.
- */
- Compat_RunCommand(cmdp, job->node);
- free(cmdStart);
- return;
- }
- break;
- }
- cmd++;
-}
+ParseRunOptions(, , , );
-pp_skip_whitespace();
+if (runAlways && noSpecials) {
+ /*
+ * We're not actually executing anything...
+ * but this one needs to be - use compat mode just for it.
+ */
+ Compat_RunCommand(cmdp, job->node);
+ free(cmdStart);
+ return;
+}
/*
* If the shell doesn't have error control the alternate echo'ing will
CVS commit: src/usr.bin/find
Module Name:src
Committed By: wiz
Date: Sun Nov 1 16:47:29 UTC 2020
Modified Files:
src/usr.bin/find: find.1
Log Message:
Properly quote '\;' in example.
To generate a diff of this commit:
cvs rdiff -u -r1.90 -r1.91 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.90 src/usr.bin/find/find.1:1.91
--- src/usr.bin/find/find.1:1.90 Sun Nov 1 16:34:02 2020
+++ src/usr.bin/find/find.1 Sun Nov 1 16:47:29 2020
@@ -1,4 +1,4 @@
-.\" $NetBSD: find.1,v 1.90 2020/11/01 16:34:02 kim Exp $
+.\" $NetBSD: find.1,v 1.91 2020/11/01 16:47:29 wiz Exp $
.\"
.\" Copyright (c) 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -824,7 +824,7 @@ but do not print them.
.It Li "find / \e( \-newer ttt \-or \-user wnj \e) \-ls \-exit 1"
Same as above, but list the first file matching the criteria before exiting
with a value of 1.
-.It Li "find . \-type f \-exec sh \-c 'file=\*[q]$1\*[q]; ...;' - {} \;"
+.It Li "find . \-type f \-exec sh \-c 'file=\*[q]$1\*[q]; ...;' - {} \e;"
Perform an arbitrarily complex shell command for every file.
.El
.Sh SEE ALSO
CVS commit: src/usr.bin/find
Module Name:src Committed By: kim Date: Sun Nov 1 16:34:02 UTC 2020 Modified Files: src/usr.bin/find: find.1 Log Message: Document the -not operator To generate a diff of this commit: cvs rdiff -u -r1.89 -r1.90 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.89 src/usr.bin/find/find.1:1.90 --- src/usr.bin/find/find.1:1.89 Mon Jul 3 21:34:57 2017 +++ src/usr.bin/find/find.1 Sun Nov 1 16:34:02 2020 @@ -1,4 +1,4 @@ -.\" $NetBSD: find.1,v 1.89 2017/07/03 21:34:57 wiz Exp $ +.\" $NetBSD: find.1,v 1.90 2020/11/01 16:34:02 kim Exp $ .\" .\" Copyright (c) 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -739,6 +739,7 @@ The operators are listed in order of dec This evaluates to true if the parenthesized expression evaluates to true. .It Cm \&! Ar expression +.It Cm -not Ar expression This is the unary .Tn NOT operator. @@ -846,7 +847,7 @@ utility syntax is a superset of the synt .St -p1003.2 standard. .Pp -The options and the +The options, the .Ic -amin , .Ic -anewer , .Ic -asince , @@ -873,7 +874,9 @@ The options and the .Ic -rm , and .Ic -since -primaries are extensions to +primaries, and the +.Ic -not +operator are extensions to .St -p1003.2 . .Pp Historically, the
CVS commit: src/doc
Module Name:src Committed By: thorpej Date: Sun Nov 1 15:41:56 UTC 2020 Modified Files: src/doc: BRANCHES Log Message: Document the thorpej-futex branch. To generate a diff of this commit: cvs rdiff -u -r1.354 -r1.355 src/doc/BRANCHES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/BRANCHES diff -u src/doc/BRANCHES:1.354 src/doc/BRANCHES:1.355 --- src/doc/BRANCHES:1.354 Sun Apr 26 12:15:37 2020 +++ src/doc/BRANCHES Sun Nov 1 15:41:56 2020 @@ -1,4 +1,4 @@ -# $NetBSD: BRANCHES,v 1.354 2020/04/26 12:15:37 martin Exp $ +# $NetBSD: BRANCHES,v 1.355 2020/11/01 15:41:56 thorpej Exp $ # # This file contains a list of branches that exist in the NetBSD CVS # tree and their current state. @@ -723,6 +723,21 @@ Notes: No longer active due to the lack (before the merge to -current) with an interop IPv6 test. More info at: http://www.tahi.org/ +Branch: thorpej-futex +Description: Overhaul of futex operations to fix thread priority issues +Status: Active +Start Date: Sun Nov 1 2020 +End Date: +Base Tag: thorpej-futex-base +Maintainer: Jason Thorpe +Scope: src/sys src/tests/lib/libc/sys +Note: Normal futex operataions pass the test suite, but there are + issues with Linux compatibility currently, that need to be + addressed before merging. Also includes new NetBSD extensions + to the futex interface to support reader/writer locks. Those + changes can be discounted in favor of fixing the standard + futex operations with respect to Linux compatibility. + Branch: wrstuden-fixsa Description: Fix a number of issues present with Scheduler Activations. Status: Active
CVS commit: [thorpej-futex] src/sys
Module Name:src Committed By: thorpej Date: Sun Nov 1 15:16:43 UTC 2020 Modified Files: src/sys/kern [thorpej-futex]: sys_futex.c src/sys/sys [thorpej-futex]: lwp.h Log Message: Major overfaul of futex implemention: - Use sleepqs directly, rather than using condition variables and separate wait queues / strutures. By doing this, and using the standard mechanism for keeping sleepqs sorted by priority, we acn ensure that the highest priority waiters will be awakened, rather than naively awakening in FIFO order. - As part of the data structure re-organization, struct lwp gains "l_futex" (the futex an LWP is blocked on) and "l_futex_wakesel" (the futex wake selector bitset) fields (and loses l___rsvd1). Plese note the special locking considerations for these fields documented in the comments. - Add the notion of a "futex class". This is prep work for eventually supporting the FUTEX_*_PI operations, as well as some future NetBSD extensions to the futex interface. - Add a preliminary implementation of the first of those NetBSD extensions, FUTEX_NETBSD_RW_WAIT and FUTEX_NETBSD_RW_HANDOFF. These are designed to implement reader/writer locks with direct-handoff to the correct priority thread(s) (real-time read-waiters need to have priority over non-real-time write-waiters). NOTE: this is currently disabled due to a mysterious panic that haasn't yet been tracked down. - Add some SDT probes to aid in debugging. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.11.2.1 src/sys/kern/sys_futex.c cvs rdiff -u -r1.212 -r1.212.2.1 src/sys/sys/lwp.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/kern/sys_futex.c diff -u src/sys/kern/sys_futex.c:1.11 src/sys/kern/sys_futex.c:1.11.2.1 --- src/sys/kern/sys_futex.c:1.11 Tue May 5 15:25:18 2020 +++ src/sys/kern/sys_futex.c Sun Nov 1 15:16:43 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: sys_futex.c,v 1.11 2020/05/05 15:25:18 riastradh Exp $ */ +/* $NetBSD: sys_futex.c,v 1.11.2.1 2020/11/01 15:16:43 thorpej Exp $ */ /*- * Copyright (c) 2018, 2019, 2020 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: sys_futex.c,v 1.11 2020/05/05 15:25:18 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sys_futex.c,v 1.11.2.1 2020/11/01 15:16:43 thorpej Exp $"); /* * Futexes @@ -120,7 +120,9 @@ __KERNEL_RCSID(0, "$NetBSD: sys_futex.c, #include #include #include +#include #include +#include #include #include @@ -129,13 +131,67 @@ __KERNEL_RCSID(0, "$NetBSD: sys_futex.c, #include /* + * DTrace probes. + */ +SDT_PROVIDER_DEFINE(futex); + +/* entry: uaddr, val, bitset, timeout, clkflags, fflags */ +/* exit: error */ +SDT_PROBE_DEFINE6(futex, func, wait, entry, "int *", "int", "int", + "struct timespec *", "int", "int"); +SDT_PROBE_DEFINE1(futex, func, wait, exit, "int"); + +/* entry: uaddr, nwake, bitset, fflags */ +/* exit: error, nwoken */ +SDT_PROBE_DEFINE4(futex, func, wake, entry, "int *", "int", "int", "int"); +SDT_PROBE_DEFINE2(futex, func, wake, exit, "int", "int"); + +/* entry: uaddr, nwake, uaddr2, nrequeue, fflags */ +/* exit: error, nwoken */ +SDT_PROBE_DEFINE5(futex, func, requeue, entry, "int *", "int", "int *", "int", + "int"); +SDT_PROBE_DEFINE2(futex, func, requeue, exit, "int", "int"); + +/* entry: uaddr, nwake, uaddr2, nrequeue, val3, fflags */ +/* exit: error, nwoken */ +SDT_PROBE_DEFINE6(futex, func, cmp_requeue, entry, "int *", "int", "int *", + "int", "int", "int"); +SDT_PROBE_DEFINE2(futex, func, cmp_requeue, exit, "int", "int"); + +/* entry: uaddr, nwake, uaddr2, nwake2, wakeop, fflags */ +/* exit: error, nwoken */ +SDT_PROBE_DEFINE6(futex, func, wake_op, entry, "int *", "int", "int *", "int", + "int", "int"); +SDT_PROBE_DEFINE2(futex, func, wake_op, exit, "int", "int"); + +/* entry: uaddr, val, r/w, abstime, fflags */ +/* exit: error */ +SDT_PROBE_DEFINE5(futex, func, rw_wait, entry, "int *", "int", "int", + "struct timespec *", "int"); +SDT_PROBE_DEFINE1(futex, func, rw_wait, exit, "int"); + +/* entry: uaddr, val, fflags */ +/* exit: error, nwoken */ +SDT_PROBE_DEFINE3(futex, func, rw_handoff, entry, "int *", "int", "int"); +SDT_PROBE_DEFINE2(futex, func, rw_handoff, exit, "int", "int"); + +SDT_PROBE_DEFINE0(futex, wait, finish, normally); +SDT_PROBE_DEFINE0(futex, wait, finish, wakerace); +SDT_PROBE_DEFINE0(futex, wait, finish, aborted); + +/* entry: timo */ +/* exit: error */ +SDT_PROBE_DEFINE1(futex, wait, sleepq_block, entry, "int"); +SDT_PROBE_DEFINE1(futex, wait, sleepq_block, exit, "int"); + +/* * Lock order: * * futex_tab.lock - * futex::fx_qlock ordered by kva of struct futex - * -> futex_wait::fw_lock only one at a time - * futex_wait::fw_lock only one at a time - * -> futex::fx_abortlock only one at a time + * futex::fx_op_lock ordered by kva of struct futex + * -> futex::fx_sq_lock ordered by
CVS commit: [thorpej-futex] src/tests/lib/libc/sys
Module Name:src
Committed By: thorpej
Date: Sun Nov 1 15:22:58 UTC 2020
Modified Files:
src/tests/lib/libc/sys [thorpej-futex]: t_futex_ops.c
Log Message:
- Re-factor the code that sets up real-time LWPs for various tests.
- Add tests for the RW_HANDOFF operations.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.5.2.1 src/tests/lib/libc/sys/t_futex_ops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libc/sys/t_futex_ops.c
diff -u src/tests/lib/libc/sys/t_futex_ops.c:1.5 src/tests/lib/libc/sys/t_futex_ops.c:1.5.2.1
--- src/tests/lib/libc/sys/t_futex_ops.c:1.5 Wed May 6 05:14:27 2020
+++ src/tests/lib/libc/sys/t_futex_ops.c Sun Nov 1 15:22:58 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: t_futex_ops.c,v 1.5 2020/05/06 05:14:27 thorpej Exp $ */
+/* $NetBSD: t_futex_ops.c,v 1.5.2.1 2020/11/01 15:22:58 thorpej Exp $ */
/*-
* Copyright (c) 2019, 2020 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
#include
__COPYRIGHT("@(#) Copyright (c) 2019, 2020\
The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: t_futex_ops.c,v 1.5 2020/05/06 05:14:27 thorpej Exp $");
+__RCSID("$NetBSD: t_futex_ops.c,v 1.5.2.1 2020/11/01 15:22:58 thorpej Exp $");
#include
#include
@@ -78,6 +78,7 @@ struct lwp_data {
volatile int *futex_ptr;
volatile int *error_ptr;
int block_val;
+ pri_t rt_prio;
void (*exit_func)(void);
@@ -101,6 +102,20 @@ static void *bs_source_buffer = NULL;
static void *bs_verify_buffer = NULL;
static long bs_pagesize;
+static int pri_min;
+static int pri_max;
+
+static void
+setup_rt_params(void)
+{
+ long pri;
+
+ ATF_REQUIRE((pri = sysconf(_SC_SCHED_PRI_MIN)) != -1);
+ pri_min = (int)pri;
+ ATF_REQUIRE((pri = sysconf(_SC_SCHED_PRI_MAX)) != -1);
+ pri_max = (int)pri;
+}
+
static void
create_lwp_waiter(struct lwp_data *d)
{
@@ -188,6 +203,23 @@ simple_test_waiter_lwp(void *arg)
_lwp_exit();
}
+static void
+rt_simple_test_waiter_lwp(void *arg)
+{
+ struct lwp_data *d = arg;
+ struct sched_param sp;
+ int policy;
+
+ d->threadid = _lwp_self();
+
+ ATF_REQUIRE(_sched_getparam(getpid(), d->threadid, , ) == 0);
+ policy = SCHED_RR;
+ sp.sched_priority = d->rt_prio;
+ ATF_REQUIRE(_sched_setparam(getpid(), d->threadid, policy, ) == 0);
+
+ simple_test_waiter_lwp(arg);
+}
+
static bool
verify_zero_bs(void)
{
@@ -826,7 +858,7 @@ do_futex_requeue_test(int flags, int op)
/* Move all waiters from 0 to 1. */
ATF_REQUIRE(__futex(_word, op | flags,
- 0, NULL, _word1, INT_MAX, good_val3) == 0);
+ 0, NULL, _word1, INT_MAX, good_val3) == 4);
/*
* FUTEX 0: 0 LWPs
@@ -847,7 +879,7 @@ do_futex_requeue_test(int flags, int op)
/* Wake one waiter on 1, move one waiter to 0. */
ATF_REQUIRE(__futex(_word1, op | flags,
- 1, NULL, _word, 1, good_val3) == 1);
+ 1, NULL, _word, 1, good_val3) == 2);
/*
* FUTEX 0: 1 LWP
@@ -1335,59 +1367,19 @@ ATF_TC_CLEANUP(futex_wait_evil_unmapped_
/*/
-static int pri_min;
-static int pri_max;
-
-static void
-lowpri_simple_test_waiter_lwp(void *arg)
-{
- struct lwp_data *d = arg;
- struct sched_param sp;
- int policy;
-
- d->threadid = _lwp_self();
-
- ATF_REQUIRE(_sched_getparam(getpid(), d->threadid, , ) == 0);
- policy = SCHED_RR;
- sp.sched_priority = pri_min;
- ATF_REQUIRE(_sched_setparam(getpid(), d->threadid, policy, ) == 0);
-
- simple_test_waiter_lwp(arg);
-}
-
-static void
-highpri_simple_test_waiter_lwp(void *arg)
-{
- struct lwp_data *d = arg;
- struct sched_param sp;
- int policy;
-
- d->threadid = _lwp_self();
-
- ATF_REQUIRE(_sched_getparam(getpid(), d->threadid, , ) == 0);
- policy = SCHED_RR;
- sp.sched_priority = pri_max;
- ATF_REQUIRE(_sched_setparam(getpid(), d->threadid, policy, ) == 0);
-
- simple_test_waiter_lwp(arg);
-}
-
static void
do_test_wake_highest_pri(void)
{
lwpid_t waiter;
int tries;
- long pri;
- ATF_REQUIRE((pri = sysconf(_SC_SCHED_PRI_MIN)) != -1);
- pri_min = (int)pri;
- ATF_REQUIRE((pri = sysconf(_SC_SCHED_PRI_MAX)) != -1);
- pri_max = (int)pri;
+ setup_rt_params();
futex_word = 0;
membar_sync();
- setup_lwp_context(_data[0], lowpri_simple_test_waiter_lwp);
+ setup_lwp_context(_data[0], rt_simple_test_waiter_lwp);
+ lwp_data[0].rt_prio = pri_min;
lwp_data[0].op_flags = FUTEX_PRIVATE_FLAG;
lwp_data[0].futex_error = -1;
lwp_data[0].futex_ptr = _word;
@@ -1409,7 +1401,8 @@ do_test_wake_highest_pri(void)
/* Ensure it's blocked. */
ATF_REQUIRE(lwp_data[0].futex_error == -1);
- setup_lwp_context(_data[1], highpri_simple_test_waiter_lwp);
+ setup_lwp_context(_data[1], rt_simple_test_waiter_lwp);
+ lwp_data[1].rt_prio = pri_max;
lwp_data[1].op_flags = FUTEX_PRIVATE_FLAG;
lwp_data[1].futex_error = -1;
lwp_data[1].futex_ptr = _word;
@@ -1471,7 +1464,6 @@ ATF_TC_HEAD(futex_wake_highest_pri, tc)
}
CVS import: src/external/bsd/tmux/dist
Module Name:src
Committed By: christos
Date: Sun Nov 1 14:52:03 UTC 2020
Update of /cvsroot/src/external/bsd/tmux/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv9842
Log Message:
CHANGED FROM 3.1b TO 3.1c
* Do not write after the end of the array and overwrite the stack when
colon-separated SGR sequences contain empty arguments.
CHANGES FROM 3.1a TO 3.1b
* Fix build on systems without sys/queue.h.
* Fix crash when allow-rename is on and an empty name is set.
CHANGES FROM 3.1 TO 3.1a
* Do not close stdout prematurely in control mode since it is needed to print
exit messages. Prevents hanging when detaching with iTerm2.
CHANGES FROM 3.0a TO 3.1
* Only search the visible part of the history when marking (highlighting)
search terms. This is much faster than searching the whole history and solves
problems with large histories. The count of matches shown is now the visible
matches rather than all matches.
* Search using regular expressions in copy mode. search-forward and
search-backward use regular expressions by default; the incremental versions
do not.
* Turn off mouse mode 1003 as well as the rest when exiting.
* Add selection_active format for when the selection is present but not moving
with the cursor.
* Fix dragging with modifier keys, so binding keys such as C-MouseDrag1Pane and
C-MouseDragEnd1Pane now work.
* Add -a to list-keys to also list keys without notes with -N.
* Do not jump to next word end if already on a word end when selecting a word;
fixes select-word with single character words and vi(1) keys.
* Fix top and bottom pane calculation with pane border status enabled.
* Add support for adding a note to a key binding (with bind-key -N) and use
this to add descriptions to the default key bindings. A new -N flag to
list-keys shows key bindings with notes. Change the default ? binding to use
this to show a readable summary of keys. Also extend command-prompt to return
the name of the key pressed and add a default binding (/) to show the note
for the next key pressed.
* Add support for the iTerm2 DSR 1337 sequence to get the terminal version.
* Treat plausible but invalid keys (like C-BSpace) as literal like any other
unrecognised string passed to send-keys.
* Detect iTerm2 and enable use of DECSLRM (much faster with horizontally split
windows).
* Add -Z to default switch-client command in tree mode.
* Add ~ to quoted characters for %%%.
* Document client exit messages in the manual page.
* Do not let read-only clients limit the size, unless all clients are
read-only.
* Add a number of new formats to inspect what sessions and clients a window is
present or active in.
* Change file reading and writing to go through the client if necessary. This
fixes commands like "tmux loadb /dev/fd/X". Also modify source-file to
support "-" for standard input, like load-buffer and save-buffer.
* Add ~/.config/tmux/tmux.conf to the default search path for configuration
files.
* Bump the escape sequence timeout to five seconds to allow for longer
legitimate sequences.
* Make a best effort to set xpixel and ypixel for each pane and add formats for
them.
* Add push-default to status-left and status-right in status-format[0].
* Do not clear search marks on cursor movement with vi(1) keys.
* Add p format modifier for padding to width and allow multiple substitutions
in a single format.
* Add -f for full size to join-pane (like split-window).
* Do not use bright when emulating 256 colours on an 8 colour terminal because
it is also bold on some terminals.
* Make select-pane -P set window-active-style also to match previous behaviour.
* Do not truncate list-keys output.
* Turn automatic-rename back on if the \033k rename escape sequence is used
with an empty name.
* Add support for percentage sizes for resize-pane ("-x 10%"). Also change
split-window and join-pane -l to accept similar percentages and deprecate the
-p flag.
* Add -F flag to send-keys to expand formats in search-backward and forward
copy mode commands and copy_cursor_word and copy_cursor_line formats for word
and line at cursor in copy mode. Use for default # and * binding with vi(1)
keys.
* Add formats for word and line at cursor position in copy mode.
* Add formats for cursor and selection position in copy mode.
* Support all the forms of RGB colour strings in OSC sequences rather than
requiring two digits.
* Limit lazy resize to panes in attached sessions only.
* Add an option to set the key sent by backspace for those whose system uses ^H
rather than ^?.
* Change new-session -A without a session name (that is, no -s option also) to
attach to the best existing session like attach-session rather than a new
one.
* Add a "latest" window-size option which tries to size windows based on the
most recently used client. This is now the default.
* Add simple support for OSC 7 (result is available in the pane_path format).
CVS commit: src/sys/arch/arm/pic
Module Name:src
Committed By: jmcneill
Date: Sun Nov 1 14:42:05 UTC 2020
Modified Files:
src/sys/arch/arm/pic: pic.c
Log Message:
intr_ipi_send: assert that kcp is either NULL or contains exactly one CPU
To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/sys/arch/arm/pic/pic.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/pic/pic.c
diff -u src/sys/arch/arm/pic/pic.c:1.60 src/sys/arch/arm/pic/pic.c:1.61
--- src/sys/arch/arm/pic/pic.c:1.60 Mon Oct 26 07:16:41 2020
+++ src/sys/arch/arm/pic/pic.c Sun Nov 1 14:42:05 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pic.c,v 1.60 2020/10/26 07:16:41 skrll Exp $ */
+/* $NetBSD: pic.c,v 1.61 2020/11/01 14:42:05 jmcneill Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -33,7 +33,7 @@
#include "opt_multiprocessor.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: pic.c,v 1.60 2020/10/26 07:16:41 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pic.c,v 1.61 2020/11/01 14:42:05 jmcneill Exp $");
#include
#include
@@ -197,6 +197,7 @@ intr_ipi_send(const kcpuset_t *kcp, u_lo
{
struct cpu_info * const ci = curcpu();
KASSERT(ipi < NIPI);
+ KASSERT(kcp == NULL || kcpuset_countset(kcp) == 1);
bool __diagused sent_p = false;
for (size_t slot = 0; slot < PIC_MAXPICS; slot++) {
struct pic_softc * const pic = pic_list[slot];
CVS commit: src/usr.bin/make
Module Name:src
Committed By: rillig
Date: Sun Nov 1 14:36:25 UTC 2020
Modified Files:
src/usr.bin/make: var.c
src/usr.bin/make/unit-tests: moderrs.exp moderrs.mk varmod-range.exp
varmod-range.mk varmod-to-separator.exp varmod-to-separator.mk
Log Message:
make(1): treat malformed :range, :ts and :[...] as errors
Before, integer overflow in the :[1..2] modifier had not been detected,
and the actual behavior varied between ILP64 and LP64I32 machines.
Before, the :ts modifier accepted character literals like \012345 and
\x1F600, which don't fit in a single character and were thus truncated.
Before, the :range modifier issued an "Unknown modifier" error message
for :range=x, which was not quite correct. The error message in this
case is now "Invalid number".
To generate a diff of this commit:
cvs rdiff -u -r1.634 -r1.635 src/usr.bin/make/var.c
cvs rdiff -u -r1.22 -r1.23 src/usr.bin/make/unit-tests/moderrs.exp
cvs rdiff -u -r1.23 -r1.24 src/usr.bin/make/unit-tests/moderrs.mk
cvs rdiff -u -r1.4 -r1.5 src/usr.bin/make/unit-tests/varmod-range.exp \
src/usr.bin/make/unit-tests/varmod-to-separator.exp
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/make/unit-tests/varmod-range.mk
cvs rdiff -u -r1.5 -r1.6 src/usr.bin/make/unit-tests/varmod-to-separator.mk
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/var.c
diff -u src/usr.bin/make/var.c:1.634 src/usr.bin/make/var.c:1.635
--- src/usr.bin/make/var.c:1.634 Sun Nov 1 13:55:31 2020
+++ src/usr.bin/make/var.c Sun Nov 1 14:36:25 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.634 2020/11/01 13:55:31 rillig Exp $ */
+/* $NetBSD: var.c,v 1.635 2020/11/01 14:36:25 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -130,7 +130,7 @@
#include "metachar.h"
/* "@(#)var.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.634 2020/11/01 13:55:31 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.635 2020/11/01 14:36:25 rillig Exp $");
#define VAR_DEBUG1(fmt, arg1) DEBUG1(VAR, fmt, arg1)
#define VAR_DEBUG2(fmt, arg1, arg2) DEBUG2(VAR, fmt, arg1, arg2)
@@ -2006,6 +2006,66 @@ ModMatchEq(const char *mod, const char *
(mod[n] == endc || mod[n] == ':' || mod[n] == '=');
}
+static Boolean
+TryParseIntBase0(const char **pp, int *out_num)
+{
+char *end;
+long n;
+
+errno = 0;
+n = strtol(*pp, , 0);
+if ((n == LONG_MIN || n == LONG_MAX) && errno == ERANGE)
+ return FALSE;
+if (n < INT_MIN || n > INT_MAX)
+ return FALSE;
+
+*pp = end;
+*out_num = (int)n;
+return TRUE;
+}
+
+static Boolean
+TryParseSize(const char **pp, size_t *out_num)
+{
+char *end;
+unsigned long n;
+
+if (!ch_isdigit(**pp))
+ return FALSE;
+
+errno = 0;
+n = strtoul(*pp, , 10);
+if (n == ULONG_MAX && errno == ERANGE)
+ return FALSE;
+if (n > SIZE_MAX)
+ return FALSE;
+
+*pp = end;
+*out_num = (size_t)n;
+return TRUE;
+}
+
+static Boolean
+TryParseChar(const char **pp, int base, char *out_ch)
+{
+char *end;
+unsigned long n;
+
+if (!ch_isalnum(**pp))
+ return FALSE;
+
+errno = 0;
+n = strtoul(*pp, , base);
+if (n == ULONG_MAX && errno == ERANGE)
+ return FALSE;
+if (n > UCHAR_MAX)
+ return FALSE;
+
+*pp = end;
+*out_ch = (char)n;
+return TRUE;
+}
+
/* :@var@...${var}...@ */
static ApplyModifierResult
ApplyModifier_Loop(const char **pp, ApplyModifiersState *st)
@@ -2263,9 +2323,12 @@ ApplyModifier_Range(const char **pp, App
return AMR_UNKNOWN;
if (mod[5] == '=') {
- char *ep;
- n = (size_t)strtoul(mod + 6, , 10);
- *pp = ep;
+ const char *p = mod + 6;
+ if (!TryParseSize(, )) {
+ Parse_Error(PARSE_FATAL, "Invalid number: %s\n", mod + 6);
+ return AMR_CLEANUP;
+ }
+ *pp = p;
} else {
n = 0;
*pp = mod + 5;
@@ -2562,24 +2625,27 @@ ApplyModifier_ToSep(const char **pp, App
/* ":ts\x40" or ":ts\100" */
{
- const char *numStart = sep + 1;
+ const char *p = sep + 1;
int base = 8; /* assume octal */
- char *end;
if (sep[1] == 'x') {
base = 16;
- numStart++;
+ p++;
} else if (!ch_isdigit(sep[1])) {
(*pp)++; /* just for backwards compatibility */
return AMR_BAD; /* ":ts". */
}
- st->sep = (char)strtoul(numStart, , base);
- if (*end != ':' && *end != st->endc) {
+ if (!TryParseChar(, base, >sep)) {
+ Parse_Error(PARSE_FATAL, "Invalid character number: %s\n", p);
+ return AMR_CLEANUP;
+ }
+ if (*p != ':' && *p != st->endc) {
(*pp)++; /* just for backwards compatibility */
return AMR_BAD;
}
- *pp = end;
+
+ *pp = p;
}
ok:
@@ -2653,9 +2719,9 @@ static ApplyModifierResult
ApplyModifier_Words(const char **pp, ApplyModifiersState *st)
{
char *estr;
-char *ep;
int first, last;
VarParseResult res;
+const char *p;
(*pp)++; /* skip the '[' */
res = ParseModifierPart(pp, ']', st->eflags, st,
@@
CVS commit: src/sys/arch/arm/cortex
Module Name:src
Committed By: jmcneill
Date: Sun Nov 1 14:30:12 UTC 2020
Modified Files:
src/sys/arch/arm/cortex: gicv3.c
Log Message:
sc_enabled_sgippi can be updated from any CPU, so use atomic_or/atomic_and
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/arm/cortex/gicv3.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/cortex/gicv3.c
diff -u src/sys/arch/arm/cortex/gicv3.c:1.31 src/sys/arch/arm/cortex/gicv3.c:1.32
--- src/sys/arch/arm/cortex/gicv3.c:1.31 Sun Nov 1 14:19:42 2020
+++ src/sys/arch/arm/cortex/gicv3.c Sun Nov 1 14:30:12 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: gicv3.c,v 1.31 2020/11/01 14:19:42 jmcneill Exp $ */
+/* $NetBSD: gicv3.c,v 1.32 2020/11/01 14:30:12 jmcneill Exp $ */
/*-
* Copyright (c) 2018 Jared McNeill
@@ -31,7 +31,7 @@
#define _INTR_PRIVATE
#include
-__KERNEL_RCSID(0, "$NetBSD: gicv3.c,v 1.31 2020/11/01 14:19:42 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gicv3.c,v 1.32 2020/11/01 14:30:12 jmcneill Exp $");
#include
#include
@@ -41,6 +41,7 @@ __KERNEL_RCSID(0, "$NetBSD: gicv3.c,v 1.
#include
#include
#include
+#include
#include
@@ -121,7 +122,7 @@ gicv3_unblock_irqs(struct pic_softc *pic
const u_int group = irqbase / 32;
if (group == 0) {
- sc->sc_enabled_sgippi |= mask;
+ atomic_or_32(>sc_enabled_sgippi, mask);
gicr_write_4(sc, ci->ci_gic_redist, GICR_ISENABLER0, mask);
while (gicr_read_4(sc, ci->ci_gic_redist, GICR_CTLR) & GICR_CTLR_RWP)
;
@@ -140,7 +141,7 @@ gicv3_block_irqs(struct pic_softc *pic,
const u_int group = irqbase / 32;
if (group == 0) {
- sc->sc_enabled_sgippi &= ~mask;
+ atomic_and_32(>sc_enabled_sgippi, ~mask);
gicr_write_4(sc, ci->ci_gic_redist, GICR_ICENABLER0, mask);
while (gicr_read_4(sc, ci->ci_gic_redist, GICR_CTLR) & GICR_CTLR_RWP)
;
CVS commit: src/doc
Module Name:src Committed By: roy Date: Sun Nov 1 14:25:48 UTC 2020 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: Note dhcpcd update To generate a diff of this commit: cvs rdiff -u -r1.1757 -r1.1758 src/doc/3RDPARTY cvs rdiff -u -r1.2750 -r1.2751 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1757 src/doc/3RDPARTY:1.1758 --- src/doc/3RDPARTY:1.1757 Sun Nov 1 11:06:30 2020 +++ src/doc/3RDPARTY Sun Nov 1 14:25:48 2020 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1757 2020/11/01 11:06:30 wiz Exp $ +# $NetBSD: 3RDPARTY,v 1.1758 2020/11/01 14:25:48 roy Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -352,12 +352,12 @@ Notes: Use the dhcp2netbsd script. Package: dhcpcd -Version: 9.3.1 -Current Vers: 9.3.1 +Version: 9.3.2 +Current Vers: 9.3.2 Maintainer: roy Archive Site: ftp://roy.marples.name/pub/dhcpcd/ Home Page: http://roy.marples.name/projects/dhcpcd/ -Date: 2020-10-12 +Date: 2020-11-01 Mailing List: dhcpcd-disc...@marples.name License: BSD (2-clause) Location: external/bsd/dhcpcd/dist Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2750 src/doc/CHANGES:1.2751 --- src/doc/CHANGES:1.2750 Thu Oct 22 08:26:00 2020 +++ src/doc/CHANGES Sun Nov 1 14:25:48 2020 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2750 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2751 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -297,3 +297,4 @@ Changes from NetBSD 9.0 to NetBSD 10.0: tzcode: Updated to 2020c. [christos 20201017] ossaudio(3): Added support for the OSSv4 Mixer API [nia 20201017] tzdata updated to 2020d [kre 20201022] + dhcpcd: Update to version 9.3.1 [roy 20201101]
CVS commit: src/external/bsd/dhcpcd/dist/src
Module Name:src
Committed By: roy
Date: Sun Nov 1 14:24:01 UTC 2020
Modified Files:
src/external/bsd/dhcpcd/dist/src: dhcp.c dhcpcd.8.in dhcpcd.c logerr.c
privsep.c
Log Message:
Sync with dhcpcd-9.3.2
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/external/bsd/dhcpcd/dist/src/dhcp.c
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/dhcpcd/dist/src/dhcpcd.8.in
cvs rdiff -u -r1.44 -r1.45 src/external/bsd/dhcpcd/dist/src/dhcpcd.c
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/dhcpcd/dist/src/logerr.c
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/dhcpcd/dist/src/privsep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/dhcpcd/dist/src/dhcp.c
diff -u src/external/bsd/dhcpcd/dist/src/dhcp.c:1.41 src/external/bsd/dhcpcd/dist/src/dhcp.c:1.42
--- src/external/bsd/dhcpcd/dist/src/dhcp.c:1.41 Mon Oct 12 14:09:03 2020
+++ src/external/bsd/dhcpcd/dist/src/dhcp.c Sun Nov 1 14:24:01 2020
@@ -1520,21 +1520,15 @@ again:
#endif
}
-void
-dhcp_close(struct interface *ifp)
+static void
+dhcp_closebpf(struct interface *ifp)
{
struct dhcpcd_ctx *ctx = ifp->ctx;
struct dhcp_state *state = D_STATE(ifp);
- if (state == NULL)
- return;
-
#ifdef PRIVSEP
- if (IN_PRIVSEP_SE(ctx)) {
+ if (IN_PRIVSEP_SE(ctx))
ps_bpf_closebootp(ifp);
- if (state->addr != NULL)
- ps_inet_closebootp(state->addr);
- }
#endif
if (state->bpf != NULL) {
@@ -1542,11 +1536,38 @@ dhcp_close(struct interface *ifp)
bpf_close(state->bpf);
state->bpf = NULL;
}
+}
+
+static void
+dhcp_closeinet(struct interface *ifp)
+{
+ struct dhcpcd_ctx *ctx = ifp->ctx;
+ struct dhcp_state *state = D_STATE(ifp);
+
+#ifdef PRIVSEP
+ if (IN_PRIVSEP_SE(ctx)) {
+ if (state->addr != NULL)
+ ps_inet_closebootp(state->addr);
+ }
+#endif
+
if (state->udp_rfd != -1) {
eloop_event_delete(ctx->eloop, state->udp_rfd);
close(state->udp_rfd);
state->udp_rfd = -1;
}
+}
+
+void
+dhcp_close(struct interface *ifp)
+{
+ struct dhcp_state *state = D_STATE(ifp);
+
+ if (state == NULL)
+ return;
+
+ dhcp_closebpf(ifp);
+ dhcp_closeinet(ifp);
state->interval = 0;
}
@@ -2061,12 +2082,14 @@ dhcp_addr_duplicated(struct interface *i
#ifdef ARP
#ifdef KERNEL_RFC5227
+#ifdef ARPING
static void
dhcp_arp_announced(struct arp_state *state)
{
arp_free(state);
}
+#endif
#else
static void
dhcp_arp_defend_failed(struct arp_state *astate)
@@ -2321,23 +2344,24 @@ dhcp_bind(struct interface *ifp)
logerr("dhcp_writefile: %s", state->leasefile);
}
+ old_state = state->added;
+
/* Close the BPF filter as we can now receive DHCP messages
* on a UDP socket. */
- old_state = state->added;
- if (ctx->options & DHCPCD_MASTER ||
- state->old == NULL ||
- state->old->yiaddr != state->new->yiaddr || old_state & STATE_FAKE)
- dhcp_close(ifp);
+ dhcp_closebpf(ifp);
+ /* Add the address */
ipv4_applyaddr(ifp);
/* If not in master mode, open an address specific socket. */
if (ctx->options & DHCPCD_MASTER ||
(state->old != NULL &&
- state->old->yiaddr == state->new->yiaddr &&
- old_state & STATE_ADDED && !(old_state & STATE_FAKE)))
+ state->old->yiaddr == state->new->yiaddr &&
+ old_state & STATE_ADDED && !(old_state & STATE_FAKE)))
return;
+ dhcp_closeinet(ifp);
+
#ifdef PRIVSEP
if (IN_PRIVSEP_SE(ctx)) {
if (ps_inet_openbootp(state->addr) == -1)
@@ -2926,6 +2950,8 @@ dhcp_handledhcp(struct interface *ifp, s
unsigned int i;
char *msg;
bool bootp_copied;
+ uint32_t v6only_time = 0;
+ bool use_v6only = false;
#ifdef AUTH
const uint8_t *auth;
size_t auth_len;
@@ -3143,6 +3169,23 @@ dhcp_handledhcp(struct interface *ifp, s
}
}
+ if (has_option_mask(ifo->requestmask, DHO_IPV6_PREFERRED_ONLY)) {
+ if (get_option_uint32(ifp->ctx, _time, bootp, bootp_len,
+ DHO_IPV6_PREFERRED_ONLY) == 0 &&
+ (state->state == DHS_DISCOVER || state->state == DHS_REBOOT))
+ {
+ char v6msg[128];
+
+ use_v6only = true;
+ if (v6only_time < MIN_V6ONLY_WAIT)
+v6only_time = MIN_V6ONLY_WAIT;
+ snprintf(v6msg, sizeof(v6msg),
+ "IPv6-Only Preferred received (%u seconds)",
+ v6only_time);
+ LOGDHCP(LOG_INFO, v6msg);
+ }
+ }
+
/* DHCP Auto-Configure, RFC 2563 */
if (type == DHCP_OFFER && bootp->yiaddr == 0) {
LOGDHCP(LOG_WARNING, "no address given");
@@ -3177,12 +3220,22 @@ dhcp_handledhcp(struct interface *ifp, s
}
eloop_timeout_delete(ifp->ctx->eloop, NULL, ifp);
eloop_timeout_add_sec(ifp->ctx->eloop,
- DHCP_MAX, dhcp_discover, ifp);
+ use_v6only ? v6only_time : DHCP_MAX,
+ dhcp_discover, ifp);
}
#endif
return;
}
+ if (use_v6only) {
+ dhcp_drop(ifp, "EXPIRE");
+ dhcp_unlink(ifp->ctx, state->leasefile);
+ eloop_timeout_delete(ifp->ctx->eloop, NULL, ifp);
+ eloop_timeout_add_sec(ifp->ctx->eloop, v6only_time,
+ dhcp_discover, ifp);
+ return;
+ }
+
/* Ensure that the address
CVS import: src/external/bsd/dhcpcd/dist
Module Name:src Committed By: roy Date: Sun Nov 1 14:23:04 UTC 2020 Update of /cvsroot/src/external/bsd/dhcpcd/dist In directory ivanova.netbsd.org:/tmp/cvs-serv28627 Log Message: Update to dhcpcd-9.3.2 with the following changes: * DHCP: Add support for IPv6-Only Preferred option, RFC 8925. * BSD: `LINK_STATE_UNKNOWN` is treated as UP once again * privsep: pass logging to the privileged actioneer * privsep: allow logfile re-opening to work * privsep: close BPF socket on ENXIO * privsep: don't leave a BOOTP BPF listener rebooting in non master mode Status: Vendor Tag: ROY Release Tags: dhcpcd-9_3_2 U src/external/bsd/dhcpcd/dist/LICENSE U src/external/bsd/dhcpcd/dist/README.md U src/external/bsd/dhcpcd/dist/src/defs.h U src/external/bsd/dhcpcd/dist/src/common.c U src/external/bsd/dhcpcd/dist/src/control.c C src/external/bsd/dhcpcd/dist/src/dhcpcd.c U src/external/bsd/dhcpcd/dist/src/duid.c U src/external/bsd/dhcpcd/dist/src/eloop.c C src/external/bsd/dhcpcd/dist/src/logerr.c U src/external/bsd/dhcpcd/dist/src/if.c U src/external/bsd/dhcpcd/dist/src/if-options.c U src/external/bsd/dhcpcd/dist/src/sa.c U src/external/bsd/dhcpcd/dist/src/route.c U src/external/bsd/dhcpcd/dist/src/dhcp-common.c U src/external/bsd/dhcpcd/dist/src/script.c U src/external/bsd/dhcpcd/dist/src/auth.c U src/external/bsd/dhcpcd/dist/src/if-bsd.c C src/external/bsd/dhcpcd/dist/src/dhcp.c U src/external/bsd/dhcpcd/dist/src/ipv4.c U src/external/bsd/dhcpcd/dist/src/bpf.c U src/external/bsd/dhcpcd/dist/src/arp.c U src/external/bsd/dhcpcd/dist/src/ipv4ll.c U src/external/bsd/dhcpcd/dist/src/ipv6.c U src/external/bsd/dhcpcd/dist/src/ipv6nd.c U src/external/bsd/dhcpcd/dist/src/dhcp6.c U src/external/bsd/dhcpcd/dist/src/dhcpcd-embedded.c C src/external/bsd/dhcpcd/dist/src/privsep.c U src/external/bsd/dhcpcd/dist/src/privsep-root.c U src/external/bsd/dhcpcd/dist/src/privsep-control.c U src/external/bsd/dhcpcd/dist/src/privsep-inet.c U src/external/bsd/dhcpcd/dist/src/privsep-bpf.c U src/external/bsd/dhcpcd/dist/src/privsep-bsd.c U src/external/bsd/dhcpcd/dist/src/common.h U src/external/bsd/dhcpcd/dist/src/control.h U src/external/bsd/dhcpcd/dist/src/dhcpcd.h U src/external/bsd/dhcpcd/dist/src/duid.h U src/external/bsd/dhcpcd/dist/src/eloop.h U src/external/bsd/dhcpcd/dist/src/logerr.h U src/external/bsd/dhcpcd/dist/src/if.h U src/external/bsd/dhcpcd/dist/src/if-options.h U src/external/bsd/dhcpcd/dist/src/sa.h U src/external/bsd/dhcpcd/dist/src/route.h U src/external/bsd/dhcpcd/dist/src/dhcp-common.h U src/external/bsd/dhcpcd/dist/src/script.h U src/external/bsd/dhcpcd/dist/src/auth.h U src/external/bsd/dhcpcd/dist/src/dhcp.h U src/external/bsd/dhcpcd/dist/src/ipv4.h U src/external/bsd/dhcpcd/dist/src/bpf.h U src/external/bsd/dhcpcd/dist/src/arp.h U src/external/bsd/dhcpcd/dist/src/ipv4ll.h U src/external/bsd/dhcpcd/dist/src/ipv6.h U src/external/bsd/dhcpcd/dist/src/ipv6nd.h U src/external/bsd/dhcpcd/dist/src/dhcp6.h U src/external/bsd/dhcpcd/dist/src/dhcpcd-embedded.h U src/external/bsd/dhcpcd/dist/src/privsep.h U src/external/bsd/dhcpcd/dist/src/privsep-root.h U src/external/bsd/dhcpcd/dist/src/privsep-control.h U src/external/bsd/dhcpcd/dist/src/privsep-inet.h U src/external/bsd/dhcpcd/dist/src/privsep-bpf.h U src/external/bsd/dhcpcd/dist/src/dev.h U src/external/bsd/dhcpcd/dist/src/dhcpcd.conf.5.in C src/external/bsd/dhcpcd/dist/src/dhcpcd.8.in U src/external/bsd/dhcpcd/dist/src/dhcpcd.conf U src/external/bsd/dhcpcd/dist/hooks/dhcpcd-run-hooks.in U src/external/bsd/dhcpcd/dist/hooks/dhcpcd-run-hooks.8.in U src/external/bsd/dhcpcd/dist/hooks/01-test U src/external/bsd/dhcpcd/dist/hooks/10-wpa_supplicant U src/external/bsd/dhcpcd/dist/hooks/15-timezone U src/external/bsd/dhcpcd/dist/hooks/20-resolv.conf U src/external/bsd/dhcpcd/dist/hooks/29-lookup-hostname U src/external/bsd/dhcpcd/dist/hooks/30-hostname.in U src/external/bsd/dhcpcd/dist/hooks/50-ntp.conf U src/external/bsd/dhcpcd/dist/hooks/50-ypbind.in 5 conflicts created by this import. Use the following command to help the merge: cvs checkout -jROY:yesterday -jROY src/external/bsd/dhcpcd/dist
CVS commit: src/sys/arch/arm/cortex
Module Name:src Committed By: jmcneill Date: Sun Nov 1 14:19:42 UTC 2020 Modified Files: src/sys/arch/arm/cortex: gicv3.c Log Message: Remove unused __HAVE_PIC_FAST_SOFTINTS block. It never would have worked if enabled.. To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/sys/arch/arm/cortex/gicv3.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/cortex/gicv3.c diff -u src/sys/arch/arm/cortex/gicv3.c:1.30 src/sys/arch/arm/cortex/gicv3.c:1.31 --- src/sys/arch/arm/cortex/gicv3.c:1.30 Sun Nov 1 12:13:21 2020 +++ src/sys/arch/arm/cortex/gicv3.c Sun Nov 1 14:19:42 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: gicv3.c,v 1.30 2020/11/01 12:13:21 jmcneill Exp $ */ +/* $NetBSD: gicv3.c,v 1.31 2020/11/01 14:19:42 jmcneill Exp $ */ /*- * Copyright (c) 2018 Jared McNeill @@ -31,7 +31,7 @@ #define _INTR_PRIVATE #include -__KERNEL_RCSID(0, "$NetBSD: gicv3.c,v 1.30 2020/11/01 12:13:21 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: gicv3.c,v 1.31 2020/11/01 14:19:42 jmcneill Exp $"); #include #include @@ -843,13 +843,6 @@ gicv3_init(struct gicv3_softc *sc) if ((gicd_typer & GICD_TYPER_LPIS) != 0) gicv3_lpi_cpu_init(>sc_lpi, curcpu()); -#ifdef __HAVE_PIC_FAST_SOFTINTS - intr_establish_xname(SOFTINT_BIO, IPL_SOFTBIO, IST_MPSAFE | IST_EDGE, pic_handle_softint, (void *)SOFTINT_BIO, "softint bio"); - intr_establish_xname(SOFTINT_CLOCK, IPL_SOFTCLOCK, IST_MPSAFE | IST_EDGE, pic_handle_softint, (void *)SOFTINT_CLOCK, "softint clock"); - intr_establish_xname(SOFTINT_NET, IPL_SOFTNET, IST_MPSAFE | IST_EDGE, pic_handle_softint, (void *)SOFTINT_NET, "softint net"); - intr_establish_xname(SOFTINT_SERIAL, IPL_SOFTSERIAL, IST_MPSAFE | IST_EDGE, pic_handle_softint, (void *)SOFTINT_SERIAL, "softint serial"); -#endif - #ifdef MULTIPROCESSOR intr_establish_xname(IPI_AST, IPL_VM, IST_MPSAFE | IST_EDGE, pic_ipi_ast, (void *)-1, "IPI ast"); intr_establish_xname(IPI_XCALL, IPL_HIGH, IST_MPSAFE | IST_EDGE, pic_ipi_xcall, (void *)-1, "IPI xcall");
CVS commit: src/usr.bin/make
Module Name:src
Committed By: rillig
Date: Sun Nov 1 13:55:31 UTC 2020
Modified Files:
src/usr.bin/make: var.c
src/usr.bin/make/unit-tests: modword.exp modword.mk varmod-range.exp
varmod-range.mk
Log Message:
make(1): add tests for the variable modifiers :[words] and :range
To generate a diff of this commit:
cvs rdiff -u -r1.633 -r1.634 src/usr.bin/make/var.c
cvs rdiff -u -r1.1 -r1.2 src/usr.bin/make/unit-tests/modword.exp
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/make/unit-tests/modword.mk \
src/usr.bin/make/unit-tests/varmod-range.exp
cvs rdiff -u -r1.5 -r1.6 src/usr.bin/make/unit-tests/varmod-range.mk
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/var.c
diff -u src/usr.bin/make/var.c:1.633 src/usr.bin/make/var.c:1.634
--- src/usr.bin/make/var.c:1.633 Sun Nov 1 12:34:45 2020
+++ src/usr.bin/make/var.c Sun Nov 1 13:55:31 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.633 2020/11/01 12:34:45 rillig Exp $ */
+/* $NetBSD: var.c,v 1.634 2020/11/01 13:55:31 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -130,7 +130,7 @@
#include "metachar.h"
/* "@(#)var.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.633 2020/11/01 12:34:45 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.634 2020/11/01 13:55:31 rillig Exp $");
#define VAR_DEBUG1(fmt, arg1) DEBUG1(VAR, fmt, arg1)
#define VAR_DEBUG2(fmt, arg1, arg2) DEBUG2(VAR, fmt, arg1, arg2)
@@ -2648,7 +2648,7 @@ ApplyModifier_To(const char **pp, ApplyM
return AMR_BAD;
}
-/* :[#], :[1], etc. */
+/* :[#], :[1], :[-1..1], etc. */
static ApplyModifierResult
ApplyModifier_Words(const char **pp, ApplyModifiersState *st)
{
Index: src/usr.bin/make/unit-tests/modword.exp
diff -u src/usr.bin/make/unit-tests/modword.exp:1.1 src/usr.bin/make/unit-tests/modword.exp:1.2
--- src/usr.bin/make/unit-tests/modword.exp:1.1 Thu Aug 21 13:44:51 2014
+++ src/usr.bin/make/unit-tests/modword.exp Sun Nov 1 13:55:31 2020
@@ -66,6 +66,7 @@ LIST:[@]:[2]="two"
LIST:[*]:C/ /,/:[2]=""
LIST:[*]:C/ /,/:[*]:[2]=""
LIST:[*]:C/ /,/:[@]:[2]="three"
+LONGLIST:[012..0x12]="10 11 12 13 14 15 16 17 18"
make: Bad modifier `:[1.]' for LIST
LIST:[1.]="" is an error
make: Bad modifier `:[1..]' for LIST
@@ -99,6 +100,7 @@ LIST:[${EMPTY}]="" is an error
LIST:[${LONGLIST:[21]:S/2//}]="one"
LIST:[${LIST:[#]}]="six"
LIST:[${LIST:[${HASH}]}]="six"
+LIST:[ -1.. +3]="six five four three"
LIST:S/ /,/="one two three four five six"
LIST:S/ /,/W="one,two three four five six"
LIST:S/ /,/gW="one,two,three,four,five,six"
Index: src/usr.bin/make/unit-tests/modword.mk
diff -u src/usr.bin/make/unit-tests/modword.mk:1.3 src/usr.bin/make/unit-tests/modword.mk:1.4
--- src/usr.bin/make/unit-tests/modword.mk:1.3 Sat Oct 24 08:50:17 2020
+++ src/usr.bin/make/unit-tests/modword.mk Sun Nov 1 13:55:31 2020
@@ -1,4 +1,4 @@
-# $NetBSD: modword.mk,v 1.3 2020/10/24 08:50:17 rillig Exp $
+# $NetBSD: modword.mk,v 1.4 2020/11/01 13:55:31 rillig Exp $
#
# Test behaviour of new :[] modifier
@@ -22,7 +22,8 @@ mod-squarebrackets: mod-squarebrackets-0
mod-squarebrackets-hash \
mod-squarebrackets-n \
mod-squarebrackets-start-end \
- mod-squarebrackets-nested
+ mod-squarebrackets-nested \
+ mod-squarebrackets-space
mod-squarebrackets-0-star-at:
@echo 'LIST:[]="${LIST:[]}" is an error'
@@ -92,6 +93,7 @@ mod-squarebrackets-n:
@echo 'LIST:[*]:C/ /,/:[2]="${LIST:[*]:C/ /,/:[2]}"'
@echo 'LIST:[*]:C/ /,/:[*]:[2]="${LIST:[*]:C/ /,/:[*]:[2]}"'
@echo 'LIST:[*]:C/ /,/:[@]:[2]="${LIST:[*]:C/ /,/:[@]:[2]}"'
+ @echo 'LONGLIST:[012..0x12]="${LONGLIST:[012..0x12]}"'
mod-squarebrackets-start-end:
@echo 'LIST:[1.]="${LIST:[1.]}" is an error'
@@ -124,6 +126,12 @@ mod-squarebrackets-nested:
@echo 'LIST:[$${LIST:[#]}]="${LIST:[${LIST:[#]}]}"'
@echo 'LIST:[$${LIST:[$${HASH}]}]="${LIST:[${LIST:[${HASH}]}]}"'
+mod-squarebrackets-space:
+ # As of 2020-11-01, it is possible to have spaces before the numbers
+ # but not after them. This is an unintended side-effect of using
+ # strtol for parsing the numbers.
+ @echo 'LIST:[ -1.. +3]="${LIST:[ -1.. +3]}"'
+
mod-C-W:
@echo 'LIST:C/ /,/="${LIST:C/ /,/}"'
@echo 'LIST:C/ /,/W="${LIST:C/ /,/W}"'
Index: src/usr.bin/make/unit-tests/varmod-range.exp
diff -u src/usr.bin/make/unit-tests/varmod-range.exp:1.3 src/usr.bin/make/unit-tests/varmod-range.exp:1.4
--- src/usr.bin/make/unit-tests/varmod-range.exp:1.3 Sun Nov 1 13:10:22 2020
+++ src/usr.bin/make/unit-tests/varmod-range.exp Sun Nov 1 13:55:31 2020
@@ -1,13 +1,13 @@
make: Unknown modifier 'x'
-make: "varmod-range.mk" line 46: Malformed conditional ("${:U:range=x}Rest" != "Rest")
+make: "varmod-range.mk" line 49: Malformed conditional ("${:U:range=x}Rest" != "Rest")
make: Unknown modifier 'x'
-make: "varmod-range.mk" line 55: Malformed conditional ("${:U:range=0x0}Rest" != "Rest")
+make: "varmod-range.mk" line 58: Malformed
CVS commit: src/usr.bin/make/unit-tests
Module Name:src
Committed By: rillig
Date: Sun Nov 1 13:28:50 UTC 2020
Modified Files:
src/usr.bin/make/unit-tests: varmod-to-separator.exp
varmod-to-separator.mk
Log Message:
make(1): add tests for parsing errors in the :ts variable modifier
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/make/unit-tests/varmod-to-separator.exp
cvs rdiff -u -r1.4 -r1.5 src/usr.bin/make/unit-tests/varmod-to-separator.mk
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/unit-tests/varmod-to-separator.exp
diff -u src/usr.bin/make/unit-tests/varmod-to-separator.exp:1.3 src/usr.bin/make/unit-tests/varmod-to-separator.exp:1.4
--- src/usr.bin/make/unit-tests/varmod-to-separator.exp:1.3 Sun Nov 1 11:50:11 2020
+++ src/usr.bin/make/unit-tests/varmod-to-separator.exp Sun Nov 1 13:28:50 2020
@@ -1,11 +1,17 @@
make: "varmod-to-separator.mk" line 106: warning: The separator \400 is accepted even though it is out of bounds.
make: "varmod-to-separator.mk" line 118: warning: The separator \x100 is accepted even though it is out of bounds.
+make: Bad modifier `:ts\-300' for WORDS
+make: "varmod-to-separator.mk" line 124: Malformed conditional (${WORDS:[1..3]:ts\-300:tu})
+make: Bad modifier `:ts\8' for 1 2 3
+make: "varmod-to-separator.mk" line 132: Malformed conditional (${1 2 3:L:ts\8:tu})
+make: Bad modifier `:ts\100L' for 1 2 3
+make: "varmod-to-separator.mk" line 139: Malformed conditional (${1 2 3:L:ts\100L})
+make: Bad modifier `:ts\x40g' for 1 2 3
+make: "varmod-to-separator.mk" line 146: Malformed conditional (${1 2 3:L:ts\x40g})
make: Bad modifier `:tx' for WORDS
-make: "varmod-to-separator.mk" line 124: Malformed conditional (${WORDS:tx} != "anything")
-make: "varmod-to-separator.mk" line 128: Parsing continues here.
+make: "varmod-to-separator.mk" line 154: Malformed conditional (${WORDS:tx} != "anything")
make: Bad modifier `:t\X' for WORDS
-make: "varmod-to-separator.mk" line 132: Malformed conditional (${WORDS:t\X} != "anything")
-make: "varmod-to-separator.mk" line 135: Parsing continues here.
+make: "varmod-to-separator.mk" line 161: Malformed conditional (${WORDS:t\X} != "anything")
make: Fatal errors encountered -- cannot continue
make: stopped in unit-tests
exit status 1
Index: src/usr.bin/make/unit-tests/varmod-to-separator.mk
diff -u src/usr.bin/make/unit-tests/varmod-to-separator.mk:1.4 src/usr.bin/make/unit-tests/varmod-to-separator.mk:1.5
--- src/usr.bin/make/unit-tests/varmod-to-separator.mk:1.4 Sun Nov 1 11:50:11 2020
+++ src/usr.bin/make/unit-tests/varmod-to-separator.mk Sun Nov 1 13:28:50 2020
@@ -1,4 +1,4 @@
-# $NetBSD: varmod-to-separator.mk,v 1.4 2020/11/01 11:50:11 rillig Exp $
+# $NetBSD: varmod-to-separator.mk,v 1.5 2020/11/01 13:28:50 rillig Exp $
#
# Tests for the :ts variable modifier, which joins the words of the variable
# using an arbitrary character as word separator.
@@ -120,19 +120,46 @@ WORDS= one two three four five six
. warning The separator \x100 is accepted even though it is out of bounds.
.endif
+# Negative numbers are not allowed for the separator character.
+.if ${WORDS:[1..3]:ts\-300:tu}
+. warning The separator \-300 is accepted even though it is negative.
+.else
+. warning The separator \-300 is accepted even though it is negative.
+.endif
+
+# The character number is interpreted as octal number by default.
+# The digit '8' is not an octal digit though.
+.if ${1 2 3:L:ts\8:tu}
+. warning The separator \8 is accepted even though it is not octal.
+.else
+. warning The separator \8 is accepted even though it is not octal.
+.endif
+
+# Trailing characters after the octal character number are rejected.
+.if ${1 2 3:L:ts\100L}
+. warning The separator \100L is accepted even though it contains an 'L'.
+.else
+. warning The separator \100L is accepted even though it contains an 'L'.
+.endif
+
+# Trailing characters after the hexadecimal character number are rejected.
+.if ${1 2 3:L:ts\x40g}
+. warning The separator \x40g is accepted even though it contains a 'g'.
+.else
+. warning The separator \x40g is accepted even though it contains a 'g'.
+.endif
+
+
# In the :t modifier, the :t must be followed by any of A, l, s, u.
.if ${WORDS:tx} != "anything"
. info This line is not reached because of the malformed condition.
. info If this line were reached, it would be visible in the -dcpv log.
.endif
-.info Parsing continues here.
# After the backslash, only n, t, an octal number, or x and a hexadecimal
# number are allowed.
.if ${WORDS:t\X} != "anything"
. info This line is not reached.
.endif
-.info Parsing continues here.
all:
- @:;
CVS commit: src/usr.bin/make/unit-tests
Module Name:src
Committed By: rillig
Date: Sun Nov 1 13:10:22 UTC 2020
Modified Files:
src/usr.bin/make/unit-tests: varmod-range.exp varmod-range.mk
Log Message:
make(1): add more tests for the variable modifier :range, edge cases
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/make/unit-tests/varmod-range.exp
cvs rdiff -u -r1.4 -r1.5 src/usr.bin/make/unit-tests/varmod-range.mk
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/unit-tests/varmod-range.exp
diff -u src/usr.bin/make/unit-tests/varmod-range.exp:1.2 src/usr.bin/make/unit-tests/varmod-range.exp:1.3
--- src/usr.bin/make/unit-tests/varmod-range.exp:1.2 Sun Aug 23 15:13:21 2020
+++ src/usr.bin/make/unit-tests/varmod-range.exp Sun Nov 1 13:10:22 2020
@@ -1,8 +1,13 @@
+make: Unknown modifier 'x'
+make: "varmod-range.mk" line 46: Malformed conditional ("${:U:range=x}Rest" != "Rest")
+make: Unknown modifier 'x'
+make: "varmod-range.mk" line 55: Malformed conditional ("${:U:range=0x0}Rest" != "Rest")
make: Unknown modifier 'r'
-
-1 2 3
+make: "varmod-range.mk" line 71: Malformed conditional ("${a b c:L:rang}Rest" != "Rest")
make: Unknown modifier 'r'
-
+make: "varmod-range.mk" line 78: Malformed conditional ("${a b c:L:rango}Rest" != "Rest")
make: Unknown modifier 'r'
-
-exit status 0
+make: "varmod-range.mk" line 85: Malformed conditional ("${a b c:L:ranger}Rest" != "Rest")
+make: Fatal errors encountered -- cannot continue
+make: stopped in unit-tests
+exit status 1
Index: src/usr.bin/make/unit-tests/varmod-range.mk
diff -u src/usr.bin/make/unit-tests/varmod-range.mk:1.4 src/usr.bin/make/unit-tests/varmod-range.mk:1.5
--- src/usr.bin/make/unit-tests/varmod-range.mk:1.4 Sun Sep 27 18:11:31 2020
+++ src/usr.bin/make/unit-tests/varmod-range.mk Sun Nov 1 13:10:22 2020
@@ -1,4 +1,4 @@
-# $NetBSD: varmod-range.mk,v 1.4 2020/09/27 18:11:31 rillig Exp $
+# $NetBSD: varmod-range.mk,v 1.5 2020/11/01 13:10:22 rillig Exp $
#
# Tests for the :range variable modifier, which generates sequences
# of integers from the given range.
@@ -31,8 +31,61 @@
. error
.endif
+# Negative ranges don't make sense.
+# As of 2020-11-01, they are accepted though, using up all available memory.
+#.if "${:range=-1}"
+#. error
+#.else
+#. error
+#.endif
+
+# The :range modifier requires a number as parameter.
+# As of 2020-11-01, the parser tries to read the 'x' as a number, fails and
+# stops there. It then tries to parse the next modifier at that point,
+# which fails with the message "Unknown modifier".
+.if "${:U:range=x}Rest" != "Rest"
+. error
+.else
+. error
+.endif
+
+# The upper limit of the range must always be given in decimal.
+# This parse error stops at the 'x', trying to parse it as a variable
+# modifier.
+.if "${:U:range=0x0}Rest" != "Rest"
+. error
+.else
+. error
+.endif
+
+# As of 2020-11-01, numeric overflow is not detected.
+# Since strtoul returns ULONG_MAX in such a case, it is interpreted as a
+# very large number, consuming all available memory.
+#.if "${:U:range=18446744073709551619}Rest" != "Rest"
+#. error
+#.else
+#. error
+#.endif
+
+# modifier name too short
+.if "${a b c:L:rang}Rest" != "Rest"
+. error
+.else
+. error
+.endif
+
+# misspelled modifier name
+.if "${a b c:L:rango}Rest" != "Rest"
+. error
+.else
+. error
+.endif
+
+# modifier name too long
+.if "${a b c:L:ranger}Rest" != "Rest"
+. error
+.else
+. error
+.endif
+
all:
- @echo ${a b c:L:rang} # modifier name too short
- @echo ${a b c:L:range} # ok
- @echo ${a b c:L:rango} # misspelled
- @echo ${a b c:L:ranger} # modifier name too long
CVS commit: src/usr.bin/make
Module Name:src
Committed By: rillig
Date: Sun Nov 1 12:34:46 UTC 2020
Modified Files:
src/usr.bin/make: var.c
Log Message:
make(1): clean up comments in ApplyModifier_Words
To generate a diff of this commit:
cvs rdiff -u -r1.632 -r1.633 src/usr.bin/make/var.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/make/var.c
diff -u src/usr.bin/make/var.c:1.632 src/usr.bin/make/var.c:1.633
--- src/usr.bin/make/var.c:1.632 Sat Oct 31 23:23:22 2020
+++ src/usr.bin/make/var.c Sun Nov 1 12:34:45 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.632 2020/10/31 23:23:22 rillig Exp $ */
+/* $NetBSD: var.c,v 1.633 2020/11/01 12:34:45 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -130,7 +130,7 @@
#include "metachar.h"
/* "@(#)var.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.632 2020/10/31 23:23:22 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.633 2020/11/01 12:34:45 rillig Exp $");
#define VAR_DEBUG1(fmt, arg1) DEBUG1(VAR, fmt, arg1)
#define VAR_DEBUG2(fmt, arg1, arg2) DEBUG2(VAR, fmt, arg1, arg2)
@@ -2114,7 +2114,8 @@ ApplyModifier_Literal(const char **pp, A
return AMR_OK;
}
-static Boolean TryParseTime(const char **pp, time_t *out_time)
+static Boolean
+TryParseTime(const char **pp, time_t *out_time)
{
char *end;
unsigned long n;
@@ -2720,8 +2721,8 @@ ApplyModifier_Words(const char **pp, App
goto bad_modifier; /* Found junk instead of ".." */
/*
- * Now seldata is properly filled in, but we still have to check for 0 as
- * a special case.
+ * Now first and last are properly filled in, but we still have to check
+ * for 0 as a special case.
*/
if (first == 0 && last == 0) {
/* ":[0]" or perhaps ":[0..0]" */
@@ -2734,7 +2735,7 @@ ApplyModifier_Words(const char **pp, App
if (first == 0 || last == 0)
goto bad_modifier;
-/* Normal case: select the words described by seldata. */
+/* Normal case: select the words described by first and last. */
st->newVal = VarSelectWords(st->sep, st->oneBigWord, st->val, first, last);
ok:
CVS commit: src/sys/arch/arm/cortex
Module Name:src Committed By: jmcneill Date: Sun Nov 1 12:13:21 UTC 2020 Modified Files: src/sys/arch/arm/cortex: gicv3.c Log Message: Add an isb() barrier after ICC_SGI1R_EL1 write to prevent reordering with subsequent wfi/wfe instructions. Haven't seen this in practice but I would rather be safe here. To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/sys/arch/arm/cortex/gicv3.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/cortex/gicv3.c diff -u src/sys/arch/arm/cortex/gicv3.c:1.29 src/sys/arch/arm/cortex/gicv3.c:1.30 --- src/sys/arch/arm/cortex/gicv3.c:1.29 Sun Nov 1 11:17:20 2020 +++ src/sys/arch/arm/cortex/gicv3.c Sun Nov 1 12:13:21 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: gicv3.c,v 1.29 2020/11/01 11:17:20 jmcneill Exp $ */ +/* $NetBSD: gicv3.c,v 1.30 2020/11/01 12:13:21 jmcneill Exp $ */ /*- * Copyright (c) 2018 Jared McNeill @@ -31,7 +31,7 @@ #define _INTR_PRIVATE #include -__KERNEL_RCSID(0, "$NetBSD: gicv3.c,v 1.29 2020/11/01 11:17:20 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: gicv3.c,v 1.30 2020/11/01 12:13:21 jmcneill Exp $"); #include #include @@ -435,6 +435,7 @@ gicv3_ipi_send(struct pic_softc *pic, co sgir |= ci->ci_gic_sgir; } icc_sgi1r_write(sgir); + isb(); } static void
CVS commit: src/external/mit/xorg/lib/xkeyboard-config
Module Name:src Committed By: mrg Date: Sun Nov 1 12:07:09 UTC 2020 Modified Files: src/external/mit/xorg/lib/xkeyboard-config: xkeyboard-config.man src/external/mit/xorg/lib/xkeyboard-config/rules: base base.lst evdev evdev.lst src/external/mit/xorg/lib/xkeyboard-config/symbols: Makefile Log Message: merge new xkeyboard-config 2.31 parts. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 \ src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man cvs rdiff -u -r1.14 -r1.15 \ src/external/mit/xorg/lib/xkeyboard-config/rules/base \ src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst \ src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst cvs rdiff -u -r1.13 -r1.14 \ src/external/mit/xorg/lib/xkeyboard-config/rules/evdev cvs rdiff -u -r1.15 -r1.16 \ src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man diff -u src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man:1.7 src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man:1.8 --- src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man:1.7 Thu Mar 12 21:55:31 2020 +++ src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man Sun Nov 1 12:07:09 2020 @@ -1,11 +1,11 @@ .\" WARNING: this man page is autogenerated. Do not edit or you will lose all your changes. -.TH XKEYBOARD-CONFIG __miscmansuffix__ __vendorversion__ +.TH XKEYBOARD-CONFIG @miscmansuffix@ @vendorversion@ .SH NAME xkeyboard-config \- XKB data description files .SH DESCRIPTION xkeyboard-config provides the description files for the X Keyboard Extension (XKB). The configuration options below are usually applied with -setxkbmap(__appmansuffix__). +setxkbmap(@appmansuffix@). .SH MODELS .TS left,box; @@ -13,10 +13,12 @@ lB lB ___ lB l. Model Description +pc86 Generic 86-key PC pc101 Generic 101-key PC -pc102 Generic 102-key PC (intl.) +pc102 Generic 102-key PC pc104 Generic 104-key PC -pc105 Generic 105-key PC (intl.) +pc104alt Generic 104-key PC with L-shaped Enter key +pc105 Generic 105-key PC dell101 Dell 101-key PC latitude Dell Latitude laptop dellm65 Dell Precision M65 laptop @@ -214,6 +216,7 @@ lB l. Layout(Variant) Description us English (US) us(chr) Cherokee +us(haw) Hawaiian us(euro) English (US, euro on 5) us(intl) English (US, intl., with dead keys) us(alt-intl) English (US, alt. intl.) @@ -225,10 +228,11 @@ us(dvorak-l) English (Dvorak, left-hande us(dvorak-r) English (Dvorak, right-handed) us(dvorak-classic) English (classic Dvorak) us(dvp) English (programmer Dvorak) +us(symbolic) English (US, Symbolic) us(rus) Russian (US, phonetic) us(mac) English (Macintosh) us(altgr-intl) English (intl., with AltGr dead keys) -us(olpc2) English (the divide/multiply keys toggle the layout) +us(olpc2) English (the divide/multiply toggle the layout) us(hbs) Serbo-Croatian (US) us(norman) English (Norman) us(workman) English (Workman) @@ -245,10 +249,10 @@ af(uz-olpc) Uzbek (Afghanistan, OLPC) _ ara Arabic ara(azerty) Arabic (AZERTY) -ara(azerty_digits) Arabic (AZERTY/digits) -ara(digits) Arabic (digits) +ara(azerty_digits) Arabic (AZERTY, Eastern Arabic numerals) +ara(digits) Arabic (Eastern Arabic numerals) ara(qwerty) Arabic (QWERTY) -ara(qwerty_digits) Arabic (qwerty/digits) +ara(qwerty_digits) Arabic (QWERTY, Eastern Arabic numerals) ara(buckwalter) Arabic (Buckwalter) ara(olpc) Arabic (OLPC) ara(mac) Arabic (Macintosh) @@ -269,7 +273,7 @@ am(eastern-alt) Armenian (alt. eastern) _ at German (Austria) at(nodeadkeys) German (Austria, no dead keys) -at(sundeadkeys) German (Austria, with Sun dead keys) +at(sundeadkeys) German (Austria, Sun dead keys) at(mac) German (Austria, Macintosh) _ @@ -283,15 +287,17 @@ _ by Belarusian by(legacy) Belarusian (legacy) by(latin) Belarusian (Latin) +by(ru) Russian (Belarus) +by(intl) Belarusian (intl.) _ be Belgian be(oss) Belgian (alt.) -be(oss_latin9) Belgian (alt., Latin-9 only) -be(oss_sundeadkeys) Belgian (alt., with Sun dead keys) -be(iso-alternate) Belgian (alt. ISO) +be(oss_latin9) Belgian (Latin-9 only, alt.) +be(oss_sundeadkeys) Belgian (Sun dead keys, alt.) +be(iso-alternate) Belgian (ISO, alt.) be(nodeadkeys) Belgian (no dead keys) -be(sundeadkeys) Belgian (with Sun dead keys) +be(sundeadkeys) Belgian (Sun dead keys) be(wang) Belgian (Wang 724 AZERTY) _ @@ -304,14 +310,14 @@ in(ben) Bangla (India) in(ben_probhat) Bangla (India, Probhat) in(ben_baishakhi) Bangla (India, Baishakhi) in(ben_bornona) Bangla (India, Bornona) -in(ben_gitanjali) Bangla (India, Uni Gitanjali) +in(ben_gitanjali) Bangla (India, Gitanjali) in(ben_inscript) Bangla (India, Baishakhi Inscript) in(eeyek) Manipuri (Eeyek) in(guj) Gujarati in(guru) Punjabi (Gurmukhi) in(jhelum)
CVS import: xsrc/external/mit/xkeyboard-config/dist
Module Name:xsrc Committed By: mrg Date: Sun Nov 1 12:00:22 UTC 2020 Update of /cvsroot/xsrc/external/mit/xkeyboard-config/dist In directory ivanova.netbsd.org:/tmp/cvs-serv4853 Log Message: initial import of xkeyboard-config-2.31 Status: Vendor Tag: xorg Release Tags: xkeyboard-config-2-31 U xsrc/external/mit/xkeyboard-config/dist/install-sh U xsrc/external/mit/xkeyboard-config/dist/README U xsrc/external/mit/xkeyboard-config/dist/aclocal.m4 U xsrc/external/mit/xkeyboard-config/dist/compile U xsrc/external/mit/xkeyboard-config/dist/Makefile.am U xsrc/external/mit/xkeyboard-config/dist/config.rpath U xsrc/external/mit/xkeyboard-config/dist/AUTHORS C xsrc/external/mit/xkeyboard-config/dist/configure U xsrc/external/mit/xkeyboard-config/dist/xkeyboard-config.pc.in U xsrc/external/mit/xkeyboard-config/dist/NEWS U xsrc/external/mit/xkeyboard-config/dist/ABOUT-NLS U xsrc/external/mit/xkeyboard-config/dist/Makefile.in U xsrc/external/mit/xkeyboard-config/dist/config.sub U xsrc/external/mit/xkeyboard-config/dist/COPYING U xsrc/external/mit/xkeyboard-config/dist/missing U xsrc/external/mit/xkeyboard-config/dist/config.guess U xsrc/external/mit/xkeyboard-config/dist/configure.ac U xsrc/external/mit/xkeyboard-config/dist/ChangeLog U xsrc/external/mit/xkeyboard-config/dist/autogen.sh U xsrc/external/mit/xkeyboard-config/dist/symbols/gb U xsrc/external/mit/xkeyboard-config/dist/symbols/eu U xsrc/external/mit/xkeyboard-config/dist/symbols/trans U xsrc/external/mit/xkeyboard-config/dist/symbols/tw U xsrc/external/mit/xkeyboard-config/dist/symbols/uz U xsrc/external/mit/xkeyboard-config/dist/symbols/tg U xsrc/external/mit/xkeyboard-config/dist/symbols/ara U xsrc/external/mit/xkeyboard-config/dist/symbols/capslock U xsrc/external/mit/xkeyboard-config/dist/symbols/inet U xsrc/external/mit/xkeyboard-config/dist/symbols/se U xsrc/external/mit/xkeyboard-config/dist/symbols/fr U xsrc/external/mit/xkeyboard-config/dist/symbols/eurosign U xsrc/external/mit/xkeyboard-config/dist/symbols/iq U xsrc/external/mit/xkeyboard-config/dist/symbols/typo U xsrc/external/mit/xkeyboard-config/dist/symbols/by U xsrc/external/mit/xkeyboard-config/dist/symbols/kpdl U xsrc/external/mit/xkeyboard-config/dist/symbols/az U xsrc/external/mit/xkeyboard-config/dist/symbols/br U xsrc/external/mit/xkeyboard-config/dist/symbols/cm N xsrc/external/mit/xkeyboard-config/dist/symbols/eg U xsrc/external/mit/xkeyboard-config/dist/symbols/de U xsrc/external/mit/xkeyboard-config/dist/symbols/kz U xsrc/external/mit/xkeyboard-config/dist/symbols/tj C xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am U xsrc/external/mit/xkeyboard-config/dist/symbols/level3 U xsrc/external/mit/xkeyboard-config/dist/symbols/us U xsrc/external/mit/xkeyboard-config/dist/symbols/es U xsrc/external/mit/xkeyboard-config/dist/symbols/latam U xsrc/external/mit/xkeyboard-config/dist/symbols/apl U xsrc/external/mit/xkeyboard-config/dist/symbols/ph U xsrc/external/mit/xkeyboard-config/dist/symbols/it U xsrc/external/mit/xkeyboard-config/dist/symbols/bd U xsrc/external/mit/xkeyboard-config/dist/symbols/tr U xsrc/external/mit/xkeyboard-config/dist/symbols/cn U xsrc/external/mit/xkeyboard-config/dist/symbols/gh U xsrc/external/mit/xkeyboard-config/dist/symbols/ua U xsrc/external/mit/xkeyboard-config/dist/symbols/empty U xsrc/external/mit/xkeyboard-config/dist/symbols/et U xsrc/external/mit/xkeyboard-config/dist/symbols/bt U xsrc/external/mit/xkeyboard-config/dist/symbols/kg U xsrc/external/mit/xkeyboard-config/dist/symbols/is U xsrc/external/mit/xkeyboard-config/dist/symbols/ee U xsrc/external/mit/xkeyboard-config/dist/symbols/tz U xsrc/external/mit/xkeyboard-config/dist/symbols/am U xsrc/external/mit/xkeyboard-config/dist/symbols/ma U xsrc/external/mit/xkeyboard-config/dist/symbols/si U xsrc/external/mit/xkeyboard-config/dist/symbols/ge U xsrc/external/mit/xkeyboard-config/dist/symbols/id U xsrc/external/mit/xkeyboard-config/dist/symbols/cz U xsrc/external/mit/xkeyboard-config/dist/symbols/za U xsrc/external/mit/xkeyboard-config/dist/symbols/au U xsrc/external/mit/xkeyboard-config/dist/symbols/srvr_ctrl U xsrc/external/mit/xkeyboard-config/dist/symbols/keypad U xsrc/external/mit/xkeyboard-config/dist/symbols/ca U xsrc/external/mit/xkeyboard-config/dist/symbols/shift U xsrc/external/mit/xkeyboard-config/dist/symbols/mt U xsrc/external/mit/xkeyboard-config/dist/symbols/gr U xsrc/external/mit/xkeyboard-config/dist/symbols/ru U xsrc/external/mit/xkeyboard-config/dist/symbols/olpc U xsrc/external/mit/xkeyboard-config/dist/symbols/compose U xsrc/external/mit/xkeyboard-config/dist/symbols/mm U xsrc/external/mit/xkeyboard-config/dist/symbols/fi N xsrc/external/mit/xkeyboard-config/dist/symbols/level2 U xsrc/external/mit/xkeyboard-config/dist/symbols/jv U xsrc/external/mit/xkeyboard-config/dist/symbols/af U xsrc/external/mit/xkeyboard-config/dist/symbols/hr C xsrc/external/mit/xkeyboard-config/dist/symbols/at U
CVS commit: src/usr.bin/make/unit-tests
Module Name:src
Committed By: rillig
Date: Sun Nov 1 11:50:11 UTC 2020
Modified Files:
src/usr.bin/make/unit-tests: varmod-to-separator.exp
varmod-to-separator.mk
Log Message:
make(1): add test for out-of-bounds separator in variable modifier :ts
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/make/unit-tests/varmod-to-separator.exp
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/make/unit-tests/varmod-to-separator.mk
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/unit-tests/varmod-to-separator.exp
diff -u src/usr.bin/make/unit-tests/varmod-to-separator.exp:1.2 src/usr.bin/make/unit-tests/varmod-to-separator.exp:1.3
--- src/usr.bin/make/unit-tests/varmod-to-separator.exp:1.2 Mon Aug 31 19:58:21 2020
+++ src/usr.bin/make/unit-tests/varmod-to-separator.exp Sun Nov 1 11:50:11 2020
@@ -1,9 +1,11 @@
+make: "varmod-to-separator.mk" line 106: warning: The separator \400 is accepted even though it is out of bounds.
+make: "varmod-to-separator.mk" line 118: warning: The separator \x100 is accepted even though it is out of bounds.
make: Bad modifier `:tx' for WORDS
-make: "varmod-to-separator.mk" line 104: Malformed conditional (${WORDS:tx} != "anything")
-make: "varmod-to-separator.mk" line 108: Parsing continues here.
+make: "varmod-to-separator.mk" line 124: Malformed conditional (${WORDS:tx} != "anything")
+make: "varmod-to-separator.mk" line 128: Parsing continues here.
make: Bad modifier `:t\X' for WORDS
-make: "varmod-to-separator.mk" line 112: Malformed conditional (${WORDS:t\X} != "anything")
-make: "varmod-to-separator.mk" line 115: Parsing continues here.
+make: "varmod-to-separator.mk" line 132: Malformed conditional (${WORDS:t\X} != "anything")
+make: "varmod-to-separator.mk" line 135: Parsing continues here.
make: Fatal errors encountered -- cannot continue
make: stopped in unit-tests
exit status 1
Index: src/usr.bin/make/unit-tests/varmod-to-separator.mk
diff -u src/usr.bin/make/unit-tests/varmod-to-separator.mk:1.3 src/usr.bin/make/unit-tests/varmod-to-separator.mk:1.4
--- src/usr.bin/make/unit-tests/varmod-to-separator.mk:1.3 Mon Aug 31 19:58:21 2020
+++ src/usr.bin/make/unit-tests/varmod-to-separator.mk Sun Nov 1 11:50:11 2020
@@ -1,4 +1,4 @@
-# $NetBSD: varmod-to-separator.mk,v 1.3 2020/08/31 19:58:21 rillig Exp $
+# $NetBSD: varmod-to-separator.mk,v 1.4 2020/11/01 11:50:11 rillig Exp $
#
# Tests for the :ts variable modifier, which joins the words of the variable
# using an arbitrary character as word separator.
@@ -95,11 +95,31 @@ WORDS= one two three four five six
. warning The separator \012 is not interpreted in octal ASCII.
.endif
+# The octal number can have as many digits as it wants.
+.if ${WORDS:[1..2]:ts\012:tu} != "ONE${.newline}TWO"
+. warning The separator \012 cannot have many leading zeroes.
+.endif
+
+# The value of the separator character must not be outside the value space
+# for an unsigned character though.
+.if ${WORDS:[1..3]:ts\400:tu}
+. warning The separator \400 is accepted even though it is out of bounds.
+.else
+. warning The separator \400 is accepted even though it is out of bounds.
+.endif
+
# The separator can be given as hexadecimal number.
.if ${WORDS:[1..3]:ts\xa:tu} != "ONE${.newline}TWO${.newline}THREE"
. warning The separator \xa is not interpreted in hexadecimal ASCII.
.endif
+# The hexadecimal number must be in the range of an unsigned char.
+.if ${WORDS:[1..3]:ts\x100:tu}
+. warning The separator \x100 is accepted even though it is out of bounds.
+.else
+. warning The separator \x100 is accepted even though it is out of bounds.
+.endif
+
# In the :t modifier, the :t must be followed by any of A, l, s, u.
.if ${WORDS:tx} != "anything"
. info This line is not reached because of the malformed condition.
CVS commit: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k
Module Name:xsrc
Committed By: tsutsui
Date: Sun Nov 1 11:44:55 UTC 2020
Modified Files:
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k: x68kKbd.c
Log Message:
Fix a suspicious chunk disabled on xfree 4.x migration as sunKbd.c does.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c:1.8 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c:1.9
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c:1.8 Sat Aug 1 20:21:00 2020
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c Sun Nov 1 11:44:55 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kKbd.c,v 1.8 2020/08/01 20:21:00 tsutsui Exp $ */
+/* $NetBSD: x68kKbd.c,v 1.9 2020/11/01 11:44:55 tsutsui Exp $ */
/*-
* Copyright (c) 1996 Yasushi Yamasaki
* All rights reserved.
@@ -185,10 +185,8 @@ x68kInitModMap(KeySymsRec *KeySyms, CARD
KeySyms->minKeyCode += MIN_KEYCODE;
KeySyms->maxKeyCode += MIN_KEYCODE;
}
-#if 0
if (KeySyms->maxKeyCode > MAX_KEYCODE)
-KeySyms->maxKeyCode += MAX_KEYCODE;
-#endif
+KeySyms->maxKeyCode = MAX_KEYCODE;
for (i = KeySyms->minKeyCode;
i < KeySyms->maxKeyCode; i++) {
switch (KeySyms->map[(i-KeySyms->minKeyCode)*4]) {
CVS commit: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k
Module Name:xsrc
Committed By: tsutsui
Date: Sun Nov 1 11:40:53 UTC 2020
Modified Files:
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k: x68kInit.c
Log Message:
Call LogInit() for logging to /var/log/X68k.%s.log as Xorg and Xsun servers.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c:1.8 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c:1.9
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c:1.8 Sat Aug 1 20:09:03 2020
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c Sun Nov 1 11:40:53 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kInit.c,v 1.8 2020/08/01 20:09:03 tsutsui Exp $ */
+/* $NetBSD: x68kInit.c,v 1.9 2020/11/01 11:40:53 tsutsui Exp $ */
/*-
* Copyright (c) 1996 Yasushi Yamasaki
* All rights reserved.
@@ -75,9 +75,35 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
static int nscreens;
+/* default log file paths */
+#ifndef DEFAULT_LOGDIR
+#define DEFAULT_LOGDIR "/var/log"
+#endif
+#ifndef DEFAULT_LOGPREFIX
+#define DEFAULT_LOGPREFIX "X68K."
+#endif
+
void
OsVendorInit(void)
{
+static int inited;
+
+if (!inited) {
+ const char *logfile;
+ char *lf;
+
+#define LOGSUFFIX ".log"
+#define LOGOLDSUFFIX ".old"
+ logfile = DEFAULT_LOGDIR "/" DEFAULT_LOGPREFIX;
+ if (asprintf(, "%s%%s" LOGSUFFIX, logfile) == -1)
+ FatalError("Cannot allocate space for the log file name\n");
+ LogInit(lf, LOGOLDSUFFIX);
+#undef LOGSUFFIX
+#undef LOGOLDSUFFIX
+ free(lf);
+
+ inited = 1;
+}
}
#ifdef GLXEXT
@@ -178,6 +204,7 @@ AbortDDX(enum ExitCode error)
fb = x68kGetFbProcRec(i);
(*fb->close)(screen);
}
+LogClose(error);
}
/*-
CVS commit: src/crypto/external/bsd/netpgp/dist/src/netpgpverify
Module Name:src
Committed By: wiz
Date: Sun Nov 1 11:29:17 UTC 2020
Modified Files:
src/crypto/external/bsd/netpgp/dist/src/netpgpverify: Makefile.in
bzlib_private.h libverify.c verify.h
Added Files:
src/crypto/external/bsd/netpgp/dist/src/netpgpverify: HOWTO
dash-escaped-text dash-escaped-text.asc netpgpv-bzlib.h verify.map
Removed Files:
src/crypto/external/bsd/netpgp/dist/src/netpgpverify: bzlib.h
Log Message:
Sync with netpgpverify-20201101 from pkgsrc (the master for this).
No effective change except for version bump.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/HOWTO \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/dash-escaped-text \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/dash-escaped-text.asc \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/netpgpv-bzlib.h \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.map
cvs rdiff -u -r1.11 -r1.12 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.in \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.h
cvs rdiff -u -r1.2 -r0 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/bzlib.h
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/bzlib_private.h
cvs rdiff -u -r1.16 -r1.17 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.in
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.in:1.11 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.in:1.12
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.in:1.11 Mon Apr 17 19:50:28 2017
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.in Sun Nov 1 11:29:17 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.in,v 1.11 2017/04/17 19:50:28 agc Exp $
+# $NetBSD: Makefile.in,v 1.12 2020/11/01 11:29:17 wiz Exp $
PROG=netpgpverify
@@ -16,7 +16,7 @@ MANDIR=@MANDIR@
all: ${PROG}
${PROG}: ${OBJS}
- ${CC} ${OBJS} -o ${PROG}
+ ${CC} ${LDFLAGS} ${CFLAGS} ${OBJS} -o ${PROG}
install:
install -c -s ${PROG} ${DESTDIR}${PREFIX}/bin
Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.h
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.h:1.11 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.h:1.12
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.h:1.11 Mon May 4 00:18:34 2020
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.h Sun Nov 1 11:29:17 2020
@@ -23,9 +23,9 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef NETPGP_VERIFY_H_
-#define NETPGP_VERIFY_H_ 20200503
+#define NETPGP_VERIFY_H_ 20201101
-#define NETPGPVERIFY_VERSION "netpgpverify portable 20200503"
+#define NETPGPVERIFY_VERSION "netpgpverify portable 20201101"
#include
Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/bzlib_private.h
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/bzlib_private.h:1.4 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/bzlib_private.h:1.5
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/bzlib_private.h:1.4 Mon May 4 00:18:34 2020
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/bzlib_private.h Sun Nov 1 11:29:17 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: bzlib_private.h,v 1.4 2020/05/04 00:18:34 agc Exp $ */
+/* $NetBSD: bzlib_private.h,v 1.5 2020/11/01 11:29:17 wiz Exp $ */
/*-*/
@@ -32,7 +32,7 @@
#include
#endif
-#include "bzlib.h"
+#include "netpgpv-bzlib.h"
Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c:1.16 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c:1.17
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c:1.16 Sat Oct 17 23:08:57 2020
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c Sun Nov 1 11:29:17 2020
@@ -40,7 +40,7 @@
#include
#include
-#include "bzlib.h"
+#include "netpgpv-bzlib.h"
#include "zlib.h"
#include "array.h"
Added files:
Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/HOWTO
diff -u /dev/null src/crypto/external/bsd/netpgp/dist/src/netpgpverify/HOWTO:1.1
--- /dev/null Sun Nov 1 11:29:17 2020
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/HOWTO Sun Nov 1 11:29:17 2020
@@ -0,0 +1,55 @@
+How to use ssh keys in PGP signatures
+=
+
+1. generate a new ssh key pair
+
+ % ssh-keygen -t rsa -b 4096 -f sshtest-20140202
+ Generating public/private rsa key p
CVS commit: src/sys/arch/arm/cortex
Module Name:src Committed By: jmcneill Date: Sun Nov 1 11:17:20 UTC 2020 Modified Files: src/sys/arch/arm/cortex: gicv3.c Log Message: gicv3_set_priority: ICC_PMR_EL1 is self-synchronizing so no need for isb() here. To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/sys/arch/arm/cortex/gicv3.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/cortex/gicv3.c diff -u src/sys/arch/arm/cortex/gicv3.c:1.28 src/sys/arch/arm/cortex/gicv3.c:1.29 --- src/sys/arch/arm/cortex/gicv3.c:1.28 Sun Nov 1 11:04:55 2020 +++ src/sys/arch/arm/cortex/gicv3.c Sun Nov 1 11:17:20 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: gicv3.c,v 1.28 2020/11/01 11:04:55 jmcneill Exp $ */ +/* $NetBSD: gicv3.c,v 1.29 2020/11/01 11:17:20 jmcneill Exp $ */ /*- * Copyright (c) 2018 Jared McNeill @@ -31,7 +31,7 @@ #define _INTR_PRIVATE #include -__KERNEL_RCSID(0, "$NetBSD: gicv3.c,v 1.28 2020/11/01 11:04:55 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: gicv3.c,v 1.29 2020/11/01 11:17:20 jmcneill Exp $"); #include #include @@ -214,7 +214,6 @@ gicv3_set_priority(struct pic_softc *pic struct gicv3_softc * const sc = PICTOSOFTC(pic); icc_pmr_write(IPL_TO_PMR(sc, ipl)); - isb(); } static void
CVS import: xsrc/external/mit/xf86-video-vesa/dist
Module Name:xsrc Committed By: mrg Date: Sun Nov 1 11:12:23 UTC 2020 Update of /cvsroot/xsrc/external/mit/xf86-video-vesa/dist In directory ivanova.netbsd.org:/tmp/cvs-serv18138 Log Message: initial import of xf86-video-vesa-2.5.0 Status: Vendor Tag: xorg Release Tags: xf86-video-vesa-2-5-0 U xsrc/external/mit/xf86-video-vesa/dist/Makefile.am C xsrc/external/mit/xf86-video-vesa/dist/configure C xsrc/external/mit/xf86-video-vesa/dist/configure.ac C xsrc/external/mit/xf86-video-vesa/dist/aclocal.m4 C xsrc/external/mit/xf86-video-vesa/dist/Makefile.in U xsrc/external/mit/xf86-video-vesa/dist/config.h.in U xsrc/external/mit/xf86-video-vesa/dist/COPYING U xsrc/external/mit/xf86-video-vesa/dist/ChangeLog U xsrc/external/mit/xf86-video-vesa/dist/INSTALL U xsrc/external/mit/xf86-video-vesa/dist/compile C xsrc/external/mit/xf86-video-vesa/dist/config.guess C xsrc/external/mit/xf86-video-vesa/dist/config.sub C xsrc/external/mit/xf86-video-vesa/dist/install-sh C xsrc/external/mit/xf86-video-vesa/dist/ltmain.sh C xsrc/external/mit/xf86-video-vesa/dist/missing N xsrc/external/mit/xf86-video-vesa/dist/README.md C xsrc/external/mit/xf86-video-vesa/dist/depcomp U xsrc/external/mit/xf86-video-vesa/dist/src/Makefile.am C xsrc/external/mit/xf86-video-vesa/dist/src/Makefile.in U xsrc/external/mit/xf86-video-vesa/dist/src/compat-api.h C xsrc/external/mit/xf86-video-vesa/dist/src/vesa.c U xsrc/external/mit/xf86-video-vesa/dist/src/vesa.h U xsrc/external/mit/xf86-video-vesa/dist/man/Makefile.am C xsrc/external/mit/xf86-video-vesa/dist/man/Makefile.in U xsrc/external/mit/xf86-video-vesa/dist/man/vesa.man 13 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xf86-video-vesa/dist
CVS commit: xsrc/external/mit
Module Name:xsrc Committed By: mrg Date: Sun Nov 1 11:08:41 UTC 2020 Modified Files: xsrc/external/mit/libxcb/dist/src: xcb_in.c Removed Files: xsrc/external/mit/libxcb/dist: README xsrc/external/mit/xcb-proto/dist: README Log Message: merge libxcb and xcb-proto 1.14. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/libxcb/dist/README cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/libxcb/dist/src/xcb_in.c cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xcb-proto/dist/README Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/libxcb/dist/src/xcb_in.c diff -u xsrc/external/mit/libxcb/dist/src/xcb_in.c:1.7 xsrc/external/mit/libxcb/dist/src/xcb_in.c:1.8 --- xsrc/external/mit/libxcb/dist/src/xcb_in.c:1.7 Fri Dec 28 22:16:48 2018 +++ xsrc/external/mit/libxcb/dist/src/xcb_in.c Sun Nov 1 11:08:40 2020 @@ -1025,6 +1025,7 @@ int _xcb_in_read(xcb_connection_t *c) } } #endif +c->in.total_read += n; c->in.queue_len += n; } while(read_packet(c)) @@ -1051,7 +1052,7 @@ int _xcb_in_read(xcb_connection_t *c) } #endif #ifndef _WIN32 -if((n > 0) || (n < 0 && errno == EAGAIN)) +if((n > 0) || (n < 0 && (errno == EAGAIN || errno == EINTR))) #else if((n > 0) || (n < 0 && WSAGetLastError() == WSAEWOULDBLOCK)) #endif /* !_WIN32 */
CVS import: xsrc/external/mit/libxcb/dist
Module Name:xsrc Committed By: mrg Date: Sun Nov 1 11:07:15 UTC 2020 Update of /cvsroot/xsrc/external/mit/libxcb/dist In directory ivanova.netbsd.org:/tmp/cvs-serv20718 Log Message: initial import of libxcb-1.14 Status: Vendor Tag: xorg Release Tags: libxcb-1-14 U xsrc/external/mit/libxcb/dist/xcb-screensaver.pc.in U xsrc/external/mit/libxcb/dist/xcb-sync.pc.in U xsrc/external/mit/libxcb/dist/Makefile.am U xsrc/external/mit/libxcb/dist/configure.ac U xsrc/external/mit/libxcb/dist/xcb-damage.pc.in N xsrc/external/mit/libxcb/dist/README.md U xsrc/external/mit/libxcb/dist/xcb-xinput.pc.in U xsrc/external/mit/libxcb/dist/xcb-record.pc.in U xsrc/external/mit/libxcb/dist/xcb-composite.pc.in U xsrc/external/mit/libxcb/dist/xcb-xf86dri.pc.in U xsrc/external/mit/libxcb/dist/xcb-dpms.pc.in U xsrc/external/mit/libxcb/dist/xcb-xevie.pc.in U xsrc/external/mit/libxcb/dist/xcb-xinerama.pc.in U xsrc/external/mit/libxcb/dist/xcb-xfixes.pc.in U xsrc/external/mit/libxcb/dist/xcb-shm.pc.in U xsrc/external/mit/libxcb/dist/xcb-dri2.pc.in U xsrc/external/mit/libxcb/dist/xcb-shape.pc.in U xsrc/external/mit/libxcb/dist/xcb-res.pc.in U xsrc/external/mit/libxcb/dist/COPYING U xsrc/external/mit/libxcb/dist/xcb.pc.in U xsrc/external/mit/libxcb/dist/INSTALL U xsrc/external/mit/libxcb/dist/Makefile.in U xsrc/external/mit/libxcb/dist/xcb-xv.pc.in U xsrc/external/mit/libxcb/dist/xcb-randr.pc.in U xsrc/external/mit/libxcb/dist/xcb-present.pc.in U xsrc/external/mit/libxcb/dist/xcb-glx.pc.in U xsrc/external/mit/libxcb/dist/xcb-xvmc.pc.in U xsrc/external/mit/libxcb/dist/xcb-xkb.pc.in U xsrc/external/mit/libxcb/dist/configure U xsrc/external/mit/libxcb/dist/xcb-xselinux.pc.in U xsrc/external/mit/libxcb/dist/xcb-xtest.pc.in U xsrc/external/mit/libxcb/dist/aclocal.m4 U xsrc/external/mit/libxcb/dist/xcb-ge.pc.in U xsrc/external/mit/libxcb/dist/xcb-xprint.pc.in U xsrc/external/mit/libxcb/dist/xcb-dri3.pc.in U xsrc/external/mit/libxcb/dist/autogen.sh U xsrc/external/mit/libxcb/dist/NEWS U xsrc/external/mit/libxcb/dist/xcb-render.pc.in U xsrc/external/mit/libxcb/dist/ChangeLog U xsrc/external/mit/libxcb/dist/check-pc-requires U xsrc/external/mit/libxcb/dist/tools/constants U xsrc/external/mit/libxcb/dist/tools/README U xsrc/external/mit/libxcb/dist/tools/api_conv.pl U xsrc/external/mit/libxcb/dist/build-aux/config.sub U xsrc/external/mit/libxcb/dist/build-aux/missing U xsrc/external/mit/libxcb/dist/build-aux/ltmain.sh U xsrc/external/mit/libxcb/dist/build-aux/config.guess U xsrc/external/mit/libxcb/dist/build-aux/test-driver U xsrc/external/mit/libxcb/dist/build-aux/compile U xsrc/external/mit/libxcb/dist/build-aux/depcomp U xsrc/external/mit/libxcb/dist/build-aux/install-sh U xsrc/external/mit/libxcb/dist/m4/xcb.m4 U xsrc/external/mit/libxcb/dist/m4/ltsugar.m4 U xsrc/external/mit/libxcb/dist/m4/libtool.m4 U xsrc/external/mit/libxcb/dist/m4/lt~obsolete.m4 U xsrc/external/mit/libxcb/dist/m4/ltversion.m4 U xsrc/external/mit/libxcb/dist/m4/ltoptions.m4 U xsrc/external/mit/libxcb/dist/doc/Makefile.am U xsrc/external/mit/libxcb/dist/doc/Makefile.in U xsrc/external/mit/libxcb/dist/doc/xkb_internals U xsrc/external/mit/libxcb/dist/doc/xcb.doxygen.in U xsrc/external/mit/libxcb/dist/doc/xkb_issues U xsrc/external/mit/libxcb/dist/doc/tutorial/xcb.css U xsrc/external/mit/libxcb/dist/doc/tutorial/index.html U xsrc/external/mit/libxcb/dist/src/xcbint.h U xsrc/external/mit/libxcb/dist/src/c_client.py U xsrc/external/mit/libxcb/dist/src/xcb.h U xsrc/external/mit/libxcb/dist/src/Makefile.am U xsrc/external/mit/libxcb/dist/src/config.h.in U xsrc/external/mit/libxcb/dist/src/xcb_auth.c U xsrc/external/mit/libxcb/dist/src/Makefile.in C xsrc/external/mit/libxcb/dist/src/xcb_in.c U xsrc/external/mit/libxcb/dist/src/xcb_list.c U xsrc/external/mit/libxcb/dist/src/xcb_xid.c U xsrc/external/mit/libxcb/dist/src/xcbext.h U xsrc/external/mit/libxcb/dist/src/xcb_conn.c U xsrc/external/mit/libxcb/dist/src/xcb_windefs.h U xsrc/external/mit/libxcb/dist/src/xcb_out.c U xsrc/external/mit/libxcb/dist/src/xcb_util.c U xsrc/external/mit/libxcb/dist/src/xcb_ext.c U xsrc/external/mit/libxcb/dist/man/Makefile.am U xsrc/external/mit/libxcb/dist/man/xcb-examples.man U xsrc/external/mit/libxcb/dist/man/Makefile.in U xsrc/external/mit/libxcb/dist/man/xcb-requests.man U xsrc/external/mit/libxcb/dist/tests/Makefile.am U xsrc/external/mit/libxcb/dist/tests/check_suites.h U xsrc/external/mit/libxcb/dist/tests/CheckLog.xsl U xsrc/external/mit/libxcb/dist/tests/Makefile.in U xsrc/external/mit/libxcb/dist/tests/check_public.c U xsrc/external/mit/libxcb/dist/tests/check_all.c 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/libxcb/dist
CVS import: xsrc/external/mit/xcb-proto/dist
Module Name:xsrc Committed By: mrg Date: Sun Nov 1 11:07:17 UTC 2020 Update of /cvsroot/xsrc/external/mit/xcb-proto/dist In directory ivanova.netbsd.org:/tmp/cvs-serv29735 Log Message: initial import of xcb-proto-1.14 Status: Vendor Tag: xorg Release Tags: xcb-proto-1-14 U xsrc/external/mit/xcb-proto/dist/Makefile.am U xsrc/external/mit/xcb-proto/dist/configure.ac U xsrc/external/mit/xcb-proto/dist/missing N xsrc/external/mit/xcb-proto/dist/README.md U xsrc/external/mit/xcb-proto/dist/py-compile U xsrc/external/mit/xcb-proto/dist/xcb-proto.pc.in U xsrc/external/mit/xcb-proto/dist/COPYING U xsrc/external/mit/xcb-proto/dist/INSTALL U xsrc/external/mit/xcb-proto/dist/Makefile.in U xsrc/external/mit/xcb-proto/dist/install-sh U xsrc/external/mit/xcb-proto/dist/TODO U xsrc/external/mit/xcb-proto/dist/configure U xsrc/external/mit/xcb-proto/dist/aclocal.m4 U xsrc/external/mit/xcb-proto/dist/autogen.sh U xsrc/external/mit/xcb-proto/dist/NEWS U xsrc/external/mit/xcb-proto/dist/xcbgen/Makefile.am U xsrc/external/mit/xcb-proto/dist/xcbgen/matcher.py U xsrc/external/mit/xcb-proto/dist/xcbgen/expr.py U xsrc/external/mit/xcb-proto/dist/xcbgen/state.py U xsrc/external/mit/xcb-proto/dist/xcbgen/__init__.py U xsrc/external/mit/xcb-proto/dist/xcbgen/error.py U xsrc/external/mit/xcb-proto/dist/xcbgen/Makefile.in U xsrc/external/mit/xcb-proto/dist/xcbgen/xtypes.py U xsrc/external/mit/xcb-proto/dist/xcbgen/align.py U xsrc/external/mit/xcb-proto/dist/doc/xml-xcb.txt U xsrc/external/mit/xcb-proto/dist/src/xf86vidmode.xml U xsrc/external/mit/xcb-proto/dist/src/xcb.xsd U xsrc/external/mit/xcb-proto/dist/src/dri3.xml U xsrc/external/mit/xcb-proto/dist/src/Makefile.am U xsrc/external/mit/xcb-proto/dist/src/composite.xml U xsrc/external/mit/xcb-proto/dist/src/record.xml U xsrc/external/mit/xcb-proto/dist/src/screensaver.xml U xsrc/external/mit/xcb-proto/dist/src/xv.xml U xsrc/external/mit/xcb-proto/dist/src/damage.xml U xsrc/external/mit/xcb-proto/dist/src/xkb.xml U xsrc/external/mit/xcb-proto/dist/src/randr.xml U xsrc/external/mit/xcb-proto/dist/src/sync.xml U xsrc/external/mit/xcb-proto/dist/src/shape.xml U xsrc/external/mit/xcb-proto/dist/src/xc_misc.xml U xsrc/external/mit/xcb-proto/dist/src/ge.xml U xsrc/external/mit/xcb-proto/dist/src/glx.xml U xsrc/external/mit/xcb-proto/dist/src/Makefile.in U xsrc/external/mit/xcb-proto/dist/src/present.xml U xsrc/external/mit/xcb-proto/dist/src/xtest.xml U xsrc/external/mit/xcb-proto/dist/src/xselinux.xml U xsrc/external/mit/xcb-proto/dist/src/xf86dri.xml U xsrc/external/mit/xcb-proto/dist/src/render.xml U xsrc/external/mit/xcb-proto/dist/src/xevie.xml U xsrc/external/mit/xcb-proto/dist/src/xfixes.xml U xsrc/external/mit/xcb-proto/dist/src/xinerama.xml U xsrc/external/mit/xcb-proto/dist/src/res.xml U xsrc/external/mit/xcb-proto/dist/src/bigreq.xml U xsrc/external/mit/xcb-proto/dist/src/shm.xml U xsrc/external/mit/xcb-proto/dist/src/xinput.xml U xsrc/external/mit/xcb-proto/dist/src/dri2.xml U xsrc/external/mit/xcb-proto/dist/src/xprint.xml U xsrc/external/mit/xcb-proto/dist/src/dpms.xml U xsrc/external/mit/xcb-proto/dist/src/xproto.xml U xsrc/external/mit/xcb-proto/dist/src/xvmc.xml No conflicts created by this import
CVS commit: src/doc
Module Name:src Committed By: wiz Date: Sun Nov 1 11:06:30 UTC 2020 Modified Files: src/doc: 3RDPARTY Log Message: tmux-3.1c out. To generate a diff of this commit: cvs rdiff -u -r1.1756 -r1.1757 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1756 src/doc/3RDPARTY:1.1757 --- src/doc/3RDPARTY:1.1756 Thu Oct 22 08:26:00 2020 +++ src/doc/3RDPARTY Sun Nov 1 11:06:30 2020 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1756 2020/10/22 08:26:00 kre Exp $ +# $NetBSD: 3RDPARTY,v 1.1757 2020/11/01 11:06:30 wiz Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1370,7 +1370,7 @@ purposes. Package: tmux Version: 3.0a -Current Vers: 3.1b +Current Vers: 3.1c Maintainer: Nicholas Marriott Archive site: https://github.com/tmux/tmux Home page: http://tmux.github.io
CVS commit: src/sys/arch/arm/cortex
Module Name:src
Committed By: jmcneill
Date: Sun Nov 1 11:04:55 UTC 2020
Modified Files:
src/sys/arch/arm/cortex: gicv3.c
Log Message:
gicv3_irq_handler: No need to call gicv3_set_priority if we are already at
the desired ipl.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/arm/cortex/gicv3.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/cortex/gicv3.c
diff -u src/sys/arch/arm/cortex/gicv3.c:1.27 src/sys/arch/arm/cortex/gicv3.c:1.28
--- src/sys/arch/arm/cortex/gicv3.c:1.27 Sun Nov 1 11:03:44 2020
+++ src/sys/arch/arm/cortex/gicv3.c Sun Nov 1 11:04:55 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: gicv3.c,v 1.27 2020/11/01 11:03:44 jmcneill Exp $ */
+/* $NetBSD: gicv3.c,v 1.28 2020/11/01 11:04:55 jmcneill Exp $ */
/*-
* Copyright (c) 2018 Jared McNeill
@@ -31,7 +31,7 @@
#define _INTR_PRIVATE
#include
-__KERNEL_RCSID(0, "$NetBSD: gicv3.c,v 1.27 2020/11/01 11:03:44 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gicv3.c,v 1.28 2020/11/01 11:04:55 jmcneill Exp $");
#include
#include
@@ -723,7 +723,7 @@ gicv3_irq_handler(void *frame)
const int ipl = is->is_ipl;
if (__predict_false(ipl < ci->ci_cpl)) {
pic_do_pending_ints(I32_bit, ipl, frame);
- } else {
+ } else if (ci->ci_cpl != ipl) {
gicv3_set_priority(pic, ipl);
ci->ci_cpl = ipl;
}
CVS commit: src/sys/arch/arm/cortex
Module Name:src
Committed By: jmcneill
Date: Sun Nov 1 11:03:44 UTC 2020
Modified Files:
src/sys/arch/arm/cortex: gicv3.c
Log Message:
gicv3_ipi_send: simplify logic in kcp != NULL case given that we know that
the kcpuset will only ever contain one cpu.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/arm/cortex/gicv3.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/cortex/gicv3.c
diff -u src/sys/arch/arm/cortex/gicv3.c:1.26 src/sys/arch/arm/cortex/gicv3.c:1.27
--- src/sys/arch/arm/cortex/gicv3.c:1.26 Fri Oct 30 18:54:36 2020
+++ src/sys/arch/arm/cortex/gicv3.c Sun Nov 1 11:03:44 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: gicv3.c,v 1.26 2020/10/30 18:54:36 skrll Exp $ */
+/* $NetBSD: gicv3.c,v 1.27 2020/11/01 11:03:44 jmcneill Exp $ */
/*-
* Copyright (c) 2018 Jared McNeill
@@ -31,7 +31,7 @@
#define _INTR_PRIVATE
#include
-__KERNEL_RCSID(0, "$NetBSD: gicv3.c,v 1.26 2020/10/30 18:54:36 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gicv3.c,v 1.27 2020/11/01 11:03:44 jmcneill Exp $");
#include
#include
@@ -419,38 +419,23 @@ gicv3_cpu_init(struct pic_softc *pic, st
static void
gicv3_ipi_send(struct pic_softc *pic, const kcpuset_t *kcp, u_long ipi)
{
- CPU_INFO_ITERATOR cii;
struct cpu_info *ci;
- uint64_t intid, aff, targets;
+ uint64_t sgir;
- intid = __SHIFTIN(ipi, ICC_SGIR_EL1_INTID);
+ sgir = __SHIFTIN(ipi, ICC_SGIR_EL1_INTID);
if (kcp == NULL) {
/* Interrupts routed to all PEs, excluding "self" */
if (ncpu == 1)
return;
- icc_sgi1r_write(intid | ICC_SGIR_EL1_IRM);
+ sgir |= ICC_SGIR_EL1_IRM;
} else {
- /* Interrupts routed to specific PEs */
- aff = 0;
- targets = 0;
- for (CPU_INFO_FOREACH(cii, ci)) {
- if (!kcpuset_isset(kcp, cpu_index(ci)))
-continue;
- if ((ci->ci_gic_sgir & ICC_SGIR_EL1_Aff) != aff) {
-if (targets != 0) {
- icc_sgi1r_write(intid | aff | targets);
- isb();
- targets = 0;
-}
-aff = (ci->ci_gic_sgir & ICC_SGIR_EL1_Aff);
- }
- targets |= (ci->ci_gic_sgir & ICC_SGIR_EL1_TargetList);
- }
- if (targets != 0) {
- icc_sgi1r_write(intid | aff | targets);
- isb();
- }
+ /* Interrupt to exactly one PE */
+ ci = cpu_lookup(kcpuset_ffs(kcp) - 1);
+ if (ci == curcpu())
+ return;
+ sgir |= ci->ci_gic_sgir;
}
+ icc_sgi1r_write(sgir);
}
static void
CVS commit: src/sys/arch/aarch64/aarch64
Module Name:src Committed By: jmcneill Date: Sun Nov 1 10:58:59 UTC 2020 Modified Files: src/sys/arch/aarch64/aarch64: pmap.c Log Message: No need to disable translation table walks in pmap_activate(). To generate a diff of this commit: cvs rdiff -u -r1.93 -r1.94 src/sys/arch/aarch64/aarch64/pmap.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/aarch64/aarch64/pmap.c diff -u src/sys/arch/aarch64/aarch64/pmap.c:1.93 src/sys/arch/aarch64/aarch64/pmap.c:1.94 --- src/sys/arch/aarch64/aarch64/pmap.c:1.93 Thu Oct 22 07:34:18 2020 +++ src/sys/arch/aarch64/aarch64/pmap.c Sun Nov 1 10:58:59 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.93 2020/10/22 07:34:18 skrll Exp $ */ +/* $NetBSD: pmap.c,v 1.94 2020/11/01 10:58:59 jmcneill Exp $ */ /* * Copyright (c) 2017 Ryo Shimizu @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.93 2020/10/22 07:34:18 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.94 2020/11/01 10:58:59 jmcneill Exp $"); #include "opt_arm_debug.h" #include "opt_ddb.h" @@ -1439,11 +1439,6 @@ pmap_activate(struct lwp *l) UVMHIST_LOG(pmaphist, "lwp=%p (pid=%d)", l, l->l_proc->p_pid, 0, 0); - /* Disable translation table walks using TTBR0 */ - tcr = reg_tcr_el1_read(); - reg_tcr_el1_write(tcr | TCR_EPD0); - isb(); - /* XXX: allocate asid, and regenerate if needed */ if (pm->pm_asid == -1) pm->pm_asid = l->l_proc->p_pid;
CVS commit: src/usr.bin/make/unit-tests
Module Name:src
Committed By: rillig
Date: Sun Nov 1 10:56:08 UTC 2020
Modified Files:
src/usr.bin/make/unit-tests: moderrs.exp moderrs.mk
Log Message:
make(1): demonstrate parsing bugs in test moderrs.mk
When a malformed variable expression is parsed, the remaining part of
the expression is passed unmodified to the output. This is unexpected
and wrong.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/usr.bin/make/unit-tests/moderrs.exp
cvs rdiff -u -r1.22 -r1.23 src/usr.bin/make/unit-tests/moderrs.mk
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/unit-tests/moderrs.exp
diff -u src/usr.bin/make/unit-tests/moderrs.exp:1.21 src/usr.bin/make/unit-tests/moderrs.exp:1.22
--- src/usr.bin/make/unit-tests/moderrs.exp:1.21 Sun Nov 1 10:53:58 2020
+++ src/usr.bin/make/unit-tests/moderrs.exp Sun Nov 1 10:56:08 2020
@@ -1,12 +1,12 @@
mod-unknown-direct:
want: Unknown modifier 'Z'
make: Unknown modifier 'Z'
-VAR:Z=
+VAR:Z=before--after
mod-unknown-indirect:
want: Unknown modifier 'Z'
make: Unknown modifier 'Z'
-VAR:Z=
+VAR:Z=before-inner}-after
unclosed-direct:
want: Unclosed variable specification (expecting '}') for "VAR" (value "Thevariable") modifier S
Index: src/usr.bin/make/unit-tests/moderrs.mk
diff -u src/usr.bin/make/unit-tests/moderrs.mk:1.22 src/usr.bin/make/unit-tests/moderrs.mk:1.23
--- src/usr.bin/make/unit-tests/moderrs.mk:1.22 Sun Nov 1 10:53:58 2020
+++ src/usr.bin/make/unit-tests/moderrs.mk Sun Nov 1 10:56:08 2020
@@ -1,4 +1,4 @@
-# $NetBSD: moderrs.mk,v 1.22 2020/11/01 10:53:58 rillig Exp $
+# $NetBSD: moderrs.mk,v 1.23 2020/11/01 10:56:08 rillig Exp $
#
# various modifier error tests
@@ -28,11 +28,11 @@ all: mod-sysv-parse
mod-unknown-direct: print-header print-footer
@echo 'want: Unknown modifier $'Z$''
- @echo "VAR:Z=${VAR:Z}"
+ @echo 'VAR:Z=before-${VAR:Z}-after'
mod-unknown-indirect: print-header print-footer
@echo 'want: Unknown modifier $'Z$''
- @echo "VAR:${MOD_UNKN}=${VAR:${MOD_UNKN}}"
+ @echo 'VAR:${MOD_UNKN}=before-${VAR:${MOD_UNKN}:inner}-after'
unclosed-direct: print-header print-footer
@echo 'want: Unclosed variable specification (expecting $'}$') for "VAR" (value "Thevariable") modifier S'
@@ -124,7 +124,8 @@ mod-regex-delimiter: print-header print-
# syntactical ambiguity since the :S and :C modifiers are open-ended (see
# mod-subst-chain). Luckily the modifier :U does not make sense after :C,
# therefore this case does not happen in practice.
-# The sub-modifier for the :C modifier would have to be chosen wisely.
+# The sub-modifier for the :S and :C modifiers would have to be chosen
+# wisely, to not create ambiguities while parsing.
mod-regex-undefined-subexpression: print-header print-footer
@echo ${FIB:C,1(.*),one\1,} # all ok
@echo ${FIB:C,1(.*)|2(.*),(\1)+(\2),:Q} # no match for subexpression
CVS commit: src/usr.bin/make/unit-tests
Module Name:src
Committed By: rillig
Date: Sun Nov 1 10:53:58 UTC 2020
Modified Files:
src/usr.bin/make/unit-tests: moderrs.exp moderrs.mk
Log Message:
make(1): renumber the tests in moderrs.mk, remove duplicates
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/usr.bin/make/unit-tests/moderrs.exp
cvs rdiff -u -r1.21 -r1.22 src/usr.bin/make/unit-tests/moderrs.mk
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/unit-tests/moderrs.exp
diff -u src/usr.bin/make/unit-tests/moderrs.exp:1.20 src/usr.bin/make/unit-tests/moderrs.exp:1.21
--- src/usr.bin/make/unit-tests/moderrs.exp:1.20 Sun Nov 1 10:52:09 2020
+++ src/usr.bin/make/unit-tests/moderrs.exp Sun Nov 1 10:53:58 2020
@@ -57,59 +57,33 @@ make: Unfinished modifier for ! ('!' mis
mod-subst-delimiter:
make: Missing delimiter for :S modifier
-
-make: Unfinished modifier for VAR (',' missing)
-
-make: Unfinished modifier for VAR (',' missing)
-
-make: Unfinished modifier for VAR (',' missing)
-
-make: Unfinished modifier for VAR (',' missing)
-
-make: Unclosed variable specification (expecting '}') for "VAR" (value "TheVariable") modifier S
-TheVariable
-TheVariable
-make: Missing delimiter for :S modifier
1:
make: Unfinished modifier for VAR (',' missing)
2:
make: Unfinished modifier for VAR (',' missing)
3:
make: Unfinished modifier for VAR (',' missing)
-
+4:
make: Unfinished modifier for VAR (',' missing)
-
+5:
make: Unclosed variable specification (expecting '}') for "VAR" (value "TheVariable") modifier S
-TheVariable
-TheVariable
+6: TheVariable
+7: TheVariable
mod-regex-delimiter:
make: Missing delimiter for :C modifier
-
-make: Unfinished modifier for VAR (',' missing)
-
-make: Unfinished modifier for VAR (',' missing)
-
-make: Unfinished modifier for VAR (',' missing)
-
-make: Unfinished modifier for VAR (',' missing)
-
-make: Unclosed variable specification (expecting '}') for "VAR" (value "TheVariable") modifier C
-TheVariable
-TheVariable
-make: Missing delimiter for :C modifier
1:
make: Unfinished modifier for VAR (',' missing)
2:
make: Unfinished modifier for VAR (',' missing)
3:
make: Unfinished modifier for VAR (',' missing)
-
+4:
make: Unfinished modifier for VAR (',' missing)
-
+5:
make: Unclosed variable specification (expecting '}') for "VAR" (value "TheVariable") modifier C
-TheVariable
-TheVariable
+6: TheVariable
+7: TheVariable
mod-regex-undefined-subexpression:
one one 2 3 5 8 one3 2one 34
Index: src/usr.bin/make/unit-tests/moderrs.mk
diff -u src/usr.bin/make/unit-tests/moderrs.mk:1.21 src/usr.bin/make/unit-tests/moderrs.mk:1.22
--- src/usr.bin/make/unit-tests/moderrs.mk:1.21 Sun Nov 1 10:52:09 2020
+++ src/usr.bin/make/unit-tests/moderrs.mk Sun Nov 1 10:53:58 2020
@@ -1,4 +1,4 @@
-# $NetBSD: moderrs.mk,v 1.21 2020/11/01 10:52:09 rillig Exp $
+# $NetBSD: moderrs.mk,v 1.22 2020/11/01 10:53:58 rillig Exp $
#
# various modifier error tests
@@ -96,36 +96,22 @@ exclam: print-header print-footer
@echo ${!:L:!=exclam}
mod-subst-delimiter: print-header print-footer
- @echo ${VAR:S
- @echo ${VAR:S,
- @echo ${VAR:S,from
- @echo ${VAR:S,from,
- @echo ${VAR:S,from,to
- @echo ${VAR:S,from,to,
- @echo ${VAR:S,from,to,}
@echo 1: ${VAR:S
@echo 2: ${VAR:S,
@echo 3: ${VAR:S,from
- @echo ${VAR:S,from,
- @echo ${VAR:S,from,to
- @echo ${VAR:S,from,to,
- @echo ${VAR:S,from,to,}
+ @echo 4: ${VAR:S,from,
+ @echo 5: ${VAR:S,from,to
+ @echo 6: ${VAR:S,from,to,
+ @echo 7: ${VAR:S,from,to,}
mod-regex-delimiter: print-header print-footer
- @echo ${VAR:C
- @echo ${VAR:C,
- @echo ${VAR:C,from
- @echo ${VAR:C,from,
- @echo ${VAR:C,from,to
- @echo ${VAR:C,from,to,
- @echo ${VAR:C,from,to,}
@echo 1: ${VAR:C
@echo 2: ${VAR:C,
@echo 3: ${VAR:C,from
- @echo ${VAR:C,from,
- @echo ${VAR:C,from,to
- @echo ${VAR:C,from,to,
- @echo ${VAR:C,from,to,}
+ @echo 4: ${VAR:C,from,
+ @echo 5: ${VAR:C,from,to
+ @echo 6: ${VAR:C,from,to,
+ @echo 7: ${VAR:C,from,to,}
# In regular expressions with alternatives, not all capturing groups are
# always set; some may be missing. Warn about these.
CVS commit: src/usr.bin/make/unit-tests
Module Name:src
Committed By: rillig
Date: Sun Nov 1 10:52:09 UTC 2020
Modified Files:
src/usr.bin/make/unit-tests: moderrs.exp moderrs.mk
Log Message:
make(1): make test names in moderrs.mk more descriptive
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/usr.bin/make/unit-tests/moderrs.exp
cvs rdiff -u -r1.20 -r1.21 src/usr.bin/make/unit-tests/moderrs.mk
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/unit-tests/moderrs.exp
diff -u src/usr.bin/make/unit-tests/moderrs.exp:1.19 src/usr.bin/make/unit-tests/moderrs.exp:1.20
--- src/usr.bin/make/unit-tests/moderrs.exp:1.19 Sun Nov 1 10:50:22 2020
+++ src/usr.bin/make/unit-tests/moderrs.exp Sun Nov 1 10:52:09 2020
@@ -1,29 +1,29 @@
-modunkn:
+mod-unknown-direct:
want: Unknown modifier 'Z'
make: Unknown modifier 'Z'
VAR:Z=
-modunknV:
+mod-unknown-indirect:
want: Unknown modifier 'Z'
make: Unknown modifier 'Z'
VAR:Z=
-varterm:
+unclosed-direct:
want: Unclosed variable specification (expecting '}') for "VAR" (value "Thevariable") modifier S
make: Unclosed variable specification (expecting '}') for "VAR" (value "Thevariable") modifier S
VAR:S,V,v,=Thevariable
-vartermV:
+unclosed-indirect:
want: Unclosed variable specification after complex modifier (expecting '}') for VAR
make: Unclosed variable specification after complex modifier (expecting '}') for VAR
VAR:S,V,v,=Thevariable
-modtermV:
+unfinished-indirect:
want: Unfinished modifier for VAR (',' missing)
make: Unfinished modifier for VAR (',' missing)
VAR:S,V,v=
-modloop:
+unfinished-loop:
want: Unfinished modifier for UNDEF ('@' missing)
make: Unfinished modifier for UNDEF ('@' missing)
@@ -32,12 +32,12 @@ make: Unfinished modifier for UNDEF ('@'
1 2 3
-modloop-close:
+loop-close:
make: Unclosed variable specification (expecting '}') for "UNDEF" (value "1}... 2}... 3}...") modifier @
1}... 2}... 3}...
1}... 2}... 3}...
-modwords:
+words:
want: Unfinished modifier for UNDEF (']' missing)
make: Unfinished modifier for UNDEF (']' missing)
@@ -47,7 +47,7 @@ make: Unfinished modifier for UNDEF (']'
13=
12345=ok
-modexclam:
+exclam:
want: Unfinished modifier for VARNAME ('!' missing)
make: Unfinished modifier for VARNAME ('!' missing)
Index: src/usr.bin/make/unit-tests/moderrs.mk
diff -u src/usr.bin/make/unit-tests/moderrs.mk:1.20 src/usr.bin/make/unit-tests/moderrs.mk:1.21
--- src/usr.bin/make/unit-tests/moderrs.mk:1.20 Sun Nov 1 10:50:22 2020
+++ src/usr.bin/make/unit-tests/moderrs.mk Sun Nov 1 10:52:09 2020
@@ -1,4 +1,4 @@
-# $NetBSD: moderrs.mk,v 1.20 2020/11/01 10:50:22 rillig Exp $
+# $NetBSD: moderrs.mk,v 1.21 2020/11/01 10:52:09 rillig Exp $
#
# various modifier error tests
@@ -11,10 +11,12 @@ MOD_S:= ${MOD_TERM},
FIB= 1 1 2 3 5 8 13 21 34
-all: modunkn modunknV varterm vartermV modtermV modloop
-all: modloop-close
-all: modwords
-all: modexclam
+all: mod-unknown-direct mod-unknown-indirect
+all: unclosed-direct unclosed-indirect
+all: unfinished-indirect unfinished-loop
+all: loop-close
+all: words
+all: exclam
all: mod-subst-delimiter
all: mod-regex-delimiter
all: mod-regex-undefined-subexpression
@@ -24,27 +26,27 @@ all: mod-ifelse-parse
all: mod-remember-parse
all: mod-sysv-parse
-modunkn: print-header print-footer
+mod-unknown-direct: print-header print-footer
@echo 'want: Unknown modifier $'Z$''
@echo "VAR:Z=${VAR:Z}"
-modunknV: print-header print-footer
+mod-unknown-indirect: print-header print-footer
@echo 'want: Unknown modifier $'Z$''
@echo "VAR:${MOD_UNKN}=${VAR:${MOD_UNKN}}"
-varterm: print-header print-footer
+unclosed-direct: print-header print-footer
@echo 'want: Unclosed variable specification (expecting $'}$') for "VAR" (value "Thevariable") modifier S'
@echo VAR:S,V,v,=${VAR:S,V,v,
-vartermV: print-header print-footer
+unclosed-indirect: print-header print-footer
@echo 'want: Unclosed variable specification after complex modifier (expecting $'}$') for VAR'
@echo VAR:${MOD_TERM},=${VAR:${MOD_S}
-modtermV: print-header print-footer
+unfinished-indirect: print-header print-footer
@echo 'want: Unfinished modifier for VAR ($',$' missing)'
-@echo "VAR:${MOD_TERM}=${VAR:${MOD_TERM}}"
-modloop: print-header print-footer
+unfinished-loop: print-header print-footer
@echo 'want: Unfinished modifier for UNDEF ($'@$' missing)'
@echo ${UNDEF:U1 2 3:@var}
@echo 'want: Unfinished modifier for UNDEF ($'@$' missing)'
@@ -57,11 +59,11 @@ modloop: print-header print-footer
# braces must be balanced.
# This is also contrary to the SysV modifier, where only the actually
# used delimiter (either braces or parentheses) must be balanced.
-modloop-close: print-header print-footer
+loop-close: print-header print-footer
@echo ${UNDEF:U1 2 3:@var@${var}}...@
@echo ${UNDEF:U1 2 3:@var@${var}}...@}
-modwords: print-header print-footer
+words:
CVS commit: src/usr.bin/make/unit-tests
Module Name:src
Committed By: rillig
Date: Sun Nov 1 10:50:22 UTC 2020
Modified Files:
src/usr.bin/make/unit-tests: moderrs.exp moderrs.mk
Log Message:
make(1): precisely describe the expected output in the test moderrs.mk
By making "want:" the same length as "make:", the remaining text in
these lines can be compared easily.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/usr.bin/make/unit-tests/moderrs.exp
cvs rdiff -u -r1.19 -r1.20 src/usr.bin/make/unit-tests/moderrs.mk
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/unit-tests/moderrs.exp
diff -u src/usr.bin/make/unit-tests/moderrs.exp:1.18 src/usr.bin/make/unit-tests/moderrs.exp:1.19
--- src/usr.bin/make/unit-tests/moderrs.exp:1.18 Sun Nov 1 10:46:34 2020
+++ src/usr.bin/make/unit-tests/moderrs.exp Sun Nov 1 10:50:22 2020
@@ -1,32 +1,33 @@
modunkn:
-Expect: Unknown modifier 'Z'
+want: Unknown modifier 'Z'
make: Unknown modifier 'Z'
VAR:Z=
modunknV:
-Expect: Unknown modifier 'Z'
+want: Unknown modifier 'Z'
make: Unknown modifier 'Z'
VAR:Z=
varterm:
-Expect: Unclosed variable specification for VAR
+want: Unclosed variable specification (expecting '}') for "VAR" (value "Thevariable") modifier S
make: Unclosed variable specification (expecting '}') for "VAR" (value "Thevariable") modifier S
VAR:S,V,v,=Thevariable
vartermV:
-Expect: Unclosed variable specification for VAR
+want: Unclosed variable specification after complex modifier (expecting '}') for VAR
make: Unclosed variable specification after complex modifier (expecting '}') for VAR
VAR:S,V,v,=Thevariable
modtermV:
-Expect: Unfinished modifier for VAR (',' missing)
+want: Unfinished modifier for VAR (',' missing)
make: Unfinished modifier for VAR (',' missing)
VAR:S,V,v=
modloop:
-Expect: 2 errors about missing @ delimiter
+want: Unfinished modifier for UNDEF ('@' missing)
make: Unfinished modifier for UNDEF ('@' missing)
+want: Unfinished modifier for UNDEF ('@' missing)
make: Unfinished modifier for UNDEF ('@' missing)
1 2 3
@@ -37,18 +38,20 @@ make: Unclosed variable specification (e
1}... 2}... 3}...
modwords:
-Expect: 2 errors about missing ] delimiter
+want: Unfinished modifier for UNDEF (']' missing)
make: Unfinished modifier for UNDEF (']' missing)
+want: Unfinished modifier for UNDEF (']' missing)
make: Unfinished modifier for UNDEF (']' missing)
13=
12345=ok
modexclam:
-Expect: 2 errors about missing ! delimiter
+want: Unfinished modifier for VARNAME ('!' missing)
make: Unfinished modifier for VARNAME ('!' missing)
+want: Unfinished modifier for ! ('!' missing)
make: Unfinished modifier for ! ('!' missing)
Index: src/usr.bin/make/unit-tests/moderrs.mk
diff -u src/usr.bin/make/unit-tests/moderrs.mk:1.19 src/usr.bin/make/unit-tests/moderrs.mk:1.20
--- src/usr.bin/make/unit-tests/moderrs.mk:1.19 Sun Nov 1 10:46:34 2020
+++ src/usr.bin/make/unit-tests/moderrs.mk Sun Nov 1 10:50:22 2020
@@ -1,7 +1,8 @@
-# $NetBSD: moderrs.mk,v 1.19 2020/11/01 10:46:34 rillig Exp $
+# $NetBSD: moderrs.mk,v 1.20 2020/11/01 10:50:22 rillig Exp $
#
# various modifier error tests
+'= '\''
VAR= TheVariable
# in case we have to change it ;-)
MOD_UNKN= Z
@@ -24,28 +25,29 @@ all: mod-remember-parse
all: mod-sysv-parse
modunkn: print-header print-footer
- @echo "Expect: Unknown modifier 'Z'"
+ @echo 'want: Unknown modifier $'Z$''
@echo "VAR:Z=${VAR:Z}"
modunknV: print-header print-footer
- @echo "Expect: Unknown modifier 'Z'"
+ @echo 'want: Unknown modifier $'Z$''
@echo "VAR:${MOD_UNKN}=${VAR:${MOD_UNKN}}"
varterm: print-header print-footer
- @echo "Expect: Unclosed variable specification for VAR"
+ @echo 'want: Unclosed variable specification (expecting $'}$') for "VAR" (value "Thevariable") modifier S'
@echo VAR:S,V,v,=${VAR:S,V,v,
vartermV: print-header print-footer
- @echo "Expect: Unclosed variable specification for VAR"
+ @echo 'want: Unclosed variable specification after complex modifier (expecting $'}$') for VAR'
@echo VAR:${MOD_TERM},=${VAR:${MOD_S}
modtermV: print-header print-footer
- @echo "Expect: Unfinished modifier for VAR (',' missing)"
+ @echo 'want: Unfinished modifier for VAR ($',$' missing)'
-@echo "VAR:${MOD_TERM}=${VAR:${MOD_TERM}}"
modloop: print-header print-footer
- @echo "Expect: 2 errors about missing @ delimiter"
+ @echo 'want: Unfinished modifier for UNDEF ($'@$' missing)'
@echo ${UNDEF:U1 2 3:@var}
+ @echo 'want: Unfinished modifier for UNDEF ($'@$' missing)'
@echo ${UNDEF:U1 2 3:@var@...}
@echo ${UNDEF:U1 2 3:@var@${var}@}
@@ -60,8 +62,9 @@ modloop-close: print-header print-footer
@echo ${UNDEF:U1 2 3:@var@${var}}...@}
modwords: print-header print-footer
- @echo "Expect: 2 errors about missing ] delimiter"
+ @echo 'want: Unfinished modifier for UNDEF ($']$' missing)'
@echo ${UNDEF:U1 2 3:[}
+ @echo 'want: Unfinished modifier
CVS commit: src/usr.bin/make/unit-tests
Module Name:src
Committed By: rillig
Date: Sun Nov 1 10:46:34 UTC 2020
Modified Files:
src/usr.bin/make/unit-tests: moderrs.exp moderrs.mk
Log Message:
make(1): separate sections of moderrs.mk with empty lines
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/usr.bin/make/unit-tests/moderrs.exp
cvs rdiff -u -r1.18 -r1.19 src/usr.bin/make/unit-tests/moderrs.mk
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/unit-tests/moderrs.exp
diff -u src/usr.bin/make/unit-tests/moderrs.exp:1.17 src/usr.bin/make/unit-tests/moderrs.exp:1.18
--- src/usr.bin/make/unit-tests/moderrs.exp:1.17 Sun Nov 1 10:12:38 2020
+++ src/usr.bin/make/unit-tests/moderrs.exp Sun Nov 1 10:46:34 2020
@@ -2,22 +2,27 @@ modunkn:
Expect: Unknown modifier 'Z'
make: Unknown modifier 'Z'
VAR:Z=
+
modunknV:
Expect: Unknown modifier 'Z'
make: Unknown modifier 'Z'
VAR:Z=
+
varterm:
Expect: Unclosed variable specification for VAR
make: Unclosed variable specification (expecting '}') for "VAR" (value "Thevariable") modifier S
VAR:S,V,v,=Thevariable
+
vartermV:
Expect: Unclosed variable specification for VAR
make: Unclosed variable specification after complex modifier (expecting '}') for VAR
VAR:S,V,v,=Thevariable
+
modtermV:
Expect: Unfinished modifier for VAR (',' missing)
make: Unfinished modifier for VAR (',' missing)
VAR:S,V,v=
+
modloop:
Expect: 2 errors about missing @ delimiter
make: Unfinished modifier for UNDEF ('@' missing)
@@ -25,10 +30,12 @@ make: Unfinished modifier for UNDEF ('@'
make: Unfinished modifier for UNDEF ('@' missing)
1 2 3
+
modloop-close:
make: Unclosed variable specification (expecting '}') for "UNDEF" (value "1}... 2}... 3}...") modifier @
1}... 2}... 3}...
1}... 2}... 3}...
+
modwords:
Expect: 2 errors about missing ] delimiter
make: Unfinished modifier for UNDEF (']' missing)
@@ -37,12 +44,14 @@ make: Unfinished modifier for UNDEF (']'
13=
12345=ok
+
modexclam:
Expect: 2 errors about missing ! delimiter
make: Unfinished modifier for VARNAME ('!' missing)
make: Unfinished modifier for ! ('!' missing)
+
mod-subst-delimiter:
make: Missing delimiter for :S modifier
@@ -70,6 +79,7 @@ make: Unfinished modifier for VAR (',' m
make: Unclosed variable specification (expecting '}') for "VAR" (value "TheVariable") modifier S
TheVariable
TheVariable
+
mod-regex-delimiter:
make: Missing delimiter for :C modifier
@@ -97,6 +107,7 @@ make: Unfinished modifier for VAR (',' m
make: Unclosed variable specification (expecting '}') for "VAR" (value "TheVariable") modifier C
TheVariable
TheVariable
+
mod-regex-undefined-subexpression:
one one 2 3 5 8 one3 2one 34
make: No match for subexpression \2
@@ -105,6 +116,7 @@ make: No match for subexpression \1
make: No match for subexpression \2
make: No match for subexpression \1
()+() ()+() ()+() 3 5 8 (3)+() ()+(1) 34
+
mod-ts-parse:
112358132134
15152535558513521534
@@ -112,6 +124,7 @@ make: Bad modifier `:ts\65oct' for FIB
65oct}
make: Bad modifier `:tsxy' for FIB
xy}
+
mod-t-parse:
make: Bad modifier `:t' for FIB
@@ -121,6 +134,7 @@ make: Bad modifier `:t' for FIB
make: Bad modifier `:t' for FIB
M*}
+
mod-ifelse-parse:
make: Unfinished modifier for FIB (':' missing)
@@ -131,10 +145,12 @@ make: Unfinished modifier for FIB ('}' m
make: Unfinished modifier for FIB ('}' missing)
then
+
mod-remember-parse:
1 1 2 3 5 8 13 21 34
make: Unknown modifier '_'
+
mod-sysv-parse:
make: Unknown modifier '3'
make: Unclosed variable specification (expecting '}') for "FIB" (value "") modifier 3
@@ -146,4 +162,5 @@ make: Unknown modifier '3'
make: Unclosed variable specification (expecting '}') for "FIB" (value "") modifier 3
1 1 2 x3 5 8 1x3 21 34
+
exit status 0
Index: src/usr.bin/make/unit-tests/moderrs.mk
diff -u src/usr.bin/make/unit-tests/moderrs.mk:1.18 src/usr.bin/make/unit-tests/moderrs.mk:1.19
--- src/usr.bin/make/unit-tests/moderrs.mk:1.18 Sun Nov 1 10:12:38 2020
+++ src/usr.bin/make/unit-tests/moderrs.mk Sun Nov 1 10:46:34 2020
@@ -1,4 +1,4 @@
-# $NetBSD: moderrs.mk,v 1.18 2020/11/01 10:12:38 rillig Exp $
+# $NetBSD: moderrs.mk,v 1.19 2020/11/01 10:46:34 rillig Exp $
#
# various modifier error tests
@@ -23,27 +23,27 @@ all: mod-ifelse-parse
all: mod-remember-parse
all: mod-sysv-parse
-modunkn: print-name
+modunkn: print-header print-footer
@echo "Expect: Unknown modifier 'Z'"
@echo "VAR:Z=${VAR:Z}"
-modunknV: print-name
+modunknV: print-header print-footer
@echo "Expect: Unknown modifier 'Z'"
@echo "VAR:${MOD_UNKN}=${VAR:${MOD_UNKN}}"
-varterm: print-name
+varterm: print-header print-footer
@echo "Expect: Unclosed variable specification for VAR"
@echo VAR:S,V,v,=${VAR:S,V,v,
-vartermV: print-name
+vartermV: print-header print-footer
@echo "Expect: Unclosed variable specification for VAR"
@echo
CVS commit: xsrc/external/mit
Module Name:xsrc
Committed By: mrg
Date: Sun Nov 1 10:24:51 UTC 2020
Modified Files:
xsrc/external/mit/fonttosfnt/dist: struct.c
Removed Files:
xsrc/external/mit/font-alias/dist: README
Log Message:
merge font-alias 1.0.4 and fonttosfnt 1.2.0.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/font-alias/dist/README
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/fonttosfnt/dist/struct.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/fonttosfnt/dist/struct.c
diff -u xsrc/external/mit/fonttosfnt/dist/struct.c:1.3 xsrc/external/mit/fonttosfnt/dist/struct.c:1.4
--- xsrc/external/mit/fonttosfnt/dist/struct.c:1.3 Sun Dec 30 08:51:05 2018
+++ xsrc/external/mit/fonttosfnt/dist/struct.c Sun Nov 1 10:24:51 2020
@@ -42,8 +42,32 @@ makeFont(void)
font->weight = 500;
font->width = 5;
font->italicAngle = 0;
-font->underlinePosition = - TWO_SIXTEENTH;
-font->underlineThickness = TWO_SIXTEENTH;
+font->pxMetrics.height = UNDEF;
+font->pxMetrics.maxX = UNDEF;
+font->pxMetrics.minX = UNDEF;
+font->pxMetrics.maxY = UNDEF;
+font->pxMetrics.minY = UNDEF;
+font->pxMetrics.xHeight = UNDEF;
+font->pxMetrics.capHeight = UNDEF;
+font->pxMetrics.maxAwidth = UNDEF;
+font->pxMetrics.awidth = UNDEF;
+font->pxMetrics.ascent = UNDEF;
+font->pxMetrics.descent = UNDEF;
+font->pxMetrics.underlinePosition = UNDEF;
+font->pxMetrics.underlineThickness = UNDEF;
+font->metrics.height = UNDEF;
+font->metrics.maxX = UNDEF;
+font->metrics.minX = UNDEF;
+font->metrics.maxY = UNDEF;
+font->metrics.minY = UNDEF;
+font->metrics.xHeight = UNDEF;
+font->metrics.capHeight = UNDEF;
+font->metrics.maxAwidth = UNDEF;
+font->metrics.awidth = UNDEF;
+font->metrics.ascent = UNDEF;
+font->metrics.descent = UNDEF;
+font->metrics.underlinePosition = UNDEF;
+font->metrics.underlineThickness = UNDEF;
font->foundry = makeName("UNKN");
font->strikes = NULL;
return font;
@@ -401,19 +425,12 @@ strikeBitmapIndex(StrikePtr strike, Cmap
return STRIKE_BITMAP(strike, code);
}
-void
-strikeMetrics(StrikePtr strike,
- int *width_max_return,
- int *x_min_return, int *y_min_return,
- int *x_max_return, int *y_max_return)
+int
+strikeMaxWidth(StrikePtr strike)
{
BitmapPtr bitmap;
int i;
int width_max = 0;
-int x_min = 1;
-int y_min = 1;
-int x_max = -1;
-int y_max = -1;
for(i = 0; i < FONT_CODES; i++) {
bitmap = STRIKE_BITMAP(strike, i);
@@ -421,21 +438,9 @@ strikeMetrics(StrikePtr strike,
continue;
if(bitmap->advanceWidth > width_max)
width_max = bitmap->advanceWidth;
-if(bitmap->horiBearingX < x_min)
-x_min = bitmap->horiBearingX;
-if(bitmap->horiBearingY > y_max)
-y_max = bitmap->horiBearingY;
-if(bitmap->horiBearingX + bitmap->width > x_max)
-x_max = bitmap->horiBearingX + bitmap->width;
-if(bitmap->horiBearingY - bitmap->height < y_min)
-y_min = bitmap->horiBearingY - bitmap->height;
}
-if(width_max_return) *width_max_return = width_max;
-if(x_min_return) *x_min_return = x_min;
-if(y_min_return) *y_min_return = y_min;
-if(x_max_return) *x_max_return = x_max;
-if(y_max_return) *y_max_return = y_max;
+return width_max;
}
int
@@ -453,7 +458,7 @@ glyphMetrics(FontPtr font, int code,
if(bitmap) {
if(width_return)
*width_return =
-(((float)bitmap->advanceWidth + 0.5) / strike->sizeX) *
+(((float)bitmap->advanceWidth) / strike->sizeX) *
TWO_SIXTEENTH;
if(x_min_return)
*x_min_return =
@@ -463,17 +468,13 @@ glyphMetrics(FontPtr font, int code,
*y_min_return =
(((float)bitmap->horiBearingY - bitmap->height)
/ strike->sizeY) * TWO_SIXTEENTH;
-/* For the following two, 0.9 instead of 0.5 might make
- more sense. However, using different rounding rules
- for x_max and awidth causes problems for detecting
- charcell fonts. */
if(x_max_return)
*x_max_return =
-(((float)bitmap->horiBearingX + bitmap->width + 0.5)
+(((float)bitmap->horiBearingX + bitmap->width)
/ strike->sizeX) * TWO_SIXTEENTH;
if(y_max_return)
*y_max_return =
-(((float)bitmap->horiBearingY + 0.5) / strike->sizeY) *
+(((float)bitmap->horiBearingY) / strike->sizeY) *
TWO_SIXTEENTH;
return 1;
}
@@ -482,33 +483,3 @@
CVS import: xsrc/external/mit/font-alias/dist
Module Name:xsrc Committed By: mrg Date: Sun Nov 1 10:23:17 UTC 2020 Update of /cvsroot/xsrc/external/mit/font-alias/dist In directory ivanova.netbsd.org:/tmp/cvs-serv24596 Log Message: initial import of font-alias-1.0.4 Status: Vendor Tag: xorg Release Tags: font-alias-1-0-4 U xsrc/external/mit/font-alias/dist/config.sub U xsrc/external/mit/font-alias/dist/configure U xsrc/external/mit/font-alias/dist/config.guess N xsrc/external/mit/font-alias/dist/README.md U xsrc/external/mit/font-alias/dist/INSTALL U xsrc/external/mit/font-alias/dist/ChangeLog U xsrc/external/mit/font-alias/dist/Makefile.am U xsrc/external/mit/font-alias/dist/COPYING N xsrc/external/mit/font-alias/dist/compile U xsrc/external/mit/font-alias/dist/aclocal.m4 U xsrc/external/mit/font-alias/dist/install-sh U xsrc/external/mit/font-alias/dist/Makefile.in U xsrc/external/mit/font-alias/dist/missing U xsrc/external/mit/font-alias/dist/configure.ac U xsrc/external/mit/font-alias/dist/cyrillic/Makefile.in U xsrc/external/mit/font-alias/dist/cyrillic/Makefile.am U xsrc/external/mit/font-alias/dist/cyrillic/fonts.alias U xsrc/external/mit/font-alias/dist/100dpi/fonts.alias U xsrc/external/mit/font-alias/dist/100dpi/Makefile.am U xsrc/external/mit/font-alias/dist/100dpi/Makefile.in U xsrc/external/mit/font-alias/dist/misc/Makefile.in U xsrc/external/mit/font-alias/dist/misc/fonts.alias U xsrc/external/mit/font-alias/dist/misc/Makefile.am U xsrc/external/mit/font-alias/dist/75dpi/Makefile.in U xsrc/external/mit/font-alias/dist/75dpi/fonts.alias U xsrc/external/mit/font-alias/dist/75dpi/Makefile.am No conflicts created by this import
CVS import: xsrc/external/mit/fonttosfnt/dist
Module Name:xsrc Committed By: mrg Date: Sun Nov 1 10:23:19 UTC 2020 Update of /cvsroot/xsrc/external/mit/fonttosfnt/dist In directory ivanova.netbsd.org:/tmp/cvs-serv18739 Log Message: initial import of fonttosfnt-1.2.0 Status: Vendor Tag: xorg Release Tags: fonttosfnt-1-2-0 U xsrc/external/mit/fonttosfnt/dist/configure U xsrc/external/mit/fonttosfnt/dist/config.sub U xsrc/external/mit/fonttosfnt/dist/configure.ac U xsrc/external/mit/fonttosfnt/dist/fonttosfnt.c U xsrc/external/mit/fonttosfnt/dist/env.c C xsrc/external/mit/fonttosfnt/dist/struct.c U xsrc/external/mit/fonttosfnt/dist/util.c U xsrc/external/mit/fonttosfnt/dist/ChangeLog U xsrc/external/mit/fonttosfnt/dist/README.md U xsrc/external/mit/fonttosfnt/dist/aclocal.m4 U xsrc/external/mit/fonttosfnt/dist/Makefile.in U xsrc/external/mit/fonttosfnt/dist/fonttosfnt.h U xsrc/external/mit/fonttosfnt/dist/COPYING U xsrc/external/mit/fonttosfnt/dist/config.guess U xsrc/external/mit/fonttosfnt/dist/install-sh U xsrc/external/mit/fonttosfnt/dist/missing U xsrc/external/mit/fonttosfnt/dist/Makefile.am U xsrc/external/mit/fonttosfnt/dist/depcomp U xsrc/external/mit/fonttosfnt/dist/INSTALL U xsrc/external/mit/fonttosfnt/dist/compile U xsrc/external/mit/fonttosfnt/dist/read.c U xsrc/external/mit/fonttosfnt/dist/write.c U xsrc/external/mit/fonttosfnt/dist/config.h.in U xsrc/external/mit/fonttosfnt/dist/man/fonttosfnt.man U xsrc/external/mit/fonttosfnt/dist/man/Makefile.in U xsrc/external/mit/fonttosfnt/dist/man/Makefile.am 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/fonttosfnt/dist
CVS commit: src/usr.bin/make/unit-tests
Module Name:src
Committed By: rillig
Date: Sun Nov 1 10:12:38 UTC 2020
Modified Files:
src/usr.bin/make/unit-tests: moderrs.exp moderrs.mk
Log Message:
make(1): add section headings to the test moderrs.mk
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/usr.bin/make/unit-tests/moderrs.exp
cvs rdiff -u -r1.17 -r1.18 src/usr.bin/make/unit-tests/moderrs.mk
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/unit-tests/moderrs.exp
diff -u src/usr.bin/make/unit-tests/moderrs.exp:1.16 src/usr.bin/make/unit-tests/moderrs.exp:1.17
--- src/usr.bin/make/unit-tests/moderrs.exp:1.16 Tue Aug 25 20:49:40 2020
+++ src/usr.bin/make/unit-tests/moderrs.exp Sun Nov 1 10:12:38 2020
@@ -1,18 +1,24 @@
+modunkn:
Expect: Unknown modifier 'Z'
make: Unknown modifier 'Z'
VAR:Z=
+modunknV:
Expect: Unknown modifier 'Z'
make: Unknown modifier 'Z'
VAR:Z=
+varterm:
Expect: Unclosed variable specification for VAR
make: Unclosed variable specification (expecting '}') for "VAR" (value "Thevariable") modifier S
VAR:S,V,v,=Thevariable
+vartermV:
Expect: Unclosed variable specification for VAR
make: Unclosed variable specification after complex modifier (expecting '}') for VAR
VAR:S,V,v,=Thevariable
+modtermV:
Expect: Unfinished modifier for VAR (',' missing)
make: Unfinished modifier for VAR (',' missing)
VAR:S,V,v=
+modloop:
Expect: 2 errors about missing @ delimiter
make: Unfinished modifier for UNDEF ('@' missing)
@@ -23,6 +29,7 @@ modloop-close:
make: Unclosed variable specification (expecting '}') for "UNDEF" (value "1}... 2}... 3}...") modifier @
1}... 2}... 3}...
1}... 2}... 3}...
+modwords:
Expect: 2 errors about missing ] delimiter
make: Unfinished modifier for UNDEF (']' missing)
@@ -30,6 +37,7 @@ make: Unfinished modifier for UNDEF (']'
13=
12345=ok
+modexclam:
Expect: 2 errors about missing ! delimiter
make: Unfinished modifier for VARNAME ('!' missing)
Index: src/usr.bin/make/unit-tests/moderrs.mk
diff -u src/usr.bin/make/unit-tests/moderrs.mk:1.17 src/usr.bin/make/unit-tests/moderrs.mk:1.18
--- src/usr.bin/make/unit-tests/moderrs.mk:1.17 Sat Oct 24 08:50:17 2020
+++ src/usr.bin/make/unit-tests/moderrs.mk Sun Nov 1 10:12:38 2020
@@ -1,9 +1,9 @@
-# $NetBSD: moderrs.mk,v 1.17 2020/10/24 08:50:17 rillig Exp $
+# $NetBSD: moderrs.mk,v 1.18 2020/11/01 10:12:38 rillig Exp $
#
# various modifier error tests
VAR= TheVariable
-# incase we have to change it ;-)
+# in case we have to change it ;-)
MOD_UNKN= Z
MOD_TERM= S,V,v
MOD_S:= ${MOD_TERM},
@@ -23,27 +23,27 @@ all: mod-ifelse-parse
all: mod-remember-parse
all: mod-sysv-parse
-modunkn:
+modunkn: print-name
@echo "Expect: Unknown modifier 'Z'"
@echo "VAR:Z=${VAR:Z}"
-modunknV:
+modunknV: print-name
@echo "Expect: Unknown modifier 'Z'"
@echo "VAR:${MOD_UNKN}=${VAR:${MOD_UNKN}}"
-varterm:
+varterm: print-name
@echo "Expect: Unclosed variable specification for VAR"
@echo VAR:S,V,v,=${VAR:S,V,v,
-vartermV:
+vartermV: print-name
@echo "Expect: Unclosed variable specification for VAR"
@echo VAR:${MOD_TERM},=${VAR:${MOD_S}
-modtermV:
+modtermV: print-name
@echo "Expect: Unfinished modifier for VAR (',' missing)"
-@echo "VAR:${MOD_TERM}=${VAR:${MOD_TERM}}"
-modloop:
+modloop: print-name
@echo "Expect: 2 errors about missing @ delimiter"
@echo ${UNDEF:U1 2 3:@var}
@echo ${UNDEF:U1 2 3:@var@...}
@@ -55,12 +55,11 @@ modloop:
# braces must be balanced.
# This is also contrary to the SysV modifier, where only the actually
# used delimiter (either braces or parentheses) must be balanced.
-modloop-close:
- @echo $@:
+modloop-close: print-name
@echo ${UNDEF:U1 2 3:@var@${var}}...@
@echo ${UNDEF:U1 2 3:@var@${var}}...@}
-modwords:
+modwords: print-name
@echo "Expect: 2 errors about missing ] delimiter"
@echo ${UNDEF:U1 2 3:[}
@echo ${UNDEF:U1 2 3:[#}
@@ -81,7 +80,7 @@ modwords:
# which is empty.
@echo 12345=${UNDEF:U1 2 3:[123451234512345123451234512345]:S,^$,ok,:S,^3$,ok,}
-modexclam:
+modexclam: print-name
@echo "Expect: 2 errors about missing ! delimiter"
@echo ${VARNAME:!echo}
# When the final exclamation mark is missing, there is no
@@ -90,8 +89,7 @@ modexclam:
# and the above would have produced an "Unknown modifier '!'".
@echo ${!:L:!=exclam}
-mod-subst-delimiter:
- @echo $@:
+mod-subst-delimiter: print-name
@echo ${VAR:S
@echo ${VAR:S,
@echo ${VAR:S,from
@@ -107,8 +105,7 @@ mod-subst-delimiter:
@echo ${VAR:S,from,to,
@echo ${VAR:S,from,to,}
-mod-regex-delimiter:
- @echo $@:
+mod-regex-delimiter: print-name
@echo ${VAR:C
@echo ${VAR:C,
@echo ${VAR:C,from
@@ -136,41 +133,38 @@ mod-regex-delimiter:
# mod-subst-chain). Luckily the modifier :U does not make sense after :C,
# therefore this case does not happen in practice.
# The sub-modifier for the :C modifier would have to be chosen wisely.
CVS commit: xsrc/external/mit/libdrm/dist
Module Name:xsrc Committed By: mrg Date: Sun Nov 1 10:01:30 UTC 2020 Modified Files: xsrc/external/mit/libdrm/dist: util_math.h xf86drm.c Log Message: fix build cornflakes from libdrm 2.4.102. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/libdrm/dist/util_math.h cvs rdiff -u -r1.26 -r1.27 xsrc/external/mit/libdrm/dist/xf86drm.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/libdrm/dist/util_math.h diff -u xsrc/external/mit/libdrm/dist/util_math.h:1.2 xsrc/external/mit/libdrm/dist/util_math.h:1.3 --- xsrc/external/mit/libdrm/dist/util_math.h:1.2 Sun Jan 21 21:49:51 2018 +++ xsrc/external/mit/libdrm/dist/util_math.h Sun Nov 1 10:01:30 2020 @@ -29,6 +29,7 @@ #define MAX3( A, B, C ) ((A) > (B) ? MAX2(A, C) : MAX2(B, C)) #define __align_mask(value, mask) (((value) + (mask)) & ~(mask)) +#undef ALIGN #define ALIGN(value, alignment)__align_mask(value, (__typeof__(value))((alignment) - 1)) #endif /*_UTIL_MATH_H_*/ Index: xsrc/external/mit/libdrm/dist/xf86drm.c diff -u xsrc/external/mit/libdrm/dist/xf86drm.c:1.26 xsrc/external/mit/libdrm/dist/xf86drm.c:1.27 --- xsrc/external/mit/libdrm/dist/xf86drm.c:1.26 Sun Nov 1 09:57:37 2020 +++ xsrc/external/mit/libdrm/dist/xf86drm.c Sun Nov 1 10:01:30 2020 @@ -3132,7 +3132,7 @@ static int drmParseSubsystemType(int maj int ret; /* Get the type of device we're looking for to pick the right pathname. */ -type = drmGetMinorType(min); +type = drmGetMinorType(maj, min); if (type == -1) return -ENODEV; @@ -3302,7 +3302,7 @@ static int drmParsePciBusInfo(int maj, i int ret; /* Get the type of device we're looking for to pick the right pathname. */ -type = drmGetMinorType(min); +type = drmGetMinorType(maj, min); if (type == -1) return -ENODEV;
CVS commit: xsrc/external/mit/libdrm/dist
Module Name:xsrc Committed By: mrg Date: Sun Nov 1 09:57:41 UTC 2020 Modified Files: xsrc/external/mit/libdrm/dist: xf86atomic.h xf86drm.c xf86drm.h xf86drmMode.c xf86drmMode.h xsrc/external/mit/libdrm/dist/include/drm: drm.h xsrc/external/mit/libdrm/dist/intel: intel_bufmgr_gem.c xsrc/external/mit/libdrm/dist/tests/modetest: modetest.c Added Files: xsrc/external/mit/libdrm/dist: Android.mk xsrc/external/mit/libdrm/dist/freedreno: Android.mk xsrc/external/mit/libdrm/dist/intel: Android.mk xsrc/external/mit/libdrm/dist/libkms: Android.mk xsrc/external/mit/libdrm/dist/nouveau: Android.mk xsrc/external/mit/libdrm/dist/radeon: Android.mk xsrc/external/mit/libdrm/dist/tests/modetest: Android.mk Removed Files: xsrc/external/mit/libdrm/dist: Makefile.am Makefile.in aclocal.m4 config.h.in configure configure.ac xsrc/external/mit/libdrm/dist/amdgpu: Makefile.am Makefile.in amdgpu-symbol-check xsrc/external/mit/libdrm/dist/build-aux: compile config.guess config.sub depcomp install-sh ltmain.sh missing test-driver xsrc/external/mit/libdrm/dist/data: Makefile.am Makefile.in xsrc/external/mit/libdrm/dist/etnaviv: Makefile.am Makefile.in etnaviv-symbol-check xsrc/external/mit/libdrm/dist/exynos: Makefile.am Makefile.in exynos-symbol-check xsrc/external/mit/libdrm/dist/freedreno: Makefile.am Makefile.in freedreno-symbol-check xsrc/external/mit/libdrm/dist/intel: Makefile.am Makefile.in intel-symbol-check xsrc/external/mit/libdrm/dist/intel/tests: gen4-3d.batch.sh gen5-3d.batch.sh gen6-3d.batch.sh gen7-2d-copy.batch.sh gen7-3d.batch.sh gm45-3d.batch.sh xsrc/external/mit/libdrm/dist/libkms: Makefile.am Makefile.in kms-symbol-check xsrc/external/mit/libdrm/dist/m4: libtool.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 lt~obsolete.m4 xsrc/external/mit/libdrm/dist/man: Makefile.am Makefile.in xsrc/external/mit/libdrm/dist/nouveau: Makefile.am Makefile.in nouveau-symbol-check xsrc/external/mit/libdrm/dist/omap: Makefile.am Makefile.in omap-symbol-check xsrc/external/mit/libdrm/dist/radeon: Makefile.am Makefile.in radeon-symbol-check xsrc/external/mit/libdrm/dist/tegra: Makefile.am Makefile.in tegra-symbol-check xsrc/external/mit/libdrm/dist/tests: Makefile.am Makefile.in random.c xsrc/external/mit/libdrm/dist/tests/amdgpu: Makefile.am Makefile.in xsrc/external/mit/libdrm/dist/tests/etnaviv: Makefile.am Makefile.in xsrc/external/mit/libdrm/dist/tests/exynos: Makefile.am Makefile.in xsrc/external/mit/libdrm/dist/tests/kms: Makefile.am Makefile.in xsrc/external/mit/libdrm/dist/tests/kmstest: Makefile.am Makefile.in xsrc/external/mit/libdrm/dist/tests/modeprint: Makefile.am Makefile.in xsrc/external/mit/libdrm/dist/tests/modetest: Makefile.am Makefile.in xsrc/external/mit/libdrm/dist/tests/nouveau: Makefile.am Makefile.in xsrc/external/mit/libdrm/dist/tests/proptest: Makefile.am Makefile.in xsrc/external/mit/libdrm/dist/tests/radeon: Makefile.am Makefile.in xsrc/external/mit/libdrm/dist/tests/tegra: Makefile.am Makefile.in xsrc/external/mit/libdrm/dist/tests/util: Makefile.am Makefile.in xsrc/external/mit/libdrm/dist/tests/vbltest: Makefile.am Makefile.in xsrc/external/mit/libdrm/dist/vc4: Makefile.am Makefile.in Log Message: merge libdrm 2.4.102. To generate a diff of this commit: cvs rdiff -u -r0 -r1.3 xsrc/external/mit/libdrm/dist/Android.mk cvs rdiff -u -r1.1.1.12 -r0 xsrc/external/mit/libdrm/dist/Makefile.am cvs rdiff -u -r1.1.1.15 -r0 xsrc/external/mit/libdrm/dist/Makefile.in cvs rdiff -u -r1.1.1.16 -r0 xsrc/external/mit/libdrm/dist/aclocal.m4 cvs rdiff -u -r1.1.1.10 -r0 xsrc/external/mit/libdrm/dist/config.h.in cvs rdiff -u -r1.1.1.19 -r0 xsrc/external/mit/libdrm/dist/configure \ xsrc/external/mit/libdrm/dist/configure.ac cvs rdiff -u -r1.13 -r1.14 xsrc/external/mit/libdrm/dist/xf86atomic.h cvs rdiff -u -r1.25 -r1.26 xsrc/external/mit/libdrm/dist/xf86drm.c cvs rdiff -u -r1.11 -r1.12 xsrc/external/mit/libdrm/dist/xf86drm.h cvs rdiff -u -r1.15 -r1.16 xsrc/external/mit/libdrm/dist/xf86drmMode.c cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/libdrm/dist/xf86drmMode.h cvs rdiff -u -r1.1.1.4 -r0 xsrc/external/mit/libdrm/dist/amdgpu/Makefile.am cvs rdiff -u -r1.1.1.6 -r0 xsrc/external/mit/libdrm/dist/amdgpu/Makefile.in cvs rdiff -u -r1.1.1.8 -r0 \ xsrc/external/mit/libdrm/dist/amdgpu/amdgpu-symbol-check cvs rdiff -u -r1.1.1.5 -r0 xsrc/external/mit/libdrm/dist/build-aux/compile \ xsrc/external/mit/libdrm/dist/build-aux/depcomp \ xsrc/external/mit/libdrm/dist/build-aux/ltmain.sh cvs
CVS import: xsrc/external/mit/libdrm/dist
Module Name:xsrc Committed By: mrg Date: Sun Nov 1 09:51:27 UTC 2020 Update of /cvsroot/xsrc/external/mit/libdrm/dist In directory ivanova.netbsd.org:/tmp/cvs-serv4782 Log Message: initial import of libdrm-2.4.102 Status: Vendor Tag: xorg Release Tags: libdrm-2-4-102 N xsrc/external/mit/libdrm/dist/.editorconfig N xsrc/external/mit/libdrm/dist/Android.common.mk C xsrc/external/mit/libdrm/dist/Android.mk N xsrc/external/mit/libdrm/dist/CONTRIBUTING.rst N xsrc/external/mit/libdrm/dist/CleanSpec.mk U xsrc/external/mit/libdrm/dist/Makefile.sources N xsrc/external/mit/libdrm/dist/README.rst N xsrc/external/mit/libdrm/dist/RELEASING N xsrc/external/mit/libdrm/dist/core-symbols.txt U xsrc/external/mit/libdrm/dist/libdrm.pc.in U xsrc/external/mit/libdrm/dist/libdrm_lists.h U xsrc/external/mit/libdrm/dist/libdrm_macros.h U xsrc/external/mit/libdrm/dist/libsync.h U xsrc/external/mit/libdrm/dist/meson.build U xsrc/external/mit/libdrm/dist/meson_options.txt N xsrc/external/mit/libdrm/dist/symbols-check.py U xsrc/external/mit/libdrm/dist/util_double_list.h U xsrc/external/mit/libdrm/dist/util_math.h C xsrc/external/mit/libdrm/dist/xf86atomic.h C xsrc/external/mit/libdrm/dist/xf86drm.c C xsrc/external/mit/libdrm/dist/xf86drm.h U xsrc/external/mit/libdrm/dist/xf86drmHash.c U xsrc/external/mit/libdrm/dist/xf86drmHash.h C xsrc/external/mit/libdrm/dist/xf86drmMode.c C xsrc/external/mit/libdrm/dist/xf86drmMode.h U xsrc/external/mit/libdrm/dist/xf86drmRandom.c U xsrc/external/mit/libdrm/dist/xf86drmRandom.h U xsrc/external/mit/libdrm/dist/xf86drmSL.c N xsrc/external/mit/libdrm/dist/amdgpu/.editorconfig N xsrc/external/mit/libdrm/dist/amdgpu/Android.mk U xsrc/external/mit/libdrm/dist/amdgpu/Makefile.sources N xsrc/external/mit/libdrm/dist/amdgpu/amdgpu-symbols.txt U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu.h U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_asic_id.c U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_bo.c U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_cs.c U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_device.c U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_gpu_info.c U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_internal.h U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_vamgr.c U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_vm.c U xsrc/external/mit/libdrm/dist/amdgpu/handle_table.c U xsrc/external/mit/libdrm/dist/amdgpu/handle_table.h U xsrc/external/mit/libdrm/dist/amdgpu/libdrm_amdgpu.pc.in U xsrc/external/mit/libdrm/dist/amdgpu/meson.build N xsrc/external/mit/libdrm/dist/android/gralloc_handle.h N xsrc/external/mit/libdrm/dist/data/Android.mk U xsrc/external/mit/libdrm/dist/data/amdgpu.ids U xsrc/external/mit/libdrm/dist/data/meson.build N xsrc/external/mit/libdrm/dist/etnaviv/Android.mk U xsrc/external/mit/libdrm/dist/etnaviv/Makefile.sources N xsrc/external/mit/libdrm/dist/etnaviv/etnaviv-symbols.txt U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_bo.c U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_bo_cache.c U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_cmd_stream.c U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_device.c U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_drm.h U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_drmif.h U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_gpu.c U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_perfmon.c U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_pipe.c U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_priv.h U xsrc/external/mit/libdrm/dist/etnaviv/libdrm_etnaviv.pc.in U xsrc/external/mit/libdrm/dist/etnaviv/meson.build N xsrc/external/mit/libdrm/dist/exynos/exynos-symbols.txt U xsrc/external/mit/libdrm/dist/exynos/exynos_drm.c U xsrc/external/mit/libdrm/dist/exynos/exynos_drm.h U xsrc/external/mit/libdrm/dist/exynos/exynos_drmif.h U xsrc/external/mit/libdrm/dist/exynos/exynos_fimg2d.c U xsrc/external/mit/libdrm/dist/exynos/exynos_fimg2d.h U xsrc/external/mit/libdrm/dist/exynos/fimg2d_reg.h U xsrc/external/mit/libdrm/dist/exynos/libdrm_exynos.pc.in U xsrc/external/mit/libdrm/dist/exynos/meson.build C xsrc/external/mit/libdrm/dist/freedreno/Android.mk U xsrc/external/mit/libdrm/dist/freedreno/Makefile.sources N xsrc/external/mit/libdrm/dist/freedreno/freedreno-symbols.txt U xsrc/external/mit/libdrm/dist/freedreno/freedreno_bo.c U xsrc/external/mit/libdrm/dist/freedreno/freedreno_bo_cache.c U xsrc/external/mit/libdrm/dist/freedreno/freedreno_device.c U xsrc/external/mit/libdrm/dist/freedreno/freedreno_drmif.h U xsrc/external/mit/libdrm/dist/freedreno/freedreno_pipe.c U xsrc/external/mit/libdrm/dist/freedreno/freedreno_priv.h U xsrc/external/mit/libdrm/dist/freedreno/freedreno_ringbuffer.c U xsrc/external/mit/libdrm/dist/freedreno/freedreno_ringbuffer.h U xsrc/external/mit/libdrm/dist/freedreno/libdrm_freedreno.pc.in U xsrc/external/mit/libdrm/dist/freedreno/meson.build N xsrc/external/mit/libdrm/dist/freedreno/kgsl/README U xsrc/external/mit/libdrm/dist/freedreno/kgsl/kgsl_bo.c U
CVS commit: src/share/man/man4
Module Name:src Committed By: khorben Date: Sun Nov 1 06:19:47 UTC 2020 Modified Files: src/share/man/man4: u3g.4 Log Message: u3g(4): also list the Huawei EM770W as supported To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/share/man/man4/u3g.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/u3g.4 diff -u src/share/man/man4/u3g.4:1.9 src/share/man/man4/u3g.4:1.10 --- src/share/man/man4/u3g.4:1.9 Sun Oct 8 03:39:50 2017 +++ src/share/man/man4/u3g.4 Sun Nov 1 06:19:47 2020 @@ -1,4 +1,4 @@ -.\" $NetBSD: u3g.4,v 1.9 2017/10/08 03:39:50 sevan Exp $ +.\" $NetBSD: u3g.4,v 1.10 2020/11/01 06:19:47 khorben Exp $ .\" .\" Copyright (c) 2008 AnyWi Technologies .\" All rights reserved. @@ -60,6 +60,8 @@ Huawei E171 .It Huawei E220 (E270?) .It +Huawei EM770W +.It Huawei Mobile .It Novatel MC950D
