Merge branch 'legacy_63'

[~andy/fetchmail] / etrn.c

diff --git a/etrn.c b/etrn.c
index 7f5e882d29b1268741283c3deca2a921672786ee..24c532d306607967af0c7dd47ea1128ac1b09988 100644 (file)
--- a/etrn.c
+++ b/etrn.c
@@ -9,13 +9,10 @@
 #include  <stdio.h>
 #include  <stdlib.h>
 #include  <assert.h>
-#ifdef HAVE_NET_SOCKET_H /* BeOS needs this */
-#include <net/socket.h>
-#endif
 #include  <netdb.h>
 #include  <errno.h>
 #include  <unistd.h>
-#include  "i18n.h"
+#include  "gettext.h"
 #include  "fetchmail.h"
 #include  "smtp.h"
 #include  "socket.h"
@@ -25,7 +22,8 @@ static int etrn_ok (int sock, char *argbuf)
 {
     int ok;
 
-    ok = SMTP_ok(sock);
+    (void)argbuf;
+    ok = SMTP_ok(sock, SMTP_MODE, TIMEOUT_DEFAULT);
     if (ok == SM_UNRECOVERABLE)
        return(PS_PROTOCOL);
     else
@@ -40,7 +38,8 @@ static int etrn_getrange(int sock, struct query *ctl, const char *id,
     char buf [MSGBUFSIZE+1];
     struct idlist *qnp;                /* pointer to Q names */
 
-    if ((ok = SMTP_ehlo(sock, fetchmailhost, 
+    (void)id;
+    if ((ok = SMTP_ehlo(sock, SMTP_MODE, fetchmailhost,
                        ctl->server.esmtp_name, ctl->server.esmtp_password,
                        &opts)))
     {
@@ -116,30 +115,29 @@ static int etrn_getrange(int sock, struct query *ctl, const char *id,
 static int etrn_logout(int sock, struct query *ctl)
 /* send logout command */
 {
+    (void)ctl;
     return(gen_transact(sock, "QUIT"));
 }
 
-const static struct method etrn =
+static const struct method etrn =
 {
     "ETRN",            /* ESMTP ETRN extension */
-#if INET6_ENABLE
     "smtp",            /* standard SMTP port */
     "smtps",           /* ssl SMTP port */
-#else /* INET6_ENABLE */
-    25,                        /* standard SMTP port */
-    465,                       /* ssl SMTP port */
-#endif /* INET6_ENABLE */
     FALSE,             /* this is not a tagged protocol */
     FALSE,             /* this does not use a message delimiter */
     etrn_ok,           /* parse command response */
     NULL,              /* no need to get authentication */
     etrn_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 */
+    NULL,              /* no mailbox support */
     etrn_logout,       /* log out, we're done */
     FALSE,             /* no, we can't re-poll */
 };
@@ -158,7 +156,7 @@ int doETRN (struct query *ctl)
        return(PS_SYNTAX);
     }
     if (ctl->mailboxes->id) {
-       fprintf(stderr, GT_("Option --remote is not supported with ETRN\n"));
+       fprintf(stderr, GT_("Option --folder is not supported with ETRN\n"));
        return(PS_SYNTAX);
     }
     if (check_only) {