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 d4a65212490faf20b6f995b82290ae29a07826fe..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     "."
 
@@ -55,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 "
@@ -276,8 +270,10 @@ pop_init (char *host, char *port, char *user, char *proxy, int snoop,
 
        case NOTOK: 
        case DONE: 
-           if (poprint)            
-               fprintf (stderr, "%s\n", response);
+           if (poprint) {
+               fputs(response, stderr);
+                putc('\n', stderr);
+            }
            netsec_shutdown(nsc);
            nsc = NULL;
            return NOTOK;
@@ -602,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;
     }