Commit 5f1fddbb authored by Bodo Möller's avatar Bodo Möller
Browse files

'||', '&&' and 'test -x' apparently don't work on Ultrix; 

also 'test' appears to be available as '[' only in 'if' conditions.
parent 027e257b

CHANGES

+4 −0
Original line number Diff line number Diff line
@@ -4,6 +4,10 @@ 


 Changes between 0.9.6 and 0.9.7  [xx XXX 2000]



  *) Change bctest again: '-x' expressions are not available in all

     versions of 'test'.

     [Bodo Moeller]



  *) Fix a couple of memory leaks in PKCS7_dataDecode()

     [Steve Henson, reported by Heyun Zheng <hzheng@atdsprint.com>]

Makefile.org

+2 −2
Original line number Diff line number Diff line
@@ -538,7 +538,7 @@ install_docs: 
		$(INSTALL_PREFIX)$(MANDIR)/man7

	@for i in doc/apps/*.pod; do \

		fn=`basename $$i .pod`; \

		sec=`[ "$$fn" = "config" ] && echo 5 || echo 1`; \

		if [ "$$fn" = "config" ]; then sec=5; else sec=1; fi; \

		echo "installing man$$sec/`basename $$i .pod`.$$sec"; \

		(cd `dirname $$i`; \

		$(PERL) ../../util/pod2man.pl --section=$$sec --center=OpenSSL \
@@ -547,7 +547,7 @@ install_docs: 
	done

	@for i in doc/crypto/*.pod doc/ssl/*.pod; do \

		fn=`basename $$i .pod`; \

		sec=`[ "$$fn" = "des_modes" ] && echo 7 || echo 3`; \

		if [ "$$fn" = "des_modes" ]; then sec=7; else sec=3; fi; \

		echo "installing man$$sec/`basename $$i .pod`.$$sec"; \

		(cd `dirname $$i`; \

		$(PERL) ../../util/pod2man.pl --section=$$sec --center=OpenSSL \

test/bctest

+15 −3
Original line number Diff line number Diff line
@@ -12,10 +12,22 @@ 




IFS=:

for dir in $PATH; do

try_path=true

# First we try "bc", then "$dir/bc" for each item in $PATH.

for dir in dummy:$PATH; do

    if [ "$try_path" = true ]; then

      # first iteration

      bc=bc

      try_path=false

    else

      # second and later iterations

      bc="$dir/bc"

      if [ ! -f "$bc" ]; then  # '-x' is not available on Ultrix

        bc=''

      fi

    fi



    if [ -x "$bc" -a ! -d "$bc" ]; then

    if [ ! "$bc" = '' ]; then

        failure=none