Fix shellcheck problems.

scripts/cppcheck.sh

@@ -13,64 +13,64 @@ fi
 # See if cppcheck accepts --check-level
 EXHAUSTIVE=$(cppcheck --check-level=exhaustive --version > /dev/null 2>&1 && echo "--check-level=exhaustive")
 
-CPPCHKOPT="-j $nproc --force $EXHAUSTIVE"
-CPPCHKOPT="$CPPCHKOPT --enable=warning,performance,portability"
-CPPCHKOPT="$CPPCHKOPT -I$(realpath "$(dirname "$0")/../include")"
+CPPCHKOPT=( -j "$nproc" --force "$EXHAUSTIVE" )
+CPPCHKOPT+=( "--enable=warning,performance,portability" )
+CPPCHKOPT+=( "-I$(realpath "$(dirname "$0")/../include")" )
 
 # Even cppcheck 2.3 (debian 11) supports c++17 (undocumented)
-CCSTD="--std=c11 --language=c"
-CXSTD="--std=c++17 --language=c++"
+CCSTD=( --std=c11 --language=c )
+CXSTD=( --std=c++17 --language=c++ )
 
-CPPCHKCC="$CPPCHKOPT $CCSTD"
-CPPCHKCX="$CPPCHKOPT $CXSTD"
+CPPCHKCC=( "${CPPCHKOPT[@]}" "${CCSTD[@]}" )
+CPPCHKCX=( "${CPPCHKOPT[@]}" "${CXSTD[@]}" )
 
 # Do this from the source directory
-cd "$(dirname "$0")/../src"
+cd "$(dirname "$0")/../src" || exit
 
 docheck() {
-    files=$(find "$1" -maxdepth 1 \( -name "*.c" -o -name "*.h" \) )
-    [ ! -z "$files" ] && cppcheck -I"$1" $CPPCHKCC $files
+    mapfile -t files < <(find "$1" -maxdepth 1 \( -name "*.c" -o -name "*.h" \) )
+    [ "${#files[@]}" -gt 0 ] && cppcheck -I"$1" "${CPPCHKCC[@]}" "${files[@]}"
 
-    files=$(find "$1" -maxdepth 1 \( -name "*.cc" -o -name "*.hh" \) )
-    [ ! -z "$files" ] && cppcheck -I"$1" $CPPCHKCX $files
+    mapfile -t files < <(find "$1" -maxdepth 1 \( -name "*.cc" -o -name "*.hh" \) )
+    [ "${#files[@]}" -gt 0 ] && cppcheck -I"$1" "${CPPCHKCX[@]}" "${files[@]}"
 }
 
 # *** HAL files ***
 echo "I (1/4): checking HAL folders with both C and C++ code"
-for d in $(find hal/ -type d -not -name "*__pycache__")
+while IFS= read -r -d '' d
 do
     # Don't care about examples
     case "$d" in hal/user_comps/mb2hal/examples*) continue;; esac
 
     echo "I (1/4): checking $d"
     docheck "$d"
-done
+done < <(find hal/ -type d -not -name "*__pycache__" -print0)
 
 # *** EMC files ***
 echo "I (2/4): checking EMC folders with both C and C++ code"
-for d in $(find emc/ -type d -not -name "*__pycache__")
+while IFS= read -r -d '' d
 do
     # Will give Tcl problems
     case "$d" in emc/usr_intf/axis/extensions*) continue;; esac
 
     echo "I (2/4): checking $d"
     docheck "$d"
-done
+done < <(find emc/ -type d -not -name "*__pycache__" -print0)
 
 # *** NML files ***
 echo "I (3/4): checking LIBNML folders with both C and C++ code"
-for d in $(find libnml/ -type d -not -name "*__pycache__")
+while IFS= read -r -d '' d
 do
     echo "I (3/4): checking $d"
     docheck "$d"
-done
+done < <(find libnml/ -type d -not -name "*__pycache__" -print0)
 
 # *** RTAPI files ***
 echo "I (4/4): checking RTAPI folders with both C and C++ code"
-for d in $(find rtapi/ -type d -not -name "*__pycache__")
+while IFS= read -r -d '' d
 do
     echo "I (4/4): checking $d"
     docheck "$d"
-done
+done < <(find rtapi/ -type d -not -name "*__pycache__" -print0)
 
 exit 0