X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=pop%2Fpop_lib.c;h=e462a6a74b1e44ea6d668104e70acefb95778f51;hp=22b2eaa01cc8dd3dc9f94700c9cab4c4df8fad87;hb=08fa240d29322ece4c7bceebfae6c6d3fb856f0e;hpb=29ed7b79229bb8e12bb1ead911a9a48031861ede

diff --git a/pop/pop_lib.c b/pop/pop_lib.c
index 22b2eaa..e462a6a 100644
--- a/pop/pop_lib.c
+++ b/pop/pop_lib.c
@@ -11,19 +11,20 @@
 # include "config.h"
 #endif
 
+#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/ascii.h>
+#include <lib-lib/macros.h>
+
 #include "mutt.h"
-#include "ascii.h"
 #include "mx.h"
 #include "url.h"
 #include "pop.h"
 #if defined (USE_SSL) || defined (USE_GNUTLS)
-# include "mutt_ssl.h"
+# include <lib-network/mutt_ssl.h>
 #endif
 
-#include "lib/mem.h"
-#include "lib/intl.h"
 #include "lib/debug.h"
-#include "lib/str.h"
 
 #include <string.h>
 #include <unistd.h>
@@ -41,7 +42,7 @@ int pop_parse_path (const char *path, ACCOUNT * acct)
   acct->port = POP_PORT;
   acct->type = M_ACCT_TYPE_POP;
 
-  c = str_dup (path);
+  c = m_strdup(path);
   url_parse_ciss (&url, c);
 
   if (url.scheme == U_POP || url.scheme == U_POPS) {
@@ -54,7 +55,7 @@ int pop_parse_path (const char *path, ACCOUNT * acct)
       ret = 0;
   }
 
-  mem_free (&c);
+  p_delete(&c);
   return ret;
 }
 
@@ -66,16 +67,14 @@ void pop_error (POP_DATA * pop_data, char *msg)
   t = strchr (pop_data->err_msg, '\0');
   c = msg;
 
-  if (!str_ncmp (msg, "-ERR ", 5)) {
-    c2 = msg + 5;
-    SKIPWS (c2);
-
+  if (!m_strncmp(msg, "-ERR ", 5)) {
+    c2 = vskipspaces(msg + 5);
     if (*c2)
       c = c2;
   }
 
-  strfcpy (t, c, sizeof (pop_data->err_msg) - strlen (pop_data->err_msg));
-  str_skip_trailws (pop_data->err_msg);
+  m_strcpy(t, sizeof(pop_data->err_msg) - strlen(pop_data->err_msg), c);
+  m_strrtrim(pop_data->err_msg);
 }
 
 /* Parse CAPA output */
@@ -85,10 +84,9 @@ static int fetch_capa (char *line, void *data)
   char *c;
 
   if (!ascii_strncasecmp (line, "SASL", 4)) {
-    mem_free (&pop_data->auth_list);
-    c = line + 4;
-    SKIPWS (c);
-    pop_data->auth_list = str_dup (c);
+    p_delete(&pop_data->auth_list);
+    c = vskipspaces(line + 4);
+    pop_data->auth_list = m_strdup(c);
   }
 
   else if (!ascii_strncasecmp (line, "STLS", 4))
@@ -112,12 +110,10 @@ static int fetch_auth (char *line, void *data)
   POP_DATA *pop_data = (POP_DATA *) data;
 
   if (!pop_data->auth_list) {
-    pop_data->auth_list = mem_malloc (strlen (line) + 1);
-    *pop_data->auth_list = '\0';
-  }
-  else {
-    mem_realloc (&pop_data->auth_list,
-                  strlen (pop_data->auth_list) + strlen (line) + 2);
+    pop_data->auth_list = p_new(char, strlen(line) + 1);
+  } else {
+    p_realloc(&pop_data->auth_list,
+              strlen(pop_data->auth_list) + strlen(line) + 2);
     strcat (pop_data->auth_list, " ");  /* __STRCAT_CHECKED__ */
   }
   strcat (pop_data->auth_list, line);   /* __STRCAT_CHECKED__ */
