Re: [PATCH 2/2] [gdb] Fix unbound variable in regformats/regdat.sh

[Simon Marchi <simark@simark.ca>]

On 2026-08-28 08:04, Tom de Vries wrote:
> While testing the previous patch, I noticed the following difference:
> ...
> $ sh ./gdb/regformats/regdat.sh \
>       gdb/regformats/rs6000/powerpc-isa205-ppr-dscr-vsx64l.dat \
>       gdbsupport/osabi.def \
>       tmp.txt
> $ ./gdb/regformats/regdat.sh \
>       gdb/regformats/rs6000/powerpc-isa205-ppr-dscr-vsx64l.dat \
>       gdbsupport/osabi.def \
>       tmp.txt
> ./gdb/regformats/regdat.sh: line 33: comment: unbound variable
> ...
> 
> The difference is due to the start of regdat.sh:
> ...
>  #!/bin/sh -u
> ...
> where -u is enabling the unbound variable check.
> 
> In the first variant, this setting is ignored.
> 
> Fix this by using "set -u" instead, making sure that the unbound variable
> check is done for both variants.
> 
> The comment variable is not used in a meaningful way, so fix the unbound
> variable error by removing it.
> 
> Tested in the same way as the preceding patch.

LGTM, thanks.

Approved-By: Simon Marchi <simon.marchi@efficios.com>

> ---
>  gdb/regformats/regdat.sh | 10 ++++------
>  1 file changed, 4 insertions(+), 6 deletions(-)
> 
> diff --git a/gdb/regformats/regdat.sh b/gdb/regformats/regdat.sh
> index 01f2dabe459..f93270ba0ca 100755
> --- a/gdb/regformats/regdat.sh
> +++ b/gdb/regformats/regdat.sh
> @@ -1,4 +1,4 @@
> -#!/bin/sh -u
> +#!/bin/sh
>  
>  # Register protocol definitions for GDB, the GNU debugger.
>  # Copyright (C) 2001-2026 Free Software Foundation, Inc.
> @@ -18,6 +18,8 @@
>  # You should have received a copy of the GNU General Public License
>  # along with this program.  If not, see <http://www.gnu.org/licenses/>.
>  
> +set -u
> +
>  # Format of the input files
>  read="type entry"
>  
> @@ -28,15 +30,11 @@ do_read ()
>      while read -r line
>      do
>  	if test "${line}" = ""
> -	then
> -	    continue
> -	elif test "${line}" = "#" -a "${comment}" = ""
>  	then
>  	    continue
>  	elif expr "${line}" : "#" > /dev/null
>  	then
> -	    comment="${comment}

Unrelated comment: I'd like if we could standardize on

  if ...; then
  for ... in ...; do
  while ...; do

instead of

  if ...
  then

  for ... in ...
  do

  while ...
  do

I think it's more common, easier to read and takes less unnecessary
lines.

Simon