From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 58E5A159C9B for ; Sun, 11 Aug 2024 10:11:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0E3772BC05A; Sun, 11 Aug 2024 10:11:14 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E673F2BC05A for ; Sun, 11 Aug 2024 10:11:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3BC06343119 for ; Sun, 11 Aug 2024 10:11:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6441C1EE8 for ; Sun, 11 Aug 2024 10:11:10 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1723371060.2a0259ec7d5d3095221854dbf89f6ead435c592d.sam@gentoo> Subject: [gentoo-commits] proj/gentoo-functions:master commit in: / X-VCS-Repository: proj/gentoo-functions X-VCS-Files: functions.sh X-VCS-Directories: / X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 2a0259ec7d5d3095221854dbf89f6ead435c592d X-VCS-Branch: master Date: Sun, 11 Aug 2024 10:11:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 46d05abe-8b84-41dd-ae5d-644658f6acb6 X-Archives-Hash: 36bc960afe144fa3f4bb88d190ac5274 commit: 2a0259ec7d5d3095221854dbf89f6ead435c592d Author: Kerin Millar plushkava net> AuthorDate: Thu Aug 8 08:56:49 2024 +0000 Commit: Sam James gentoo org> CommitDate: Sun Aug 11 10:11:00 2024 +0000 URL: https://gitweb.gentoo.org/proj/gentoo-functions.git/commit/?id=2a0259ec Implement a variant of quote_args() optimised for bash Add the quote_args_bash() function, which will be called from quote_args() under the appropriate circumstances. It is faster than the sh implementation, not merely because it takes advantage of the ${parameter@Q} form of parameter expansion, but also because executing external utilities exacts a greater performance toll for bash than it does for, say, dash. The difference is appreciable if running the test suite. Signed-off-by: Kerin Millar plushkava.net> Signed-off-by: Sam James gentoo.org> functions.sh | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/functions.sh b/functions.sh index 1c55b3d..a111f12 100644 --- a/functions.sh +++ b/functions.sh @@ -407,6 +407,12 @@ parallel_run() # quote_args() { + # Call into a bash-optimised implementation where appropriate. + # shellcheck disable=3028 + if [ ! "${POSIXLY_CORRECT}" ] && [ "${BASH_VERSINFO-0}" -ge 5 ]; then + quote_args_bash "$@" + return + fi LC_ALL=C awk -v q=\' -f - -- "$@" <<-'EOF' function init_table() { # Iterate over ranges \001-\037 and \177-\377. @@ -462,6 +468,26 @@ quote_args() EOF } +# shellcheck disable=3028 +if [ "${BASH_VERSINFO-0}" -ge 5 ]; then + # Note that the ${parameter@Q} form of expansion is supported as of + # bash 4.4. However, it is simpler to test for 5.0 or greater in sh. + eval ' + quote_args_bash() { + local IFS=" " args i + + (( $# > 0 )) || return 0 + args=("${@@Q}") + for i in "${!args[@]}"; do + if [[ ${args[i]} == \$* ]]; then + args[i]=${args[i]//\\E/\\e} + fi + done + printf "%s\\n" "${args[*]}" + } + ' +fi + # # Generates a random number between 0 and 2147483647 (2^31-1) with the # assistance of the kernel CSPRNG. Upon success, the number shall be printed to