CVS commit: src/usr.bin/xlint/lint1
Module Name:src
Committed By: christos
Date: Sat Feb 20 01:18:03 UTC 2021
Modified Files:
src/usr.bin/xlint/lint1: ckgetopt.c
Log Message:
Prevent crashing when options are NULL in libc while linting
src/lib/libc/posix1e/acl_from_text.c
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/xlint/lint1/ckgetopt.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/xlint/lint1/ckgetopt.c
diff -u src/usr.bin/xlint/lint1/ckgetopt.c:1.2 src/usr.bin/xlint/lint1/ckgetopt.c:1.3
--- src/usr.bin/xlint/lint1/ckgetopt.c:1.2 Fri Feb 19 09:44:29 2021
+++ src/usr.bin/xlint/lint1/ckgetopt.c Fri Feb 19 20:18:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ckgetopt.c,v 1.2 2021/02/19 14:44:29 rillig Exp $ */
+/* $NetBSD: ckgetopt.c,v 1.3 2021/02/20 01:18:02 christos Exp $ */
/*-
* Copyright (c) 2021 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: ckgetopt.c,v 1.2 2021/02/19 14:44:29 rillig Exp $");
+__RCSID("$NetBSD: ckgetopt.c,v 1.3 2021/02/20 01:18:02 christos Exp $");
#endif
#include
@@ -100,7 +100,7 @@ is_getopt_call(const tnode_t *tn, char *
static void
check_unlisted_option(char opt)
{
- if (opt == '?')
+ if (opt == '?' || ck.options == NULL)
return;
const char *optptr = strchr(ck.options, opt);
@@ -116,6 +116,9 @@ check_unlisted_option(char opt)
static void
check_unhandled_option(void)
{
+ if (ck.unhandled_options == NULL)
+ return;
+
for (const char *opt = ck.unhandled_options; *opt != '\0'; opt++) {
if (*opt == ' ' || *opt == ':')
continue;
CVS commit: src/usr.bin/xlint/lint1
Module Name:src Committed By: christos Date: Sat Feb 20 01:18:03 UTC 2021 Modified Files: src/usr.bin/xlint/lint1: ckgetopt.c Log Message: Prevent crashing when options are NULL in libc while linting src/lib/libc/posix1e/acl_from_text.c To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/usr.bin/xlint/lint1/ckgetopt.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mpl/dhcp
Module Name:src Committed By: christos Date: Sat Feb 20 01:43:04 UTC 2021 Modified Files: src/external/mpl/dhcp: Makefile.inc Log Message: libisc needs libssl now To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/external/mpl/dhcp/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mpl/dhcp
Module Name:src
Committed By: christos
Date: Sat Feb 20 01:43:04 UTC 2021
Modified Files:
src/external/mpl/dhcp: Makefile.inc
Log Message:
libisc needs libssl now
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/mpl/dhcp/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mpl/dhcp/Makefile.inc
diff -u src/external/mpl/dhcp/Makefile.inc:1.8 src/external/mpl/dhcp/Makefile.inc:1.9
--- src/external/mpl/dhcp/Makefile.inc:1.8 Sat May 30 16:47:59 2020
+++ src/external/mpl/dhcp/Makefile.inc Fri Feb 19 20:43:04 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.8 2020/05/30 20:47:59 christos Exp $
+# $NetBSD: Makefile.inc,v 1.9 2021/02/20 01:43:04 christos Exp $
WARNS?= 1 # XXX -Wshadow -Wcast-qual -Wsign-compare
@@ -54,8 +54,8 @@ DPADD+= ${LIBKRB5_DPADD} ${LIBHEIMNTLM}
.if defined(PROG) && ${PROG} == "dhclient" && ${MKSANITIZER:Uno} != "yes"
LDADD+=-Wl,-Bdynamic
.endif
-LDADD+= -lcrypto -lipsec -lcrypt
-DPADD+= ${LIBCRYPTO} ${LIBIPSEC} ${LIBCRYPT}
+LDADD+= -lssl -lcrypto -lipsec -lcrypt
+DPADD+= ${LIBSSL} ${LIBCRYPTO} ${LIBIPSEC} ${LIBCRYPT}
.if defined(PROG) && ${PROG} == "dhclient" && ${MKSANITIZER:Uno} != "yes"
LDADD+=-Wl,-Bdynamic
.endif
CVS commit: src/sys/arch/powerpc/powerpc
Module Name:src
Committed By: thorpej
Date: Sat Feb 20 01:57:54 UTC 2021
Modified Files:
src/sys/arch/powerpc/powerpc: ofw_machdep.c
Log Message:
Query real-mode? at startup and cache the result.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/powerpc/powerpc/ofw_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/powerpc/powerpc/ofw_machdep.c
diff -u src/sys/arch/powerpc/powerpc/ofw_machdep.c:1.28 src/sys/arch/powerpc/powerpc/ofw_machdep.c:1.29
--- src/sys/arch/powerpc/powerpc/ofw_machdep.c:1.28 Fri Feb 19 05:21:39 2021
+++ src/sys/arch/powerpc/powerpc/ofw_machdep.c Sat Feb 20 01:57:54 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ofw_machdep.c,v 1.28 2021/02/19 05:21:39 thorpej Exp $ */
+/* $NetBSD: ofw_machdep.c,v 1.29 2021/02/20 01:57:54 thorpej Exp $ */
/*-
* Copyright (c) 2007, 2021 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ofw_machdep.c,v 1.28 2021/02/19 05:21:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofw_machdep.c,v 1.29 2021/02/20 01:57:54 thorpej Exp $");
#include
#include
@@ -91,6 +91,8 @@ __KERNEL_RCSID(0, "$NetBSD: ofw_machdep.
int ofw_root;
int ofw_chosen;
+bool ofw_real_mode;
+
/*
* Bootstrap console support functions.
*/
@@ -411,6 +413,21 @@ ofw_bootstrap_get_translations(void)
}
}
+static bool
+ofw_option_truefalse(const char *prop, int proplen)
+{
+ /* These are all supposed to be strings. */
+ switch (prop[0]) {
+ case 'y':
+ case 'Y':
+ case 't':
+ case 'T':
+ case '1':
+ return true;
+ }
+ return false;
+}
+
/*
* Called from ofwinit() very early in bootstrap. We are still
* running on the stack provided by OpenFirmware and in the same
@@ -421,6 +438,9 @@ ofw_bootstrap_get_translations(void)
void
ofw_bootstrap(void)
{
+ char prop[32];
+ int handle, proplen;
+
/* Stash the handles for "/" and "/chosen" for convenience later. */
ofw_root = OF_finddevice("/");
ofw_chosen = OF_finddevice("/chosen");
@@ -428,6 +448,19 @@ ofw_bootstrap(void)
/* Initialize the early bootstrap console. */
ofw_bootstrap_console();
+ /* Check to see if we're running in real-mode. */
+ handle = OF_finddevice("/options");
+ if (handle != -1) {
+ proplen = OF_getprop(handle, "real-mode?", prop, sizeof(prop));
+ if (proplen > 0) {
+ ofw_real_mode = ofw_option_truefalse(prop, proplen);
+ } else {
+ ofw_real_mode = false;
+ }
+ }
+ aprint_normal("OpenFirmware running in %s-mode\n",
+ ofw_real_mode ? "real" : "virtual");
+
/* Get #address-cells and #size-cells to fething memory info. */
if (OF_getprop(ofw_root, "#address-cells", _address_cells,
sizeof(ofw_address_cells)) <= 0)
CVS commit: src/sys/arch/powerpc/powerpc
Module Name:src Committed By: thorpej Date: Sat Feb 20 01:57:54 UTC 2021 Modified Files: src/sys/arch/powerpc/powerpc: ofw_machdep.c Log Message: Query real-mode? at startup and cache the result. To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/sys/arch/powerpc/powerpc/ofw_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/binutils/dist/ld/emulparams
Module Name:src Committed By: simonb Date: Sat Feb 20 02:47:21 UTC 2021 Modified Files: src/external/gpl3/binutils/dist/ld/emulparams: elf32bmip.sh elf32bmipn32-defs.sh Log Message: Revert the MIPS __eprol change. Unintended fallout that doesn't appear easy to fix so far. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl3/binutils/dist/ld/emulparams/elf32bmip.sh cvs rdiff -u -r1.8 -r1.9 \ src/external/gpl3/binutils/dist/ld/emulparams/elf32bmipn32-defs.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/binutils/dist/ld/emulparams
Module Name:src
Committed By: simonb
Date: Sat Feb 20 02:47:21 UTC 2021
Modified Files:
src/external/gpl3/binutils/dist/ld/emulparams: elf32bmip.sh
elf32bmipn32-defs.sh
Log Message:
Revert the MIPS __eprol change. Unintended fallout that doesn't appear
easy to fix so far.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/binutils/dist/ld/emulparams/elf32bmip.sh
cvs rdiff -u -r1.8 -r1.9 \
src/external/gpl3/binutils/dist/ld/emulparams/elf32bmipn32-defs.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/binutils/dist/ld/emulparams/elf32bmip.sh
diff -u src/external/gpl3/binutils/dist/ld/emulparams/elf32bmip.sh:1.2 src/external/gpl3/binutils/dist/ld/emulparams/elf32bmip.sh:1.3
--- src/external/gpl3/binutils/dist/ld/emulparams/elf32bmip.sh:1.2 Fri Feb 19 03:42:02 2021
+++ src/external/gpl3/binutils/dist/ld/emulparams/elf32bmip.sh Sat Feb 20 02:47:21 2021
@@ -56,7 +56,7 @@ OTHER_SDATA_SECTIONS="
.lit8 ${RELOCATING-0} : { *(.lit8) }
.lit4 ${RELOCATING-0} : { *(.lit4) }
"
-TEXT_START_SYMBOLS="PROVIDE_HIDDEN (__eprol = .); ${CREATE_SHLIB+PROVIDE (}_ftext = .${CREATE_SHLIB+)}"
+TEXT_START_SYMBOLS="${CREATE_SHLIB+PROVIDE (}_ftext = .${CREATE_SHLIB+)};"
DATA_START_SYMBOLS="${CREATE_SHLIB+PROVIDE (}_fdata = .${CREATE_SHLIB+)};"
OTHER_BSS_SYMBOLS="${CREATE_SHLIB+PROVIDE (}_fbss = .${CREATE_SHLIB+)};"
OTHER_SECTIONS="
Index: src/external/gpl3/binutils/dist/ld/emulparams/elf32bmipn32-defs.sh
diff -u src/external/gpl3/binutils/dist/ld/emulparams/elf32bmipn32-defs.sh:1.8 src/external/gpl3/binutils/dist/ld/emulparams/elf32bmipn32-defs.sh:1.9
--- src/external/gpl3/binutils/dist/ld/emulparams/elf32bmipn32-defs.sh:1.8 Fri Feb 19 03:42:02 2021
+++ src/external/gpl3/binutils/dist/ld/emulparams/elf32bmipn32-defs.sh Sat Feb 20 02:47:21 2021
@@ -78,7 +78,7 @@ OTHER_SDATA_SECTIONS="
"
# Magic symbols.
-TEXT_START_SYMBOLS="PROVIDE_HIDDEN (__eprol = .); ${CREATE_SHLIB+PROVIDE (}_ftext = .${CREATE_SHLIB+)};"
+TEXT_START_SYMBOLS="${CREATE_SHLIB+PROVIDE (}_ftext = .${CREATE_SHLIB+)};"
DATA_START_SYMBOLS="${CREATE_SHLIB+PROVIDE (}_fdata = .${CREATE_SHLIB+)};"
OTHER_BSS_SYMBOLS="${CREATE_SHLIB+PROVIDE (}_fbss = .${CREATE_SHLIB+)};"
CVS commit: src/crypto/external/bsd/openssl/dist
Module Name:src Committed By: christos Date: Sat Feb 20 03:22:14 UTC 2021 Modified Files: src/crypto/external/bsd/openssl/dist: CHANGES Configure NEWS README src/crypto/external/bsd/openssl/dist/apps: ca.c src/crypto/external/bsd/openssl/dist/crypto: armcap.c ppccap.c src/crypto/external/bsd/openssl/dist/crypto/conf: conf_def.c src/crypto/external/bsd/openssl/dist/crypto/evp: evp_enc.c src/crypto/external/bsd/openssl/dist/crypto/x509: x509_vfy.c src/crypto/external/bsd/openssl/dist/ssl: d1_lib.c src/crypto/external/bsd/openssl/dist/test: rsa_test.c Log Message: merge conflicts To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/crypto/external/bsd/openssl/dist/CHANGES \ src/crypto/external/bsd/openssl/dist/NEWS \ src/crypto/external/bsd/openssl/dist/README cvs rdiff -u -r1.27 -r1.28 src/crypto/external/bsd/openssl/dist/Configure cvs rdiff -u -r1.20 -r1.21 src/crypto/external/bsd/openssl/dist/apps/ca.c cvs rdiff -u -r1.12 -r1.13 \ src/crypto/external/bsd/openssl/dist/crypto/armcap.c cvs rdiff -u -r1.18 -r1.19 \ src/crypto/external/bsd/openssl/dist/crypto/ppccap.c cvs rdiff -u -r1.12 -r1.13 \ src/crypto/external/bsd/openssl/dist/crypto/conf/conf_def.c cvs rdiff -u -r1.11 -r1.12 \ src/crypto/external/bsd/openssl/dist/crypto/evp/evp_enc.c cvs rdiff -u -r1.21 -r1.22 \ src/crypto/external/bsd/openssl/dist/crypto/x509/x509_vfy.c cvs rdiff -u -r1.10 -r1.11 src/crypto/external/bsd/openssl/dist/ssl/d1_lib.c cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/openssl/dist/test/rsa_test.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/openssl/dist/CHANGES diff -u src/crypto/external/bsd/openssl/dist/CHANGES:1.25 src/crypto/external/bsd/openssl/dist/CHANGES:1.26 --- src/crypto/external/bsd/openssl/dist/CHANGES:1.25 Wed Dec 9 19:33:08 2020 +++ src/crypto/external/bsd/openssl/dist/CHANGES Fri Feb 19 22:22:13 2021 @@ -7,6 +7,43 @@ https://github.com/openssl/openssl/commits/ and pick the appropriate release branch. + Changes between 1.1.1i and 1.1.1j [16 Feb 2021] + + *) Fixed the X509_issuer_and_serial_hash() function. It attempts to + create a unique hash value based on the issuer and serial number data + contained within an X509 certificate. However it was failing to correctly + handle any errors that may occur while parsing the issuer field (which might + occur if the issuer field is maliciously constructed). This may subsequently + result in a NULL pointer deref and a crash leading to a potential denial of + service attack. + (CVE-2021-23841) + [Matt Caswell] + + *) Fixed the RSA_padding_check_SSLv23() function and the RSA_SSLV23_PADDING + padding mode to correctly check for rollback attacks. This is considered a + bug in OpenSSL 1.1.1 because it does not support SSLv2. In 1.0.2 this is + CVE-2021-23839. + [Matt Caswell] + + *) Fixed the EVP_CipherUpdate, EVP_EncryptUpdate and EVP_DecryptUpdate + functions. Previously they could overflow the output length argument in some + cases where the input length is close to the maximum permissable length for + an integer on the platform. In such cases the return value from the function + call would be 1 (indicating success), but the output length value would be + negative. This could cause applications to behave incorrectly or crash. + (CVE-2021-23840) + [Matt Caswell] + + *) Fixed SRP_Calc_client_key so that it runs in constant time. The previous + implementation called BN_mod_exp without setting BN_FLG_CONSTTIME. This + could be exploited in a side channel attack to recover the password. Since + the attack is local host only this is outside of the current OpenSSL + threat model and therefore no CVE is assigned. + + Thanks to Mohammed Sabt and Daniel De Almeida Braga for reporting this + issue. + [Matt Caswell] + Changes between 1.1.1h and 1.1.1i [8 Dec 2020] *) Fixed NULL pointer deref in the GENERAL_NAME_cmp function Index: src/crypto/external/bsd/openssl/dist/NEWS diff -u src/crypto/external/bsd/openssl/dist/NEWS:1.25 src/crypto/external/bsd/openssl/dist/NEWS:1.26 --- src/crypto/external/bsd/openssl/dist/NEWS:1.25 Wed Dec 9 19:33:08 2020 +++ src/crypto/external/bsd/openssl/dist/NEWS Fri Feb 19 22:22:13 2021 @@ -5,6 +5,16 @@ This file gives a brief overview of the major changes between each OpenSSL release. For more details please read the CHANGES file. + Major changes between OpenSSL 1.1.1i and OpenSSL 1.1.1j [16 Feb 2021] + + o Fixed a NULL pointer deref in the X509_issuer_and_serial_hash() +function (CVE-2021-23841) + o Fixed the RSA_padding_check_SSLv23() function and the RSA_SSLV23_PADDING +padding mode to correctly check for rollback attacks + o Fixed an overflow in the
CVS commit: src/crypto/external/bsd/openssl/dist
Module Name:src Committed By: christos Date: Sat Feb 20 03:22:14 UTC 2021 Modified Files: src/crypto/external/bsd/openssl/dist: CHANGES Configure NEWS README src/crypto/external/bsd/openssl/dist/apps: ca.c src/crypto/external/bsd/openssl/dist/crypto: armcap.c ppccap.c src/crypto/external/bsd/openssl/dist/crypto/conf: conf_def.c src/crypto/external/bsd/openssl/dist/crypto/evp: evp_enc.c src/crypto/external/bsd/openssl/dist/crypto/x509: x509_vfy.c src/crypto/external/bsd/openssl/dist/ssl: d1_lib.c src/crypto/external/bsd/openssl/dist/test: rsa_test.c Log Message: merge conflicts To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/crypto/external/bsd/openssl/dist/CHANGES \ src/crypto/external/bsd/openssl/dist/NEWS \ src/crypto/external/bsd/openssl/dist/README cvs rdiff -u -r1.27 -r1.28 src/crypto/external/bsd/openssl/dist/Configure cvs rdiff -u -r1.20 -r1.21 src/crypto/external/bsd/openssl/dist/apps/ca.c cvs rdiff -u -r1.12 -r1.13 \ src/crypto/external/bsd/openssl/dist/crypto/armcap.c cvs rdiff -u -r1.18 -r1.19 \ src/crypto/external/bsd/openssl/dist/crypto/ppccap.c cvs rdiff -u -r1.12 -r1.13 \ src/crypto/external/bsd/openssl/dist/crypto/conf/conf_def.c cvs rdiff -u -r1.11 -r1.12 \ src/crypto/external/bsd/openssl/dist/crypto/evp/evp_enc.c cvs rdiff -u -r1.21 -r1.22 \ src/crypto/external/bsd/openssl/dist/crypto/x509/x509_vfy.c cvs rdiff -u -r1.10 -r1.11 src/crypto/external/bsd/openssl/dist/ssl/d1_lib.c cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/openssl/dist/test/rsa_test.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: Sat Feb 20 03:25:36 UTC 2021 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new OpenSSL To generate a diff of this commit: cvs rdiff -u -r1.1778 -r1.1779 src/doc/3RDPARTY cvs rdiff -u -r1.2780 -r1.2781 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/doc
Module Name:src Committed By: christos Date: Sat Feb 20 03:25:36 UTC 2021 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new OpenSSL To generate a diff of this commit: cvs rdiff -u -r1.1778 -r1.1779 src/doc/3RDPARTY cvs rdiff -u -r1.2780 -r1.2781 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.1778 src/doc/3RDPARTY:1.1779 --- src/doc/3RDPARTY:1.1778 Fri Feb 19 12:09:35 2021 +++ src/doc/3RDPARTY Fri Feb 19 22:25:35 2021 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1778 2021/02/19 17:09:35 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.1779 2021/02/20 03:25:35 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1113,12 +1113,12 @@ markus is very cooperative about it): - adjust the DEFAULT_PKCS11_WHITELIST for ssh-agent Package: OpenSSL -Version: 1.0.2o/1.1.1i -Current Vers: 1.0.2t/1.1.1i +Version: 1.0.2o/1.1.1j +Current Vers: 1.0.2t/1.1.1j Maintainer: The OpenSSL Project Archive Site: ftp://ftp.openssl.org/source/ Home Page: http://www.openssl.org/ -Date: 2020-06-13 +Date: 2021-02-19 Mailing List: openssl-annou...@openssl.org Responsible: christos, mjf, tls, riastradh, spz License: OpenSSL and SSLeay license (both BSD-like) Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2780 src/doc/CHANGES:1.2781 --- src/doc/CHANGES:1.2780 Fri Feb 19 12:08:22 2021 +++ src/doc/CHANGES Fri Feb 19 22:25:36 2021 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2780 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2781 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -333,3 +333,4 @@ Changes from NetBSD 9.0 to NetBSD 10.0: x68k: Add Emulate3Buttons support to X68k Xorg based monolithic server. [tsutsui 20210207] bind: Import version 9.16.12. [christos 20210219] + OpenSSL: Imported 1.1.1j. [christos 20210219]
CVS commit: src/sys
Module Name:src
Committed By: christos
Date: Fri Feb 19 14:52:00 UTC 2021
Modified Files:
src/sys/net: if_arp.h if_bridge.c
src/sys/netinet: if_arp.c in_l2tp.c ip_flow.c ip_input.c ip_private.h
tcp_input.c tcp_private.h udp_private.h udp_usrreq.c
src/sys/netinet6: icmp6.c in6_l2tp.c ip6_flow.c ip6_input.c
ip6_private.h udp6_usrreq.c
src/sys/sys: mbuf.h param.h
Log Message:
- Make ALIGNED_POINTER use __alignof(t) instead of sizeof(t). This is more
correct because it works with non-primitive types and provides the ABI
alignment for the type the compiler will use.
- Remove all the *_HDR_ALIGNMENT macros and asserts
- Replace POINTER_ALIGNED_P with ACCESSIBLE_POINTER which is identical to
ALIGNED_POINTER, but returns that the pointer is always aligned if the
CPU supports unaligned accesses.
[ as proposed in tech-kern ]
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/sys/net/if_arp.h
cvs rdiff -u -r1.178 -r1.179 src/sys/net/if_bridge.c
cvs rdiff -u -r1.306 -r1.307 src/sys/netinet/if_arp.c
cvs rdiff -u -r1.19 -r1.20 src/sys/netinet/in_l2tp.c
cvs rdiff -u -r1.84 -r1.85 src/sys/netinet/ip_flow.c
cvs rdiff -u -r1.398 -r1.399 src/sys/netinet/ip_input.c
cvs rdiff -u -r1.5 -r1.6 src/sys/netinet/ip_private.h \
src/sys/netinet/tcp_private.h src/sys/netinet/udp_private.h
cvs rdiff -u -r1.425 -r1.426 src/sys/netinet/tcp_input.c
cvs rdiff -u -r1.260 -r1.261 src/sys/netinet/udp_usrreq.c
cvs rdiff -u -r1.249 -r1.250 src/sys/netinet6/icmp6.c
cvs rdiff -u -r1.20 -r1.21 src/sys/netinet6/in6_l2tp.c
cvs rdiff -u -r1.41 -r1.42 src/sys/netinet6/ip6_flow.c
cvs rdiff -u -r1.223 -r1.224 src/sys/netinet6/ip6_input.c
cvs rdiff -u -r1.5 -r1.6 src/sys/netinet6/ip6_private.h
cvs rdiff -u -r1.149 -r1.150 src/sys/netinet6/udp6_usrreq.c
cvs rdiff -u -r1.231 -r1.232 src/sys/sys/mbuf.h
cvs rdiff -u -r1.689 -r1.690 src/sys/sys/param.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/net/if_arp.h
diff -u src/sys/net/if_arp.h:1.42 src/sys/net/if_arp.h:1.43
--- src/sys/net/if_arp.h:1.42 Wed Feb 17 17:32:04 2021
+++ src/sys/net/if_arp.h Fri Feb 19 09:51:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: if_arp.h,v 1.42 2021/02/17 22:32:04 christos Exp $ */
+/* $NetBSD: if_arp.h,v 1.43 2021/02/19 14:51:59 christos Exp $ */
/*
* Copyright (c) 1986, 1993
@@ -72,8 +72,6 @@ struct arphdr {
uint8_t ar_tpa[]; /* target protocol address */
#endif
};
-#define ARP_HDR_ALIGNMENT __alignof(struct arphdr)
-__CTASSERT(ARP_HDR_ALIGNMENT == 2);
static __inline uint8_t *
ar_data(struct arphdr *ap)
Index: src/sys/net/if_bridge.c
diff -u src/sys/net/if_bridge.c:1.178 src/sys/net/if_bridge.c:1.179
--- src/sys/net/if_bridge.c:1.178 Sun Feb 14 15:58:34 2021
+++ src/sys/net/if_bridge.c Fri Feb 19 09:51:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bridge.c,v 1.178 2021/02/14 20:58:34 christos Exp $ */
+/* $NetBSD: if_bridge.c,v 1.179 2021/02/19 14:51:59 christos Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -80,7 +80,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_bridge.c,v 1.178 2021/02/14 20:58:34 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bridge.c,v 1.179 2021/02/19 14:51:59 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -2806,7 +2806,7 @@ bridge_ip_checkbasic(struct mbuf **mp)
if (*mp == NULL)
return -1;
- if (m_get_aligned_hdr(, IP_HDR_ALIGNMENT, sizeof(*ip), true) != 0) {
+ if (M_GET_ALIGNED_HDR(, struct ip, true) != 0) {
/* XXXJRT new stat, please */
ip_statinc(IP_STAT_TOOSMALL);
goto bad;
@@ -2900,7 +2900,7 @@ bridge_ip6_checkbasic(struct mbuf **mp)
* it. Otherwise, if it is aligned, make sure the entire base
* IPv6 header is in the first mbuf of the chain.
*/
- if (m_get_aligned_hdr(, IP6_HDR_ALIGNMENT, sizeof(*ip6), true) != 0) {
+ if (M_GET_ALIGNED_HDR(, struct ip6_hdr, true) != 0) {
struct ifnet *inifp = m_get_rcvif_NOMPSAFE(m);
/* XXXJRT new stat, please */
ip6_statinc(IP6_STAT_TOOSMALL);
Index: src/sys/netinet/if_arp.c
diff -u src/sys/netinet/if_arp.c:1.306 src/sys/netinet/if_arp.c:1.307
--- src/sys/netinet/if_arp.c:1.306 Tue Feb 16 05:22:52 2021
+++ src/sys/netinet/if_arp.c Fri Feb 19 09:51:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: if_arp.c,v 1.306 2021/02/16 10:22:52 martin Exp $ */
+/* $NetBSD: if_arp.c,v 1.307 2021/02/19 14:51:59 christos Exp $ */
/*
* Copyright (c) 1998, 2000, 2008 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_arp.c,v 1.306 2021/02/16 10:22:52 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_arp.c,v 1.307 2021/02/19 14:51:59 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -706,7 +706,7 @@ arpintr(void)
goto badlen;
}
ar = mtod(m, struct arphdr *);
- KASSERT(POINTER_ALIGNED_P(ar, ARP_HDR_ALIGNMENT));
+ KASSERT(ACCESSIBLE_POINTER(ar, struct arphdr));
rcvif = m_get_rcvif(m, );
if
CVS commit: src/sys
Module Name:src Committed By: christos Date: Fri Feb 19 14:52:00 UTC 2021 Modified Files: src/sys/net: if_arp.h if_bridge.c src/sys/netinet: if_arp.c in_l2tp.c ip_flow.c ip_input.c ip_private.h tcp_input.c tcp_private.h udp_private.h udp_usrreq.c src/sys/netinet6: icmp6.c in6_l2tp.c ip6_flow.c ip6_input.c ip6_private.h udp6_usrreq.c src/sys/sys: mbuf.h param.h Log Message: - Make ALIGNED_POINTER use __alignof(t) instead of sizeof(t). This is more correct because it works with non-primitive types and provides the ABI alignment for the type the compiler will use. - Remove all the *_HDR_ALIGNMENT macros and asserts - Replace POINTER_ALIGNED_P with ACCESSIBLE_POINTER which is identical to ALIGNED_POINTER, but returns that the pointer is always aligned if the CPU supports unaligned accesses. [ as proposed in tech-kern ] To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.43 src/sys/net/if_arp.h cvs rdiff -u -r1.178 -r1.179 src/sys/net/if_bridge.c cvs rdiff -u -r1.306 -r1.307 src/sys/netinet/if_arp.c cvs rdiff -u -r1.19 -r1.20 src/sys/netinet/in_l2tp.c cvs rdiff -u -r1.84 -r1.85 src/sys/netinet/ip_flow.c cvs rdiff -u -r1.398 -r1.399 src/sys/netinet/ip_input.c cvs rdiff -u -r1.5 -r1.6 src/sys/netinet/ip_private.h \ src/sys/netinet/tcp_private.h src/sys/netinet/udp_private.h cvs rdiff -u -r1.425 -r1.426 src/sys/netinet/tcp_input.c cvs rdiff -u -r1.260 -r1.261 src/sys/netinet/udp_usrreq.c cvs rdiff -u -r1.249 -r1.250 src/sys/netinet6/icmp6.c cvs rdiff -u -r1.20 -r1.21 src/sys/netinet6/in6_l2tp.c cvs rdiff -u -r1.41 -r1.42 src/sys/netinet6/ip6_flow.c cvs rdiff -u -r1.223 -r1.224 src/sys/netinet6/ip6_input.c cvs rdiff -u -r1.5 -r1.6 src/sys/netinet6/ip6_private.h cvs rdiff -u -r1.149 -r1.150 src/sys/netinet6/udp6_usrreq.c cvs rdiff -u -r1.231 -r1.232 src/sys/sys/mbuf.h cvs rdiff -u -r1.689 -r1.690 src/sys/sys/param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/uvm
Module Name:src Committed By: hannken Date: Fri Feb 19 13:20:44 UTC 2021 Modified Files: src/sys/uvm: uvm_swap.c Log Message: When turning off swap during reboot we have to lock with LK_RETRY as regular files got reclaimed during unmount. Adresses PR kern/54969 (Disk cache is no longer flushed on shutdown) To generate a diff of this commit: cvs rdiff -u -r1.201 -r1.202 src/sys/uvm/uvm_swap.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/uvm
Module Name:src
Committed By: hannken
Date: Fri Feb 19 13:20:44 UTC 2021
Modified Files:
src/sys/uvm: uvm_swap.c
Log Message:
When turning off swap during reboot we have to lock with LK_RETRY
as regular files got reclaimed during unmount.
Adresses PR kern/54969 (Disk cache is no longer flushed on shutdown)
To generate a diff of this commit:
cvs rdiff -u -r1.201 -r1.202 src/sys/uvm/uvm_swap.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/uvm/uvm_swap.c
diff -u src/sys/uvm/uvm_swap.c:1.201 src/sys/uvm/uvm_swap.c:1.202
--- src/sys/uvm/uvm_swap.c:1.201 Tue Feb 16 09:56:32 2021
+++ src/sys/uvm/uvm_swap.c Fri Feb 19 13:20:43 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_swap.c,v 1.201 2021/02/16 09:56:32 hannken Exp $ */
+/* $NetBSD: uvm_swap.c,v 1.202 2021/02/19 13:20:43 hannken Exp $ */
/*
* Copyright (c) 1995, 1996, 1997, 2009 Matthew R. Green
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uvm_swap.c,v 1.201 2021/02/16 09:56:32 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_swap.c,v 1.202 2021/02/19 13:20:43 hannken Exp $");
#include "opt_uvmhist.h"
#include "opt_compat_netbsd.h"
@@ -1155,14 +1155,11 @@ again:
printf("\nturning off swap on %s...", sdp->swd_path);
#endif
/* Have to lock and reference vnode for swap_off(). */
- if (vn_lock(vp = sdp->swd_vp, LK_EXCLUSIVE)) {
-error = EBUSY;
- } else {
-vref(vp);
-error = swap_off(l, sdp);
-vput(vp);
-mutex_enter(_swap_data_lock);
- }
+ vn_lock(vp = sdp->swd_vp, LK_EXCLUSIVE|LK_RETRY);
+ vref(vp);
+ error = swap_off(l, sdp);
+ vput(vp);
+ mutex_enter(_swap_data_lock);
if (error) {
printf("stopping swap on %s failed "
"with error %d\n", sdp->swd_path, error);
CVS commit: src/usr.bin/xlint/lint1
Module Name:src Committed By: rillig Date: Fri Feb 19 14:44:29 UTC 2021 Modified Files: src/usr.bin/xlint/lint1: ckgetopt.c Log Message: lint: fix build in tools mode To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/usr.bin/xlint/lint1/ckgetopt.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/xlint/lint1
Module Name:src
Committed By: rillig
Date: Fri Feb 19 14:44:29 UTC 2021
Modified Files:
src/usr.bin/xlint/lint1: ckgetopt.c
Log Message:
lint: fix build in tools mode
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/usr.bin/xlint/lint1/ckgetopt.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/xlint/lint1/ckgetopt.c
diff -u src/usr.bin/xlint/lint1/ckgetopt.c:1.1 src/usr.bin/xlint/lint1/ckgetopt.c:1.2
--- src/usr.bin/xlint/lint1/ckgetopt.c:1.1 Fri Feb 19 12:28:56 2021
+++ src/usr.bin/xlint/lint1/ckgetopt.c Fri Feb 19 14:44:29 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ckgetopt.c,v 1.1 2021/02/19 12:28:56 rillig Exp $ */
+/* $NetBSD: ckgetopt.c,v 1.2 2021/02/19 14:44:29 rillig Exp $ */
/*-
* Copyright (c) 2021 The NetBSD Foundation, Inc.
@@ -29,9 +29,13 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: ckgetopt.c,v 1.1 2021/02/19 12:28:56 rillig Exp $");
+__RCSID("$NetBSD: ckgetopt.c,v 1.2 2021/02/19 14:44:29 rillig Exp $");
#endif
#include
CVS commit: src/lib/libc/arch/mips/sys
Module Name:src Committed By: simonb Date: Fri Feb 19 08:33:02 UTC 2021 Modified Files: src/lib/libc/arch/mips/sys: __syscall.S Log Message: Remove the incorrect register shuffle - we pass SYS___syscall as the syscall number in v0 and pass all the original __syscall() args in their original slots/regs. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/lib/libc/arch/mips/sys/__syscall.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/arch/mips/sys
Module Name:src Committed By: simonb Date: Fri Feb 19 08:33:02 UTC 2021 Modified Files: src/lib/libc/arch/mips/sys: __syscall.S Log Message: Remove the incorrect register shuffle - we pass SYS___syscall as the syscall number in v0 and pass all the original __syscall() args in their original slots/regs. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/lib/libc/arch/mips/sys/__syscall.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/arch/mips/sys/__syscall.S diff -u src/lib/libc/arch/mips/sys/__syscall.S:1.3 src/lib/libc/arch/mips/sys/__syscall.S:1.4 --- src/lib/libc/arch/mips/sys/__syscall.S:1.3 Sat Apr 18 23:55:51 2020 +++ src/lib/libc/arch/mips/sys/__syscall.S Fri Feb 19 08:33:02 2021 @@ -1,31 +1,10 @@ -/* $NetBSD: __syscall.S,v 1.3 2020/04/18 23:55:51 thorpej Exp $ */ +/* $NetBSD: __syscall.S,v 1.4 2021/02/19 08:33:02 simonb Exp $ */ #include "SYS.h" -#ifdef __mips_o32 - RSYSCALL(__syscall) -#else /* ! __mips_o32 */ - -LEAF(__syscall) -PIC_PROLOGUE(__syscall) - move v0, a0 - move a0, a1 - move a1, a2 - move a2, a3 - move a3, a4 - move a4, a5 - move a5, a6 - move a6, a7 - REG_L a7, (sp) -SYSTRAP(__syscall) -bne a3,zero,1f -PIC_RETURN() -1: -PIC_TAILCALL(__cerror) -END(__syscall) +#ifndef __mips_o32 STRONG_ALIAS(_syscall,__syscall) WEAK_ALIAS(syscall,__syscall) - -#endif /* __mips_o32 */ +#endif /* ! __mips_o32 */
CVS commit: src/usr.bin/videoctl
Module Name:src Committed By: rillig Date: Fri Feb 19 11:39:11 UTC 2021 Modified Files: src/usr.bin/videoctl: videoctl.c Log Message: videoctl: remove unnecessary code for unknown option -h The generated binary stays the same. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/usr.bin/videoctl/videoctl.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/videoctl
Module Name:src
Committed By: rillig
Date: Fri Feb 19 11:39:11 UTC 2021
Modified Files:
src/usr.bin/videoctl: videoctl.c
Log Message:
videoctl: remove unnecessary code for unknown option -h
The generated binary stays the same.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/videoctl/videoctl.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/videoctl/videoctl.c
diff -u src/usr.bin/videoctl/videoctl.c:1.2 src/usr.bin/videoctl/videoctl.c:1.3
--- src/usr.bin/videoctl/videoctl.c:1.2 Fri Sep 16 15:39:30 2011
+++ src/usr.bin/videoctl/videoctl.c Fri Feb 19 11:39:11 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: videoctl.c,v 1.2 2011/09/16 15:39:30 joerg Exp $ */
+/* $NetBSD: videoctl.c,v 1.3 2021/02/19 11:39:11 rillig Exp $ */
/*-
* Copyright (c) 2010 Jared D. McNeill
@@ -29,7 +29,7 @@
#include
__COPYRIGHT("@(#) Copyright (c) 2010\
Jared D. McNeill . All rights reserved.");
-__RCSID("$NetBSD: videoctl.c,v 1.2 2011/09/16 15:39:30 joerg Exp $");
+__RCSID("$NetBSD: videoctl.c,v 1.3 2021/02/19 11:39:11 rillig Exp $");
#include
#include
@@ -120,7 +120,6 @@ main(int argc, char *argv[])
case 'w':
wflag = true;
break;
- case 'h':
default:
usage();
/* NOTREACHED */
CVS commit: src/share/man/man4
Module Name:src Committed By: msaitoh Date: Fri Feb 19 08:57:56 UTC 2021 Modified Files: src/share/man/man4: ddb.4 Log Message: Add missing 'q' modifier for the write command. To generate a diff of this commit: cvs rdiff -u -r1.197 -r1.198 src/share/man/man4/ddb.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man4
Module Name:src Committed By: msaitoh Date: Fri Feb 19 08:57:56 UTC 2021 Modified Files: src/share/man/man4: ddb.4 Log Message: Add missing 'q' modifier for the write command. To generate a diff of this commit: cvs rdiff -u -r1.197 -r1.198 src/share/man/man4/ddb.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/ddb.4 diff -u src/share/man/man4/ddb.4:1.197 src/share/man/man4/ddb.4:1.198 --- src/share/man/man4/ddb.4:1.197 Sat Dec 19 23:38:21 2020 +++ src/share/man/man4/ddb.4 Fri Feb 19 08:57:56 2021 @@ -1,4 +1,4 @@ -.\" $NetBSD: ddb.4,v 1.197 2020/12/19 23:38:21 mrg Exp $ +.\" $NetBSD: ddb.4,v 1.198 2021/02/19 08:57:56 msaitoh Exp $ .\" .\" Copyright (c) 1997 - 2019 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -56,7 +56,7 @@ .\" any improvements or extensions that they make and grant Carnegie Mellon .\" the rights to redistribute these changes. .\" -.Dd December 19, 2020 +.Dd February 19, 2021 .Dt DDB 4 .Os .Sh NAME @@ -946,7 +946,7 @@ an unrecoverable error in some systems s Watchpoints on user addresses work the best. .It Ic whatis Ar address Describe what an address is. -.It Ic write Ns Oo Cm /bhlBHL Oc Ar address Ar expression Oo Ar expression ... Oc +.It Ic write Ns Oo Cm /bhlqBHLQ Oc Ar address Ar expression Oo Ar expression ... Oc Write the .Ar expression Ns s at succeeding locations. @@ -955,8 +955,9 @@ The unit size is specified with a modifi Valid modifiers are: .Cm /b , .Cm /h , +.Cm /l , and -.Cm /l . +.Cm /q . If no modifier is specified, .Cm /l is used. @@ -965,6 +966,7 @@ Specifying the modifiers in upper case, .Cm /B , .Cm /H , .Cm /L , +.Cm /Q , will prevent .Nm from reading the memory location first, which is useful for avoiding
CVS commit: src
Module Name:src Committed By: rillig Date: Fri Feb 19 12:28:57 UTC 2021 Modified Files: src/distrib/sets/lists/tests: mi src/tests/usr.bin/xlint/lint1: Makefile t_integration.sh src/usr.bin/xlint/lint1: Makefile err.c externs1.h func.c Added Files: src/tests/usr.bin/xlint/lint1: msg_338.c msg_338.exp msg_339.c msg_339.exp src/usr.bin/xlint/lint1: ckgetopt.c Log Message: lint: warn about mismatch in getopt handling To generate a diff of this commit: cvs rdiff -u -r1.1019 -r1.1020 src/distrib/sets/lists/tests/mi cvs rdiff -u -r1.30 -r1.31 src/tests/usr.bin/xlint/lint1/Makefile cvs rdiff -u -r0 -r1.1 src/tests/usr.bin/xlint/lint1/msg_338.c \ src/tests/usr.bin/xlint/lint1/msg_338.exp \ src/tests/usr.bin/xlint/lint1/msg_339.c \ src/tests/usr.bin/xlint/lint1/msg_339.exp cvs rdiff -u -r1.28 -r1.29 src/tests/usr.bin/xlint/lint1/t_integration.sh cvs rdiff -u -r1.59 -r1.60 src/usr.bin/xlint/lint1/Makefile cvs rdiff -u -r0 -r1.1 src/usr.bin/xlint/lint1/ckgetopt.c cvs rdiff -u -r1.78 -r1.79 src/usr.bin/xlint/lint1/err.c cvs rdiff -u -r1.65 -r1.66 src/usr.bin/xlint/lint1/externs1.h cvs rdiff -u -r1.67 -r1.68 src/usr.bin/xlint/lint1/func.c 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: rillig
Date: Fri Feb 19 12:28:57 UTC 2021
Modified Files:
src/distrib/sets/lists/tests: mi
src/tests/usr.bin/xlint/lint1: Makefile t_integration.sh
src/usr.bin/xlint/lint1: Makefile err.c externs1.h func.c
Added Files:
src/tests/usr.bin/xlint/lint1: msg_338.c msg_338.exp msg_339.c
msg_339.exp
src/usr.bin/xlint/lint1: ckgetopt.c
Log Message:
lint: warn about mismatch in getopt handling
To generate a diff of this commit:
cvs rdiff -u -r1.1019 -r1.1020 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.30 -r1.31 src/tests/usr.bin/xlint/lint1/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/usr.bin/xlint/lint1/msg_338.c \
src/tests/usr.bin/xlint/lint1/msg_338.exp \
src/tests/usr.bin/xlint/lint1/msg_339.c \
src/tests/usr.bin/xlint/lint1/msg_339.exp
cvs rdiff -u -r1.28 -r1.29 src/tests/usr.bin/xlint/lint1/t_integration.sh
cvs rdiff -u -r1.59 -r1.60 src/usr.bin/xlint/lint1/Makefile
cvs rdiff -u -r0 -r1.1 src/usr.bin/xlint/lint1/ckgetopt.c
cvs rdiff -u -r1.78 -r1.79 src/usr.bin/xlint/lint1/err.c
cvs rdiff -u -r1.65 -r1.66 src/usr.bin/xlint/lint1/externs1.h
cvs rdiff -u -r1.67 -r1.68 src/usr.bin/xlint/lint1/func.c
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.1019 src/distrib/sets/lists/tests/mi:1.1020
--- src/distrib/sets/lists/tests/mi:1.1019 Tue Feb 16 09:46:24 2021
+++ src/distrib/sets/lists/tests/mi Fri Feb 19 12:28:56 2021
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1019 2021/02/16 09:46:24 kre Exp $
+# $NetBSD: mi,v 1.1020 2021/02/19 12:28:56 rillig Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -6511,6 +6511,10 @@
./usr/tests/usr.bin/xlint/lint1/msg_336.exp tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/xlint/lint1/msg_337.c tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/xlint/lint1/msg_337.exp tests-usr.bin-tests compattestfile,atf
+./usr/tests/usr.bin/xlint/lint1/msg_338.c tests-usr.bin-tests compattestfile,atf
+./usr/tests/usr.bin/xlint/lint1/msg_338.exp tests-usr.bin-tests compattestfile,atf
+./usr/tests/usr.bin/xlint/lint1/msg_339.c tests-usr.bin-tests compattestfile,atf
+./usr/tests/usr.bin/xlint/lint1/msg_339.exp tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/xlint/lint1/t_integration tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/ztesttests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/ztest/Atffile tests-usr.bin-tests compattestfile,atf
Index: src/tests/usr.bin/xlint/lint1/Makefile
diff -u src/tests/usr.bin/xlint/lint1/Makefile:1.30 src/tests/usr.bin/xlint/lint1/Makefile:1.31
--- src/tests/usr.bin/xlint/lint1/Makefile:1.30 Sun Jan 17 23:00:41 2021
+++ src/tests/usr.bin/xlint/lint1/Makefile Fri Feb 19 12:28:56 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2021/01/17 23:00:41 rillig Exp $
+# $NetBSD: Makefile,v 1.31 2021/02/19 12:28:56 rillig Exp $
NOMAN= # defined
@@ -91,7 +91,7 @@ FILES+= d_type_question_colon.c
FILES+= d_typefun.c
FILES+= d_typename_as_var.c
FILES+= d_zero_sized_arrays.c
-FILES+= ${:U0 ${:U:range=337}:C,^.$,0&,:C,^..$,0&,:@msg@msg_${msg}.c msg_${msg}.exp@}
+FILES+= ${:U0 ${:U:range=339}:C,^.$,0&,:C,^..$,0&,:@msg@msg_${msg}.c msg_${msg}.exp@}
# Note: only works for adding tests.
# To remove a test, the $$mi file must be edited manually.
Index: src/tests/usr.bin/xlint/lint1/t_integration.sh
diff -u src/tests/usr.bin/xlint/lint1/t_integration.sh:1.28 src/tests/usr.bin/xlint/lint1/t_integration.sh:1.29
--- src/tests/usr.bin/xlint/lint1/t_integration.sh:1.28 Mon Jan 18 20:02:34 2021
+++ src/tests/usr.bin/xlint/lint1/t_integration.sh Fri Feb 19 12:28:56 2021
@@ -1,4 +1,4 @@
-# $NetBSD: t_integration.sh,v 1.28 2021/01/18 20:02:34 rillig Exp $
+# $NetBSD: t_integration.sh,v 1.29 2021/02/19 12:28:56 rillig Exp $
#
# Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -184,7 +184,7 @@ all_messages_body()
srcdir="$(atf_get_srcdir)"
ok="true"
- for msg in $(seq 0 337); do
+ for msg in $(seq 0 339); do
base="$(printf '%s/msg_%03d' "${srcdir}" "${msg}")"
flags="$(extract_flags "${base}.c")"
Index: src/usr.bin/xlint/lint1/Makefile
diff -u src/usr.bin/xlint/lint1/Makefile:1.59 src/usr.bin/xlint/lint1/Makefile:1.60
--- src/usr.bin/xlint/lint1/Makefile:1.59 Sat Jan 23 17:58:03 2021
+++ src/usr.bin/xlint/lint1/Makefile Fri Feb 19 12:28:56 2021
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.59 2021/01/23 17:58:03 rillig Exp $
+# $NetBSD: Makefile,v 1.60 2021/02/19 12:28:56 rillig Exp $
.include
PROG= lint1
-SRCS= cgram.y decl.c emit.c emit1.c err.c func.c init.c inittyp.c \
- lex.c \
+SRCS= cgram.y ckgetopt.c decl.c emit.c emit1.c err.c \
+ func.c init.c inittyp.c lex.c \
main1.c mem.c mem1.c oper.c print.c scan.l tree.c tyname.c
MAN=
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: christos Date: Fri Feb 19 17:06:26 UTC 2021 Modified Files: src/distrib/sets/lists/base: shl.mi src/distrib/sets/lists/debug: shl.mi Log Message: bump bind libraries To generate a diff of this commit: cvs rdiff -u -r1.910 -r1.911 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.269 -r1.270 src/distrib/sets/lists/debug/shl.mi 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
Module Name:src Committed By: christos Date: Fri Feb 19 17:06:26 UTC 2021 Modified Files: src/distrib/sets/lists/base: shl.mi src/distrib/sets/lists/debug: shl.mi Log Message: bump bind libraries To generate a diff of this commit: cvs rdiff -u -r1.910 -r1.911 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.269 -r1.270 src/distrib/sets/lists/debug/shl.mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/shl.mi diff -u src/distrib/sets/lists/base/shl.mi:1.910 src/distrib/sets/lists/base/shl.mi:1.911 --- src/distrib/sets/lists/base/shl.mi:1.910 Fri Dec 4 13:43:47 2020 +++ src/distrib/sets/lists/base/shl.mi Fri Feb 19 12:06:26 2021 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.910 2020/12/04 18:43:47 christos Exp $ +# $NetBSD: shl.mi,v 1.911 2021/02/19 17:06:26 christos Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -232,8 +232,8 @@ ./usr/lib/libbfd.so.17base-sys-shlib compatfile,binutils=234 ./usr/lib/libbfd.so.17.0 base-sys-shlib compatfile,binutils=234 ./usr/lib/libbind9.sobase-bind-shlib compatfile -./usr/lib/libbind9.so.15base-bind-shlib compatfile -./usr/lib/libbind9.so.15.0 base-bind-shlib compatfile +./usr/lib/libbind9.so.16 base-bind-shlib compatfile +./usr/lib/libbind9.so.16.0 base-bind-shlib compatfile ./usr/lib/libblacklist.so base-obsolete obsolete,compatfile ./usr/lib/libblacklist.so.0 base-obsolete obsolete,compatfile ./usr/lib/libblacklist.so.0.0 base-obsolete obsolete,compatfile @@ -298,8 +298,8 @@ ./usr/lib/libdm.so.0base-sys-shlib compatfile ./usr/lib/libdm.so.0.0base-sys-shlib compatfile ./usr/lib/libdns.sobase-bind-shlib compatfile -./usr/lib/libdns.so.15base-bind-shlib compatfile -./usr/lib/libdns.so.15.0 base-bind-shlib compatfile +./usr/lib/libdns.so.16base-bind-shlib compatfile +./usr/lib/libdns.so.16.0 base-bind-shlib compatfile ./usr/lib/libdns_sd.sobase-mdns-shlib compatfile,mdns ./usr/lib/libdns_sd.so.0 base-mdns-shlib compatfile,mdns ./usr/lib/libdns_sd.so.0.0 base-mdns-shlib compatfile,mdns @@ -374,17 +374,17 @@ ./usr/lib/libipsec.so.3base-net-shlib compatfile ./usr/lib/libipsec.so.3.0 base-net-shlib compatfile ./usr/lib/libirs.sobase-bind-shlib compatfile -./usr/lib/libirs.so.15base-bind-shlib compatfile -./usr/lib/libirs.so.15.0 base-bind-shlib compatfile +./usr/lib/libirs.so.16base-bind-shlib compatfile +./usr/lib/libirs.so.16.0 base-bind-shlib compatfile ./usr/lib/libisc.sobase-bind-shlib compatfile -./usr/lib/libisc.so.15base-bind-shlib compatfile -./usr/lib/libisc.so.15.0 base-bind-shlib compatfile +./usr/lib/libisc.so.16base-bind-shlib compatfile +./usr/lib/libisc.so.16.0 base-bind-shlib compatfile ./usr/lib/libisccc.sobase-bind-shlib compatfile -./usr/lib/libisccc.so.15 base-bind-shlib compatfile -./usr/lib/libisccc.so.15.0 base-bind-shlib compatfile +./usr/lib/libisccc.so.16 base-bind-shlib compatfile +./usr/lib/libisccc.so.16.0 base-bind-shlib compatfile ./usr/lib/libisccfg.sobase-bind-shlib compatfile -./usr/lib/libisccfg.so.15 base-bind-shlib compatfile -./usr/lib/libisccfg.so.15.0 base-bind-shlib compatfile +./usr/lib/libisccfg.so.16 base-bind-shlib compatfile +./usr/lib/libisccfg.so.16.0 base-bind-shlib compatfile ./usr/lib/libiscsi.sobase-iscsi-shlib iscsi,compatfile ./usr/lib/libiscsi.so.2base-iscsi-shlib iscsi,compatfile ./usr/lib/libiscsi.so.2.0 base-iscsi-shlib iscsi,compatfile @@ -469,8 +469,8 @@ ./usr/lib/libnpf.so.0base-npf-shlib npf,compatfile ./usr/lib/libnpf.so.0.1base-npf-shlib npf,compatfile ./usr/lib/libns.sobase-bind-shlib compatfile -./usr/lib/libns.so.15base-bind-shlib compatfile -./usr/lib/libns.so.15.0base-bind-shlib compatfile +./usr/lib/libns.so.16base-bind-shlib compatfile +./usr/lib/libns.so.16.0base-bind-shlib compatfile ./usr/lib/libnvmm.sobase-sys-shlib nvmm,pic ./usr/lib/libnvmm.so.0base-sys-shlib nvmm,pic ./usr/lib/libnvmm.so.0.1 base-sys-shlib nvmm,pic Index: src/distrib/sets/lists/debug/shl.mi diff -u src/distrib/sets/lists/debug/shl.mi:1.269 src/distrib/sets/lists/debug/shl.mi:1.270 --- src/distrib/sets/lists/debug/shl.mi:1.269 Fri Dec 4 13:43:47 2020 +++ src/distrib/sets/lists/debug/shl.mi Fri Feb 19 12:06:26 2021 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.269 2020/12/04 18:43:47 christos Exp $ +# $NetBSD: shl.mi,v 1.270 2021/02/19 17:06:26 christos Exp $ ./usr/lib/libbfd_g.a comp-c-debuglib debuglib,compatfile,binutils ./usr/libdata/debug/lib base-sys-usr debug,dynamicroot,compatdir ./usr/libdata/debug/lib/libavl.so.0.0.debug comp-zfs-debug debug,dynamicroot,zfs @@ -77,7 +77,7 @@ ./usr/libdata/debug/usr/lib/libavl.so.0.0.debug comp-zfs-debug
CVS commit: [netbsd-9] src/external/gpl2/grep/dist/lib
Module Name:src Committed By: martin Date: Fri Feb 19 17:41:19 UTC 2021 Modified Files: src/external/gpl2/grep/dist/lib [netbsd-9]: regex.c Log Message: Pull up following revision(s) (requested by mlelstv in ticket #1208): external/gpl2/grep/dist/lib/regex.c: revision 1.3 Moving pointers could fail if realloc() allocates a new memory region where the difference between old and new address exceeds an int. Use ptrdiff_t for calculations instead. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.2.18.1 src/external/gpl2/grep/dist/lib/regex.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/external/gpl2/grep/dist/lib
Module Name:src
Committed By: martin
Date: Fri Feb 19 17:41:19 UTC 2021
Modified Files:
src/external/gpl2/grep/dist/lib [netbsd-9]: regex.c
Log Message:
Pull up following revision(s) (requested by mlelstv in ticket #1208):
external/gpl2/grep/dist/lib/regex.c: revision 1.3
Moving pointers could fail if realloc() allocates a new memory region
where the difference between old and new address exceeds an int. Use
ptrdiff_t for calculations instead.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.18.1 src/external/gpl2/grep/dist/lib/regex.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl2/grep/dist/lib/regex.c
diff -u src/external/gpl2/grep/dist/lib/regex.c:1.2 src/external/gpl2/grep/dist/lib/regex.c:1.2.18.1
--- src/external/gpl2/grep/dist/lib/regex.c:1.2 Sun Jan 10 22:16:40 2016
+++ src/external/gpl2/grep/dist/lib/regex.c Fri Feb 19 17:41:19 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: regex.c,v 1.2 2016/01/10 22:16:40 christos Exp $ */
+/* $NetBSD: regex.c,v 1.2.18.1 2021/02/19 17:41:19 martin Exp $ */
/* Extended regular expression matching and search library,
version 0.12.
@@ -2047,7 +2047,7 @@ static reg_errcode_t compile_range _RE_A
/* If the buffer moved, move all the pointers into it. */ \
if (old_buffer != COMPILED_BUFFER_VAR)\
{ \
- int incr = COMPILED_BUFFER_VAR - old_buffer; \
+ ptrdiff_t incr = COMPILED_BUFFER_VAR - old_buffer; \
MOVE_BUFFER_POINTER (b); \
MOVE_BUFFER_POINTER (begalt); \
if (fixup_alt_jump) \
@@ -2075,7 +2075,7 @@ static reg_errcode_t compile_range _RE_A
/* If the buffer moved, move all the pointers into it. */ \
if (old_buffer != COMPILED_BUFFER_VAR)\
{ \
- int incr = COMPILED_BUFFER_VAR - old_buffer; \
+ ptrdiff_t incr = COMPILED_BUFFER_VAR - old_buffer; \
MOVE_BUFFER_POINTER (b); \
MOVE_BUFFER_POINTER (begalt); \
if (fixup_alt_jump) \
CVS commit: src/external/mpl/bind
Module Name:src Committed By: christos Date: Fri Feb 19 16:42:24 UTC 2021 Modified Files: src/external/mpl/bind: Makefile.inc src/external/mpl/bind/bin/named: Makefile src/external/mpl/bind/dist: Makefile.in config.h.in configure src/external/mpl/bind/dist/bin/check: check-tool.c check-tool.h named-checkconf.c named-checkzone.c src/external/mpl/bind/dist/bin/confgen: ddns-confgen.c keygen.c keygen.h rndc-confgen.c util.c util.h src/external/mpl/bind/dist/bin/confgen/include/confgen: os.h src/external/mpl/bind/dist/bin/confgen/unix: os.c src/external/mpl/bind/dist/bin/confgen/win32: os.c src/external/mpl/bind/dist/bin/delv: delv.c src/external/mpl/bind/dist/bin/dig: dig.c dighost.c host.c nslookup.c src/external/mpl/bind/dist/bin/dig/include/dig: dig.h src/external/mpl/bind/dist/bin/dnssec: dnssec-cds.c dnssec-dsfromkey.c dnssec-importkey.c dnssec-keyfromlabel.c dnssec-keygen.c dnssec-revoke.c dnssec-settime.c dnssec-signzone.c dnssec-verify.c dnssectool.c dnssectool.h src/external/mpl/bind/dist/bin/named: bind9.xsl.h builtin.c config.c control.c controlconf.c fuzz.c geoip.c log.c logconf.c main.c server.c statschannel.c tkeyconf.c tsigconf.c zoneconf.c src/external/mpl/bind/dist/bin/named/include/dlz: dlz_dlopen_driver.h src/external/mpl/bind/dist/bin/named/include/named: builtin.h config.h control.h fuzz.h geoip.h globals.h log.h logconf.h main.h server.h smf_globals.h statschannel.h tkeyconf.h tsigconf.h types.h zoneconf.h src/external/mpl/bind/dist/bin/named/unix: dlz_dlopen_driver.c os.c src/external/mpl/bind/dist/bin/named/unix/include/named: os.h src/external/mpl/bind/dist/bin/named/win32: dlz_dlopen_driver.c ntservice.c os.c src/external/mpl/bind/dist/bin/named/win32/include/named: ntservice.h os.h src/external/mpl/bind/dist/bin/nsupdate: nsupdate.c src/external/mpl/bind/dist/bin/pkcs11: pkcs11-list.c pkcs11-tokens.c src/external/mpl/bind/dist/bin/plugins: filter-.c src/external/mpl/bind/dist/bin/rndc: rndc.c util.c util.h src/external/mpl/bind/dist/bin/rndc/include/rndc: os.h src/external/mpl/bind/dist/bin/tests: cfg_test.c makejournal.c wire_test.c src/external/mpl/bind/dist/bin/tests/optional: adb_test.c backtrace_test.c byaddr_test.c byname_test.c db_test.c fsaccess_test.c gsstest.c inter_test.c lex_test.c lfsr_test.c log_test.c master_test.c mempool_test.c name_test.c nsecify.c ratelimiter_test.c rbt_test.c rwlock_test.c serial_test.c shutdown_test.c sig0_test.c sock_test.c sym_test.c task_test.c timer_test.c zone_test.c src/external/mpl/bind/dist/bin/tests/pkcs11/benchmarks: create.c find.c genrsa.c login.c privrsa.c pubrsa.c session.c sha1.c sign.c verify.c src/external/mpl/bind/dist/bin/tests/system: feature-test.c src/external/mpl/bind/dist/bin/tests/system/dlz/ns1/dns-root/com/example/xfr.d: 10.53.0.1 src/external/mpl/bind/dist/bin/tests/system/dlzexternal: driver.c driver.h src/external/mpl/bind/dist/bin/tests/system/dyndb/driver: db.c src/external/mpl/bind/dist/bin/tests/system/pipelined: pipequeries.c src/external/mpl/bind/dist/bin/tests/system/rndc: gencheck.c src/external/mpl/bind/dist/bin/tests/system/rpz: dnsrps.c src/external/mpl/bind/dist/bin/tests/system/rsabigexponent: bigkey.c src/external/mpl/bind/dist/bin/tests/system/tkey: keycreate.c keydelete.c src/external/mpl/bind/dist/bin/tools: arpaname.c dnstap-read.c mdig.c named-journalprint.c named-nzd2nzf.c named-rrchecker.c nsec3hash.c src/external/mpl/bind/dist/bin/win32/BINDInstall: AccountInfo.h BINDInstall.h BINDInstallDlg.h DirBrowse.h src/external/mpl/bind/dist/doc/arm: isc-logo.pdf src/external/mpl/bind/dist/fuzz: dns_name_fromtext_target.c dns_rdata_fromwire_text.c fuzz.h main.c src/external/mpl/bind/dist/lib/bind9: check.c getaddresses.c version.c src/external/mpl/bind/dist/lib/bind9/include/bind9: check.h getaddresses.h version.h src/external/mpl/bind/dist/lib/bind9/win32: DLLMain.c version.c src/external/mpl/bind/dist/lib/dns: acl.c adb.c badcache.c byaddr.c cache.c callbacks.c catz.c client.c clientinfo.c compress.c db.c dbiterator.c dbtable.c diff.c dispatch.c dlz.c dns64.c dnsrps.c dnssec.c dnstap.c ds.c dst_api.c dst_internal.h dst_openssl.h dst_parse.c dst_parse.h dst_pkcs11.h dst_result.c dyndb.c ecdb.c ecs.c fixedname.c forward.c gen-unix.h gen-win32.h
CVS commit: src/external/mpl/bind
Module Name:src Committed By: christos Date: Fri Feb 19 16:42:24 UTC 2021 Modified Files: src/external/mpl/bind: Makefile.inc src/external/mpl/bind/bin/named: Makefile src/external/mpl/bind/dist: Makefile.in config.h.in configure src/external/mpl/bind/dist/bin/check: check-tool.c check-tool.h named-checkconf.c named-checkzone.c src/external/mpl/bind/dist/bin/confgen: ddns-confgen.c keygen.c keygen.h rndc-confgen.c util.c util.h src/external/mpl/bind/dist/bin/confgen/include/confgen: os.h src/external/mpl/bind/dist/bin/confgen/unix: os.c src/external/mpl/bind/dist/bin/confgen/win32: os.c src/external/mpl/bind/dist/bin/delv: delv.c src/external/mpl/bind/dist/bin/dig: dig.c dighost.c host.c nslookup.c src/external/mpl/bind/dist/bin/dig/include/dig: dig.h src/external/mpl/bind/dist/bin/dnssec: dnssec-cds.c dnssec-dsfromkey.c dnssec-importkey.c dnssec-keyfromlabel.c dnssec-keygen.c dnssec-revoke.c dnssec-settime.c dnssec-signzone.c dnssec-verify.c dnssectool.c dnssectool.h src/external/mpl/bind/dist/bin/named: bind9.xsl.h builtin.c config.c control.c controlconf.c fuzz.c geoip.c log.c logconf.c main.c server.c statschannel.c tkeyconf.c tsigconf.c zoneconf.c src/external/mpl/bind/dist/bin/named/include/dlz: dlz_dlopen_driver.h src/external/mpl/bind/dist/bin/named/include/named: builtin.h config.h control.h fuzz.h geoip.h globals.h log.h logconf.h main.h server.h smf_globals.h statschannel.h tkeyconf.h tsigconf.h types.h zoneconf.h src/external/mpl/bind/dist/bin/named/unix: dlz_dlopen_driver.c os.c src/external/mpl/bind/dist/bin/named/unix/include/named: os.h src/external/mpl/bind/dist/bin/named/win32: dlz_dlopen_driver.c ntservice.c os.c src/external/mpl/bind/dist/bin/named/win32/include/named: ntservice.h os.h src/external/mpl/bind/dist/bin/nsupdate: nsupdate.c src/external/mpl/bind/dist/bin/pkcs11: pkcs11-list.c pkcs11-tokens.c src/external/mpl/bind/dist/bin/plugins: filter-.c src/external/mpl/bind/dist/bin/rndc: rndc.c util.c util.h src/external/mpl/bind/dist/bin/rndc/include/rndc: os.h src/external/mpl/bind/dist/bin/tests: cfg_test.c makejournal.c wire_test.c src/external/mpl/bind/dist/bin/tests/optional: adb_test.c backtrace_test.c byaddr_test.c byname_test.c db_test.c fsaccess_test.c gsstest.c inter_test.c lex_test.c lfsr_test.c log_test.c master_test.c mempool_test.c name_test.c nsecify.c ratelimiter_test.c rbt_test.c rwlock_test.c serial_test.c shutdown_test.c sig0_test.c sock_test.c sym_test.c task_test.c timer_test.c zone_test.c src/external/mpl/bind/dist/bin/tests/pkcs11/benchmarks: create.c find.c genrsa.c login.c privrsa.c pubrsa.c session.c sha1.c sign.c verify.c src/external/mpl/bind/dist/bin/tests/system: feature-test.c src/external/mpl/bind/dist/bin/tests/system/dlz/ns1/dns-root/com/example/xfr.d: 10.53.0.1 src/external/mpl/bind/dist/bin/tests/system/dlzexternal: driver.c driver.h src/external/mpl/bind/dist/bin/tests/system/dyndb/driver: db.c src/external/mpl/bind/dist/bin/tests/system/pipelined: pipequeries.c src/external/mpl/bind/dist/bin/tests/system/rndc: gencheck.c src/external/mpl/bind/dist/bin/tests/system/rpz: dnsrps.c src/external/mpl/bind/dist/bin/tests/system/rsabigexponent: bigkey.c src/external/mpl/bind/dist/bin/tests/system/tkey: keycreate.c keydelete.c src/external/mpl/bind/dist/bin/tools: arpaname.c dnstap-read.c mdig.c named-journalprint.c named-nzd2nzf.c named-rrchecker.c nsec3hash.c src/external/mpl/bind/dist/bin/win32/BINDInstall: AccountInfo.h BINDInstall.h BINDInstallDlg.h DirBrowse.h src/external/mpl/bind/dist/doc/arm: isc-logo.pdf src/external/mpl/bind/dist/fuzz: dns_name_fromtext_target.c dns_rdata_fromwire_text.c fuzz.h main.c src/external/mpl/bind/dist/lib/bind9: check.c getaddresses.c version.c src/external/mpl/bind/dist/lib/bind9/include/bind9: check.h getaddresses.h version.h src/external/mpl/bind/dist/lib/bind9/win32: DLLMain.c version.c src/external/mpl/bind/dist/lib/dns: acl.c adb.c badcache.c byaddr.c cache.c callbacks.c catz.c client.c clientinfo.c compress.c db.c dbiterator.c dbtable.c diff.c dispatch.c dlz.c dns64.c dnsrps.c dnssec.c dnstap.c ds.c dst_api.c dst_internal.h dst_openssl.h dst_parse.c dst_parse.h dst_pkcs11.h dst_result.c dyndb.c ecdb.c ecs.c fixedname.c forward.c gen-unix.h gen-win32.h
CVS commit: src/doc
Module Name:src Committed By: christos Date: Fri Feb 19 17:08:22 UTC 2021 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new bind To generate a diff of this commit: cvs rdiff -u -r1.1776 -r1.1777 src/doc/3RDPARTY cvs rdiff -u -r1.2779 -r1.2780 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/doc
Module Name:src Committed By: christos Date: Fri Feb 19 17:08:22 UTC 2021 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new bind To generate a diff of this commit: cvs rdiff -u -r1.1776 -r1.1777 src/doc/3RDPARTY cvs rdiff -u -r1.2779 -r1.2780 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.1776 src/doc/3RDPARTY:1.1777 --- src/doc/3RDPARTY:1.1776 Thu Feb 4 22:27:58 2021 +++ src/doc/3RDPARTY Fri Feb 19 12:08:22 2021 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1776 2021/02/05 03:27:58 taca Exp $ +# $NetBSD: 3RDPARTY,v 1.1777 2021/02/19 17:08:22 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -120,8 +120,8 @@ Notes: bc includes dc, both of which are in the NetBSD tree. Package: bind [named and utils] -Version: 9.16.5/MPL -Current Vers: 9.16.5/MPL 9.17.3/MPL +Version: 9.16.12/MPL +Current Vers: 9.16.12/MPL 9.17.10/MPL Maintainer: ISC Archive Site: ftp://ftp.isc.org/isc/bind9/ Home Page: http://www.isc.org/software/bind/ Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2779 src/doc/CHANGES:1.2780 --- src/doc/CHANGES:1.2779 Sun Feb 7 11:58:53 2021 +++ src/doc/CHANGES Fri Feb 19 12:08:22 2021 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2779 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2780 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -332,3 +332,4 @@ Changes from NetBSD 9.0 to NetBSD 10.0: evbmips: Add support for QEMU "mipssim" emulator. [simonb 20210127] x68k: Add Emulate3Buttons support to X68k Xorg based monolithic server. [tsutsui 20210207] + bind: Import version 9.16.12. [christos 20210219]
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Fri Feb 19 17:48:17 UTC 2021 Modified Files: src/doc [netbsd-9]: CHANGES-9.2 Log Message: Tickets #1208 and #1209 To generate a diff of this commit: cvs rdiff -u -r1.1.2.46 -r1.1.2.47 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/doc
Module Name:src Committed By: martin Date: Fri Feb 19 17:48:17 UTC 2021 Modified Files: src/doc [netbsd-9]: CHANGES-9.2 Log Message: Tickets #1208 and #1209 To generate a diff of this commit: cvs rdiff -u -r1.1.2.46 -r1.1.2.47 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.46 src/doc/CHANGES-9.2:1.1.2.47 --- src/doc/CHANGES-9.2:1.1.2.46 Wed Feb 17 09:52:36 2021 +++ src/doc/CHANGES-9.2 Fri Feb 19 17:48:17 2021 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.2,v 1.1.2.46 2021/02/17 09:52:36 martin Exp $ +# $NetBSD: CHANGES-9.2,v 1.1.2.47 2021/02/19 17:48:17 martin Exp $ A complete list of changes from the NetBSD 9.1 release to the NetBSD 9.2 release: @@ -1666,3 +1666,13 @@ external/mit/xorg/bin/xterm/Makefile 1. for combining characters. [mrg, ticket #1207] +external/gpl2/grep/dist/lib/regex.c 1.3 + + Fix pointer fixup after realloc(3). + [mlelstv, ticket #1208] + +sys/arch/x86/x86/intr.c1.154 (patch) + + x86: fix pci_intr_disestablish clean up routine. + [knakahara, ticket #1209] +
CVS commit: src/doc
Module Name:src Committed By: christos Date: Fri Feb 19 17:09:35 UTC 2021 Modified Files: src/doc: 3RDPARTY Log Message: update the date for bind To generate a diff of this commit: cvs rdiff -u -r1.1777 -r1.1778 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1777 src/doc/3RDPARTY:1.1778 --- src/doc/3RDPARTY:1.1777 Fri Feb 19 12:08:22 2021 +++ src/doc/3RDPARTY Fri Feb 19 12:09:35 2021 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1777 2021/02/19 17:08:22 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.1778 2021/02/19 17:09:35 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -125,7 +125,7 @@ Current Vers: 9.16.12/MPL 9.17.10/MPL Maintainer: ISC Archive Site: ftp://ftp.isc.org/isc/bind9/ Home Page: http://www.isc.org/software/bind/ -Date: 2020-08-02 +Date: 2021-02-19 Mailing List: https://lists.isc.org/mailman/listinfo/bind-announce Mailing List: https://lists.isc.org/mailman/listinfo/bind-users Responsible: christos
CVS commit: src/doc
Module Name:src Committed By: christos Date: Fri Feb 19 17:09:35 UTC 2021 Modified Files: src/doc: 3RDPARTY Log Message: update the date for bind To generate a diff of this commit: cvs rdiff -u -r1.1777 -r1.1778 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/netinet
Module Name:src Committed By: jakllsch Date: Fri Feb 19 15:43:56 UTC 2021 Modified Files: src/sys/netinet: tcp_input.c Log Message: it's spelled struct tcphdr, not struct tcp_hdr To generate a diff of this commit: cvs rdiff -u -r1.426 -r1.427 src/sys/netinet/tcp_input.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/netinet
Module Name:src
Committed By: jakllsch
Date: Fri Feb 19 15:43:56 UTC 2021
Modified Files:
src/sys/netinet: tcp_input.c
Log Message:
it's spelled struct tcphdr, not struct tcp_hdr
To generate a diff of this commit:
cvs rdiff -u -r1.426 -r1.427 src/sys/netinet/tcp_input.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/netinet/tcp_input.c
diff -u src/sys/netinet/tcp_input.c:1.426 src/sys/netinet/tcp_input.c:1.427
--- src/sys/netinet/tcp_input.c:1.426 Fri Feb 19 14:51:59 2021
+++ src/sys/netinet/tcp_input.c Fri Feb 19 15:43:56 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_input.c,v 1.426 2021/02/19 14:51:59 christos Exp $ */
+/* $NetBSD: tcp_input.c,v 1.427 2021/02/19 15:43:56 jakllsch Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -148,7 +148,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: tcp_input.c,v 1.426 2021/02/19 14:51:59 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_input.c,v 1.427 2021/02/19 15:43:56 jakllsch Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1274,7 +1274,7 @@ tcp_input(struct mbuf *m, int off, int p
* Enforce alignment requirements that are violated in
* some cases, see kern/50766 for details.
*/
- if (ACCESSIBLE_POINTER(th, struct tcp_hdr) == 0) {
+ if (ACCESSIBLE_POINTER(th, struct tcphdr) == 0) {
m = m_copyup(m, off + sizeof(struct tcphdr), 0);
if (m == NULL) {
TCP_STATINC(TCP_STAT_RCVSHORT);
@@ -1282,7 +1282,7 @@ tcp_input(struct mbuf *m, int off, int p
}
th = (struct tcphdr *)(mtod(m, char *) + off);
}
- KASSERT(ACCESSIBLE_POINTER(th, struct tcp_hdr));
+ KASSERT(ACCESSIBLE_POINTER(th, struct tcphdr));
/*
* Get IP and TCP header.
@@ -1362,7 +1362,7 @@ tcp_input(struct mbuf *m, int off, int p
TCP_STATINC(TCP_STAT_RCVSHORT);
return;
}
- KASSERT(ACCESSIBLE_POINTER(th, struct tcp_hdr));
+ KASSERT(ACCESSIBLE_POINTER(th, struct tcphdr));
optlen = thlen - sizeof(struct tcphdr);
optp = ((u_int8_t *)th) + sizeof(struct tcphdr);
CVS commit: [netbsd-9] src/sys/arch/x86/x86
Module Name:src
Committed By: martin
Date: Fri Feb 19 17:47:13 UTC 2021
Modified Files:
src/sys/arch/x86/x86 [netbsd-9]: intr.c
Log Message:
Pull up following revision(s) (requested by knakahara in ticket #1209):
sys/arch/x86/x86/intr.c: revision 1.154 (via patch)
Fix x86's pci_intr_disestablish clean up routine. Pointed out by t-kusaba@IIJ,
thanks.
Fix panic on x86 by the following code.
sc_ih = pci_intr_establish_xname(sc_pc, ...);
pci_intr_disestablish(sc_pc, sc_ih);
sc_ih = pci_intr_establish(sc_pc, ...);
ena(4) do such processing when ifconfig down/up.
XXX pullup-8,9
To generate a diff of this commit:
cvs rdiff -u -r1.146.2.1 -r1.146.2.2 src/sys/arch/x86/x86/intr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/x86/intr.c
diff -u src/sys/arch/x86/x86/intr.c:1.146.2.1 src/sys/arch/x86/x86/intr.c:1.146.2.2
--- src/sys/arch/x86/x86/intr.c:1.146.2.1 Mon Nov 11 17:20:00 2019
+++ src/sys/arch/x86/x86/intr.c Fri Feb 19 17:47:13 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.c,v 1.146.2.1 2019/11/11 17:20:00 martin Exp $ */
+/* $NetBSD: intr.c,v 1.146.2.2 2021/02/19 17:47:13 martin Exp $ */
/*
* Copyright (c) 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -133,7 +133,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.146.2.1 2019/11/11 17:20:00 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.146.2.2 2021/02/19 17:47:13 martin Exp $");
#include "opt_intrdebug.h"
#include "opt_multiprocessor.h"
@@ -704,6 +704,9 @@ intr_source_free(struct cpu_info *ci, in
ci->ci_isources[slot] = NULL;
if (pic != _pic)
idt_vec_free(idtvec);
+
+ isp->is_recurse = NULL;
+ isp->is_resume = NULL;
}
#ifdef MULTIPROCESSOR
@@ -1042,12 +1045,12 @@ intr_disestablish_xcall(void *arg1, void
else
(*pic->pic_hwunmask)(pic, ih->ih_pin);
- /* Re-enable interrupts. */
- x86_write_psl(psl);
-
/* If the source is free we can drop it now. */
intr_source_free(ci, ih->ih_slot, pic, idtvec);
+ /* Re-enable interrupts. */
+ x86_write_psl(psl);
+
DPRINTF(("%s: remove slot %d (pic %s pin %d vec %d)\n",
device_xname(ci->ci_dev), ih->ih_slot, pic->pic_name,
ih->ih_pin, idtvec));
CVS commit: src/usr.bin/patch
Module Name:src
Committed By: nia
Date: Fri Feb 19 17:46:53 UTC 2021
Modified Files:
src/usr.bin/patch: backupfile.c backupfile.h patch.c
Log Message:
patch: make '-V none' work in the expected way
Internally the code confuses the concept of "the user doesn't want
a backup file" and "the user hasn't defined a type of backup file".
Introduce a new "undefined" backup type to serve the purpose "none"
previously did, and make "none" not generate backup files, as expected.
http://mail-index.netbsd.org/tech-userlevel/2021/02/19/msg012901.html
XXX pullup?
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/usr.bin/patch/backupfile.c
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/patch/backupfile.h
cvs rdiff -u -r1.29 -r1.30 src/usr.bin/patch/patch.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/patch/backupfile.c
diff -u src/usr.bin/patch/backupfile.c:1.15 src/usr.bin/patch/backupfile.c:1.16
--- src/usr.bin/patch/backupfile.c:1.15 Fri Apr 11 17:30:03 2014
+++ src/usr.bin/patch/backupfile.c Fri Feb 19 17:46:53 2021
@@ -1,7 +1,7 @@
/*
* $OpenBSD: backupfile.c,v 1.19 2006/03/11 19:41:30 otto Exp $
* $DragonFly: src/usr.bin/patch/backupfile.c,v 1.5 2008/08/11 00:05:06 joerg Exp $
- * $NetBSD: backupfile.c,v 1.15 2014/04/11 17:30:03 christos Exp $
+ * $NetBSD: backupfile.c,v 1.16 2021/02/19 17:46:53 nia Exp $
*/
/*
@@ -22,7 +22,7 @@
*/
#include
-__RCSID("$NetBSD: backupfile.c,v 1.15 2014/04/11 17:30:03 christos Exp $");
+__RCSID("$NetBSD: backupfile.c,v 1.16 2021/02/19 17:46:53 nia Exp $");
#include
#include
@@ -38,7 +38,7 @@ __RCSID("$NetBSD: backupfile.c,v 1.15 20
#define ISDIGIT(c) (isascii ((unsigned char)c) && isdigit ((unsigned char)c))
/* Which type of backup file names are generated. */
-enum backup_type backup_type = none;
+enum backup_type backup_type = undefined;
/*
* The extension added to file names to produce a simple (as opposed to
Index: src/usr.bin/patch/backupfile.h
diff -u src/usr.bin/patch/backupfile.h:1.6 src/usr.bin/patch/backupfile.h:1.7
--- src/usr.bin/patch/backupfile.h:1.6 Fri Sep 19 18:33:34 2008
+++ src/usr.bin/patch/backupfile.h Fri Feb 19 17:46:53 2021
@@ -1,7 +1,7 @@
/*
* $OpenBSD: backupfile.h,v 1.6 2003/07/28 18:35:36 otto Exp $
* $DragonFly: src/usr.bin/patch/backupfile.h,v 1.3 2007/09/29 23:11:10 swildner Exp $
- * $NetBSD: backupfile.h,v 1.6 2008/09/19 18:33:34 joerg Exp $
+ * $NetBSD: backupfile.h,v 1.7 2021/02/19 17:46:53 nia Exp $
*/
/*
@@ -19,6 +19,8 @@
/* When to make backup files. */
enum backup_type {
+ undefined,
+
/* Never make backups. */
none,
Index: src/usr.bin/patch/patch.c
diff -u src/usr.bin/patch/patch.c:1.29 src/usr.bin/patch/patch.c:1.30
--- src/usr.bin/patch/patch.c:1.29 Tue Sep 6 18:25:14 2011
+++ src/usr.bin/patch/patch.c Fri Feb 19 17:46:53 2021
@@ -1,7 +1,7 @@
/*
* $OpenBSD: patch.c,v 1.45 2007/04/18 21:52:24 sobrado Exp $
* $DragonFly: src/usr.bin/patch/patch.c,v 1.10 2008/08/10 23:39:56 joerg Exp $
- * $NetBSD: patch.c,v 1.29 2011/09/06 18:25:14 joerg Exp $
+ * $NetBSD: patch.c,v 1.30 2021/02/19 17:46:53 nia Exp $
*/
/*
@@ -31,7 +31,7 @@
*/
#include
-__RCSID("$NetBSD: patch.c,v 1.29 2011/09/06 18:25:14 joerg Exp $");
+__RCSID("$NetBSD: patch.c,v 1.30 2021/02/19 17:46:53 nia Exp $");
#include
#include
@@ -197,17 +197,18 @@ main(int argc, char *argv[])
else
simple_backup_suffix = ORIGEXT;
+ if ((v = getenv("PATCH_VERSION_CONTROL")) == NULL)
+ v = getenv("VERSION_CONTROL");
+ if (v != NULL)
+ backup_type = get_version(v);
+
/* parse switches */
Argc = argc;
Argv = argv;
get_some_switches();
- if (backup_type == none) {
- if ((v = getenv("PATCH_VERSION_CONTROL")) == NULL)
- v = getenv("VERSION_CONTROL");
- if (v != NULL || !posix)
- backup_type = get_version(v); /* OK to pass NULL. */
- }
+ if (backup_type == undefined)
+ backup_type = posix ? none : numbered_existing;
/* make sure we clean up /tmp in case of disaster */
set_signals(0);
@@ -493,7 +494,7 @@ get_some_switches(void)
while ((ch = getopt_long(Argc, Argv, options, longopts, NULL)) != -1) {
switch (ch) {
case 'b':
- if (backup_type == none)
+ if (backup_type == undefined)
backup_type = numbered_existing;
if (optarg == NULL)
break;
CVS commit: [netbsd-9] src/sys/arch/x86/x86
Module Name:src Committed By: martin Date: Fri Feb 19 17:47:13 UTC 2021 Modified Files: src/sys/arch/x86/x86 [netbsd-9]: intr.c Log Message: Pull up following revision(s) (requested by knakahara in ticket #1209): sys/arch/x86/x86/intr.c: revision 1.154 (via patch) Fix x86's pci_intr_disestablish clean up routine. Pointed out by t-kusaba@IIJ, thanks. Fix panic on x86 by the following code. sc_ih = pci_intr_establish_xname(sc_pc, ...); pci_intr_disestablish(sc_pc, sc_ih); sc_ih = pci_intr_establish(sc_pc, ...); ena(4) do such processing when ifconfig down/up. XXX pullup-8,9 To generate a diff of this commit: cvs rdiff -u -r1.146.2.1 -r1.146.2.2 src/sys/arch/x86/x86/intr.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/patch
Module Name:src Committed By: nia Date: Fri Feb 19 17:46:53 UTC 2021 Modified Files: src/usr.bin/patch: backupfile.c backupfile.h patch.c Log Message: patch: make '-V none' work in the expected way Internally the code confuses the concept of "the user doesn't want a backup file" and "the user hasn't defined a type of backup file". Introduce a new "undefined" backup type to serve the purpose "none" previously did, and make "none" not generate backup files, as expected. http://mail-index.netbsd.org/tech-userlevel/2021/02/19/msg012901.html XXX pullup? To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/usr.bin/patch/backupfile.c cvs rdiff -u -r1.6 -r1.7 src/usr.bin/patch/backupfile.h cvs rdiff -u -r1.29 -r1.30 src/usr.bin/patch/patch.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/sys/arch/x86/x86
Module Name:src Committed By: martin Date: Fri Feb 19 17:49:19 UTC 2021 Modified Files: src/sys/arch/x86/x86 [netbsd-8]: intr.c Log Message: Pull up following revision(s) (requested by knakahara in ticket #1657): sys/arch/x86/x86/intr.c: revision 1.154 (via patch) Fix x86's pci_intr_disestablish clean up routine. Pointed out by t-kusaba@IIJ, thanks. Fix panic on x86 by the following code. sc_ih = pci_intr_establish_xname(sc_pc, ...); pci_intr_disestablish(sc_pc, sc_ih); sc_ih = pci_intr_establish(sc_pc, ...); ena(4) do such processing when ifconfig down/up. XXX pullup-8,9 To generate a diff of this commit: cvs rdiff -u -r1.101.2.7 -r1.101.2.8 src/sys/arch/x86/x86/intr.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/sys/arch/x86/x86
Module Name:src
Committed By: martin
Date: Fri Feb 19 17:49:19 UTC 2021
Modified Files:
src/sys/arch/x86/x86 [netbsd-8]: intr.c
Log Message:
Pull up following revision(s) (requested by knakahara in ticket #1657):
sys/arch/x86/x86/intr.c: revision 1.154 (via patch)
Fix x86's pci_intr_disestablish clean up routine. Pointed out by t-kusaba@IIJ,
thanks.
Fix panic on x86 by the following code.
sc_ih = pci_intr_establish_xname(sc_pc, ...);
pci_intr_disestablish(sc_pc, sc_ih);
sc_ih = pci_intr_establish(sc_pc, ...);
ena(4) do such processing when ifconfig down/up.
XXX pullup-8,9
To generate a diff of this commit:
cvs rdiff -u -r1.101.2.7 -r1.101.2.8 src/sys/arch/x86/x86/intr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/x86/intr.c
diff -u src/sys/arch/x86/x86/intr.c:1.101.2.7 src/sys/arch/x86/x86/intr.c:1.101.2.8
--- src/sys/arch/x86/x86/intr.c:1.101.2.7 Thu Nov 14 15:58:06 2019
+++ src/sys/arch/x86/x86/intr.c Fri Feb 19 17:49:19 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.c,v 1.101.2.7 2019/11/14 15:58:06 martin Exp $ */
+/* $NetBSD: intr.c,v 1.101.2.8 2021/02/19 17:49:19 martin Exp $ */
/*-
* Copyright (c) 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -133,7 +133,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.101.2.7 2019/11/14 15:58:06 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.101.2.8 2021/02/19 17:49:19 martin Exp $");
#include "opt_intrdebug.h"
#include "opt_multiprocessor.h"
@@ -807,6 +807,9 @@ intr_source_free(struct cpu_info *ci, in
ci->ci_isources[slot] = NULL;
if (pic != _pic)
idt_vec_free(idtvec);
+
+ isp->is_recurse = NULL;
+ isp->is_resume = NULL;
}
#ifdef MULTIPROCESSOR
@@ -1161,12 +1164,12 @@ intr_disestablish_xcall(void *arg1, void
else
(*pic->pic_hwunmask)(pic, ih->ih_pin);
- /* Re-enable interrupts. */
- x86_write_psl(psl);
-
/* If the source is free we can drop it now. */
intr_source_free(ci, ih->ih_slot, pic, idtvec);
+ /* Re-enable interrupts. */
+ x86_write_psl(psl);
+
DPRINTF(("%s: remove slot %d (pic %s pin %d vec %d)\n",
device_xname(ci->ci_dev), ih->ih_slot, pic->pic_name,
ih->ih_pin, idtvec));
CVS commit: src/sys/arch/powerpc/oea
Module Name:src Committed By: thorpej Date: Fri Feb 19 18:02:45 UTC 2021 Modified Files: src/sys/arch/powerpc/oea: ofw_subr.S Log Message: Put back accidental removal of "ofwreal_incharge". To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/arch/powerpc/oea/ofw_subr.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/lib/libarchive
Module Name:src Committed By: martin Date: Fri Feb 19 18:36:50 UTC 2021 Modified Files: src/tests/lib/libarchive: t_libarchive.sh Log Message: PR kern/55272: do not skip this test on single cpu machines - it is not the only test causing the watchdog starvation and we better find and fix the real issue. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/tests/lib/libarchive/t_libarchive.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/lib/libarchive/t_libarchive.sh diff -u src/tests/lib/libarchive/t_libarchive.sh:1.7 src/tests/lib/libarchive/t_libarchive.sh:1.8 --- src/tests/lib/libarchive/t_libarchive.sh:1.7 Fri Aug 28 18:46:05 2020 +++ src/tests/lib/libarchive/t_libarchive.sh Fri Feb 19 18:36:50 2021 @@ -1,4 +1,4 @@ -# $NetBSD: t_libarchive.sh,v 1.7 2020/08/28 18:46:05 christos Exp $ +# $NetBSD: t_libarchive.sh,v 1.8 2021/02/19 18:36:50 martin Exp $ # # Copyright (c) 2020 The NetBSD Foundation, Inc. # All rights reserved. @@ -41,10 +41,6 @@ libarchive_body() if [ $m -lt 400 ]; then atf_skip "Not enough RAM" fi - local ncpu=$( sysctl -n hw.ncpuonline ) - if [ $ncpu -lt 2 ]; then - atf_skip "PR kern/55272: too dangerous to run this test" - fi local d=$(atf_get_srcdir) atf_check -s exit:0 -o 'not-match:^Details for failing tests:.*' \ "$d/h_libarchive" -r "$d"
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Fri Feb 19 17:50:39 UTC 2021 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Ticket #1657 To generate a diff of this commit: cvs rdiff -u -r1.1.2.72 -r1.1.2.73 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: src/sys/arch/powerpc/oea
Module Name:src Committed By: thorpej Date: Fri Feb 19 17:58:43 UTC 2021 Modified Files: src/sys/arch/powerpc/oea: ofw_consinit.c Log Message: Avoid an unused variable warning for the not-building-macppc case. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/sys/arch/powerpc/oea/ofw_consinit.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: Fri Feb 19 17:50:39 UTC 2021 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Ticket #1657 To generate a diff of this commit: cvs rdiff -u -r1.1.2.72 -r1.1.2.73 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.72 src/doc/CHANGES-8.3:1.1.2.73 --- src/doc/CHANGES-8.3:1.1.2.72 Wed Feb 17 09:56:53 2021 +++ src/doc/CHANGES-8.3 Fri Feb 19 17:50:39 2021 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.3,v 1.1.2.72 2021/02/17 09:56:53 martin Exp $ +# $NetBSD: CHANGES-8.3,v 1.1.2.73 2021/02/19 17:50:39 martin Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -1729,3 +1729,8 @@ external/mit/xorg/bin/xterm/Makefile 1. for combining characters. [mrg, ticket #1656] +sys/arch/x86/x86/intr.c1.154 (patch) + + x86: fix pci_intr_disestablish clean up routine. + [knakahara, ticket #1657] +
CVS commit: src/sys/arch/powerpc/oea
Module Name:src
Committed By: thorpej
Date: Fri Feb 19 17:58:43 UTC 2021
Modified Files:
src/sys/arch/powerpc/oea: ofw_consinit.c
Log Message:
Avoid an unused variable warning for the not-building-macppc case.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/powerpc/oea/ofw_consinit.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/powerpc/oea/ofw_consinit.c
diff -u src/sys/arch/powerpc/oea/ofw_consinit.c:1.21 src/sys/arch/powerpc/oea/ofw_consinit.c:1.22
--- src/sys/arch/powerpc/oea/ofw_consinit.c:1.21 Fri Feb 19 05:23:53 2021
+++ src/sys/arch/powerpc/oea/ofw_consinit.c Fri Feb 19 17:58:43 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ofw_consinit.c,v 1.21 2021/02/19 05:23:53 thorpej Exp $ */
+/* $NetBSD: ofw_consinit.c,v 1.22 2021/02/19 17:58:43 thorpej Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ofw_consinit.c,v 1.21 2021/02/19 05:23:53 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofw_consinit.c,v 1.22 2021/02/19 17:58:43 thorpej Exp $");
#include "adb.h"
#include "adbkbd.h"
@@ -134,12 +134,10 @@ cninit(void)
OFPRINTF("console type: %s\n", name);
if (strcmp(name, "serial") == 0) {
- struct consdev *cp;
-
#ifdef PMAC_G5
/* The MMU hasn't been initialized yet, use failsafe for now */
extern struct consdev failsafe_cons;
- cp = _cons;
+ struct consdev *cp = _cons;
cn_tab = cp;
(*cp->cn_probe)(cp);
(*cp->cn_init)(cp);
@@ -150,7 +148,7 @@ cninit(void)
#if (NZSTTY > 0) && !defined(MAMBO)
OF_getprop(console_node, "name", name, sizeof(name));
if (strcmp(name, "ch-a") == 0 || strcmp(name, "ch-b") == 0) {
- cp = _zs;
+ struct consdev *cp = _zs;
(*cp->cn_probe)(cp);
(*cp->cn_init)(cp);
cn_tab = cp;
CVS commit: src/sys/arch/powerpc/oea
Module Name:src Committed By: thorpej Date: Fri Feb 19 18:03:21 UTC 2021 Modified Files: src/sys/arch/powerpc/oea: ofw_subr.S Log Message: ofwreal_incharge does not need to be global. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/arch/powerpc/oea/ofw_subr.S 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/powerpc/oea/ofw_subr.S diff -u src/sys/arch/powerpc/oea/ofw_subr.S:1.16 src/sys/arch/powerpc/oea/ofw_subr.S:1.17 --- src/sys/arch/powerpc/oea/ofw_subr.S:1.16 Fri Feb 19 18:02:45 2021 +++ src/sys/arch/powerpc/oea/ofw_subr.S Fri Feb 19 18:03:21 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: ofw_subr.S,v 1.16 2021/02/19 18:02:45 thorpej Exp $ */ +/* $NetBSD: ofw_subr.S,v 1.17 2021/02/19 18:03:21 thorpej Exp $ */ /* * Copyright (C) 1995, 1996 Wolfgang Solfrank. @@ -55,7 +55,7 @@ .comm ofwmsr,20,4 #ifdef FIRMWORKSBUGS - .comm ofwreal_incharge,4,4 + .lcomm ofwreal_incharge,4,4 #endif /*
CVS commit: src/sys/arch/powerpc/oea
Module Name:src Committed By: thorpej Date: Fri Feb 19 18:03:21 UTC 2021 Modified Files: src/sys/arch/powerpc/oea: ofw_subr.S Log Message: ofwreal_incharge does not need to be global. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/arch/powerpc/oea/ofw_subr.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/powerpc/oea
Module Name:src Committed By: thorpej Date: Fri Feb 19 18:02:45 UTC 2021 Modified Files: src/sys/arch/powerpc/oea: ofw_subr.S Log Message: Put back accidental removal of "ofwreal_incharge". To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/arch/powerpc/oea/ofw_subr.S 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/powerpc/oea/ofw_subr.S diff -u src/sys/arch/powerpc/oea/ofw_subr.S:1.15 src/sys/arch/powerpc/oea/ofw_subr.S:1.16 --- src/sys/arch/powerpc/oea/ofw_subr.S:1.15 Thu Feb 18 18:31:22 2021 +++ src/sys/arch/powerpc/oea/ofw_subr.S Fri Feb 19 18:02:45 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: ofw_subr.S,v 1.15 2021/02/18 18:31:22 thorpej Exp $ */ +/* $NetBSD: ofw_subr.S,v 1.16 2021/02/19 18:02:45 thorpej Exp $ */ /* * Copyright (C) 1995, 1996 Wolfgang Solfrank. @@ -54,6 +54,10 @@ .globl ofwmsr .comm ofwmsr,20,4 +#ifdef FIRMWORKSBUGS + .comm ofwreal_incharge,4,4 +#endif + /* * Called by start to save the initial OFW state so we can restore it * when call back to OFW.
CVS commit: src/sys/arch/powerpc/oea
Module Name:src
Committed By: thorpej
Date: Fri Feb 19 18:10:51 UTC 2021
Modified Files:
src/sys/arch/powerpc/oea: ofwoea_machdep.c
Log Message:
Update some #ifdef PMAC_G5 for previous change that I missed before.
To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/powerpc/oea/ofwoea_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/powerpc/oea/ofwoea_machdep.c
diff -u src/sys/arch/powerpc/oea/ofwoea_machdep.c:1.52 src/sys/arch/powerpc/oea/ofwoea_machdep.c:1.53
--- src/sys/arch/powerpc/oea/ofwoea_machdep.c:1.52 Fri Feb 19 05:21:39 2021
+++ src/sys/arch/powerpc/oea/ofwoea_machdep.c Fri Feb 19 18:10:51 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ofwoea_machdep.c,v 1.52 2021/02/19 05:21:39 thorpej Exp $ */
+/* $NetBSD: ofwoea_machdep.c,v 1.53 2021/02/19 18:10:51 thorpej Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ofwoea_machdep.c,v 1.52 2021/02/19 05:21:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofwoea_machdep.c,v 1.53 2021/02/19 18:10:51 thorpej Exp $");
#include "ksyms.h"
#include "wsdisplay.h"
@@ -242,6 +242,7 @@ ofwoea_initppc(u_int startkernel, u_int
if (oeacpufeat & OEACPU_64_BRIDGE) {
vaddr_t va;
paddr_t pa;
+ vsize_t size;
int i;
pmap_setup_segment0_map(0, msgbuf_paddr, msgbuf_paddr,
@@ -249,12 +250,22 @@ ofwoea_initppc(u_int startkernel, u_int
/* Map OFW code+data */
- for (i = 0; i < ofmaplen / sizeof(struct ofw_translations); i++) {
- if (ofmap[i].va < 0xff80)
+ for (i = 0; i < __arraycount(ofw_translations); i++) {
+ va = ofw_translations[i].virt;
+ size = ofw_translations[i].size;
+ pa = ofw_translations[i].phys;
+ /* XXX mode */
+
+ if (size == 0) {
+/* No more, all done! */
+break;
+ }
+
+ if (va < 0xff80)
continue;
- for (va = ofmap[i].va, pa = ofmap[i].pa;
- va < ofmap[i].va + ofmap[i].len;
+
+ for (; va < (ofw_translations[i].virt + size);
va += PAGE_SIZE, pa += PAGE_SIZE) {
pmap_enter(pmap_kernel(), va, pa, VM_PROT_ALL,
VM_PROT_ALL | PMAP_WIRED);
CVS commit: src/sys/arch/powerpc/oea
Module Name:src Committed By: thorpej Date: Fri Feb 19 18:10:51 UTC 2021 Modified Files: src/sys/arch/powerpc/oea: ofwoea_machdep.c Log Message: Update some #ifdef PMAC_G5 for previous change that I missed before. To generate a diff of this commit: cvs rdiff -u -r1.52 -r1.53 src/sys/arch/powerpc/oea/ofwoea_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/arch/powerpc/oea
Module Name:src Committed By: thorpej Date: Fri Feb 19 18:05:42 UTC 2021 Modified Files: src/sys/arch/powerpc/oea: ofw_consinit.c Log Message: Fix the previously differently. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/sys/arch/powerpc/oea/ofw_consinit.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/powerpc/oea
Module Name:src
Committed By: thorpej
Date: Fri Feb 19 18:05:42 UTC 2021
Modified Files:
src/sys/arch/powerpc/oea: ofw_consinit.c
Log Message:
Fix the previously differently.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/powerpc/oea/ofw_consinit.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/powerpc/oea/ofw_consinit.c
diff -u src/sys/arch/powerpc/oea/ofw_consinit.c:1.22 src/sys/arch/powerpc/oea/ofw_consinit.c:1.23
--- src/sys/arch/powerpc/oea/ofw_consinit.c:1.22 Fri Feb 19 17:58:43 2021
+++ src/sys/arch/powerpc/oea/ofw_consinit.c Fri Feb 19 18:05:42 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ofw_consinit.c,v 1.22 2021/02/19 17:58:43 thorpej Exp $ */
+/* $NetBSD: ofw_consinit.c,v 1.23 2021/02/19 18:05:42 thorpej Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ofw_consinit.c,v 1.22 2021/02/19 17:58:43 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofw_consinit.c,v 1.23 2021/02/19 18:05:42 thorpej Exp $");
#include "adb.h"
#include "adbkbd.h"
@@ -137,10 +137,9 @@ cninit(void)
#ifdef PMAC_G5
/* The MMU hasn't been initialized yet, use failsafe for now */
extern struct consdev failsafe_cons;
- struct consdev *cp = _cons;
- cn_tab = cp;
- (*cp->cn_probe)(cp);
- (*cp->cn_init)(cp);
+ cn_tab = _cons;
+ (*cn_tab->cn_probe)(cn_tab);
+ (*cn_tab->cn_init)(cn_tab);
aprint_verbose("Early G5 console initialized\n");
return;
#endif /* PMAC_G5 */
@@ -148,10 +147,9 @@ cninit(void)
#if (NZSTTY > 0) && !defined(MAMBO)
OF_getprop(console_node, "name", name, sizeof(name));
if (strcmp(name, "ch-a") == 0 || strcmp(name, "ch-b") == 0) {
- struct consdev *cp = _zs;
- (*cp->cn_probe)(cp);
- (*cp->cn_init)(cp);
- cn_tab = cp;
+ cn_tab = _zs;
+ (*cn_tab->cn_probe)(cn_tab);
+ (*cn_tab->cn_init)(cn_tab);
}
return;
#endif /* NZTTY */
CVS commit: src/tests/lib/libarchive
Module Name:src Committed By: martin Date: Fri Feb 19 18:36:50 UTC 2021 Modified Files: src/tests/lib/libarchive: t_libarchive.sh Log Message: PR kern/55272: do not skip this test on single cpu machines - it is not the only test causing the watchdog starvation and we better find and fix the real issue. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/tests/lib/libarchive/t_libarchive.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/xlint
Module Name:src Committed By: rillig Date: Fri Feb 19 22:20:18 UTC 2021 Modified Files: src/usr.bin/xlint/common: tyname.c src/usr.bin/xlint/lint1: decl.c emit1.c func.c lint1.h Log Message: lint: rename tenum_t and its members to be more expressive To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/usr.bin/xlint/common/tyname.c cvs rdiff -u -r1.134 -r1.135 src/usr.bin/xlint/lint1/decl.c cvs rdiff -u -r1.40 -r1.41 src/usr.bin/xlint/lint1/emit1.c cvs rdiff -u -r1.69 -r1.70 src/usr.bin/xlint/lint1/func.c cvs rdiff -u -r1.62 -r1.63 src/usr.bin/xlint/lint1/lint1.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/xlint
Module Name:src
Committed By: rillig
Date: Fri Feb 19 22:20:18 UTC 2021
Modified Files:
src/usr.bin/xlint/common: tyname.c
src/usr.bin/xlint/lint1: decl.c emit1.c func.c lint1.h
Log Message:
lint: rename tenum_t and its members to be more expressive
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/usr.bin/xlint/common/tyname.c
cvs rdiff -u -r1.134 -r1.135 src/usr.bin/xlint/lint1/decl.c
cvs rdiff -u -r1.40 -r1.41 src/usr.bin/xlint/lint1/emit1.c
cvs rdiff -u -r1.69 -r1.70 src/usr.bin/xlint/lint1/func.c
cvs rdiff -u -r1.62 -r1.63 src/usr.bin/xlint/lint1/lint1.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/xlint/common/tyname.c
diff -u src/usr.bin/xlint/common/tyname.c:1.27 src/usr.bin/xlint/common/tyname.c:1.28
--- src/usr.bin/xlint/common/tyname.c:1.27 Fri Feb 19 22:16:12 2021
+++ src/usr.bin/xlint/common/tyname.c Fri Feb 19 22:20:18 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: tyname.c,v 1.27 2021/02/19 22:16:12 rillig Exp $ */
+/* $NetBSD: tyname.c,v 1.28 2021/02/19 22:20:18 rillig Exp $ */
/*-
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: tyname.c,v 1.27 2021/02/19 22:16:12 rillig Exp $");
+__RCSID("$NetBSD: tyname.c,v 1.28 2021/02/19 22:20:18 rillig Exp $");
#endif
#include
@@ -230,8 +230,8 @@ sametype(const type_t *t1, const type_t
return sametype(t1->t_subt, t2->t_subt);
case ENUM:
#ifdef t_enum
- return strcmp(t1->t_enum->etag->s_name,
- t2->t_enum->etag->s_name) == 0;
+ return strcmp(t1->t_enum->en_tag->s_name,
+ t2->t_enum->en_tag->s_name) == 0;
#else
return true;
#endif
@@ -339,7 +339,7 @@ type_name(const type_t *tp)
case ENUM:
buf_add(, " ");
#ifdef t_enum
- buf_add(, tp->t_enum->etag->s_name);
+ buf_add(, tp->t_enum->en_tag->s_name);
#else
buf_add(,
tp->t_isuniqpos ? "*anonymous*" : tp->t_tag->h_name);
Index: src/usr.bin/xlint/lint1/decl.c
diff -u src/usr.bin/xlint/lint1/decl.c:1.134 src/usr.bin/xlint/lint1/decl.c:1.135
--- src/usr.bin/xlint/lint1/decl.c:1.134 Fri Feb 19 22:16:12 2021
+++ src/usr.bin/xlint/lint1/decl.c Fri Feb 19 22:20:18 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: decl.c,v 1.134 2021/02/19 22:16:12 rillig Exp $ */
+/* $NetBSD: decl.c,v 1.135 2021/02/19 22:20:18 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -38,7 +38,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: decl.c,v 1.134 2021/02/19 22:16:12 rillig Exp $");
+__RCSID("$NetBSD: decl.c,v 1.135 2021/02/19 22:20:18 rillig Exp $");
#endif
#include
@@ -183,7 +183,7 @@ is_incomplete(const type_t *tp)
} else if (t == STRUCT || t == UNION) {
return tp->t_str->sou_incomplete;
} else if (t == ENUM) {
- return tp->t_enum->eincompl;
+ return tp->t_enum->en_incomplete;
}
return false;
}
@@ -202,7 +202,7 @@ setcomplete(type_t *tp, bool complete)
tp->t_str->sou_incomplete = !complete;
} else {
lint_assert(t == ENUM);
- tp->t_enum->eincompl = !complete;
+ tp->t_enum->en_incomplete = !complete;
}
}
@@ -485,8 +485,8 @@ settdsym(type_t *tp, sym_t *sym)
if (tp->t_str->sou_first_typedef == NULL)
tp->t_str->sou_first_typedef = sym;
} else if (t == ENUM) {
- if (tp->t_enum->etdef == NULL)
- tp->t_enum->etdef = sym;
+ if (tp->t_enum->en_first_typedef == NULL)
+ tp->t_enum->en_first_typedef = sym;
}
}
@@ -1667,7 +1667,7 @@ mktag(sym_t *tag, tspec_t kind, bool dec
} else {
tp->t_isenum = true;
tp->t_enum = getblk(sizeof(*tp->t_enum));
- tp->t_enum->etag = tag;
+ tp->t_enum->en_tag = tag;
}
setcomplete(tp, false);
}
@@ -1813,7 +1813,7 @@ complete_tag_enum(type_t *tp, sym_t *fme
{
setcomplete(tp, true);
- tp->t_enum->elem = fmem;
+ tp->t_enum->en_first_enumerator = fmem;
return tp;
}
Index: src/usr.bin/xlint/lint1/emit1.c
diff -u src/usr.bin/xlint/lint1/emit1.c:1.40 src/usr.bin/xlint/lint1/emit1.c:1.41
--- src/usr.bin/xlint/lint1/emit1.c:1.40 Fri Feb 19 22:16:12 2021
+++ src/usr.bin/xlint/lint1/emit1.c Fri Feb 19 22:20:18 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: emit1.c,v 1.40 2021/02/19 22:16:12 rillig Exp $ */
+/* $NetBSD: emit1.c,v 1.41 2021/02/19 22:20:18 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -38,7 +38,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: emit1.c,v 1.40 2021/02/19 22:16:12 rillig Exp $");
+__RCSID("$NetBSD: emit1.c,v 1.41 2021/02/19 22:20:18 rillig Exp $");
#endif
#include
@@ -140,7 +140,7 @@ outtype(const type_t *tp)
if (ts == ARRAY) {
outint(tp->t_dim);
} else if (ts == ENUM) {
- outtt(tp->t_enum->etag, tp->t_enum->etdef);
+ outtt(tp->t_enum->en_tag, tp->t_enum->en_first_typedef);
} else if (ts == STRUCT || ts == UNION) {
outtt(tp->t_str->sou_tag, tp->t_str->sou_first_typedef);
} else
CVS commit: src/usr.bin/xlint/lint1
Module Name:src Committed By: rillig Date: Fri Feb 19 21:35:44 UTC 2021 Modified Files: src/usr.bin/xlint/lint1: func.c lint1.h Log Message: lint: replace cryptic sym.s_rimpl with expressive name No functional change. To generate a diff of this commit: cvs rdiff -u -r1.68 -r1.69 src/usr.bin/xlint/lint1/func.c cvs rdiff -u -r1.60 -r1.61 src/usr.bin/xlint/lint1/lint1.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/xlint/lint1
Module Name:src
Committed By: rillig
Date: Fri Feb 19 21:35:44 UTC 2021
Modified Files:
src/usr.bin/xlint/lint1: func.c lint1.h
Log Message:
lint: replace cryptic sym.s_rimpl with expressive name
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 src/usr.bin/xlint/lint1/func.c
cvs rdiff -u -r1.60 -r1.61 src/usr.bin/xlint/lint1/lint1.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/xlint/lint1/func.c
diff -u src/usr.bin/xlint/lint1/func.c:1.68 src/usr.bin/xlint/lint1/func.c:1.69
--- src/usr.bin/xlint/lint1/func.c:1.68 Fri Feb 19 12:28:56 2021
+++ src/usr.bin/xlint/lint1/func.c Fri Feb 19 21:35:44 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: func.c,v 1.68 2021/02/19 12:28:56 rillig Exp $ */
+/* $NetBSD: func.c,v 1.69 2021/02/19 21:35:44 rillig Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -37,7 +37,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: func.c,v 1.68 2021/02/19 12:28:56 rillig Exp $");
+__RCSID("$NetBSD: func.c,v 1.69 2021/02/19 21:35:44 rillig Exp $");
#endif
#include
@@ -332,8 +332,7 @@ funcdef(sym_t *fsym)
}
if (dcs->d_notyp)
- /* return value is implicitly declared to be int */
- fsym->s_rimpl = true;
+ fsym->s_return_type_implicit_int = true;
reached = true;
}
@@ -350,7 +349,7 @@ funcend(void)
if (reached) {
cstmt->c_had_return_noval = true;
if (funcsym->s_type->t_subt->t_tspec != VOID &&
- !funcsym->s_rimpl) {
+ !funcsym->s_return_type_implicit_int) {
/* func. %s falls off bottom without returning value */
warning(217, funcsym->s_name);
}
@@ -362,7 +361,7 @@ funcend(void)
* has already printed a warning.
*/
if (cstmt->c_had_return_noval && cstmt->c_had_return_value &&
- funcsym->s_rimpl)
+ funcsym->s_return_type_implicit_int)
/* function %s has return (e); and return; */
warning(216, funcsym->s_name);
@@ -992,7 +991,7 @@ doreturn(tnode_t *tn)
* Assume that the function has a return value only if it
* is explicitly declared.
*/
- if (!funcsym->s_rimpl)
+ if (!funcsym->s_return_type_implicit_int)
/* function %s expects to return value */
warning(214, funcsym->s_name);
}
Index: src/usr.bin/xlint/lint1/lint1.h
diff -u src/usr.bin/xlint/lint1/lint1.h:1.60 src/usr.bin/xlint/lint1/lint1.h:1.61
--- src/usr.bin/xlint/lint1/lint1.h:1.60 Sat Jan 23 22:20:17 2021
+++ src/usr.bin/xlint/lint1/lint1.h Fri Feb 19 21:35:44 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: lint1.h,v 1.60 2021/01/23 22:20:17 rillig Exp $ */
+/* $NetBSD: lint1.h,v 1.61 2021/02/19 21:35:44 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -234,7 +234,7 @@ typedef struct sym {
bool s_reg : 1; /* symbol is register variable */
bool s_defarg : 1; /* undefined symbol in old style function
definition */
- bool s_rimpl : 1; /* return value of function implicit decl. */
+ bool s_return_type_implicit_int : 1;
bool s_osdef : 1; /* symbol stems from old style function def. */
bool s_inline : 1; /* true if this is an inline function */
struct sym *s_ext_sym; /* for local declared external symbols pointer
CVS commit: src/usr.bin/xlint
Module Name:src
Committed By: rillig
Date: Fri Feb 19 22:27:49 UTC 2021
Modified Files:
src/usr.bin/xlint/common: tyname.c
src/usr.bin/xlint/lint1: decl.c emit1.c func.c lint1.h tree.c
src/usr.bin/xlint/lint2: chk.c emit2.c lint2.h read.c
Log Message:
lint: rename t_isenum and t_aincompl to be more expressive
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/usr.bin/xlint/common/tyname.c
cvs rdiff -u -r1.135 -r1.136 src/usr.bin/xlint/lint1/decl.c
cvs rdiff -u -r1.41 -r1.42 src/usr.bin/xlint/lint1/emit1.c
cvs rdiff -u -r1.70 -r1.71 src/usr.bin/xlint/lint1/func.c
cvs rdiff -u -r1.63 -r1.64 src/usr.bin/xlint/lint1/lint1.h
cvs rdiff -u -r1.208 -r1.209 src/usr.bin/xlint/lint1/tree.c
cvs rdiff -u -r1.37 -r1.38 src/usr.bin/xlint/lint2/chk.c
cvs rdiff -u -r1.15 -r1.16 src/usr.bin/xlint/lint2/emit2.c
cvs rdiff -u -r1.12 -r1.13 src/usr.bin/xlint/lint2/lint2.h
cvs rdiff -u -r1.38 -r1.39 src/usr.bin/xlint/lint2/read.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/xlint/common/tyname.c
diff -u src/usr.bin/xlint/common/tyname.c:1.28 src/usr.bin/xlint/common/tyname.c:1.29
--- src/usr.bin/xlint/common/tyname.c:1.28 Fri Feb 19 22:20:18 2021
+++ src/usr.bin/xlint/common/tyname.c Fri Feb 19 22:27:49 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: tyname.c,v 1.28 2021/02/19 22:20:18 rillig Exp $ */
+/* $NetBSD: tyname.c,v 1.29 2021/02/19 22:27:49 rillig Exp $ */
/*-
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: tyname.c,v 1.28 2021/02/19 22:20:18 rillig Exp $");
+__RCSID("$NetBSD: tyname.c,v 1.29 2021/02/19 22:27:49 rillig Exp $");
#endif
#include
@@ -294,7 +294,7 @@ type_name(const type_t *tp)
* XXX: Why is this necessary, and in which cases does this apply?
* Shouldn't the type be an ENUM from the beginning?
*/
- if ((t = tp->t_tspec) == INT && tp->t_isenum)
+ if ((t = tp->t_tspec) == INT && tp->t_is_enum)
t = ENUM;
buf_init();
Index: src/usr.bin/xlint/lint1/decl.c
diff -u src/usr.bin/xlint/lint1/decl.c:1.135 src/usr.bin/xlint/lint1/decl.c:1.136
--- src/usr.bin/xlint/lint1/decl.c:1.135 Fri Feb 19 22:20:18 2021
+++ src/usr.bin/xlint/lint1/decl.c Fri Feb 19 22:27:49 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: decl.c,v 1.135 2021/02/19 22:20:18 rillig Exp $ */
+/* $NetBSD: decl.c,v 1.136 2021/02/19 22:27:49 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -38,7 +38,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: decl.c,v 1.135 2021/02/19 22:20:18 rillig Exp $");
+__RCSID("$NetBSD: decl.c,v 1.136 2021/02/19 22:27:49 rillig Exp $");
#endif
#include
@@ -179,7 +179,7 @@ is_incomplete(const type_t *tp)
if ((t = tp->t_tspec) == VOID) {
return true;
} else if (t == ARRAY) {
- return tp->t_aincompl;
+ return tp->t_incomplete_array;
} else if (t == STRUCT || t == UNION) {
return tp->t_str->sou_incomplete;
} else if (t == ENUM) {
@@ -197,7 +197,7 @@ setcomplete(type_t *tp, bool complete)
tspec_t t;
if ((t = tp->t_tspec) == ARRAY) {
- tp->t_aincompl = !complete;
+ tp->t_incomplete_array = !complete;
} else if (t == STRUCT || t == UNION) {
tp->t_str->sou_incomplete = !complete;
} else {
@@ -1665,7 +1665,7 @@ mktag(sym_t *tag, tspec_t kind, bool dec
tp->t_str->sou_align_in_bit = CHAR_SIZE;
tp->t_str->sou_tag = tag;
} else {
- tp->t_isenum = true;
+ tp->t_is_enum = true;
tp->t_enum = getblk(sizeof(*tp->t_enum));
tp->t_enum->en_tag = tag;
}
Index: src/usr.bin/xlint/lint1/emit1.c
diff -u src/usr.bin/xlint/lint1/emit1.c:1.41 src/usr.bin/xlint/lint1/emit1.c:1.42
--- src/usr.bin/xlint/lint1/emit1.c:1.41 Fri Feb 19 22:20:18 2021
+++ src/usr.bin/xlint/lint1/emit1.c Fri Feb 19 22:27:49 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: emit1.c,v 1.41 2021/02/19 22:20:18 rillig Exp $ */
+/* $NetBSD: emit1.c,v 1.42 2021/02/19 22:27:49 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -38,7 +38,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: emit1.c,v 1.41 2021/02/19 22:20:18 rillig Exp $");
+__RCSID("$NetBSD: emit1.c,v 1.42 2021/02/19 22:27:49 rillig Exp $");
#endif
#include
@@ -99,7 +99,7 @@ outtype(const type_t *tp)
tspec_t ts;
while (tp != NULL) {
- if ((ts = tp->t_tspec) == INT && tp->t_isenum)
+ if ((ts = tp->t_tspec) == INT && tp->t_is_enum)
ts = ENUM;
switch (ts) {
case BOOL: t = 'B'; s = '\0'; break;
Index: src/usr.bin/xlint/lint1/func.c
diff -u src/usr.bin/xlint/lint1/func.c:1.70 src/usr.bin/xlint/lint1/func.c:1.71
--- src/usr.bin/xlint/lint1/func.c:1.70 Fri Feb 19 22:20:18 2021
+++ src/usr.bin/xlint/lint1/func.c Fri Feb 19 22:27:49 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: func.c,v 1.70 2021/02/19 22:20:18 rillig Exp $ */
+/* $NetBSD: func.c,v 1.71
CVS commit: src/usr.bin/xlint
Module Name:src Committed By: rillig Date: Fri Feb 19 22:27:49 UTC 2021 Modified Files: src/usr.bin/xlint/common: tyname.c src/usr.bin/xlint/lint1: decl.c emit1.c func.c lint1.h tree.c src/usr.bin/xlint/lint2: chk.c emit2.c lint2.h read.c Log Message: lint: rename t_isenum and t_aincompl to be more expressive No functional change. To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/usr.bin/xlint/common/tyname.c cvs rdiff -u -r1.135 -r1.136 src/usr.bin/xlint/lint1/decl.c cvs rdiff -u -r1.41 -r1.42 src/usr.bin/xlint/lint1/emit1.c cvs rdiff -u -r1.70 -r1.71 src/usr.bin/xlint/lint1/func.c cvs rdiff -u -r1.63 -r1.64 src/usr.bin/xlint/lint1/lint1.h cvs rdiff -u -r1.208 -r1.209 src/usr.bin/xlint/lint1/tree.c cvs rdiff -u -r1.37 -r1.38 src/usr.bin/xlint/lint2/chk.c cvs rdiff -u -r1.15 -r1.16 src/usr.bin/xlint/lint2/emit2.c cvs rdiff -u -r1.12 -r1.13 src/usr.bin/xlint/lint2/lint2.h cvs rdiff -u -r1.38 -r1.39 src/usr.bin/xlint/lint2/read.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/xlint
Module Name:src Committed By: rillig Date: Fri Feb 19 22:16:12 UTC 2021 Modified Files: src/usr.bin/xlint/common: tyname.c src/usr.bin/xlint/lint1: cgram.y decl.c emit1.c init.c lint1.h tree.c Log Message: lint: rename str_t and its members to be more expressive No functional change. To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/usr.bin/xlint/common/tyname.c cvs rdiff -u -r1.160 -r1.161 src/usr.bin/xlint/lint1/cgram.y cvs rdiff -u -r1.133 -r1.134 src/usr.bin/xlint/lint1/decl.c cvs rdiff -u -r1.39 -r1.40 src/usr.bin/xlint/lint1/emit1.c cvs rdiff -u -r1.66 -r1.67 src/usr.bin/xlint/lint1/init.c cvs rdiff -u -r1.61 -r1.62 src/usr.bin/xlint/lint1/lint1.h cvs rdiff -u -r1.207 -r1.208 src/usr.bin/xlint/lint1/tree.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/xlint
Module Name:src
Committed By: rillig
Date: Fri Feb 19 22:16:12 UTC 2021
Modified Files:
src/usr.bin/xlint/common: tyname.c
src/usr.bin/xlint/lint1: cgram.y decl.c emit1.c init.c lint1.h tree.c
Log Message:
lint: rename str_t and its members to be more expressive
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/usr.bin/xlint/common/tyname.c
cvs rdiff -u -r1.160 -r1.161 src/usr.bin/xlint/lint1/cgram.y
cvs rdiff -u -r1.133 -r1.134 src/usr.bin/xlint/lint1/decl.c
cvs rdiff -u -r1.39 -r1.40 src/usr.bin/xlint/lint1/emit1.c
cvs rdiff -u -r1.66 -r1.67 src/usr.bin/xlint/lint1/init.c
cvs rdiff -u -r1.61 -r1.62 src/usr.bin/xlint/lint1/lint1.h
cvs rdiff -u -r1.207 -r1.208 src/usr.bin/xlint/lint1/tree.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/xlint/common/tyname.c
diff -u src/usr.bin/xlint/common/tyname.c:1.26 src/usr.bin/xlint/common/tyname.c:1.27
--- src/usr.bin/xlint/common/tyname.c:1.26 Tue Jan 26 18:38:57 2021
+++ src/usr.bin/xlint/common/tyname.c Fri Feb 19 22:16:12 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: tyname.c,v 1.26 2021/01/26 18:38:57 rillig Exp $ */
+/* $NetBSD: tyname.c,v 1.27 2021/02/19 22:16:12 rillig Exp $ */
/*-
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: tyname.c,v 1.26 2021/01/26 18:38:57 rillig Exp $");
+__RCSID("$NetBSD: tyname.c,v 1.27 2021/02/19 22:16:12 rillig Exp $");
#endif
#include
@@ -238,8 +238,8 @@ sametype(const type_t *t1, const type_t
case STRUCT:
case UNION:
#ifdef t_str
- return strcmp(t1->t_str->stag->s_name,
- t2->t_str->stag->s_name) == 0;
+ return strcmp(t1->t_str->sou_tag->s_name,
+ t2->t_str->sou_tag->s_name) == 0;
#else
return true;
#endif
@@ -349,7 +349,7 @@ type_name(const type_t *tp)
case UNION:
buf_add(, " ");
#ifdef t_str
- buf_add(, tp->t_str->stag->s_name);
+ buf_add(, tp->t_str->sou_tag->s_name);
#else
buf_add(,
tp->t_isuniqpos ? "*anonymous*" : tp->t_tag->h_name);
Index: src/usr.bin/xlint/lint1/cgram.y
diff -u src/usr.bin/xlint/lint1/cgram.y:1.160 src/usr.bin/xlint/lint1/cgram.y:1.161
--- src/usr.bin/xlint/lint1/cgram.y:1.160 Sun Jan 31 12:44:34 2021
+++ src/usr.bin/xlint/lint1/cgram.y Fri Feb 19 22:16:12 2021
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: cgram.y,v 1.160 2021/01/31 12:44:34 rillig Exp $ */
+/* $NetBSD: cgram.y,v 1.161 2021/02/19 22:16:12 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -35,7 +35,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: cgram.y,v 1.160 2021/01/31 12:44:34 rillig Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.161 2021/02/19 22:16:12 rillig Exp $");
#endif
#include
@@ -802,7 +802,7 @@ member_declaration:
/* anonymous struct/union members is a C9X feature */
warning(49);
/* add all the members of the anonymous struct/union */
- $$ = dcs->d_type->t_str->memb;
+ $$ = dcs->d_type->t_str->sou_first_member;
anonymize($$);
}
| noclass_declspecs deftyp opt_type_attribute {
@@ -811,7 +811,7 @@ member_declaration:
if (!Sflag)
/* anonymous struct/union members is a C9X feature */
warning(49);
- $$ = dcs->d_type->t_str->memb;
+ $$ = dcs->d_type->t_str->sou_first_member;
/* add all the members of the anonymous struct/union */
anonymize($$);
}
Index: src/usr.bin/xlint/lint1/decl.c
diff -u src/usr.bin/xlint/lint1/decl.c:1.133 src/usr.bin/xlint/lint1/decl.c:1.134
--- src/usr.bin/xlint/lint1/decl.c:1.133 Sun Jan 31 11:23:01 2021
+++ src/usr.bin/xlint/lint1/decl.c Fri Feb 19 22:16:12 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: decl.c,v 1.133 2021/01/31 11:23:01 rillig Exp $ */
+/* $NetBSD: decl.c,v 1.134 2021/02/19 22:16:12 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -38,7 +38,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: decl.c,v 1.133 2021/01/31 11:23:01 rillig Exp $");
+__RCSID("$NetBSD: decl.c,v 1.134 2021/02/19 22:16:12 rillig Exp $");
#endif
#include
@@ -181,7 +181,7 @@ is_incomplete(const type_t *tp)
} else if (t == ARRAY) {
return tp->t_aincompl;
} else if (t == STRUCT || t == UNION) {
- return tp->t_str->sincompl;
+ return tp->t_str->sou_incomplete;
} else if (t == ENUM) {
return tp->t_enum->eincompl;
}
@@ -199,7 +199,7 @@ setcomplete(type_t *tp, bool complete)
if ((t = tp->t_tspec) == ARRAY) {
tp->t_aincompl = !complete;
} else if (t == STRUCT || t == UNION) {
- tp->t_str->sincompl = !complete;
+ tp->t_str->sou_incomplete = !complete;
} else {
lint_assert(t == ENUM);
tp->t_enum->eincompl = !complete;
@@ -482,8 +482,8 @@ settdsym(type_t *tp, sym_t *sym)
tspec_t t;
if ((t = tp->t_tspec) == STRUCT || t == UNION) {
- if (tp->t_str->stdef == NULL)
- tp->t_str->stdef = sym;
+ if
CVS commit: src/usr.bin/xlint/lint1
Module Name:src
Committed By: rillig
Date: Fri Feb 19 22:35:42 UTC 2021
Modified Files:
src/usr.bin/xlint/lint1: cgram.y decl.c lint1.h
Log Message:
lint: rename storage class constants to be more expressive
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.161 -r1.162 src/usr.bin/xlint/lint1/cgram.y
cvs rdiff -u -r1.136 -r1.137 src/usr.bin/xlint/lint1/decl.c
cvs rdiff -u -r1.64 -r1.65 src/usr.bin/xlint/lint1/lint1.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/xlint/lint1/cgram.y
diff -u src/usr.bin/xlint/lint1/cgram.y:1.161 src/usr.bin/xlint/lint1/cgram.y:1.162
--- src/usr.bin/xlint/lint1/cgram.y:1.161 Fri Feb 19 22:16:12 2021
+++ src/usr.bin/xlint/lint1/cgram.y Fri Feb 19 22:35:42 2021
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: cgram.y,v 1.161 2021/02/19 22:16:12 rillig Exp $ */
+/* $NetBSD: cgram.y,v 1.162 2021/02/19 22:35:42 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -35,7 +35,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: cgram.y,v 1.161 2021/02/19 22:16:12 rillig Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.162 2021/02/19 22:35:42 rillig Exp $");
#endif
#include
@@ -1212,7 +1212,7 @@ param_list:
id_list_lparn:
T_LPAREN {
blklev++;
- pushdecl(PARG);
+ pushdecl(PROTO_ARG);
}
;
@@ -1244,7 +1244,7 @@ abstract_decl_param_list:
abstract_decl_lparn:
T_LPAREN {
blklev++;
- pushdecl(PARG);
+ pushdecl(PROTO_ARG);
}
;
Index: src/usr.bin/xlint/lint1/decl.c
diff -u src/usr.bin/xlint/lint1/decl.c:1.136 src/usr.bin/xlint/lint1/decl.c:1.137
--- src/usr.bin/xlint/lint1/decl.c:1.136 Fri Feb 19 22:27:49 2021
+++ src/usr.bin/xlint/lint1/decl.c Fri Feb 19 22:35:42 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: decl.c,v 1.136 2021/02/19 22:27:49 rillig Exp $ */
+/* $NetBSD: decl.c,v 1.137 2021/02/19 22:35:42 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -38,7 +38,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: decl.c,v 1.136 2021/02/19 22:27:49 rillig Exp $");
+__RCSID("$NetBSD: decl.c,v 1.137 2021/02/19 22:35:42 rillig Exp $");
#endif
#include
@@ -654,7 +654,7 @@ popdecl(void)
/* check usage of local vars */
check_usage(di);
/* FALLTHROUGH */
- case PARG:
+ case PROTO_ARG:
/* usage of arguments will be checked by funcend() */
rmsyms(di->d_dlsyms);
break;
@@ -825,7 +825,7 @@ deftyp(void)
error(8);
scl = NOSCL;
}
- } else if (dcs->d_ctx == ARG || dcs->d_ctx == PARG) {
+ } else if (dcs->d_ctx == ARG || dcs->d_ctx == PROTO_ARG) {
if (scl != NOSCL && scl != REG) {
/* only register valid as formal parameter storage... */
error(9);
@@ -1015,7 +1015,7 @@ check_type(sym_t *sym)
}
return;
} else if (tp->t_const || tp->t_volatile) {
-if (sflag) { /* XXX oder better !tflag ? */
+if (sflag) { /* XXX or better !tflag ? */
/* function cannot return const... */
warning(228);
}
@@ -1047,7 +1047,7 @@ check_type(sym_t *sym)
#endif
}
} else if (to == NOTSPEC && t == VOID) {
- if (dcs->d_ctx == PARG) {
+ if (dcs->d_ctx == PROTO_ARG) {
if (sym->s_scl != ABSTRACT) {
lint_assert(sym->s_name != unnamed);
/* void param. cannot have name: %s */
@@ -1414,7 +1414,7 @@ new_style_function(sym_t *decl, sym_t *a
*/
for (sym = dcs->d_dlsyms; sym != NULL; sym = sym->s_dlnxt) {
sc = sym->s_scl;
- if (sc == STRTAG || sc == UNIONTAG || sc == ENUMTAG) {
+ if (sc == STRUCT_TAG || sc == UNION_TAG || sc == ENUM_TAG) {
/* dubious tag declaration: %s %s */
warning(85, storage_class_name(sc), sym->s_name);
}
@@ -1534,7 +1534,7 @@ declarator_name(sym_t *sym)
sym->s_def = DECL;
}
break;
- case PARG:
+ case PROTO_ARG:
sym->s_arg = true;
/* FALLTHROUGH */
case ARG:
@@ -1619,12 +1619,12 @@ mktag(sym_t *tag, tspec_t kind, bool dec
type_t *tp;
if (kind == STRUCT) {
- scl = STRTAG;
+ scl = STRUCT_TAG;
} else if (kind == UNION) {
- scl = UNIONTAG;
+ scl = UNION_TAG;
} else {
lint_assert(kind == ENUM);
- scl = ENUMTAG;
+ scl = ENUM_TAG;
}
if (tag != NULL) {
@@ -1633,7 +1633,7 @@ mktag(sym_t *tag, tspec_t kind, bool dec
} else {
/* a new tag, no empty declaration */
dcs->d_next->d_nedecl = true;
- if (scl == ENUMTAG && !decl) {
+ if (scl == ENUM_TAG && !decl) {
if (!tflag && (sflag || pflag))
/* forward reference to enum type */
warning(42);
@@ -1749,9 +1749,9 @@ storage_class_name(scl_t sc)
case AUTO: s = "auto"; break;
case REG: s = "register"; break;
case TYPEDEF: s = "typedef"; break;
- case STRTAG: s = "struct"; break;
- case UNIONTAG: s = "union"; break;
- case ENUMTAG: s = "enum"; break;
+ case STRUCT_TAG:s = "struct"; break;
+ case UNION_TAG: s = "union"; break;
+ case ENUM_TAG: s = "enum"; break;
default:
CVS commit: src/usr.bin/xlint/lint1
Module Name:src Committed By: rillig Date: Fri Feb 19 22:35:42 UTC 2021 Modified Files: src/usr.bin/xlint/lint1: cgram.y decl.c lint1.h Log Message: lint: rename storage class constants to be more expressive No functional change. To generate a diff of this commit: cvs rdiff -u -r1.161 -r1.162 src/usr.bin/xlint/lint1/cgram.y cvs rdiff -u -r1.136 -r1.137 src/usr.bin/xlint/lint1/decl.c cvs rdiff -u -r1.64 -r1.65 src/usr.bin/xlint/lint1/lint1.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/xlint/lint1
Module Name:src Committed By: rillig Date: Fri Feb 19 23:22:19 UTC 2021 Modified Files: src/usr.bin/xlint/lint1: check-msgs.lua Log Message: lint: shorten code in check-msgs.lua No functional change. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/usr.bin/xlint/lint1/check-msgs.lua Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/xlint/lint1
Module Name:src
Committed By: rillig
Date: Fri Feb 19 23:22:19 UTC 2021
Modified Files:
src/usr.bin/xlint/lint1: check-msgs.lua
Log Message:
lint: shorten code in check-msgs.lua
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/xlint/lint1/check-msgs.lua
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/xlint/lint1/check-msgs.lua
diff -u src/usr.bin/xlint/lint1/check-msgs.lua:1.6 src/usr.bin/xlint/lint1/check-msgs.lua:1.7
--- src/usr.bin/xlint/lint1/check-msgs.lua:1.6 Sun Jan 31 11:44:48 2021
+++ src/usr.bin/xlint/lint1/check-msgs.lua Fri Feb 19 23:22:19 2021
@@ -1,5 +1,5 @@
#! /usr/bin/lua
--- $NetBSD: check-msgs.lua,v 1.6 2021/01/31 11:44:48 rillig Exp $
+-- $NetBSD: check-msgs.lua,v 1.7 2021/02/19 23:22:19 rillig Exp $
--[[
@@ -36,24 +36,24 @@ local function check_message(fname, line
return
end
- msg = string.gsub(msg, "/%*", "**")
- msg = string.gsub(msg, "%*/", "**")
- msg = string.gsub(msg, "\\(.)", "%1")
-
- comment = string.gsub(comment, "arg%.", "argument")
- comment = string.gsub(comment, "comb%.", "combination")
- comment = string.gsub(comment, "conv%.", "conversion")
- comment = string.gsub(comment, "decl%.", "declaration")
- comment = string.gsub(comment, "defn%.", "definition")
- comment = string.gsub(comment, "des%.s", "designators")
- comment = string.gsub(comment, "expr%.", "expression")
- comment = string.gsub(comment, "func%.", "function")
- comment = string.gsub(comment, "incomp%.", "incompatible")
- comment = string.gsub(comment, "init%.", "initialize")
- comment = string.gsub(comment, "param%.", "parameter")
- comment = string.gsub(comment, "req%.", "requires")
- comment = string.gsub(comment, "poss%.", "possibly")
- comment = string.gsub(comment, "trad%.", "traditional")
+ msg = msg:gsub("/%*", "**")
+ msg = msg:gsub("%*/", "**")
+ msg = msg:gsub("\\(.)", "%1")
+
+ comment = comment:gsub("arg%.", "argument")
+ comment = comment:gsub("comb%.", "combination")
+ comment = comment:gsub("conv%.", "conversion")
+ comment = comment:gsub("decl%.", "declaration")
+ comment = comment:gsub("defn%.", "definition")
+ comment = comment:gsub("des%.s", "designators")
+ comment = comment:gsub("expr%.", "expression")
+ comment = comment:gsub("func%.", "function")
+ comment = comment:gsub("incomp%.", "incompatible")
+ comment = comment:gsub("init%.", "initialize")
+ comment = comment:gsub("param%.", "parameter")
+ comment = comment:gsub("req%.", "requires")
+ comment = comment:gsub("poss%.", "possibly")
+ comment = comment:gsub("trad%.", "traditional")
if comment == msg then
return
@@ -72,7 +72,7 @@ end
local function collect_errors(fname, msgs)
local errors = {}
errors.add = function(self, fmt, ...)
-table.insert(self, string.format(fmt, ...))
+table.insert(self, fmt:format(...))
end
local f = assert(io.open(fname, "r"))
local lineno = 0
@@ -120,4 +120,5 @@ local function main(arg)
return ok
end
+
os.exit(main(arg))
CVS commit: src/usr.bin/xlint/lint1
Module Name:src Committed By: rillig Date: Fri Feb 19 23:25:26 UTC 2021 Modified Files: src/usr.bin/xlint/lint1: Makefile Log Message: lint: remove gcov results on "make clean" To generate a diff of this commit: cvs rdiff -u -r1.60 -r1.61 src/usr.bin/xlint/lint1/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/xlint/lint1
Module Name:src
Committed By: rillig
Date: Fri Feb 19 23:25:26 UTC 2021
Modified Files:
src/usr.bin/xlint/lint1: Makefile
Log Message:
lint: remove gcov results on "make clean"
To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/usr.bin/xlint/lint1/Makefile
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/xlint/lint1/Makefile
diff -u src/usr.bin/xlint/lint1/Makefile:1.60 src/usr.bin/xlint/lint1/Makefile:1.61
--- src/usr.bin/xlint/lint1/Makefile:1.60 Fri Feb 19 12:28:56 2021
+++ src/usr.bin/xlint/lint1/Makefile Fri Feb 19 23:25:26 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2021/02/19 12:28:56 rillig Exp $
+# $NetBSD: Makefile,v 1.61 2021/02/19 23:25:26 rillig Exp $
.include
@@ -21,6 +21,7 @@ CPPFLAGS+= -I${.CURDIR} -I. -DPASS=\"${P
BINDIR= /usr/libexec
CLEANFILES+= ${MAN}
+CLEANFILES+= *.gcno *.gcda *.gcov
.if ${USETOOLS} == "yes"
LINT1= ${TOOLDIR}/libexec/${MACHINE_GNU_PLATFORM}-lint1
