From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 5270F3882060 for ; Thu, 13 Jun 2024 15:11:59 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5270F3882060 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 5270F3882060 Authentication-Results: server2.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=1718291521; cv=none; b=gXhJJBd9H5hGzFQOW2Ci/3/3jI3bhfpYvI1Tg1Y6rw6Y3FXqxLqfD63Ke5RtXIih1Z7ngtcVkvtCiGFDbsCrIZAqt5drguOMIbxX1WYzS5ShGy+FOljfoF+LFlZSkNy8jvK5knkJx2g18z7bFvFrVj/NN8guLXjfA/NVsV/I9zM= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1718291521; c=relaxed/simple; bh=nF37vf0Twi9D4mz2sdNU0QFoqw0YGvKrRhuppEtviug=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-Id:MIME-Version; b=iEEM+7vJODDDu8IlEQOk5aSYRHETP0sAdsNH5husWZ+5ZkNcbiXgUuZC5Nekp4oGwAcdupfxlYtvZpt6xRdjguwsMJWRq22G0gnMy0SUjPEiqsuBfNiBrehGRE2mZJJgvuJd9jN7f45SuGLUqWtoiBweBVTG7nWEPlGj4esm/rY= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104: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 5DD41372FB for ; Thu, 13 Jun 2024 15:11:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1718291518; 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=CR/ztHfFJYNH7Gx6TgpkvQLzZNItVC7ZpeOm4CHwbug=; b=w0ExHT+gGknj/R9tX/KsTr/JH2yFWAwoVC1p3c57mg+KhFWi6OZ5AeF8YILS2gj60CLiAc da3QCSsid3Wb2uTNDeCrF6CS8AWshimnpX2N8mG3buFzBg55pU5NxLM40f2iiIq8dgNvDU If7bYWZKEYfhF8rEM6yMpJ3UfyT6hUk= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1718291518; 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=CR/ztHfFJYNH7Gx6TgpkvQLzZNItVC7ZpeOm4CHwbug=; b=tGmEKPyGS9f9VS2IqmoiwgAx43TOGen8K95/1dQRj5hrTC3u5iFwwCedX81YSgSt0mlOFc LPWc+BwO9LvGPACw== Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=w0ExHT+g; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=tGmEKPyG DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1718291518; 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=CR/ztHfFJYNH7Gx6TgpkvQLzZNItVC7ZpeOm4CHwbug=; b=w0ExHT+gGknj/R9tX/KsTr/JH2yFWAwoVC1p3c57mg+KhFWi6OZ5AeF8YILS2gj60CLiAc da3QCSsid3Wb2uTNDeCrF6CS8AWshimnpX2N8mG3buFzBg55pU5NxLM40f2iiIq8dgNvDU If7bYWZKEYfhF8rEM6yMpJ3UfyT6hUk= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1718291518; 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=CR/ztHfFJYNH7Gx6TgpkvQLzZNItVC7ZpeOm4CHwbug=; b=tGmEKPyGS9f9VS2IqmoiwgAx43TOGen8K95/1dQRj5hrTC3u5iFwwCedX81YSgSt0mlOFc LPWc+BwO9LvGPACw== 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 3D60B13A87 for ; Thu, 13 Jun 2024 15:11:58 +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 iPyaDT4Ma2ZUXQAAD6G6ig (envelope-from ) for ; Thu, 13 Jun 2024 15:11:58 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH v2 5/5] [gdb/build] Cleanup gdb/features/feature_to_c.sh Date: Thu, 13 Jun 2024 17:12:41 +0200 Message-Id: <20240613151241.8144-5-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20240613151241.8144-1-tdevries@suse.de> References: <20240613151241.8144-1-tdevries@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; RCVD_TLS_ALL(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:dkim]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FUZZY_BLOCKED(0.00)[rspamd.com]; TO_DN_NONE(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; MIME_TRACE(0.00)[0:+]; DKIM_TRACE(0.00)[suse.de:+] X-Rspamd-Action: no action X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Rspamd-Queue-Id: 5DD41372FB X-Spam-Score: -3.01 X-Spam-Level: X-Spam-Status: No, score=-12.4 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Clean up script gdb/features/feature_to_c.sh by: - fixing shellcheck warnings, - moving an embedded awk script out of the file, reducing the amount of escaping in the awk script, making it more readable and maintainable, and - adding emacs / vi settings for local tab size 2 (copied from ./ltmain.sh). Tested on x86_64-linux. --- gdb/features/feature_to_c.awk | 30 +++++++++++++++++++ gdb/features/feature_to_c.sh | 56 ++++++++++++++--------------------- 2 files changed, 52 insertions(+), 34 deletions(-) create mode 100644 gdb/features/feature_to_c.awk diff --git a/gdb/features/feature_to_c.awk b/gdb/features/feature_to_c.awk new file mode 100644 index 00000000000..42b9900f206 --- /dev/null +++ b/gdb/features/feature_to_c.awk @@ -0,0 +1,30 @@ +BEGIN { n = 0 + printf "static const char %s[] = {\n", arrayname + for (i = 0; i < 255; i++) + _ord_[sprintf("%c", i)] = i +} + +{ + split($0, line, ""); + printf " " + for (i = 1; i <= length($0); i++) { + c = line[i] + if (c == "'") { + printf "'\\''" + } else if (c == "\\") { + printf "'\\\\'" + } else if (_ord_[c] >= 32 && _ord_[c] < 127) { + printf "'%s'", c + } else { + printf "'\\%03o'", _ord_[c] + } + printf ", " + if (i % 10 == 0) + printf "\n " + } + printf "'\\n', \n" +} + +END { + print " 0 };" +} diff --git a/gdb/features/feature_to_c.sh b/gdb/features/feature_to_c.sh index 3159ec523a6..d5d3db7157f 100755 --- a/gdb/features/feature_to_c.sh +++ b/gdb/features/feature_to_c.sh @@ -32,47 +32,35 @@ if test -e "$output"; then exit 1 fi -echo '#include "xml-builtin.h"' >> $output +echo '#include "xml-builtin.h"' >> "$output" + +awk_script=$(echo "$0" | sed 's/\.sh$/.awk/') for input; do - arrayname=xml_feature_`echo $input | sed 's,.*/,,; s/[-.]/_/g'` + arrayname=xml_feature_$(echo "$input" | sed 's,.*/,,; s/[-.]/_/g') - ${AWK:-awk} 'BEGIN { n = 0 - print "static const char '$arrayname'[] = {" - for (i = 0; i < 255; i++) - _ord_[sprintf("%c", i)] = i - } { - split($0, line, ""); - printf " " - for (i = 1; i <= length($0); i++) { - c = line[i] - if (c == "'\''") { - printf "'\''\\'\'''\'', " - } else if (c == "\\") { - printf "'\''\\\\'\'', " - } else if (_ord_[c] >= 32 && _ord_[c] < 127) { - printf "'\''%s'\'', ", c - } else { - printf "'\''\\%03o'\'', ", _ord_[c] - } - if (i % 10 == 0) - printf "\n " - } - printf "'\''\\n'\'', \n" - } END { - print " 0 };" - }' < $input >> $output + ${AWK:-awk} \ + -v "arrayname=$arrayname" \ + -f "$awk_script" \ + < "$input" \ + >> "$output" done -echo >> $output +echo >> "$output" -echo "extern const char *const xml_builtin[][2] = {" >> $output +echo "extern const char *const xml_builtin[][2] = {" >> "$output" for input; do - basename=`echo $input | sed 's,.*/,,'` - arrayname=xml_feature_`echo $input | sed 's,.*/,,; s/[-.]/_/g'` - echo " { \"$basename\", $arrayname }," >> $output + basename=$(echo "$input" | sed 's,.*/,,') + arrayname=xml_feature_$(echo "$input" | sed 's,.*/,,; s/[-.]/_/g') + echo " { \"$basename\", $arrayname }," >> "$output" done -echo " { 0, 0 }" >> $output -echo "};" >> $output +echo " { 0, 0 }" >> "$output" +echo "};" >> "$output" + +# Local Variables: +# mode:shell-script +# sh-indentation:2 +# End: +# vi:sw=2 -- 2.35.3