[*.h] C++ support ; [*.h,*.c] fd -eh -ec -x clang-format --style=LLVM -i ; [LICENSE-{APACHE,MIT}] Welcome back libacquire!

SamuelMarks · SamuelMarks · commit 70bff449e9b0 · 2025-04-26T12:11:55.000-06:00
diff --git a/LICENSE-APACHE b/LICENSE-APACHE
@@ -187,7 +187,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2020-2021 Samuel Marks (for Offscale.io)
+   Copyright 2020-2025 Samuel Marks (for Offscale.io)
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/LICENSE-MIT b/LICENSE-MIT
@@ -1,4 +1,4 @@
-Copyright 2020-2021 Samuel Marks (for Offscale.io)
+Copyright 2020-2025 Samuel Marks (for Offscale.io)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
diff --git a/acquire/acquire_checksums.h b/acquire/acquire_checksums.h
@@ -8,6 +8,10 @@
 #ifndef LIBACQUIRE_ACQUIRE_CHECKSUMS_H
 #define LIBACQUIRE_ACQUIRE_CHECKSUMS_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 #include "libacquire_export.h"
 #if defined(HAS_STDBOOL) && !defined(bool)
 #include <stdbool.h>
@@ -65,4 +69,8 @@ bool (*get_checksum_function(enum Checksum checksum))(const char *,
 
 #endif /* LIBACQUIRE_IMPLEMENTATION */
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /* ! LIBACQUIRE_ACQUIRE_CHECKSUMS_H */
diff --git a/acquire/acquire_common_defs.h b/acquire/acquire_common_defs.h
@@ -7,11 +7,17 @@
 #ifndef LIBACQUIRE_ACQUIRE_COMMON_DEFS_H
 #define LIBACQUIRE_ACQUIRE_COMMON_DEFS_H
 
-#if defined(HAS_STDBOOL) && !defined(bool)
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#ifdef __cplusplus
+extern "C" {
+#elif defined(HAS_STDBOOL) && !defined(bool)
 #include <stdbool.h>
 #else
 #include "acquire_stdbool.h"
-#endif /* defined(HAS_STDBOOL) && !defined(bool) */
+#endif /* __cplusplus */
 
 #include "acquire_checksums.h"
 #include "acquire_download.h"
@@ -93,4 +99,8 @@
 #endif
 #endif /* !defined(_AMD64_) && !defined(_X86_) && defined(_ARM_) */
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /* ! LIBACQUIRE_ACQUIRE_COMMON_DEFS_H */
diff --git a/acquire/acquire_crc32c.h b/acquire/acquire_crc32c.h
@@ -12,11 +12,13 @@
     defined(LIBACQUIRE_IMPLEMENTATION) && defined(USE_CRC32C)
 #define LIBACQUIRE_ACQUIRE_CRC32C_H
 
-#if defined(HAS_STDBOOL) && !defined(bool)
+#ifdef __cplusplus
+extern "C" {
+#elif defined(HAS_STDBOOL) && !defined(bool)
 #include <stdbool.h>
 #else
 #include "acquire_stdbool.h"
-#endif
+#endif /* __cplusplus */
 
 #define CHUNK_SIZE 4096
 
@@ -115,5 +117,9 @@ bool crc32c(const char *filename, const char *hash) {
   return true;
 }
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /* !defined(LIBACQUIRE_ACQUIRE_CRC32C_H) &&                             \
           defined(LIBACQUIRE_IMPLEMENTATION) && defined(USE_CRC32C) */
diff --git a/acquire/acquire_download.h b/acquire/acquire_download.h
@@ -10,11 +10,13 @@
 
 #include <stdlib.h>
 
-#if defined(HAS_STDBOOL) && !defined(bool)
+#ifdef __cplusplus
+extern "C" {
+#elif defined(HAS_STDBOOL) && !defined(bool)
 #include <stdbool.h>
 #else
 #include "acquire_stdbool.h"
-#endif /* defined(HAS_STDBOOL) && !defined(bool) */
+#endif /* __cplusplus */
 #include "acquire_config.h"
 #include "acquire_fileutils.h"
 #include "acquire_url_utils.h"
@@ -40,5 +42,8 @@ extern LIBACQUIRE_LIB_EXPORT int download(const char *, enum Checksum,
 extern LIBACQUIRE_LIB_EXPORT int download_many(const char *[], const char *[],
                                                enum Checksum[], const char *,
                                                bool, size_t, size_t);
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
 
 #endif /* ! LIBACQUIRE_ACQUIRE_DOWNLOAD_H */
diff --git a/acquire/acquire_extract.h b/acquire/acquire_extract.h
@@ -10,6 +10,10 @@
 #ifndef LIBACQUIRE_ACQUIRE_EXTRACT_H
 #define LIBACQUIRE_ACQUIRE_EXTRACT_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 #include "libacquire_export.h"
 
 enum LIBACQUIRE_LIB_EXPORT Archive {
@@ -38,4 +42,8 @@ extern enum Archive extension2archive(const char *const s) {
 
 #endif /* LIBACQUIRE_IMPLEMENTATION */
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /* ! LIBACQUIRE_ACQUIRE_EXTRACT_H */
diff --git a/acquire/acquire_fileutils.h b/acquire/acquire_fileutils.h
@@ -8,13 +8,15 @@
 #ifndef LIBACQUIRE_ACQUIRE_FILEUTILS_H
 #define LIBACQUIRE_ACQUIRE_FILEUTILS_H
 
-#if defined(HAS_STDBOOL) && !defined(bool)
+#ifdef __cplusplus
+extern "C" {
+#elif defined(HAS_STDBOOL) && !defined(bool)
 #include <stdbool.h>
 #else
 #include "acquire_stdbool.h"
 #include "libacquire_export.h"
+#endif /* __cplusplus */
 
-#endif /* defined(HAS_STDBOOL) && !defined(bool) */
 #include <string.h>
 
 #if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__)
@@ -127,4 +129,8 @@ const char *get_extension(const char *const filename) {
 
 #endif /* LIBACQUIRE_IMPLEMENTATION */
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /* ! LIBACQUIRE_ACQUIRE_FILEUTILS_H */
diff --git a/acquire/acquire_libarchive.h b/acquire/acquire_libarchive.h
@@ -6,6 +6,10 @@
  * https://github.com/libarchive/libarchive/wiki/Examples#a-complete-extractor
  */
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 #include "acquire_extract.h"
 
 #include <archive.h>
@@ -102,5 +106,9 @@ int extract_archive(enum Archive archive, const char *archive_filepath,
   return EXIT_SUCCESS;
 }
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /* !defined(LIBACQUIRE_ACQUIRE_LIBARCHIVE_H) && defined(USE_LIBARCHIVE) \
           && defined(LIBACQUIRE_IMPLEMENTATION) */
diff --git a/acquire/acquire_libcurl.h b/acquire/acquire_libcurl.h
@@ -13,6 +13,10 @@
 
 #define LIBACQUIRE_LIBCURL_H
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #include <stdint.h>
 #include <stdlib.h>
 
@@ -185,7 +189,7 @@ int download(const char *url, enum Checksum checksum, const char *hash,
     if (filesize(target_location) > 0 /* && check checksum */) {
       return EEXIST /*CURLE_ALREADY_COMPLETE*/;
     } else
-    set_remote_fname_to_target_location : {
+    set_remote_fname_to_target_location: {
       const size_t target_location_n = strlen(target_location);
       strncpy(dnld_params.dnld_remote_fname, target_location,
               target_location_n);
@@ -304,5 +308,9 @@ int download_many(const char *url[], const char *hashes[],
   return UNIMPLEMENTED;
 }
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /* !defined(LIBACQUIRE_LIBCURL_H) && defined(USE_LIBCURL) &&            \
           defined(LIBACQUIRE_IMPLEMENTATION) */
diff --git a/acquire/acquire_libfetch.h b/acquire/acquire_libfetch.h
@@ -15,6 +15,10 @@
     defined(LIBACQUIRE_IMPLEMENTATION)
 #define LIBACQUIRE_LIBFETCH_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 #include <sys/ioctl.h>
 
 #include "acquire_checksums.h"
@@ -810,5 +814,9 @@ int download(const char *url, enum Checksum checksum, const char *hash,
   return result;
 }
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /* !defined(LIBACQUIRE_LIBFETCH_H) && defined(USE_LIBFETCH) &&          \
           defined(LIBACQUIRE_IMPLEMENTATION) */
diff --git a/acquire/acquire_librhash.h b/acquire/acquire_librhash.h
@@ -8,7 +8,9 @@
 
 #include <errno.h>
 
-#if defined(HAS_STDBOOL) && !defined(bool)
+#ifdef __cplusplus
+extern "C" {
+#elif defined(HAS_STDBOOL) && !defined(bool)
 #include <stdbool.h>
 #else
 #include "acquire_stdbool.h"
@@ -103,5 +105,9 @@ bool sha512(const char *filename, const char *gold_hash) {
 HASHES
 #undef X
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /* !defined(LIBACQUIRE_ACQUIRE_LIBRHASH_H) &&                           \
           defined(LIBACQUIRE_IMPLEMENTATION) && defined(USE_LIBRHASH) */
diff --git a/acquire/acquire_miniz.h b/acquire/acquire_miniz.h
@@ -2,6 +2,10 @@
     defined(LIBACQUIRE_IMPLEMENTATION)
 #define LIBACQUIRE_ACQUIRE_MINIZ_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 #include <stdio.h>
 #include <stdlib.h>
 
@@ -31,5 +35,9 @@ int extract_archive(enum Archive archive, const char *archive_filepath,
   }
 }
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /* !defined(LIBACQUIRE_ACQUIRE_MINIZ_H) && defined(USE_MINIZ) &&        \
           defined(LIBACQUIRE_IMPLEMENTATION) */
diff --git a/acquire/acquire_net_common.h b/acquire/acquire_net_common.h
@@ -6,6 +6,10 @@
 #ifndef LIBACQUIRE_ACQUIRE_NET_COMMON_H
 #define LIBACQUIRE_ACQUIRE_NET_COMMON_H
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #include "acquire_download.h"
 #include "acquire_string_extras.h"
 
@@ -45,4 +49,8 @@ bool is_downloaded(const char *url, enum Checksum checksum, const char *hash,
 }
 #endif /* LIBACQUIRE_IMPLEMENTATION */
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /* !LIBACQUIRE_ACQUIRE_NET_COMMON_H */
diff --git a/acquire/acquire_openbsd_ftp.h b/acquire/acquire_openbsd_ftp.h
@@ -7,6 +7,10 @@
 #if !defined(LIBACQUIRE_OPENBSD_FTP_H) && defined(LIBACQUIRE_IMPLEMENTATION)
 #define LIBACQUIRE_OPENBSD_FTP_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 #include "openbsd.ftp/extern.h"
 
 const char *get_download_dir() { return ".downloads"; }
@@ -17,5 +21,9 @@ int download(const char *url, enum Checksum checksum, const char *hash,
   sendrequest();
 }
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /* !defined(LIBACQUIRE_OPENBSD_FTP_H) &&                                \
           defined(LIBACQUIRE_IMPLEMENTATION) */
diff --git a/acquire/acquire_openssl.h b/acquire/acquire_openssl.h
@@ -11,6 +11,10 @@
 #if !defined(LIBACQUIRE_OPENSSL_H) && defined(LIBACQUIRE_IMPLEMENTATION)
 #define LIBACQUIRE_OPENSSL_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 #include "acquire_config.h"
 
 #if defined(USE_COMMON_CRYPTO) || defined(USE_OPENSSL)
@@ -244,5 +248,9 @@ bool sha512(const char *filename, const char *hash) {
 
 #endif /* defined(USE_COMMON_CRYPTO) || defined(USE_OPENSSL) */
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /* !defined(LIBACQUIRE_OPENSSL_H) && defined(LIBACQUIRE_IMPLEMENTATION) \
         */
diff --git a/acquire/acquire_string_extras.h b/acquire/acquire_string_extras.h
@@ -6,6 +6,10 @@
 #ifndef LIBACQUIRE_ACQUIRE_STRING_EXTRAS_H
 #define LIBACQUIRE_ACQUIRE_STRING_EXTRAS_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 #include <stdarg.h>
 #include <stdio.h>
 #ifdef HAVE_LIBBSD
@@ -270,4 +274,8 @@ size_t strerrorlen_s(errno_t errnum) {
 
 #endif /* !HAVE_STRERRORLEN_S */
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /* ! LIBACQUIRE_ACQUIRE_STRING_EXTRAS_H */
diff --git a/acquire/acquire_url_utils.h b/acquire/acquire_url_utils.h
@@ -5,11 +5,13 @@
 #ifndef LIBACQUIRE_ACQUIRE_URL_UTILS_H
 #define LIBACQUIRE_ACQUIRE_URL_UTILS_H
 
-#if defined(HAS_STDBOOL) && !defined(bool)
+#ifdef __cplusplus
+extern "C" {
+#elif defined(HAS_STDBOOL) && !defined(bool)
 #include <stdbool.h>
 #else
 #include "acquire_stdbool.h"
-#endif /* defined(HAS_STDBOOL) && !defined(bool) */
+#endif /* __cplusplus */
 
 #if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__)
 #define strdup _strdup
@@ -61,4 +63,8 @@ bool is_url(const char *maybe_url) {
 
 #endif /* LIBACQUIRE_IMPLEMENTATION */
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /* ! LIBACQUIRE_ACQUIRE_URL_UTILS_H */
diff --git a/acquire/acquire_wincrypt.h b/acquire/acquire_wincrypt.h
diff --git a/acquire/acquire_wininet.h b/acquire/acquire_wininet.h
diff --git a/acquire/acquire_winseccng.h b/acquire/acquire_winseccng.h
diff --git a/acquire/acquire_zlib.h b/acquire/acquire_zlib.h
diff --git a/acquire/freebsd_libfetch/http.c b/acquire/freebsd_libfetch/http.c
diff --git a/acquire/freebsd_libfetch/shim.c b/acquire/freebsd_libfetch/shim.c

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-Copyright 2020-2021 Samuel Marks (for Offscale.io)`
	`1`	`+Copyright 2020-2025 Samuel Marks (for Offscale.io)`
`2`	`2`
`3`	`3`	`Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:`
`4`	`4`