inc/test-eom-align: Replace case on $MBOX_TYPE with interpolation.

[nmh] / uip / popsbr.c

diff --git a/uip/popsbr.c b/uip/popsbr.c
index c5af09dd0421d25b10263a60096f7c116cb0647f..d79c8b3d2f628bfbefb5fd4a8139b284c752c181 100644 (file)
--- a/uip/popsbr.c
+++ b/uip/popsbr.c
@@ -12,7 +12,7 @@
 
 #include <h/popsbr.h>
 #include <h/signals.h>
-#include "../sbr/base64.h"
+#include "sbr/base64.h"
 
 #define        TRM     "."
 
@@ -108,7 +108,7 @@ parse_proxy(char *proxy, char *host)
 
    /* put together list of arguments */
     p = pargv = mh_xmalloc(pargc * sizeof(char *));
-    c = *pargv = mh_xmalloc(plen * sizeof(char));
+    c = *pargv = mh_xmalloc(plen);
     for (cur = pro; *cur; cur++) {
         if (isspace(*cur) && cur[1] && !isspace(cur[1])) {
            *c++ = '\0';
@@ -182,7 +182,7 @@ pop_init (char *host, char *port, char *user, char *proxy, int snoop,
           close(1);
           free(*argv);
           free(argv);
-          exit(10);
+          exit(1);
        }
 
        /* okay in the parent we do some stuff */
@@ -270,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;
@@ -592,12 +594,14 @@ vcommand (const char *fmt, va_list ap)
        case OK: 
            if (poprint)
                fprintf (stderr, "<--- %s\n", response);
-           return (*response == '+' ? OK : NOTOK);
+           return *response == '+' ? OK : NOTOK;
 
        case NOTOK: 
        case DONE: 
-           if (poprint)            
-               fprintf (stderr, "%s\n", response);
+           if (poprint) {
+               fputs(response, stderr);
+                putc('\n', stderr);
+            }
            return NOTOK;
     }