From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id Lix+OqCAlmqSBBoAWB0awg (envelope-from ) for ; Tue, 01 Sep 2026 03:37:04 -0400 Authentication-Results: simark.ca; dkim=pass (1024-bit key; unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=xS4laCKz; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=HhvCVRuK; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=GNMN8NTZ; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=DuXEYD9G; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id DBF8C1E166; Tue, 01 Sep 2026 03:37:04 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-5.4 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham autolearn_force=no version=4.0.1 Received: from vm01.sourceware.org (vm01.sourceware.org [38.145.34.32]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id AA3861E09B for ; Tue, 01 Sep 2026 03:37:03 -0400 (EDT) Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 3171C4BA79A8 for ; Tue, 1 Sep 2026 07:37:03 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3171C4BA79A8 Authentication-Results: sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=xS4laCKz; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=HhvCVRuK; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=GNMN8NTZ; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=DuXEYD9G Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by sourceware.org (Postfix) with ESMTPS id 2B9E54BA23F1 for ; Tue, 1 Sep 2026 07:36:36 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 2B9E54BA23F1 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 2B9E54BA23F1 Authentication-Results: sourceware.org; arc=none smtp.remote-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1788248196; cv=none; b=jRkDKMyKxgHj8dUTDnxJ2eP0gZlcLkUoyC/pOJfuRunw7GdCshAas46EqsfkuN19ttwTsx1EyZl20n/JEvL1fVSkPe4avTV3NnlnI7QOwd6ZAKOCoJf8M0JHFxUefIRdqx8/RyYN7DUY4ivoHZhrGP64DTQtd+9RHHYG+eeLcdE= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1788248196; c=relaxed/simple; bh=DEaBlzpQQxwakqA8frB5YyQ4ys1LI2LfXoqUL3mD4Yg=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-ID:MIME-Version; b=OCCGr++1oxlnonnSA/PLLpGDSBbOKoJmIW5bDO5Ek76VOZVF8C9Vwvya6+pE7Hd1KeLd7w4fI5QHntQnxP/CluR/e0+lnRBavzGIHEFvepteqCwtPSj8fbbLcm71VqOqGvqWtBaveXGE4WSLGUa/EHGb8r9ULGo9TvMKXWKiXbs= ARC-Authentication-Results: i=1; sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=xS4laCKz; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=HhvCVRuK; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=GNMN8NTZ; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=DuXEYD9G DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2B9E54BA23F1 Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id BDEFC1FB3B for ; Tue, 1 Sep 2026 07:36:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1788248190; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=W+FH3PmwXeUSdYJVm2Hx5trY+kwt386ocfPn6AxeBEA=; b=xS4laCKzn1noY/6IuWJ92it9GFTRFV/2s5MLyJOVhSCP1eewRf+pOk9oSFBO3p8qosPdq5 tD+w+Cz4E0dox+CMz5EkrDEzzAIXuEi6a1CvwSg/qi30IjRSIZVxd64JovhWQR0Qzl09MQ zTmyy4RFkbzjUYLEzqoVZ89dL790Nkc= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1788248190; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=W+FH3PmwXeUSdYJVm2Hx5trY+kwt386ocfPn6AxeBEA=; b=HhvCVRuKxg6sX0qlfymFMmLIcvypMJbBmWs4yKv+WWzHtsrzw8Wqm5+sGoaL1fP4H0mfsr gpNDPpPoYLbRbnBA== Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1788248186; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=W+FH3PmwXeUSdYJVm2Hx5trY+kwt386ocfPn6AxeBEA=; b=GNMN8NTZrHfLhxG/A1fdeM3BKWBuFO9edpYE05r3uKpQ5F6sdcSohuZEWvyvCrPjZKzycY GuqzsCHFmZspl88AecLn8tHj1lu3C9jITtRXC8Kt6TEIpQBmbIFfr0HUUG9XxIK+jdX/II TqIVFn7wgspc8tX4h2cAEuYkRb69t24= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1788248186; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=W+FH3PmwXeUSdYJVm2Hx5trY+kwt386ocfPn6AxeBEA=; b=DuXEYD9G8V2zyz59H8foAx+2OlGABmw1hOEM+laEwnpySOu1UALFq7x/Bi8NLYcQIrxvjT iXcmvQMrKlQvn/Ag== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 9488013515 for ; Tue, 1 Sep 2026 07:36:26 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id oMALI3qAlmoWUAAAD6G6ig (envelope-from ) for ; Tue, 01 Sep 2026 07:36:26 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH v2] [gdb/config/djgpp] Make djcheck.sh and djconfig.sh shellcheck-clean Date: Tue, 1 Sep 2026 09:36:26 +0200 Message-ID: <20260901073626.2862612-1-tdevries@suse.de> X-Mailer: git-send-email 2.51.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Result: default: False [-2.80 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-0.996]; MIME_GOOD(-0.10)[text/plain]; ARC_NA(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; RCVD_VIA_SMTP_AUTH(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo,suse.de:mid]; URIBL_BLOCKED(0.00)[sourceware.org:url,imap1.dmz-prg2.suse.org:helo,gnu.org:url,ltmain.sh:url,suse.de:mid]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_NONE(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; RCVD_TLS_ALL(0.00)[] X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces~public-inbox=simark.ca@sourceware.org Make gdb/config/djgpp/{djcheck.sh,djconfig.sh} shellcheck-clean: - add missing quotes - add "|| exit 1" after cd - use printf instead of echo -n - disable SC2016 for "configure --prefix='${DJDIR}' assuming ${DJDIR} is indeed not meant to be expanded Add a .shellcheckrc to disable SC2006 to allow legacy backticked `...`. I don't have a djgpp setup, so I can't test this. Changes in v2: - disable SC2006 Versions: - v1 https://sourceware.org/pipermail/gdb-patches/2026-August/229858.html --- gdb/config/djgpp/.shellcheckrc | 4 ++ gdb/config/djgpp/djcheck.sh | 18 ++++---- gdb/config/djgpp/djconfig.sh | 75 +++++++++++++++++----------------- gdb/contrib/shellcheck.sh | 4 +- 4 files changed, 52 insertions(+), 49 deletions(-) create mode 100644 gdb/config/djgpp/.shellcheckrc diff --git a/gdb/config/djgpp/.shellcheckrc b/gdb/config/djgpp/.shellcheckrc new file mode 100644 index 00000000000..cef62c6c16f --- /dev/null +++ b/gdb/config/djgpp/.shellcheckrc @@ -0,0 +1,4 @@ +# There's a concern that $(...) is not (sufficiently) supported on DJGPP [1]. +# Disable SC2006 to allow legacy backticked `...`. +# [1] https://sourceware.org/pipermail/gdb-patches/2026-August/229860.html +disable=SC2006 diff --git a/gdb/config/djgpp/djcheck.sh b/gdb/config/djgpp/djcheck.sh index fa75d03f776..e7e03315301 100644 --- a/gdb/config/djgpp/djcheck.sh +++ b/gdb/config/djgpp/djcheck.sh @@ -18,30 +18,30 @@ # along with this program. If not, see . ORIGDIR=`pwd` -GDB=${ORIGDIR}/../gdb.exe -SUBDIRS=`find $ORIGDIR -type d ! -ipath $ORIGDIR` +GDB="${ORIGDIR}/../gdb.exe" +SUBDIRS=`find "$ORIGDIR" -type d ! -ipath "$ORIGDIR"` for d in $SUBDIRS do - cd $d + cd "$d" || exit 1 echo "Running tests in $d..." for f in *.out do - test -f $f || break - base=`basename $f .out` + test -f "$f" || break + base=`basename "$f" .out` if test "${base}" = "dbx" ; then options=-dbx else options= fi - $GDB ${options} < ${base}.in 2>&1 \ + $GDB ${options} < "${base}.in" 2>&1 \ | sed -e '/GNU gdb /s/ [.0-9][.0-9]*//' \ -e '/^Copyright/s/[12][0-9][0-9][0-9]/XYZZY/g' \ -e '/Starting program: /s|[A-z]:/.*/||' \ -e '/main (/s/=0x[0-9a-f][0-9a-f]*/=XYZ/g' \ - > ${base}.tst - if diff --binary -u ${base}.out ${base}.tst ; then - rm -f ${base}.tst + > "${base}.tst" + if diff --binary -u "${base}.out" "${base}.tst" ; then + rm -f "${base}.tst" fi done done diff --git a/gdb/config/djgpp/djconfig.sh b/gdb/config/djgpp/djconfig.sh index b630e6c0c58..27fea185cae 100644 --- a/gdb/config/djgpp/djconfig.sh +++ b/gdb/config/djgpp/djconfig.sh @@ -40,30 +40,30 @@ unset CDPATH # then only forward slashes (/) in the directories. It should be # an absolute path. -if [ x$1 = x ]; then +if [ "$1" = "" ]; then srcdir=`pwd` else - srcdir=`cd $1 && pwd` + srcdir=`cd "$1" && pwd` || exit 1 shift fi # Make sure they don't have some file names mangled by untarring. -echo -n "Checking the unpacked distribution..." -if ( ! test -f ${srcdir}/bfd/ChangeLog.0203 || \ - ! test -f ${srcdir}/gdb/ChangeLog.002 || \ - ! test -f ${srcdir}/opcodes/ChangeLog.0203 || \ - ! test -f ${srcdir}/readline/config.h-in ) ; then - if ( ! test -f ${srcdir}/bfd/ChangeLog.0203 ) ; then - notfound=${srcdir}/bfd/ChangeLog.0203 +printf "Checking the unpacked distribution..." +if ! test -f "${srcdir}/bfd/ChangeLog.0203" || \ + ! test -f "${srcdir}/gdb/ChangeLog.002" || \ + ! test -f "${srcdir}/opcodes/ChangeLog.0203" || \ + ! test -f "${srcdir}/readline/config.h-in"; then + if ! test -f "${srcdir}/bfd/ChangeLog.0203"; then + notfound="${srcdir}/bfd/ChangeLog.0203" else - if ( ! test -f ${srcdir}/gdb/ChangeLog.002) ; then - notfound=${srcdir}/gdb/ChangeLog.002 + if ! test -f "${srcdir}/gdb/ChangeLog.002"; then + notfound="${srcdir}/gdb/ChangeLog.002" else - if ( ! test -f ${srcdir}/readline/config.h-in ) ; then - notfound=${srcdir}/readline/config.h-in + if ! test -f "${srcdir}/readline/config.h-in"; then + notfound="${srcdir}/readline/config.h-in" else - if ( ! test -f ${srcdir}/opcodes/ChangeLog.0203 ) ; then - notfound=${srcdir}/opcodes/ChangeLog.0203 + if ! test -f "${srcdir}/opcodes/ChangeLog.0203"; then + notfound="${srcdir}/opcodes/ChangeLog.0203" fi fi fi @@ -85,7 +85,7 @@ else fi # Where is the directory with DJGPP-specific scripts? -DJGPPDIR=${srcdir}/gdb/config/djgpp +DJGPPDIR="${srcdir}/gdb/config/djgpp" echo "Editing configure scripts for DJGPP..." TMPFILE="${TMPDIR-.}/cfg.tmp" @@ -103,22 +103,22 @@ fi # We use explicit /dev/env/DJDIR/bin/find to avoid catching # an incompatible DOS/Windows version that might be on their PATH. for fix_dir in \ - `cd $srcdir && /dev/env/DJDIR/bin/find . -type d ! -ipath "${SKIPDIR}" ! -ipath "${SKIPFILES}"` + `cd "$srcdir" && /dev/env/DJDIR/bin/find . -type d ! -ipath "${SKIPDIR}" ! -ipath "${SKIPFILES}"` do - if test ! -f ${fix_dir}/configure.orig ; then - if test -f ${srcdir}/${fix_dir}/configure ; then - mkdir -p ${fix_dir} - cp -p ${srcdir}/${fix_dir}/configure ${fix_dir}/configure.orig + if test ! -f "${fix_dir}/configure.orig" ; then + if test -f "${srcdir}/${fix_dir}/configure" ; then + mkdir -p "${fix_dir}" + cp -p "${srcdir}/${fix_dir}/configure" "${fix_dir}/configure.orig" fi fi - if test -f ${fix_dir}/configure.orig ; then - sed -f ${DJGPPDIR}/config.sed ${fix_dir}/configure.orig > $TMPFILE - update $TMPFILE ${fix_dir}/configure - touch ./${fix_dir}/configure -r ${fix_dir}/configure.orig - rm -f $TMPFILE + if test -f "${fix_dir}/configure.orig" ; then + sed -f "${DJGPPDIR}/config.sed" "${fix_dir}/configure.orig" > "$TMPFILE" + update "$TMPFILE" "${fix_dir}/configure" + touch "./${fix_dir}/configure" -r "${fix_dir}/configure.orig" + rm -f "$TMPFILE" fi - if test -f ${fix_dir}/INSTALL ; then - mv ${fix_dir}/INSTALL ${fix_dir}/INSTALL.txt + if test -f "${fix_dir}/INSTALL" ; then + mv "${fix_dir}/INSTALL" "${fix_dir}/INSTALL.txt" fi done @@ -134,7 +134,7 @@ export CONFIG_SHELL=/dev/env/DJDIR/bin/sh.exe # force to have the ltmain.sh script to be in DOS text format, # otherwise the resulting ltconfig script will have mixed # (UNIX/DOS) format and is unusable with Bash ports before v2.03. -utod $srcdir/ltmain.sh +utod "$srcdir/ltmain.sh" # Give the configure script some hints: export LD=ld @@ -159,16 +159,16 @@ export lt_cv_sys_max_cmd_len=12288 # Force depcomp to use _deps rather than .deps as the name of the # subdirectory where the *.Po dependency files are put. File names # with leading dots are invalid on DOS 8+3 filesystems. -export DEPDIR=${DEPDIR:-_deps} +export DEPDIR="${DEPDIR:-_deps}" # The configure script needs to see the `install-sh' script, otherwise # it decides the source installation is broken. But "make install" will # fail on 8+3 filesystems if it finds a file `install-', since there # are numerous "install-foo" targets in Makefile's. So we rename the # offending file after the configure step is done. -if test ! -f ${srcdir}/install-sh ; then - if test -f ${srcdir}/install-.sh ; then - mv ${srcdir}/install-.sh ${srcdir}/install-sh +if test ! -f "${srcdir}/install-sh" ; then + if test -f "${srcdir}/install-.sh" ; then + mv "${srcdir}/install-.sh" "${srcdir}/install-sh" fi fi @@ -176,10 +176,11 @@ fi # support, which is nearly impossible to be supported in the current way, # since it relies on file names which will never work on DOS. echo "Running the configure script..." -$srcdir/configure --srcdir="$srcdir" --prefix='${DJDIR}' \ +# shellcheck disable=SC2016 # $DJDIR is not expanded here. +"$srcdir/configure" --srcdir="$srcdir" --prefix='${DJDIR}' \ --disable-shared --disable-nls --verbose --enable-build-warnings=\ --Wimplicit,-Wcomment,-Wformat,-Wparentheses,-Wpointer-arith,-Wuninitialized $* +-Wimplicit,-Wcomment,-Wformat,-Wparentheses,-Wpointer-arith,-Wuninitialized "$@" -if test -f ${srcdir}/install- ; then - mv ${srcdir}/install- ${srcdir}/install-.sh +if test -f "${srcdir}/install-" ; then + mv "${srcdir}/install-" "${srcdir}/install-.sh" fi diff --git a/gdb/contrib/shellcheck.sh b/gdb/contrib/shellcheck.sh index ad59e2b0871..6f5634ce38e 100755 --- a/gdb/contrib/shellcheck.sh +++ b/gdb/contrib/shellcheck.sh @@ -41,9 +41,7 @@ for f in "$@"; do # Skip generated files. continue ;; - gdb/config/djgpp/djcheck.sh \ - | gdb/config/djgpp/djconfig.sh \ - | gdb/contrib/gdb-add-index.sh \ + gdb/contrib/gdb-add-index.sh \ | gdb/gdb_buildall.sh \ | gdb/gdb_mbuild.sh ) # Skip unclean files. base-commit: 2e9a026c2cd76b09f863ba877a1c492ebda76ee0 -- 2.51.0