From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id wW6PAE18s2qEaTYAWB0awg (envelope-from ) for ; Wed, 23 Sep 2026 03:14:21 -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=qR8PcvLt; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=fLP2wEBq; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=0MpPn8qb; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=H2l740RJ; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id EE4441E06B; Wed, 23 Sep 2026 03:14:20 -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 11F121E033 for ; Wed, 23 Sep 2026 03:14:20 -0400 (EDT) Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id EAD084BB1C37 for ; Wed, 23 Sep 2026 07:14:18 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org EAD084BB1C37 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=qR8PcvLt; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=fLP2wEBq; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=0MpPn8qb; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=H2l740RJ Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2a07:de40:b251:101:10:150:64:1]) by sourceware.org (Postfix) with ESMTPS id B72394BA9027 for ; Wed, 23 Sep 2026 07:13:53 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B72394BA9027 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 B72394BA9027 Authentication-Results: sourceware.org; arc=none smtp.remote-ip=2a07:de40:b251:101:10:150:64:1 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1790147633; cv=none; b=e8r2LKTITj3/DWfJIU94fUwAKma7kks+ohGTnjMlYS9dlv1Nvq6Cmn+fxS9Zs+hffL0Sg+r/WRouhsz23/L0SQKnXsAPmDkz1F5N9CiiOhMZT6VHRJ5gxMaJZNFeg2WRmnjscaiIS3uiNomnlxoNzob1jg2wHmSP/vLXzp8AnX0= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1790147633; c=relaxed/simple; bh=ZAX3NVwiytYSGUiI74SbOQ6HJNVQ/Z2BSXMgHja++Ao=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-ID:MIME-Version; b=oSe5+lv7WkrbHv3l3ywJFH3Q3dyTVxQA1k8pKjD7s3uNuV4+lq2jVE95irvrm5TZiBvfgkr7Gs5Tv0GgMLTOez82jFcCL8kjFwgouY0DCue6IVznI6BrP4CHZiBUV/FRxCgL9ONca9Pt3dGCZxLQw9nBlg6fJ+kPa4gT3WO7moY= 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=qR8PcvLt; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=fLP2wEBq; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=0MpPn8qb; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=H2l740RJ DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B72394BA9027 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-out1.suse.de (Postfix) with ESMTPS id DBF5321D63 for ; Wed, 23 Sep 2026 07:13:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1790147628; 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=4ycgbDp6i+qz0RMPBPn2QvSSA10rGjDFCPBznstKL3s=; b=qR8PcvLtFtQ4XE4shEgL4FaW1WuDcJvRYeLzshrVg3GDXU8rQI6OYEz34S1eLRwGelTIiD TQFqsj7sW5f2oJd12hj4GBZqLlMT36qHhLPweYo4Lekt32F6pD7UiLoliLJZXmW8zwS/ND DDQ7ygWKGUl9B2ZVBaZzAxiP+n+ZaKs= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1790147628; 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=4ycgbDp6i+qz0RMPBPn2QvSSA10rGjDFCPBznstKL3s=; b=fLP2wEBqp9TRIcxYGgzPb0dlEGar40aEzUx5oDJAOeBy7AdTMue3jzstize+R6brAXiTUC MdW/nIKhhtpLX+Ag== Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1790147623; 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=4ycgbDp6i+qz0RMPBPn2QvSSA10rGjDFCPBznstKL3s=; b=0MpPn8qbBQm8etJJjfwFL/cbHyBwOY7sBoFMovwvuFw+lkgPxJ3O8KwaIBIB0d1rzzQfsY yqSHyKQrRd92HoB9jjekS+VCXJQWZoT6u5RdhfHpBiqu1QLZaIn9sD+9ZC15vLvNqVWl0S 9JeTlYGHsPOZknhMCv1XO6kGD8r3fv0= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1790147623; 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=4ycgbDp6i+qz0RMPBPn2QvSSA10rGjDFCPBznstKL3s=; b=H2l740RJwjrOsAqvrXl02tQwboiZdltxnMexKqHiv0yaO7l2pEX3BV/+yZVThcz6cj8m3Z ED/a1jsZ4aq4neAQ== 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 9D04513432 for ; Wed, 23 Sep 2026 07:13:43 +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 48seGid8s2qZVAAAD6G6ig (envelope-from ) for ; Wed, 23 Sep 2026 07:13:43 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH v2] [gdb/contrib] Make gdb-add-index.sh shellcheck-clean Date: Wed, 23 Sep 2026 09:13:43 +0200 Message-ID: <20260923071343.2887804-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.995]; 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)[suse.de:mid,imap1.dmz-prg2.suse.org:helo]; 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 gdb-add-index.sh shellcheck-clean: - drop x in "xa" != "xb" comparison - eliminate tmp_files - drop dwz_file=$(echo $dwz_file) and strip leading spaces using sed instead Also for clarity: - use $file instead of $1 - use set -- after consuming last argument Changes in v2: - use "$file" instead of $1 - to eliminate tmp_files, don't use $@ but list tmp files explicitly in cleanup function Versions: - v1 https://sourceware.org/pipermail/gdb-patches/2026-September/230364.html --- gdb/contrib/gdb-add-index.sh | 38 +++++++++++++++++++++--------------- gdb/contrib/shellcheck.sh | 4 ---- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/gdb/contrib/gdb-add-index.sh b/gdb/contrib/gdb-add-index.sh index 4a30c5c5536..0c7797d23ed 100755 --- a/gdb/contrib/gdb-add-index.sh +++ b/gdb/contrib/gdb-add-index.sh @@ -82,7 +82,7 @@ case ${opt} in ;; esac # Break from loop if the first character of OPT is not '-'. -[ "x$(printf %.1s "$opt")" != "x-" ] +[ "$(printf %.1s "$opt")" != "-" ] do shift done @@ -93,10 +93,11 @@ if test $# != 1; then fi file="$1" +set -- if test -L "$file"; then if ! command -v readlink >/dev/null 2>&1; then - echo "$myname: 'readlink' missing. Failed to follow symlink $1." 1>&2 + echo "$myname: 'readlink' missing. Failed to follow symlink $file." 1>&2 exit 1 fi @@ -135,8 +136,7 @@ if $READELF -S "$file" | grep -q " \.gnu_debugaltlink "; then dwz_file=$($READELF --string-dump=.gnu_debugaltlink "$file" \ | grep -A1 "'\.gnu_debugaltlink':" \ | tail -n +2 \ - | sed 's/.*]//') - dwz_file=$(echo $dwz_file) + | sed 's/.*] *//') if $READELF -S "$dwz_file" | grep -E -q " \.(gdb_index|debug_names) "; then # Already has an index, skip it. dwz_file="" @@ -154,19 +154,25 @@ set_files () debugstrerr="${fpath}.debug_str.err" } -tmp_files= -for f in "$file" "$dwz_file"; do - if [ "$f" = "" ]; then - continue - fi - set_files "$f" - tmp_files="$tmp_files $index4 $index5 $debugstr $debugstrmerge $debugstrerr" -done - -rm -f $tmp_files - # Ensure intermediate index file is removed when we exit. -trap "rm -f $tmp_files" 0 +cleanup () +{ + for f in "$file" "$dwz_file"; do + if [ "$f" = "" ]; then + continue + fi + set_files "$f" + rm -f \ + "$index4" \ + "$index5" \ + "$debugstr" \ + "$debugstrmerge" \ + "$debugstrerr" + done +} + +cleanup +trap cleanup 0 $GDB --batch -nx -iex 'set auto-load no' \ -iex 'set debuginfod enabled off' \ diff --git a/gdb/contrib/shellcheck.sh b/gdb/contrib/shellcheck.sh index 6417d7a871f..9056206ea5f 100755 --- a/gdb/contrib/shellcheck.sh +++ b/gdb/contrib/shellcheck.sh @@ -41,10 +41,6 @@ for f in "$@"; do # Skip generated files. continue ;; - gdb/contrib/gdb-add-index.sh ) - # Skip unclean files. - continue - ;; *) files=("${files[@]}" "$f") ;; base-commit: a121bf759aefc18f3be9c5495d23ebe39354810b -- 2.51.0