generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Find the right indent on *BSD.

Browse Source 
Reviewed-by: Tim Hudson <tjh@openssl.org>
This commit is contained in:
Ben Laurie 2015-08-09 10:47:03 +01:00
parent ff4a9394a2
commit 4b9cb35d85
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
util/openssl-format-source
View File

@ -21,6 +21,9 @@ HERE="`dirname $0`"
set -e set -e
INDENT=indent
uname -s | grep BSD > /dev/null && type gindent > /dev/null 2>&1 && INDENT=gindent
if [ $# -eq 0 ]; then if [ $# -eq 0 ]; then
echo "usage: $0 [-v] [-n] [-c] [sourcefile|sourcedir] ..." >&2 echo "usage: $0 [-v] [-n] [-c] [sourcefile|sourcedir] ..." >&2
exit 1 exit 1
@ -120,11 +123,11 @@ do
-e '/ASN1_(ITEM_ref|ITEM_ptr|ITEM_rptr|PCTX)/ || s/^((ASN1|ADB)_[^\*]*[){=,]+[ \t]*)$/\/**INDENT-OFF**\/\n$1/;' \ -e '/ASN1_(ITEM_ref|ITEM_ptr|ITEM_rptr|PCTX)/ || s/^((ASN1|ADB)_[^\*]*[){=,]+[ \t]*)$/\/**INDENT-OFF**\/\n$1/;' \
-e 's/^(} (ASN1|ADB)_[^\*]*[\){=,;]+)$/$1\n\/**INDENT-ON**\//;' \ -e 's/^(} (ASN1|ADB)_[^\*]*[\){=,;]+)$/$1\n\/**INDENT-ON**\//;' \
| \ | \
$DEBUG indent $INDENT_ARGS | \ $DEBUG $INDENT $INDENT_ARGS | \
perl -np \ perl -np \
-e 's/^([ \t]*)\/\*-(.*)\*\/[ \t]*$/$1\/*$2*\//;' \ -e 's/^([ \t]*)\/\*-(.*)\*\/[ \t]*$/$1\/*$2*\//;' \
-e 's/^\/\*-((Copyright|=|----).*)$/\/* $1/;' \ -e 's/^\/\*-((Copyright|=|----).*)$/\/* $1/;' \
| indent | \ | $INDENT | \
perl -0 -np \ perl -0 -np \
-e 's/\/\*\*INDENT-(ON|OFF)\*\*\/\n//g;' \ -e 's/\/\*\*INDENT-(ON|OFF)\*\*\/\n//g;' \
| perl -np \ | perl -np \
@ -133,7 +136,7 @@ do
| perl "$HERE"/su-filter.pl \ | perl "$HERE"/su-filter.pl \
> "$tmp" > "$tmp"
else else
expand "$j" | indent $INDENT_ARGS > "$tmp" expand "$j" | $INDENT $INDENT_ARGS > "$tmp"
fi; fi;
if cmp -s "$tmp" "$j"; then if cmp -s "$tmp" "$j"; then
if [ "$VERBOSE" = "true" ]; then if [ "$VERBOSE" = "true" ]; then