Updated patch for new cURL version.
This commit is contained in:
parent
d18092c62a
commit
589e0b387b
@ -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) {
|
||||
|
@ -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 {
|
||||
|
Loading…
Reference in New Issue
Block a user