projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
less horrible strncpy's
[apps/madmutt.git]
/
pop
/
pop.c
diff --git
a/pop/pop.c
b/pop/pop.c
index
1b70009
..
365b772
100644
(file)
--- a/
pop/pop.c
+++ b/
pop/pop.c
@@
-12,6
+12,9
@@
#endif
#include <lib-lib/mem.h>
#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.h"
#include "mx.h"
@@
-19,9
+22,6
@@
#include "mutt_crypt.h"
#include "mutt_curses.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>
#include "lib/debug.h"
#include <string.h>
@@
-132,7
+132,7
@@
static int fetch_uidl (char *line, void *data)
sscanf (line, "%d %s", &index, line);
for (i = 0; i < ctx->msgcount; i++)
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) {
break;
if (i == ctx->msgcount) {
@@
-143,7
+143,7
@@
static int fetch_uidl (char *line, void *data)
ctx->msgcount++;
ctx->hdrs[i] = mutt_new_header ();
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;
}
else if (ctx->hdrs[i]->index != index - 1)
pop_data->clear_cache = 1;
@@
-249,7
+249,7
@@
int pop_open_mailbox (CONTEXT * ctx)
return -1;
p_delete(&ctx->path);
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;
pop_data = p_new(POP_DATA, 1);
pop_data->conn = conn;
@@
-260,7
+260,7
@@
int pop_open_mailbox (CONTEXT * ctx)
conn->data = pop_data;
conn->data = pop_data;
-
FOREVER
{
+
for (;;)
{
if (pop_reconnect (ctx) != PQ_OK)
return -1;
if (pop_reconnect (ctx) != PQ_OK)
return -1;
@@
-355,7
+355,7
@@
int pop_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno)
}
}
}
}
-
FOREVER
{
+
for (;;)
{
if (pop_reconnect (ctx) != PQ_OK)
return -1;
if (pop_reconnect (ctx) != PQ_OK)
return -1;
@@
-406,7
+406,7
@@
int pop_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno)
* portion of the headers, those required for the main display.
*/
cache->index = h->index;
* 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);
rewind (msg->fp);
uidl = h->data;
mutt_free_envelope (&h->env);
@@
-441,7
+441,7
@@
pop_query_status pop_sync_mailbox (CONTEXT * ctx, int unused, int *index_hint)
pop_data->check_time = 0;
pop_data->check_time = 0;
-
FOREVER
{
+
for (;;)
{
if (pop_reconnect (ctx) != PQ_OK)
return PQ_NOT_CONNECTED;
if (pop_reconnect (ctx) != PQ_OK)
return PQ_NOT_CONNECTED;