Fixed an incompatible pointer type in cleanarg() function.
This commit is contained in:
parent
0793ad2791
commit
0ce95c8b80
1
build.sh
1
build.sh
@ -235,6 +235,7 @@ sed -i -E 's/\bmain[[:space:]]*\(([^\(\)]*)\)/wmain(\1)/g' configure
|
||||
patch -p1 -b < "${BASE_DIR}/patch/curl_getenv.diff"
|
||||
patch -p1 -b < "${BASE_DIR}/patch/curl_threads.diff"
|
||||
patch -p1 -b < "${BASE_DIR}/patch/curl_tool_doswin.diff"
|
||||
patch -p1 -b < "${BASE_DIR}/patch/curl_tool_getparam.diff"
|
||||
patch -p1 -b < "${BASE_DIR}/patch/curl_tool_parsecfg.diff"
|
||||
CFLAGS="-march=${MY_MARCH} -mtune=${MY_MTUNE} -I${LIBS_DIR}/include" CPPFLAGS="-DNDEBUG -D_WIN32_WINNT=0x0501 -DNGHTTP2_STATICLIB -DNGHTTP3_STATICLIB -DNGTCP2_STATICLIB -DUNICODE -D_UNICODE" LDFLAGS="-municode -mconsole -Wl,--trace -static -no-pthread -L${LIBS_DIR}/lib" LIBS="-liconv -lcrypt32 -lwinmm" PKG_CONFIG_PATH="${LIBS_DIR}/lib/pkgconfig" ./configure --enable-static --disable-shared --disable-pthreads --disable-libcurl-option --disable-openssl-auto-load-config --with-zlib --with-zstd --with-brotli --with-openssl --with-librtmp --with-libssh2 --with-nghttp2="${LIBS_DIR}" --with-ngtcp2="${LIBS_DIR}" --with-nghttp3="${LIBS_DIR}" --with-libidn2 --with-gsasl --without-ca-bundle
|
||||
make V=1
|
||||
|
@ -67,4 +67,4 @@ index e9347d2..558d15d 100644
|
||||
+ config->cacert = cacert;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
21
patch/curl_tool_getparam.diff
Normal file
21
patch/curl_tool_getparam.diff
Normal file
@ -0,0 +1,21 @@
|
||||
src/tool_getparam.c | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/src/tool_getparam.c b/src/tool_getparam.c
|
||||
index 6d6cac3..de02cfd 100644
|
||||
--- a/src/tool_getparam.c
|
||||
+++ b/src/tool_getparam.c
|
||||
@@ -552,8 +552,13 @@ static void cleanarg(argv_item_t str)
|
||||
* argument out so that the username:password isn't displayed in the
|
||||
* system process list */
|
||||
if(str) {
|
||||
+#ifdef _UNICODE
|
||||
+ size_t len = wcslen(str);
|
||||
+ wmemset(str, L' ', len);
|
||||
+#else
|
||||
size_t len = strlen(str);
|
||||
memset(str, ' ', len);
|
||||
+#endif
|
||||
}
|
||||
}
|
||||
#else
|
Loading…
Reference in New Issue
Block a user