Native Windows curl doesn't create paths with forward slashes #1007
Comments
|
On a similar note, it appears that the MSYS2 version of |
|
So this: https://github.com/curl/curl/blob/master/lib/curl_setup.h#L448 should have some #ifdef logic to detect mingw and then use a forward slash? |
|
Ideally the code should recognise both |
|
I don't think that'd be the fix I want, since if you require paths to be separated by forward slashes with MinGW-w64, then paths like I'd want at least the MinGW-w64 version of FWIW, this command: seems to work if the |
|
The current command line tool logic for this uses only one slash: https://github.com/curl/curl/blob/master/src/tool_dirhie.c#L117 I suppose that function should be fixed to work with backslashes and forward slashes (on windows)? Or do we have this problem elsewhere as well? |
That sounds good to me! |
|
Similar issue may be present on MS-DOS and OS/2. Though I don't have information on how expected it is from tools to transparently accept forward slashes on these systems — probably not very. |
|
@vszakats I don't remember DOS and OS/2 using the forward slash very much for that, but the code should probably be written with a nice #ifdef in there somehow anyway and then the DOS and OS/2 aware people can later switch on that logic if deemed applicable. I don't think we have a very large user base on those operating systems (but yes it exists). @RyanGlScott you feel like taking a stab at writing an improved version of that function? |
|
@bagder Agreed! |
|
Here's my suggested patch (updated since initial post): From b97310641ef8063e6afc89d01bcb5ea04e0b517e Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Tue, 13 Sep 2016 15:20:05 +0200
Subject: [PATCH] curl: make --create-dirs on windows grok both forward and
backward slashes
Reported-by: Ryan Scott
Fixes #1007
---
src/tool_dirhie.c | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/tool_dirhie.c b/src/tool_dirhie.c
index db810d6..23bb2cb 100644
--- a/src/tool_dirhie.c
+++ b/src/tool_dirhie.c
@@ -89,10 +89,18 @@ static void show_dir_errno(FILE *errors, const char *name)
* multi-GETs in file output, ie:
* curl "http://my.site/dir[1-5]/file[1-5].txt" -o "dir#1/file#2.txt"
* should create all the dir* automagically
*/
+#ifdef WIN32
+/* systems that may use either or when specifying a path */
+#define PATH_DELIMITERS "\\/"
+#else
+#define PATH_DELIMITERS DIR_CHAR
+#endif
+
+
CURLcode create_dir_hierarchy(const char *outfile, FILE *errors)
{
char *tempdir;
char *tempdir2;
char *outdup;
@@ -112,22 +120,23 @@ CURLcode create_dir_hierarchy(const char *outfile, FILE *errors)
}
dirbuildup[0] = '\0';
/* Allow strtok() here since this isn't used threaded */
/* !checksrc! disable BANNEDFUNC 2 */
- tempdir = strtok(outdup, DIR_CHAR);
+ tempdir = strtok(outdup, PATH_DELIMITERS);
while(tempdir != NULL) {
- tempdir2 = strtok(NULL, DIR_CHAR);
+ tempdir2 = strtok(NULL, PATH_DELIMITERS);
/* since strtok returns a token for the last word even
if not ending with DIR_CHAR, we need to prune it */
if(tempdir2 != NULL) {
size_t dlen = strlen(dirbuildup);
if(dlen)
snprintf(&dirbuildup[dlen], outlen - dlen, "%s%s", DIR_CHAR, tempdir);
else {
- if(0 != strncmp(outdup, DIR_CHAR, 1))
+ if(outdup == tempdir)
+ /* the output string doesn't start with a separator */
strcpy(dirbuildup, tempdir);
else
snprintf(dirbuildup, outlen, "%s%s", DIR_CHAR, tempdir);
}
if(access(dirbuildup, F_OK) == -1) {
--
2.9.3 |
|
(of course with a |
|
Thanks, @Badger! When I get a chance I'll try this patch out and see if it fixes the issues I've been having. |
|
(and just for the record, I'm @bagder, which the g and d switched!) |
|
That patch works beautifully! |
|
thanks! |
RyanGlScott commentedSep 11, 2016
(Originally reported as https://github.com/Alexpux/MINGW-packages/issues/1707, re-opened here by suggestion)
I did this
I used the native Windows version of
curl(in MSYS2 terms, this ismingw-w64-x86_64-curl) to download a file to a path containing forward slashes, but it failed unexpectedly:I expected the following
I expected it to behave like
curldoes on Linux, or how the MSYS2-built version ofcurlbehaves (i.e., howcurlbehaves in a POSIX emulation layer):A workaround is to convert all the forward slashes (
/) in that path to backslashes (\\):curl/libcurl version
I reproduced this with versions 7.50.1 and 7.50.2.
operating system
Windows 10 (64-bit)
I installed the native Windows version and the MSYS2 version of
curlusingpacman -S mingw-w64-x86_64-curlandpacman -S curl, respectively, but @vszakats reports experiencing the same issue using the Windows version ofcurl-7.50.2available for download from thecurlwebsite.The text was updated successfully, but these errors were encountered: