romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-05 03:36:14 +03:00
Code Issues Projects Releases Packages Wiki Activity

FTP quote commands prefixed with '*' now can fail without aborting

Browse source 
Prefixing the FTP quote commands with an asterisk really only
worked for the postquote actions. This is now fixed and test case
227 has been extended to verify.
This commit is contained in:
Daniel Stenberg 2010-04-09 16:54:52 +02:00
parent 10977f57de
commit 02892e4fd8
4 changed files with 27 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

19
lib/ftp.c
View file

@ -1424,6 +1424,12 @@ static CURLcode ftp_state_quote(struct connectdata *conn,
break;
}
/*
* This state uses:
* 'count1' to iterate over the commands to send
* 'count2' to store wether to allow commands to fail
*/
if(init)
ftpc->count1 = 0;
else
@ -1438,7 +1444,15 @@ static CURLcode ftp_state_quote(struct connectdata *conn,
i++;
}
if(item) {
PPSENDF(&ftpc->pp, "%s", item->data);
char *cmd = item->data;
if(cmd[0] == '*') {
cmd++;
ftpc->count2 = 1; /* the sent command is allowed to fail */
}
else
ftpc->count2 = 0; /* failure means cancel operation */
PPSENDF(&ftpc->pp, "%s", cmd);
state(conn, instate);
quote = TRUE;
}
@ -2658,7 +2672,8 @@ static CURLcode ftp_statemach_act(struct connectdata *conn)
case FTP_POSTQUOTE:
case FTP_RETR_PREQUOTE:
case FTP_STOR_PREQUOTE:
if(ftpcode >= 400) {
if((ftpcode >= 400) && !ftpc->count2) {
/* failure reponse code, and not allowed to fail */
failf(conn->data, "QUOT command failed with %03d", ftpcode);
return CURLE_QUOTE_ERROR;
}