X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=pop%2Fpop.c;h=b00274aa390152d903642f5f119ef208c849daf6;hp=01f8e9328f85d428175dbb67912318b962222107;hb=68edc972742930c4003e554144bfe197ba6199aa;hpb=ba5e3af4ea19e1d20c80941c077039871ec84258

diff --git a/pop/pop.c b/pop/pop.c
index 01f8e93..b00274a 100644
--- a/pop/pop.c
+++ b/pop/pop.c
@@ -7,22 +7,14 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <lib-lib/lib-lib.h>
+
+#include <lib-ui/curses.h>
 
 #include "mutt.h"
 #include "mx.h"
 #include "pop.h"
-#include "mutt_crypt.h"
-
-#include "lib/mem.h"
-#include "lib/str.h"
-#include "lib/intl.h"
-#include "lib/debug.h"
-
-#include <string.h>
-#include <unistd.h>
+#include <lib-crypt/crypt.h>
 
 /* write line to file */
 static int fetch_message (char *line, void *file)
@@ -47,7 +39,7 @@ 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];
@@ -59,10 +51,10 @@ static pop_query_status pop_read_header (POP_DATA * pop_data, HEADER * h)
     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);
@@ -70,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."));
       }
@@ -106,6 +94,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;
     }
   }
@@ -118,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;
 }
@@ -174,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."));
     }
@@ -209,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;
   }
 
@@ -223,27 +211,27 @@ 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;
 
@@ -252,7 +240,7 @@ int pop_open_mailbox (CONTEXT * ctx)
 
   conn->data = pop_data;
 
-  FOREVER {
+  for (;;) {
     if (pop_reconnect (ctx) != PQ_OK)
       return -1;
 
@@ -280,12 +268,10 @@ 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);
     }
   }
 }
@@ -321,7 +307,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];
@@ -343,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;
 
@@ -359,7 +345,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+");
@@ -371,7 +359,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;
 
@@ -396,10 +384,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;
@@ -409,11 +397,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);
@@ -422,7 +409,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)
+pop_query_status pop_sync_mailbox (CONTEXT * ctx,
+                                   int unused __attribute__ ((unused)),
+                                   int *index_hint __attribute__ ((unused)))
 {
   int i;
   pop_query_status ret;
@@ -431,7 +420,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;
 
@@ -445,7 +434,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));
     }
 
@@ -465,7 +454,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)
+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;
@@ -507,7 +498,7 @@ void pop_fetch_mail (void)
   CONNECTION *conn;
   CONTEXT ctx;
   MESSAGE *msg = NULL;
-  ACCOUNT acct;
+  ACCOUNT act;
   POP_DATA *pop_data;
 
   if (!PopHost) {
@@ -516,30 +507,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;
   }
 
@@ -548,7 +539,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;
@@ -561,7 +552,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;
@@ -630,22 +621,22 @@ 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);
 }