Run expand before perl, to make sure things are properly aligned

[oweals/openssl.git] / util / openssl-format-source

diff --git a/util/openssl-format-source b/util/openssl-format-source
index c1aada7d372d04c1264664218c9de31ec199c5dd..1918611249a4ce3dea149f3797a7ee64d9f8eacb 100755 (executable)
--- a/util/openssl-format-source
+++ b/util/openssl-format-source
@@ -30,33 +30,12 @@ DONT=false
 STOPARGS=false
 COMMENTS=false
 
-# locate the indent configuration file to use which generally will be 
-# in the current directory but might be elsewhere and we want consistent
-# use of the file so we set the env var to point directly to the file in
-# our priority order
-if [ -z "$INDENT_PROFILE" ]; then
-  for i in . ../openssl $HOME
-  do
-    if [ -f "$i/.indent.pro" ]; then
-      INDENT_PROFILE="$i/.indent.pro"
-      export INDENT_PROFILE
-      break
-    fi
-  done
-fi
-
-if [ -z "$INDENT_PROFILE" ]; then
-  # If at the top of the source tree, try the file in util
-  if [ -f "e_os.h" ]; then 
-    f=`/bin/pwd`/util/indent.pro
-    if [ -f $f ]; then
-      INDENT_PROFILE=$f
-      export INDENT_PROFILE
-    fi
-  fi
-fi
-if [ -z "$INDENT_PROFILE" ]; then
-  echo "$0: unable to locate .indent.pro file " >&2
+# for this exercise, we want to force the openssl style, so we roll
+# our own indent profile, which is at a well known location
+INDENT_PROFILE="`dirname $0`/indent.pro"
+export INDENT_PROFILE
+if [ -f "$INDENT_PROFILE" ]; then
+  echo "$0: unable to locate the openssl indent.pro file" >&2
   exit 1
 fi
 
@@ -118,11 +97,13 @@ do
            # into the right possition within the code as indent leaves marked 
            # comments entirely untouched - we appear to have no way to avoid 
            # the double processing and get the desired output
+           cat "$j" | \
+           expand | \
            perl -0 -np \
              -e 's/(\n#[ \t]*ifdef[ \t]+__cplusplus\n[^\n]*\n#[ \t]*endif\n)/\n\n\/**INDENT-OFF**\/$1\/**INDENT-ON**\/\n/g;' \
              -e 's/(\n\/\*\!)/\n\/**/g;' \
              -e 's/(STACK_OF|LHASH_OF)\(([^ \t,\)]+)\) /$1_$2_ /g;' \
-             < "$j" | \
+             | \
            perl -np \
              -e 's/^([ \t]*)\/\*([ \t]+.*)\*\/[ \t]*$/if (length("$1$2")<75) {$c="-"}else{$c=""}; "$1\/*$c$2*\/"/e;' \
              -e 's/^\/\* ((Copyright|=|----).*)$/\/*-$1/;' \
@@ -133,7 +114,7 @@ do
              -e '/ASN1_ITEM_(ref|ptr|rptr)/ || s/^((ASN1|ADB)_[^\*]*[){=,]+[ \t]*)$/\/**INDENT-OFF**\/\n$1/;' \
              -e 's/^(} (ASN1|ADB)_[^\*]*[\){=,;]+)$/$1\n\/**INDENT-ON**\//;' \
              | \
-             expand | indent $INDENT_ARGS | \
+             indent $INDENT_ARGS | \
              perl -np \
                -e 's/^([ \t]*)\/\*-(.*)\*\/[ \t]*$/$1\/*$2*\//;' \
                -e 's/^\/\*-((Copyright|=|----).*)$/\/* $1/;' \