Use strtol instead of atoi in asn1parse

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

diff --git a/util/openssl-format-source b/util/openssl-format-source
index 162103f5e964d6d2c0cf98d206f89b10a4ea3471..2655e9c4009ccaa6d5e320c94c7d8c7a21881f72 100755 (executable)
--- a/util/openssl-format-source
+++ b/util/openssl-format-source
@@ -1,4 +1,12 @@
 #!/bin/sh
+#
+# Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved.
+#
+# Licensed under the OpenSSL license (the "License").  You may not use
+# this file except in compliance with the License.  You can obtain a copy
+# in the file LICENSE in the source distribution or at
+# https://www.openssl.org/source/license.html
+
 #
 # openssl-format-source 
 # - format source tree according to OpenSSL coding style using indent
@@ -21,6 +29,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
@@ -30,12 +41,14 @@ VERBOSE=false
 DONT=false
 STOPARGS=false
 COMMENTS=false
+CHANGED=false
+DEBUG=""
 
 # 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="$HERE/indent.pro"
 export INDENT_PROFILE
-if [ -f "$INDENT_PROFILE" ]; then
+if [ ! -f "$INDENT_PROFILE" ]; then
   echo "$0: unable to locate the openssl indent.pro file" >&2
   exit 1
 fi
@@ -54,6 +67,10 @@ do
       -c) COMMENTS="true"; 
          INDENT_ARGS="-fc1 -fca -cdb -sc"; 
          continue;;
+      -nc) COMMENTS="true";
+         continue;;
+      -d) DEBUG='eval tee "$j.pre" |'
+         continue;;
     esac
   fi
 
@@ -77,17 +94,16 @@ do
       fi
     fi
 
-    if [ "$VERBOSE" = "true" ]; then
-      echo "$j"
-    fi
-
     if [ "$DONT" = "false" ]; then
       tmp=$(mktemp /tmp/indent.XXXXXX)
       trap 'rm -f "$tmp"' HUP INT TERM EXIT
 
-      case $j in 
+      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|aes_x86core.c|ecp_nistz256.c)
+         echo "skipping $j"
+         ;;
        *)
          if [ "$COMMENTS" = "true" ]; then
            # we have to mark single line comments as /*- ...*/ to stop indent
@@ -95,7 +111,7 @@ do
            # the process-comments options and then undo that marking, and then 
            # finally re-run indent without process-comments so the marked-to-
            # be-ignored comments we did automatically end up getting moved 
-           # into the right possition within the code as indent leaves marked 
+           # into the right position 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" | \
@@ -103,23 +119,23 @@ 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/^([ \t]*)\/\*([ \t]+.*)\*\/[ \t]*$/my ($x1,$x2) = ($1, $2); if (length("$x1$x2")<75 && $x2 !~ m#^\s*\*INDENT-(ON|OFF)\*\s*$#) {$c="-"}else{$c=""}; "$x1\/*$c$x2*\/"/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)_.*)$/\/**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**\//;' \
+             -e 's/^((ASN1|ADB)_.*_(end|END)\(.*[\){=,;]+[ \t]*)$/$1\n\/**INDENT-ON**\//;' \
              -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**\//;' \
              | \
-             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 \
@@ -128,13 +144,32 @@ 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
+             echo "$j unchanged"
+           fi
+           rm "$tmp"
+         else
+           if [ "$VERBOSE" = "true" ]; then
+             echo "$j changed"
+           fi
+           CHANGED=true
+           mv "$tmp" "$j"
          fi
          ;;
       esac
-      mv "$tmp" "$j"
     fi
   done
 done
 
 
+if [ "$VERBOSE" = "true" ]; then
+  echo
+  if [ "$CHANGED" = "true" ]; then
+    echo "SOURCE WAS MODIFIED"
+  else
+    echo "SOURCE WAS NOT MODIFIED"
+  fi
+fi