Fix bctest, and add a workaround that should solve the problem with

FreeBSD's /bin/sh.

2 files changed, 29 insertions, 41 deletions

diff --git a/test/Makefile.ssl b/test/Makefile.ssl
index e765a16a2d..f0e3233944 100644
--- a/test/Makefile.ssl
+++ b/test/Makefile.ssl
@@ -259,7 +259,7 @@ dclean:
 	mv -f Makefile.new $(MAKEFILE)
 
 clean:
-	rm -f .rnd tmp.bntest *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff $(EXE) *.ss *.srl log
+	rm -f .rnd tmp.bntest tmp.bctest *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff $(EXE) *.ss *.srl log
 
 $(DLIBSSL):
 	(cd ../ssl; $(MAKE))
diff --git a/test/bctest b/test/bctest
index 3a5e912079..b9ef95bf82 100755
--- a/test/bctest
+++ b/test/bctest
@@ -11,9 +11,9 @@
 # running) bc.
 
 
-# Test for SunOS 5.[78] bc bug (or missing bc)
+# Test for SunOS 5.[78] bc bug
 SunOStest() {
-if [ 0 != "`${1} <<\EOF
+${1} >tmp.bctest <<\EOF
 obase=16
 ibase=16
 a=AD88C418F31B3FC712D0425001D522B3AE9134FF3A98C13C1FCC1682211195406C1A6C66C6A\
@@ -27,18 +27,18 @@ b=DCE91E7D120B983EA9A104B5A96D634DD644C37657B1C7860B45E6838999B3DCE5A555583C6\
 8B3CD64126E1A82E190228020C05B91C8B141F1110086FC2A4C6ED631EBA129D04BB9A19FC53D\
 3ED0E2017D60A68775B75481449
 (a/b)*b + (a%b) - a
-EOF`" ]
+EOF
+if [ 0 != "`cat tmp.bctest`" ]
 then
-#  echo "bc does not work.  Consider installing GNU bc." >&2
-#  echo "cat >/dev/null"
+  # failure
   return 1
 fi
 }
 
+
 # Test for SCO bc bug.
 SCOtest() {
-if [ "0
-0" != "`${1} <<\EOF
+${1} >tmp.bctest <<\EOF
 obase=16
 ibase=16
 -FFDD63BA1A4648F0D804F8A1C66C53F0D2110590E8A3907EC73B4AEC6F15AC177F176F2274D2\
@@ -64,48 +64,36 @@ F617E3145BBFBE9AFD0D6E437EA4FF6F04BC67C4F1458B4F0F47B64 - 1C2BBBB19B74E86FD32\
 9E8DB6A8C3B1B9986D57ED5419C2E855F7D5469E35E76334BB42F4C43E3F3A31B9697C171DAC4\
 D97935A7E1A14AD209D6CF811F55C6DB83AA9E6DFECFCD6669DED7171EE22A40C6181615CAF3F\
 5296964
-EOF`" ]
+EOF
+if [ "0
+0" != "`cat tmp.bctest`" ]
 then
-#  echo "bc does not work.  Consider installing GNU bc." >&2
-#  echo "cat >/dev/null"
+  # failure
   return 1
 fi
 }
 
-#
-# Find the full pathname(s) of bc
-#
-findBc()
-{
-    IFS=:
-    for i in $PATH; do
-	eval  test -x $i/bc  -a  ! -d $i/bc && { echo $i/bc ; }
-    done
-}
 
-Printtest() {
-# bc works, good.
-# Now check if it knows the 'print' command.
-if [ "OK" = "`${1} 2>/dev/null <<\EOF
-print \"OK\"
-EOF`" ]
-then
-    echo "${1}"
-else
-    echo "sed 's/print.*//' | ${1}"
-fi
+IFS=:
+for dir in $PATH; do
+    bc="$dir/bc"
 
-exit 0
-}
+    if [ -x "$bc" -a ! -d "$bc" ]; then
+        if SunOStest "$bc" && SCOtest "$bc"; then
+            # bc works; now check if it knows the 'print' command.
+            if [ "OK" = "`echo 'print \"OK\"' | $bc 2>/dev/null`" ]
+            then
+                echo "$bc"
+            else
+                echo "sed 's/print.*//' | $bc"
+            fi
+            exit 0
+        fi
 
-for BC in `findBc`
-do
-	if SunOStest ${BC} && SCOtest ${BC}
-	then
-		Printtest ${BC}
-	fi
+        echo "$bc does not work properly.  Looking for another bc ..." >&2
+    fi
 done
 
-echo "bc does not work.  Consider installing GNU bc." >&2
+echo "No working bc found.  Consider installing GNU bc." >&2
 echo "cat >/dev/null"
 exit 1