Update.

[~andy/fetchmail] / odmr.c

diff --git a/odmr.c b/odmr.c
index d08b13d0c8e82f5d367bc93dc4dad9c22a21bb53..b97a73bafd35dbd89c96dea3fdf190366b0caf83 100644 (file)
--- a/odmr.c
+++ b/odmr.c
@@ -16,10 +16,12 @@
 #include <net/socket.h>
 #endif
 #include  <sys/types.h>
-#include  <sys/time.h>
 #ifdef HAVE_NET_SELECT_H /* AIX needs this */
 #include <net/select.h>
 #endif
+#ifdef HAVE_SYS_SELECT_H /* AIX 4.1, at least, needs this */
+#include  <sys/select.h>
+#endif
 #include  <netdb.h>
 #include  <errno.h>
 #include  <unistd.h>
@@ -45,18 +47,21 @@ static int odmr_getrange(int sock, struct query *ctl, const char *id,
 /* send ODMR and then run a reverse SMTP session */
 {
     int ok, opts, smtp_sock;
+    int doing_smtp_data = 0;   /* Are we in SMTP DATA state? */
     char buf [MSGBUFSIZE+1];
     struct idlist *qnp;                /* pointer to Q names */
 
-    if ((ok = SMTP_ehlo(sock, fetchmailhost, &opts)))
+    if ((ok = SMTP_ehlo(sock, fetchmailhost, 
+                       ctl->server.esmtp_name, ctl->server.esmtp_password,
+                       &opts)))
     {
-       report(stderr, _("%s's SMTP listener does not support ESMTP\n"),
+       report(stderr, GT_("%s's SMTP listener does not support ESMTP\n"),
              ctl->server.pollname);
        return(ok);
     }
     else if (!(opts & ESMTP_ATRN))
     {
-       report(stderr, _("%s's SMTP listener does not support ATRN\n"),
+       report(stderr, GT_("%s's SMTP listener does not support ATRN\n"),
              ctl->server.pollname);
        return(PS_PROTOCOL);
     }
@@ -93,33 +98,34 @@ static int odmr_getrange(int sock, struct query *ctl, const char *id,
     switch(atoi(buf))
     {
     case 250:  /* OK, turnaround is about to happe */
-       if (outlevel >= O_SILENT)
-           report(stdout, _("Turnaround now...\n"));
+       if (outlevel > O_SILENT)
+           report(stdout, GT_("Turnaround now...\n"));
        break;
 
     case 450:  /* ATRN request refused */
-       if (outlevel >= O_SILENT)
-           report(stdout, _("ATRN request refused.\n"));
+       if (outlevel > O_SILENT)
+           report(stdout, GT_("ATRN request refused.\n"));
        return(PS_PROTOCOL);
 
     case 451:  /* Unable to process ATRN request now */
-       report(stderr, _("Unable to process ATRN request now\n"));
+       report(stderr, GT_("Unable to process ATRN request now\n"));
        return(PS_EXCLUDE);
 
     case 453:  /* You have no mail */
-       report(stderr, _("You have no mail.\n"));
+       if (outlevel > O_SILENT)
+           report(stderr, GT_("You have no mail.\n"));
        return(PS_NOMAIL);
 
     case 502:  /* Command not implemented */
-       report(stderr, _("Command not implemented\n"));
+       report(stderr, GT_("Command not implemented\n"));
        return(PS_PROTOCOL);
 
     case 530:  /* Authentication required */
-       report(stderr, _("Authentication required.\n"));
+       report(stderr, GT_("Authentication required.\n"));
        return(PS_AUTHFAIL);
 
     default:
-       report(stderr, _("Unknown ODMR error %d\n"), atoi(buf));
+       report(stderr, GT_("Unknown ODMR error %d\n"), atoi(buf));
        return(PS_PROTOCOL);
     }
 
@@ -159,8 +165,8 @@ static int odmr_getrange(int sock, struct query *ctl, const char *id,
                    break;
 
                SockWrite(smtp_sock, buf, n);
-               if (outlevel >= O_MONITOR)
-                   report(stdout, "ODMR< %s\n", buf);
+               if (outlevel >= O_MONITOR && !doing_smtp_data)
+                   report(stdout, "ODMR< %s", buf);
            }
            if (FD_ISSET(smtp_sock, &readfds))
            {
@@ -170,7 +176,17 @@ static int odmr_getrange(int sock, struct query *ctl, const char *id,
 
                SockWrite(sock, buf, n);
                if (outlevel >= O_MONITOR)
-                   report(stdout, "ODMR> %s\n", buf);
+                   report(stdout, "ODMR> %s", buf);
+
+               /* We are about to receive message data if the local MTA
+                * sends 354 (after receiving DATA) */
+               if (!doing_smtp_data && !strncmp(buf, "354", 3))
+               {
+                   doing_smtp_data = 1;
+                   report(stdout, "receiving message data\n");
+               }
+               else if (doing_smtp_data)
+                   doing_smtp_data = 0;
            }
        }
        SockClose(smtp_sock);
@@ -191,10 +207,10 @@ static int odmr_logout(int sock, struct query *ctl)
        return(PS_SUCCESS);
 }
 
-const static struct method odmr =
+static const struct method odmr =
 {
     "ODMR",            /* ODMR protocol */
-#if INET6_ENABLE
+#ifdef INET6_ENABLE
     "odmr",            /* standard SMTP port */
     "odmrs",           /* ssl SMTP port */
 #else /* INET6_ENABLE */
@@ -207,11 +223,13 @@ const static struct method odmr =
     NULL,              /* no need to get authentication */
     odmr_getrange,     /* initialize message sending */
     NULL,              /* we cannot get a list of sizes */
+    NULL,              /* we cannot get a list of sizes of subsets */
     NULL,              /* how do we tell a message is old? */
     NULL,              /* no way to fetch headers */
     NULL,              /* no way to fetch body */
     NULL,              /* no message trailer */
     NULL,              /* how to delete a message */
+    NULL,              /* how to mark a message as seen */
     odmr_logout,       /* log out, we're done */
     FALSE,             /* no, we can't re-poll */
 };
@@ -222,19 +240,19 @@ int doODMR (struct query *ctl)
     int status;
 
     if (ctl->keep) {
-       fprintf(stderr, _("Option --keep is not supported with ODMR\n"));
+       fprintf(stderr, GT_("Option --keep is not supported with ODMR\n"));
        return(PS_SYNTAX);
     }
     if (ctl->flush) {
-       fprintf(stderr, _("Option --flush is not supported with ODMR\n"));
+       fprintf(stderr, GT_("Option --flush is not supported with ODMR\n"));
        return(PS_SYNTAX);
     }
     if (ctl->mailboxes->id) {
-       fprintf(stderr, _("Option --remote is not supported with ODMR\n"));
+       fprintf(stderr, GT_("Option --remote is not supported with ODMR\n"));
        return(PS_SYNTAX);
     }
     if (check_only) {
-       fprintf(stderr, _("Option --check is not supported with ODMR\n"));
+       fprintf(stderr, GT_("Option --check is not supported with ODMR\n"));
        return(PS_SYNTAX);
     }
     peek_capable = FALSE;