X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=imap%2Fauth_sasl.c;h=b8b1e3ce64128e0d0f9d3237cc5187d0ebcf6048;hp=60e4656a045f38b7e9e7feffdbf1cc72d1bb98b0;hb=3e9a92ab72e04aecb0fc4098098a1b57c5101d84;hpb=8889846011afe0d33ff155acce9afef5af306ae0;ds=sidebyside

diff --git a/imap/auth_sasl.c b/imap/auth_sasl.c
index 60e4656..b8b1e3c 100644
--- a/imap/auth_sasl.c
+++ b/imap/auth_sasl.c
@@ -13,15 +13,16 @@
 # include "config.h"
 #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/mem.h"
-#include "lib/intl.h"
-#include "lib/debug.h"
+#include <lib-lib/macros.h>
+#include <lib-lib/debug.h>
 
 #include <sasl/sasl.h>
 #include <sasl/saslutil.h>
@@ -109,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"));
@@ -140,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);
     }