diff options
| -rw-r--r-- | run-sbcl.sh | 13 | ||||
| -rw-r--r-- | src/runtime/runtime.c | 1 | ||||
| -rw-r--r-- | tests/subr.sh | 3 | ||||
| -rw-r--r-- | version.lisp-expr | 2 |
4 files changed, 14 insertions, 5 deletions
diff --git a/run-sbcl.sh b/run-sbcl.sh index 83f40c1d3..26dc40689 100644 --- a/run-sbcl.sh +++ b/run-sbcl.sh @@ -14,15 +14,22 @@ set -e BASE=`dirname "$0"` -BASE=`(readlink -f ${BASE} 2> /dev/null || echo ${BASE})` +if (readlink -f "${BASE}") >/dev/null 2>&1; then + BASE=`readlink -f ${BASE}` +else + opwd=`pwd` + cd "${BASE}" + BASE=`pwd` + cd "${opwd}" +fi CORE_DEFINED=no for arg in $*; do case $arg in - (--core) + --core) CORE_DEFINED=yes ;; - (--help) + --help) echo "usage: run-sbcl.sh sbcl-options*" echo echo "Runs SBCL from the build directory or binary tarball without need for" diff --git a/src/runtime/runtime.c b/src/runtime/runtime.c index 720050008..0f1f0ff02 100644 --- a/src/runtime/runtime.c +++ b/src/runtime/runtime.c @@ -35,6 +35,7 @@ #endif #include <errno.h> #include <locale.h> +#include <limits.h> #if defined(SVR4) || defined(__linux__) #include <time.h> diff --git a/tests/subr.sh b/tests/subr.sh index c0e67f8e1..333ffb66a 100644 --- a/tests/subr.sh +++ b/tests/subr.sh @@ -33,7 +33,8 @@ SBCL_ARGS="--noinform --no-sysinit --no-userinit --noprint --disable-debugger" # Scripts that use these variables should quote them. TEST_BASENAME="`basename $0`" -TEST_FILESTEM="`echo ${TEST_BASENAME%.sh} | sed 's/\./-/g'`" +TEST_FILESTEM="`basename "${TEST_BASENAME}" | sed 's/\.sh$//'`" +TEST_FILESTEM="`echo "${TEST_FILESTEM}" | sed 's/\./-/g'`" TEST_DIRECTORY="$SBCL_PWD/$TEST_FILESTEM-$$" # "Ten four" is the closest numerical slang I can find to "OK", so diff --git a/version.lisp-expr b/version.lisp-expr index 6784b8570..922b46408 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -17,4 +17,4 @@ ;;; checkins which aren't released. (And occasionally for internal ;;; versions, especially for internal versions off the main CVS ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".) -"1.0.42.6" +"1.0.42.7" |