update formatted documentation; fix typo in bashline.c; update system-dependent tests

diff --git a/CWRU/CWRU.chlog b/CWRU/CWRU.chlog
index a868dc5c5637073e8be427956475069c049712c6..3f25c0089c446814ec6a09313caf61b0725b0263 100644 (file)
--- a/CWRU/CWRU.chlog
+++ b/CWRU/CWRU.chlog
@@ -11288,3 +11288,10 @@ general.c
 parse.y
        - read_token_word: set dollar_present if we see <( or >), backing
          out change from 2/4/2023
+
+[bash-5.3 frozen]
+
+                                   7/2
+                                   ---
+tests/printf7.sub,tests/exec3.sub
+       - changes to compensate for some system differences (macos/Linux/BSD)

diff --git a/bashline.c b/bashline.c
index 2b4da758b1cc20d8d2fab765a7fc5af9e07019ef..c60398442ed1bdd2690da6eac12aa3ba886c2b48 100644 (file)
--- a/bashline.c
+++ b/bashline.c
@@ -4142,7 +4142,7 @@ vi_advance_point (void)
        }
     }
 #else
-    rl_point++:
+    rl_point++;
 #endif
   return point;
 }

diff --git a/builtins/printf.def b/builtins/printf.def
index 7d7f8c26688ed9fba844b93971f325e14dc24826..142c5bdf3cd0d8e0382fc4101c04f7b4dcf2a036 100644 (file)
--- a/builtins/printf.def
+++ b/builtins/printf.def
@@ -914,7 +914,11 @@ printstr (char *fmt, char *string, size_t len, int fieldwidth, int precision)
          pr = decodeint (&fmt, 1, -1);
          /* pr < precision means we adjusted precision in printf_builtin
             for the quoted string length (%Q), so we use the adjusted value */
+#if 0 /*TAG:bash-5.4 20250702 */
+         if (pr >= 0 && pr < precision)
+#else
          if (pr < precision)
+#endif
            pr = precision;
        }
       else

diff --git a/doc/bash.1 b/doc/bash.1
index 5af3492f7dc6ac17535d526436fa2ab2780556c6..3ad39facd52c235ee5d7d99574ca146648a55c13 100644 (file)
--- a/doc/bash.1
+++ b/doc/bash.1
@@ -5400,7 +5400,7 @@ when it is referenced, or when a variable which has been given the
 \fIinteger\fP attribute using \fBdeclare \-i\fP is assigned a value.
 A null value evaluates to 0.
 A shell variable need not have its \fIinteger\fP attribute
-turned on to be used in an expression.
+enabled to be used in an expression.
 .PP
 Integer constants follow the C language definition, without suffixes or
 character constants.

diff --git a/doc/bashbug.0 b/doc/bashbug.0
index 58f08de22a07dd62b4a8771b115be13c8473d37c..0047e3706f3293b15d04bf96d665604440746987 100644 (file)
--- a/doc/bashbug.0
+++ b/doc/bashbug.0
@@ -1,6 +1,4 @@
-BASHBUG(1)                  General Commands Manual                 BASHBUG(1)
-
-
+_\bB_\bA_\bS_\bH_\bB_\bU_\bG(1)                  General Commands Manual                 _\bB_\bA_\bS_\bH_\bB_\bU_\bG(1)
 
 N\bNA\bAM\bME\bE
        bashbug - report a bug in bash
@@ -32,7 +30,7 @@ E\bEN\bNV\bVI\bIR\bRO\bON\bNM\bME\bEN\bNT\bT
               e\bem\bma\bac\bcs\bs.  If b\bba\bas\bsh\bhb\bbu\bug\bg cannot locate any of the alternative editors,
               it attempts to execute v\bvi\bi.
 
-       H\bHO\bOM\bME\bE   Directory  in  which  the failed bug report is saved if the mail
+       H\bHO\bOM\bME\bE   Directory in which the failed bug report is saved  if  the  mail
               fails.
 
        T\bTM\bMP\bPD\bDI\bIR\bR Directory in which to create temporary files and directories.
@@ -47,6 +45,4 @@ A\bAU\bUT\bTH\bHO\bOR\bRS\bS
        Chet Ramey, Case Western Reserve University
        chet@po.cwru.edu
 
-
-
-GNU Bash 5.2                     2020 August 1                      BASHBUG(1)
+GNU Bash 5.3                     2020 August 1                      _\bB_\bA_\bS_\bH_\bB_\bU_\bG(1)

