X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=pop%2Fpop.c;h=f53f76a57ab6bb9d78a017d5a3415b99af3799be;hp=c67cd7ebe1f072f0543f78d1a2dc692fe9e0f554;hb=b0811fbd6a0e218c9c310a6ef4170e81540e6c22;hpb=0f44dc85fc1280372ffab911d701e703d803fb4b diff --git a/pop/pop.c b/pop/pop.c index c67cd7e..f53f76a 100644 --- a/pop/pop.c +++ b/pop/pop.c @@ -19,6 +19,7 @@ #include "lib/mem.h" #include "lib/str.h" #include "lib/intl.h" +#include "lib/debug.h" #include #include @@ -48,7 +49,6 @@ static pop_query_status pop_read_header (POP_DATA * pop_data, HEADER * h) FILE *f; int index; pop_query_status ret; - cmd_status status; long length; char buf[LONG_STRING]; char tempfile[_POSIX_PATH_MAX]; @@ -71,13 +71,13 @@ static pop_query_status pop_read_header (POP_DATA * pop_data, HEADER * h) if (ret == PQ_OK) { pop_data->cmd_top = CMD_AVAILABLE; - dprint (1, (debugfile, "pop_read_header: set TOP capability\n")); + debug_print (1, ("set TOP capability\n")); } if (ret == PQ_ERR) { pop_data->cmd_top = CMD_NOT_AVAILABLE; - dprint (1, (debugfile, "pop_read_header: unset TOP capability\n")); + debug_print (1, ("unset TOP capability\n")); snprintf (pop_data->err_msg, sizeof (pop_data->err_msg), _("Command TOP is not supported by server.")); } @@ -106,6 +106,11 @@ static pop_query_status pop_read_header (POP_DATA * pop_data, HEADER * h) { mutt_error _("Can't write header to temporary file!"); + break; + } + case PQ_NOT_CONNECTED: + { + mutt_error _("Can't fetch header: Not connected!"); break; } } @@ -124,20 +129,18 @@ static int fetch_uidl (char *line, void *data) sscanf (line, "%d %s", &index, line); for (i = 0; i < ctx->msgcount; i++) - if (!safe_strcmp (line, ctx->hdrs[i]->data)) + if (!str_cmp (line, ctx->hdrs[i]->data)) break; if (i == ctx->msgcount) { - dprint (1, - (debugfile, "pop_fetch_headers: new header %d %s\n", index, - line)); + debug_print (1, ("new header %d %s\n", index, line)); if (i >= ctx->hdrmax) mx_alloc_memory (ctx); ctx->msgcount++; ctx->hdrs[i] = mutt_new_header (); - ctx->hdrs[i]->data = safe_strdup (line); + ctx->hdrs[i]->data = str_dup (line); } else if (ctx->hdrs[i]->index != index - 1) pop_data->clear_cache = 1; @@ -177,13 +180,13 @@ static int pop_fetch_headers (CONTEXT * ctx) if (ret == PQ_OK) { pop_data->cmd_uidl = CMD_AVAILABLE; - dprint (1, (debugfile, "pop_fetch_headers: set UIDL capability\n")); + debug_print (1, ("set UIDL capability\n")); } if (ret == PQ_ERR && pop_data->cmd_uidl == CMD_UNKNOWN) { pop_data->cmd_uidl = CMD_NOT_AVAILABLE; - dprint (1, (debugfile, "pop_fetch_headers: unset UIDL capability\n")); + debug_print (1, ("unset UIDL capability\n")); snprintf (pop_data->err_msg, sizeof (pop_data->err_msg), _("Command UIDL is not supported by server.")); } @@ -242,10 +245,10 @@ int pop_open_mailbox (CONTEXT * ctx) if (!conn) return -1; - FREE (&ctx->path); - ctx->path = safe_strdup (buf); + mem_free (&ctx->path); + ctx->path = str_dup (buf); - pop_data = safe_calloc (1, sizeof (POP_DATA)); + pop_data = mem_calloc (1, sizeof (POP_DATA)); pop_data->conn = conn; ctx->data = pop_data; @@ -282,12 +285,12 @@ static void pop_clear_cache (POP_DATA * pop_data) if (!pop_data->clear_cache) return; - dprint (1, (debugfile, "pop_clear_cache: delete cached messages\n")); + debug_print (1, ("delete cached messages\n")); for (i = 0; i < POP_CACHE_LEN; i++) { if (pop_data->cache[i].path) { unlink (pop_data->cache[i].path); - FREE (&pop_data->cache[i].path); + mem_free (&pop_data->cache[i].path); } } } @@ -345,7 +348,7 @@ int pop_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno) else { /* clear the previous entry */ unlink (cache->path); - FREE (&cache->path); + mem_free (&cache->path); } } @@ -398,7 +401,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; - cache->path = safe_strdup (path); + cache->path = str_dup (path); rewind (msg->fp); uidl = h->data; mutt_free_envelope (&h->env); @@ -424,7 +427,7 @@ int pop_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno) } /* update POP mailbox - delete messages from server */ -pop_query_status pop_sync_mailbox (CONTEXT * ctx, int *index_hint) +pop_query_status pop_sync_mailbox (CONTEXT * ctx, int unused, int *index_hint) { int i; pop_query_status ret; @@ -467,7 +470,7 @@ pop_query_status pop_sync_mailbox (CONTEXT * ctx, int *index_hint) } /* Check for new messages and fetch headers */ -int pop_check_mailbox (CONTEXT * ctx, int *index_hint) +int pop_check_mailbox (CONTEXT * ctx, int *index_hint, int unused) { int ret; POP_DATA *pop_data = (POP_DATA *) ctx->data; @@ -518,7 +521,7 @@ void pop_fetch_mail (void) return; } - url = p = safe_calloc (strlen (PopHost) + 7, sizeof (char)); + url = p = mem_calloc (strlen (PopHost) + 7, sizeof (char)); if (url_check_scheme (PopHost) == U_UNKNOWN) { strcpy (url, "pop://"); /* __STRCPY_CHECKED__ */ p = strchr (url, '\0'); @@ -526,7 +529,7 @@ void pop_fetch_mail (void) strcpy (p, PopHost); /* __STRCPY_CHECKED__ */ ret = pop_parse_path (url, &acct); - FREE (&url); + mem_free (&url); if (ret) { mutt_error (_("%s is an invalid POP path"), PopHost); return; @@ -536,12 +539,12 @@ void pop_fetch_mail (void) if (!conn) return; - pop_data = safe_calloc (1, sizeof (POP_DATA)); + pop_data = mem_calloc (1, sizeof (POP_DATA)); pop_data->conn = conn; if (pop_open_connection (pop_data) < 0) { mutt_socket_free (pop_data->conn); - FREE (&pop_data); + mem_free (&pop_data); return; } @@ -643,11 +646,11 @@ finish: if (pop_query (pop_data, buffer, sizeof (buffer)) == PQ_NOT_CONNECTED) goto fail; mutt_socket_close (conn); - FREE (&pop_data); + mem_free (&pop_data); return; fail: mutt_error _("Server closed connection!"); mutt_socket_close (conn); - FREE (&pop_data); + mem_free (&pop_data); }