[acquire/acquire_net_common.h] musl libc / classic C library solution to fallback/weak definition (static to the rescue) ; [acquire/tests/CMakeLists.txt] Modify symbol impl src prop to get it to build successfully on Windows with MSVC ; [acquire/tests/test.c] Remove old hack

Author: SamuelMarks

acquire/CMakeLists.txt

@@ -315,7 +315,7 @@ else ()
             else ()
                 set_source_files_properties(
                         ${src} PROPERTIES
-                        COMPILE_DEFINITIONS "LIBACQUIRE_IMPLEMENTATION=1;STRCASESTR_IMPL=1;STRERRORLEN_IMPL=1;STRNSTR_IMPL=1"
+                        COMPILE_DEFINITIONS "LIBACQUIRE_IMPLEMENTATION=1;STRCASESTR_IMPL=1;STRERRORLEN_IMPL=1;STRNSTR_IMPL=1;STRNCASECMP_IMPL=1"
                 )
             endif ()
         elseif (src MATCHES "/gen_acquire_url_utils.c$")
@@ -585,7 +585,7 @@ include(GenerateExportHeader)
 set(_export_file "${CMAKE_CURRENT_BINARY_DIR}/lib${LIBRARY_NAME}_export.h")
 
 if (1)
-    # pass
+    # pass (intentionally never run)
 elseif (LIBACQUIRE_HEADER_ONLY)
     file(WRITE "${_export_file}"
             "#ifndef LIBACQUIRE_EXPORT_H\n"

acquire/acquire_net_common.h

@@ -78,6 +78,9 @@ bool is_downloaded(const char *url_or_path, enum Checksum checksum,
   return result == 0;
 }
 
+/* fallback */
+static const char *get_download_dir(void) { return ".fallback_downloads"; }
+
 #endif /* defined(LIBACQUIRE_IMPLEMENTATION) &&                                \
           defined(LIBACQUIRE_ACQUIRE_NET_COMMON_IMPL) */
 

acquire/acquire_string_extras.h

@@ -4,7 +4,7 @@
  * */
 
 #ifndef LIBACQUIRE_ACQUIRE_STRING_EXTRAS_H
-#define LIBACQUIRE_ACQUIRE_STRING_EXTRAS_H 1
+#define LIBACQUIRE_ACQUIRE_STRING_EXTRAS_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -192,13 +192,25 @@ inline double wtf_vsnprintf(char *buffer, size_t count, const char *format,
 #endif /* !defined(HAVE_SNPRINTF) && defined(SNPRINTF_IMPL) && SNPRINTF_IMPL   \
         */
 
+#if defined(_MSC_VER) && !defined(__INTEL_COMPILER) && !defined(STRNCASECMP_IMPL)
+/* TODO: remove this hack */
+#define STRNCASECMP_IMPL 1
+#endif /* defined(_MSC_VER) && !defined(__INTEL_COMPILER) && !defined(STRNCASECMP_IMPL) */
+
 #if !defined(HAVE_STRNCASECMP) && defined(STRNCASECMP_IMPL) && STRNCASECMP_IMPL
 #define HAVE_STRNCASECMP 1
 
 #if defined(_MSC_VER) && !defined(__INTEL_COMPILER)
-#define strncasecmp _strnicmp
+/* this didn't work `#define strncasecmp _strnicmp` */
+LIBACQUIRE_EXPORT int strncasecmp(const char *_l, const char *_r, size_t n) {
+    return _strnicmp(_l, _r, n);
+}
+
+/* this didn't work `#define strcasecmp _stricmp` */
+LIBACQUIRE_EXPORT int strcasecmp(const char *l, const char *r) {
+    return _stricmp(l, r);
+}
 
-#define strcasecmp _stricmp
 #else
 /* from MIT licensed musl @ e0ef93c20de1a9e0a6b8f4a4a951a8e61a1a2973 */
 int strncasecmp(const char *_l, const char *_r, size_t n) {

acquire/tests/CMakeLists.txt

@@ -1,5 +1,3 @@
-set(EXEC_NAME "test_${PROJECT_NAME}")
-
 #########################
 # Dependencies download #
 #########################
@@ -119,6 +117,45 @@ endmacro(test_wrapper)
 
 configure_file(config_for_tests.h.in "${PROJECT_BINARY_DIR}/src/config_for_tests.h" @ONLY)
 
+#######################
+# Download dir target #
+#######################
+
+set(DOWNLOAD_DIR_LIB "test_${PROJECT_NAME}_download_dir")
+
+set(Header_Files
+        "${CMAKE_BINARY_DIR}/gen/gen_acquire_common_defs.h"
+        "${CMAKE_BINARY_DIR}/gen/gen_acquire_net_common.h"
+)
+source_group("${DOWNLOAD_DIR_LIB} Header Files" FILES "${Header_Files}")
+
+set(Source_Files
+        "${CMAKE_BINARY_DIR}/gen/gen_acquire_net_common.c")
+source_group("${DOWNLOAD_DIR_LIB} Source Files" FILES "${Source_Files}")
+
+add_library("${DOWNLOAD_DIR_LIB}" SHARED "${Header_Files}" "${Source_Files}")
+
+target_link_libraries("${DOWNLOAD_DIR_LIB}" PRIVATE "${PROJECT_NAME}")
+
+target_include_directories(
+        "${DOWNLOAD_DIR_LIB}"
+        PRIVATE
+        "$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/tests>"
+        "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>"
+        "$<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/gen>"
+)
+if (WIN32)
+    target_compile_definitions(
+            "${DOWNLOAD_DIR_LIB}"
+            PRIVATE
+            "_${TARGET_ARCH}_"
+    )
+endif ()
+
+####
+
+set(EXEC_NAME "test_${PROJECT_NAME}")
+
 set(Header_Files
         "test_handle.h"
         "test_checksum.h"
@@ -133,18 +170,23 @@ set(Header_Files
 )
 source_group("Header Files" FILES "${Header_Files}")
 
-set(Source_Files "test.c" "${CMAKE_SOURCE_DIR}/acquire/cli/cli.c")
+set(Source_Files
+        "${CMAKE_BINARY_DIR}/gen/gen_acquire_string_extras.c"
+        "test.c"
+        "${CMAKE_SOURCE_DIR}/acquire/cli/cli.c")
 source_group("Source Files" FILES "${Source_Files}")
 
 if (MSVC)
     set_source_files_properties("test_string_extras.c"
-            PROPERTIES COMPILE_DEFINITIONS "LIBACQUIRE_IMPLEMENTATION=1;STRCASESTR_IMPL=1;STRNCASECMP_IMPL=1")
+            PROPERTIES COMPILE_DEFINITIONS "LIBACQUIRE_IMPLEMENTATION=0;STRCASESTR_IMPL=0;STRNCASECMP_IMPL=0")
+    set_source_files_properties("${CMAKE_BINARY_DIR}/gen/gen_acquire_string_extras.c"
+            PROPERTIES COMPILE_DEFINITIONS "LIBACQUIRE_IMPLEMENTATION=1;STRCASESTR_IMPL=1;STRNCASECMP_IMPL=0;STRNSTR_IMPL=1;STRERRORLEN_IMPL=1")
 else ()
-    set_source_files_properties("test.c"
-            PROPERTIES COMPILE_DEFINITIONS "LIBACQUIRE_DOWNLOAD_DIR_IMPL=1")
     set_source_files_properties("test_string_extras.c"
             PROPERTIES COMPILE_DEFINITIONS "LIBACQUIRE_IMPLEMENTATION=1")
 endif ()
+#set_source_files_properties("test.c"
+#        PROPERTIES COMPILE_DEFINITIONS "LIBACQUIRE_DOWNLOAD_DIR_IMPL=1")
 
 add_executable("${EXEC_NAME}" "${Header_Files}" "${Source_Files}")
 target_compile_definitions("${EXEC_NAME}" PUBLIC "_${TARGET_ARCH}_")
@@ -156,11 +198,12 @@ target_link_libraries(
         PRIVATE
         "${PROJECT_NAME}"
         "${PROJECT_NAME}_compiler_flags"
+        "${DOWNLOAD_DIR_LIB}"
 )
 
 if (LIBACQUIRE_USE_MY_LIBFETCH)
     target_link_libraries(${EXEC_NAME} PRIVATE freebsd_libfetch)
-endif ()
+endif (LIBACQUIRE_USE_MY_LIBFETCH)
 
 if (LIBACQUIRE_USE_MINIZ)
     find_package(kubazip CONFIG REQUIRED)

acquire/tests/test.c

@@ -27,10 +27,6 @@
 #include "test_string_extras.h"
 #include "test_url_utils.h"
 
-#ifdef LIBACQUIRE_DOWNLOAD_DIR_IMPL
-const char *get_download_dir(void) { return ".test_downloads"; }
-#endif /* LIBACQUIRE_DOWNLOAD_DIR_IMPL */
-
 /* Add definitions that need to be in the test runner's main file. */
 GREATEST_MAIN_DEFS();