* please see the file GPL in the top level source directory.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <string.h>
-#include <unistd.h>
-
#include <lib-lib/lib-lib.h>
#include <lib-ui/curses.h>
+#include <lib-mx/mx.h>
#include "mutt.h"
-#include "mx.h"
#include "pop.h"
#include <lib-crypt/crypt.h>
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), "string_list_t %d\r\n", h->refno);
+ snprintf (buf, sizeof (buf), "LIST %d\r\n", h->refno);
ret = pop_query (pop_data, buf, sizeof (buf));
if (ret == PQ_OK) {
sscanf (buf, "+OK %d %ld", &idx, &length);
}
}
- fclose (f);
+ m_fclose(&f);
unlink (tempfile);
return ret;
}
}
/* 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];
}
/* close POP mailbox */
-void pop_close_mailbox (CONTEXT * ctx)
+static void pop_close_mailbox (CONTEXT * ctx)
{
POP_DATA *pop_data = (POP_DATA *) ctx->data;
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;
}
if (ret == PQ_OK)
break;
- safe_fclose (&msg->fp);
+ m_fclose(&msg->fp);
unlink (path);
if (ret == PQ_ERR) {
}
/* update POP mailbox - delete messages from server */
-pop_query_status pop_sync_mailbox (CONTEXT * ctx,
- int unused __attribute__ ((unused)),
- int *index_hint __attribute__ ((unused)))
+static pop_query_status
+pop_sync_mailbox (CONTEXT * ctx, int unused __attribute__ ((unused)),
+ int *index_hint __attribute__ ((unused)))
{
int i;
pop_query_status ret;
}
/* Check for new messages and fetch headers */
-int pop_check_mailbox (CONTEXT * ctx,
- int *index_hint __attribute__ ((unused)),
- int unused __attribute__ ((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;
void pop_fetch_mail (void)
{
char buffer[LONG_STRING];
- char msgbuf[SHORT_STRING];
+ char msgbuf[STRING];
char *url, *p;
int i, delanswer, last = 0, msgs, bytes, rset = 0;
pop_query_status ret;
MESSAGE *msg = NULL;
ACCOUNT act;
POP_DATA *pop_data;
+ ssize_t plen;
if (!PopHost) {
mutt_error _("POP host is not defined.");
return;
}
- url = p = p_new(char, strlen (PopHost) + 7);
+ plen = m_strlen(PopHost) + 7;
+ url = p = p_new(char, plen);
if (url_check_scheme (PopHost) == U_UNKNOWN) {
- strcpy (url, "pop://"); /* __STRCPY_CHECKED__ */
- p = strchr (url, '\0');
+ plen -= m_strcpy(url, plen, "pop://");
+ p += plen;
}
- strcpy (p, PopHost); /* __STRCPY_CHECKED__ */
+ m_strcpy(p, plen, PopHost);
ret = pop_parse_path (url, &act);
p_delete(&url);
mutt_socket_close (conn);
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,
+};