diff options
| author | Richard Levitte <richard@levitte.org> | 2015-01-20 15:17:02 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2015-01-22 09:42:29 +0000 |
| commit | 016b92d112961d67d20e347cefb653cb7fd7878f (patch) | |
| tree | 75e1791271a2cd96f0f176b58b897970c2f3a97e | |
| parent | dd6da173fdd24ea2076c8a25d92c1ddf1fade372 (diff) | |
Run expand before perl, to make sure things are properly aligned
Reviewed-by: Tim Hudson <tjh@openssl.org>
| -rwxr-xr-x | util/openssl-format-source | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/util/openssl-format-source b/util/openssl-format-source index a814e1f822..1918611249 100755 --- a/util/openssl-format-source +++ b/util/openssl-format-source @@ -97,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/;' \ @@ -112,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/;' \ |