CI updates; cleanups

src/util/system_defs.h

@@ -30,9 +30,16 @@
 #define _FILE_OFFSET_BITS 64
 #endif
 
-#if !defined(__STDC_FORMAT_MACROS) // this is needed for some older glibc/mingw versions
+// these are needed for some older glibc/mingw versions
+#if !defined(__STDC_CONSTANT_MACROS)
+#define __STDC_CONSTANT_MACROS 1
+#endif
+#if !defined(__STDC_FORMAT_MACROS)
 #define __STDC_FORMAT_MACROS 1
 #endif
+#if !defined(__STDC_LIMIT_MACROS)
+#define __STDC_LIMIT_MACROS 1
+#endif
 
 #if !defined(__USE_MINGW_ANSI_STDIO)
 #if defined(_WIN32) && defined(__MINGW32__) && (defined(__clang__) || defined(__GNUC__))
@@ -40,7 +47,7 @@
 #endif
 #endif
 
-#if defined(_WIN32)
+#if defined(_WIN32) || defined(__CYGWIN__)
 // disable silly warnings about using "deprecated" POSIX functions like fopen()
 #if !defined(_CRT_NONSTDC_NO_DEPRECATE)
 #define _CRT_NONSTDC_NO_DEPRECATE 1

src/util/system_headers.h

@@ -32,7 +32,36 @@
 #error "C++17 is required"
 #endif
 
-// sanity check
+// check expected defines
+#if defined(__CYGWIN32__) && !defined(__CYGWIN__)
+#error "missing __CYGWIN__"
+#endif
+#if defined(__CYGWIN64__) && !defined(__CYGWIN__)
+#error "missing __CYGWIN__"
+#endif
+#if defined(__clang__) || defined(__GNUC__)
+// these are pre-defined since gcc-4.6 (2011) and clang-3.2 (2012)
+#if !defined(__ORDER_BIG_ENDIAN__) || (__ORDER_BIG_ENDIAN__ + 0 == 0)
+#error "missing __ORDER_BIG_ENDIAN__"
+#endif
+#if !defined(__ORDER_LITTLE_ENDIAN__) || (__ORDER_LITTLE_ENDIAN__ + 0 == 0)
+#error "missing __ORDER_LITTLE_ENDIAN__"
+#endif
+#if !defined(__BYTE_ORDER__) || (__BYTE_ORDER__ + 0 == 0)
+#error "missing __BYTE_ORDER__"
+#endif
+#if !defined(__ORDER_BIG_ENDIAN__) || (__ORDER_BIG_ENDIAN__ + 0 != 4321)
+#error "unexpected __ORDER_BIG_ENDIAN__"
+#endif
+#if !defined(__ORDER_BIG_ENDIAN__) || (__ORDER_LITTLE_ENDIAN__ + 0 != 1234)
+#error "unexpected __ORDER_BIG_ENDIAN__"
+#endif
+#if (__BYTE_ORDER__ != __ORDER_BIG_ENDIAN__) && (__BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__)
+#error "unexpected __BYTE_ORDER__"
+#endif
+#endif
+
+// sanity checks
 #if defined(__ILP32) || defined(__ILP32__)
 static_assert(sizeof(int) == 4);
 static_assert(sizeof(long) == 4);
@@ -55,28 +84,9 @@ static_assert(sizeof(int) == 4);
 static_assert(sizeof(long) == 4);
 static_assert(sizeof(void *) == 8);
 #endif
-
-// check expected defines
-#if defined(__clang__) || defined(__GNUC__)
-// these are pre-defined since gcc-4.6 (2011) and clang-3.2 (2012)
-#if !defined(__ORDER_BIG_ENDIAN__) || (__ORDER_BIG_ENDIAN__ + 0 == 0)
-#error "missing __ORDER_BIG_ENDIAN__"
-#endif
-#if !defined(__ORDER_LITTLE_ENDIAN__) || (__ORDER_LITTLE_ENDIAN__ + 0 == 0)
-#error "missing __ORDER_LITTLE_ENDIAN__"
-#endif
-#if !defined(__BYTE_ORDER__) || (__BYTE_ORDER__ + 0 == 0)
-#error "missing __BYTE_ORDER__"
-#endif
-#if !defined(__ORDER_BIG_ENDIAN__) || (__ORDER_BIG_ENDIAN__ + 0 != 4321)
-#error "unexpected __ORDER_BIG_ENDIAN__"
-#endif
-#if !defined(__ORDER_BIG_ENDIAN__) || (__ORDER_LITTLE_ENDIAN__ + 0 != 1234)
-#error "unexpected __ORDER_BIG_ENDIAN__"
-#endif
-#if (__BYTE_ORDER__ != __ORDER_BIG_ENDIAN__) && (__BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__)
-#error "unexpected __BYTE_ORDER__"
-#endif
+#if defined(__CYGWIN__)
+static_assert(sizeof(int) == 4);
+static_assert(sizeof(void *) == sizeof(long));
 #endif
 
 // ACC and C system headers
@@ -135,6 +145,11 @@ static_assert(sizeof(void *) == 8);
 #define __SANITIZE_MEMORY__ 1
 #endif
 #endif
+#if !defined(__SANITIZE_UNDEFINED_BEHAVIOR__) && defined(__has_feature)
+#if __has_feature(undefined_behavior_sanitizer)
+#define __SANITIZE_UNDEFINED_BEHAVIOR__ 1
+#endif
+#endif
 
 // UPX vendor git submodule headers
 #include <doctest/doctest/parts/doctest_fwd.h>

src/util/util.cpp

@@ -768,6 +768,19 @@ int fn_strcmp(const char *n1, const char *n2) {
 // misc
 **************************************************************************/
 
+bool is_envvar_true(const char *envvar, const char *alternate_name) noexcept {
+    // UPX convention: any environment variable that is set and is not strictly equal to "0" is true
+    const char *e = getenv(envvar);
+    if (e != nullptr && e[0])
+        return strcmp(e, "0") != 0;
+    if (alternate_name != nullptr) {
+        e = getenv(alternate_name);
+        if (e != nullptr && e[0])
+            return strcmp(e, "0") != 0;
+    }
+    return false;
+}
+
 bool set_method_name(char *buf, size_t size, int method, int level) {
     bool r = true;
     const char *alg;

src/util/util.h

@@ -192,6 +192,8 @@ bool maketempname(char *ofilename, size_t size, const char *ifilename, const cha
                   bool force = true);
 bool makebakname(char *ofilename, size_t size, const char *ifilename, bool force = true);
 
+bool is_envvar_true(const char *envvar, const char *alternate_name = nullptr) noexcept;
+
 unsigned get_ratio(upx_uint64_t u_len, upx_uint64_t c_len);
 bool set_method_name(char *buf, size_t size, int method, int level);
 void center_string(char *buf, size_t size, const char *s);