[openssl-commits] [openssl] master update

[Ben Laurie]

The branch master has been updated
       via  4b9cb35d85c32a8ebc973355bdb4833e719af108 (commit)
      from  ff4a9394a2380140209a9ce2849f011063af1ecc (commit)


- Log -----------------------------------------------------------------
commit 4b9cb35d85c32a8ebc973355bdb4833e719af108
Author: Ben Laurie <ben at links.org>
Date:   Sun Aug 9 10:47:03 2015 +0100

    Find the right indent on *BSD.
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 util/openssl-format-source | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/util/openssl-format-source b/util/openssl-format-source
index 4ea2f1b..7258836 100755
--- a/util/openssl-format-source
+++ b/util/openssl-format-source
@@ -21,6 +21,9 @@ HERE="`dirname $0`"
 
 set -e
 
+INDENT=indent
+uname -s | grep BSD > /dev/null && type gindent > /dev/null 2>&1 && INDENT=gindent
+
 if [ $# -eq 0 ]; then
   echo "usage: $0 [-v] [-n] [-c] [sourcefile|sourcedir] ..." >&2
   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 's/^(} (ASN1|ADB)_[^\*]*[\){=,;]+)$/$1\n\/**INDENT-ON**\//;' \
 	      | \
-	      $DEBUG indent $INDENT_ARGS | \
+	      $DEBUG $INDENT $INDENT_ARGS | \
 	      perl -np \
 		-e 's/^([ \t]*)\/\*-(.*)\*\/[ \t]*$/$1\/*$2*\//;' \
 		-e 's/^\/\*-((Copyright|=|----).*)$/\/* $1/;' \
-	      | indent | \
+	      | $INDENT | \
 	      perl -0 -np \
 		-e 's/\/\*\*INDENT-(ON|OFF)\*\*\/\n//g;' \
 	      | perl -np \
@@ -133,7 +136,7 @@ do
 	      | perl "$HERE"/su-filter.pl \
 	      > "$tmp"
 	  else
-	    expand "$j" | indent $INDENT_ARGS > "$tmp"
+	    expand "$j" | $INDENT $INDENT_ARGS > "$tmp"
 	  fi;
 	  if cmp -s "$tmp" "$j"; then
 	    if [ "$VERBOSE" = "true" ]; then