showfile.c: Move interface to own file.

[nmh] / uip / popsbr.c

diff --git a/uip/popsbr.c b/uip/popsbr.c
index ca6599e0352e3e69e54725ee2def76e31dc3738b..02e10e6e6a3776b12bf67d81d3b94896c1ba0164 100644 (file)
--- a/uip/popsbr.c
+++ b/uip/popsbr.c
@@ -5,13 +5,17 @@
  * complete copyright information.
  */
 
  * complete copyright information.
  */
 

-#include <h/mh.h>
-#include <h/utils.h>
-#include <h/oauth.h>
-#include <h/netsec.h>
-
-#include <h/popsbr.h>
-#include <h/signals.h>
+#include "h/mh.h"
+#include "sbr/credentials.h"
+#include "sbr/client.h"
+#include "sbr/error.h"
+#include "h/utils.h"
+#include "h/oauth.h"
+#include "h/netsec.h"
+
+#include "h/popsbr.h"
+#include "h/signals.h"
+#include "sbr/base64.h"

 
 #define        TRM     "."
 
 
 #define        TRM     "."
 


@@ -24,20 +28,22 @@ static netsec_context *nsc = NULL;
  * static prototypes
  */
 
  * static prototypes
  */
 

-static int command(const char *, ...);
+static int command(const char *, ...) CHECK_PRINTF(1, 2);

 static int multiline(void);
 
 static int multiline(void);
 

