jim 99/01/15 12:59:46
Modified: . configure src Configure src/helpers GuessOS PrintPath TestCompile binbuild.sh buildinfo.sh checkheader.sh find-dbm-lib findcpp.sh fmn.sh fp2rp install.sh mkshadow.sh ppl.sh slo.sh Log: Final phase of shell programming style consistancy check. Revision Changes Path 1.70 +7 -7 apache-1.3/configure Index: configure =================================================================== RCS file: /export/home/cvs/apache-1.3/configure,v retrieving revision 1.69 retrieving revision 1.70 diff -u -r1.69 -r1.70 --- configure 1999/01/15 20:44:01 1.69 +++ configure 1999/01/15 20:59:34 1.70 @@ -1157,7 +1157,7 @@ name="`echo $rule | tr "a-z" "A-Z"`" eval "val=\$rule_$rule" echo $SEO "s%^\\(Rule $name=\\).*%\\1$val%g" >>$sedsubst - if [ $verbose = yes ]; then + if [ "$verbose" = "yes" ]; then echo " + Rule $name=$val" fi done @@ -1168,13 +1168,13 @@ OIFS="$IFS" IFS=':' for module in $modules; do eval "share=\$shared_$module" - if [ $share = yes ]; then + if [ "$share" = "yes" ]; then some_shares=1 fi done IFS="$OIFS" -if [ $some_shares = 1 ]; then - if [ $module_so = no ]; then +if [ "$some_shares" = "1" ]; then + if [ "$module_so" = "no" ]; then module_so=yes if [ "$quiet" = "no" ]; then echo " + enabling mod_so for DSO support" @@ -1263,7 +1263,7 @@ OIFS="$IFS" IFS=':' for module in $modules; do eval "add=\$module_$module" - if [ $add = yes ]; then + if [ "$add" = "yes" ]; then echo $SEO "s%^.*\\(AddModule.*[_b/]$module\\..*\\)%\\1%g" >>$sedsubst echo $SEO "s%^.*\\(SharedModule.*[_b/]$module\\..*\\)%\\1%g" >>$sedsubst m="yes [static]" @@ -1273,11 +1273,11 @@ m=no fi eval "share=\$shared_$module" - if [ $share = yes ]; then + if [ "$share" = "yes" ]; then echo $SEO "s%^\\(.*\\)AddModule\\(.*[_b/]$module\\.\\)[oam].*\\(.*\\)%\\1SharedModule\\2so\\3%g" >>$sedsubst m="yes [shared]" fi - if [ $verbose = yes ]; then + if [ "$verbose" = "yes" ]; then echo " + Module $module: $m" fi done 1.324 +1 -1 apache-1.3/src/Configure Index: Configure =================================================================== RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.323 retrieving revision 1.324 diff -u -r1.323 -r1.324 --- Configure 1999/01/15 20:32:53 1.323 +++ Configure 1999/01/15 20:59:36 1.324 @@ -172,7 +172,7 @@ ## that the user was using the old default root directory ## and issue a notice about it. ## -if [ $file != "Configuration.apaci" ] +if [ "$file" != "Configuration.apaci" ] then if [ -d /usr/local/etc/httpd/ ] then 1.55 +3 -3 apache-1.3/src/helpers/GuessOS Index: GuessOS =================================================================== RCS file: /export/home/cvs/apache-1.3/src/helpers/GuessOS,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- GuessOS 1999/01/09 14:24:52 1.54 +++ GuessOS 1999/01/15 20:59:38 1.55 @@ -22,7 +22,7 @@ # # We need to work around FreeBSD 1.1.5.1 XREL=`uname -X 2>/dev/null | grep "^Release" | awk '{print $3}'` -if [ "x$XREL" != "x" ]; then +if [ "$XREL" != "" ]; then if [ -f /etc/kconfig ]; then case "$XREL" in 4.0|4.1) @@ -38,9 +38,9 @@ echo "whatever-whatever-sco5"; exit 0 ;; 4.2MP) - if [ "x$VERSION" = "x2.1.1" ]; then + if [ "$VERSION" = "2.1.1" ]; then echo "${MACHINE}-whatever-unixware211"; exit 0 - elif [ "x$VERSION" = "x2.1.2" ]; then + elif [ "$VERSION" = "2.1.2" ]; then echo "${MACHINE}-whatever-unixware212"; exit 0 else echo "${MACHINE}-whatever-unixware2"; exit 0 1.15 +1 -1 apache-1.3/src/helpers/PrintPath Index: PrintPath =================================================================== RCS file: /export/home/cvs/apache-1.3/src/helpers/PrintPath,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- PrintPath 1998/12/02 14:03:31 1.14 +++ PrintPath 1999/01/15 20:59:38 1.15 @@ -49,7 +49,7 @@ # if test/[] knows about -x, which is the prefered flag. ## -if [ "x$os" = "xOS/2" ] +if [ "$os" = "OS/2" ] then ext=".exe" pathname=`echo -E $pathname | 1.23 +4 -4 apache-1.3/src/helpers/TestCompile Index: TestCompile =================================================================== RCS file: /export/home/cvs/apache-1.3/src/helpers/TestCompile,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- TestCompile 1998/12/09 21:26:19 1.22 +++ TestCompile 1999/01/15 20:59:39 1.23 @@ -58,7 +58,7 @@ case "$1" in "lib") - if [ "x$2" = "x" ]; then + if [ "$2" = "" ]; then exit fi TLIB="-l$2" @@ -67,7 +67,7 @@ else ERRDIR='2>/dev/null' fi - if [ "x$3" = "x" ]; then + if [ "$3" = "" ]; then TARGET='dummy' else TARGET='testfunc' @@ -84,7 +84,7 @@ TARGET='dummy' ;; "func") - if [ "x$2" = "x" ]; then + if [ "$2" = "" ]; then exit fi TLIB="" @@ -102,7 +102,7 @@ EOF ;; "header") - if [ "x$2" = "x" ]; then + if [ "$2" = "" ]; then exit fi TLIB="" 1.4 +3 -3 apache-1.3/src/helpers/binbuild.sh Index: binbuild.sh =================================================================== RCS file: /export/home/cvs/apache-1.3/src/helpers/binbuild.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- binbuild.sh 1999/01/15 15:06:59 1.3 +++ binbuild.sh 1999/01/15 20:59:39 1.4 @@ -190,14 +190,14 @@ echo "ERROR: Failed to build Apache. See \"build.log\" for details." exit 1; else - if [ ".$GTAR" != . ] + if [ "$GTAR" != "" ] then $GTAR -zcf ../apache-$VER-$OS.tar.gz -C .. --owner=root --group=root apache-$VER else - if [ ".$TAR" != . ] + if [ "$TAR" != "" ] then $TAR -cf ../apache-$VER-$OS.tar -C .. apache-$VER - if [ ".$GZIP" != . ] + if [ "$GZIP" != "" ] then $GZIP ../apache-$VER-$OS.tar fi 1.3 +12 -12 apache-1.3/src/helpers/buildinfo.sh Index: buildinfo.sh =================================================================== RCS file: /export/home/cvs/apache-1.3/src/helpers/buildinfo.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- buildinfo.sh 1998/09/16 20:49:24 1.2 +++ buildinfo.sh 1999/01/15 20:59:39 1.3 @@ -16,10 +16,10 @@ if [ $# -ne 1 -a $# -ne 2 ]; then error=yes fi -if [ $# -eq 2 -a ".$1" != ".-n" ]; then +if [ $# -eq 2 -a "$1" != "-n" ]; then error=yes fi -if [ $error = yes ]; then +if [ "$error" = "yes" ]; then echo "$0:Error: invalid argument line" echo "$0:Usage: $0 [-n] <format-string>" echo "Where <format-string> can contain:" @@ -55,15 +55,15 @@ # determine username # username="$LOGNAME" -if [ ".$username" = . ]; then +if [ "$username" = "" ]; then username="$USER" - if [ ".$username" = . ]; then + if [ "$username" = "" ]; then username="`whoami 2>/dev/null |\ awk '{ printf("%s", $1); }'`" - if [ ".$username" = . ]; then + if [ "$username" = "" ]; then username="`who am i 2>/dev/null |\ awk '{ printf("%s", $1); }'`" - if [ ".$username" = . ]; then + if [ "$username" = "" ]; then username='unknown' fi fi @@ -75,10 +75,10 @@ # hostname="`uname -n 2>/dev/null |\ awk '{ printf("%s", $1); }'`" -if [ ".$hostname" = . ]; then +if [ "$hostname" = "" ]; then hostname="`hostname 2>/dev/null |\ awk '{ printf("%s", $1); }'`" - if [ ".$hostname" = . ]; then + if [ "$hostname" = "" ]; then hostname='unknown' fi fi @@ -88,14 +88,14 @@ hostname="`echo $hostname | cut -d. -f1`" ;; esac -if [ ".$domainname" = . ]; then +if [ "$domainname" = "" ]; then if [ -f /etc/resolv.conf ]; then domainname="`egrep '^[ ]*domain' /etc/resolv.conf | head -1 |\ sed -e 's/.*domain//' \ -e 's/^[ ]*//' -e 's/^ *//' -e 's/^ *//' \ -e 's/^\.//' -e 's/^/./' |\ awk '{ printf("%s", $1); }'`" - if [ ".$domainname" = . ]; then + if [ "$domainname" = "" ]; then domainname="`egrep '^[ ]*search' /etc/resolv.conf | head -1 |\ sed -e 's/.*search//' \ -e 's/^[ ]*//' -e 's/^ *//' -e 's/^ *//' \ @@ -112,7 +112,7 @@ time_day="`date '+%d' | awk '{ printf("%s", $1); }'`" time_month="`date '+%m' | awk '{ printf("%s", $1); }'`" time_year="`date '+%Y' 2>/dev/null | awk '{ printf("%s", $1); }'`" -if test ".$time_year" = .; then +if test "$time_year" = "" ; then time_year="`date '+%y' | awk '{ printf("%s", $1); }'`" case $time_year in 9[0-9]*) time_year="19$time_year" ;; @@ -137,7 +137,7 @@ # # create result string # -if [ ".$newline" = .yes ]; then +if [ "$newline" = "yes" ]; then echo $format_string |\ sed -e "s;%u;$username;g" \ -e "s;%h;$hostname;g" \ 1.3 +3 -3 apache-1.3/src/helpers/checkheader.sh Index: checkheader.sh =================================================================== RCS file: /export/home/cvs/apache-1.3/src/helpers/checkheader.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- checkheader.sh 1998/09/16 20:49:24 1.2 +++ checkheader.sh 1999/01/15 20:59:39 1.3 @@ -10,10 +10,10 @@ header=$1 rc=1 -if [ ".$CPP" = . ]; then +if [ "$CPP" = "" ]; then CPP='NOT-AVAILABLE' fi -if [ ".$CPP" != ".NOT-AVAILABLE" ]; then +if [ "$CPP" != "NOT-AVAILABLE" ]; then # create a test C source cat >conftest.c <<EOF #include <$header> @@ -21,7 +21,7 @@ EOF (eval "$CPP conftest.c >/dev/null") 2>conftest.out my_error=`grep -v '^ *+' conftest.out` - if [ ".$my_error" = . ]; then + if [ "$my_error" = "" ]; then rc=0 fi else 1.6 +1 -1 apache-1.3/src/helpers/find-dbm-lib Index: find-dbm-lib =================================================================== RCS file: /export/home/cvs/apache-1.3/src/helpers/find-dbm-lib,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- find-dbm-lib 1998/04/14 10:58:23 1.5 +++ find-dbm-lib 1999/01/15 20:59:40 1.6 @@ -4,7 +4,7 @@ # we'd end up having to do the work twice... and we'd end up putting # two -ldbm -ldbm into the LIBS variable. -if [ "x$found_dbm" = "x" ]; then +if [ "$found_dbm" = "" ]; then if ./helpers/TestCompile func dbm_open; then found_dbm=1 else 1.4 +9 -9 apache-1.3/src/helpers/findcpp.sh Index: findcpp.sh =================================================================== RCS file: /export/home/cvs/apache-1.3/src/helpers/findcpp.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- findcpp.sh 1998/09/17 04:09:42 1.3 +++ findcpp.sh 1999/01/15 20:59:40 1.4 @@ -19,16 +19,16 @@ EOF # some braindead systems have a CPP define for a directory :-( -if [ ".$CPP" != . ]; then +if [ "$CPP" != "" ]; then if [ -d "$CPP" ]; then CPP='' fi fi -if [ ".$CPP" != . ]; then +if [ "$CPP" != "" ]; then # case 1: user provided a default CPP variable (we only check) (eval "$CPP conftest.c >/dev/null") 2>conftest.out my_error=`grep -v '^ *+' conftest.out` - if [ ".$my_error" != . ]; then + if [ "$my_error" != "" ]; then CPP='' fi else @@ -37,21 +37,21 @@ CPP="${CC-cc} -E" (eval "$CPP conftest.c >/dev/null") 2>conftest.out my_error=`grep -v '^ *+' conftest.out` - if [ ".$my_error" != . ]; then + if [ "$my_error" != "" ]; then # 2. try the -E option and GCC's -traditional-ccp option CPP="${CC-cc} -E -traditional-cpp" (eval "$CPP conftest.c >/dev/null") 2>conftest.out my_error=`grep -v '^ *+' conftest.out` - if [ ".$my_error" != . ]; then + if [ "$my_error" != "" ]; then # 3. try a standalone cpp command in $PATH and lib dirs CPP="`./helpers/PrintPath cpp`" - if [ ".$CPP" = . ]; then + if [ "$CPP" = "" ]; then CPP="`./helpers/PrintPath -p/lib:/usr/lib:/usr/local/lib cpp`" fi - if [ ".$CPP" != . ]; then + if [ "$CPP" != "" ]; then (eval "$CPP conftest.c >/dev/null") 2>conftest.out my_error=`grep -v '^ *+' conftest.out` - if [ ".$my_error" != . ]; then + if [ "$my_error" != "" ]; then # ok, we gave up... CPP='' fi @@ -64,7 +64,7 @@ rm -f conftest.* # Ok, empty CPP variable now means it's not available -if [ ".$CPP" = . ]; then +if [ "$CPP" = "" ]; then CPP='NOT-AVAILABLE' fi 1.3 +4 -4 apache-1.3/src/helpers/fmn.sh Index: fmn.sh =================================================================== RCS file: /export/home/cvs/apache-1.3/src/helpers/fmn.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fmn.sh 1998/09/16 20:49:24 1.2 +++ fmn.sh 1999/01/15 20:59:41 1.3 @@ -20,9 +20,9 @@ modname='' ext=`echo $modfile | sed 's/^.*\.//'` modbase=`echo $modfile | sed 's/\.[^.]*$//'` -if [ x$ext = x$modfile ]; then ext=o; modbase=$modfile; modfile=$modbase.o; fi -if [ x$ext = x ] ; then ext=o; modbase=$modfile; fi -if [ x$ext = xc ] ; then ext=o; fi +if [ "$ext" = "$modfile" ]; then ext=o; modbase=$modfile; modfile=$modbase.o; fi +if [ "$ext" = "" ] ; then ext=o; modbase=$modfile; fi +if [ "$ext" = "c" ] ; then ext=o; fi if [ -r $modbase.module ] ; then cat $modbase.module >$tmpfile else @@ -39,7 +39,7 @@ if [ -r $tmpfile ] ; then modname=`grep "Name:" $tmpfile | sed 's/^.*Name:[ ]*//'` fi -if [ "x$modname" = "x" ] ; then +if [ "$modname" = "" ] ; then modname=`echo $modbase | sed 's/^.*\///' | \ sed 's/^mod_//' | sed 's/^lib//' | sed 's/$/_module/'` fi 1.4 +1 -1 apache-1.3/src/helpers/fp2rp Index: fp2rp =================================================================== RCS file: /export/home/cvs/apache-1.3/src/helpers/fp2rp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- fp2rp 1998/03/20 07:23:42 1.3 +++ fp2rp 1999/01/15 20:59:41 1.4 @@ -2,7 +2,7 @@ ## ## fp2rp -- convert a standard forward path to a reverse dotted path ## -if [ "x$1" = x. ]; then +if [ "$1" = "." ]; then rp="." else rp="" 1.3 +8 -8 apache-1.3/src/helpers/install.sh Index: install.sh =================================================================== RCS file: /export/home/cvs/apache-1.3/src/helpers/install.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- install.sh 1998/09/16 20:49:25 1.2 +++ install.sh 1999/01/15 20:59:41 1.3 @@ -36,7 +36,7 @@ mvcmd="$mvprog" src="" dst="" -while [ ".$1" != . ]; do +while [ "$1" != "" ]; do case $1 in -c) instcmd="$cpprog" shift; continue @@ -52,7 +52,7 @@ ;; -s) stripcmd="$stripprog" shift; continue;; - *) if [ ".$src" = . ]; then + *) if [ "$src" = "" ]; then src=$1 else dst=$1 @@ -61,11 +61,11 @@ ;; esac done -if [ ".$src" = . ]; then +if [ "$src" = "" ]; then echo "install.sh: no input file specified" exit 1 fi -if [ ".$dst" = . ]; then +if [ "$dst" = "" ]; then echo "install.sh: no destination specified" exit 1 fi @@ -87,10 +87,10 @@ $instcmd $src $dsttmp # And set any options; do chmod last to preserve setuid bits -if [ ".$chowncmd" != . ]; then $chowncmd $dsttmp; fi -if [ ".$chgrpcmd" != . ]; then $chgrpcmd $dsttmp; fi -if [ ".$stripcmd" != . ]; then $stripcmd $dsttmp; fi -if [ ".$chmodcmd" != . ]; then $chmodcmd $dsttmp; fi +if [ "$chowncmd" != "" ]; then $chowncmd $dsttmp; fi +if [ "$chgrpcmd" != "" ]; then $chgrpcmd $dsttmp; fi +if [ "$stripcmd" != "" ]; then $stripcmd $dsttmp; fi +if [ "$chmodcmd" != "" ]; then $chmodcmd $dsttmp; fi # Now rename the file to the real destination. $rmcmd $dst 1.5 +3 -3 apache-1.3/src/helpers/mkshadow.sh Index: mkshadow.sh =================================================================== RCS file: /export/home/cvs/apache-1.3/src/helpers/mkshadow.sh,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- mkshadow.sh 1998/12/05 11:13:42 1.4 +++ mkshadow.sh 1999/01/15 20:59:42 1.5 @@ -37,7 +37,7 @@ # determine reverse directory for destination directory dstrevdir='' -if [ $oneisabs = 0 ]; then +if [ "$oneisabs" = "0" ]; then # (inlined fp2rp) OIFS2="$IFS"; IFS='/' for pe in $dst; do @@ -88,8 +88,8 @@ dir=`echo $file | sed -e 's:[^/]*$::' -e 's:/$::' -e 's:$:/:' -e 's:^/$::'` from="$src/$file" to="$dst/$dir$basename" - if [ $oneisabs = 0 ]; then - if [ ".$dir" != . ]; then + if [ "$oneisabs" = "0" ]; then + if [ "$dir" != "" ]; then subdir=`echo $dir | sed -e 's:/$::'` # (inlined fp2rp) revdir='' 1.3 +1 -1 apache-1.3/src/helpers/ppl.sh Index: ppl.sh =================================================================== RCS file: /export/home/cvs/apache-1.3/src/helpers/ppl.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ppl.sh 1998/09/16 20:49:25 1.2 +++ ppl.sh 1999/01/15 20:59:42 1.3 @@ -16,7 +16,7 @@ list=` IFS=: for entry in $*; do - if [ ".$entry" != . ]; then + if [ "$entry" != "" ]; then echo $entry fi done |\ 1.3 +13 -13 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.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- slo.sh 1998/09/16 20:49:25 1.2 +++ slo.sh 1999/01/15 20:59:42 1.3 @@ -22,12 +22,12 @@ for opt do # concatenate with previous option if exists - if [ ".$optprev" != . ]; then + if [ "$optprev" != "" ]; then opt="${optprev}${opt}"; optprev='' fi # remember options for arg when used stand-alone - if [ ".$opt" = ".-L" -o ".$opt" = ".-l" ]; then + if [ "$opt" = "-L" -o "$opt" = "-l" ]; then optprev="$opt" continue; fi @@ -47,7 +47,7 @@ # set linker default directories # DIRS_DEFAULT='/lib:/usr/lib' -if [ ".$LD_LIBRARY_PATH" != . ]; then +if [ "$LD_LIBRARY_PATH" != "" ]; then DIRS_DEFAULT="$DIRS_DEFAULT:$LD_LIBRARY_PATH" fi @@ -64,7 +64,7 @@ # for each library... OIFS="$IFS" IFS=':' for lib in $LIBS; do - [ ".$lib" = . ] && continue + [ "$lib" = "" ] && continue found='no' found_indefdir='no' @@ -74,14 +74,14 @@ # for each directory... OIFS2="$IFS" IFS=":$DIFS" for dir in ${DIRS} switch-to-defdirs ${DIRS_DEFAULT}; do - [ ".$dir" = . ] && continue - [ ".$dir" = .switch-to-defdirs ] && found_indefdir=yes + [ "$dir" = "" ] && continue + [ "$dir" = "switch-to-defdirs" ] && found_indefdir=yes [ ! -d $dir ] && continue # search the file OIFS3="$IFS" IFS="$DIFS" for file in '' `cd $dir && ls lib${lib}.* 2>/dev/null`; do - [ ".$file" = . ] && continue + [ "$file" = "" ] && continue case $file in *.so|*.so.[0-9]*|*.sl|*.sl.[0-9]* ) found=yes; @@ -93,7 +93,7 @@ found_type=PIC ;; *.a ) - if [ ".$found_type" = . ]; then + if [ "$found_type" = "" ]; then found=yes found_type=OBJ fi @@ -101,15 +101,15 @@ esac done IFS="$OIFS3" - if [ ".$found" = .yes ]; then + if [ "$found" = "yes" ]; then found_dir="$dir" break fi done IFS="$OIFS2" - if [ ".$found" = .yes ]; then - if [ ".$found_indefdir" != .yes ]; then + if [ "$found" = "yes" ]; then + if [ "$found_indefdir" != "yes" ]; then eval "dirlist=\"\${DIRS_${found_type}}:\"" if [ ".`echo \"$dirlist\" | fgrep :$found_dir:`" = . ]; then eval "DIRS_${found_type}=\"\$DIRS_${found_type}:${found_dir}\"" @@ -148,7 +148,7 @@ eval "libs=\"\$LIBS_${type}\"" opts='' for lib in $libs; do - [ ".$lib" = . ] && continue + [ "$lib" = "" ] && continue opts="$opts -l$lib" done eval "LIBS_${type}=\"$opts\"" @@ -156,7 +156,7 @@ eval "dirs=\"\$DIRS_${type}\"" opts='' for dir in $dirs; do - [ ".$dir" = . ] && continue + [ "$dir" = "" ] && continue opts="$opts -L$dir" done eval "DIRS_${type}=\"$opts\""