diff --git a/doc/bashbug.1 b/doc/bashbug.1
index abcaf48232377c821b3d0e461692deb2ed9eda4b..c98405accf70a349e662266db89df0ba6e495311 100644 (file)
--- a/doc/bashbug.1
+++ b/doc/bashbug.1
@@ -7,7 +7,7 @@
 .\"
 .\"     Last Change: Sun Aug  2 15:39:07 EDT 2020
 .\"
-.TH BASHBUG 1 "2020 August 1" "GNU Bash 5.1"
+.TH BASHBUG 1 "2020 August 1" "GNU Bash 5.3"
 .SH NAME
 bashbug \- report a bug in bash
 .SH SYNOPSIS

diff --git a/doc/bashref.texi b/doc/bashref.texi
index 138a0f9be7a87745753d6becdd399d097739b1b7..22221df6cea8c5a17735bda5bb073acec1b0410b 100644 (file)
--- a/doc/bashref.texi
+++ b/doc/bashref.texi
@@ -8505,7 +8505,7 @@ The value of a variable is evaluated as an arithmetic expression
 when it is referenced, or when a variable which has been given the  
 @code{integer} attribute using @samp{declare -i} is assigned a value.
 A null value evaluates to 0.
-A shell variable need not have its @code{integer} attribute turned on
+A shell variable need not have its @code{integer} attribute enabled
 to be used in an expression.
 
 Integer constants follow the C language definition, without suffixes or

diff --git a/doc/builtins.0 b/doc/builtins.0
index 9136232b8a1da8a1f4fd1bc95aea25321a9f883a..112f4410e6a38b14c24f05998ca4b463673b280d 100644 (file)
--- a/doc/builtins.0
+++ b/doc/builtins.0
@@ -2325,4 +2325,4 @@ S\bSH\bHE\bEL\bLL\bL C\bCO\bOM\bMP\bPA\bAT\bTI\bIB\bBI\bIL\bLI\bIT\bTY\bY M\bMO\bOD\bDE\bE
 S\bSE\bEE\bE A\bAL\bLS\bSO\bO
        bash(1), sh(1)
 
-GNU Bash 5.2                    2023 January 27               _\bB_\bA_\bS_\bH_\b__\bB_\bU_\bI_\bL_\bT_\bI_\bN_\bS(1)
+GNU Bash 5.3                    2023 January 27               _\bB_\bA_\bS_\bH_\b__\bB_\bU_\bI_\bL_\bT_\bI_\bN_\bS(1)

diff --git a/doc/builtins.1 b/doc/builtins.1
index dad2dc9b9f0b9969ed8e302205b58508a77553be..5c9245e8ea44e72a8ce477f88d5f3a6f7c6e2c9f 100644 (file)
--- a/doc/builtins.1
+++ b/doc/builtins.1
@@ -7,7 +7,7 @@
 .de FN
 \fI\|\\$1\|\fP
 ..