@@ -149,12 +145,12 @@ static pop_query_status pop_capabilities (POP_DATA * pop_data, int mode)
     pop_data->resp_codes = 0;
     pop_data->expire = 1;
     pop_data->login_delay = 0;
-    mem_free (&pop_data->auth_list);
+    p_delete(&pop_data->auth_list);
   }
 
   /* Execute CAPA command */
   if (mode == 0 || pop_data->cmd_capa != CMD_NOT_AVAILABLE) {
-    strfcpy (buf, "CAPA\r\n", sizeof (buf));
+    m_strcpy(buf, sizeof(buf), "CAPA\r\n");
     switch (pop_fetch_data (pop_data, buf, NULL, fetch_capa, pop_data)) {
     case PQ_OK:
       {
@@ -178,7 +174,7 @@ static pop_query_status pop_capabilities (POP_DATA * pop_data, int mode)
     pop_data->cmd_uidl = CMD_UNKNOWN;
     pop_data->cmd_top = CMD_UNKNOWN;
 
-    strfcpy (buf, "AUTH\r\n", sizeof (buf));
+    m_strcpy(buf, sizeof(buf), "AUTH\r\n");
     if (pop_fetch_data (pop_data, buf, NULL, fetch_auth, pop_data) == PQ_NOT_CONNECTED)
       return PQ_NOT_CONNECTED;
   }
@@ -223,7 +219,7 @@ pop_query_status pop_connect (POP_DATA * pop_data)
 
   pop_data->status = POP_CONNECTED;
 
-  if (str_ncmp (buf, "+OK", 3)) {
+  if (m_strncmp(buf, "+OK", 3)) {
     *pop_data->err_msg = '\0';
     pop_error (pop_data, buf);
     mutt_error ("%s", pop_data->err_msg);
@@ -277,7 +273,7 @@ pop_query_status pop_open_connection (POP_DATA * pop_data)
         pop_data->use_stls = 2;
     }
     if (pop_data->use_stls == 2) {
-      strfcpy (buf, "STLS\r\n", sizeof (buf));
+      m_strcpy(buf, sizeof(buf), "STLS\r\n");
       ret = pop_query (pop_data, buf, sizeof (buf));
       if (ret == PQ_NOT_CONNECTED)
         goto err_conn;
@@ -331,7 +327,7 @@ pop_query_status pop_open_connection (POP_DATA * pop_data)
   }
 
   /* get total size of mailbox */
-  strfcpy (buf, "STAT\r\n", sizeof (buf));
+  m_strcpy(buf, sizeof(buf), "STAT\r\n");
   ret = pop_query (pop_data, buf, sizeof (buf));
   if (ret == PQ_NOT_CONNECTED)
     goto err_conn;
@@ -364,12 +360,12 @@ void pop_logout (CONTEXT * ctx)
     mutt_message _("Closing connection to POP server...");
 
     if (ctx->readonly) {
-      strfcpy (buf, "RSET\r\n", sizeof (buf));
+      m_strcpy(buf, sizeof(buf), "RSET\r\n");
       ret = pop_query (pop_data, buf, sizeof (buf));
     }
 
     if (ret != PQ_NOT_CONNECTED) {
-      strfcpy (buf, "QUIT\r\n", sizeof (buf));
+      m_strcpy(buf, sizeof(buf), "QUIT\r\n");
       pop_query (pop_data, buf, sizeof (buf));
     }
 
@@ -386,7 +382,7 @@ void pop_logout (CONTEXT * ctx)
  * -1 - conection lost,
  * -2 - invalid command or execution error.
 */
-pop_query_status pop_query_d (POP_DATA * pop_data, char *buf, size_t buflen, char *msg)
+pop_query_status pop_query_d (POP_DATA * pop_data, char *buf, size_t buflen, const char *msg)
 {
   int dbg = M_SOCK_LOG_CMD;
   char *c;
@@ -412,7 +408,7 @@ pop_query_status pop_query_d (POP_DATA * pop_data, char *buf, size_t buflen, cha
     pop_data->status = POP_DISCONNECTED;
     return PQ_NOT_CONNECTED;
   }
-  if (!str_ncmp (buf, "+OK", 3))
+  if (!m_strncmp(buf, "+OK", 3))
     return PQ_OK;
 
   pop_error (pop_data, buf);
@@ -428,24 +424,25 @@ pop_query_status pop_query_d (POP_DATA * pop_data, char *buf, size_t buflen, cha
  * -2 - invalid command or execution error,
  * -3 - error in funct(*line, *data)
  */
-pop_query_status pop_fetch_data (POP_DATA * pop_data, char *query, char *msg,
+pop_query_status pop_fetch_data (POP_DATA * pop_data, const char *query, progress_t* bar,
                     int (*funct) (char *, void *), void *data)
 {
   char buf[LONG_STRING];
   char *inbuf;
   char *p;
   pop_query_status ret;
-  int chunk, line = 0;
+  int chunk = 0;
+  long pos = 0;
   size_t lenbuf = 0;
 
-  strfcpy (buf, query, sizeof (buf));
+  m_strcpy(buf, sizeof(buf), query);
   ret = pop_query (pop_data, buf, sizeof (buf));
   if (ret != PQ_OK)
     return ret;
 
-  inbuf = mem_malloc (sizeof (buf));
+  inbuf = p_new(char, sizeof(buf));
 
-  FOREVER {
+  for (;;) {
     chunk =
       mutt_socket_readln_d (buf, sizeof (buf), pop_data->conn,
                             M_SOCK_LOG_HDR);
@@ -462,24 +459,24 @@ pop_query_status pop_fetch_data (POP_DATA * pop_data, char *query, char *msg,
       p++;
     }
 
-    strfcpy (inbuf + lenbuf, p, sizeof (buf));
+    m_strcpy(inbuf + lenbuf,sizeof(buf), p);
+    pos += chunk;
 
     if (chunk >= sizeof (buf)) {
       lenbuf += strlen (p);
     }
     else {
-      line++;
-      if (msg && ReadInc && (line % ReadInc == 0))
-        mutt_message ("%s %d", msg, line);
+      if (bar)
+        mutt_progress_bar (bar, pos);
       if (ret == 0 && funct (inbuf, data) < 0)
         ret = PFD_FUNCT_ERROR;
       lenbuf = 0;
     }
 
-    mem_realloc (&inbuf, lenbuf + sizeof (buf));
+    p_realloc(&inbuf, lenbuf + sizeof(buf));
   }
 
-  mem_free (&inbuf);
+  p_delete(&inbuf);
   return ret;
 }
 
@@ -492,7 +489,7 @@ static int check_uidl (char *line, void *data)
 
   sscanf (line, "%u %s", &index, line);
   for (i = 0; i < ctx->msgcount; i++) {
-    if (!str_cmp (ctx->hdrs[i]->data, line)) {
+    if (!m_strcmp(ctx->hdrs[i]->data, line)) {
       ctx->hdrs[i]->refno = index;
       break;
     }
@@ -506,26 +503,28 @@ pop_query_status pop_reconnect (CONTEXT * ctx)
 {
   pop_query_status ret;
   POP_DATA *pop_data = (POP_DATA *) ctx->data;
+  progress_t bar;
 
   if (pop_data->status == POP_CONNECTED)
     return PQ_OK;
   if (pop_data->status == POP_BYE)
     return PQ_NOT_CONNECTED;
 
-  FOREVER {
+  for (;;) {
     mutt_socket_close (pop_data->conn);
 
     ret = pop_open_connection (pop_data);
     if (ret == PQ_OK) {
-      char *msg = _("Verifying message indexes...");
       int i;
 
+      bar.msg = _("Verifying message indexes...");
+      bar.size = 0;
+      mutt_progress_bar (&bar, 0);
+
       for (i = 0; i < ctx->msgcount; i++)
         ctx->hdrs[i]->refno = -1;
 
-      mutt_message (msg);
-
-      ret = pop_fetch_data (pop_data, "UIDL\r\n", msg, check_uidl, ctx);
+      ret = pop_fetch_data(pop_data, "UIDL\r\n", &bar, check_uidl, ctx);
       if (ret == PQ_ERR) {
         mutt_error ("%s", pop_data->err_msg);
         mutt_sleep (2);