Splice shell arguments with ${1+"$@"}.

Leave as "${@}" only where it is absolutely obvious there must be at
least one parameter anyway, e.g. because it is a full command line.

diff --git a/src/Setup.sh b/src/Setup.sh
index 8ace433d10f64478342828189c736f47c7b87d91..e35dddf868dcb9fb313d65aafab1b3ef7b0bc5ba 100755 (executable)
--- a/src/Setup.sh
+++ b/src/Setup.sh
@@ -102,5 +102,5 @@ maybe_link config.guess microcode/config.guess
 for SUBDIR in ${INSTALLED_SUBDIRS} ${OTHER_SUBDIRS}; do
     echo "setting up ${SUBDIR}"
     maybe_link ${SUBDIR}/Setup.sh ../etc/Setup.sh
-    (cd ${SUBDIR} && ./Setup.sh ${@:+"${@}"})
+    (cd ${SUBDIR} && ./Setup.sh ${1+"$@"})
 done

diff --git a/src/blowfish/tags-fix.sh b/src/blowfish/tags-fix.sh
index c2823ad7ffc2183bd9939fc7348422cef5072030..14e5e863648ba89d391e72a5b5edb44d4ec379ce 100755 (executable)
--- a/src/blowfish/tags-fix.sh
+++ b/src/blowfish/tags-fix.sh
@@ -5,7 +5,7 @@
 
 set -e
 : ${MIT_SCHEME_EXE=mit-scheme}