-static int traverse (int (*)(void *, char *), void *closure, 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 *,
 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 *,

-                            char **);
+                            void *, char **);

 
 static int
 check_mech(char *server_mechs, size_t server_mechs_size)
 {
 
 static int
 check_mech(char *server_mechs, size_t server_mechs_size)
 {

-  int status, sasl_capability = 0;
+  int status;
+  bool sasl_capability = false;

 
     /*
      * First off, we're going to send the CAPA command to see if we can
 
     /*
      * First off, we're going to send the CAPA command to see if we can


@@ -54,23 +60,16 @@ check_mech(char *server_mechs, size_t server_mechs_size)
        return NOTOK;
     }
 
        return NOTOK;
     }
 

-    while ((status = multiline()) != DONE)
-       switch (status) {
-       case NOTOK:
+    while ((status = multiline()) != DONE) {
+        if (status == NOTOK)

            return 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 = true;
+            strncpy(server_mechs, response + 5, server_mechs_size);
+        }
+    }

 
     if (!sasl_capability) {
        snprintf(response, sizeof(response), "POP server does not support "
 
     if (!sasl_capability) {
        snprintf(response, sizeof(response), "POP server does not support "


@@ -113,7 +112,7 @@ parse_proxy(char *proxy, char *host)
 
    /* put together list of arguments */
     p = pargv = mh_xmalloc(pargc * sizeof(char *));
 
    /* 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';
     for (cur = pro; *cur; cur++) {
         if (isspace(*cur) && cur[1] && !isspace(cur[1])) {
            *c++ = '\0';


@@ -187,7 +186,7 @@ pop_init (char *host, char *port, char *user, char *proxy, int snoop,
           close(1);
           free(*argv);
           free(argv);
           close(1);
           free(*argv);
           free(argv);

-          exit(10);
+          exit(1);

        }
 
        /* okay in the parent we do some stuff */
        }
 
        /* okay in the parent we do some stuff */


@@ -228,7 +227,7 @@ pop_init (char *host, char *port, char *user, char *proxy, int snoop,
 
     if (sasl) {
        if (netsec_set_sasl_params(nsc, "pop", mech, pop_sasl_callback,
 
     if (sasl) {
        if (netsec_set_sasl_params(nsc, "pop", mech, pop_sasl_callback,

-                                  &errstr) != OK) {
+                                  NULL, &errstr) != OK) {

            snprintf(response, sizeof(response), "%s", errstr);
            free(errstr);
            return NOTOK;
            snprintf(response, sizeof(response), "%s", errstr);
            free(errstr);
            return NOTOK;


@@ -275,8 +274,10 @@ pop_init (char *host, char *port, char *user, char *proxy, int snoop,
 
        case NOTOK: 
        case DONE: 
 
        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;
            netsec_shutdown(nsc);
            nsc = NULL;
            return NOTOK;


@@ -295,11 +296,12 @@ pop_init (char *host, char *port, char *user, char *proxy, int snoop,
 static int
 pop_sasl_callback(enum sasl_message_type mtype, unsigned const char *indata,
                  unsigned int indatalen, unsigned char **outdata,
 static int
 pop_sasl_callback(enum sasl_message_type mtype, unsigned const char *indata,
                  unsigned int indatalen, unsigned char **outdata,

-                 unsigned int *outdatalen, char **errstr)
+                 unsigned int *outdatalen, void *context, char **errstr)

 {
     int rc, snoopoffset;
     char *mech, *line;
     size_t len, b64len;
 {
     int rc, snoopoffset;
     char *mech, *line;
     size_t len, b64len;

+    NMH_UNUSED(context);

 
     switch (mtype) {
     case NETSEC_SASL_START:
 
     switch (mtype) {
     case NETSEC_SASL_START:


@@ -341,25 +343,27 @@ pop_sasl_callback(enum sasl_message_type mtype, unsigned const char *indata,
                               "for initial challenge response");
                    return NOTOK;
                }
                               "for initial challenge response");
                    return NOTOK;
                }

-               netsec_set_snoop_callback(nsc, netsec_b64_snoop_decoder, NULL);

                rc = netsec_printf(nsc, errstr, "%s\r\n", b64data);
                rc = netsec_printf(nsc, errstr, "%s\r\n", b64data);

-               netsec_set_snoop_callback(nsc, NULL, NULL);

                free(b64data);
                if (rc != OK)
                    return NOTOK;
                free(b64data);
                if (rc != OK)
                    return NOTOK;

-               if (netsec_flush(nsc, errstr) != OK)
+               netsec_set_snoop_callback(nsc, netsec_b64_snoop_decoder, NULL);
+               rc = netsec_flush(nsc, errstr);
+               netsec_set_snoop_callback(nsc, NULL, NULL);
+               if (rc != OK)

                    return NOTOK;
            } else {
                    return NOTOK;
            } else {

-               netsec_set_snoop_callback(nsc, netsec_b64_snoop_decoder,
-                                         &snoopoffset);
-               snoopoffset = 6 + strlen(mech);

                rc = netsec_printf(nsc, errstr, "AUTH %s %s\r\n", mech,
                                   b64data);
                free(b64data);
                rc = netsec_printf(nsc, errstr, "AUTH %s %s\r\n", mech,
                                   b64data);
                free(b64data);

-               netsec_set_snoop_callback(nsc, NULL, NULL);

                if (rc != OK)
                    return NOTOK;
                if (rc != OK)
                    return NOTOK;

-               if (netsec_flush(nsc, errstr) != OK)
+               netsec_set_snoop_callback(nsc, netsec_b64_snoop_decoder,
+                                         &snoopoffset);
+               snoopoffset = 6 + strlen(mech);
+               rc = netsec_flush(nsc, errstr);
+               netsec_set_snoop_callback(nsc, NULL, NULL);
+               if (rc != OK)

                    return NOTOK;
            }
        } else {
                    return NOTOK;
            }
        } else {


@@ -412,16 +416,18 @@ pop_sasl_callback(enum sasl_message_type mtype, unsigned const char *indata,
            unsigned char *b64data;
            b64data = mh_xmalloc(BASE64SIZE(indatalen));
            writeBase64raw(indata, indatalen, b64data);
            unsigned char *b64data;
            b64data = mh_xmalloc(BASE64SIZE(indatalen));
            writeBase64raw(indata, indatalen, b64data);

-           netsec_set_snoop_callback(nsc, netsec_b64_snoop_decoder, NULL);

            rc = netsec_printf(nsc, errstr, "%s\r\n", b64data);
            rc = netsec_printf(nsc, errstr, "%s\r\n", b64data);

-           netsec_set_snoop_callback(nsc, NULL, NULL);

            free(b64data);
        }
 
        if (rc != OK)
            return NOTOK;
 
            free(b64data);
        }
 
        if (rc != OK)
            return NOTOK;
 

-       if (netsec_flush(nsc, errstr) != OK)
+       if (indatalen > 0)
+           netsec_set_snoop_callback(nsc, netsec_b64_snoop_decoder, NULL);
+       rc = netsec_flush(nsc, errstr);
+       netsec_set_snoop_callback(nsc, NULL, NULL);
+       if (rc != OK)

            return NOTOK;
        break;
 
            return NOTOK;
        break;
 


@@ -597,12 +603,14 @@ vcommand (const char *fmt, va_list ap)
        case OK: 
            if (poprint)
                fprintf (stderr, "<--- %s\n", response);
        case OK: 
            if (poprint)
                fprintf (stderr, "<--- %s\n", response);

-           return (*response == '+' ? OK : NOTOK);
+           return *response == '+' ? OK : NOTOK;

 
        case NOTOK: 
        case DONE: 
 
        case NOTOK: 
        case DONE: 

-           if (poprint)            
-               fprintf (stderr, "%s\n", response);
+           if (poprint) {
+               fputs(response, stderr);
+                putc('\n', stderr);
+            }

            return NOTOK;
     }
 
            return NOTOK;
     }