X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=pop%2Fpop.c;h=be2d105faf7c2c117c763b7b049db7656e959108;hp=5f8933e51fba697c8cff14ad05ac9a2b0325a43b;hb=7b392ef7b50798f9eb3e7c869e634c5fef0092d1;hpb=4282401a0bcdc285a228da4ad635cbf7baf71488

diff --git a/pop/pop.c b/pop/pop.c
index 5f8933e..be2d105 100644
--- a/pop/pop.c
+++ b/pop/pop.c
@@ -7,23 +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/mem.h>
-#include <lib-lib/file.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/debug.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>
 
@@ -56,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;
   }
 
@@ -73,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."));
       }
@@ -136,8 +121,6 @@ static int fetch_uidl (char *line, void *data)
       break;
 
   if (i == ctx->msgcount) {
-    debug_print (1, ("new header %d %s\n", idx, line));
-
     if (i >= ctx->hdrmax)
       mx_alloc_memory (ctx);
 
@@ -182,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."));
     }
@@ -226,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];
@@ -288,8 +268,6 @@ 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);
@@ -299,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;
 
@@ -371,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;
     }
 
@@ -431,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;
@@ -476,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;
@@ -662,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,
+};