X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=pop%2Fpop_lib.c;h=8359cac8a0cad0d5354a98ac653f930ae4a9fd51;hp=6b814faf1fa71c3cd5c078c7537d39e137daeed7;hb=617e7d83d14e14e6a520a48e75437211b16c8834;hpb=36d6553c2d1a80b38e961b95ebbfe0290dd5b002

diff --git a/pop/pop_lib.c b/pop/pop_lib.c
index 6b814fa..8359cac 100644
--- a/pop/pop_lib.c
+++ b/pop/pop_lib.c
@@ -11,14 +11,21 @@
 # include "config.h"
 #endif
 
+#include <lib-lib/mem.h>
+
 #include "mutt.h"
+#include "ascii.h"
 #include "mx.h"
 #include "url.h"
 #include "pop.h"
-#ifdef USE_SSL
+#if defined (USE_SSL) || defined (USE_GNUTLS)
 # include "mutt_ssl.h"
 #endif
 
+#include "lib/intl.h"
+#include "lib/debug.h"
+#include "lib/str.h"
+
 #include <string.h>
 #include <unistd.h>
 #include <ctype.h>
@@ -35,7 +42,7 @@ int pop_parse_path (const char *path, ACCOUNT * acct)
   acct->port = POP_PORT;
   acct->type = M_ACCT_TYPE_POP;
 
-  c = safe_strdup (path);
+  c = str_dup (path);
   url_parse_ciss (&url, c);
 
   if (url.scheme == U_POP || url.scheme == U_POPS) {
@@ -48,7 +55,7 @@ int pop_parse_path (const char *path, ACCOUNT * acct)
       ret = 0;
   }
 
-  FREE (&c);
+  p_delete(&c);
   return ret;
 }
 
@@ -60,7 +67,7 @@ void pop_error (POP_DATA * pop_data, char *msg)
   t = strchr (pop_data->err_msg, '\0');
   c = msg;
 
-  if (!mutt_strncmp (msg, "-ERR ", 5)) {
+  if (!str_ncmp (msg, "-ERR ", 5)) {
     c2 = msg + 5;
     SKIPWS (c2);
 
@@ -69,7 +76,7 @@ void pop_error (POP_DATA * pop_data, char *msg)
   }
 
   strfcpy (t, c, sizeof (pop_data->err_msg) - strlen (pop_data->err_msg));
-  mutt_remove_trailing_ws (pop_data->err_msg);
+  str_skip_trailws (pop_data->err_msg);
 }
 
 /* Parse CAPA output */
@@ -79,23 +86,23 @@ static int fetch_capa (char *line, void *data)
   char *c;
 
   if (!ascii_strncasecmp (line, "SASL", 4)) {
-    FREE (&pop_data->auth_list);
+    p_delete(&pop_data->auth_list);
     c = line + 4;
     SKIPWS (c);
-    pop_data->auth_list = safe_strdup (c);
+    pop_data->auth_list = str_dup (c);
   }
 
   else if (!ascii_strncasecmp (line, "STLS", 4))
-    pop_data->cmd_stls = 1;
+    pop_data->cmd_stls = CMD_AVAILABLE;
 
   else if (!ascii_strncasecmp (line, "USER", 4))
-    pop_data->cmd_user = 1;
+    pop_data->cmd_user = CMD_AVAILABLE;
 
   else if (!ascii_strncasecmp (line, "UIDL", 4))
-    pop_data->cmd_uidl = 1;
+    pop_data->cmd_uidl = CMD_AVAILABLE;
 
   else if (!ascii_strncasecmp (line, "TOP", 3))
-    pop_data->cmd_top = 1;
+    pop_data->cmd_top = CMD_AVAILABLE;
 
   return 0;
 }
