# include "config.h"
#endif
+#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/ascii.h>
+#include <lib-lib/macros.h>
+
#include "mutt.h"
-#include "ascii.h"
#include "mx.h"
#include "url.h"
#include "pop.h"
# 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>
acct->port = POP_PORT;
acct->type = M_ACCT_TYPE_POP;
- c = str_dup (path);
+ c = m_strdup(path);
url_parse_ciss (&url, c);
if (url.scheme == U_POP || url.scheme == U_POPS) {
ret = 0;
}
- mem_free (&c);
+ p_delete(&c);
return ret;
}
char *c;
if (!ascii_strncasecmp (line, "SASL", 4)) {
- mem_free (&pop_data->auth_list);
+ p_delete(&pop_data->auth_list);
c = line + 4;
SKIPWS (c);
- pop_data->auth_list = str_dup (c);
+ pop_data->auth_list = m_strdup(c);
}
else if (!ascii_strncasecmp (line, "STLS", 4))
POP_DATA *pop_data = (POP_DATA *) data;
if (!pop_data->auth_list) {
- pop_data->auth_list = mem_malloc (strlen (line) + 1);
- *pop_data->auth_list = '\0';
- }
- else {
- mem_realloc (&pop_data->auth_list,
- strlen (pop_data->auth_list) + strlen (line) + 2);
+ pop_data->auth_list = p_new(char, strlen(line) + 1);
+ } else {
+ p_realloc(&pop_data->auth_list,
+ strlen(pop_data->auth_list) + strlen(line) + 2);
strcat (pop_data->auth_list, " "); /* __STRCAT_CHECKED__ */
}
strcat (pop_data->auth_list, line); /* __STRCAT_CHECKED__ */
pop_data->resp_codes = 0;
pop_data->expire = 1;
pop_data->login_delay = 0;
- mem_free (&pop_data->auth_list);
+ p_delete(&pop_data->auth_list);
}
/* Execute CAPA command */
if (ret != PQ_OK)
return ret;
- inbuf = mem_malloc (sizeof (buf));
+ inbuf = p_new(char, sizeof(buf));
FOREVER {
chunk =
p++;
}
- strfcpy (inbuf + lenbuf, p, sizeof (buf));
+ strfcpy(inbuf + lenbuf, p, sizeof(buf));
pos += chunk;
if (chunk >= sizeof (buf)) {
lenbuf = 0;
}
- mem_realloc (&inbuf, lenbuf + sizeof (buf));
+ p_realloc(&inbuf, lenbuf + sizeof(buf));
}
- mem_free (&inbuf);
+ p_delete(&inbuf);
return ret;
}
sscanf (line, "%u %s", &index, line);
for (i = 0; i < ctx->msgcount; i++) {
- if (!str_cmp (ctx->hdrs[i]->data, line)) {
+ if (!m_strcmp(ctx->hdrs[i]->data, line)) {
ctx->hdrs[i]->refno = index;
break;
}