From e2dba37ed391dba56d73f315ac052b066174e655 Mon Sep 17 00:00:00 2001
From: midipix <writeonce@midipix.org>
Date: Sat, 26 Oct 2019 19:53:50 +0000
Subject: build system: normalize quoting of printf format argument.

---
 sofort/ccenv/ccenv.sh   | 20 ++++++++++----------
 sofort/tools/version.sh |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'sofort')

diff --git a/sofort/ccenv/ccenv.sh b/sofort/ccenv/ccenv.sh
index 996557c..59f0105 100644
--- a/sofort/ccenv/ccenv.sh
+++ b/sofort/ccenv/ccenv.sh
@@ -51,7 +51,7 @@ ccenv_comment()
 ccenv_find_tool()
 {
 	if [ -z "$ccenv_prefixes" ]; then
-		for ccenv_candidate in $(printf %s "$ccenv_candidates"); do
+		for ccenv_candidate in $(printf '%s' "$ccenv_candidates"); do
 			if [ -z ${@:-} ]; then
 				if command -v "$ccenv_candidate" > /dev/null; then
 					ccenv_tool="$ccenv_candidate"
@@ -72,8 +72,8 @@ ccenv_find_tool()
 		return 0
 	fi
 
-	for ccenv_prefix in $(printf %s "$ccenv_prefixes"); do
-		for ccenv_candidate in $(printf %s "$ccenv_candidates"); do
+	for ccenv_prefix in $(printf '%s' "$ccenv_prefixes"); do
+		for ccenv_candidate in $(printf '%s' "$ccenv_candidates"); do
 			ccenv_tool="$ccenv_prefix$ccenv_candidate"
 
 			if command -v "$ccenv_tool" > /dev/null; then
@@ -82,7 +82,7 @@ ccenv_find_tool()
 		done
 	done
 
-	for ccenv_candidate in $(printf %s "$ccenv_candidates"); do
+	for ccenv_candidate in $(printf '%s' "$ccenv_candidates"); do
 		if command -v "$ccenv_candidate" > /dev/null; then
 			ccenv_tool="$ccenv_candidate"
 			return 0
@@ -101,7 +101,7 @@ ccenv_set_primary_tools()
 	ccenv_hack_tools="addr2line cov elfedit readelf readobj otool"
 	ccenv_peep_tools="perk mdso dlltool windmc windres"
 
-	for __tool in $(printf %s "$ccenv_core_tools $ccenv_hack_tools $ccenv_peep_tools"); do
+	for __tool in $(printf '%s' "$ccenv_core_tools $ccenv_hack_tools $ccenv_peep_tools"); do
 		if [ -n "$mb_agnostic" ]; then
 			ccenv_candidates=" $__tool"
 
@@ -470,8 +470,8 @@ ccenv_set_cc_bits()
 
 	for ccenv_internal_guess in 64 32 128; do
 		if [ -z $ccenv_internal_size ]; then
-			ccenv_internal_str=$(printf "$ccenv_internal_test"  \
-				"$ccenv_internal_type"                      \
+			ccenv_internal_str=$(printf '%s' "$ccenv_internal_test"  \
+				"$ccenv_internal_type"                           \
 				"$ccenv_internal_guess")
 
 			printf '%s' "$ccenv_internal_str"                   \
@@ -1003,7 +1003,7 @@ ccenv_output_defs()
 	ccenv_exvars="ccenv_cfgtype ccenv_makevar_prefix"
 
 	ccenv_sed_substs=" \
-		$(for __var in $(printf %s "$ccenv_vars $ccenv_exvars"); do \
+		$(for __var in $(printf '%s' "$ccenv_vars $ccenv_exvars"); do \
 			printf '%s"$%s"%s' "-e 's/@$__var@/'" \
 				"$__var" "'/g' ";              \
 		done)"
@@ -1013,7 +1013,7 @@ ccenv_output_defs()
 		> "$ccenv_mk"
 
 	if [ "$ccenv_cfgtype" = 'host' ]; then
-		for __var in $(printf %s "$ccenv_vars"); do
+		for __var in $(printf '%s' "$ccenv_vars"); do
 			ccenv_src_var=$__var
 			ccenv_dst_var=mb_${__var#*ccenv_}
 			ccenv_var_expr='${'$ccenv_src_var':-}'
@@ -1024,7 +1024,7 @@ ccenv_output_defs()
 		mb_host=$ccenv_host
 		mb_cchost=$ccenv_cchost
 	else
-		for __var in $(printf %s "$ccenv_vars"); do
+		for __var in $(printf '%s' "$ccenv_vars"); do
 			ccenv_src_var=$__var
 			ccenv_dst_var=mb_native_${__var#*ccenv_}
 			ccenv_var_expr='${'$ccenv_src_var':-}'
diff --git a/sofort/tools/version.sh b/sofort/tools/version.sh
index 61fa364..41e120a 100755
--- a/sofort/tools/version.sh
+++ b/sofort/tools/version.sh
@@ -39,7 +39,7 @@ while getopts "hs:o:p:" opt; do
     		prefix="$OPTARG"
     		;;
 	\?)
-    		printf "Invalid option: -%s" "$OPTARG" >&2
+		printf 'Invalid option: -%s' "$OPTARG" >&2
     		usage
     		;;
 	esac
-- 
cgit v1.2.3