X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=pop%2Fpop.c;h=be2d105faf7c2c117c763b7b049db7656e959108;hp=804fec25714f5a4dc5b63a2afb012fb4cc5b4ae2;hb=7b392ef7b50798f9eb3e7c869e634c5fef0092d1;hpb=4711a1a970ba7dda6eaf71f16fdfd74f90d02bb8 diff --git a/pop/pop.c b/pop/pop.c index 804fec2..be2d105 100644 --- a/pop/pop.c +++ b/pop/pop.c @@ -7,23 +7,14 @@ * please see the file GPL in the top level source directory. */ -#if HAVE_CONFIG_H -# include "config.h" -#endif +#include + +#include +#include #include "mutt.h" -#include "mx.h" #include "pop.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 -#include +#include /* write line to file */ static int fetch_message (char *line, void *file) @@ -48,22 +39,22 @@ 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]; char tempfile[_POSIX_PATH_MAX]; - mutt_mktemp (tempfile); - if (!(f = safe_fopen (tempfile, "w+"))) { - mutt_perror (tempfile); + f = m_tempfile(tempfile, sizeof(tempfile), NONULL(Tempdir), NULL); + if (!f) { + mutt_error(_("Could not create temporary file")); 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); @@ -71,14 +62,10 @@ static pop_query_status pop_read_header (POP_DATA * pop_data, HEADER * h) if (pop_data->cmd_top == CMD_UNKNOWN) { if (ret == PQ_OK) { pop_data->cmd_top = CMD_AVAILABLE; - - debug_print (1, ("set TOP capability\n")); } if (ret == PQ_ERR) { pop_data->cmd_top = CMD_NOT_AVAILABLE; - - debug_print (1, ("unset TOP capability\n")); snprintf (pop_data->err_msg, sizeof (pop_data->err_msg), _("Command TOP is not supported by server.")); } @@ -124,30 +111,28 @@ 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 (!str_cmp (line, ctx->hdrs[i]->data)) + if (!m_strcmp(line, ctx->hdrs[i]->data)) break; if (i == ctx->msgcount) { - 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 = str_dup (line); + 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; } @@ -180,14 +165,11 @@ static int pop_fetch_headers (CONTEXT * ctx) if (pop_data->cmd_uidl == CMD_UNKNOWN) { if (ret == PQ_OK) { pop_data->cmd_uidl = CMD_AVAILABLE; - - debug_print (1, ("set UIDL capability\n")); } if (ret == PQ_ERR && pop_data->cmd_uidl == CMD_UNKNOWN) { pop_data->cmd_uidl = CMD_NOT_AVAILABLE; - debug_print (1, ("unset UIDL capability\n")); snprintf (pop_data->err_msg, sizeof (pop_data->err_msg), _("Command UIDL is not supported by server.")); } @@ -215,7 +197,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; } @@ -224,32 +206,32 @@ static int pop_fetch_headers (CONTEXT * ctx) } /* open POP mailbox - fetch only headers */ -int pop_open_mailbox (CONTEXT * ctx) +static 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; - mem_free (&ctx->path); - ctx->path = str_dup (buf); + p_delete(&ctx->path); + ctx->path = m_strdup(buf); - pop_data = mem_calloc (1, sizeof (POP_DATA)); + pop_data = p_new(POP_DATA, 1); pop_data->conn = conn; ctx->data = pop_data; @@ -258,7 +240,7 @@ int pop_open_mailbox (CONTEXT * ctx) conn->data = pop_data; - FOREVER { + for (;;) { if (pop_reconnect (ctx) != PQ_OK) return -1; @@ -286,18 +268,16 @@ static void pop_clear_cache (POP_DATA * pop_data) if (!pop_data->clear_cache) return; - 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); - mem_free (&pop_data->cache[i].path); + p_delete(&pop_data->cache[i].path); } } } /* close POP mailbox */ -void pop_close_mailbox (CONTEXT * ctx) +static void pop_close_mailbox (CONTEXT * ctx) { POP_DATA *pop_data = (POP_DATA *) ctx->data; @@ -349,11 +329,11 @@ int pop_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno) else { /* clear the previous entry */ unlink (cache->path); - mem_free (&cache->path); + p_delete(&cache->path); } } - FOREVER { + for (;;) { if (pop_reconnect (ctx) != PQ_OK) return -1; @@ -369,11 +349,10 @@ int pop_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno) bar.msg = _("Fetching message..."); mutt_progress_bar (&bar, 0); - mutt_mktemp (path); - msg->fp = safe_fopen (path, "w+"); + msg->fp = m_tempfile(path, sizeof(path), NONULL(Tempdir), NULL); if (!msg->fp) { - mutt_perror (path); - mutt_sleep (2); + mutt_error(_("Could not create temporary file")); + mutt_sleep(2); return -1; } @@ -404,10 +383,10 @@ 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 = str_dup (path); + 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; @@ -417,11 +396,10 @@ int pop_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno) fgets (buf, sizeof (buf), msg->fp); } - h->content->length = ftell (msg->fp) - h->content->offset; + 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); @@ -430,7 +408,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) +static pop_query_status +pop_sync_mailbox (CONTEXT * ctx, int unused __attribute__ ((unused)), + int *index_hint __attribute__ ((unused))) { int i; pop_query_status ret; @@ -439,7 +419,7 @@ pop_query_status pop_sync_mailbox (CONTEXT * ctx, int unused, int *index_hint) pop_data->check_time = 0; - FOREVER { + for (;;) { if (pop_reconnect (ctx) != PQ_OK) return PQ_NOT_CONNECTED; @@ -453,7 +433,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)); } @@ -473,7 +453,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) +static 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; @@ -515,7 +497,7 @@ void pop_fetch_mail (void) CONNECTION *conn; CONTEXT ctx; MESSAGE *msg = NULL; - ACCOUNT acct; + ACCOUNT act; POP_DATA *pop_data; if (!PopHost) { @@ -524,30 +506,30 @@ void pop_fetch_mail (void) return; } - url = p = mem_calloc (strlen (PopHost) + 7, sizeof (char)); + url = p = p_new(char, strlen (PopHost) + 7); if (url_check_scheme (PopHost) == U_UNKNOWN) { strcpy (url, "pop://"); /* __STRCPY_CHECKED__ */ p = strchr (url, '\0'); } strcpy (p, PopHost); /* __STRCPY_CHECKED__ */ - ret = pop_parse_path (url, &acct); - mem_free (&url); + 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; - pop_data = mem_calloc (1, sizeof (POP_DATA)); + pop_data = p_new(POP_DATA, 1); pop_data->conn = conn; if (pop_open_connection (pop_data) < 0) { mutt_socket_free (pop_data->conn); - mem_free (&pop_data); + p_delete(&pop_data); return; } @@ -556,7 +538,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; @@ -569,7 +551,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; @@ -638,22 +620,55 @@ 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); - mem_free (&pop_data); + p_delete(&pop_data); return; fail: mutt_error _("Server closed connection!"); mutt_socket_close (conn); - mem_free (&pop_data); + p_delete(&pop_data); +} + +static int pop_is_magic (const char* path, struct stat* st __attribute__ ((unused))) { + url_scheme_t s = url_check_scheme (NONULL (path)); + return ((s == U_POP || s == U_POPS) ? M_POP : -1); } + +static int acl_check_pop (CONTEXT* ctx __attribute__ ((unused)), int bit) { + switch (bit) { + case ACL_INSERT: /* editing messages */ + case ACL_WRITE: /* change importance */ + return (0); + case ACL_DELETE: /* (un)deletion */ + case ACL_SEEN: /* mark as read */ + return (1); + default: + return (0); + } +} + +mx_t const pop_mx = { + M_POP, + 0, + pop_is_magic, + NULL, + NULL, + pop_open_mailbox, + NULL, + acl_check_pop, + pop_check_mailbox, + pop_close_mailbox, + pop_sync_mailbox, + NULL, +};