X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=pop%2Fpop.c;h=40df8781bab09e82406547b396fdbf3e09ca32fc;hp=86107136f7e60fc575ace22fc6047fe0e7818b66;hb=916e4872caf252a5850e64f79427b9dd7808435d;hpb=230399f9632c37b66c1c117a17e8327eae6b3235

diff --git a/pop/pop.c b/pop/pop.c
index 8610713..40df878 100644
--- a/pop/pop.c
+++ b/pop/pop.c
@@ -7,19 +7,12 @@
  * 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>
 
@@ -52,9 +45,9 @@ static pop_query_status pop_read_header (POP_DATA * pop_data, HEADER * 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;
   }
 
@@ -110,7 +103,7 @@ static pop_query_status pop_read_header (POP_DATA * pop_data, HEADER * h)
     }
   }
 
-  fclose (f);
+  m_fclose(&f);
   unlink (tempfile);
   return ret;
 }
@@ -213,7 +206,7 @@ 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];
@@ -284,7 +277,7 @@ static void pop_clear_cache (POP_DATA * pop_data)
 }
 
 /* close POP mailbox */
-void pop_close_mailbox (CONTEXT * ctx)
+static void pop_close_mailbox (CONTEXT * ctx)
 {
   POP_DATA *pop_data = (POP_DATA *) ctx->data;
 
@@ -356,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;
     }
 
@@ -370,7 +362,7 @@ int pop_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno)
     if (ret == PQ_OK)
       break;
 
-    safe_fclose (&msg->fp);
+    m_fclose(&msg->fp);
     unlink (path);
 
     if (ret == PQ_ERR) {
@@ -416,9 +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 __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;
@@ -461,9 +453,9 @@ pop_query_status pop_sync_mailbox (CONTEXT * ctx,
 }
 
 /* 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;
@@ -647,3 +639,36 @@ fail:
   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,
+};