1
0
mirror of https://github.com/moparisthebest/curl synced 2024-12-22 08:08:50 -05:00

Franois Pons brought a patch that once again made curl deal with ftp and

"double slash" as indicating the root directory. In the RFC1738-fix of April
30, that ability was removed (since it is not the "right" way).
This commit is contained in:
Daniel Stenberg 2003-07-28 08:50:02 +00:00
parent 9301bc3444
commit d9246ff24d

View File

@ -2134,12 +2134,16 @@ CURLcode Curl_ftp(struct connectdata *conn)
/* parse the URL path into separate path components */ /* parse the URL path into separate path components */
while((slash_pos=strchr(cur_pos, '/'))) { while((slash_pos=strchr(cur_pos, '/'))) {
/* 1 or 0 to indicate absolute directory */
bool absolute_dir = (cur_pos - conn->ppath > 0) && (path_part == 0);
/* seek out the next path component */ /* seek out the next path component */
if (slash_pos-cur_pos) { if (slash_pos-cur_pos) {
/* we skip empty path components, like "x//y" since the FTP command CWD /* we skip empty path components, like "x//y" since the FTP command CWD
requires a parameter and a non-existant parameter a) doesn't work on requires a parameter and a non-existant parameter a) doesn't work on
many servers and b) has no effect on the others. */ many servers and b) has no effect on the others. */
ftp->dirs[path_part] = curl_unescape(cur_pos,slash_pos-cur_pos); ftp->dirs[path_part] = curl_unescape(cur_pos - absolute_dir,
slash_pos - cur_pos + absolute_dir);
if (!ftp->dirs[path_part]) { /* run out of memory ... */ if (!ftp->dirs[path_part]) { /* run out of memory ... */
failf(data, "no memory"); failf(data, "no memory");