build: Fix building for windows.

Author: nouwaarom

.github/workflows/tests.yml

@@ -40,13 +40,13 @@ jobs:
       shell: bash
       run: |
         mkdir -p dockcross
-        sudo docker run --rm dockcross/windows-x64 > dockcross-windows-x64
+        sudo docker run --rm dockcross/windows-static-64-posix > dockcross-windows-x64
         cat dockcross-windows-x64
         chmod +x dockcross-windows-x64
-        wget https://curl.haxx.se/download/curl-7.69.1.tar.gz
+        wget https://curl.haxx.se/download/curl-7.76.0.tar.gz
         tar xzf curl-*
         CURL_SRC=curl-*
-        ./dockcross-windows-x64 bash -c 'cd '"$CURL_SRC"' && ./configure --prefix="/work/deps/curl" --host=x86_64-w64-mingw32.static --with-winssl --disable-dependency-tracking --disable-pthreads --disable-pthreads --enable-threaded-resolver'
+        ./dockcross-windows-x64 bash -c 'cd '"$CURL_SRC"' && ./configure --prefix="/work/deps/curl" --host=x86_64-w64-mingw32.static --with-winssl --disable-dependency-tracking --disable-pthreads --enable-threaded-resolver --disable-imap --disable-pop3 --disable-smpt --disable-ldap --disable-mqtt --disable-smb'
         ./dockcross-windows-x64 bash -c 'cd '"$CURL_SRC"' && make'
         ./dockcross-windows-x64 bash -c 'cd '"$CURL_SRC"' && make install'
     - name: Run Tests

.gitignore

@@ -12,6 +12,7 @@ clib-build
 clib-update
 clib-upgrade
 clib-uninstall
+*.exe
 
 test/package/package-*
 !test/package/package-*.c

Makefile

@@ -21,7 +21,7 @@ OBJS = $(DEPS:.c=.o)
 
 export CC
 
-CFLAGS  += -std=c99 -U__STRICT_ANSI__ -Ideps -Isrc/common -Isrc/repository -Isrc/registry $(shell curl-config --cflags)
+CFLAGS  += -std=c99 -U__STRICT_ANSI__ -Ideps -Isrc/common -Isrc/repository -Isrc/registry
 CFLAGS  += -g -Wall -Werror=return-type -Wno-unused-function -Werror=implicit-function-declaration
 
 ifdef STATIC

deps/strdup/strdup.c

@@ -8,9 +8,9 @@
 
 #ifndef HAVE_STRDUP
 
+#include "strdup.h"
 #include <stdlib.h>
 #include <string.h>
-#include "strdup.h"
 
 #ifndef strdup
 
@@ -30,6 +30,19 @@ strdup(const char *str) {
   return buf;
 }
 
+char* strndup(const char *str, size_t len) {
+  if (NULL == (char *) str) {
+    return NULL;
+  }
+
+  char *buf = malloc(len+1);
+
+  if (buf) {
+    memset(buf, 0, len+1);
+    memcpy(buf, str, len);
+  }
+  return buf;
+}
 #endif
 
 #endif /* HAVE_STRDUP */

deps/strdup/strdup.h

@@ -17,10 +17,10 @@
  * Returns a pointer to the newly allocated
  * copy of `str`, or `NULL` on failure.
  */
-
+#include <stddef.h>
 #ifndef strdup
-char *
-strdup(const char *str);
+char * strdup(const char *str);
+char * strndup(const char *str, size_t len);
 #endif
 
 #endif /* HAVE_STRDUP */

scripts/feature-test-pthreads

@@ -4,5 +4,5 @@
   echo '#include <pthread.h>' &&
   echo 'void *f(void *a) { return 0; }' &&
   echo 'int main(void) { pthread_t t; return pthread_create(&t, 0, f, 0); }';
-} | ${CC:-cc} -o /dev/null -xc -pthread - 2>/dev/null
+} | ${CC:-cc} -o pthread_test -xc -pthread - 2>/dev/null || rm pthread_test
 exit $?

src/clib-search.c

@@ -182,7 +182,7 @@ int main(int argc, char *argv[]) {
   clib_secrets_t secrets = clib_secrets_load_from_file("clib_secrets.json");
 
   clib_package_t *package = clib_package_load_local_manifest(0);
-  registries_t registries = registry_manager_init_registries(package->registries, secrets);
+  registries_t registries = registry_manager_init_registries(package ? package->registries : NULL, secrets);
   registry_manager_fetch_registries(registries);
 
   // TODO, implement caching for the new registries.

src/common/clib-package-installer.c

@@ -23,6 +23,12 @@
 #include <limits.h>
 #include <strdup/strdup.h>
 
+#if defined(_WIN32) || defined(WIN32) || defined(__MINGW32__) ||               \
+    defined(__MINGW64__) || defined(__CYGWIN__)
+#define setenv(k, v, _) _putenv_s(k, v)
+#define realpath(a, b) _fullpath(a, b, strlen(a))
+#endif
+
 CURLSH *clib_package_curl_share;
 //TODO, cleanup somewhere curl_share_cleanup(clib_package_curl_share);
 
@@ -375,6 +381,7 @@ int clib_package_install(clib_package_t *pkg, const char *dir, int verbose) {
     _debug("mkdir -p %s", pkg_dir);
     // create directory for pkg
     if (-1 == mkdirp(pkg_dir, 0777)) {
+      logger_error("error", "Could not create directory %s", pkg_dir);
       rc = -1;
       goto cleanup;
     }

src/registry/gitlab-registry.c

@@ -5,11 +5,11 @@
 // MIT licensed
 //
 #include "gitlab-registry.h"
-#include "gumbo-get-element-by-id/get-element-by-id.h"
 #include "http-get/http-get.h"
 #include "registry-internal.h"
 #include <curl/curl.h>
 #include <string.h>
+#include <strdup/strdup.h>
 
 /**
  * Parse a list of packages from the given `html`
@@ -19,9 +19,9 @@ static list_t *gitlab_registry_parse(const char *hostname, const char *html) {
 
   // Try to parse the markdown file.
   char *input = strdup(html);
-  char *line;
+  char *line = input;
   char *category = NULL;
-  while ((line = strsep(&input, "\n"))) {
+  while ((line = strtok(line, "\n"))) {
     char *dash_position = strstr(line, "-");
     // The line starts with a dash, so we expect a package.
     if (dash_position != NULL && dash_position - line < 4) {

src/repository/repository.c

@@ -206,6 +206,7 @@ static void *fetch_package_file_thread(void *arg) {
   int rc = fetch_package_file_work(data->url, data->dir, data->file, data->secret);
   *status = rc;
   pthread_exit((void *) status);
+  return status;
 }
 #endif