From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id oW15BYt5kWoWMgsAWB0awg (envelope-from ) for ; Fri, 28 Aug 2026 08:05:31 -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=TYMBgFXA; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=0YDp8bJO; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=KFcShEFV; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=9u9o7jtY; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id E7C091E033; Fri, 28 Aug 2026 08:05:30 -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 [IPv6:2620:52:6:3111::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 7BD721E033 for ; Fri, 28 Aug 2026 08:05:29 -0400 (EDT) Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id AB2584BA5434 for ; Fri, 28 Aug 2026 12:05:28 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org AB2584BA5434 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=TYMBgFXA; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=0YDp8bJO; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=KFcShEFV; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=9u9o7jtY Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2a07:de40:b251:101:10:150:64:2]) by sourceware.org (Postfix) with ESMTPS id 674604BA5436 for ; Fri, 28 Aug 2026 12:04:49 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 674604BA5436 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 674604BA5436 Authentication-Results: sourceware.org; arc=none smtp.remote-ip=2a07:de40:b251:101:10:150:64:2 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1787918689; cv=none; b=aJinFkU8FqUF1um0wM4pACC2lQYcS2ua/a7wGObiy3ci8rthBUm6UWjb8nhzLljHe+kERtk12nQD4UCIbZWY+4KXT86OyYdYurFvfbYcEjTfm7HsEiyeoPKQBRvBfiCEEQbBckscGuUUneah97kI8zNaTrdKPUXPGwMOmCwBVoU= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1787918689; c=relaxed/simple; bh=BCuSKL0r3AvONGMlJAHC/WtuofWRdunIn+NqCtCcylg=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-ID:MIME-Version; b=U4u8Yd8gELEFAxKH7EVJ8NPGHsRUnDBTxpR/+fIBXCkiFp8yt9PwAcTDol6+GDL/G/r/a+OxlDJJzTYY5Nxb+zbXOH6txcsDr1J/RzwoMOlSSrBoEjl7PcwcAd6niBNZjOiGvmkfQuaMjGFdfZi0xaNMKeqQn2s+EuWIcK713Jk= 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=TYMBgFXA; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=0YDp8bJO; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=KFcShEFV; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=9u9o7jtY DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 674604BA5436 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 1E4451FE97 for ; Fri, 28 Aug 2026 12:04:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1787918684; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=80oi2vAwZ1BMbxnjFxwZuRhlHaCwsWjeW5+UhlI0+qc=; b=TYMBgFXAFU6CfKHXU1KcM2OvNuAqMd/4Ml839H4iesWiPfWzYjH1uuXwEsSSgf1jWisvSb h5wfMcWQHSniBJpeA+8lNGEMWQqawEWXmLlTYOXP9xe9QmZrC9mWx5/OjrXB4jKItugNvL HOvOR7wrtKvr6MtBtb3LEu+ZfEspueY= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1787918684; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=80oi2vAwZ1BMbxnjFxwZuRhlHaCwsWjeW5+UhlI0+qc=; b=0YDp8bJO+/8o/uSJRrw7eGdW7ShfR50wLPNkEXoSsgu23eT1uS1ID23RsNNgZT49JAs4UY YzyZ09wXFnSfgwDA== Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1787918680; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=80oi2vAwZ1BMbxnjFxwZuRhlHaCwsWjeW5+UhlI0+qc=; b=KFcShEFVWt/q/fzjSOCMoxB27xninRq+Zj7JImBUKI3o65883Vryc+HZly9C4x9eHWJ5J8 5q5F7S+f1z502WVjx8bXP4zgubJpmiCAqDX5c4t0IHbH+uPG79wjHaJ8Txc34aiMJXre/w wkOg7oSj4s2aX594FQj9nM1p18u3Wnk= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1787918680; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=80oi2vAwZ1BMbxnjFxwZuRhlHaCwsWjeW5+UhlI0+qc=; b=9u9o7jtYJIgqg5/tmCqN4TDIvHs+rzStIZthDGCzZ6jwJGPdbxLYzK5kk43KRn0rOhFtAs 93OfSdqk8UueX3Cw== 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 D9E9D13674 for ; Fri, 28 Aug 2026 12:04:39 +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 0FeLM1d5kWq4GAAAD6G6ig (envelope-from ) for ; Fri, 28 Aug 2026 12:04:39 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH 1/2] [gdb] Make regformats/regdat.sh shellcheck-clean Date: Fri, 28 Aug 2026 14:04:38 +0200 Message-ID: <20260828120439.3857602-2-tdevries@suse.de> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260828120439.3857602-1-tdevries@suse.de> References: <20260828120439.3857602-1-tdevries@suse.de> 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.993]; MIME_GOOD(-0.10)[text/plain]; ARC_NA(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; RCVD_VIA_SMTP_AUTH(0.00)[]; MIME_TRACE(0.00)[0:+]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo,suse.de:mid,shellcheck.net:url]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_NONE(0.00)[]; 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 regformats/regdat.sh shellcheck-clean: - use read -r - use $() - ignore intentional word-splitting - add missing quotes - use $(()) Handle a shellcheck error in this: ... if eval test \"\${${r}}\" = \"\ \" ... by simplifying to: ... eval "rvalue=\$$r" if test "${rvalue:-}" = " " ... Note that shellcheck can't detect that rvalue is assigned to, so we use '${parameter:-word}' to use default value "", to silence a SC2154 [1]. Also, handle a shellcheck error in this: ... eval ${r}="" ... by simplifying to: ... eval "$r=''" ... Tested on x86_64-linux using: ... $ for f in $(find gdb/regformats -name "*.dat"); do \ sh gdb/regformats/regdat.sh \ $f \ gdbsupport/osabi.def \ $(echo $f | sed 's%/%-%g'); \ done ... and comparing the generated files with and without this patch. [1] https://www.shellcheck.net/wiki/SC2154 --- gdb/contrib/shellcheck.sh | 1 - gdb/regformats/regdat.sh | 25 ++++++++++++++----------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/gdb/contrib/shellcheck.sh b/gdb/contrib/shellcheck.sh index f7f7bf9efbf..a3e80a553f4 100755 --- a/gdb/contrib/shellcheck.sh +++ b/gdb/contrib/shellcheck.sh @@ -47,7 +47,6 @@ for f in "$@"; do | gdb/contrib/gdb-add-index.sh \ | gdb/gdb_buildall.sh \ | gdb/gdb_mbuild.sh \ - | gdb/regformats/regdat.sh \ | gdb/testsuite/lib/pdtrace.in) # Skip unclean files. continue diff --git a/gdb/regformats/regdat.sh b/gdb/regformats/regdat.sh index b57b76132aa..01f2dabe459 100755 --- a/gdb/regformats/regdat.sh +++ b/gdb/regformats/regdat.sh @@ -25,7 +25,7 @@ do_read () { type="" entry="" - while read line + while read -r line do if test "${line}" = "" then @@ -42,9 +42,11 @@ ${line}" # The semantics of IFS varies between different SH's. Some # treat ``::' as three fields while some treat it as just too. # Work around this by eliminating ``::'' .... - line="`echo "${line}" | sed -e 's/::/: :/g' -e 's/::/: :/g'`" + line="$(echo "${line}" | sed -e 's/::/: :/g' -e 's/::/: :/g')" OFS="${IFS}" ; IFS="[:]" + # Word-splitting on read variable is required. + # shellcheck disable=SC2086 eval read ${read} <&2 exit 1 fi @@ -105,8 +108,8 @@ EOF } -exec > new-$3 -copyright $1 +exec > new-"$3" +copyright "$1" echo '#include "regdef.h"' echo '#include "tdesc.h"' echo @@ -119,7 +122,7 @@ xmlosabi=x expedite=x feature=x osabi=unknown -exec < $1 +exec < "$1" while do_read do if test "${type}" = "name"; then @@ -162,13 +165,13 @@ do echo " tdesc_create_reg (feature, \"${entry}\"," echo " 0, 0, NULL, ${type}, NULL);" - offset=`expr ${offset} + ${type}` - i=`expr $i + 1` + offset=$((offset + type)) + i=$((i + 1)) fi done echo -echo "static const char *expedite_regs_${name}[] = { \"`echo ${expedite} | sed 's/,/", "/g'`\", 0 };" +echo "static const char *expedite_regs_${name}[] = { \"$(echo "${expedite}" | sed 's/,/", "/g')\", 0 };" echo "#ifndef IN_PROCESS_AGENT" if test "${feature}" != x; then -- 2.51.0