diff options
| author | Bodo Möller <bodo@openssl.org> | 2001-04-08 13:49:45 +0000 |
|---|---|---|
| committer | Bodo Möller <bodo@openssl.org> | 2001-04-08 13:49:45 +0000 |
| commit | 5f1fddbbe787e594de2efe746ac00143da655fcc (patch) | |
| tree | 455d9805342136a41a50870015a34d6991420ca5 | |
| parent | 027e257b1da1289b64587dc5bde598920feaee8c (diff) | |
| download | openssl-5f1fddbbe787e594de2efe746ac00143da655fcc.tar.gz | |
'||', '&&' and 'test -x' apparently don't work on Ultrix;
also 'test' appears to be available as '[' only in 'if' conditions.
| -rw-r--r-- | CHANGES | 4 | ||||
| -rw-r--r-- | Makefile.org | 4 | ||||
| -rwxr-xr-x | test/bctest | 18 |
3 files changed, 21 insertions, 5 deletions
@@ -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>] diff --git a/Makefile.org b/Makefile.org index 5a41088195..6fbf6b5825 100644 --- a/Makefile.org +++ b/Makefile.org @@ -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 \ diff --git a/test/bctest b/test/bctest index 17b75d4eca..7dde781653 100755 --- a/test/bctest +++ b/test/bctest @@ -12,10 +12,22 @@ IFS=: -for dir in $PATH; do - bc="$dir/bc" +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 |