generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

when the file name given to -T is used to build an upload path, the local

Browse Source 
directory part is now stripped off and only the actual file name part will be
used
This commit is contained in:
Daniel Stenberg 2001-12-11 00:48:55 +00:00
parent 1c99c4ad11
commit c63ca99c1c
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main.c
View File

@ -2091,17 +2091,29 @@ operate(struct Configurable *config, int argc, char *argv[])
to be able to do so, we have to create a new URL in another to be able to do so, we have to create a new URL in another
buffer.*/ buffer.*/
urlbuffer=(char *)malloc(strlen(url) + strlen(config->infile) + 3); /* We only want the part of the local path that is on the right
side of the rightmost slash and backslash. */
char *filep = strrchr(config->infile, '/');
char *file2 = strrchr(filep?filep:config->infile, '\\');
if(file2)
filep = file2+1;
else if(filep)
filep++;
else
filep = config->infile;
urlbuffer=(char *)malloc(strlen(url) + strlen(filep) + 3);
if(!urlbuffer) { if(!urlbuffer) {
helpf("out of memory\n"); helpf("out of memory\n");
return CURLE_OUT_OF_MEMORY; return CURLE_OUT_OF_MEMORY;
} }
if(ptr) if(ptr)
/* there is a trailing slash on the URL */ /* there is a trailing slash on the URL */
sprintf(urlbuffer, "%s%s", url, config->infile); sprintf(urlbuffer, "%s%s", url, filep);
else else
/* thers is no trailing slash on the URL */ /* thers is no trailing slash on the URL */
sprintf(urlbuffer, "%s/%s", url, config->infile); sprintf(urlbuffer, "%s/%s", url, filep);
url = urlbuffer; /* use our new URL instead! */ url = urlbuffer; /* use our new URL instead! */
} }