X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/8aea555551a2f6a43aa2d24a5b45b09612f0cbb8..babec898bb63d36349aae85a8cbde6b97b274192:/uip/popsbr.c

diff --git a/uip/popsbr.c b/uip/popsbr.c
index ac1117be..9ccf6dcc 100644
--- a/uip/popsbr.c
+++ b/uip/popsbr.c
@@ -5,13 +5,16 @@
  * 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 "popsbr.h"
+#include "h/signals.h"
 #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)
 {
-  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
@@ -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. */
-            sasl_capability++;
+            sasl_capability = true;
             strncpy(server_mechs, response + 5, server_mechs_size);
         }
     }
@@ -81,7 +85,7 @@ check_mech(char *server_mechs, size_t server_mechs_size)
  * suitable for passing to exec. Returned array must be freed. Shouldn't
  * be possible to call this with host set to NULL.
  */
-char **
+static char **
 parse_proxy(char *proxy, char *host)
 {
     char **pargv, **p;
@@ -554,7 +558,7 @@ pop_done (void)
 }
 
 
-int
+static int
 command(const char *fmt, ...)
 {
     va_list ap;
@@ -614,7 +618,7 @@ vcommand (const char *fmt, va_list ap)
 }
 
 
-int
+static int
 multiline (void)
 {
     char buffer[BUFSIZ + LEN(TRM)];