moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

curl: make --create-dirs on windows grok both forward and backward slashes 

Reported-by: Ryan Scott

Fixes #1007
This commit is contained in:
Daniel Stenberg 2016-09-13 15:20:05 +02:00
parent 4a35bbbe8e
commit ffa0709a88
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/tool_dirhie.c
View File

@ -91,6 +91,14 @@ static void show_dir_errno(FILE *errors, const char *name)
* 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;
@ -114,10 +122,10 @@ CURLcode create_dir_hierarchy(const char *outfile, FILE *errors)
/* 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) {
@ -125,7 +133,8 @@ CURLcode create_dir_hierarchy(const char *outfile, FILE *errors)
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);