jim 99/01/15 14:25:15
Modified: . configure src CHANGES Configure src/helpers slo.sh Log: Add Ben's suggestions Revision Changes Path 1.71 +1 -1 apache-1.3/configure Index: configure =================================================================== RCS file: /export/home/cvs/apache-1.3/configure,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- configure 1999/01/15 20:59:34 1.70 +++ configure 1999/01/15 22:25:10 1.71 @@ -366,7 +366,7 @@ exit 0 ;; --with-layout=*|--compat) - if [ "$apc_option" = "--compat" ]; then + if [ "x$apc_option" = "x--compat" ]; then apc_optarg="Apache" fi case $apc_optarg in 1.1215 +3 -1 apache-1.3/src/CHANGES Index: CHANGES =================================================================== RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1214 retrieving revision 1.1215 diff -u -r1.1214 -r1.1215 --- CHANGES 1999/01/15 21:04:16 1.1214 +++ CHANGES 1999/01/15 22:25:11 1.1215 @@ -3,7 +3,9 @@ *) Shell script style now consistant. For shell string equality tests, we used to have several different styles to work around old shells. It's now formally (eg): if [ "$var" = "value" ] (ie: both sides are - wrapped in dbl-quotes). [Jim Jagielski] + wrapped in dbl-quotes). There is one exception: if "value" + has a leading "-" then it should be [ "x$var" = "x-value" ]. + [Jim Jagielski] *) The status module now prints out both the main server generation as well as the generation of each process. Also, the vhost info is 1.325 +1 -1 apache-1.3/src/Configure Index: Configure =================================================================== RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.324 retrieving revision 1.325 diff -u -r1.324 -r1.325 --- Configure 1999/01/15 20:59:36 1.324 +++ Configure 1999/01/15 22:25:12 1.325 @@ -83,7 +83,7 @@ ## to select an alternate Configuration file ## while [ "$1" != "" ]; do - if [ "$1" = "-file" ] ; then + if [ "x$1" = "x-file" ] ; then shift 1; file=$1; shift 1 if [ ! -r $file ]; then echo "$file does not exist or is not readable." 1.4 +1 -1 apache-1.3/src/helpers/slo.sh Index: slo.sh =================================================================== RCS file: /export/home/cvs/apache-1.3/src/helpers/slo.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- slo.sh 1999/01/15 20:59:42 1.3 +++ slo.sh 1999/01/15 22:25:14 1.4 @@ -27,7 +27,7 @@ optprev='' fi # remember options for arg when used stand-alone - if [ "$opt" = "-L" -o "$opt" = "-l" ]; then + if [ "x$opt" = "x-L" -o "x$opt" = "x-l" ]; then optprev="$opt" continue; fi