Test option -nc

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

diff --git a/util/openssl-format-source b/util/openssl-format-source
index c92c37c4a4db7170d52384c13427efe3ada2325b..30d50f8b589b73232f58fcad44843895a6323059 100755 (executable)
--- a/util/openssl-format-source
+++ b/util/openssl-format-source
@@ -54,6 +54,8 @@ do
       -c) COMMENTS="true"; 
          INDENT_ARGS="-fc1 -fca -cdb -sc"; 
          continue;;
+      -nc) COMMENTS="true";
+         continue;;
     esac
   fi
 
@@ -88,7 +90,7 @@ do
       case `basename $j` in 
        # the list of files that indent is unable to handle correctly
        # that we simply leave alone for manual formatting now
-       obj_dat.h|aes_core.c)
+       obj_dat.h|aes_core.c|aes_x86core.c|ecp_nistz256.c)
          echo "skipping $j"
          ;;
        *)
@@ -106,12 +108,12 @@ do
            perl -0 -np \
              -e 's/(\n#[ \t]*ifdef[ \t]+__cplusplus\n[^\n]*\n#[ \t]*endif\n)/\n\/**INDENT-OFF**\/$1\/**INDENT-ON**\/\n/g;' \
              -e 's/(\n\/\*\!)/\n\/**/g;' \
-             -e 's/(STACK_OF|LHASH_OF)\(([^ \t,\)]+)\) /$1_$2_ /g;' \
+             -e 's/(STACK_OF|LHASH_OF)\(([^ \t,\)]+)\)( |\n)/$1_$2_$3/g;' \
              | \
            perl -np \
              -e 's/^([ \t]*)\/\*([ \t]+.*)\*\/[ \t]*$/if (length("$1$2")<75) {$c="-"}else{$c=""}; "$1\/*$c$2*\/"/e;' \
              -e 's/^\/\* ((Copyright|=|----).*)$/\/*-$1/;' \
-             -e 's/^((DECLARE|IMPLEMENT)_(EXTERN_ASN1|ASN1|ADB|STACK_OF).*)$/\/**INDENT-OFF**\/\n$1\n\/**INDENT-ON**\//;' \
+             -e 's/^((DECLARE|IMPLEMENT)_(EXTERN_ASN1|ASN1|ADB|STACK_OF|PKCS12_STACK_OF).*)$/\/**INDENT-OFF**\/\n$1\n\/**INDENT-ON**\//;' \
              -e 's/^([ \t]*(make_dh|make_dh_bn|make_rfc5114_td)\(.*\)[ \t,]*)$/\/**INDENT-OFF**\/\n$1\n\/**INDENT-ON**\//;' \
              -e 's/^(ASN1_ADB_TEMPLATE\(.*)$/\/**INDENT-OFF**\/\n$1\n\/**INDENT-ON**\//;' \
              -e 's/^((ASN1|ADB)_.*_END\(.*[\){=,;]+[ \t]*)$/$1\n\/**INDENT-ON**\//;' \