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

smtp: Moved smtp_rcpt_to() to be with the other perform functions

Browse Source
This commit is contained in:
Steve Holme 2013-04-16 19:32:55 +01:00
parent 8093f9541e
commit e621a5f6ea
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
lib/smtp.c
View File

@ -569,6 +569,27 @@ static CURLcode smtp_mail(struct connectdata *conn)
return result; return result;
} }
static CURLcode smtp_rcpt_to(struct connectdata *conn)
{
CURLcode result = CURLE_OK;
struct SessionHandle *data = conn->data;
struct SMTP *smtp = data->state.proto.smtp;
/* Send the RCPT TO command */
if(smtp->rcpt) {
if(smtp->rcpt->data[0] == '<')
result = Curl_pp_sendf(&conn->proto.smtpc.pp, "RCPT TO:%s",
smtp->rcpt->data);
else
result = Curl_pp_sendf(&conn->proto.smtpc.pp, "RCPT TO:<%s>",
smtp->rcpt->data);
if(!result)
state(conn, SMTP_RCPT);
}
return result;
}
/* For the initial server greeting */ /* For the initial server greeting */
static CURLcode smtp_state_servergreet_resp(struct connectdata *conn, static CURLcode smtp_state_servergreet_resp(struct connectdata *conn,
int smtpcode, int smtpcode,
@ -1006,27 +1027,6 @@ static CURLcode smtp_state_auth_final_resp(struct connectdata *conn,
return result; return result;
} }
static CURLcode smtp_rcpt_to(struct connectdata *conn)
{
CURLcode result = CURLE_OK;
struct SessionHandle *data = conn->data;
struct SMTP *smtp = data->state.proto.smtp;
/* Send the RCPT TO command */
if(smtp->rcpt) {
if(smtp->rcpt->data[0] == '<')
result = Curl_pp_sendf(&conn->proto.smtpc.pp, "RCPT TO:%s",
smtp->rcpt->data);
else
result = Curl_pp_sendf(&conn->proto.smtpc.pp, "RCPT TO:<%s>",
smtp->rcpt->data);
if(!result)
state(conn, SMTP_RCPT);
}
return result;
}
/* For MAIL responses */ /* For MAIL responses */
static CURLcode smtp_state_mail_resp(struct connectdata *conn, int smtpcode, static CURLcode smtp_state_mail_resp(struct connectdata *conn, int smtpcode,
smtpstate instate) smtpstate instate)