@@ -106,12 +113,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 = safe_malloc (strlen (line) + 1);
-    *pop_data->auth_list = '\0';
-  }
-  else {
-    safe_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__ */
@@ -125,7 +130,7 @@ static int fetch_auth (char *line, void *data)
  * -1 - conection lost,
  * -2 - execution error.
 */
-static int pop_capabilities (POP_DATA * pop_data, int mode)
+static pop_query_status pop_capabilities (POP_DATA * pop_data, int mode)
 {
   char buf[LONG_STRING];
 
@@ -135,40 +140,46 @@ static int pop_capabilities (POP_DATA * pop_data, int mode)
 
   /* init capabilities */
   if (mode == 0) {
-    pop_data->cmd_capa = 0;
-    pop_data->cmd_stls = 0;
-    pop_data->cmd_user = 0;
-    pop_data->cmd_uidl = 0;
-    pop_data->cmd_top = 0;
+    pop_data->cmd_capa = CMD_NOT_AVAILABLE;
+    pop_data->cmd_stls = CMD_NOT_AVAILABLE;
+    pop_data->cmd_user = CMD_NOT_AVAILABLE;
+    pop_data->cmd_uidl = CMD_NOT_AVAILABLE;
+    pop_data->cmd_top = CMD_NOT_AVAILABLE;
     pop_data->resp_codes = 0;
     pop_data->expire = 1;
     pop_data->login_delay = 0;
-    FREE (&pop_data->auth_list);
+    p_delete(&pop_data->auth_list);
   }
 
   /* Execute CAPA command */
-  if (mode == 0 || pop_data->cmd_capa) {
+  if (mode == 0 || pop_data->cmd_capa != CMD_NOT_AVAILABLE) {
     strfcpy (buf, "CAPA\r\n", sizeof (buf));
     switch (pop_fetch_data (pop_data, buf, NULL, fetch_capa, pop_data)) {
-    case 0:
+    case PQ_OK:
+      {
+        pop_data->cmd_capa = CMD_AVAILABLE;
+        break;
+      }
+    case PFD_FUNCT_ERROR:
+    case PQ_ERR:
       {
-        pop_data->cmd_capa = 1;
+        pop_data->cmd_capa = CMD_NOT_AVAILABLE;
         break;
       }
-    case -1:
-      return -1;
+    case PQ_NOT_CONNECTED:
+      return PQ_NOT_CONNECTED;
     }
   }
 
   /* CAPA not supported, use defaults */
-  if (mode == 0 && !pop_data->cmd_capa) {
-    pop_data->cmd_user = 2;
-    pop_data->cmd_uidl = 2;
-    pop_data->cmd_top = 2;
+  if (mode == 0 && pop_data->cmd_capa == CMD_NOT_AVAILABLE) {
+    pop_data->cmd_user = CMD_UNKNOWN;
+    pop_data->cmd_uidl = CMD_UNKNOWN;
+    pop_data->cmd_top = CMD_UNKNOWN;
 
     strfcpy (buf, "AUTH\r\n", sizeof (buf));
-    if (pop_fetch_data (pop_data, buf, NULL, fetch_auth, pop_data) == -1)
-      return -1;
+    if (pop_fetch_data (pop_data, buf, NULL, fetch_auth, pop_data) == PQ_NOT_CONNECTED)
+      return PQ_NOT_CONNECTED;
   }
 
   /* Check capabilities */
@@ -177,18 +188,18 @@ static int pop_capabilities (POP_DATA * pop_data, int mode)
 
     if (!pop_data->expire)
       msg = _("Unable to leave messages on server.");
-    if (!pop_data->cmd_top)
+    if (pop_data->cmd_top == CMD_NOT_AVAILABLE)
       msg = _("Command TOP is not supported by server.");
-    if (!pop_data->cmd_uidl)
+    if (pop_data->cmd_uidl == CMD_NOT_AVAILABLE)
       msg = _("Command UIDL is not supported by server.");
-    if (msg && pop_data->cmd_capa) {
+    if (msg && pop_data->cmd_capa != CMD_AVAILABLE) {
       mutt_error (msg);
-      return -2;
+      return PQ_ERR;
     }
     pop_data->capabilities = 1;
   }
 
-  return 0;
+  return PQ_OK;
 }
 
 /*
@@ -197,7 +208,7 @@ static int pop_capabilities (POP_DATA * pop_data, int mode)
  * -1 - conection lost,
  * -2 - invalid response.
 */
-int pop_connect (POP_DATA * pop_data)
+pop_query_status pop_connect (POP_DATA * pop_data)
 {
   char buf[LONG_STRING];
 
@@ -206,21 +217,21 @@ int pop_connect (POP_DATA * pop_data)
       mutt_socket_readln (buf, sizeof (buf), pop_data->conn) < 0) {
     mutt_error (_("Error connecting to server: %s"),
                 pop_data->conn->account.host);
-    return -1;
+    return PQ_NOT_CONNECTED;
   }
 
   pop_data->status = POP_CONNECTED;
 
-  if (mutt_strncmp (buf, "+OK", 3)) {
+  if (str_ncmp (buf, "+OK", 3)) {
     *pop_data->err_msg = '\0';
     pop_error (pop_data, buf);
     mutt_error ("%s", pop_data->err_msg);
-    return -2;
+    return PQ_ERR;
   }
 
   pop_apop_timestamp (pop_data, buf);
 
-  return 0;
+  return PQ_OK;
 }
 
 /*
@@ -230,34 +241,36 @@ int pop_connect (POP_DATA * pop_data)
  * -2 - invalid command or execution error,
  * -3 - authentication canceled.
 */
-int pop_open_connection (POP_DATA * pop_data)
+pop_query_status pop_open_connection (POP_DATA * pop_data)
 {
-  int ret;
+  pop_query_status ret;
   unsigned int n, size;
   char buf[LONG_STRING];
 
   ret = pop_connect (pop_data);
-  if (ret < 0) {
+  if (ret != PQ_OK) {
     mutt_sleep (2);
     return ret;
   }
 
   ret = pop_capabilities (pop_data, 0);
-  if (ret == -1)
+  if (ret == PQ_NOT_CONNECTED)
     goto err_conn;
-  if (ret == -2) {
+  if (ret == PQ_ERR) {
     mutt_sleep (2);
-    return -2;
+    return PQ_ERR;
   }
 
-#if (defined(USE_SSL) || defined(USE_GNUTLS)) && !defined(USE_NSS)
+#if (defined(USE_SSL) || defined(USE_GNUTLS))
   /* Attempt STLS if available and desired. */
-  if (pop_data->cmd_stls && !pop_data->conn->ssf) {
+  if (!pop_data->conn->ssf && (pop_data->cmd_stls || option(OPTSSLFORCETLS))) {
+    if (option (OPTSSLFORCETLS))
+      pop_data->use_stls = 2;
     if (pop_data->use_stls == 0) {
       ret = query_quadoption (OPT_SSLSTARTTLS,
                               _("Secure connection with TLS?"));
       if (ret == -1)
-        return -2;
+        return PQ_ERR;
       pop_data->use_stls = 1;
       if (ret == M_YES)
         pop_data->use_stls = 2;
@@ -265,59 +278,63 @@ int pop_open_connection (POP_DATA * pop_data)
     if (pop_data->use_stls == 2) {
       strfcpy (buf, "STLS\r\n", sizeof (buf));
       ret = pop_query (pop_data, buf, sizeof (buf));
-      if (ret == -1)
+      if (ret == PQ_NOT_CONNECTED)
         goto err_conn;
-      if (ret != 0) {
+      if (ret != PQ_OK) {
         mutt_error ("%s", pop_data->err_msg);
         mutt_sleep (2);
       }
-#ifdef USE_SSL
+#if defined (USE_SSL) || defined (USE_GNUTLS)
       else if (mutt_ssl_starttls (pop_data->conn))
-#elif USE_GNUTLS
-      else if (mutt_gnutls_starttls (pop_data->conn))
 #endif
       {
         mutt_error (_("Could not negotiate TLS connection"));
         mutt_sleep (2);
-        return -2;
+        return PQ_ERR;
       }
       else {
         /* recheck capabilities after STLS completes */
         ret = pop_capabilities (pop_data, 1);
-        if (ret == -1)
+        if (ret == PQ_NOT_CONNECTED)
           goto err_conn;
-        if (ret == -2) {
+        if (ret == PQ_ERR) {
           mutt_sleep (2);
-          return -2;
+          return PQ_ERR;
         }
       }
     }
   }
+
+  if (option(OPTSSLFORCETLS) && !pop_data->conn->ssf) {
+    mutt_error _("Encrypted connection unavailable");
+    mutt_sleep (1);
+    return -2;
+  }
 #endif
 
   ret = pop_authenticate (pop_data);
-  if (ret == -1)
+  if (ret == PQ_NOT_CONNECTED)
     goto err_conn;
-  if (ret == -3)
+  if (ret == PFD_FUNCT_ERROR)
     mutt_clear_error ();
-  if (ret != 0)
+  if (ret != PQ_OK)
     return ret;
 
   /* recheck capabilities after authentication */
   ret = pop_capabilities (pop_data, 2);
-  if (ret == -1)
+  if (ret == PQ_NOT_CONNECTED)
     goto err_conn;
-  if (ret == -2) {
+  if (ret == PQ_ERR) {
     mutt_sleep (2);
-    return -2;
+    return PQ_ERR;
   }
 
   /* get total size of mailbox */
   strfcpy (buf, "STAT\r\n", sizeof (buf));
   ret = pop_query (pop_data, buf, sizeof (buf));
-  if (ret == -1)
+  if (ret == PQ_NOT_CONNECTED)
     goto err_conn;
-  if (ret == -2) {
+  if (ret == PQ_ERR) {
     mutt_error ("%s", pop_data->err_msg);
     mutt_sleep (2);
     return ret;
@@ -325,20 +342,20 @@ int pop_open_connection (POP_DATA * pop_data)
 
   sscanf (buf, "+OK %u %u", &n, &size);
   pop_data->size = size;
-  return 0;
+  return PQ_OK;
 
 err_conn:
   pop_data->status = POP_DISCONNECTED;
   mutt_error _("Server closed connection!");
 
   mutt_sleep (2);
-  return -1;
+  return PQ_NOT_CONNECTED;
 }
 
 /* logout from POP server */
 void pop_logout (CONTEXT * ctx)
 {
-  int ret = 0;
+  pop_query_status ret = 0;
   char buf[LONG_STRING];
   POP_DATA *pop_data = (POP_DATA *) ctx->data;
 
@@ -350,7 +367,7 @@ void pop_logout (CONTEXT * ctx)
       ret = pop_query (pop_data, buf, sizeof (buf));
     }
 
-    if (ret != -1) {
+    if (ret != PQ_NOT_CONNECTED) {
       strfcpy (buf, "QUIT\r\n", sizeof (buf));
       pop_query (pop_data, buf, sizeof (buf));
     }
@@ -368,19 +385,19 @@ void pop_logout (CONTEXT * ctx)
  * -1 - conection lost,
  * -2 - invalid command or execution error.
 */
-int 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;
 
   if (pop_data->status != POP_CONNECTED)
-    return -1;
+    return PQ_NOT_CONNECTED;
 
 #ifdef DEBUG
   /* print msg instaed of real command */
   if (msg) {
     dbg = M_SOCK_LOG_FULL;
-    dprint (M_SOCK_LOG_CMD, (debugfile, "> %s", msg));
+    debug_print (M_SOCK_LOG_CMD, ("> %s", msg));
   }
 #endif
 
@@ -392,13 +409,13 @@ int pop_query_d (POP_DATA * pop_data, char *buf, size_t buflen, char *msg)
 
   if (mutt_socket_readln (buf, buflen, pop_data->conn) < 0) {
     pop_data->status = POP_DISCONNECTED;
-    return -1;
+    return PQ_NOT_CONNECTED;
   }
-  if (!mutt_strncmp (buf, "+OK", 3))
-    return 0;
+  if (!str_ncmp (buf, "+OK", 3))
+    return PQ_OK;
 
   pop_error (pop_data, buf);
-  return -2;
+  return PQ_ERR;
 }
 
 /*
@@ -410,21 +427,23 @@ int pop_query_d (POP_DATA * pop_data, char *buf, size_t buflen, char *msg)
  * -2 - invalid command or execution error,
  * -3 - error in funct(*line, *data)
  */
-int 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;
-  int ret, chunk, line = 0;
+  pop_query_status ret;
+  int chunk = 0;
+  long pos = 0;
   size_t lenbuf = 0;
 
   strfcpy (buf, query, sizeof (buf));
   ret = pop_query (pop_data, buf, sizeof (buf));
-  if (ret < 0)
+  if (ret != PQ_OK)
     return ret;
 
-  inbuf = safe_malloc (sizeof (buf));
+  inbuf = p_new(char, sizeof(buf));
 
   FOREVER {
     chunk =
@@ -432,7 +451,7 @@ int pop_fetch_data (POP_DATA * pop_data, char *query, char *msg,
                             M_SOCK_LOG_HDR);
     if (chunk < 0) {
       pop_data->status = POP_DISCONNECTED;
-      ret = -1;
+      ret = PQ_NOT_CONNECTED;
       break;
     }
 
@@ -443,24 +462,24 @@ int pop_fetch_data (POP_DATA * pop_data, char *query, char *msg,
       p++;
     }
 
-    strfcpy (inbuf + lenbuf, p, sizeof (buf));
+    strfcpy(inbuf + lenbuf, p, sizeof(buf));
+    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 = -3;
+        ret = PFD_FUNCT_ERROR;
       lenbuf = 0;
     }
 
-    safe_realloc (&inbuf, lenbuf + sizeof (buf));
+    p_realloc(&inbuf, lenbuf + sizeof(buf));
   }
 
-  FREE (&inbuf);
+  p_delete(&inbuf);
   return ret;
 }
 
@@ -473,7 +492,7 @@ static int check_uidl (char *line, void *data)
 
   sscanf (line, "%u %s", &index, line);
   for (i = 0; i < ctx->msgcount; i++) {
-    if (!mutt_strcmp (ctx->hdrs[i]->data, line)) {
+    if (!str_cmp (ctx->hdrs[i]->data, line)) {
       ctx->hdrs[i]->refno = index;
       break;
     }
@@ -482,47 +501,49 @@ static int check_uidl (char *line, void *data)
   return 0;
 }
 
-/* reconnect and verify idnexes if connection was lost */
-int pop_reconnect (CONTEXT * ctx)
+/* reconnect and verify indexes if connection was lost */
+pop_query_status pop_reconnect (CONTEXT * ctx)
 {
-  int ret;
+  pop_query_status ret;
   POP_DATA *pop_data = (POP_DATA *) ctx->data;
+  progress_t bar;
 
   if (pop_data->status == POP_CONNECTED)
-    return 0;
+    return PQ_OK;
   if (pop_data->status == POP_BYE)
-    return -1;
+    return PQ_NOT_CONNECTED;
 
   FOREVER {
     mutt_socket_close (pop_data->conn);
 
     ret = pop_open_connection (pop_data);
-    if (ret == 0) {
-      char *msg = _("Verifying message indexes...");
+    if (ret == PQ_OK) {
       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);
-      if (ret == -2) {
+      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);
       }
     }
-    if (ret == 0)
-      return 0;
+    if (ret == PQ_OK)
+      return PQ_OK;
 
     pop_logout (ctx);
 
-    if (ret < -1)
-      return -1;
+    if (ret == PQ_ERR)
+      return PQ_NOT_CONNECTED;
 
     if (query_quadoption (OPT_POPRECONNECT,
                           _("Connection lost. Reconnect to POP server?")) !=
         M_YES)
-      return -1;
+      return PQ_NOT_CONNECTED;
   }
 }