diff --git a/NEWS b/NEWS index 6aac022d8b26..f04b48599cb3 100644 --- a/NEWS +++ b/NEWS @@ -2,6 +2,11 @@ This documents significant changes in the dev branch of ksh 93u+m. For full details, see the git log at: https://github.com/ksh93/ksh Uppercase BUG_* IDs are shell bug IDs as used by the Modernish shell library. +2024-02-09: + +- Fixed multiple inaccurate or missing values in the /opt/ast/bin/getconf + path-bound built-in command. + 2024-02-08: - Fixed an init-time crash that may occur if standard error is on a terminal, diff --git a/src/cmd/ksh93/include/version.h b/src/cmd/ksh93/include/version.h index d7b3a55c5f4b..dd66e845384e 100644 --- a/src/cmd/ksh93/include/version.h +++ b/src/cmd/ksh93/include/version.h @@ -18,7 +18,7 @@ #define SH_RELEASE_FORK "93u+m" /* only change if you develop a new ksh93 fork */ #define SH_RELEASE_SVER "1.1.0-alpha" /* semantic version number: https://semver.org */ -#define SH_RELEASE_DATE "2024-02-08" /* must be in this format for $((.sh.version)) */ +#define SH_RELEASE_DATE "2024-02-09" /* must be in this format for $((.sh.version)) */ #define SH_RELEASE_CPYR "(c) 2020-2024 Contributors to ksh " SH_RELEASE_FORK /* Scripts sometimes field-split ${.sh.version}, so don't change amount of whitespace. */ diff --git a/src/lib/libast/comp/conf.sh b/src/lib/libast/comp/conf.sh index 060062a14cc6..dc97c9b9ad0e 100644 --- a/src/lib/libast/comp/conf.sh +++ b/src/lib/libast/comp/conf.sh @@ -2,7 +2,7 @@ # # # This software is part of the ast package # # Copyright (c) 1985-2011 AT&T Intellectual Property # -# Copyright (c) 2020-2023 Contributors to ksh 93u+m # +# Copyright (c) 2020-2024 Contributors to ksh 93u+m # # and is licensed under the # # Eclipse Public License, Version 2.0 # # # @@ -249,9 +249,6 @@ case $append$extra in esac ;; *) values=$values$sp$1 - case $1 in - $sym) echo "$1" >> $tmp.v ;; - esac ;; esac done @@ -799,8 +796,6 @@ do eval name=\"'$'CONF_name_$key\" done > $tmp.q sort -u < $tmp.q > $tmp.t mv $tmp.t $tmp.q -sort -u < $tmp.v > $tmp.t -mv $tmp.t $tmp.v case $debug in -d4) exit ;; esac @@ -862,7 +857,6 @@ case $verbose in 1) echo "$command: check macros/enums as static initializers" >&2 ;; esac defined $tmp.q -defined $tmp.v case $debug in -d5) exit ;; esac @@ -873,10 +867,6 @@ exec < $tmp.q while read line do eval CONF_const_${line}=1 done -exec < $tmp.v -while read line -do eval CONF_const_${line}=1 -done # mark the string literal values @@ -1061,13 +1051,8 @@ do eval name=\"'$'CONF_name_$key\" conf_limit=0 case $flags in *[Ll]*) d= - case ${conf_name} in - LONG_MAX|SSIZE_MAX) - x= - ;; - *) eval x='$'CONF_const_${conf_name} - ;; - esac + # always probe, even if a CONF_const_${conf_name} variable exists + x= case $x in '') for s in ${values} do case $s in diff --git a/src/lib/libast/comp/conf.tab b/src/lib/libast/comp/conf.tab index 4124752412ea..0d2430711b55 100644 --- a/src/lib/libast/comp/conf.tab +++ b/src/lib/libast/comp/conf.tab @@ -97,7 +97,7 @@ ENH_I18N XOPEN SC 1 FSUW EQUIV_CLASS_MAX C QQ 1 L EXEC_INTERPRETER_LENGTH C QQ 1 L EXPR_NEST_MAX POSIX SC 2 LMN 32 -FCHR_MAX SVID SC 1 LMU LONG_MAX 2147483647 +FCHR_MAX SVID SC 1 LMU SSIZE_MAX 2147483647 FILESIZEBITS POSIX PC 1 LMU (8*sizeof(off_t)) 32 FILE_LOCKING POSIX SC 1 FU FORT_DEV POSIX SC 2 CFUW diff --git a/src/lib/libcmd/getconf.c b/src/lib/libcmd/getconf.c index 6f16113fd6a9..44bc93dd623c 100644 --- a/src/lib/libcmd/getconf.c +++ b/src/lib/libcmd/getconf.c @@ -24,7 +24,7 @@ */ static const char usage[] = -"[-?\n@(#)$Id: getconf (ksh 93u+m) 2021-04-20 $\n]" +"[-?\n@(#)$Id: getconf (ksh 93u+m) 2024-02-09 $\n]" "[--catalog?" ERROR_CATALOG "]" "[+NAME?getconf - get configuration values]" "[+DESCRIPTION?\bgetconf\b displays the system configuration value for"