X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=pop%2Fpop_lib.c;h=143868e4c33863b46430b58c23f7e6e641645e89;hp=3a86c6a51c74bb83aac05f575e3ae4c248164792;hb=ba5e3af4ea19e1d20c80941c077039871ec84258;hpb=cc917eda58cb573cd3f56337dfe088a94e23649c

diff --git a/pop/pop_lib.c b/pop/pop_lib.c
index 3a86c6a..143868e 100644
--- a/pop/pop_lib.c
+++ b/pop/pop_lib.c
@@ -19,6 +19,11 @@
 # include "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>
 #include <ctype.h>
@@ -35,7 +40,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 +53,7 @@ int pop_parse_path (const char *path, ACCOUNT * acct)
       ret = 0;
   }
 
-  FREE (&c);
+  mem_free (&c);
   return ret;
 }
 
@@ -60,7 +65,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 +74,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 +84,23 @@ static int fetch_capa (char *line, void *data)
   char *c;
 
   if (!ascii_strncasecmp (line, "SASL", 4)) {
-    FREE (&pop_data->auth_list);
+    mem_free (&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,11 +111,11 @@ 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 = mem_malloc (strlen (line) + 1);
     *pop_data->auth_list = '\0';
   }
   else {
-    safe_realloc (&pop_data->auth_list,
+    mem_realloc (&pop_data->auth_list,
                   strlen (pop_data->auth_list) + strlen (line) + 2);
     strcat (pop_data->auth_list, " ");  /* __STRCAT_CHECKED__ */
   }
@@ -135,24 +140,29 @@ static pop_query_status 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);
+    mem_free (&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 PQ_OK:
       {
-        pop_data->cmd_capa = 1;
+        pop_data->cmd_capa = CMD_AVAILABLE;
+        break;
+      }
+    case PQ_ERR:
+      {
+        pop_data->cmd_capa = CMD_NOT_AVAILABLE;
         break;
       }
     case PQ_NOT_CONNECTED:
@@ -161,10 +171,10 @@ static pop_query_status pop_capabilities (POP_DATA * pop_data, int mode)
   }
 
   /* 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) == PQ_NOT_CONNECTED)
@@ -177,11 +187,11 @@ static pop_query_status 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 PQ_ERR;
     }
@@ -197,7 +207,7 @@ static pop_query_status 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 +216,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;
 }
 
 /*
@@ -250,9 +260,11 @@ pop_query_status pop_open_connection (POP_DATA * pop_data)
     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?"));
@@ -293,6 +305,12 @@ pop_query_status pop_open_connection (POP_DATA * pop_data)
       }
     }
   }
+
+  if (option(OPTSSLFORCETLS) && !pop_data->conn->ssf) {
+    mutt_error _("Encrypted connection unavailable");
+    mutt_sleep (1);
+    return -2;
+  }
 #endif
 
   ret = pop_authenticate (pop_data);
@@ -380,7 +398,7 @@ pop_query_status pop_query_d (POP_DATA * pop_data, char *buf, size_t buflen, cha
   /* 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
 
@@ -394,7 +412,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 (!mutt_strncmp (buf, "+OK", 3))
+  if (!str_ncmp (buf, "+OK", 3))
     return PQ_OK;
 
   pop_error (pop_data, buf);
@@ -425,7 +443,7 @@ pop_query_status pop_fetch_data (POP_DATA * pop_data, char *query, char *msg,
   if (ret != PQ_OK)
     return ret;
 
-  inbuf = safe_malloc (sizeof (buf));
+  inbuf = mem_malloc (sizeof (buf));
 
   FOREVER {
     chunk =
@@ -458,10 +476,10 @@ pop_query_status pop_fetch_data (POP_DATA * pop_data, char *query, char *msg,
       lenbuf = 0;
     }
 
-    safe_realloc (&inbuf, lenbuf + sizeof (buf));
+    mem_realloc (&inbuf, lenbuf + sizeof (buf));
   }
 
-  FREE (&inbuf);
+  mem_free (&inbuf);
   return ret;
 }
 
@@ -474,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;
     }
@@ -483,7 +501,7 @@ static int check_uidl (char *line, void *data)
   return 0;
 }
 
-/* reconnect and verify idnexes if connection was lost */
+/* reconnect and verify indexes if connection was lost */
 pop_query_status pop_reconnect (CONTEXT * ctx)
 {
   pop_query_status ret;