lock_file.c: close(2) file descriptor on failure, avoiding leak.

[nmh] / uip / popsbr.c

diff --git a/uip/popsbr.c b/uip/popsbr.c
index 14bc9fc1fe5c73c5afdce3b54e6bdda9f30fd8c4..a93190541f48e2c4a04e9649211c837e40fcaebd 100644 (file)
--- 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,14 +478,14 @@ pop_stat (int *nmsgs, int *nbytes)
 
 
 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;
@@ -505,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;
 }
 
 
@@ -546,7 +543,7 @@ int
 pop_done (void)
 {
     if (nsc)
-       netsec_shutdown(nsc, 1);
+       netsec_shutdown(nsc);
 
     return OK;
 }
@@ -601,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;
     }