# include "mutt_ssl.h"
#endif
+#include "lib/mem.h"
+#include "lib/intl.h"
+#include "lib/debug.h"
+#include "lib/str.h"
+
#include <string.h>
#include <unistd.h>
#include <ctype.h>
t = strchr (pop_data->err_msg, '\0');
c = msg;
- if (!mutt_strncmp (msg, "-ERR ", 5)) {
+ if (!safe_strncmp (msg, "-ERR ", 5)) {
c2 = msg + 5;
SKIPWS (c2);
}
strfcpy (t, c, sizeof (pop_data->err_msg) - strlen (pop_data->err_msg));
- mutt_remove_trailing_ws (pop_data->err_msg);
+ str_skip_trailws (pop_data->err_msg);
}
/* Parse CAPA output */
pop_data->status = POP_CONNECTED;
- if (mutt_strncmp (buf, "+OK", 3)) {
+ if (safe_strncmp (buf, "+OK", 3)) {
*pop_data->err_msg = '\0';
pop_error (pop_data, buf);
mutt_error ("%s", pop_data->err_msg);
/* print msg instaed of real command */
if (msg) {
dbg = M_SOCK_LOG_FULL;
- dprint (M_SOCK_LOG_CMD, (debugfile, "> %s", msg));
+ debug_print (M_SOCK_LOG_CMD, ("> %s", msg));
}
#endif
pop_data->status = POP_DISCONNECTED;
return PQ_NOT_CONNECTED;
}
- if (!mutt_strncmp (buf, "+OK", 3))
+ if (!safe_strncmp (buf, "+OK", 3))
return PQ_OK;
pop_error (pop_data, buf);