[acquire/CMakeLists.txt] Improve C code parsing and generating ; [*.h] Try and get build working and tests running on macOS

Author: SamuelMarks

acquire/CMakeLists.txt

@@ -20,6 +20,9 @@ extern "C" {
 #endif
 #include "acquire_config.h"
 #include "acquire_string_extras.h"
+#ifdef USE_LIBRHASH
+#include "acquire_librhash.h"
+#endif /* USE_LIBRHASH */
 
 extern LIBACQUIRE_LIB_EXPORT bool crc32c(const char *, const char *);
 

acquire/acquire_checksums.h

@@ -789,8 +789,10 @@ static int fetch(char *URL, const char *path) {
 }
 
 /* CUSTOM libacquire stuff */
-
+#ifndef DOWNLOAD_DIR_IMPL
+#define DOWNLOAD_DIR_IMPL
 const char *get_download_dir() { return ".downloads"; }
+#endif /* !DOWNLOAD_DIR_IMPL */
 
 int download(const char *url, enum Checksum checksum, const char *hash,
              const char target_location[NAME_MAX], bool follow, size_t retry,

acquire/acquire_libfetch.h

@@ -67,8 +67,10 @@ bool sha512(const char *filename, const char *gold_hash) {
 /* X(sha512, RHASH_SHA512, comma) \ */
 #define comma ,
 #define blank /* nothing */
+#ifndef HASHES
 #define HASHES                                                                 \
   X(crc32, RHASH_CRC32, comma)                                                 \
+  X(crc32c, RHASH_CRC32C, comma)                                               \
   X(md4, RHASH_MD4, comma)                                                     \
   X(md5, RHASH_MD5, comma)                                                     \
   X(tiger, RHASH_TIGER, comma)                                                 \
@@ -91,10 +93,10 @@ bool sha512(const char *filename, const char *gold_hash) {
   X(sha3_256, RHASH_SHA3_256, comma)                                           \
   X(sha3_384, RHASH_SHA3_384, comma)                                           \
   X(sha3_512, RHASH_SHA3_512, comma)                                           \
-  X(crc32c, RHASH_CRC32C, comma)                                               \
   X(snefru128, RHASH_SNEFRU128, comma)                                         \
   X(snefru256, RHASH_SNEFRU256, blank)
-
+#endif /* !HASHES */
+#ifndef X
 #define X(name, hash, unused)                                                  \
   bool name(const char *filename, const char *gold_hash) {                     \
     char gen_hash[130], digest[64];                                            \
@@ -103,6 +105,7 @@ bool sha512(const char *filename, const char *gold_hash) {
                : strcmp(gen_hash, gold_hash) == 0;                             \
   }
 HASHES
+#endif /* !X */
 #undef X
 
 #ifdef __cplusplus

acquire/acquire_librhash.h

@@ -12,13 +12,20 @@ extern "C" {
 
 #include "acquire_download.h"
 #include "acquire_string_extras.h"
+#include "acquire_common_defs.h"
 
 bool LIBACQUIRE_LIB_EXPORT is_downloaded(const char *url,
                                          enum Checksum checksum,
                                          const char *hash,
                                          const char *target_location);
 
 #ifdef LIBACQUIRE_IMPLEMENTATION
+
+#ifndef DOWNLOAD_DIR_IMPL
+#define DOWNLOAD_DIR_IMPL
+const char *get_download_dir() { return ".downloads"; }
+#endif /* !DOWNLOAD_DIR_IMPL */
+
 bool is_downloaded(const char *url, enum Checksum checksum, const char *hash,
                    const char *target_location) {
   char full_local_fname[NAME_MAX + 1];

acquire/acquire_net_common.h

@@ -13,7 +13,10 @@ extern "C" {
 
 #include "openbsd.ftp/extern.h"
 
+#ifndef DOWNLOAD_DIR_IMPL
+#define DOWNLOAD_DIR_IMPL
 const char *get_download_dir() { return ".downloads"; }
+#endif /* !DOWNLOAD_DIR_IMPL */
 
 int download(const char *url, enum Checksum checksum, const char *hash,
              const char target_location[NAME_MAX], bool follow, size_t retry,

acquire/acquire_openbsd_ftp.h

@@ -12,6 +12,7 @@ extern "C" {
 
 #include <stdarg.h>
 #include <stdio.h>
+#include <ctype.h>
 #ifdef HAVE_LIBBSD
 #include <bsd/string.h>
 #else
@@ -57,7 +58,7 @@ extern "C" {
 
 #if defined(__APPLE__) && defined(__MACH__)
 #define HAVE_SNPRINTF_H
-#define HAVE_STRNCASECMP_H
+#define HAVE_STRNCASECMP
 #endif /* defined(__APPLE__) && defined(__MACH__) */
 
 #if defined(BSD) && (BSD >= 199306) && !defined(__linux__) &&                  \
@@ -89,7 +90,7 @@ typedef int errno_t;
 
 #ifndef _MSC_VER
 #define HAVE_STRINGS_H
-#define HAVE_STRNCASECMP_H
+#define HAVE_STRNCASECMP
 #endif
 
 #if defined(ANY_BSD) || defined(__APPLE__) && defined(__MACH__) ||             \
@@ -146,7 +147,7 @@ inline double wtf_vsnprintf(char *buffer, size_t count, const char *format,
 
 #endif /* !defined(HAVE_SNPRINTF_H) && defined(LIBACQUIRE_IMPLEMENTATION) */
 
-#ifndef HAVE_STRNCASECMP_H
+#ifndef HAVE_STRNCASECMP
 
 extern LIBACQUIRE_LIB_EXPORT int strncasecmp(const char *, const char *,
                                              size_t);
@@ -155,13 +156,24 @@ extern LIBACQUIRE_LIB_EXPORT int strcasecmp(const char *, const char *);
 
 #ifdef LIBACQUIRE_IMPLEMENTATION
 
+#if defined(_MSC_VER) && !defined(__INTEL_COMPILER)
 #define strncasecmp _strnicmp
 
 #define strcasecmp _stricmp
+#else
+/* from MIT licensed musl @ e0ef93c20de1a9e0a6b8f4a4a951a8e61a1a2973 */
+  int strncasecmp(const char *_l, const char *_r, size_t n)
+  {
+    const unsigned char *l=(void *)_l, *r=(void *)_r;
+    if (!n--) return 0;
+    for (; *l && *r && n && (*l == *r || tolower(*l) == tolower(*r)); l++, r++, n--);
+    return tolower(*l) - tolower(*r);
+  }
+#endif /* defined(_MSC_VER) && !defined(__INTEL_COMPILER) */
 
 #endif /* LIBACQUIRE_IMPLEMENTATION */
 
-#endif /* !HAVE_STRNCASECMP_H */
+#endif /* !HAVE_STRNCASECMP */
 
 #ifndef HAVE_STRNSTR
 

acquire/acquire_string_extras.h

@@ -33,7 +33,10 @@ extern "C" {
 
 #define BUFFER_SIZE 4096
 
+#ifndef DOWNLOAD_DIR_IMPL
+#define DOWNLOAD_DIR_IMPL
 const char *get_download_dir() { return TMPDIR "//.downloads"; }
+#endif /* !DOWNLOAD_DIR_IMPL */
 
 int download(const char *url, enum Checksum checksum, const char *hash,
              const char target_location[NAME_MAX], bool follow, size_t retry,

acquire/acquire_wininet.h

@@ -15,6 +15,10 @@ source_group("${LIBRARY_NAME} Source Files" FILES "${Source_Files}")
 add_library("${LIBRARY_NAME}" "${Header_Files}" "${Source_Files}")
 
 target_link_libraries("${LIBRARY_NAME}" PRIVATE "${PROJECT_NAME}_compiler_flags")
+#foreach (lib ${LIBACQUIRE_LIBRARIES})
+#    message(STATUS "${LIBRARY_NAME} being linked with ${lib}")
+#    target_link_libraries("${LIBRARY_NAME}" PUBLIC "${lib}")
+#endforeach ()
 
 include(GNUInstallDirs)