Comment fix.

[~andy/fetchmail] / smtp.c

diff --git a/smtp.c b/smtp.c
index 1ef1183ce4de4d0802cf78b86dd1d9df9e0c161a..5cbfbcd287131d3fcf4947993817449a7dc0c00f 100644 (file)
--- a/smtp.c
+++ b/smtp.c
@@ -11,14 +11,26 @@
 
 #include <stdio.h>
 #include <config.h>
-#include <sys/types.h>
 #include <unistd.h>
 #include <string.h>
-#include "socket.h"
 #include "fetchmail.h"
+#include "socket.h"
 #include "smtp.h"
 
-int smtp_response;     /* numeric value of SMTP response code */
+struct opt
+{
+    char *name;
+    int value;
+};
+
+static struct opt extensions[] =
+{
+    {"8BITMIME",       ESMTP_8BITMIME},
+    {"SIZE",           ESMTP_SIZE},
+    {(char *)NULL, 0},
+};
+
+char smtp_response[MSGBUFSIZE];
 
 int SMTP_helo(FILE *sockfp,char *host)
 /* send a "HELO" message to the SMTP listener */
@@ -27,19 +39,60 @@ int SMTP_helo(FILE *sockfp,char *host)
 
   SockPrintf(sockfp,"HELO %s\r\n", host);
   if (outlevel == O_VERBOSE)
-      fprintf(stderr, "SMTP> HELO %s\n", host);
+      error(0, 0, "SMTP> HELO %s", host);
   ok = SMTP_ok(sockfp);
   return ok;
 }
 
-int SMTP_from(FILE *sockfp, char *from)
+int SMTP_ehlo(FILE *sockfp, char *host, int *opt)
+/* send a "EHLO" message to the SMTP listener, return extension status bits */
+{
+  int ok;
+  char *ip;
+  struct opt *hp;
+
+  SockPrintf(sockfp,"EHLO %s\r\n", host);
+  if (outlevel == O_VERBOSE)
+      error(0, 0, "SMTP> EHLO %s", host);
+  
+  *opt = 0;
+  while ((ip = SockGets(smtp_response, sizeof(smtp_response)-1, sockfp)))
+  {
+      int  n = strlen(ip);
+
+      if (smtp_response[strlen(smtp_response)-1] == '\n')
+         smtp_response[strlen(smtp_response)-1] = '\0';
+      if (smtp_response[strlen(smtp_response)-1] == '\r')
+         smtp_response[strlen(smtp_response)-1] = '\r';
+      if (n < 4)
+         return SM_ERROR;
+      smtp_response[n] = '\0';
+      if (outlevel == O_VERBOSE)
+         error(0, 0, "SMTP< %s", smtp_response);
+      for (hp = extensions; hp->name; hp++)
+         if (!strncasecmp(hp->name, smtp_response+4, strlen(hp->name)))
+             *opt |= hp->value;
+      if ((smtp_response[0] == '1' || smtp_response[0] == '2' || smtp_response[0] == '3') && smtp_response[3] == ' ')
+         return SM_OK;
+      else if (smtp_response[3] != '-')
+         return SM_ERROR;
+  }
+  return SM_UNRECOVERABLE;
+}
+
+int SMTP_from(FILE *sockfp, char *from, char *opts)
 /* send a "MAIL FROM:" message to the SMTP listener */
 {
   int ok;
+  struct opt *hp;
+  char buf[MSGBUFSIZE];
 
-  SockPrintf(sockfp,"MAIL FROM:<%s>\r\n", from);
+  sprintf(buf, "MAIL FROM:<%s>", from);
+  if (opts)
+      strcat(buf, opts);
+  SockPrintf(sockfp,"%s\r\n", buf);
   if (outlevel == O_VERBOSE)
-      fprintf(stderr, "SMTP> MAIL FROM:<%s>\n", from);
+      error(0, 0, "SMTP> %s", buf);
   ok = SMTP_ok(sockfp);
   return ok;
 }
@@ -51,7 +104,7 @@ int SMTP_rcpt(FILE *sockfp, char *to)
 
   SockPrintf(sockfp,"RCPT TO:<%s>\r\n", to);
   if (outlevel == O_VERBOSE)
-      fprintf(stderr, "SMTP> RCPT TO:<%s>\n", to);
+      error(0, 0, "SMTP> RCPT TO:<%s>", to);
   ok = SMTP_ok(sockfp);
   return ok;
 }
@@ -63,7 +116,19 @@ int SMTP_data(FILE *sockfp)
 
   SockPrintf(sockfp,"DATA\r\n");
   if (outlevel == O_VERBOSE)
-      fprintf(stderr, "SMTP> DATA\n");
+      error(0, 0, "SMTP> DATA");
+  ok = SMTP_ok(sockfp);
+  return ok;
+}
+
+int SMTP_rset(FILE *sockfp)
+/* send a "RSET" message to the SMTP listener */
+{
+  int ok;
+
+  SockPrintf(sockfp,"RSET\r\n");
+  if (outlevel == O_VERBOSE)
+      error(0, 0, "SMTP> RSET");
   ok = SMTP_ok(sockfp);
   return ok;
 }
@@ -75,7 +140,7 @@ int SMTP_quit(FILE *sockfp)
 
   SockPrintf(sockfp,"QUIT\r\n");
   if (outlevel == O_VERBOSE)
-      fprintf(stderr, "SMTP> QUIT\n");
+      error(0, 0, "SMTP> QUIT");
   ok = SMTP_ok(sockfp);
   return ok;
 }
@@ -87,7 +152,7 @@ int SMTP_eom(FILE *sockfp)
 
   SockPrintf(sockfp,".\r\n");
   if (outlevel == O_VERBOSE)
-      fprintf(stderr, "SMTP>. (EOM)\n");
+      error(0, 0, "SMTP>. (EOM)");
   ok = SMTP_ok(sockfp);
   return ok;
 }
@@ -95,20 +160,24 @@ int SMTP_eom(FILE *sockfp)
 int SMTP_ok(FILE *sockfp)
 /* returns status of SMTP connection */
 {
-    int  n;
-    char buf[SMTPBUFSIZE];
+    char *ip;
   
-    while ((n = SockGets(buf, sizeof(buf)-1, sockfp)) > 0)
+    while ((ip = SockGets(smtp_response, sizeof(smtp_response)-1, sockfp)))
     {
+       int  n = strlen(ip);
+
+       if (smtp_response[strlen(smtp_response)-1] == '\n')
+           smtp_response[strlen(smtp_response)-1] = '\0';
+       if (smtp_response[strlen(smtp_response)-1] == '\r')
+           smtp_response[strlen(smtp_response)-1] = '\r';
        if (n < 4)
            return SM_ERROR;
-       buf[n] = '\0';
+       smtp_response[n] = '\0';
        if (outlevel == O_VERBOSE)
-           fprintf(stderr, "SMTP< %s\n", buf);
-       smtp_response = atoi(buf);
-       if ((buf[0] == '1' || buf[0] == '2' || buf[0] == '3') && buf[3] == ' ')
+           error(0, 0, "SMTP< %s", smtp_response);
+       if ((smtp_response[0] == '1' || smtp_response[0] == '2' || smtp_response[0] == '3') && smtp_response[3] == ' ')
            return SM_OK;
-       else if (buf[3] != '-')
+       else if (smtp_response[3] != '-')
            return SM_ERROR;
     }
     return SM_UNRECOVERABLE;