X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=pop%2Fpop.c;h=5f8933e51fba697c8cff14ad05ac9a2b0325a43b;hp=365b772522ea231700675babfe9f548729f77133;hb=4282401a0bcdc285a228da4ad635cbf7baf71488;hpb=ae0ce4dfcafa0c3820f107c5bfa8bd06e5272b57 diff --git a/pop/pop.c b/pop/pop.c index 365b772..5f8933e 100644 --- a/pop/pop.c +++ b/pop/pop.c @@ -11,21 +11,21 @@ # include "config.h" #endif +#include +#include + #include #include #include #include +#include + +#include #include "mutt.h" #include "mx.h" #include "pop.h" -#include "mutt_crypt.h" -#include "mutt_curses.h" - -#include "lib/debug.h" - -#include -#include +#include /* write line to file */ static int fetch_message (char *line, void *file) @@ -50,7 +50,7 @@ static int fetch_message (char *line, void *file) static pop_query_status pop_read_header (POP_DATA * pop_data, HEADER * h) { FILE *f; - int index; + int idx; pop_query_status ret; long length; char buf[LONG_STRING]; @@ -62,10 +62,10 @@ static pop_query_status pop_read_header (POP_DATA * pop_data, HEADER * h) return PFD_FUNCT_ERROR; } - snprintf (buf, sizeof (buf), "LIST %d\r\n", h->refno); + snprintf (buf, sizeof (buf), "string_list_t %d\r\n", h->refno); ret = pop_query (pop_data, buf, sizeof (buf)); if (ret == PQ_OK) { - sscanf (buf, "+OK %d %ld", &index, &length); + sscanf (buf, "+OK %d %ld", &idx, &length); snprintf (buf, sizeof (buf), "TOP %d 0\r\n", h->refno); ret = pop_fetch_data (pop_data, buf, NULL, fetch_message, f); @@ -126,30 +126,30 @@ static pop_query_status pop_read_header (POP_DATA * pop_data, HEADER * h) /* parse UIDL */ static int fetch_uidl (char *line, void *data) { - int i, index; + int i, idx; CONTEXT *ctx = (CONTEXT *) data; POP_DATA *pop_data = (POP_DATA *) ctx->data; - sscanf (line, "%d %s", &index, line); + sscanf (line, "%d %s", &idx, line); for (i = 0; i < ctx->msgcount; i++) if (!m_strcmp(line, ctx->hdrs[i]->data)) break; if (i == ctx->msgcount) { - debug_print (1, ("new header %d %s\n", index, line)); + debug_print (1, ("new header %d %s\n", idx, line)); if (i >= ctx->hdrmax) mx_alloc_memory (ctx); ctx->msgcount++; - ctx->hdrs[i] = mutt_new_header (); + ctx->hdrs[i] = header_new(); ctx->hdrs[i]->data = m_strdup(line); } - else if (ctx->hdrs[i]->index != index - 1) + else if (ctx->hdrs[i]->index != idx - 1) pop_data->clear_cache = 1; - ctx->hdrs[i]->refno = index; - ctx->hdrs[i]->index = index - 1; + ctx->hdrs[i]->refno = idx; + ctx->hdrs[i]->index = idx - 1; return 0; } @@ -217,7 +217,7 @@ static int pop_fetch_headers (CONTEXT * ctx) if (ret != PQ_OK) { for (i = ctx->msgcount; i < new_count; i++) - mutt_free_header (&ctx->hdrs[i]); + header_delete(&ctx->hdrs[i]); return ret; } @@ -231,20 +231,20 @@ int pop_open_mailbox (CONTEXT * ctx) int ret; char buf[LONG_STRING]; CONNECTION *conn; - ACCOUNT acct; + ACCOUNT act; POP_DATA *pop_data; ciss_url_t url; - if (pop_parse_path (ctx->path, &acct)) { + if (pop_parse_path (ctx->path, &act)) { mutt_error (_("%s is an invalid POP path"), ctx->path); mutt_sleep (2); return -1; } - mutt_account_tourl (&acct, &url); + mutt_account_tourl (&act, &url); url.path = NULL; url_ciss_tostring (&url, buf, sizeof (buf), 0); - conn = mutt_conn_find (NULL, &acct); + conn = mutt_conn_find (NULL, &act); if (!conn) return -1; @@ -409,7 +409,7 @@ int pop_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno) cache->path = m_strdup(path); rewind (msg->fp); uidl = h->data; - mutt_free_envelope (&h->env); + envelope_delete(&h->env); h->env = mutt_read_rfc822_header (msg->fp, h, 0, 0); h->data = uidl; h->lines = 0; @@ -422,8 +422,7 @@ int pop_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno) h->content->length = ftello (msg->fp) - h->content->offset; /* This needs to be done in case this is a multipart message */ - if (!WithCrypto) - h->security = crypt_query (h->content); + h->security = crypt_query (h->content); mutt_clear_error (); rewind (msg->fp); @@ -432,7 +431,9 @@ 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 unused, int *index_hint) +pop_query_status pop_sync_mailbox (CONTEXT * ctx, + int unused __attribute__ ((unused)), + int *index_hint __attribute__ ((unused))) { int i; pop_query_status ret; @@ -455,7 +456,7 @@ pop_query_status pop_sync_mailbox (CONTEXT * ctx, int unused, int *index_hint) } if (ret == PQ_OK) { - strfcpy (buf, "QUIT\r\n", sizeof (buf)); + m_strcpy(buf, sizeof(buf), "QUIT\r\n"); ret = pop_query (pop_data, buf, sizeof (buf)); } @@ -475,7 +476,9 @@ pop_query_status pop_sync_mailbox (CONTEXT * ctx, int unused, int *index_hint) } /* Check for new messages and fetch headers */ -int pop_check_mailbox (CONTEXT * ctx, int *index_hint, int unused) +int pop_check_mailbox (CONTEXT * ctx, + int *index_hint __attribute__ ((unused)), + int unused __attribute__ ((unused))) { int ret; POP_DATA *pop_data = (POP_DATA *) ctx->data; @@ -517,7 +520,7 @@ void pop_fetch_mail (void) CONNECTION *conn; CONTEXT ctx; MESSAGE *msg = NULL; - ACCOUNT acct; + ACCOUNT act; POP_DATA *pop_data; if (!PopHost) { @@ -533,14 +536,14 @@ void pop_fetch_mail (void) } strcpy (p, PopHost); /* __STRCPY_CHECKED__ */ - ret = pop_parse_path (url, &acct); + ret = pop_parse_path (url, &act); p_delete(&url); if (ret) { mutt_error (_("%s is an invalid POP path"), PopHost); return; } - conn = mutt_conn_find (NULL, &acct); + conn = mutt_conn_find (NULL, &act); if (!conn) return; @@ -558,7 +561,7 @@ void pop_fetch_mail (void) mutt_message _("Checking for new messages..."); /* find out how many messages are in the mailbox. */ - strfcpy (buffer, "STAT\r\n", sizeof (buffer)); + m_strcpy(buffer, sizeof(buffer), "STAT\r\n"); ret = pop_query (pop_data, buffer, sizeof (buffer)); if (ret == PQ_NOT_CONNECTED) goto fail; @@ -571,7 +574,7 @@ void pop_fetch_mail (void) /* only get unread messages */ if (msgs > 0 && option (OPTPOPLAST)) { - strfcpy (buffer, "LAST\r\n", sizeof (buffer)); + m_strcpy(buffer, sizeof(buffer), "LAST\r\n"); ret = pop_query (pop_data, buffer, sizeof (buffer)); if (ret == PQ_NOT_CONNECTED) goto fail; @@ -640,14 +643,14 @@ void pop_fetch_mail (void) if (rset) { /* make sure no messages get deleted */ - strfcpy (buffer, "RSET\r\n", sizeof (buffer)); + m_strcpy(buffer, sizeof(buffer), "RSET\r\n"); if (pop_query (pop_data, buffer, sizeof (buffer)) == PQ_NOT_CONNECTED) goto fail; } finish: /* exit gracefully */ - strfcpy (buffer, "QUIT\r\n", sizeof (buffer)); + m_strcpy(buffer, sizeof(buffer), "QUIT\r\n"); if (pop_query (pop_data, buffer, sizeof (buffer)) == PQ_NOT_CONNECTED) goto fail; mutt_socket_close (conn);