Fixed mhical(1) exit status to reflect return status of icalparse().

[nmh] / uip / imaptest.c

diff --git a/uip/imaptest.c b/uip/imaptest.c
index e624bc4df7f1c469c46325d1ed33ee33dd7582fd..9ad2234111bd417805856105fb37ba8e961bffe8 100644 (file)
--- a/uip/imaptest.c
+++ b/uip/imaptest.c
@@ -6,6 +6,14 @@
  */
 
 #include "h/mh.h"
+#include "sbr/getarguments.h"
+#include "sbr/smatch.h"
+#include "sbr/client.h"
+#include "sbr/getcpy.h"
+#include "sbr/brkstring.h"
+#include "sbr/ambigsw.h"
+#include "sbr/print_version.h"
+#include "sbr/print_help.h"
 #include "sbr/error.h"
 #include "h/utils.h"
 #include "h/netsec.h"
@@ -182,7 +190,7 @@ main (int argc, char **argv)
                snoop = true;
                continue;
            case NOSNOOPSW:
-               snoop = false;
+               snoop = false;
                continue;
            case SASLSW:
                sasl = true;
@@ -195,7 +203,7 @@ main (int argc, char **argv)
                    die("missing argument to %s", argp[-2]);
                continue;
            case AUTHSERVICESW:
-               if (!(oauth_svc = *argp++) || *oauth_svc == '-')
+               if (!(oauth_svc = *argp++) || *oauth_svc == '-')
                    die("missing argument to %s", argp[-2]);
                continue;
            case TLSSW:
@@ -641,7 +649,7 @@ imap_sasl_callback(enum sasl_message_type mtype, unsigned const char *indata,
            *outdata = NULL;
            *outdatalen = 0;
        } else {
-           rc = decodeBase64(line + 2, outdata, &len, 0, NULL);
+           rc = decodeBase64(line + 2, outdata, &len, 0);
            *outdatalen = len;
            if (rc != OK) {
                netsec_err(errstr, "Unable to decode base64 response");
@@ -745,7 +753,7 @@ send_imap_command(netsec_context *nsc, bool noflush, char **errstr,
        vsnprintf(cmd->prefix, sizeof(cmd->prefix), fmt, ap);
        va_end(ap);
 
-       p = strchr(cmd->prefix, ' ');
+       p = strchr(cmd->prefix, ' ');
 
        if (p)
            *p = '\0';