commit a2182359646f8f7ee457aec75f45e36f016c3b0f
author Daniel Stenberg <daniel@haxx.se> Fri Dec 25 22:50:11 2009 +0000
committer Daniel Stenberg <daniel@haxx.se> Fri Dec 25 22:50:11 2009 +0000
tree 5409648957c6e860a8e013e6547496ed294e02bd
parent 73ad32e1252af34de0df8ae0c41bc0694cff9e47

first shot at actually doing the SMTP upload as well, not doing the proper
end-of-body treatment

lib/smtp.c

diff --git a/lib/smtp.c b/lib/smtp.c
index 074d9e7..44e405e 100644
--- a/lib/smtp.c
+++ b/lib/smtp.c
@@ -321,7 +321,7 @@
   struct SessionHandle *data = conn->data;
 
   /* send MAIL */
-  result = Curl_pp_sendf(&conn->proto.smtpc.pp, "MAIL FROM:<%s>",
+  result = Curl_pp_sendf(&conn->proto.smtpc.pp, "MAIL FROM:%s",
                          data->set.str[STRING_MAIL_FROM]);
   if(result)
     return result;
@@ -346,7 +346,7 @@
   }
   else {
     /* send RCPT TO */
-    result = Curl_pp_sendf(&conn->proto.smtpc.pp, "RCPT TO:<%s>",
+    result = Curl_pp_sendf(&conn->proto.smtpc.pp, "RCPT TO:%s",
                            data->set.str[STRING_MAIL_RCPT]);
     if(result)
       return result;
@@ -392,15 +392,14 @@
 
   (void)instate; /* no use for this yet */
 
-  if(smtpcode/100 != 2) {
+  if(smtpcode != 354) {
     state(conn, SMTP_STOP);
     return CURLE_RECV_ERROR;
   }
 
   /* SMTP upload */
-  result=Curl_setup_transfer(conn, FIRSTSOCKET, -1, FALSE,
-                             smtp->bytecountp,
-                             -1, NULL); /* no upload here */
+  result = Curl_setup_transfer(conn, -1, -1, FALSE, NULL, /* no download */
+                               FIRSTSOCKET, smtp->bytecountp);
 
   state(conn, SMTP_STOP);
   return result;