moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-08-13 17:03:50 -04:00
Code Issues Releases Wiki Activity

smtp: Post SMTP command expansion tidy up

Browse Source 
Removed unnecessary SMTP_STOP state changes on failure.

Removed hard return on failure in smtp_state_data_resp().
This commit is contained in:
Steve Holme 2013-11-23 09:35:35 +00:00
parent 9f18cf15d5
commit 5ee64be9c6
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/smtp.c
View File

@ -1319,7 +1319,6 @@ static CURLcode smtp_state_mail_resp(struct connectdata *conn, int smtpcode,
if(smtpcode/100 != 2) { if(smtpcode/100 != 2) {
failf(data, "MAIL failed: %d", smtpcode); failf(data, "MAIL failed: %d", smtpcode);
result = CURLE_SEND_ERROR; result = CURLE_SEND_ERROR;
state(conn, SMTP_STOP);
} }
else else
/* Start the RCPT TO command */ /* Start the RCPT TO command */
@ -1341,7 +1340,6 @@ static CURLcode smtp_state_rcpt_resp(struct connectdata *conn, int smtpcode,
if(smtpcode/100 != 2) { if(smtpcode/100 != 2) {
failf(data, "RCPT failed: %d", smtpcode); failf(data, "RCPT failed: %d", smtpcode);
result = CURLE_SEND_ERROR; result = CURLE_SEND_ERROR;
state(conn, SMTP_STOP);
} }
else { else {
smtp->rcpt = smtp->rcpt->next; smtp->rcpt = smtp->rcpt->next;
@ -1365,25 +1363,27 @@ static CURLcode smtp_state_rcpt_resp(struct connectdata *conn, int smtpcode,
static CURLcode smtp_state_data_resp(struct connectdata *conn, int smtpcode, static CURLcode smtp_state_data_resp(struct connectdata *conn, int smtpcode,
smtpstate instate) smtpstate instate)
{ {
CURLcode result = CURLE_OK;
struct SessionHandle *data = conn->data; struct SessionHandle *data = conn->data;
(void)instate; /* no use for this yet */ (void)instate; /* no use for this yet */
if(smtpcode != 354) { if(smtpcode != 354) {
failf(data, "DATA failed: %d", smtpcode);
result = CURLE_SEND_ERROR;
}
else {
/* Set the progress upload size */
Curl_pgrsSetUploadSize(data, data->set.infilesize);
/* SMTP upload */
Curl_setup_transfer(conn, -1, -1, FALSE, NULL, FIRSTSOCKET, NULL);
/* End of DO phase */
state(conn, SMTP_STOP); state(conn, SMTP_STOP);
return CURLE_SEND_ERROR;
} }
/* Set the progress upload size */ return result;
Curl_pgrsSetUploadSize(data, data->set.infilesize);
/* SMTP upload */
Curl_setup_transfer(conn, -1, -1, FALSE, NULL, FIRSTSOCKET, NULL);
/* End of DO phase */
state(conn, SMTP_STOP);
return CURLE_OK;
} }
/* For POSTDATA responses, which are received after the entire DATA /* For POSTDATA responses, which are received after the entire DATA