showfile.c: Move interface to own file.

[nmh] / uip / popsbr.c

diff --git a/uip/popsbr.c b/uip/popsbr.c
index ac1117be062fe4654188eb798c4a112e6f603324..02e10e6e6a3776b12bf67d81d3b94896c1ba0164 100644 (file)
--- a/uip/popsbr.c
+++ b/uip/popsbr.c
@@ -5,13 +5,16 @@
  * 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     "."
 #include "sbr/base64.h"
 
 #define        TRM     "."


@@ -39,7 +42,8 @@ static int pop_sasl_callback(enum sasl_message_type, unsigned const 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


@@ -62,7 +66,7 @@ check_mech(char *server_mechs, size_t server_mechs_size)
 
         if (strncasecmp(response, "SASL ", 5) == 0) {
             /* We've seen the SASL capability.  Grab the mech list. */
 
         if (strncasecmp(response, "SASL ", 5) == 0) {
             /* We've seen the SASL capability.  Grab the mech list. */

-            sasl_capability++;
+            sasl_capability = true;

             strncpy(server_mechs, response + 5, server_mechs_size);
         }
     }
             strncpy(server_mechs, response + 5, server_mechs_size);
         }
     }