Compare commits

..

No commits in common. "ad6ed9e244b1b260606cbe009e4bf4d681015fbf" and "c45f6037556f797bc52b34dda3d5e264dfd6dfa1" have entirely different histories.

2 changed files with 7 additions and 9 deletions

View File

@ -11,7 +11,7 @@ trap 'read -p "Press any key..." x' EXIT
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# cURL version # cURL version
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
readonly MY_VERSION=8.9.1 readonly MY_VERSION=8.8.0
############################################################################### ###############################################################################
# PREPARATION # PREPARATION
@ -146,8 +146,8 @@ fetch_pkg "fbd9c40848c235736377ba3fd0b8677a05d39e7c39406769588a6595dda5636f" "${
fetch_pkg "4c21a791b610b9519b9d0e12b8097bf2f359b12f8dd92647611a929e6bfd7d64" "${PKGS_DIR}/libidn2.tar.gz" https://ftp.gnu.org/gnu/libidn/libidn2-2.3.7.tar.gz fetch_pkg "4c21a791b610b9519b9d0e12b8097bf2f359b12f8dd92647611a929e6bfd7d64" "${PKGS_DIR}/libidn2.tar.gz" https://ftp.gnu.org/gnu/libidn/libidn2-2.3.7.tar.gz
fetch_pkg "1dcc9ceae8b128f3c0b3f654decd0e1e891afc6ff81098f227ef260449dae208" "${PKGS_DIR}/libpsl.tar.gz" https://github.com/rockdaboot/libpsl/releases/download/0.21.5/libpsl-0.21.5.tar.gz fetch_pkg "1dcc9ceae8b128f3c0b3f654decd0e1e891afc6ff81098f227ef260449dae208" "${PKGS_DIR}/libpsl.tar.gz" https://github.com/rockdaboot/libpsl/releases/download/0.21.5/libpsl-0.21.5.tar.gz
fetch_pkg "f1b553384dedbd87478449775546a358d6f5140c15cccc8fb574136fdc77329f" "${PKGS_DIR}/libgsasl.tar.gz" https://ftp.gnu.org/gnu/gsasl/libgsasl-1.10.0.tar.gz fetch_pkg "f1b553384dedbd87478449775546a358d6f5140c15cccc8fb574136fdc77329f" "${PKGS_DIR}/libgsasl.tar.gz" https://ftp.gnu.org/gnu/gsasl/libgsasl-1.10.0.tar.gz
fetch_pkg "291124a007ee5111997825940b3876b3048f7d31e73e9caa681b80fe48b2dcd5" "${PKGS_DIR}/curl.tar.gz" https://curl.se/download/curl-${MY_VERSION}.tar.gz fetch_pkg "77c0e1cd35ab5b45b659645a93b46d660224d0024f1185e8a95cdb27ae3d787d" "${PKGS_DIR}/curl.tar.gz" https://curl.se/download/curl-${MY_VERSION}.tar.gz
fetch_pkg "1bf458412568e134a4514f5e170a328d11091e071c7110955c9884ed87972ac9" "${PKGS_DIR}/cacert.pem" https://curl.se/ca/cacert-2024-07-02.pem fetch_pkg "1794c1d4f7055b7d02c2170337b61b48a2ef6c90d77e95444fd2596f4cac609f" "${PKGS_DIR}/cacert.pem" https://curl.se/ca/cacert-2024-03-11.pem
fetch_pkg "zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz" "${PKGS_DIR}/manpage.html" https://curl.se/docs/manpage.html fetch_pkg "zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz" "${PKGS_DIR}/manpage.html" https://curl.se/docs/manpage.html
############################################################################### ###############################################################################
@ -379,8 +379,6 @@ unix2dos -n "${ICNV_DIR}/README" "legal/libiconv.README"
unix2dos -n "${IDN2_DIR}/AUTHORS" "legal/libidn2.AUTHORS.txt" unix2dos -n "${IDN2_DIR}/AUTHORS" "legal/libidn2.AUTHORS.txt"
unix2dos -n "${IDN2_DIR}/COPYING" "legal/libidn2.COPYING.txt" unix2dos -n "${IDN2_DIR}/COPYING" "legal/libidn2.COPYING.txt"
unix2dos -n "${IDN2_DIR}/README.md" "legal/libidn2.README.md" unix2dos -n "${IDN2_DIR}/README.md" "legal/libidn2.README.md"
unix2dos -n "${LPSL_DIR}/AUTHORS" "legal/libpsl.AUTHORS.txt"
unix2dos -n "${LPSL_DIR}/COPYING" "legal/libpsl.COPYING.txt"
unix2dos -n "${NGH2_DIR}/AUTHORS" "legal/nghttp2.AUTHORS.txt" unix2dos -n "${NGH2_DIR}/AUTHORS" "legal/nghttp2.AUTHORS.txt"
unix2dos -n "${NGH2_DIR}/COPYING" "legal/nghttp2.COPYING.txt" unix2dos -n "${NGH2_DIR}/COPYING" "legal/nghttp2.COPYING.txt"
unix2dos -n "${NGH2_DIR}/README.rst" "legal/nghttp2.README.rst" unix2dos -n "${NGH2_DIR}/README.rst" "legal/nghttp2.README.rst"

View File

@ -2,7 +2,7 @@
1 file changed, 30 insertions(+), 17 deletions(-) 1 file changed, 30 insertions(+), 17 deletions(-)
diff --git a/lib/getenv.c b/lib/getenv.c diff --git a/lib/getenv.c b/lib/getenv.c
index 49a2e50..dbf2642 100644 index 48ee972..fe27a24 100644
--- a/lib/getenv.c --- a/lib/getenv.c
+++ b/lib/getenv.c +++ b/lib/getenv.c
@@ -26,26 +26,23 @@ @@ -26,26 +26,23 @@
@ -23,7 +23,7 @@ index 49a2e50..dbf2642 100644
- return NULL; - return NULL;
-#elif defined(_WIN32) -#elif defined(_WIN32)
/* This uses Windows API instead of C runtime getenv() to get the environment /* This uses Windows API instead of C runtime getenv() to get the environment
variable since some changes are not always visible to the latter. #4774 */ variable since some changes aren't always visible to the latter. #4774 */
- char *buf = NULL; - char *buf = NULL;
- char *tmp; - char *tmp;
+ wchar_t *buf = NULL; + wchar_t *buf = NULL;
@ -40,8 +40,8 @@ index 49a2e50..dbf2642 100644
return NULL; return NULL;
@@ -56,25 +53,41 @@ static char *GetEnv(const char *variable) @@ -56,25 +53,41 @@ static char *GetEnv(const char *variable)
/* it is possible for rc to be 0 if the variable was found but empty. /* It's possible for rc to be 0 if the variable was found but empty.
Since getenv does not make that distinction we ignore it as well. */ Since getenv doesn't make that distinction we ignore it as well. */
- rc = GetEnvironmentVariableA(variable, buf, bufsize); - rc = GetEnvironmentVariableA(variable, buf, bufsize);
+ rc = GetEnvironmentVariableW(variable, buf, bufsize); + rc = GetEnvironmentVariableW(variable, buf, bufsize);
if(!rc || rc == bufsize || rc > max) { if(!rc || rc == bufsize || rc > max) {