-.TH BASH_BUILTINS 1 "2023 January 27" "GNU Bash 5.2"
+.TH BASH_BUILTINS 1 "2023 January 27" "GNU Bash 5.3"
 .SH NAME
 :, ., [, alias, bg, bind, break, builtin, caller,
 cd, command, compgen, complete, compopt,

diff --git a/doc/builtins.pdf b/doc/builtins.pdf
index 9a8f2884eed54623a05897deb738dcb4a35fa147..a73377c6d840a9bed7b939241c758458faf366ce 100644 (file)
Binary files a/doc/builtins.pdf and b/doc/builtins.pdf differ

diff --git a/doc/rbash.0 b/doc/rbash.0
index 2eeae366564f6963368b9ac8be57fe4a12bafade..0ea451e444100fc01bdc4c0e7004d701cbd12275 100644 (file)
--- a/doc/rbash.0
+++ b/doc/rbash.0
@@ -60,4 +60,4 @@ R\bRE\bES\bST\bTR\bRI\bIC\bCT\bTE\bED\bD S\bSH\bHE\bEL\bLL\bL
 S\bSE\bEE\bE A\bAL\bLS\bSO\bO
        bash(1)
 
-Bash-5.2                       2021 November 22                       _\bR_\bB_\bA_\bS_\bH(1)
+Bash-5.3                       2021 November 22                       _\bR_\bB_\bA_\bS_\bH(1)

diff --git a/doc/rbash.1 b/doc/rbash.1
index 39309b4cb9f0f66ff25417a4afbcbf21c5f7007e..1733297d59d6060bbbcf705abd29fb52948883e1 100644 (file)
--- a/doc/rbash.1
+++ b/doc/rbash.1
@@ -1,4 +1,4 @@
-.TH RBASH 1 "2021 November 22" "Bash-5.2"
+.TH RBASH 1 "2021 November 22" "Bash-5.3"
 .SH NAME
 rbash \- restricted bash, see \fBbash\fR(1)
 .SH RESTRICTED SHELL

diff --git a/doc/rbash.pdf b/doc/rbash.pdf
index 76ea9a0b32b118a933ae21e4d27ccd4b4c72345f..ca2474c0354979e867878b06c0803b3baa1386c5 100644 (file)
Binary files a/doc/rbash.pdf and b/doc/rbash.pdf differ

diff --git a/tests/exec.right b/tests/exec.right
index 0116f202f8965c982736acaa8f794dd95c08f591..bc30e5fc80b3d1113dcdbc9d36e69f48bfcac5b5 100644 (file)
--- a/tests/exec.right
+++ b/tests/exec.right
@@ -25,16 +25,16 @@ posix-bash: line 1: exec: .: cannot execute: Is a directory
 126
 0
 this is bashenv
-trap -- 'echo EXIT' EXIT
 trap -- '' SIGTERM
 trap -- 'echo USR1' SIGUSR1
+trap -- 'rm -f x.sh x.output ; echo EXIT' EXIT
 USR1
-./exec3.sub: line 38: /tmp/bash-notthere: No such file or directory
+./exec3.sub: line 45: /tmp/bash-notthere: No such file or directory
 ./exec3.sub: ENOENT: after failed exec: 127
-./exec3.sub: line 43: exec: bash-notthere: not found
-trap -- 'echo EXIT' EXIT
+./exec3.sub: line 50: exec: bash-notthere: not found
 trap -- '' SIGTERM
 trap -- 'echo USR1' SIGUSR1
+trap -- 'rm -f x.sh x.output ; echo EXIT' EXIT
 USR1
 EXIT
 ./execscript: line 103: notthere: command not found

diff --git a/tests/exec3.sub b/tests/exec3.sub
index 089edf41a0717575533499b1a41c3f0335c54d45..258511131a33ed2f5e3cb8265bfd686bdd19ff32 100644 (file)
--- a/tests/exec3.sub
+++ b/tests/exec3.sub
@@ -25,10 +25,17 @@ cd $TDIR || exit 1
 
 shopt -s execfail
 
-trap 'echo EXIT' EXIT 
+trapsort()
+{
+       trap > x.output
+       sort x.output && rm -f x.output
+}
+
+trap 'rm -f x.sh x.output ; echo EXIT' EXIT 
 trap 'echo USR1' USR1
 trap '' TERM
-trap
+
+trapsort
 
 kill -s USR1 $$                # should run the trap
 
@@ -94,7 +101,7 @@ case $string in
 esac
 rm -f x.sh x.output
 
-trap
+trapsort
 kill -s USR1 $$                # should run the trap
 kill -s TERM $$                # should still be ignored
 

diff --git a/tests/printf7.sub b/tests/printf7.sub
index 888e9d905c535d95317093015d22d021556440bb..50bcf98fac333c92b35584239f435ee762f946b5 100644 (file)
--- a/tests/printf7.sub
+++ b/tests/printf7.sub
@@ -85,7 +85,5 @@ unset -v VAR
 
 # can't test %s, too many varying implementations
 #printf "%.${TOOBIG}s\n" XY
-printf -v VAR "%.${TOOBIG}s\n" XY
-echo $VAR
-unset -v VAR
+printf_overflow $LINENO "%.${TOOBIG}b\n" XY
 printf_overflow $LINENO "%.${TOOBIG}Q\n" XY

diff --git a/tests/run-execscript b/tests/run-execscript
index c3ed53e60f349a30a60f57d2c6d33b76742b2b66..4581a649e0f5f14b4950099955e63ba9a8438064 100644 (file)
--- a/tests/run-execscript
+++ b/tests/run-execscript
@@ -14,9 +14,6 @@
 
 echo "warning: the text of a system error message may vary between systems and" >&2
 echo "warning: produce diff output." >&2
-echo "warning: UNIX versions number signals differently." >&2
-echo "warning: If output differing only in line numbers is produced, please" >&2
-echo "warning: do not consider this a test failure." >&2
 echo "warning: if the text of the error messages concerning \`notthere' or" >&2
 echo "warning: \`/tmp/bash-notthere' not being found or \`/' being a directory" >&2
 echo "warning: produce diff output, please do not consider this a test failure" >&2