|
@@ -8,18 +8,18 @@
|
|
# https://www.openssl.org/source/license.html
|
|
# https://www.openssl.org/source/license.html
|
|
|
|
|
|
#
|
|
#
|
|
-# openssl-format-source
|
|
|
|
|
|
+# openssl-format-source
|
|
# - format source tree according to OpenSSL coding style using indent
|
|
# - format source tree according to OpenSSL coding style using indent
|
|
#
|
|
#
|
|
# usage:
|
|
# usage:
|
|
# openssl-format-source [-v] [-n] [file|directory] ...
|
|
# openssl-format-source [-v] [-n] [file|directory] ...
|
|
#
|
|
#
|
|
# note: the indent options assume GNU indent v2.2.10 which was released
|
|
# note: the indent options assume GNU indent v2.2.10 which was released
|
|
-# Feb-2009 so if you have an older indent the options may not
|
|
|
|
|
|
+# Feb-2009 so if you have an older indent the options may not
|
|
# match what is expected
|
|
# match what is expected
|
|
#
|
|
#
|
|
# any marked block comment blocks have to be moved to align manually after
|
|
# any marked block comment blocks have to be moved to align manually after
|
|
-# the reformatting has been completed as marking a block causes indent to
|
|
|
|
|
|
+# the reformatting has been completed as marking a block causes indent to
|
|
# not move it at all ...
|
|
# not move it at all ...
|
|
#
|
|
#
|
|
|
|
|
|
@@ -55,17 +55,17 @@ fi
|
|
|
|
|
|
# Extra arguments; for adding the comment-formatting
|
|
# Extra arguments; for adding the comment-formatting
|
|
INDENT_ARGS=""
|
|
INDENT_ARGS=""
|
|
-for i
|
|
|
|
|
|
+for i
|
|
do
|
|
do
|
|
if [ "$STOPARGS" != "true" ]; then
|
|
if [ "$STOPARGS" != "true" ]; then
|
|
case $i in
|
|
case $i in
|
|
--) STOPARGS="true"; continue;;
|
|
--) STOPARGS="true"; continue;;
|
|
-n) DONT="true"; continue;;
|
|
-n) DONT="true"; continue;;
|
|
- -v) VERBOSE="true";
|
|
|
|
|
|
+ -v) VERBOSE="true";
|
|
echo "INDENT_PROFILE=$INDENT_PROFILE";
|
|
echo "INDENT_PROFILE=$INDENT_PROFILE";
|
|
continue;;
|
|
continue;;
|
|
- -c) COMMENTS="true";
|
|
|
|
- INDENT_ARGS="-fc1 -fca -cdb -sc";
|
|
|
|
|
|
+ -c) COMMENTS="true";
|
|
|
|
+ INDENT_ARGS="-fc1 -fca -cdb -sc";
|
|
continue;;
|
|
continue;;
|
|
-nc) COMMENTS="true";
|
|
-nc) COMMENTS="true";
|
|
continue;;
|
|
continue;;
|
|
@@ -76,14 +76,14 @@ do
|
|
|
|
|
|
if [ -d "$i" ]; then
|
|
if [ -d "$i" ]; then
|
|
LIST=`find "$i" -name '*.[ch]' -print`
|
|
LIST=`find "$i" -name '*.[ch]' -print`
|
|
- else
|
|
|
|
|
|
+ else
|
|
if [ ! -f "$i" ]; then
|
|
if [ ! -f "$i" ]; then
|
|
echo "$0: source file not found: $i" >&2
|
|
echo "$0: source file not found: $i" >&2
|
|
exit 1
|
|
exit 1
|
|
fi
|
|
fi
|
|
LIST="$i"
|
|
LIST="$i"
|
|
fi
|
|
fi
|
|
-
|
|
|
|
|
|
+
|
|
for j in $LIST
|
|
for j in $LIST
|
|
do
|
|
do
|
|
# ignore symlinks - we only ever process the base file - so if we
|
|
# ignore symlinks - we only ever process the base file - so if we
|
|
@@ -98,7 +98,7 @@ do
|
|
tmp=$(mktemp /tmp/indent.XXXXXX)
|
|
tmp=$(mktemp /tmp/indent.XXXXXX)
|
|
trap 'rm -f "$tmp"' HUP INT TERM EXIT
|
|
trap 'rm -f "$tmp"' HUP INT TERM EXIT
|
|
|
|
|
|
- case `basename $j` in
|
|
|
|
|
|
+ case `basename $j` in
|
|
# the list of files that indent is unable to handle correctly
|
|
# the list of files that indent is unable to handle correctly
|
|
# that we simply leave alone for manual formatting now
|
|
# that we simply leave alone for manual formatting now
|
|
obj_dat.h|aes_core.c|aes_x86core.c|ecp_nistz256.c)
|
|
obj_dat.h|aes_core.c|aes_x86core.c|ecp_nistz256.c)
|
|
@@ -108,11 +108,11 @@ do
|
|
if [ "$COMMENTS" = "true" ]; then
|
|
if [ "$COMMENTS" = "true" ]; then
|
|
# we have to mark single line comments as /*- ...*/ to stop indent
|
|
# we have to mark single line comments as /*- ...*/ to stop indent
|
|
# messing with them, run expand then indent as usual but with the
|
|
# messing with them, run expand then indent as usual but with the
|
|
- # the process-comments options and then undo that marking, and then
|
|
|
|
|
|
+ # the process-comments options and then undo that marking, and then
|
|
# finally re-run indent without process-comments so the marked-to-
|
|
# finally re-run indent without process-comments so the marked-to-
|
|
- # be-ignored comments we did automatically end up getting moved
|
|
|
|
- # into the right position within the code as indent leaves marked
|
|
|
|
- # comments entirely untouched - we appear to have no way to avoid
|
|
|
|
|
|
+ # be-ignored comments we did automatically end up getting moved
|
|
|
|
+ # 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
|
|
# the double processing and get the desired output
|
|
cat "$j" | \
|
|
cat "$j" | \
|
|
expand | \
|
|
expand | \
|