X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/47e4d2685ab31e71336a7806fdc3dcd2a107f60f..63621a81d16ab743de6b57d47578a9a2c670ad22:/uip/popsbr.c

diff --git a/uip/popsbr.c b/uip/popsbr.c
index 0d655b84..a9319054 100644
--- a/uip/popsbr.c
+++ b/uip/popsbr.c
@@ -12,6 +12,7 @@
 
 #include <h/popsbr.h>
 #include <h/signals.h>
+#include "sbr/base64.h"
 
 #define	TRM	"."
 
@@ -24,11 +25,12 @@ static netsec_context *nsc = NULL;
  * static prototypes
  */
 
-static int command(const char *, ...);
+static int command(const char *, ...) CHECK_PRINTF(1, 2);
 static int multiline(void);
 
-static int traverse (int (*)(char *), const char *, ...);
-static int vcommand(const char *, va_list);
+static int traverse(int (*)(void *, char *), void *closure,
+    const char *, ...) CHECK_PRINTF(3, 4);
+static int vcommand(const char *, va_list) CHECK_PRINTF(1, 0);
 static int pop_getline (char *, int, netsec_context *);
 static int pop_sasl_callback(enum sasl_message_type, unsigned const char *,
 			     unsigned int, unsigned char **, unsigned int *,
@@ -54,23 +56,16 @@ check_mech(char *server_mechs, size_t server_mechs_size)
 	return NOTOK;
     }
 
-    while ((status = multiline()) != DONE)
-	switch (status) {
-	case NOTOK:
+    while ((status = multiline()) != DONE) {
+        if (status == NOTOK)
 	    return NOTOK;
-	    break;
-	case DONE:	/* Shouldn't be possible, but just in case */
-	    break;
-	case OK:
-	    if (strncasecmp(response, "SASL ", 5) == 0) {
-		/*
-		 * We've seen the SASL capability.  Grab the mech list
-		 */
-		sasl_capability++;
-		strncpy(server_mechs, response + 5, server_mechs_size);
-	    }
-	    break;
-	}
+
+        if (strncasecmp(response, "SASL ", 5) == 0) {
+            /* We've seen the SASL capability.  Grab the mech list. */
+            sasl_capability++;
+            strncpy(server_mechs, response + 5, server_mechs_size);
+        }
+    }
 
     if (!sasl_capability) {
 	snprintf(response, sizeof(response), "POP server does not support "
@@ -275,9 +270,11 @@ pop_init (char *host, char *port, char *user, char *proxy, int snoop,
 
 	case NOTOK: 
 	case DONE: 
-	    if (poprint)	    
-		fprintf (stderr, "%s\n", response);
-	    netsec_shutdown(nsc, 1);
+	    if (poprint) {
+		fputs(response, stderr);
+                putc('\n', stderr);
+            }
+	    netsec_shutdown(nsc);
 	    nsc = NULL;
 	    return NOTOK;
     }
@@ -481,66 +478,14 @@ pop_stat (int *nmsgs, int *nbytes)
 
 
 int
-pop_list (int msgno, int *nmsgs, int *msgs, int *bytes)
-{
-    int i;
-    int *ids = NULL;
-
-    if (msgno) {
-	if (command ("LIST %d", msgno) == NOTOK)
-	    return NOTOK;
-	*msgs = *bytes = 0;
-	if (ids) {
-	    *ids = 0;
-	    sscanf (response, "+OK %d %d %d", msgs, bytes, ids);
-	}
-	else
-	    sscanf (response, "+OK %d %d", msgs, bytes);
-	return OK;
-    }
-
-    if (command ("LIST") == NOTOK)
-	return NOTOK;
-
-    for (i = 0; i < *nmsgs; i++)
-	switch (multiline ()) {
-	    case NOTOK: 
-		return NOTOK;
-	    case DONE: 
-		*nmsgs = ++i;
-		return OK;
-	    case OK: 
-		*msgs = *bytes = 0;
-		if (ids) {
-		    *ids = 0;
-		    sscanf (response, "%d %d %d",
-			    msgs++, bytes++, ids++);
-		}
-		else
-		    sscanf (response, "%d %d", msgs++, bytes++);
-		break;
-	}
-    for (;;)
-	switch (multiline ()) {
-	    case NOTOK: 
-		return NOTOK;
-	    case DONE: 
-		return OK;
-	    case OK: 
-		break;
-	}
-}
-
-
-int
-pop_retr (int msgno, int (*action)(char *))
+pop_retr (int msgno, int (*action)(void *, char *), void *closure)
 {
-    return traverse (action, "RETR %d", msgno);
+    return traverse (action, closure, "RETR %d", msgno);
 }
 
 
 static int
-traverse (int (*action)(char *), const char *fmt, ...)
+traverse (int (*action)(void *, char *), void *closure, const char *fmt, ...)
 {
     int result, snoopstate;
     va_list ap;
@@ -557,21 +502,21 @@ traverse (int (*action)(char *), const char *fmt, ...)
     if ((snoopstate = netsec_get_snoop(nsc)))
 	netsec_set_snoop(nsc, 0);
 
-    for (;;)
-	switch (multiline ()) {
-	    case NOTOK: 
-		netsec_set_snoop(nsc, snoopstate);
-		return NOTOK;
-
-	    case DONE: 
-		strncpy (response, buffer, sizeof(response));
-		netsec_set_snoop(nsc, snoopstate);
-		return OK;
+    for (;;) {
+        result = multiline();
+        if (result == OK) {
+            result = (*action)(closure, response);
+            if (result == OK)
+                continue;
+        } else if (result == DONE) {
+            strncpy(response, buffer, sizeof(response));
+            result = OK;
+        }
+        break;
+    }
 
-	    case OK: 
-		(*action) (response);
-		break;
-	}
+    netsec_set_snoop(nsc, snoopstate);
+    return result;
 }
 
 
@@ -582,27 +527,6 @@ pop_dele (int msgno)
 }
 
 
-int
-pop_noop (void)
-{
-    return command ("NOOP");
-}
-
-
-int
-pop_rset (void)
-{
-    return command ("RSET");
-}
-
-
-int
-pop_top (int msgno, int lines, int (*action)(char *))
-{
-    return traverse (action, "TOP %d %d", msgno, lines);
-}
-
-
 int
 pop_quit (void)
 {
@@ -619,7 +543,7 @@ int
 pop_done (void)
 {
     if (nsc)
-	netsec_shutdown(nsc, 1);
+	netsec_shutdown(nsc);
 
     return OK;
 }
@@ -674,8 +598,10 @@ vcommand (const char *fmt, va_list ap)
 
 	case NOTOK: 
 	case DONE: 
-	    if (poprint)	    
-		fprintf (stderr, "%s\n", response);
+	    if (poprint) {
+		fputs(response, stderr);
+                putc('\n', stderr);
+            }
 	    return NOTOK;
     }