X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=pop%2Fpop.c;h=365b772522ea231700675babfe9f548729f77133;hp=3213e92f087e54b84ed83e0ed79f0db73914e753;hb=ae0ce4dfcafa0c3820f107c5bfa8bd06e5272b57;hpb=baf86ef44a449017ea20c3fcb252b66dc43fe6ce

diff --git a/pop/pop.c b/pop/pop.c
index 3213e92..365b772 100644
--- a/pop/pop.c
+++ b/pop/pop.c
@@ -11,14 +11,17 @@
 # include "config.h"
 #endif
 
+#include <lib-lib/mem.h>
+#include <lib-lib/file.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
+
 #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 <string.h>
@@ -49,7 +52,6 @@ static pop_query_status pop_read_header (POP_DATA * pop_data, HEADER * h)
   FILE *f;
   int index;
   pop_query_status ret;
-  cmd_status status;
   long length;
   char buf[LONG_STRING];
   char tempfile[_POSIX_PATH_MAX];
@@ -107,6 +109,11 @@ static pop_query_status pop_read_header (POP_DATA * pop_data, HEADER * h)
     {
       mutt_error _("Can't write header to temporary file!");
 
+      break;
+    }
+  case PQ_NOT_CONNECTED:
+    {
+      mutt_error _("Can't fetch header: Not connected!");
       break;
     }
   }
@@ -125,7 +132,7 @@ static int fetch_uidl (char *line, void *data)
 
   sscanf (line, "%d %s", &index, line);
   for (i = 0; i < ctx->msgcount; i++)
-    if (!safe_strcmp (line, ctx->hdrs[i]->data))
+    if (!m_strcmp(line, ctx->hdrs[i]->data))
       break;
 
   if (i == ctx->msgcount) {
@@ -136,7 +143,7 @@ static int fetch_uidl (char *line, void *data)
 
     ctx->msgcount++;
     ctx->hdrs[i] = mutt_new_header ();
-    ctx->hdrs[i]->data = safe_strdup (line);
+    ctx->hdrs[i]->data = m_strdup(line);
   }
   else if (ctx->hdrs[i]->index != index - 1)
     pop_data->clear_cache = 1;
@@ -241,10 +248,10 @@ int pop_open_mailbox (CONTEXT * ctx)
   if (!conn)
     return -1;
 
-  FREE (&ctx->path);
-  ctx->path = safe_strdup (buf);
+  p_delete(&ctx->path);
+  ctx->path = m_strdup(buf);
 
-  pop_data = safe_calloc (1, sizeof (POP_DATA));
+  pop_data = p_new(POP_DATA, 1);
   pop_data->conn = conn;
   ctx->data = pop_data;
 
@@ -253,7 +260,7 @@ int pop_open_mailbox (CONTEXT * ctx)
 
   conn->data = pop_data;
 
-  FOREVER {
+  for (;;) {
     if (pop_reconnect (ctx) != PQ_OK)
       return -1;
 
@@ -286,7 +293,7 @@ static void pop_clear_cache (POP_DATA * pop_data)
   for (i = 0; i < POP_CACHE_LEN; i++) {
     if (pop_data->cache[i].path) {
       unlink (pop_data->cache[i].path);
-      FREE (&pop_data->cache[i].path);
+      p_delete(&pop_data->cache[i].path);
     }
   }
 }
@@ -322,7 +329,7 @@ int pop_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno)
   void *uidl;
   char buf[LONG_STRING];
   char path[_POSIX_PATH_MAX];
-  char *m = _("Fetching message...");
+  progress_t bar;
   POP_DATA *pop_data = (POP_DATA *) ctx->data;
   POP_CACHE *cache;
   HEADER *h = ctx->hdrs[msgno];
@@ -344,11 +351,11 @@ int pop_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno)
     else {
       /* clear the previous entry */
       unlink (cache->path);
-      FREE (&cache->path);
+      p_delete(&cache->path);
     }
   }
 
-  FOREVER {
+  for (;;) {
     if (pop_reconnect (ctx) != PQ_OK)
       return -1;
 
@@ -360,7 +367,9 @@ int pop_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno)
       return -1;
     }
 
-    mutt_message (m);
+    bar.size = h->content->length + h->content->offset - 1;
+    bar.msg = _("Fetching message...");
+    mutt_progress_bar (&bar, 0);
 
     mutt_mktemp (path);
     msg->fp = safe_fopen (path, "w+");
@@ -372,7 +381,7 @@ int pop_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno)
 
     snprintf (buf, sizeof (buf), "RETR %d\r\n", h->refno);
 
-    ret = pop_fetch_data (pop_data, buf, m, fetch_message, msg->fp);
+    ret = pop_fetch_data (pop_data, buf, &bar, fetch_message, msg->fp);
     if (ret == PQ_OK)
       break;
 
@@ -397,7 +406,7 @@ 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 = safe_strdup (path);
+  cache->path = m_strdup(path);
   rewind (msg->fp);
   uidl = h->data;
   mutt_free_envelope (&h->env);
@@ -410,7 +419,7 @@ 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)
@@ -432,7 +441,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;
 
@@ -517,7 +526,7 @@ void pop_fetch_mail (void)
     return;
   }
 
-  url = p = safe_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');
@@ -525,7 +534,7 @@ void pop_fetch_mail (void)
   strcpy (p, PopHost);          /* __STRCPY_CHECKED__ */
 
   ret = pop_parse_path (url, &acct);
-  FREE (&url);
+  p_delete(&url);
   if (ret) {
     mutt_error (_("%s is an invalid POP path"), PopHost);
     return;
@@ -535,12 +544,12 @@ void pop_fetch_mail (void)
   if (!conn)
     return;
 
-  pop_data = safe_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);
-    FREE (&pop_data);
+    p_delete(&pop_data);
     return;
   }
 
@@ -642,11 +651,11 @@ finish:
   if (pop_query (pop_data, buffer, sizeof (buffer)) == PQ_NOT_CONNECTED)
     goto fail;
   mutt_socket_close (conn);
-  FREE (&pop_data);
+  p_delete(&pop_data);
   return;
 
 fail:
   mutt_error _("Server closed connection!");
   mutt_socket_close (conn);
-  FREE (&pop_data);
+  p_delete(&pop_data);
 }