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

smtp: Simplify the MAIL command and avoid a duplication of send strings

Browse source 
This avoids the duplication of strings when the optional AUTH and SIZE
parameters are required. It also assists with the modifications that
are part of #4892.

Closes #4903
This commit is contained in:
Steve Holme 2020-02-09 15:50:57 +00:00
parent 02f8de6516
commit 0b8651d48b
No known key found for this signature in database
GPG key ID: 4059CB85CA7E8F19
1 changed files with 7 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

19
lib/smtp.c
View file

@ -584,18 +584,13 @@ static CURLcode smtp_perform_mail(struct connectdata *conn)
}
/* Send the MAIL command */
if(!auth && !size)
result = Curl_pp_sendf(&conn->proto.smtpc.pp,
"MAIL FROM:%s", from);
else if(auth && !size)
result = Curl_pp_sendf(&conn->proto.smtpc.pp,
"MAIL FROM:%s AUTH=%s", from, auth);
else if(auth && size)
result = Curl_pp_sendf(&conn->proto.smtpc.pp,
"MAIL FROM:%s AUTH=%s SIZE=%s", from, auth, size);
else
result = Curl_pp_sendf(&conn->proto.smtpc.pp,
"MAIL FROM:%s SIZE=%s", from, size);
result = Curl_pp_sendf(&conn->proto.smtpc.pp,
"MAIL FROM:%s%s%s%s%s",
from, /* Mandatory */
auth ? " AUTH=" : "", /* Optional (on AUTH support) */
auth ? auth : "",
size ? " SIZE=" : "", /* Optional (on SIZE support) */
size ? size : "");
free(from);
free(auth);