CVS commit: src/lib/libintl
Module Name:src
Committed By: christos
Date: Sat Apr 13 02:01:38 UTC 2024
Modified Files:
src/lib/libintl: gettext.c
Log Message:
PR/58136: Paul Ripke: Fix use after free.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/lib/libintl/gettext.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libintl/gettext.c
diff -u src/lib/libintl/gettext.c:1.31 src/lib/libintl/gettext.c:1.32
--- src/lib/libintl/gettext.c:1.31 Thu Oct 3 12:35:57 2019
+++ src/lib/libintl/gettext.c Fri Apr 12 22:01:38 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: gettext.c,v 1.31 2019/10/03 16:35:57 christos Exp $ */
+/* $NetBSD: gettext.c,v 1.32 2024/04/13 02:01:38 christos Exp $ */
/*-
* Copyright (c) 2000, 2001 Citrus Project,
@@ -29,7 +29,7 @@
*/
#include
-__RCSID("$NetBSD: gettext.c,v 1.31 2019/10/03 16:35:57 christos Exp $");
+__RCSID("$NetBSD: gettext.c,v 1.32 2024/04/13 02:01:38 christos Exp $");
#include
#include
@@ -176,6 +176,9 @@ pgettext_impl(const char *domainname, co
msgid2, n, category);
free(msgctxt_id);
+ if (translation == msgctxt_id)
+ return msgid1;
+
p = strchr(translation, '\004');
if (p)
return p + 1;
CVS commit: src/lib/libintl
Module Name:src Committed By: christos Date: Sat Apr 13 02:01:38 UTC 2024 Modified Files: src/lib/libintl: gettext.c Log Message: PR/58136: Paul Ripke: Fix use after free. To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/lib/libintl/gettext.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/bin/sh
Module Name:src Committed By: kre Date: Fri Apr 12 19:09:50 UTC 2024 Modified Files: src/bin/sh: sh.1 Log Message: Edgar Fuß pointed out that sh(1) did not mention comments (at all). This has been true forever, and no-one else (including me) ever seems to have noticed this ommission. Correct that. While in the area, improve the general sections on the Lexical structure of the shell's input, and including some refinements to how quoting is described. To generate a diff of this commit: cvs rdiff -u -r1.259 -r1.260 src/bin/sh/sh.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/bin/sh/sh.1 diff -u src/bin/sh/sh.1:1.259 src/bin/sh/sh.1:1.260 --- src/bin/sh/sh.1:1.259 Tue Jan 16 14:30:22 2024 +++ src/bin/sh/sh.1 Fri Apr 12 19:09:50 2024 @@ -1,4 +1,4 @@ -.\" $NetBSD: sh.1,v 1.259 2024/01/16 14:30:22 kre Exp $ +.\" $NetBSD: sh.1,v 1.260 2024/04/12 19:09:50 kre Exp $ .\" Copyright (c) 1991, 1993 .\" The Regents of the University of California. All rights reserved. .\" @@ -31,7 +31,7 @@ .\" .\" @(#)sh.1 8.6 (Berkeley) 5/4/95 .\" -.Dd December 9, 2022 +.Dd April 12, 2024 .Dt SH 1 .\" everything except c o and s (keep them ordered) .ds flags abCEeFfhIiLlmnpquVvXx @@ -650,10 +650,14 @@ or must be enabled for this to work. .El .Ss Lexical Structure -The shell reads input in terms of lines from a file and breaks it up into -words at whitespace (blanks and tabs), and at certain sequences of -characters that are special to the shell called +The shell reads input in terms of lines from a file +(or its standard input, or an argument string), +removes comments, +and then breaks it up into words at whitespace (blanks and tabs), and at +certain sequences of characters that are special to the shell called .Dq operators . +Unquoted whitespace is removed as part of this, after serving to +separate words or operators. There are two types of operators: control operators and redirection operators (their meaning is discussed later). The following is a list of operators: @@ -663,9 +667,76 @@ The following is a list of operators: .It "Redirection operators:" .Dl < > >| << >> <& >& <<- <> .El +.Pp +The shell will detect an operator, which must be entirely unquoted, +at any point in the input line (other than in comments, which have +already been removed), +and sometimes other than immediately after an unquoted dollar +.Pq Sq \&$ +character, see +.Sx Word Expansions +below for defined sequences starting with +.Pq Sq \&$ +which always form (part of) a word, even if some of the +following characters would otherwise appear to be operators. +.Pp +For future proofing, it is advisable to precede and +follow all operators with either line endings or whitespace. +When recognizing an operator the longest sequence of characters +present which form a valid operator are detected as that operator +rather than shorter alternative sequences, so, for example, +the sequence +.Dl >& +is always recognized as the two character redirection operator +.Dq Li \&>& +rather than the +.Dq Li \&> +redirection operator followed by control operator +.Dq Li \&& . +So while currently the sequence +.Dl ;) +is recognized as the two control operators +.Dq Li \&; +followed by +.Dq Li \&) , +a future extension could create a new operator +.Dq Li \&;) +in which case that would be detected instead. +Writing the sequence as +.Dl ;\ ) +(note the space between the semicolon and parenthesis) +guarantees that it will be recognized as two operators. +Note that this does happen, the +.Dq Li ;& +control operator shown above is relatively new (by shell standards) +and would once have been parsed as two operators. +.Pp +Also note that any of the redirection operators listed above may be +immediately preceded by a digit sequence, with no intervening +whitespace. +Those digits form part of the redirection operator. +See +.Sx Redirections +below for more details. +.Ss Comments +A shell comment begins with a +.Sq Li
CVS commit: src/bin/sh
Module Name:src Committed By: kre Date: Fri Apr 12 19:09:50 UTC 2024 Modified Files: src/bin/sh: sh.1 Log Message: Edgar Fuß pointed out that sh(1) did not mention comments (at all). This has been true forever, and no-one else (including me) ever seems to have noticed this ommission. Correct that. While in the area, improve the general sections on the Lexical structure of the shell's input, and including some refinements to how quoting is described. To generate a diff of this commit: cvs rdiff -u -r1.259 -r1.260 src/bin/sh/sh.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/ntp/lib/libntp
Module Name:src
Committed By: jakllsch
Date: Fri Apr 12 19:06:45 UTC 2024
Modified Files:
src/external/bsd/ntp/lib/libntp: Makefile
Log Message:
remove now-unused assignment
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/external/bsd/ntp/lib/libntp/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/ntp/lib/libntp/Makefile
diff -u src/external/bsd/ntp/lib/libntp/Makefile:1.29 src/external/bsd/ntp/lib/libntp/Makefile:1.30
--- src/external/bsd/ntp/lib/libntp/Makefile:1.29 Wed Apr 3 00:38:36 2024
+++ src/external/bsd/ntp/lib/libntp/Makefile Fri Apr 12 19:06:45 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2024/04/03 00:38:36 christos Exp $
+# $NetBSD: Makefile,v 1.30 2024/04/12 19:06:45 jakllsch Exp $
LIBISPRIVATE=yes
@@ -88,7 +88,6 @@ CPPFLAGS+= -I${IDIST}/sntp/libopts
# For MKREPRO, avoid using __DATE__ and __TIME__.
# Instead, use the date and time from ${MKREPRO_TIMESTAMP}
.if ${MKREPRO:Uno} == "yes"
-IMPORTDATE_FILE := ${.PARSEDIR}/../../importdate
MKREPRO_DATE != ${TOOL_DATE} -u -r "${MKREPRO_TIMESTAMP}" "+%F"
MKREPRO_TIME != ${TOOL_DATE} -u -r "${MKREPRO_TIMESTAMP}" "+%T"
CPPFLAGS.ntp_calendar.c += -DMKREPRO_DATE=\"${MKREPRO_DATE:Q}\"
CVS commit: src/external/bsd/ntp/lib/libntp
Module Name:src Committed By: jakllsch Date: Fri Apr 12 19:06:45 UTC 2024 Modified Files: src/external/bsd/ntp/lib/libntp: Makefile Log Message: remove now-unused assignment To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/external/bsd/ntp/lib/libntp/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/usb
Module Name:src Committed By: jakllsch Date: Fri Apr 12 16:54:37 UTC 2024 Modified Files: src/sys/dev/usb: ucom.c Log Message: include opt_ntp.h for PPS_SYNC To generate a diff of this commit: cvs rdiff -u -r1.138 -r1.139 src/sys/dev/usb/ucom.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/usb/ucom.c diff -u src/sys/dev/usb/ucom.c:1.138 src/sys/dev/usb/ucom.c:1.139 --- src/sys/dev/usb/ucom.c:1.138 Sun Mar 5 23:28:54 2023 +++ src/sys/dev/usb/ucom.c Fri Apr 12 16:54:37 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: ucom.c,v 1.138 2023/03/05 23:28:54 riastradh Exp $ */ +/* $NetBSD: ucom.c,v 1.139 2024/04/12 16:54:37 jakllsch Exp $ */ /* * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc. @@ -34,9 +34,10 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ucom.c,v 1.138 2023/03/05 23:28:54 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ucom.c,v 1.139 2024/04/12 16:54:37 jakllsch Exp $"); #ifdef _KERNEL_OPT +#include "opt_ntp.h" #include "opt_usb.h" #endif
CVS commit: src/sys/dev/usb
Module Name:src Committed By: jakllsch Date: Fri Apr 12 16:54:37 UTC 2024 Modified Files: src/sys/dev/usb: ucom.c Log Message: include opt_ntp.h for PPS_SYNC To generate a diff of this commit: cvs rdiff -u -r1.138 -r1.139 src/sys/dev/usb/ucom.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/mk
Module Name:src
Committed By: jakllsch
Date: Fri Apr 12 16:28:43 UTC 2024
Modified Files:
src/share/mk: bsd.hostlib.mk
Log Message:
Filter out -Wp,-iremap,* from CPPFLAGS as is done in hostprog.mk
Seems to fix build of libnbcompat in reproducible mode on host toolchains w/o
-iremap
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/share/mk/bsd.hostlib.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.hostlib.mk
diff -u src/share/mk/bsd.hostlib.mk:1.20 src/share/mk/bsd.hostlib.mk:1.21
--- src/share/mk/bsd.hostlib.mk:1.20 Fri May 4 14:50:40 2018
+++ src/share/mk/bsd.hostlib.mk Fri Apr 12 16:28:43 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.hostlib.mk,v 1.20 2018/05/04 14:50:40 christos Exp $
+# $NetBSD: bsd.hostlib.mk,v 1.21 2024/04/12 16:28:43 jakllsch Exp $
.include
.include
@@ -47,7 +47,7 @@ CLEANFILES+= a.out [Ee]rrs mklog core *.
beforedepend:
CFLAGS:= ${HOST_CFLAGS}
-CPPFLAGS:= ${HOST_CPPFLAGS}
+CPPFLAGS:= ${HOST_CPPFLAGS:N-Wp,-iremap,*}
# Pull in related .mk logic
.include
CVS commit: src/share/mk
Module Name:src Committed By: jakllsch Date: Fri Apr 12 16:28:43 UTC 2024 Modified Files: src/share/mk: bsd.hostlib.mk Log Message: Filter out -Wp,-iremap,* from CPPFLAGS as is done in hostprog.mk Seems to fix build of libnbcompat in reproducible mode on host toolchains w/o -iremap To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/share/mk/bsd.hostlib.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists/debug32
Module Name:src Committed By: hannken Date: Fri Apr 12 14:22:51 UTC 2024 Modified Files: src/distrib/sets/lists/debug32: md.amd64 Log Message: Files libgcc_eh_g.a and libgcc_s_g.a are debuglib, not debug. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/distrib/sets/lists/debug32/md.amd64 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/debug32
Module Name:src Committed By: hannken Date: Fri Apr 12 14:22:51 UTC 2024 Modified Files: src/distrib/sets/lists/debug32: md.amd64 Log Message: Files libgcc_eh_g.a and libgcc_s_g.a are debuglib, not debug. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/distrib/sets/lists/debug32/md.amd64 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/debug32/md.amd64 diff -u src/distrib/sets/lists/debug32/md.amd64:1.5 src/distrib/sets/lists/debug32/md.amd64:1.6 --- src/distrib/sets/lists/debug32/md.amd64:1.5 Fri Apr 12 11:40:09 2024 +++ src/distrib/sets/lists/debug32/md.amd64 Fri Apr 12 14:22:51 2024 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.5 2024/04/12 11:40:09 wiz Exp $ +# $NetBSD: md.amd64,v 1.6 2024/04/12 14:22:51 hannken Exp $ ./usr/lib/i386/i18n/libBIG5_g.a comp-c-debuglib debuglib,compat ./usr/lib/i386/i18n/libDECHanyu_g.a comp-c-debuglib debuglib,compat ./usr/lib/i386/i18n/libEUCTW_g.a comp-c-debuglib debuglib,compat @@ -63,9 +63,9 @@ ./usr/lib/i386/libfido2_g.a comp-c-debuglib debuglib,compat ./usr/lib/i386/libfl_g.a comp-c-debuglib debuglib,compat ./usr/lib/i386/libform_g.a comp-c-debuglib debuglib,compat -./usr/lib/i386/libgcc_eh_g.a comp-sys-debug debug,compat,gcc +./usr/lib/i386/libgcc_eh_g.a comp-c-debuglib debuglib,compat,gcc ./usr/lib/i386/libgcc_g.a comp-c-debuglib debuglib,compat,gcc -./usr/lib/i386/libgcc_s_g.a comp-sys-debug debug,compat,gcc +./usr/lib/i386/libgcc_s_g.a comp-c-debuglib debuglib,compat,gcc ./usr/lib/i386/libgcov_g.a comp-c-debuglib debuglib,compat,gcc ./usr/lib/i386/libgnuctf_g.a comp-c-debuglib debuglib,compat,binutils ./usr/lib/i386/libgnumalloc_g.a comp-c-debuglib debuglib,compat
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: wiz Date: Fri Apr 12 11:40:10 UTC 2024 Modified Files: src/distrib/sets/lists/base32: md.amd64 src/distrib/sets/lists/debug32: md.amd64 Log Message: mark *32 libc++ with libcxx To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/distrib/sets/lists/base32/md.amd64 cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/lists/debug32/md.amd64 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/base32/md.amd64 diff -u src/distrib/sets/lists/base32/md.amd64:1.2 src/distrib/sets/lists/base32/md.amd64:1.3 --- src/distrib/sets/lists/base32/md.amd64:1.2 Thu Apr 11 15:29:16 2024 +++ src/distrib/sets/lists/base32/md.amd64 Fri Apr 12 11:40:09 2024 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.2 2024/04/11 15:29:16 wiz Exp $ +# $NetBSD: md.amd64,v 1.3 2024/04/12 11:40:09 wiz Exp $ ./lib/i386 base-compat-shlib compat ./lib/i386/npf base-compat-shlib compat,npf ./lib/i386/npf/ext_log.so base-compat-shlib compat,npf @@ -122,9 +122,9 @@ ./usr/lib/i386/libbz2.so base-compat-shlib compat ./usr/lib/i386/libbz2.so.1 base-compat-shlib compat ./usr/lib/i386/libbz2.so.1.1 base-compat-shlib compat -./usr/lib/i386/libc++.so base-compat-shlib compat -./usr/lib/i386/libc++.so.1 base-compat-shlib compat -./usr/lib/i386/libc++.so.1.0 base-compat-shlib compat +./usr/lib/i386/libc++.so base-compat-shlib compat,libcxx +./usr/lib/i386/libc++.so.1 base-compat-shlib compat,libcxx +./usr/lib/i386/libc++.so.1.0 base-compat-shlib compat,libcxx ./usr/lib/i386/libc.sobase-compat-shlib compat ./usr/lib/i386/libc.so.12 base-compat-shlib compat ./usr/lib/i386/libc.so.12.221 base-compat-shlib compat Index: src/distrib/sets/lists/debug32/md.amd64 diff -u src/distrib/sets/lists/debug32/md.amd64:1.4 src/distrib/sets/lists/debug32/md.amd64:1.5 --- src/distrib/sets/lists/debug32/md.amd64:1.4 Thu Apr 11 15:29:16 2024 +++ src/distrib/sets/lists/debug32/md.amd64 Fri Apr 12 11:40:09 2024 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.4 2024/04/11 15:29:16 wiz Exp $ +# $NetBSD: md.amd64,v 1.5 2024/04/12 11:40:09 wiz Exp $ ./usr/lib/i386/i18n/libBIG5_g.a comp-c-debuglib debuglib,compat ./usr/lib/i386/i18n/libDECHanyu_g.a comp-c-debuglib debuglib,compat ./usr/lib/i386/i18n/libEUCTW_g.a comp-c-debuglib debuglib,compat @@ -36,7 +36,7 @@ ./usr/lib/i386/libbozohttpd_g.a comp-c-debuglib debuglib,compat ./usr/lib/i386/libbsdmalloc_g.a comp-c-debuglib debuglib,compat ./usr/lib/i386/libbz2_g.a comp-c-debuglib debuglib,compat -./usr/lib/i386/libc++_g.a comp-c-debuglib debuglib,compat +./usr/lib/i386/libc++_g.a comp-c-debuglib debuglib,compat,libcxx ./usr/lib/i386/libc_g.a comp-c-debuglib debuglib,compat ./usr/lib/i386/libcbor_g.a comp-c-debuglib debuglib,compat ./usr/lib/i386/libcom_err_g.a comp-c-debuglib debuglib,compat @@ -205,7 +205,7 @@ ./usr/libdata/debug/usr/lib/i386/libbozohttpd.so.1.0.debug comp-sys-debug debug,compat ./usr/libdata/debug/usr/lib/i386/libbsdmalloc.so.0.1.debug comp-sys-debug debug,compat ./usr/libdata/debug/usr/lib/i386/libbz2.so.1.1.debug comp-sys-debug debug,compat -./usr/libdata/debug/usr/lib/i386/libc++.so.1.0.debug comp-sys-debug debug,compat +./usr/libdata/debug/usr/lib/i386/libc++.so.1.0.debug comp-sys-debug debug,compat,libcxx ./usr/libdata/debug/usr/lib/i386/libc.so.12.221.debug comp-sys-debug debug,compat ./usr/libdata/debug/usr/lib/i386/libcbor.so.0.5.debug comp-sys-debug debug,compat ./usr/libdata/debug/usr/lib/i386/libcom_err.so.8.0.debug comp-sys-debug debug,compat,kerberos
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: wiz Date: Fri Apr 12 11:40:10 UTC 2024 Modified Files: src/distrib/sets/lists/base32: md.amd64 src/distrib/sets/lists/debug32: md.amd64 Log Message: mark *32 libc++ with libcxx To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/distrib/sets/lists/base32/md.amd64 cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/lists/debug32/md.amd64 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/lib/libc/sys
Module Name:src
Committed By: gson
Date: Fri Apr 12 07:16:50 UTC 2024
Modified Files:
src/tests/lib/libc/sys: t_getrusage.c
Log Message:
Require at least 64 MB RAM to run the getrusage_maxrss test case as it
allocates 40 MB and we should leave some for the system, too.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/tests/lib/libc/sys/t_getrusage.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libc/sys/t_getrusage.c
diff -u src/tests/lib/libc/sys/t_getrusage.c:1.8 src/tests/lib/libc/sys/t_getrusage.c:1.9
--- src/tests/lib/libc/sys/t_getrusage.c:1.8 Wed May 9 08:45:03 2018
+++ src/tests/lib/libc/sys/t_getrusage.c Fri Apr 12 07:16:50 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: t_getrusage.c,v 1.8 2018/05/09 08:45:03 mrg Exp $ */
+/* $NetBSD: t_getrusage.c,v 1.9 2024/04/12 07:16:50 gson Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__RCSID("$NetBSD: t_getrusage.c,v 1.8 2018/05/09 08:45:03 mrg Exp $");
+__RCSID("$NetBSD: t_getrusage.c,v 1.9 2024/04/12 07:16:50 gson Exp $");
#include
#include
@@ -126,6 +126,7 @@ ATF_TC(getrusage_maxrss);
ATF_TC_HEAD(getrusage_maxrss, tc)
{
atf_tc_set_md_var(tc, "descr", "Test maxrss growing with getrusage(2)");
+ atf_tc_set_md_var(tc, "require.memory", "64M");
}
ATF_TC_BODY(getrusage_maxrss, tc)
CVS commit: src/tests/lib/libc/sys
Module Name:src Committed By: gson Date: Fri Apr 12 07:16:50 UTC 2024 Modified Files: src/tests/lib/libc/sys: t_getrusage.c Log Message: Require at least 64 MB RAM to run the getrusage_maxrss test case as it allocates 40 MB and we should leave some for the system, too. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/tests/lib/libc/sys/t_getrusage.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
