# 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>
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"));
debug_print (1, ("error base64-encoding client response.\n"));
goto bail;
}
-
- /* sasl_client_st(art|ep) allocate pc with malloc, expect me to
- * free it */
- mem_free (&pc);
}
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);
}