#endif
#include <lib-lib/mem.h>
+#include <lib-lib/file.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
#include "mutt.h"
#include "mx.h"
#include "mutt_crypt.h"
#include "mutt_curses.h"
-#include "lib/mem.h"
-#include "lib/str.h"
-#include "lib/intl.h"
#include "lib/debug.h"
#include <string.h>
sscanf (line, "%d %s", &index, line);
for (i = 0; i < ctx->msgcount; i++)
- if (!str_cmp (line, ctx->hdrs[i]->data))
+ if (!m_strcmp(line, ctx->hdrs[i]->data))
break;
if (i == ctx->msgcount) {
ctx->msgcount++;
ctx->hdrs[i] = mutt_new_header ();
- ctx->hdrs[i]->data = str_dup (line);
+ ctx->hdrs[i]->data = m_strdup(line);
}
else if (ctx->hdrs[i]->index != index - 1)
pop_data->clear_cache = 1;
return -1;
p_delete(&ctx->path);
- ctx->path = str_dup (buf);
+ ctx->path = m_strdup(buf);
pop_data = p_new(POP_DATA, 1);
pop_data->conn = conn;
conn->data = pop_data;
- FOREVER {
+ for (;;) {
if (pop_reconnect (ctx) != PQ_OK)
return -1;
}
}
- FOREVER {
+ for (;;) {
if (pop_reconnect (ctx) != PQ_OK)
return -1;
* portion of the headers, those required for the main display.
*/
cache->index = h->index;
- cache->path = str_dup (path);
+ cache->path = m_strdup(path);
rewind (msg->fp);
uidl = h->data;
mutt_free_envelope (&h->env);
pop_data->check_time = 0;
- FOREVER {
+ for (;;) {
if (pop_reconnect (ctx) != PQ_OK)
return PQ_NOT_CONNECTED;