rationalize list handling in mutt a bit.

[apps/madmutt.git] / imap / auth_sasl.c

diff --git a/imap/auth_sasl.c b/imap/auth_sasl.c
index 436b331..b8b1e3c 100644 (file)
--- a/imap/auth_sasl.c
+++ b/imap/auth_sasl.c
@@ -14,15 +14,15 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/ascii.h>
 
 #include "mutt.h"
-#include "ascii.h"
 #include "mutt_sasl.h"
 #include "imap_private.h"
 #include "auth.h"
 
 #include <lib-lib/macros.h>
-#include "lib/debug.h"
+#include <lib-lib/debug.h>
 
 #include <sasl/sasl.h>
 #include <sasl/saslutil.h>
@@ -110,7 +110,7 @@ imap_auth_res_t imap_auth_sasl (IMAP_DATA * idata, const char *method)
 
     if (irc == IMAP_CMD_RESPOND) {
       if (sasl_decode64
-          (idata->cmd.buf + 2, str_len (idata->cmd.buf + 2), buf,
+          (idata->cmd.buf + 2, m_strlen(idata->cmd.buf + 2), buf,
            LONG_STRING - 1,
                          &len) != SASL_OK) {
         debug_print (1, ("error base64-decoding server response.\n"));
@@ -141,7 +141,7 @@ imap_auth_res_t imap_auth_sasl (IMAP_DATA * idata, const char *method)
     }
 
     if (irc == IMAP_CMD_RESPOND) {
-      strfcpy (buf + olen, "\r\n", sizeof (buf) - olen);
+      m_strcpy(buf + olen, sizeof(buf) - olen, "\r\n");
       mutt_socket_write (idata->conn, buf);
     }