Extend "make shellcheck" onto mkdep too.

Same as in tcpdump.

diff --git a/Makefile.in b/Makefile.in
index 3c36c4ffb051cf8f4dc3f0eba53ea7b882cab36b..b87ca5e3ed67a7f46e78d49a98af2cfabc21382e 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -249,4 +249,4 @@ depend:
        $(MKDEP) -c "$(CC)" -m "$(DEPENDENCY_CFLAG)" -s "$(srcdir)" $(DEFS) $(INCLS) $(SRC)
 
 shellcheck:
-       shellcheck -f gcc -e SC2006 autogen.sh build.sh build_matrix.sh build_common.sh .ci-coverity-scan-build.sh
+       shellcheck -f gcc -e SC2006 autogen.sh build.sh build_matrix.sh build_common.sh mkdep .ci-coverity-scan-build.sh

diff --git a/mkdep b/mkdep
index 2ec0e1ce4741c78cbbc93a431e67bad5f499154f..36cc57f5f9b8c8e34047555756efeaca3a1b5c66 100755 (executable)
--- a/mkdep
+++ b/mkdep
@@ -63,20 +63,20 @@ if [ $# = 0 ] ; then
        exit 1
 fi
 
-if [ ! -w $MAKE ]; then
+if [ ! -w "$MAKE" ]; then
        echo "mkdep: no writeable file \"$MAKE\""
        exit 1
 fi
 
 TMP=${TMPDIR:-/tmp}/mkdep$$
 
-trap 'rm -f $TMP ; exit 1' 1 2 3 13 15
+trap 'rm -f "$TMP" ; exit 1' HUP INT QUIT PIPE TERM
 
-cp $MAKE ${MAKE}.bak
+cp "$MAKE" "${MAKE}.bak"
 
-sed -e '/DO NOT DELETE THIS LINE/,$d' < $MAKE > $TMP
+sed -e '/DO NOT DELETE THIS LINE/,$d' < "$MAKE" > "$TMP"
 
-cat << _EOF_ >> $TMP
+cat << _EOF_ >> "$TMP"
 # DO NOT DELETE THIS LINE -- mkdep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
@@ -94,23 +94,25 @@ _EOF_
 # Construct a list of source files with paths relative to the source directory.
 #
 sources=""
-for srcfile in $*
+for srcfile in "$@"
 do
        sources="$sources $SOURCE_DIRECTORY/$srcfile"
 done
 
 # XXX this doesn't work with things like "-DDECLWAITSTATUS=union\ wait"
-$CC $DEPENDENCY_CFLAG $flags $sources |
+# $flags and $sources are meant to expand
+# shellcheck disable=SC2086
+"$CC" "$DEPENDENCY_CFLAG" $flags $sources |
 sed "
        s; \./; ;g
-       $SED" >> $TMP
+       $SED" >> "$TMP"
 
-cat << _EOF_ >> $TMP
+cat << _EOF_ >> "$TMP"
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
 _EOF_
 
 # copy to preserve permissions
-cp $TMP $MAKE
-rm -f ${MAKE}.bak $TMP
+cp "$TMP" "$MAKE"
+rm -f "${MAKE}.bak" "$TMP"
 exit 0