update version to 5.2-devel, update copyright dates

diff --git a/CWRU/CWRU.chlog b/CWRU/CWRU.chlog
index fecad1647ec3fbc3a4bfa2476c29cc8d2dcfd5a1..4ba494fe314920670274ee47ab7247016c83abc9 100644 (file)
--- a/CWRU/CWRU.chlog
+++ b/CWRU/CWRU.chlog
@@ -2441,3 +2441,11 @@ execute_cmd.c
          use SET_LINE_NUMBER to avoid overwriting line_number_for_err trap
          while executing the ERR trap. Tentative fix for `caller' problem
          reported by Quinn Grier <quinn@quinngrier.com>
+
+configure.ac,patchlevel.h
+       - set bash version to 5.2-devel, meaning shell_compatibility_level = 52,
+         which required updating tests (array.tests, array21.sub,
+         quotearray3.sub, new-exp10.sub, history2.sub). The first three are
+         because bash-5.2 flushes an indexed array but does not unset the
+         variable when given `unset a[@]' or `unset[*]' (that is, it acts
+         like `a=()' instead of `unset a').

diff --git a/MANIFEST b/MANIFEST
index 2073e9876ad1c77cd7ff3b0f28f5412a1ec3424f..a014c5e3d4fe3d60d1b84bfe8bc420413cf04f65 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -1462,6 +1462,7 @@ tests/tilde.tests f
 tests/tilde.right      f
 tests/tilde2.tests     f
 tests/tilde2.right     f
+tests/tilde3.sub       f
 tests/trap.tests       f
 tests/trap.right       f
 tests/trap1.sub                f       755

diff --git a/Makefile.in b/Makefile.in
index c76283cb66ca5d138a9e7654001c09d85e56f310..0299b1dd7bd3d423afb37dc4d103934bd430b7f8 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile for bash-5.0, version 4.31
+# Makefile for bash-5.2, version 5.1
 #
-# Copyright (C) 1996-2018 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
 
 #   This program is free software: you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by

diff --git a/alias.c b/alias.c
index cd5e99b7e04e54b9b303b10f4e59e780b1fd869a..23f967fa8167bca3f18215849bf40fe4ab448938 100644 (file)
--- a/alias.c
+++ b/alias.c
@@ -1,7 +1,7 @@
 /* alias.c -- Not a full alias, but just the kind that we use in the
    shell.  Csh style alias is somewhere else (`over there, in a box'). */
 
-/* Copyright (C) 1987-2020 Free Software Foundation, Inc.
+/* Copyright (C) 1987-2021 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 

diff --git a/array.c b/array.c
index eb47cc959d69c32b20c4fdebbd457863f44f2c70..910bbaad815d604ca32d9b8169bb79b98d61e690 100644 (file)
--- a/array.c
+++ b/array.c
@@ -9,7 +9,7 @@
  * chet@ins.cwru.edu
  */
 
-/* Copyright (C) 1997-2020 Free Software Foundation, Inc.
+/* Copyright (C) 1997-2021 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 

diff --git a/array.h b/array.h
index 17d1bc9c5c56a56bcb0e32681873beeda4525960..24d2b632d9e80fbb3f9ac601658498a3e4251848 100644 (file)
--- a/array.h
+++ b/array.h
@@ -1,7 +1,7 @@
 /* array.h -- definitions for the interface exported by array.c that allows
    the rest of the shell to manipulate array variables. */
 
-/* Copyright (C) 1997-2020 Free Software Foundation, Inc.
+/* Copyright (C) 1997-2021 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 

diff --git a/assoc.h b/assoc.h
index 1bfef16cea259e3740531eeda59c4fe6cff63fd6..664d13740b84652546817bfcc76a1a6fdd4300a6 100644 (file)
--- a/assoc.h
+++ b/assoc.h
@@ -1,7 +1,7 @@
 /* assoc.h -- definitions for the interface exported by assoc.c that allows
    the rest of the shell to manipulate associative array variables. */
 
-/* Copyright (C) 2008,2009-2020 Free Software Foundation, Inc.
+/* Copyright (C) 2008,2009-2021 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 

diff --git a/bashansi.h b/bashansi.h
index e271bce8ae734388104ce669c9b5f5a88d212528..dd2a544cd073288f2619decde285c092c61df51a 100644 (file)
--- a/bashansi.h
+++ b/bashansi.h
@@ -1,6 +1,6 @@
 /* bashansi.h -- Typically included information required by picky compilers. */
 
-/* Copyright (C) 1993-2009 Free Software Foundation, Inc.
+/* Copyright (C) 1993-2021 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 

diff --git a/bashhist.c b/bashhist.c
index 3acb57240a3e926ab4ca79d8787866c96edb8ee7..3ad417dfde710e14713257994b346821b174caa3 100644 (file)
--- a/bashhist.c
+++ b/bashhist.c
@@ -1,6 +1,6 @@
 /* bashhist.c -- bash interface to the GNU history library. */
 
-/* Copyright (C) 1993-2019 Free Software Foundation, Inc.
+/* Copyright (C) 1993-2021 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 

diff --git a/bashjmp.h b/bashjmp.h
index 801faa2e5f154e091f41660d72b545364e661c2f..1a4721bc8044d7b2207c022ad450426c411f8237 100644 (file)
--- a/bashjmp.h
+++ b/bashjmp.h
@@ -1,6 +1,6 @@
 /* bashjmp.h -- wrapper for setjmp.h with necessary bash definitions. */
 
-/* Copyright (C) 1987-2009 Free Software Foundation, Inc.
+/* Copyright (C) 1987-2021 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 

diff --git a/builtins.h b/builtins.h
index 883081c53ea790b37686c4a1645d97e5117448bf..0156593565c41ec7207e4ba56d97cab4553d0c31 100644 (file)
--- a/builtins.h
+++ b/builtins.h
@@ -1,6 +1,6 @@
 /* builtins.h -- What a builtin looks like, and where to find them. */
 
-/* Copyright (C) 1987-2009 Free Software Foundation, Inc.
+/* Copyright (C) 1987-2021 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 

diff --git a/builtins/Makefile.in b/builtins/Makefile.in
index 1f5add0df4edf448d37b6c4439db6d8ee68e6502..313ea54f66ccf0908f8873bbe7fb3845f4223365 100644 (file)
--- a/builtins/Makefile.in
+++ b/builtins/Makefile.in
@@ -1,6 +1,6 @@
 # This Makefile for building libbuiltins.a is in -*- text -*- for Emacs.
 #
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
 
 #   This program is free software: you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by

diff --git a/builtins/bashgetopt.c b/builtins/bashgetopt.c
index 43f18806405d096e7659d9dc9547bacfc0e86093..d40ffa23aaef90d34e9f50bf1d7cead3fec743c3 100644 (file)
--- a/builtins/bashgetopt.c
+++ b/builtins/bashgetopt.c
@@ -1,6 +1,6 @@
 /* bashgetopt.c -- `getopt' for use by the builtins. */
 
-/* Copyright (C) 1992-2002 Free Software Foundation, Inc.
+/* Copyright (C) 1992-2021 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 

diff --git a/builtins/bashgetopt.h b/builtins/bashgetopt.h
index 875bc6126d43ac8af2114643f7b3892e90076006..79be3431503a64577bed7c8da28b07eb8ae3fa55 100644 (file)
--- a/builtins/bashgetopt.h
+++ b/builtins/bashgetopt.h
@@ -1,6 +1,6 @@
 /* bashgetopt.h -- extern declarations for stuff defined in bashgetopt.c. */
 
-/* Copyright (C) 1993-2020 Free Software Foundation, Inc.
+/* Copyright (C) 1993-2021 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 

diff --git a/builtins/bind.def b/builtins/bind.def
index 2eaaafda5b8f2c9a100ae19e2c4a0382982e8f3a..53a65ac7c7b967d74f5860b77e12c142178f7821 100644 (file)
--- a/builtins/bind.def
+++ b/builtins/bind.def
@@ -1,7 +1,7 @@
 This file is bind.def, from which is created bind.c.
 It implements the builtin "bind" in Bash.
 
-Copyright (C) 1987-2020 Free Software Foundation, Inc.
+Copyright (C) 1987-2021 Free Software Foundation, Inc.
 
 This file is part of GNU Bash, the Bourne Again SHell.
 

diff --git a/builtins/complete.def b/builtins/complete.def
index 71572eeba6036e5dd559a53bf7bf64e8dcec5435..6d600efb5f4cdfba911b0e3a39680b35e04bb21e 100644 (file)
--- a/builtins/complete.def
+++ b/builtins/complete.def
@@ -1,7 +1,7 @@
 This file is complete.def, from which is created complete.c.
 It implements the builtins "complete", "compgen", and "compopt" in Bash.
 
-Copyright (C) 1999-2020 Free Software Foundation, Inc.
+Copyright (C) 1999-2021 Free Software Foundation, Inc.
 
 This file is part of GNU Bash, the Bourne Again SHell.
 

diff --git a/builtins/evalstring.c b/builtins/evalstring.c
index 4fd2c5672bcbad5688eb488f8f710f88cf20a381..59c0fad19c3f9d13b52788bf0d087611be8f4681 100644 (file)
--- a/builtins/evalstring.c
+++ b/builtins/evalstring.c
@@ -1,6 +1,6 @@
 /* evalstring.c - evaluate a string as one or more shell commands. */
 
-/* Copyright (C) 1996-2020 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2021 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 

diff --git a/builtins/exec.def b/builtins/exec.def
index f654b15165830ef627ad237af521a2b08952efbc..16a81daeee48164392c938392c2464dac44d1b7f 100644 (file)
--- a/builtins/exec.def
+++ b/builtins/exec.def
@@ -1,7 +1,7 @@
 This file is exec.def, from which is created exec.c.
 It implements the builtin "exec" in Bash.
 
-Copyright (C) 1987-2019 Free Software Foundation, Inc.
+Copyright (C) 1987-2021 Free Software Foundation, Inc.
 
 This file is part of GNU Bash, the Bourne Again SHell.
 

diff --git a/builtins/exit.def b/builtins/exit.def
index 376213276758e8a9551268e9b3538fd5003b82bd..9c85bc582726e4f9976a0e39912a0a14ee3a160c 100644 (file)
--- a/builtins/exit.def
+++ b/builtins/exit.def
@@ -1,7 +1,7 @@
 This file is exit.def, from which is created exit.c.
 It implements the builtins "exit", and "logout" in Bash.
 
-Copyright (C) 1987-2020 Free Software Foundation, Inc.
+Copyright (C) 1987-2021 Free Software Foundation, Inc.
 
 This file is part of GNU Bash, the Bourne Again SHell.
 

diff --git a/builtins/gen-helpfiles.c b/builtins/gen-helpfiles.c
index c9d6ea91a3e2b719e67b6936674cec23ef08bd8c..d27d306b1a76567a9d59733b703f7c7a95bc258b 100644 (file)
--- a/builtins/gen-helpfiles.c
+++ b/builtins/gen-helpfiles.c
@@ -1,6 +1,6 @@
 /* gen-helpfiles - create files containing builtin help text */
 
-/* Copyright (C) 2012-2020 Free Software Foundation, Inc.
+/* Copyright (C) 2012-2021 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 

diff --git a/builtins/hash.def b/builtins/hash.def
index 7cc842fd44e30b866bd9cbeaf7e5da895791ad27..b65f42ee4d505cac1731032a87254a0f4d63eddf 100644 (file)
--- a/builtins/hash.def
+++ b/builtins/hash.def
@@ -1,7 +1,7 @@
 This file is hash.def, from which is created hash.c.
 It implements the builtin "hash" in Bash.
 
-Copyright (C) 1987-2020 Free Software Foundation, Inc.
+Copyright (C) 1987-2021 Free Software Foundation, Inc.
 
 This file is part of GNU Bash, the Bourne Again SHell.
 

diff --git a/builtins/help.def b/builtins/help.def
index 9d86a0c8d83d6ce376f9e916a74fd65c90dca92f..346d93fe8e139be04b3aef75535c1f2215cc75da 100644 (file)
--- a/builtins/help.def
+++ b/builtins/help.def
@@ -1,7 +1,7 @@
 This file is help.def, from which is created help.c.
 It implements the builtin "help" in Bash.
 
-Copyright (C) 1987-2020 Free Software Foundation, Inc.
+Copyright (C) 1987-2021 Free Software Foundation, Inc.
 
 This file is part of GNU Bash, the Bourne Again SHell.
 

diff --git a/builtins/history.def b/builtins/history.def
index f2082b94680e933b1a6c3600d8612da0e0e35c16..6918d8a42cec5730284da1ad8210818ecf404fc6 100644 (file)
--- a/builtins/history.def
+++ b/builtins/history.def
@@ -1,7 +1,7 @@
 This file is history.def, from which is created history.c.
 It implements the builtin "history" in Bash.
 
-Copyright (C) 1987-2020 Free Software Foundation, Inc.
+Copyright (C) 1987-2021 Free Software Foundation, Inc.
 
 This file is part of GNU Bash, the Bourne Again SHell.
 

diff --git a/builtins/mkbuiltins.c b/builtins/mkbuiltins.c
index 71e76da1608f53b9ecec0db16f19729f447838ba..f21b76b98d981e7fa187f20d6df3bd5808dc28b2 100644 (file)
--- a/builtins/mkbuiltins.c
+++ b/builtins/mkbuiltins.c
@@ -1,7 +1,7 @@
 /* mkbuiltins.c - Create builtins.c, builtext.h, and builtdoc.c from
    a single source file called builtins.def. */
 
-/* Copyright (C) 1987-2020 Free Software Foundation, Inc.
+/* Copyright (C) 1987-2021 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 

diff --git a/builtins/set.def b/builtins/set.def
index 5f2f4c153e0124f89d5424b5b7a929583d396e5f..2972f9aac83e4ecc70a3c34aba7c3291c649315b 100644 (file)
--- a/builtins/set.def
+++ b/builtins/set.def
@@ -1,7 +1,7 @@
 This file is set.def, from which is created set.c.
 It implements the "set" and "unset" builtins in Bash.
 
-Copyright (C) 1987-2020 Free Software Foundation, Inc.
+Copyright (C) 1987-2021 Free Software Foundation, Inc.
 
 This file is part of GNU Bash, the Bourne Again SHell.
 

diff --git a/builtins/setattr.def b/builtins/setattr.def
index a3bbb7e193724ea9efba57331ca1ca8524a03871..c2ea7d568f7128106d42476488411d37d1cb237b 100644 (file)
--- a/builtins/setattr.def
+++ b/builtins/setattr.def
@@ -1,7 +1,7 @@
 This file is setattr.def, from which is created setattr.c.
 It implements the builtins "export" and "readonly", in Bash.
 
-Copyright (C) 1987-2020 Free Software Foundation, Inc.
+Copyright (C) 1987-2021 Free Software Foundation, Inc.
 
 This file is part of GNU Bash, the Bourne Again SHell.
 

diff --git a/builtins/trap.def b/builtins/trap.def
index 51a92be1930301f7617c1324f5d0754129c6e78e..94229433c50256f92ebe650a9a3ce7c0f1e65617 100644 (file)
--- a/builtins/trap.def
+++ b/builtins/trap.def
@@ -1,7 +1,7 @@
 This file is trap.def, from which is created trap.c.
 It implements the builtin "trap" in Bash.
 
-Copyright (C) 1987-2020 Free Software Foundation, Inc.
+Copyright (C) 1987-2021 Free Software Foundation, Inc.
 
 This file is part of GNU Bash, the Bourne Again SHell.
 

diff --git a/builtins/ulimit.def b/builtins/ulimit.def
index f6e6572b0661bfc77f3248606273c88c1ab79daf..fd9f7a3df8ea594b4f695ed196de1219db97bd37 100644 (file)
--- a/builtins/ulimit.def
+++ b/builtins/ulimit.def
@@ -1,7 +1,7 @@
 This file is ulimit.def, from which is created ulimit.c.
 It implements the builtin "ulimit" in Bash.
 
-Copyright (C) 1987-2020 Free Software Foundation, Inc.
+Copyright (C) 1987-2021 Free Software Foundation, Inc.
 
 This file is part of GNU Bash, the Bourne Again SHell.
 

diff --git a/builtins/wait.def b/builtins/wait.def
index ab1e88bcd17a09172383d3ca9c3319fd81a4ed14..e68c1757a6d104d2dbc4b98500debaedd339ad27 100644 (file)
--- a/builtins/wait.def
+++ b/builtins/wait.def
@@ -1,7 +1,7 @@
 This file is wait.def, from which is created wait.c.
 It implements the builtin "wait" in Bash.
 
-Copyright (C) 1987-2020 Free Software Foundation, Inc.
+Copyright (C) 1987-2021 Free Software Foundation, Inc.
 
 This file is part of GNU Bash, the Bourne Again SHell.
 

diff --git a/config-bot.h b/config-bot.h
index 297224eb1025e8cd469015386eb8d679f18250fc..a687e402940dfb3ce64c2afa6ea18c4c2998f09e 100644 (file)
--- a/config-bot.h
+++ b/config-bot.h
@@ -1,7 +1,7 @@
 /* config-bot.h */
 /* modify settings or make new ones based on what autoconf tells us. */
 
-/* Copyright (C) 1989-2009 Free Software Foundation, Inc.
+/* Copyright (C) 1989-2021 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 

diff --git a/config-top.h b/config-top.h
index 03be53db298ed72156d058ecb54afd9580467ca9..db4ab6ee3a8b7b6f216d6271d13035233d7d7b76 100644 (file)
--- a/config-top.h
+++ b/config-top.h
@@ -1,6 +1,6 @@
 /* config-top.h - various user-settable options not under the control of autoconf. */
 
-/* Copyright (C) 2002-2009 Free Software Foundation, Inc.
+/* Copyright (C) 2002-2021 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 

diff --git a/configure b/configure
index 27df47a8c68cc3953a21bc86e02271e95692dcf3..0545990c6dc790f3ac3d19e043c3f6089c6a20ff 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
-# From configure.ac for Bash 5.1, version 5.034.
+# From configure.ac for Bash 5.2, version 5.036.
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for bash 5.1-maint.
+# Generated by GNU Autoconf 2.71 for bash 5.2-devel.
 #
 # Report bugs to <bug-bash@gnu.org>.
 #
@@ -612,8 +612,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='bash'
 PACKAGE_TARNAME='bash'
-PACKAGE_VERSION='5.1-maint'
-PACKAGE_STRING='bash 5.1-maint'
+PACKAGE_VERSION='5.2-devel'
+PACKAGE_STRING='bash 5.2-devel'
 PACKAGE_BUGREPORT='bug-bash@gnu.org'
 PACKAGE_URL=''
 
@@ -1466,7 +1466,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures bash 5.1-maint to adapt to many kinds of systems.
+\`configure' configures bash 5.2-devel to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1532,7 +1532,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of bash 5.1-maint:";;
+     short | recursive ) echo "Configuration of bash 5.2-devel:";;
    esac
   cat <<\_ACEOF
 
@@ -1737,7 +1737,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-bash configure 5.1-maint
+bash configure 5.2-devel
 generated by GNU Autoconf 2.71
 
 Copyright (C) 2021 Free Software Foundation, Inc.
@@ -2394,7 +2394,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by bash $as_me 5.1-maint, which was
+It was created by bash $as_me 5.2-devel, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   $ $0$ac_configure_args_raw
@@ -3172,8 +3172,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_config_headers="$ac_config_headers config.h"
 
 
-BASHVERS=5.1
-RELSTATUS=maint
+BASHVERS=5.2
+RELSTATUS=devel
 
 case "$RELSTATUS" in
 alp*|bet*|dev*|rc*|releng*|maint*)     DEBUG='-DDEBUG' MALLOC_DEBUG='-DMALLOC_DEBUG' ;;
@@ -22315,7 +22315,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by bash $as_me 5.1-maint, which was
+This file was extended by bash $as_me 5.2-devel, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -22383,7 +22383,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
-bash config.status 5.1-maint
+bash config.status 5.2-devel
 configured by $0, generated by GNU Autoconf 2.71,
   with options \\"\$ac_cs_config\\"
 

diff --git a/configure.ac b/configure.ac
index 4e03fb5aa65881208ae1704b6f15a5087bcc70e0..6506c59861cf8b7fc6d5349bb7a48fd99e681303 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -21,10 +21,10 @@ dnl Process this file with autoconf to produce a configure script.
 #   You should have received a copy of the GNU General Public License
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-AC_REVISION([for Bash 5.1, version 5.034])dnl
+AC_REVISION([for Bash 5.2, version 5.036])dnl
 
-define(bashvers, 5.1)
-define(relstatus, maint)
+define(bashvers, 5.2)
+define(relstatus, devel)
 
 AC_INIT([bash], bashvers-relstatus, [bug-bash@gnu.org])
 

diff --git a/error.c b/error.c
index 7df4b146ccdd6f8ddc5535594553f90c7c6ccd2e..b0ac7950fd4ec900cb4e669f61e421d9d3aec943 100644 (file)
--- a/error.c
+++ b/error.c
@@ -1,6 +1,6 @@
 /* error.c -- Functions for handling errors. */
 
-/* Copyright (C) 1993-2020 Free Software Foundation, Inc.
+/* Copyright (C) 1993-2021 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 

diff --git a/eval.c b/eval.c
index 0e6acf827dbef906a74693e64bc135cd49be6ab9..c8ef6bd5aeb427de377dcb68e0fcca8b34e470e1 100644 (file)
--- a/eval.c
+++ b/eval.c
@@ -1,6 +1,6 @@
 /* eval.c -- reading and evaluating commands. */
 
-/* Copyright (C) 1996-2020 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2021 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 

diff --git a/examples/loadables/Makefile.in b/examples/loadables/Makefile.in
index 6b3d4b37f2516f91f1c157485baed04552c33628..22705a482893f7ff9871ac3316c2a1e62ddc6beb 100644 (file)
--- a/examples/loadables/Makefile.in
+++ b/examples/loadables/Makefile.in
@@ -58,6 +58,7 @@ host_os = @host_os@
 host_cpu = @host_cpu@
 host_vendor = @host_vendor@
 
+STYLE_CFLAGS = @STYLE_CFLAGS@
 CFLAGS = @CFLAGS@
 LOCAL_CFLAGS = @LOCAL_CFLAGS@
 DEFS = @DEFS@
@@ -76,7 +77,7 @@ INTL_BUILDDIR = ${LIBBUILD}/intl
 INTL_INC = @INTL_INC@
 LIBINTL_H = @LIBINTL_H@
 
-CCFLAGS = $(DEFS) $(LOCAL_DEFS) $(LOCAL_CFLAGS) $(CPPFLAGS) $(CFLAGS)
+CCFLAGS = $(DEFS) $(LOCAL_DEFS) $(LOCAL_CFLAGS) $(CPPFLAGS) $(CFLAGS) $(STYLE_CFLAGS)
 
 #
 # These values are generated for configure by ${topdir}/support/shobj-conf.

diff --git a/execute_cmd.c b/execute_cmd.c
index 0ef8bfddbc78182515cebe40789244f6a34a9fef..a435daafe0ee25df47294f281f913d59e5341641 100644 (file)
--- a/execute_cmd.c
+++ b/execute_cmd.c
@@ -1579,10 +1579,11 @@ execute_in_subshell (command, asynchronous, pipe_in, pipe_out, fds_to_close)
 
   /* We are in a subshell, so forget that we are running a trap handler or
      that the signal handler has changed (we haven't changed it!) */
+  /* XXX - maybe do this for `real' signals and not ERR/DEBUG/RETURN/EXIT
+     traps? */
   if (running_trap > 0)
     {
       run_trap_cleanup (running_trap - 1);
-itrace("execute_in_subshell: setting running_trap = 0");
       running_trap = 0;                /* XXX - maybe leave this */
     }
 

diff --git a/expr.c b/expr.c
index 73e5b29789ba96bcd79cf69b2c0d3fc199be0e3c..db482f37b22eadb545fe8f40bbfbd61565ff6fca 100644 (file)
--- a/expr.c
+++ b/expr.c
@@ -1,6 +1,6 @@
 /* expr.c -- arithmetic expression evaluation. */
 
-/* Copyright (C) 1990-2020 Free Software Foundation, Inc.
+/* Copyright (C) 1990-2021 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 

diff --git a/flags.c b/flags.c
index 983f9a507c8040de00e8b64b4c579a1a381ac809..30f6c13d4262c14643eb786125955e6f09138d80 100644 (file)
--- a/flags.c
+++ b/flags.c
@@ -1,7 +1,7 @@
 /* flags.c -- Everything about flags except the `set' command.  That
    is in builtins.c */
 
-/* Copyright (C) 1987-2020 Free Software Foundation, Inc.
+/* Copyright (C) 1987-2021 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 

diff --git a/general.c b/general.c
index f47cdd0620a95d301e6971896bc6ae84198db181..85c5a8b685908a432992bd5035c612398884a11a 100644 (file)
--- a/general.c
+++ b/general.c
@@ -1,6 +1,6 @@
 /* general.c -- Stuff that is used by all files. */
 
-/* Copyright (C) 1987-2020 Free Software Foundation, Inc.
+/* Copyright (C) 1987-2021 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 

diff --git a/general.h b/general.h
index 0303d01a2b9672224d0278743739c7cb383a3386..8064c50eb51edcafdc7af705b76494589ecd007f 100644 (file)
--- a/general.h
+++ b/general.h
@@ -1,6 +1,6 @@
 /* general.h -- defines that everybody likes to use. */
 
-/* Copyright (C) 1993-2020 Free Software Foundation, Inc.
+/* Copyright (C) 1993-2021 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 

diff --git a/hashcmd.c b/hashcmd.c
index da3af005c206cb160d2e231f347469b285d7f794..891f967a58846e4d6bfbd7366df87143c9b9454b 100644 (file)
--- a/hashcmd.c
+++ b/hashcmd.c
@@ -1,7 +1,7 @@
 /* hashcmd.c - functions for managing a hash table mapping command names to
               full pathnames. */
 
-/* Copyright (C) 1997-2020 Free Software Foundation, Inc.
+/* Copyright (C) 1997-2021 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 

diff --git a/include/chartypes.h b/include/chartypes.h
index 45c31244da8a851eaa5ba92a914b8dc02a6c4c11..0fe5fc1a2af10fe8b1fdc3358c3e92b87f1042ba 100644 (file)
--- a/include/chartypes.h
+++ b/include/chartypes.h
@@ -1,6 +1,6 @@
 /* chartypes.h -- extend ctype.h */
 
-/* Copyright (C) 2001 Free Software Foundation, Inc.
+/* Copyright (C) 2001-2021 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 

diff --git a/include/posixdir.h b/include/posixdir.h
index af5be8012b347eee3b62ba0e78f36109619999e0..b737bd7d1ce1e9a06fccc1bbf369119d772f85ee 100644 (file)
--- a/include/posixdir.h
+++ b/include/posixdir.h
@@ -1,6 +1,6 @@
 /* posixdir.h -- Posix directory reading includes and defines. */
 
-/* Copyright (C) 1987,1991,2012 Free Software Foundation, Inc.
+/* Copyright (C) 1987,1991,2012,2019,2021 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 

diff --git a/include/posixtime.h b/include/posixtime.h
index 3fbf178e89f6d44f5db0c5e4e4c1e73a732e6296..e70ebec67cf08e756b0f32af79234ff11de103d8 100644 (file)
--- a/include/posixtime.h
+++ b/include/posixtime.h
@@ -1,6 +1,6 @@
 /* posixtime.h -- wrapper for time.h, sys/times.h mess. */
 
-/* Copyright (C) 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1999-2021 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 

diff --git a/include/shmbchar.h b/include/shmbchar.h
index a4f3f2472cfc1aa249db769b3ceaf8a1b2333f5f..27b0024fb2729f58dff736a4b73fad89a89a2259 100644 (file)
--- a/include/shmbchar.h
+++ b/include/shmbchar.h
@@ -1,5 +1,5 @@
 /* Multibyte character data type.
-   Copyright (C) 2001, 2005-2007, 2009-2010 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2005-2007, 2009-2010, 2021 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

diff --git a/include/stdc.h b/include/stdc.h
index 7b9282cc721e5fbf69547134067b0be35cf0f950..38516ae5d0c18ef245075f6b1743cbdef1e08107 100644 (file)
--- a/include/stdc.h
+++ b/include/stdc.h
@@ -1,7 +1,7 @@
 /* stdc.h -- macros to make source compile on both ANSI C and K&R C
    compilers. */
 
-/* Copyright (C) 1993 Free Software Foundation, Inc.
+/* Copyright (C) 1993-2021 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 

diff --git a/include/typemax.h b/include/typemax.h
index e5d7d8cf56709f87eecfba53a12d2f81b0d7ed82..0c8791825ed4677ea02acf588a11863053a56cbc 100644 (file)
--- a/include/typemax.h
+++ b/include/typemax.h
@@ -1,6 +1,6 @@
 /* typemax.h -- encapsulate max values for long, long long, etc. */
 
-/* Copyright (C) 2001 Free Software Foundation, Inc.
+/* Copyright (C) 2001-2021 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 

diff --git a/input.c b/input.c
index c57e81c362f9514b07aedf6d4c8d5d5d06635b45..7b439f8c8943808699db33f163c1447c8964f81f 100644 (file)
--- a/input.c
+++ b/input.c
@@ -1,6 +1,6 @@
 /* input.c -- functions to perform buffered input with synchronization. */
 
-/* Copyright (C) 1992-2020 Free Software Foundation, Inc.
+/* Copyright (C) 1992-2021 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 

diff --git a/jobs.c b/jobs.c
index ffe4bed6e8c2f02e936aaa3674f1607f76935548..867a047722c773f48caef41bae4bbcf4d5504c9c 100644 (file)
--- a/jobs.c
+++ b/jobs.c
@@ -3,7 +3,7 @@
 /* This file works with both POSIX and BSD systems.  It implements job
    control. */
 
-/* Copyright (C) 1989-2020 Free Software Foundation, Inc.
+/* Copyright (C) 1989-2021 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 

diff --git a/lib/glob/glob.h b/lib/glob/glob.h
index 59a25152e6e4bbfbf290af9c67afcc0140dcd04f..47410577c2c09864aecfd76dc1dd23edb1937568 100644 (file)
--- a/lib/glob/glob.h
+++ b/lib/glob/glob.h
@@ -1,5 +1,5 @@
 /* File-name wildcard pattern matching for GNU.
-   Copyright (C) 1985-2020 Free Software Foundation, Inc.
+   Copyright (C) 1985-2021 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne-Again SHell.
 

diff --git a/lib/malloc/Makefile.in b/lib/malloc/Makefile.in
index 508318868567e5c54ee3535519586fe1265bd76c..7ec8f64f82bed6134cdd0707902f606a681655ac 100644 (file)
--- a/lib/malloc/Makefile.in
+++ b/lib/malloc/Makefile.in
@@ -1,6 +1,6 @@
 # Skeleton Makefile for the GNU malloc code
 #
-# Copyright (C) 1996-2009 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
 
 #   This program is free software: you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by

diff --git a/lib/malloc/malloc.c b/lib/malloc/malloc.c
index 32c763f37355896441de41fbb3888a87df39c5a2..06983c745969c3892da46c5abd5f98283dea7db6 100644 (file)
--- a/lib/malloc/malloc.c
+++ b/lib/malloc/malloc.c
@@ -1,6 +1,6 @@
 /* malloc.c - dynamic memory allocation for bash. */
 
-/*  Copyright (C) 1985-2020 Free Software Foundation, Inc.
+/*  Copyright (C) 1985-2021 Free Software Foundation, Inc.
 
     This file is part of GNU Bash, the Bourne-Again SHell.
     

diff --git a/lib/malloc/mstats.h b/lib/malloc/mstats.h
index 07dffcc9a90fe97479803069257bce7e7e9bfc29..aa3fa33b465fba64b853fe7e544a9d60253b1434 100644 (file)
--- a/lib/malloc/mstats.h
+++ b/lib/malloc/mstats.h
@@ -1,6 +1,6 @@
 /* mstats.h - definitions for malloc statistics */
 
-/*  Copyright (C) 2001-2020 Free Software Foundation, Inc.
+/*  Copyright (C) 2001-2021 Free Software Foundation, Inc.
 
     This file is part of GNU Bash, the Bourne-Again SHell.
 

diff --git a/lib/readline/chardefs.h b/lib/readline/chardefs.h
index dfbdf318d99cc6ca352e045c190e480ba49ea8b9..24a25f1f105bb45b41c8eefc5ad9b34d93aa941b 100644 (file)
--- a/lib/readline/chardefs.h
+++ b/lib/readline/chardefs.h
@@ -1,6 +1,6 @@
 /* chardefs.h -- Character definitions for readline. */
 
-/* Copyright (C) 1994-2015 Free Software Foundation, Inc.
+/* Copyright (C) 1994-2021 Free Software Foundation, Inc.
 
    This file is part of the GNU Readline Library (Readline), a library
    for reading lines of text with interactive input and history editing.

diff --git a/lib/readline/xmalloc.h b/lib/readline/xmalloc.h
index 3bd7f0f0bc6adba6b8bcdb060f5ab2fd47fe5410..0fb9df9c00b4973c61da6f53a5519505e4dc6ae5 100644 (file)
--- a/lib/readline/xmalloc.h
+++ b/lib/readline/xmalloc.h
@@ -1,6 +1,6 @@
 /* xmalloc.h -- memory allocation that aborts on errors. */
 
-/* Copyright (C) 1999-2009 Free Software Foundation, Inc.
+/* Copyright (C) 1999-2009,2010-2021 Free Software Foundation, Inc.
 
    This file is part of the GNU Readline Library (Readline), a library
    for reading lines of text with interactive input and history editing.      

diff --git a/lib/tilde/Makefile.in b/lib/tilde/Makefile.in
index 4da9e2f1286cb58882f6d38c66747f30fdb847e1..e61c6718dc2f03e5a06db5e2fe15eb9ada24aad3 100644 (file)
--- a/lib/tilde/Makefile.in
+++ b/lib/tilde/Makefile.in
@@ -4,7 +4,7 @@
 #                                                                 #
 ####################################################################
 
-# Copyright (C) 1996-2009 Free Software Foundation, Inc.     
+# Copyright (C) 1996-2021 Free Software Foundation, Inc.     
 
 #   This program is free software: you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by

diff --git a/make_cmd.c b/make_cmd.c
index d40b8366de3da3384f26c25a714e260591c38c2a..5c1d5efedece3a67b7eb5a2b0ddd60f59d770f65 100644 (file)
--- a/make_cmd.c
+++ b/make_cmd.c
@@ -1,7 +1,7 @@
 /* make_cmd.c -- Functions for making instances of the various
    parser constructs. */
 
-/* Copyright (C) 1989-2020 Free Software Foundation, Inc.
+/* Copyright (C) 1989-2021 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 

diff --git a/nojobs.c b/nojobs.c
index f2563ca09b8a4e1e88cf819747378d663fe86fcf..1e05fd7b3dbd66d8dea4e40a903d9ace50f996c5 100644 (file)
--- a/nojobs.c
+++ b/nojobs.c
@@ -3,7 +3,7 @@
 /* This file works under BSD, System V, minix, and Posix systems.  It does
    not implement job control. */
 
-/* Copyright (C) 1987-2020 Free Software Foundation, Inc.
+/* Copyright (C) 1987-2021 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 

diff --git a/parser.h b/parser.h
index 287d68eea2ccaca7c8c35d2c1c5ea1f143df5bf5..e3621d6c3c0684ad8939b51af09ef12d9823eae5 100644 (file)
--- a/parser.h
+++ b/parser.h
@@ -1,7 +1,7 @@
 /* parser.h -- Everything you wanted to know about the parser, but were
    afraid to ask. */
 
-/* Copyright (C) 1995-2019 Free Software Foundation, Inc.
+/* Copyright (C) 1995-2021 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 

diff --git a/patchlevel.h b/patchlevel.h
index 333dd9472f941499ea32147297e46aad4c9022d7..165390c155411545a5e05f0ed98d1c85d0098955 100644 (file)
--- a/patchlevel.h
+++ b/patchlevel.h
@@ -25,6 +25,6 @@
    regexp `^#define[   ]*PATCHLEVEL', since that's what support/mkversion.sh
    looks for to find the patch level (for the sccs version string). */
 
-#define PATCHLEVEL 8
+#define PATCHLEVEL 0
 
 #endif /* _PATCHLEVEL_H_ */

diff --git a/pcomplete.c b/pcomplete.c
index cccd4c955edcbee3a5505747709ecb4dc9dca39c..08cd7524c53d25c3853d2573a320b4faccac6a7f 100644 (file)
--- a/pcomplete.c
+++ b/pcomplete.c
@@ -1,6 +1,6 @@
 /* pcomplete.c - functions to generate lists of matches for programmable completion. */
 
-/* Copyright (C) 1999-2020 Free Software Foundation, Inc.
+/* Copyright (C) 1999-2021 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 

diff --git a/pcomplib.c b/pcomplib.c
index f6780ede047553c11f0fbeb1ba423e5452f81459..e8df62ece99628a390c9c14f1de23b59852e5a34 100644 (file)
--- a/pcomplib.c
+++ b/pcomplib.c
@@ -1,6 +1,6 @@
 /* pcomplib.c - library functions for programmable completion. */
 
-/* Copyright (C) 1999-2020 Free Software Foundation, Inc.
+/* Copyright (C) 1999-2021 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 

diff --git a/print_cmd.c b/print_cmd.c
index 6333e70e80e004c005d83824e97ac9a746054722..9f3f670c8fa0cc9b0329e9127abea68454f6229d 100644 (file)
--- a/print_cmd.c
+++ b/print_cmd.c
@@ -1,6 +1,6 @@
 /* print_command -- A way to make readable commands from a command tree. */
 
-/* Copyright (C) 1989-2020 Free Software Foundation, Inc.
+/* Copyright (C) 1989-2021 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 

diff --git a/redir.h b/redir.h
index 8ef1ce3a06d59aedd3a6c963d877d40c063d2845..340dc1c0218477129d3f825b0a6e5928614d88a7 100644 (file)
--- a/redir.h
+++ b/redir.h
@@ -1,6 +1,6 @@
 /* redir.h - functions from redir.c. */
 
-/* Copyright (C) 1997, 2001, 2005, 2008, 2009-2020 Free Software Foundation, Inc.
+/* Copyright (C) 1997, 2001, 2005, 2008, 2009-2021 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 

diff --git a/shell.c b/shell.c
index 4d0f4c2ded8dcfa39358e5f248d483f9331f3d6e..ae1c61090ce71b1b7e17c7b10571f01c3fee45b5 100644 (file)
--- a/shell.c
+++ b/shell.c
@@ -1,6 +1,6 @@
 /* shell.c -- GNU's idea of the POSIX shell specification. */
 
-/* Copyright (C) 1987-2019 Free Software Foundation, Inc.
+/* Copyright (C) 1987-2021 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 

diff --git a/shell.h b/shell.h
index 1bdbe721adcd7425187e402291fa20c09d8e30df..475f7d888e0eb292ef4966fc82b3108636abc85d 100644 (file)
--- a/shell.h
+++ b/shell.h
@@ -1,6 +1,6 @@
 /* shell.h -- The data structures used by the shell */
 
-/* Copyright (C) 1993-2020 Free Software Foundation, Inc.
+/* Copyright (C) 1993-2021 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 

diff --git a/sig.c b/sig.c
index e6537d2673b5db7b3d6c43c7afbe11dd9a262b58..840d577546d9197795521e92f32b0fd5a0cb2ac9 100644 (file)
--- a/sig.c
+++ b/sig.c
@@ -1,6 +1,6 @@
 /* sig.c - interface for shell signal handlers and signal initialization. */
 
-/* Copyright (C) 1994-2020 Free Software Foundation, Inc.
+/* Copyright (C) 1994-2021 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 

diff --git a/sig.h b/sig.h
index a516cba0591cadb02d3de0addbcd5d4d97cc3ee5..0217be53d9adc89e7dd516bae6ee8f1d0b87d9c8 100644 (file)
--- a/sig.h
+++ b/sig.h
@@ -1,6 +1,6 @@
 /* sig.h -- header file for signal handler definitions. */
 
-/* Copyright (C) 1994-2013 Free Software Foundation, Inc.
+/* Copyright (C) 1994-2021 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 

diff --git a/support/Makefile.in b/support/Makefile.in
index 44bf8f0245f8b8a5641e9acad31d0b37fb7dbd98..f7de7ac21764c92bca7825e13c261e059b12779a 100644 (file)
--- a/support/Makefile.in
+++ b/support/Makefile.in
@@ -9,7 +9,7 @@
 #
 # Currently only man2html is built
 #
-# Copyright (C) 1998-2018 Free Software Foundation, Inc.
+# Copyright (C) 1998-2021 Free Software Foundation, Inc.
 
 #   This program is free software: you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by

diff --git a/support/bashbug.sh b/support/bashbug.sh
index 01e9f01470008212985aa3a96f8bf424b01b3017..940f70654bee92a429067f5cd85f1d13ab938d51 100644 (file)
--- a/support/bashbug.sh
+++ b/support/bashbug.sh
@@ -7,7 +7,7 @@
 # chet@cwru.edu and, optionally, to bash-testers@cwru.edu.
 # Other versions send mail to bug-bash@gnu.org.
 #
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
 #
 #   This program is free software: you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by

diff --git a/support/bashbug.sh.in b/support/bashbug.sh.in
index d4b48c903eacb72d7ae426e406bef94d2c806863..d6759d76be9ed35b2fce2329d307e098eb42142a 100644 (file)
--- a/support/bashbug.sh.in
+++ b/support/bashbug.sh.in
@@ -7,7 +7,7 @@
 # chet@cwru.edu and, optionally, to bash-testers@cwru.edu.
 # Other versions send mail to bug-bash@gnu.org.
 #
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
 #
 #   This program is free software: you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by

diff --git a/support/bashversion.c b/support/bashversion.c
index 4f86b13467a9be60a8e593ac17031158b39905f2..ad02d46ea06bc16679608280c7b1eaefd173593e 100644 (file)
--- a/support/bashversion.c
+++ b/support/bashversion.c
@@ -1,6 +1,6 @@
 /* bashversion.c -- Display bash version information. */
 
-/* Copyright (C) 2001-2020 Free Software Foundation, Inc.
+/* Copyright (C) 2001-2021 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 

diff --git a/support/signames.c b/support/signames.c
index aba4842aeea87e9eca8b0baf694bbccd6e8e16a1..35ecf4416ee1811e8ff34047917b1b16cfd5c2d5 100644 (file)
--- a/support/signames.c
+++ b/support/signames.c
@@ -1,6 +1,6 @@
 /* signames.c -- Create an array of signal names. */
 
-/* Copyright (C) 2006-2020 Free Software Foundation, Inc.
+/* Copyright (C) 2006-2021 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 

diff --git a/test.c b/test.c
index 0daf71f65df6b1b2f05c7ea4d0ff201d343e314b..e1bd77f772d569da2fc5c13d1537a0ddde95719c 100644 (file)
--- a/test.c
+++ b/test.c
@@ -2,7 +2,7 @@
 
 /* Modified to run with the GNU shell Apr 25, 1988 by bfox. */
 
-/* Copyright (C) 1987-2020 Free Software Foundation, Inc.
+/* Copyright (C) 1987-2021 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 

diff --git a/test.h b/test.h
index f6625e66a45af38f3b861a67b7deabd748e2b457..ffd79e5e0dad10af36b29cd4b13e99a3f0116e53 100644 (file)
--- a/test.h
+++ b/test.h
@@ -1,6 +1,6 @@
 /* test.h -- external interface to the conditional command code. */
 
-/* Copyright (C) 1997-2020 Free Software Foundation, Inc.
+/* Copyright (C) 1997-2021 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 

diff --git a/tests/RUN-ONE-TEST b/tests/RUN-ONE-TEST
index c8bef8dd12533217b1b65fc20d00f3d1cc1b81e7..0b06381072414283266cf5d055a42ac14b9b6da6 100755 (executable)
--- a/tests/RUN-ONE-TEST
+++ b/tests/RUN-ONE-TEST
@@ -1,4 +1,4 @@
-BUILD_DIR=/usr/local/build/bash/bash-current
+BUILD_DIR=/usr/local/build/chet/bash/bash-current
 THIS_SH=$BUILD_DIR/bash
 PATH=$PATH:$BUILD_DIR
 

diff --git a/tests/array.right b/tests/array.right
index 03f6c61be7a18713813959bdcf69954dd853405e..939d6a2a6e8fa488c4fe00e4261a05a6a0352de9 100644 (file)
--- a/tests/array.right
+++ b/tests/array.right
@@ -67,6 +67,7 @@ declare -ar a=([1]="" [2]="bdef" [5]="hello world" [6]="test expression" [15]="t
 declare -a b=([0]="this" [1]="is" [2]="a" [3]="test" [4]="" [5]="/etc/passwd")
 declare -ar c
 declare -a d=([1]="test test")
+declare -a e=()
 declare -a f=([0]="" [1]="bdef" [2]="hello world" [3]="test" [4]="ninth element")
 ./array.tests: line 135: unset: ps1: not an array variable
 ./array.tests: line 139: declare: c: cannot destroy array variables in this way
@@ -84,6 +85,7 @@ declare -ar a=([1]="" [2]="bdef" [5]="hello world" [6]="test expression" [15]="t
 declare -a b=([0]="this" [1]="is" [2]="a" [3]="test" [4]="" [5]="/etc/passwd")
 declare -ar c
 declare -a d=([1]="test test")
+declare -a e=()
 declare -a f=([0]="" [1]="bdef" [2]="hello world" [3]="test" [4]="ninth element")
 declare -a rv=([0]="this" [1]="is" [2]="a" [3]="test" [4]="of" [5]="read" [6]="using" [7]="arrays")
 abde
@@ -494,7 +496,7 @@ x b c
 declare -a a=([1]="2" [2]="3" [3]="4")
 abcd
 unset
-./array21.sub: line 30: typeset: a: not found
+declare -a a=()
 declare -A A=([four]="4" [two]="2" [three]="3" [one]="1" )
 declare -a a=()
 declare -A A=()

diff --git a/tests/history.right b/tests/history.right
index eb4d95dec589eded41c56c8b1dddfda08070a455..5273de6bc85309936db10ec8e5287ff198321f1b 100644 (file)
--- a/tests/history.right
+++ b/tests/history.right
@@ -140,9 +140,9 @@ three
 one
 two
 three
-5.1
+5.2
 echo ${BASH_VERSION%\.*}
-5.1
+5.2
         echo ${BASH_VERSION%\.*}
 a
 b

diff --git a/tests/new-exp.right b/tests/new-exp.right
index cb1faa8ba1ee5e715a685d4527576b48fba62f86..b35782e3ae788a4add41fefb3b7b169168e56c91 100644 (file)
--- a/tests/new-exp.right
+++ b/tests/new-exp.right
@@ -625,7 +625,7 @@ bash: line 1: ${x@C}: bad substitution
 <'ab cd'> 
 <'4'> <'ab cd'> 
 <> 
-argv[1] = <host(2)[5.1]$ >
+argv[1] = <host(2)[5.2]$ >
 <      
 >
 <' \t\n'>

diff --git a/tests/quotearray.right b/tests/quotearray.right
index 1a9074119a6976b13096139811e43455c3d12e70..e68936598efff441214fee55a4bb974cc8b647e6 100644 (file)
--- a/tests/quotearray.right
+++ b/tests/quotearray.right
@@ -93,7 +93,7 @@ declare -A assoc=(["!"]="bang" )
 declare -A assoc=(["!"]="bang" ["@"]="at" )
 declare -A assoc=(["!"]="bang" )
 declare -a array=([0]="1" [1]="2" [2]="3")
-./quotearray3.sub: line 94: declare: array: not found
+declare -a array=()
 ./quotearray3.sub: line 98: declare: array: not found
 declare -A map=(["foo\$(uname >/dev/tty)bar"]="1" )
 1

diff --git a/tests/tilde.tests b/tests/tilde.tests
index 374f3e6d6942340190fd736e4b9d5087e45ee413..20268a731bdfd43280c9d08d3d5f8739fbf5758e 100644 (file)
--- a/tests/tilde.tests
+++ b/tests/tilde.tests
@@ -86,7 +86,9 @@ echo ~$USER
 
 cd "$wdir"
 
+# this test is incomplete; should also test assignment statements (tilde3.sub)
+echo foo=bar:~
+set -o posix
 echo foo=bar:~
-set -o posix; echo foo=bar:~
 
 exit 0

diff --git a/tests/tilde2.right b/tests/tilde2.right
index fce04687e25265a2cfc6775f34075b25d0d55b1b..f383e3a3f8648389feb2f2031080cbaf3f1bc931 100644 (file)
--- a/tests/tilde2.right
+++ b/tests/tilde2.right
@@ -22,3 +22,7 @@ HOME=~
 /usr/$x/abc
 HOME=/usr/$x/abc
 /usr/$x/abc
+foo=/home/xyz:/home/xyz
+/home/xyz:/home/xyz
+foo=~:~
+/home/xyz:/home/xyz

diff --git a/tests/tilde2.tests b/tests/tilde2.tests
index cc5dba9f6cabfb764d925f270db945d5499c87d8..d2415cb35f3d8c914a019ff737bc69f86bc68410 100644 (file)
--- a/tests/tilde2.tests
+++ b/tests/tilde2.tests
@@ -81,3 +81,5 @@ set +o posix
 eval echo $h
 eval $h
 echo $HOME
+
+$THIS_SH ./tilde3.sub

diff --git a/tests/tilde3.sub b/tests/tilde3.sub
new file mode 100644 (file)
index 0000000..c35ea50
--- /dev/null
+++ b/tests/tilde3.sub
@@ -0,0 +1,26 @@
+#   This program is free software: you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation, either version 3 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# regression test for tilde expansion following unquoted colons in posix mode
+
+HOME=/home/xyz
+
+echo foo=~:~
+foo=~:~
+printf "%s\n" $foo
+
+set -o posix
+
+echo foo=~:~
+foo=~:~
+printf "%s\n" $foo

diff --git a/trap.h b/trap.h
index 62d7ee9e16ea8b5d355bfff1ba0f50eb012592cb..89402a1bcbd4b60c97b659c64dd11375744e913a 100644 (file)
--- a/trap.h
+++ b/trap.h
@@ -1,6 +1,6 @@
 /* trap.h -- data structures used in the trap mechanism. */
 
-/* Copyright (C) 1993-2013 Free Software Foundation, Inc.
+/* Copyright (C) 1993-2021 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 

diff --git a/variables.c b/variables.c
index a8db6349ba1f2a0915a29e672476a0d230e714f8..5f216328cd562ac47a7a2c7bae70d0f4e52f320b 100644 (file)
--- a/variables.c
+++ b/variables.c
@@ -1,6 +1,6 @@
 /* variables.c -- Functions for hacking shell variables. */
 
-/* Copyright (C) 1987-2020 Free Software Foundation, Inc.
+/* Copyright (C) 1987-2021 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 

diff --git a/variables.h b/variables.h
index 8511ab052d906c95353b66d29fbf36d44297adaf..15fd49f2ca1903ce401883cd48bae51bd0eb5fbf 100644 (file)
--- a/variables.h
+++ b/variables.h
@@ -1,6 +1,6 @@
 /* variables.h -- data structures for shell variables. */
 
-/* Copyright (C) 1987-2020 Free Software Foundation, Inc.
+/* Copyright (C) 1987-2021 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 

diff --git a/version.c b/version.c
index 8c1568ae4bc94b3a003c048de18aebab796becea..d4c78f6bcf1ce17743249d5c6a7d7dbdf63028eb 100644 (file)
--- a/version.c
+++ b/version.c
@@ -1,6 +1,6 @@
 /* version.c -- distribution and version numbers. */
 
-/* Copyright (C) 1989-2020 Free Software Foundation, Inc.
+/* Copyright (C) 1989-2021 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 
@@ -43,7 +43,7 @@ const char * const release_status = (char *)0;
 #endif
 const char * const sccs_version = SCCSVERSION;
 
-const char * const bash_copyright = N_("Copyright (C) 2020 Free Software Foundation, Inc.");
+const char * const bash_copyright = N_("Copyright (C) 2021 Free Software Foundation, Inc.");
 const char * const bash_license = N_("License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n");
 
 /* If == 31, shell compatible with bash-3.1, == 32 with bash-3.2, and so on */

diff --git a/version2.c b/version2.c
index 8c1568ae4bc94b3a003c048de18aebab796becea..d4c78f6bcf1ce17743249d5c6a7d7dbdf63028eb 100644 (file)
--- a/version2.c
+++ b/version2.c
@@ -1,6 +1,6 @@
 /* version.c -- distribution and version numbers. */
 
-/* Copyright (C) 1989-2020 Free Software Foundation, Inc.
+/* Copyright (C) 1989-2021 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 
@@ -43,7 +43,7 @@ const char * const release_status = (char *)0;
 #endif
 const char * const sccs_version = SCCSVERSION;
 
-const char * const bash_copyright = N_("Copyright (C) 2020 Free Software Foundation, Inc.");
+const char * const bash_copyright = N_("Copyright (C) 2021 Free Software Foundation, Inc.");
 const char * const bash_license = N_("License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n");
 
 /* If == 31, shell compatible with bash-3.1, == 32 with bash-3.2, and so on */