mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-03-15 10:20:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improve quote_args output readability

Browse Source 
Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>
This commit is contained in:
Dave Rodgman 2024-02-15 16:04:36 +00:00
parent 90dbba5385
commit 1110698ed9
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/scripts/quiet/cmake
View File

@ -24,12 +24,14 @@ quote_args() {
local args=("$@")
s=""
for a in "${args[@]}"; do
simple_pattern='^[[:alnum:] _=+-]*$'
simple_pattern='^([[:alnum:]_+-]+=)?([[:alnum:] _=+-]*)$'
if [[ $a =~ ' ' && $a =~ $simple_pattern ]]; then
# a has spaces, but no other special characters that need escaping
# (quoting after removing spaces yields no backslashes)
# simplify quoted form to "$a" - e.g. yield "a b c" instead of a\ b\ c
q="\"$a\""
# simplify quoted form - e.g.:
# a b -> "a b"
# CFLAGS=a b -> CFLAGS="a b"
q="${BASH_REMATCH[1]}\"${BASH_REMATCH[2]}\""
else
# get bash to do the quoting
q=$(printf '%q' "$a")

8
tests/scripts/quiet/make
View File

@ -24,12 +24,14 @@ quote_args() {
local args=("$@")
s=""
for a in "${args[@]}"; do
simple_pattern='^[[:alnum:] _=+-]*$'
simple_pattern='^([[:alnum:]_+-]+=)?([[:alnum:] _=+-]*)$'
if [[ $a =~ ' ' && $a =~ $simple_pattern ]]; then
# a has spaces, but no other special characters that need escaping
# (quoting after removing spaces yields no backslashes)
# simplify quoted form to "$a" - e.g. yield "a b c" instead of a\ b\ c
q="\"$a\""
# simplify quoted form - e.g.:
# a b -> "a b"
# CFLAGS=a b -> CFLAGS="a b"
q="${BASH_REMATCH[1]}\"${BASH_REMATCH[2]}\""
else
# get bash to do the quoting
q=$(printf '%q' "$a")