-${MIT_SCHEME_EXE} --batch-mode -- "${@}" <<\EOF
+${MIT_SCHEME_EXE} --batch-mode -- ${1+"$@"} <<\EOF
 (let ((name (car (command-line))))
   (let ((shim.c-prefix (string-append name "-shim.c,"))
        (const.c-prefix (string-append name "-const.c,")))

diff --git a/src/compiler/Setup.sh b/src/compiler/Setup.sh
index 23e2ef883c3f8a0d00f60a6c4909d542bdbb9b49..712b9cba2bd61fa0887398dacb2096875e2a8bf0 100755 (executable)
--- a/src/compiler/Setup.sh
+++ b/src/compiler/Setup.sh
@@ -29,4 +29,4 @@ set -eu
 
 . ../etc/functions.sh
 
-../etc/Setup.sh ${@:+"${@}"}
+../etc/Setup.sh ${1+"$@"}

diff --git a/src/etc/c-bundle.sh b/src/etc/c-bundle.sh
index 60e50f39e323966bebc9c50aea9e501ded8b7a2f..bfdb71d60124045a50a52fb177bc5e4d6f483897 100755 (executable)
--- a/src/etc/c-bundle.sh
+++ b/src/etc/c-bundle.sh
@@ -43,7 +43,7 @@ shift 3
 GEN_NONCE=${AUXDIR}/gen-nonce
 EXTRACT_DECLS=${AUXDIR}/extract-liarc-decls
 
-"${EXTRACT_DECLS}" "${@}" > "${SYSTEM}.h"
+"${EXTRACT_DECLS}" ${1+"$@"} > "${SYSTEM}.h"
 
 cat <<EOF > "${SYSTEM}.c"
 

diff --git a/src/etc/functions.sh b/src/etc/functions.sh
index c6a0173edb526fcdca85d2e7e968482929a15b6a..a4256d16632ec3f3e3701162c67c1c13c759fdc0 100644 (file)
--- a/src/etc/functions.sh
+++ b/src/etc/functions.sh
@@ -32,12 +32,12 @@ run_cmd ()
 
 run_configure ()
 {
-    run_cmd ./configure "${@}"
+    run_cmd ./configure ${1+"$@"}
 }
 
 run_make ()
 {
-    run_cmd make "${@}"
+    run_cmd make ${1+"$@"}
 }
 
 run_cmd_in_dir ()
@@ -102,7 +102,7 @@ maybe_rm ()
 {
     FILES=
     DIRS=
-    for FN in "${@}"; do
+    for FN in ${1+"$@"}; do
        if [ -L "${FN}" ]; then
            :
        elif [ -f "${FN}" ]; then

diff --git a/src/etc/macosx/mit-scheme.sh b/src/etc/macosx/mit-scheme.sh
index 3408f8cfa01f59fd0e4cadee38adf6e2f6c4d0f1..452ef0575b592a5c66f298cfd3748c672084ca95 100755 (executable)
--- a/src/etc/macosx/mit-scheme.sh
+++ b/src/etc/macosx/mit-scheme.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-exec /Applications/MIT\:GNU\ Scheme.app/Contents/Resources/mit-scheme "${@}"
+exec /Applications/MIT\:GNU\ Scheme.app/Contents/Resources/mit-scheme ${1+"$@"}

diff --git a/src/etc/make-in-subdirs.sh b/src/etc/make-in-subdirs.sh
index d0fd8ec4fa26d21fcfaf045cfa03e69c726a80a8..60133e7f4f5f96523c2a864b2c9307e70e30825d 100755 (executable)
--- a/src/etc/make-in-subdirs.sh
+++ b/src/etc/make-in-subdirs.sh
@@ -28,6 +28,6 @@ set -e
 
 TARGET=${1}
 shift
-for SUBDIR in "${@}"; do
+for SUBDIR in ${1+"$@"}; do
     run_cmd_in_dir "${SUBDIR}" make "${TARGET}"
 done

diff --git a/src/etc/make-liarc-dist.sh b/src/etc/make-liarc-dist.sh
index 28fc0cd953be5a58013ddac26558c03ac3ba3f4c..784489d1c9d843a90baf677fcbd3f13e9f50a8f7 100755 (executable)
--- a/src/etc/make-liarc-dist.sh
+++ b/src/etc/make-liarc-dist.sh
@@ -30,5 +30,5 @@ set -e
 export MIT_SCHEME_EXE
 
 run_cmd ./Setup.sh
-run_configure --enable-native-code=c "${@}"
+run_configure --enable-native-code=c ${1+"$@"}
 run_make liarc-dist

diff --git a/src/etc/make-liarc.sh b/src/etc/make-liarc.sh
index b57e89280de04cee78e5d0aa638e7047d793c0c2..922282b1e45c61975707ed7aea86bdfdc0aab4d5 100755 (executable)
--- a/src/etc/make-liarc.sh
+++ b/src/etc/make-liarc.sh
@@ -27,7 +27,7 @@ set -e
 . etc/functions.sh
 
 FASTP=no
-for ARG in "${@}"; do
+for ARG in ${1+"$@"}; do
     case ${ARG} in
     --help|--help=*|--version)
        FASTP=yes
@@ -36,7 +36,7 @@ for ARG in "${@}"; do
 done
 
 if [ ${FASTP} = yes ]; then
-    exec ./configure "${@}"
+    exec ./configure ${1+"$@"}
 fi
 
 if [ ! -f runtime/runtime-unx.c ]; then
@@ -55,5 +55,5 @@ run_configure --prefix=`pwd`/boot-root --enable-native-code=c \
     --disable-host-scheme-test
 run_make stamp_install-liarc-boot-compiler c-clean distclean
 
-run_configure --enable-native-code=c --disable-host-scheme-test "${@}"
+run_configure --enable-native-code=c --disable-host-scheme-test ${1+"$@"}
 run_make stamp_compile-liarc-bundles build-bands clean-boot-root

diff --git a/src/etc/make-native.sh b/src/etc/make-native.sh
index 8721e0c18d4a519302e434ce804add94c732a30f..e9c86852f9c7fee8a60bf1f8993676856daa7400 100755 (executable)
--- a/src/etc/make-native.sh
+++ b/src/etc/make-native.sh
@@ -28,7 +28,7 @@ set -e
 
 FASTP=no
 NATIVE_CODE=
-for ARG in "${@}"; do
+for ARG in ${1+"$@"}; do
     case ${ARG} in
     --help|--help=*|--version)
        FASTP=yes
@@ -40,7 +40,7 @@ for ARG in "${@}"; do
 done
 
 if [ ${FASTP} = yes ]; then
-    exec ./configure "${@}"
+    exec ./configure ${1+"$@"}
 fi
 
 : ${MIT_SCHEME_EXE:=mit-scheme-c}
@@ -112,5 +112,5 @@ EOF
 
 run_make stamp_install-native-boot-compiler c-clean distclean
 
-run_configure "${@}"
+run_configure ${1+"$@"}
 run_make stamp_native-compile-scheme build-bands clean-boot-root

diff --git a/src/gdbm/tags-fix.sh b/src/gdbm/tags-fix.sh
index c2823ad7ffc2183bd9939fc7348422cef5072030..14e5e863648ba89d391e72a5b5edb44d4ec379ce 100755 (executable)
--- a/src/gdbm/tags-fix.sh
+++ b/src/gdbm/tags-fix.sh
@@ -5,7 +5,7 @@
 
 set -e
 : ${MIT_SCHEME_EXE=mit-scheme}
-${MIT_SCHEME_EXE} --batch-mode -- "${@}" <<\EOF
+${MIT_SCHEME_EXE} --batch-mode -- ${1+"$@"} <<\EOF
 (let ((name (car (command-line))))
   (let ((shim.c-prefix (string-append name "-shim.c,"))
        (const.c-prefix (string-append name "-const.c,")))

diff --git a/src/mcrypt/tags-fix.sh b/src/mcrypt/tags-fix.sh
index c2823ad7ffc2183bd9939fc7348422cef5072030..14e5e863648ba89d391e72a5b5edb44d4ec379ce 100755 (executable)
--- a/src/mcrypt/tags-fix.sh
+++ b/src/mcrypt/tags-fix.sh
@@ -5,7 +5,7 @@
 
 set -e
 : ${MIT_SCHEME_EXE=mit-scheme}
-${MIT_SCHEME_EXE} --batch-mode -- "${@}" <<\EOF
+${MIT_SCHEME_EXE} --batch-mode -- ${1+"$@"} <<\EOF
 (let ((name (car (command-line))))
   (let ((shim.c-prefix (string-append name "-shim.c,"))
        (const.c-prefix (string-append name "-const.c,")))

diff --git a/src/md5/tags-fix.sh b/src/md5/tags-fix.sh
index c2823ad7ffc2183bd9939fc7348422cef5072030..14e5e863648ba89d391e72a5b5edb44d4ec379ce 100755 (executable)
--- a/src/md5/tags-fix.sh
+++ b/src/md5/tags-fix.sh
@@ -5,7 +5,7 @@
 
 set -e
 : ${MIT_SCHEME_EXE=mit-scheme}
-${MIT_SCHEME_EXE} --batch-mode -- "${@}" <<\EOF
+${MIT_SCHEME_EXE} --batch-mode -- ${1+"$@"} <<\EOF
 (let ((name (car (command-line))))
   (let ((shim.c-prefix (string-append name "-shim.c,"))
        (const.c-prefix (string-append name "-const.c,")))

diff --git a/src/mhash/tags-fix.sh b/src/mhash/tags-fix.sh
index c2823ad7ffc2183bd9939fc7348422cef5072030..14e5e863648ba89d391e72a5b5edb44d4ec379ce 100755 (executable)
--- a/src/mhash/tags-fix.sh
+++ b/src/mhash/tags-fix.sh
@@ -5,7 +5,7 @@
 
 set -e
 : ${MIT_SCHEME_EXE=mit-scheme}
-${MIT_SCHEME_EXE} --batch-mode -- "${@}" <<\EOF
+${MIT_SCHEME_EXE} --batch-mode -- ${1+"$@"} <<\EOF
 (let ((name (car (command-line))))
   (let ((shim.c-prefix (string-append name "-shim.c,"))
        (const.c-prefix (string-append name "-const.c,")))

diff --git a/src/microcode/Setup.sh b/src/microcode/Setup.sh
index 1af18c3d1fa90de7cb653a4b88beb07775f9f717..98212eabd2dde344e33d3365a46349950e2de58c 100755 (executable)
--- a/src/microcode/Setup.sh
+++ b/src/microcode/Setup.sh
@@ -58,9 +58,9 @@ if [ ! -x configure ]; then
     autoconf
     autoconf=done
 fi
-( cd cmpauxmd && make ${@:+"${@}"} )
+( cd cmpauxmd && make ${1+"$@"} )
 if [ ! -f Makefile.in ]; then
     makeinit=clean
-    makegen/makeinit.sh ${@:+"${@}"}
+    makegen/makeinit.sh ${1+"$@"}
     makeinit=done
 fi

diff --git a/src/microcode/makegen/makeinit.sh b/src/microcode/makegen/makeinit.sh
index d9ca21e1a7ad2113616e817a769934df7d5ca6f9..96b2eb6338abaff535eef37a5ec471b9b282ed2d 100755 (executable)
--- a/src/microcode/makegen/makeinit.sh
+++ b/src/microcode/makegen/makeinit.sh
@@ -42,7 +42,7 @@ trap clean EXIT INT TERM
 # Generate "config.h".
 
 touch Makefile.in
-./configure --disable-native-code ${@:-"${@}"} || exit $?
+./configure --disable-native-code ${1+"$@"} || exit $?
 
 # Generate the real "Makefile.in" from "Makefile.in.in".  Requires
 # "config.h", because dependencies are generated by running GCC -M on

diff --git a/src/x11/tags-fix.sh b/src/x11/tags-fix.sh
index c2823ad7ffc2183bd9939fc7348422cef5072030..14e5e863648ba89d391e72a5b5edb44d4ec379ce 100755 (executable)
--- a/src/x11/tags-fix.sh
+++ b/src/x11/tags-fix.sh
@@ -5,7 +5,7 @@
 
 set -e
 : ${MIT_SCHEME_EXE=mit-scheme}
-${MIT_SCHEME_EXE} --batch-mode -- "${@}" <<\EOF
+${MIT_SCHEME_EXE} --batch-mode -- ${1+"$@"} <<\EOF
 (let ((name (car (command-line))))
   (let ((shim.c-prefix (string-append name "-shim.c,"))
        (const.c-prefix (string-append name "-const.c,")))