From 8236276a90ad6f95173cc6fd0afa01644096b491 Mon Sep 17 00:00:00 2001
From: "Markus F.X.J. Oberhumer" <markus@oberhumer.com>
Date: Mon, 4 Jan 2021 19:07:17 +0100
Subject: [PATCH] Add and use .clang-format file.

---
 .clang-format                     | 12 ++++++++++++
 src/stub/scripts/upx-clang-format | 16 +++-------------
 2 files changed, 15 insertions(+), 13 deletions(-)
 create mode 100644 .clang-format

diff --git a/.clang-format b/.clang-format
new file mode 100644
index 00000000..f38a5bac
--- /dev/null
+++ b/.clang-format
@@ -0,0 +1,12 @@
+# for clang-format-10.0.1
+---
+BasedOnStyle: LLVM
+AccessModifierOffset: -4
+#AlignConsecutiveAssignments: true
+AlwaysBreakTemplateDeclarations: true
+ColumnLimit: 100
+IndentWidth: 4
+SortIncludes: false
+SpaceAfterCStyleCast: true
+Standard: Cpp03
+...
diff --git a/src/stub/scripts/upx-clang-format b/src/stub/scripts/upx-clang-format
index 27a9f55c..f17a7656 100755
--- a/src/stub/scripts/upx-clang-format
+++ b/src/stub/scripts/upx-clang-format
@@ -14,22 +14,12 @@ CLANG_FORMAT="$HOME/bin/bin-upx/clang-format-10.0.1"
 fi
 if [[ ! -f $CLANG_FORMAT ]]; then
     echo "ERROR: $0: cannot find clang-format-10.0.1"
-    echo "ERROR: $0: please visit https://github.com/upx/upx-stubtools/releases"
+    echo "ERROR: $0: please visit https://github.com/upx/upx-stubtools"
     exit 1
 fi
 
-s='Language: Cpp, BasedOnStyle: LLVM, '
-s="$s"' AccessModifierOffset: -4, '
-#s="$s"' AllowShortFunctionsOnASingleLine: None, '
-s="$s"' AlwaysBreakTemplateDeclarations: true, '
-s="$s"' ColumnLimit: 100, '
-####s="$s"' FixNamespaceComments: false, '                  # added in llvm-5.0
-s="$s"' IndentWidth: 4, '
-s="$s"' SortIncludes: false, '                          # added in llvm-3.8
-s="$s"' SpaceAfterCStyleCast: true, '                   # added in llvm-3.6
-s="$s"' Standard: Cpp03, '
-CLANG_FORMAT_STYLE='-style={'"$s"' }'
+# NOTE: we use .clang-format config from upx.git/.clang-format
 
 #echo $CLANG_FORMAT
-exec "$CLANG_FORMAT" "$CLANG_FORMAT_STYLE" "$@"
+exec "$CLANG_FORMAT" -style=file "$@"
 exit 1