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/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.
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: 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.
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: 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.
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 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.
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: 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.
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.
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.
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 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/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.
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.
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 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.
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/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.
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.
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.
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.
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/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.
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/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.
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
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.
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/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.
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/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.
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/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.
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
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.
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: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.
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/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.
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.
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.
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.
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.
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/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.
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
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.
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.
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/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.
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: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.
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/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.
Re: CVS commit: src/sys
On Sun, 1 Nov 2020, Paul Goyette wrote: 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 !!! Of course, this should be "Welcome to 9.99.75" :) ++--+---+ | Paul Goyette | PGP Key fingerprint: | E-mail addresses: | | (Retired) | FA29 0E3B 35AF E8AE 6651 | p...@whooppee.com | | Software Developer | 0786 F758 55DE 53BA 7731 | pgoye...@netbsd.org | ++--+---+
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/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.
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.
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: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.
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/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.
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: 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.
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/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.
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-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/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.
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: [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/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.
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/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.
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.
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: 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.
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/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.
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.
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.
