--- ../bm-orig/Run	Sun Apr  5 19:15:13 1992
+++ Run	Sat Nov  8 21:33:57 2003
@@ -87,19 +87,19 @@
 #
 # establish full paths to directories
 PWD=`pwd`
-HOMEDIR=${HOMEDIR-.}
+HOMEDIR=${HOMEDIR:-.}
 cd $HOMEDIR
 HOMEDIR=`pwd`
 cd $PWD
 
-BINDIR=${BINDIR-${HOMEDIR}/pgms}
+BINDIR=${BINDIR:-${HOMEDIR}/pgms}
 cd $BINDIR
 BINDIR=`pwd`
 cd $PWD
 # let's extend the path to this directory
 PATH="${PATH}:${BINDIR}"
 
-SCRPDIR=${SCRPDIR-${HOMEDIR}/pgms}
+SCRPDIR=${SCRPDIR:-${HOMEDIR}/pgms}
 cd $SCRPDIR
 SCRPDIR=`pwd`
 cd $PWD
@@ -109,14 +109,14 @@
 TMPDIR=`pwd`
 cd $PWD
 
-RESULTDIR=${RESULTDIR-${HOMEDIR}/results}
+RESULTDIR=${RESULTDIR:-${HOMEDIR}/results}
 cd $RESULTDIR
 RESULTDIR=`pwd`
 cd $PWD
 
-TIMEACCUM=${TIMEACCUM-${RESULTDIR}/times}
+TIMEACCUM=${TIMEACCUM:-${RESULTDIR}/times}
 
-TESTDIR=${TESTDIR-${HOMEDIR}/testdir}
+TESTDIR=${TESTDIR:-${HOMEDIR}/testdir}
 cd $TESTDIR
 TESTDIR=`pwd`
 cd $PWD
@@ -217,7 +217,7 @@
 echo "|  Start Benchmark Run: `date`" >>$LOGFILE
 echo "|  " `who | wc -l` "interactive users." >>$LOGFILE
 #if not specified, do each bench 6 iterations
-iter=${iterations-6}
+iter=${iterations:-6}
 if test $iter -eq 6
 then
   longloop="1 2 3 4 5 6"
@@ -260,62 +260,62 @@
     case $bench
     in
   dhry2)
-    options=${dhrytime-10}
+    options=${dhrytime:-10}
     logmsg="Dhrystone 2 without register variables"
     ;;
 
   dhry2reg)
-    options=${dhrytime-10}
+    options=${dhrytime:-10}
     logmsg="Dhrystone 2 using register variables"
     ;;
 
   arithoh|register|short|int|long)
-    options=${arithtime-10}
+    options=${arithtime:-10}
     logmsg="Arithmetic Test (type = $bench)"
     ;;
 
   float|double)
-    options=${arithtime-10}
+    options=${arithtime:-10}
     logmsg="Arithmetic Test (type = $bench)"
     ;;
 
   syscall)
-    options=${systime-10}
+    options=${systime:-10}
     logmsg="System Call Overhead Test"
     ;;
 
   context1)
-    options=${systime-10}
+    options=${systime:-10}
     logmsg="Pipe-based Context Switching Test"
     ;;
 
   pipe)   
-    options=${systime-10}
+    options=${systime:-10}
     logmsg="Pipe Throughput Test"
     ;;
 
   spawn)  
-    options=${systime-10}
+    options=${systime:-10}
     logmsg="Process Creation Test"
     ;;
 
   execl)  
-    options=${systime-10}
+    options=${systime:-10}
     logmsg="Execl Throughput Test"
     ;;
 
   fstime) 
     logmsg='Filesystem Throughput Test ($param second test)'
-    where=${where-${TMPDIR}}
+    where=${where:-${TMPDIR}}
     cleanopt="-f $TMPTIMES"
     options='$param '"$where"
-    paramlist=${seconds-"10 30"}
+    paramlist=${seconds:-"10 30"}
     parammsg='Test Time: $param secs'
     ;;
 
   C)  
     logmsg="C Compiler Test"
-    prog="looper ${looper-60} ${CC} cctest.c"
+    prog="looper ${looper:-60} ${CC} cctest.c"
     stdout=/dev/null
     repeat="$shortloop"
     cleanopt="-m $TMPTIMES"
@@ -324,10 +324,10 @@
 
   shell)
     logmsg='Shell scripts ($param concurrent)'
-    prog="looper ${looper-60} multi.sh"
+    prog="looper ${looper:-60} multi.sh"
     repeat="$shortloop"
     stdout=/dev/null
-    paramlist=${background-"1 2 4 8 "}
+    paramlist=${background:-"1 2 4 8 "}
     parammsg='$param concurrent background processes'
     bgnumber='$param'
     cleanopt="-m $TMPTIMES"
@@ -335,14 +335,14 @@
 
   dc)  
     logmsg="Dc: sqrt(2) to 99 decimal places"
-    prog="looper ${looper-60} dc"
+    prog="looper ${looper:-60} dc"
     stdin=dc.dat
     stdout=/dev/null
     cleanopt="-m $TMPTIMES"
     ;;
 
   hanoi)  
-    options=${systime-10}
+    options=${systime:-10}
     stdout=/dev/null
     logmsg="Recursion Test--Tower of Hanoi"
     parammsg='$param Disk Problem:'