[PATCH 2/7] gdb: fix shellcheck warnings SC2086 (missing double quotes) in gdbarch.sh

Simon Marchi
2020-04-28T21:47:03Z

Fix all instances of:

In gdbarch.sh line 31:
if test ! -r ${file}
^-----^ SC2086: Double quote to prevent globbing and word splitting.

Did you mean:
if test ! -r "${file}"

Note that some instances of these are in text that is eval'ed. I'm
pretty sure that things could go wrong during the eval too, but that's
not something shellcheck can check.

gdb/ChangeLog:

* gdbarch.sh: Use double quotes around variables.
---
gdb/gdbarch.sh | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh
index 2780a819f915..a934a7aa6bc1 100755
--- a/gdb/gdbarch.sh
+++ b/gdb/gdbarch.sh
@@ -28,10 +28,10 @@ LC_ALL=C ; export LC_ALL
compare_new ()
{
file=$1
- if test ! -r ${file}
+ if test ! -r "${file}"
then
echo "${file} missing? cp new-${file} ${file}" 1>&2
- elif diff -u ${file} new-${file}
+ elif diff -u "${file}" "new-${file}"
then
echo "${file} unchanged" 1>&2
else
@@ -70,7 +70,7 @@ ${line}"
line="`echo "${line}" | sed -e 's/;;/; ;/g' -e 's/;;/; ;/g'`"

OFS="${IFS}" ; IFS="[;]"
- eval read ${read} <<EOF
+ eval read "${read}" <<EOF
${line}
EOF
IFS="${OFS}"
@@ -86,9 +86,9 @@ EOF
# that ended up with just that space character.
for r in ${read}
do
- if eval test \"\${${r}}\" = \"\ \"
+ if eval test "\"\${${r}}\" = ' '"
then
- eval ${r}=""
+ eval "${r}="
fi
done

@@ -1227,7 +1227,7 @@ ${class} ${returntype} ${function} ($formal)
EOF
for r in ${read}
do
- eval echo \"\ \ \ \ ${r}=\${${r}}\"
+ eval echo "\" ${r}=\${${r}}\""
done
if class_is_predicate_p && fallback_default_p
then
@@ -2162,7 +2162,7 @@ do
printf "\n"
printf "void\n"
printf "set_gdbarch_%s (struct gdbarch *gdbarch,\n" "$function"
- printf " `echo ${function} | sed -e 's/./ /g'` gdbarch_%s_ftype %s)\n" "$function" "$function"
+ printf " `echo "$function" | sed -e 's/./ /g'` gdbarch_%s_ftype %s)\n" "$function" "$function"
printf "{\n"
printf " gdbarch->%s = %s;\n" "$function" "$function"
printf "}\n"
@@ -2192,7 +2192,7 @@ do
printf "\n"
printf "void\n"
printf "set_gdbarch_%s (struct gdbarch *gdbarch,\n" "$function"
- printf " `echo ${function} | sed -e 's/./ /g'` %s %s)\n" "$returntype" "$function"
+ printf " `echo "$function" | sed -e 's/./ /g'` %s %s)\n" "$returntype" "$function"
printf "{\n"
printf " gdbarch->%s = %s;\n" "$function" "$function"
printf "}\n"
--
2.26.2