From 589e0b387b5e93df666b8cb63b755a1583f922fa Mon Sep 17 00:00:00 2001 From: LoRd_MuldeR Date: Fri, 13 Sep 2024 21:32:46 +0200 Subject: [PATCH] Updated patch for new cURL version. --- patch/curl_tool_getparam.diff | 6 +++--- patch/curl_tool_parsecfg.diff | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/patch/curl_tool_getparam.diff b/patch/curl_tool_getparam.diff index 0b80fd6..47669c1 100644 --- a/patch/curl_tool_getparam.diff +++ b/patch/curl_tool_getparam.diff @@ -2,7 +2,7 @@ 1 file changed, 9 insertions(+) diff --git a/src/tool_getparam.c b/src/tool_getparam.c -index 4c9392c..d7310d4 100644 +index be41aa35d..b1b032b9f 100644 --- a/src/tool_getparam.c +++ b/src/tool_getparam.c @@ -23,6 +23,10 @@ @@ -15,8 +15,8 @@ index 4c9392c..d7310d4 100644 + #include "strcase.h" - #define ENABLE_CURLX_PRINTF -@@ -838,8 +842,13 @@ static void cleanarg(argv_item_t str) + #include "curlx.h" +@@ -551,8 +555,13 @@ static void cleanarg(argv_item_t str) * argument out so that the username:password is not displayed in the * system process list */ if(str) { diff --git a/patch/curl_tool_parsecfg.diff b/patch/curl_tool_parsecfg.diff index d55de4e..4e547fc 100644 --- a/patch/curl_tool_parsecfg.diff +++ b/patch/curl_tool_parsecfg.diff @@ -2,10 +2,10 @@ 1 file changed, 16 insertions(+), 26 deletions(-) diff --git a/src/tool_parsecfg.c b/src/tool_parsecfg.c -index d0a3159..6034b17 100644 +index 6da5a9250..e6f7ad786 100644 --- a/src/tool_parsecfg.c +++ b/src/tool_parsecfg.c -@@ -47,29 +47,20 @@ static const char *unslashquote(const char *line, char *param); +@@ -45,29 +45,20 @@ static const char *unslashquote(const char *line, char *param); static bool my_get_line(FILE *fp, struct curlx_dynbuf *, bool *error); #ifdef _WIN32 @@ -47,7 +47,7 @@ index d0a3159..6034b17 100644 } } -@@ -89,7 +80,7 @@ int parseconfig(const char *filename, struct GlobalConfig *global) +@@ -87,7 +78,7 @@ int parseconfig(const char *filename, struct GlobalConfig *global) if(!filename) { /* NULL means load .curlrc from homedir! */ @@ -56,7 +56,7 @@ index d0a3159..6034b17 100644 if(curlrc) { file = fopen(curlrc, FOPEN_READTEXT); if(!file) { -@@ -100,14 +91,13 @@ int parseconfig(const char *filename, struct GlobalConfig *global) +@@ -98,14 +89,13 @@ int parseconfig(const char *filename, struct GlobalConfig *global) } #ifdef _WIN32 /* Windows */ else {