From 3f2f01c6c209827aefd86907712684e9f87d88ab Mon Sep 17 00:00:00 2001
From: LoRd_MuldeR <mulder2@gmx.de>
Date: Wed, 9 Jun 2021 16:11:19 +0200
Subject: [PATCH] Enable Unicode build.

---
 build.sh                    |  5 +--
 patch/curl_parseconfig.diff | 61 ++++++++++++++++++++++++++++++++++---
 2 files changed, 59 insertions(+), 7 deletions(-)

diff --git a/build.sh b/build.sh
index 9757af2..1d63f2b 100644
--- a/build.sh
+++ b/build.sh
@@ -166,8 +166,9 @@ pushd "${CURL_DIR}"
 patch -p1 -b < "${BASE_DIR}/patch/curl_findw32cacert.diff"
 patch -p1 -b < "${BASE_DIR}/patch/curl_mutex_init.diff"
 patch -p1 -b < "${BASE_DIR}/patch/curl_parseconfig.diff"
-cp -vf "${LIBS_DIR}/cacert.pem"   ca-bundle.pem
-CFLAGS="-march=${MY_MARCH} -mtune=${MY_MTUNE} -I\"${LIBS_DIR}/include\"" CPPFLAGS="-DNGHTTP2_STATICLIB" LDFLAGS="-static -no-pthread -L\"${LIBS_DIR}/lib\"" LIBS="-latomic -liconv -lcrypt32" PKG_CONFIG_PATH="${LIBS_DIR}/pkgconfig" ./configure --enable-static --disable-shared --disable-pthreads --disable-libcurl-option --disable-openssl-auto-load-config --with-zlib="${LIBS_DIR}" --with-zstd="${LIBS_DIR}" --with-brotli="${LIBS_DIR}" --with-openssl="${LIBS_DIR}" --with-libssh2="${LIBS_DIR}" --with-nghttp2="${LIBS_DIR}" --with-libidn2="${LIBS_DIR}" --with-ca-bundle="ca-bundle.pem"
+cp -vf "${LIBS_DIR}/cacert.pem" ca-bundle.pem
+sed -i -E 's/\bint[[:space:]]*main[[:space:]]*\(/int wmain(/g' configure
+CFLAGS="-municode -mconsole -march=${MY_MARCH} -mtune=${MY_MTUNE} -I\"${LIBS_DIR}/include\"" CPPFLAGS="-DNGHTTP2_STATICLIB" LDFLAGS="-static -no-pthread -L\"${LIBS_DIR}/lib\"" LIBS="-latomic -liconv -lcrypt32" PKG_CONFIG_PATH="${LIBS_DIR}/pkgconfig" ./configure --enable-static --disable-shared --disable-pthreads --disable-libcurl-option --disable-openssl-auto-load-config --with-zlib="${LIBS_DIR}" --with-zstd="${LIBS_DIR}" --with-brotli="${LIBS_DIR}" --with-openssl="${LIBS_DIR}" --with-libssh2="${LIBS_DIR}" --with-nghttp2="${LIBS_DIR}" --with-libidn2="${LIBS_DIR}" --with-ca-bundle="ca-bundle.pem"
 make curl_LDFLAGS=-all-static
 strip -s src/curl.exe
 popd
diff --git a/patch/curl_parseconfig.diff b/patch/curl_parseconfig.diff
index bcc5d92..9219c6f 100644
--- a/patch/curl_parseconfig.diff
+++ b/patch/curl_parseconfig.diff
@@ -1,8 +1,59 @@
-diff --git "a/D:\\_Sandbox\\curl\\curl-src\\src\\tool_parsecfg.c.ori" "b/D:\\_Sandbox\\curl\\curl-src\\src\\tool_parsecfg.c"
-index d26774f..9ef1564 100644
---- "a/src/tool_parsecfg.c"
-+++ "b/src/tool_parsecfg.c"
-@@ -85,7 +85,7 @@ int parseconfig(const char *filename, struct GlobalConfig *global)
+diff --git "a/D:\\_Sandbox\\curl\\curl-src\\src\\tool_parsecfg.c.orig" "b/D:\\_Sandbox\\curl\\curl-src\\src\\tool_parsecfg.c"
+index d26774f..e0b97c1 100644
+--- "a/D:\\_Sandbox\\curl\\curl-src\\src\\tool_parsecfg.c.orig"
++++ "b/D:\\_Sandbox\\curl\\curl-src\\src\\tool_parsecfg.c"
+@@ -47,28 +47,34 @@ static bool my_get_line(FILE *fp, struct curlx_dynbuf *, bool *error);
+ #ifdef WIN32
+ static FILE *execpath(const char *filename)
+ {
+-  char filebuffer[512];
++  static const size_t BUFFSIZE = 512;
++  FILE *file = NULL;
++  TCHAR filebuffer[BUFFSIZE];
+   /* Get the filename of our executable. GetModuleFileName is already declared
+-   * via inclusions done in setup header file.  We assume that we are using
+-   * the ASCII version here.
++   * via inclusions done in setup header file.
+    */
+-  unsigned long len = GetModuleFileNameA(0, filebuffer, sizeof(filebuffer));
+-  if(len > 0 && len < sizeof(filebuffer)) {
+-    /* We got a valid filename - get the directory part */
+-    char *lastdirchar = strrchr(filebuffer, '\\');
+-    if(lastdirchar) {
+-      size_t remaining;
+-      *lastdirchar = 0;
+-      /* If we have enough space, build the RC filename */
+-      remaining = sizeof(filebuffer) - strlen(filebuffer);
+-      if(strlen(filename) < remaining - 1) {
+-        msnprintf(lastdirchar, remaining, "%s%s", DIR_CHAR, filename);
+-        return fopen(filebuffer, FOPEN_READTEXT);
++  unsigned long len = GetModuleFileName(0, filebuffer, BUFFSIZE);
++  if(len > 0 && len < BUFFSIZE) {
++#ifdef UNICODE
++    char *module_path = curlx_convert_wchar_to_UTF8(filebuffer);
++#else
++    char *module_path = strdup(filebuffer);
++#endif
++    if (module_path) {
++      char *lastdirchar = strrchr(module_path, '\\');
++      if(lastdirchar) {
++        *lastdirchar = '\0';
++      }
++      char *file_path = curl_maprintf("%s%s%s", module_path, DIR_CHAR, filename);
++      if (file_path) {
++        file = fopen(file_path, FOPEN_READTEXT);
++        free(file_path);
+       }
++      free(module_path);
+     }
+   }
+ 
+-  return NULL;
++  return file;
+ }
+ #endif
+ 
+@@ -85,7 +91,7 @@ int parseconfig(const char *filename, struct GlobalConfig *global)
    if(!filename || !*filename) {
      /* NULL or no file name attempts to load .curlrc from the homedir! */