Muldersoft/cURL-build-win32
Muldersoft/cURL-build-win32
1
0
Fork 0
Code Issues Pull Requests Projects Releases 20 Wiki Activity

Updated patches for new cURL version.

Browse Source
This commit is contained in:
LoRd_MuldeR 2024-12-14 14:03:32 +01:00
parent af9358dc42
commit 66d2df4cad
4 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
patch/curl_tool_doswin.diff
View File

@ -2,10 +2,10 @@
1 file changed, 8 insertions(+) 1 file changed, 8 insertions(+)
diff --git a/src/tool_doswin.c b/src/tool_doswin.c diff --git a/src/tool_doswin.c b/src/tool_doswin.c
index 70b263113..28489a521 100644 index 301b2974e..6720ad5d7 100644
--- a/src/tool_doswin.c --- a/src/tool_doswin.c
+++ b/src/tool_doswin.c +++ b/src/tool_doswin.c
@@ -739,6 +739,8 @@ bool tool_isVistaOrGreater; @@ -741,6 +741,8 @@ bool tool_isVistaOrGreater;
CURLcode win32_init(void) CURLcode win32_init(void)
{ {
@ -14,7 +14,7 @@ index 70b263113..28489a521 100644
/* curlx_verify_windows_version must be called during init at least once /* curlx_verify_windows_version must be called during init at least once
because it has its own initialization routine. */ because it has its own initialization routine. */
if(curlx_verify_windows_version(6, 0, 0, PLATFORM_WINNT, if(curlx_verify_windows_version(6, 0, 0, PLATFORM_WINNT,
@@ -753,6 +755,12 @@ CURLcode win32_init(void) @@ -755,6 +757,12 @@ CURLcode win32_init(void)
init_terminal(); init_terminal();
#endif #endif

13
patch/curl_tool_getparam.diff
View File

@ -1,7 +1,10 @@
diff --git "a/src/tool_getparam.c" "b/src/tool_getparam.c" src/tool_getparam.c | 9 +++++++++
index 1231b3bd6..434e9ddd3 100644 1 file changed, 9 insertions(+)
--- "a/src/tool_getparam.c"
+++ "b/src/tool_getparam.c" diff --git a/src/tool_getparam.c b/src/tool_getparam.c
index d352c80a5..f0c42ddc8 100644
--- a/src/tool_getparam.c
+++ b/src/tool_getparam.c
@@ -23,6 +23,10 @@ @@ -23,6 +23,10 @@
***************************************************************************/ ***************************************************************************/
#include "tool_setup.h" #include "tool_setup.h"
@ -13,7 +16,7 @@ index 1231b3bd6..434e9ddd3 100644
#include "strcase.h" #include "strcase.h"
#include "curlx.h" #include "curlx.h"
@@ -554,8 +558,13 @@ static void cleanarg(argv_item_t str) @@ -557,8 +561,13 @@ static void cleanarg(argv_item_t str)
* argument out so that the username:password is not displayed in the * argument out so that the username:password is not displayed in the
* system process list */ * system process list */
if(str) { if(str) {

4
patch/curl_tool_operate.diff
View File

@ -2,10 +2,10 @@
1 file changed, 6 insertions(+), 2 deletions(-) 1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/tool_operate.c b/src/tool_operate.c diff --git a/src/tool_operate.c b/src/tool_operate.c
index a1212c9dd..d88fa3242 100644 index 2309495d8..2c494e63f 100644
--- a/src/tool_operate.c --- a/src/tool_operate.c
+++ b/src/tool_operate.c +++ b/src/tool_operate.c
@@ -3007,11 +3007,15 @@ static CURLcode cacertpaths(struct OperationConfig *config) @@ -3017,11 +3017,15 @@ static CURLcode cacertpaths(struct OperationConfig *config)
#ifdef _WIN32 #ifdef _WIN32
if(!env) { if(!env) {
#if defined(CURL_CA_SEARCH_SAFE) #if defined(CURL_CA_SEARCH_SAFE)

8
patch/curl_tool_util.diff
View File

@ -3,10 +3,10 @@
2 files changed, 14 insertions(+), 21 deletions(-) 2 files changed, 14 insertions(+), 21 deletions(-)
diff --git a/src/tool_util.c b/src/tool_util.c diff --git a/src/tool_util.c b/src/tool_util.c
index e657dacf0..7044ca008 100644 index 69b1d2b42..00557fdba 100644
--- a/src/tool_util.c --- a/src/tool_util.c
+++ b/src/tool_util.c +++ b/src/tool_util.c
@@ -191,28 +191,21 @@ int tool_ftruncate64(int fd, curl_off_t where) @@ -228,28 +228,21 @@ int tool_ftruncate64(int fd, curl_off_t where)
#endif /* USE_TOOL_FTRUNCATE */ #endif /* USE_TOOL_FTRUNCATE */
#ifdef _WIN32 #ifdef _WIN32
@ -49,10 +49,10 @@ index e657dacf0..7044ca008 100644
} }
diff --git a/src/tool_util.h b/src/tool_util.h diff --git a/src/tool_util.h b/src/tool_util.h
index 9fec7e873..93d7ef9fc 100644 index 9a4e87dc4..8092c1409 100644
--- a/src/tool_util.h --- a/src/tool_util.h
+++ b/src/tool_util.h +++ b/src/tool_util.h
@@ -40,7 +40,7 @@ int struplocompare(const char *p1, const char *p2); @@ -49,7 +49,7 @@ int struplocompare(const char *p1, const char *p2);
int struplocompare4sort(const void *p1, const void *p2); int struplocompare4sort(const void *p1, const void *p2);
#ifdef _WIN32 #ifdef _WIN32