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

diff --git a/pop/pop.c b/pop/pop.c
index f39f023..5f8933e 100644
--- a/pop/pop.c
+++ b/pop/pop.c
@@ -11,13 +11,21 @@
 # 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-ui/curses.h>
+
 #include "mutt.h"
 #include "mx.h"
 #include "pop.h"
-#include "mutt_crypt.h"
-
-#include <string.h>
-#include <unistd.h>
+#include <lib-crypt/crypt.h>
 
 /* write line to file */
 static int fetch_message (char *line, void *file)
@@ -39,10 +47,11 @@ static int fetch_message (char *line, void *file)
  * -2 - invalid command or execution error,
  * -3 - error writing to tempfile
  */
-static int pop_read_header (POP_DATA * pop_data, HEADER * h)
+static pop_query_status pop_read_header (POP_DATA * pop_data, HEADER * h)
 {
   FILE *f;
-  int ret, index;
+  int idx;
+  pop_query_status ret;
   long length;
   char buf[LONG_STRING];
   char tempfile[_POSIX_PATH_MAX];
@@ -50,28 +59,28 @@ static int pop_read_header (POP_DATA * pop_data, HEADER * h)
   mutt_mktemp (tempfile);
   if (!(f = safe_fopen (tempfile, "w+"))) {
     mutt_perror (tempfile);
-    return -3;
+    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 == 0) {
-    sscanf (buf, "+OK %d %ld", &index, &length);
+  if (ret == PQ_OK) {
+    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);
 
-    if (pop_data->cmd_top == 2) {
-      if (ret == 0) {
-        pop_data->cmd_top = 1;
+    if (pop_data->cmd_top == CMD_UNKNOWN) {
+      if (ret == PQ_OK) {
+        pop_data->cmd_top = CMD_AVAILABLE;
 
-        dprint (1, (debugfile, "pop_read_header: set TOP capability\n"));
+        debug_print (1, ("set TOP capability\n"));
       }
 
-      if (ret == -2) {
-        pop_data->cmd_top = 0;
+      if (ret == PQ_ERR) {
+        pop_data->cmd_top = CMD_NOT_AVAILABLE;
 
-        dprint (1, (debugfile, "pop_read_header: unset TOP capability\n"));
+        debug_print (1, ("unset TOP capability\n"));
         snprintf (pop_data->err_msg, sizeof (pop_data->err_msg),
                   _("Command TOP is not supported by server."));
       }
@@ -79,7 +88,7 @@ static int pop_read_header (POP_DATA * pop_data, HEADER * h)
   }
 
   switch (ret) {
-  case 0:
+  case PQ_OK:
     {
       rewind (f);
       h->env = mutt_read_rfc822_header (f, h, 0, 0);
@@ -91,15 +100,20 @@ static int pop_read_header (POP_DATA * pop_data, HEADER * h)
       }
       break;
     }
-  case -2:
+  case PQ_ERR:
     {
       mutt_error ("%s", pop_data->err_msg);
       break;
     }
-  case -3:
+  case PFD_FUNCT_ERROR:
     {
       mutt_error _("Can't write header to temporary file!");
 
+      break;
+    }
+  case PQ_NOT_CONNECTED:
+    {
+      mutt_error _("Can't fetch header: Not connected!");
       break;
     }
   }
@@ -112,32 +126,30 @@ static int 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 (!mutt_strcmp (line, ctx->hdrs[i]->data))
+    if (!m_strcmp(line, ctx->hdrs[i]->data))
       break;
 
   if (i == ctx->msgcount) {
-    dprint (1,
-            (debugfile, "pop_fetch_headers: new header %d %s\n", index,
-             line));
+    debug_print (1, ("new header %d %s\n", idx, line));
 
     if (i >= ctx->hdrmax)
       mx_alloc_memory (ctx);
 
     ctx->msgcount++;
-    ctx->hdrs[i] = mutt_new_header ();
-    ctx->hdrs[i]->data = safe_strdup (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;
 }
@@ -152,7 +164,8 @@ static int fetch_uidl (char *line, void *data)
  */
 static int pop_fetch_headers (CONTEXT * ctx)
 {
-  int i, ret, old_count, new_count;
+  int i, old_count, new_count;
+  pop_query_status ret;
   POP_DATA *pop_data = (POP_DATA *) ctx->data;
 
   time (&pop_data->check_time);
@@ -166,23 +179,23 @@ static int pop_fetch_headers (CONTEXT * ctx)
   new_count = ctx->msgcount;
   ctx->msgcount = old_count;
 
-  if (pop_data->cmd_uidl == 2) {
-    if (ret == 0) {
-      pop_data->cmd_uidl = 1;
+  if (pop_data->cmd_uidl == CMD_UNKNOWN) {
+    if (ret == PQ_OK) {
+      pop_data->cmd_uidl = CMD_AVAILABLE;
 
-      dprint (1, (debugfile, "pop_fetch_headers: set UIDL capability\n"));
+      debug_print (1, ("set UIDL capability\n"));
     }
 
-    if (ret == -2 && pop_data->cmd_uidl == 2) {
-      pop_data->cmd_uidl = 0;
+    if (ret == PQ_ERR && pop_data->cmd_uidl == CMD_UNKNOWN) {
+      pop_data->cmd_uidl = CMD_NOT_AVAILABLE;
 
-      dprint (1, (debugfile, "pop_fetch_headers: unset UIDL capability\n"));
+      debug_print (1, ("unset UIDL capability\n"));
       snprintf (pop_data->err_msg, sizeof (pop_data->err_msg),
                 _("Command UIDL is not supported by server."));
     }
   }
 
-  if (ret == 0) {
+  if (ret == PQ_OK) {
     for (i = 0; i < old_count; i++)
       if (ctx->hdrs[i]->refno == -1)
         ctx->hdrs[i]->deleted = 1;
@@ -192,7 +205,7 @@ static int pop_fetch_headers (CONTEXT * ctx)
                     i + 1 - old_count, new_count - old_count);
 
       ret = pop_read_header (pop_data, ctx->hdrs[i]);
-      if (ret < 0)
+      if (ret != PQ_OK)
         break;
 
       ctx->msgcount++;
@@ -202,9 +215,9 @@ static int pop_fetch_headers (CONTEXT * ctx)
       mx_update_context (ctx, i - old_count);
   }
 
-  if (ret < 0) {
+  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;
   }
 
@@ -218,27 +231,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;
 
-  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;
 
@@ -247,8 +260,8 @@ int pop_open_mailbox (CONTEXT * ctx)
 
   conn->data = pop_data;
 
-  FOREVER {
-    if (pop_reconnect (ctx) < 0)
+  for (;;) {
+    if (pop_reconnect (ctx) != PQ_OK)
       return -1;
 
     ctx->size = pop_data->size;
@@ -275,12 +288,12 @@ static void pop_clear_cache (POP_DATA * pop_data)
   if (!pop_data->clear_cache)
     return;
 
-  dprint (1, (debugfile, "pop_clear_cache: delete cached messages\n"));
+  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);
-      FREE (&pop_data->cache[i].path);
+      p_delete(&pop_data->cache[i].path);
     }
   }
 }
@@ -316,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];
@@ -338,12 +351,12 @@ 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 {
-    if (pop_reconnect (ctx) < 0)
+  for (;;) {
+    if (pop_reconnect (ctx) != PQ_OK)
       return -1;
 
     /* verify that massage index is correct */
@@ -354,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+");
@@ -366,20 +381,20 @@ 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);
-    if (ret == 0)
+    ret = pop_fetch_data (pop_data, buf, &bar, fetch_message, msg->fp);
+    if (ret == PQ_OK)
       break;
 
     safe_fclose (&msg->fp);
     unlink (path);
 
-    if (ret == -2) {
+    if (ret == PQ_ERR) {
       mutt_error ("%s", pop_data->err_msg);
       mutt_sleep (2);
       return -1;
     }
 
-    if (ret == -3) {
+    if (ret == PFD_FUNCT_ERROR) {
       mutt_error _("Can't write message to temporary file!");
 
       mutt_sleep (2);
@@ -391,10 +406,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 = safe_strdup (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;
@@ -404,11 +419,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);
@@ -417,17 +431,20 @@ int pop_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno)
 }
 
 /* update POP mailbox - delete messages from server */
-int pop_sync_mailbox (CONTEXT * ctx, int *index_hint)
+pop_query_status pop_sync_mailbox (CONTEXT * ctx,
+                                   int unused __attribute__ ((unused)),
+                                   int *index_hint __attribute__ ((unused)))
 {
-  int i, ret;
+  int i;
+  pop_query_status ret;
   char buf[LONG_STRING];
   POP_DATA *pop_data = (POP_DATA *) ctx->data;
 
   pop_data->check_time = 0;
 
-  FOREVER {
-    if (pop_reconnect (ctx) < 0)
-      return -1;
+  for (;;) {
+    if (pop_reconnect (ctx) != PQ_OK)
+      return PQ_NOT_CONNECTED;
 
     mutt_message (_("Marking %d messages deleted..."), ctx->deleted);
 
@@ -438,28 +455,30 @@ int pop_sync_mailbox (CONTEXT * ctx, int *index_hint)
       }
     }
 
-    if (ret == 0) {
-      strfcpy (buf, "QUIT\r\n", sizeof (buf));
+    if (ret == PQ_OK) {
+      m_strcpy(buf, sizeof(buf), "QUIT\r\n");
       ret = pop_query (pop_data, buf, sizeof (buf));
     }
 
-    if (ret == 0) {
+    if (ret == PQ_OK) {
       pop_data->clear_cache = 1;
       pop_clear_cache (pop_data);
       pop_data->status = POP_DISCONNECTED;
-      return 0;
+      return PQ_OK;
     }
 
-    if (ret == -2) {
+    if (ret == PQ_ERR) {
       mutt_error ("%s", pop_data->err_msg);
       mutt_sleep (2);
-      return -1;
+      return PQ_NOT_CONNECTED;
     }
   }
 }
 
 /* Check for new messages and fetch headers */
-int pop_check_mailbox (CONTEXT * ctx, int *index_hint)
+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;
@@ -496,11 +515,12 @@ void pop_fetch_mail (void)
   char buffer[LONG_STRING];
   char msgbuf[SHORT_STRING];
   char *url, *p;
-  int i, delanswer, last = 0, msgs, bytes, rset = 0, ret;
+  int i, delanswer, last = 0, msgs, bytes, rset = 0;
+  pop_query_status ret;
   CONNECTION *conn;
   CONTEXT ctx;
   MESSAGE *msg = NULL;
-  ACCOUNT acct;
+  ACCOUNT act;
   POP_DATA *pop_data;
 
   if (!PopHost) {
@@ -509,30 +529,30 @@ 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');
   }
   strcpy (p, PopHost);          /* __STRCPY_CHECKED__ */
 
-  ret = pop_parse_path (url, &acct);
-  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 = 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;
   }
 
@@ -541,11 +561,11 @@ 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 == -1)
+  if (ret == PQ_NOT_CONNECTED)
     goto fail;
-  if (ret == -2) {
+  if (ret == PQ_ERR) {
     mutt_error ("%s", pop_data->err_msg);
     goto finish;
   }
@@ -554,11 +574,11 @@ 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 == -1)
+    if (ret == PQ_NOT_CONNECTED)
       goto fail;
-    if (ret == 0)
+    if (ret == PQ_OK)
       sscanf (buffer, "+OK %d", &last);
   }
 
@@ -584,32 +604,32 @@ void pop_fetch_mail (void)
     else {
       snprintf (buffer, sizeof (buffer), "RETR %d\r\n", i);
       ret = pop_fetch_data (pop_data, buffer, NULL, fetch_message, msg->fp);
-      if (ret == -3)
+      if (ret == PFD_FUNCT_ERROR)
         rset = 1;
 
-      if (ret == 0 && mx_commit_message (msg, &ctx) != 0) {
+      if (ret == PQ_OK && mx_commit_message (msg, &ctx) != 0) {
         rset = 1;
-        ret = -3;
+        ret = PFD_FUNCT_ERROR;
       }
 
       mx_close_message (&msg);
     }
 
-    if (ret == 0 && delanswer == M_YES) {
+    if (ret == PQ_OK && delanswer == M_YES) {
       /* delete the message on the server */
       snprintf (buffer, sizeof (buffer), "DELE %d\r\n", i);
       ret = pop_query (pop_data, buffer, sizeof (buffer));
     }
 
-    if (ret == -1) {
+    if (ret == PQ_NOT_CONNECTED) {
       mx_close_mailbox (&ctx, NULL);
       goto fail;
     }
-    if (ret == -2) {
+    if (ret == PQ_ERR) {
       mutt_error ("%s", pop_data->err_msg);
       break;
     }
-    if (ret == -3) {
+    if (ret == -3) { /* this is -3 when ret != 0, because it will keep the value from before *gna* */
       mutt_error _("Error while writing mailbox!");
 
       break;
@@ -623,22 +643,22 @@ void pop_fetch_mail (void)
 
   if (rset) {
     /* make sure no messages get deleted */
-    strfcpy (buffer, "RSET\r\n", sizeof (buffer));
-    if (pop_query (pop_data, buffer, sizeof (buffer)) == -1)
+    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));
-  if (pop_query (pop_data, buffer, sizeof (buffer)) == -1)
+  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);
-  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);
 }