X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=pop%2Fpop_lib.c;h=22b2eaa01cc8dd3dc9f94700c9cab4c4df8fad87;hb=b85f52d2ec4d820ab5c4b577857548bec294bb27;hp=2cd84f08fef33f2b7295e4a4cd479911e9c34c3f;hpb=a8477ebaa09990b3688164cbe5cf661c4189541d;p=apps%2Fmadmutt.git

diff --git a/pop/pop_lib.c b/pop/pop_lib.c
index 2cd84f0..22b2eaa 100644
--- a/pop/pop_lib.c
+++ b/pop/pop_lib.c
@@ -12,10 +12,11 @@
 #endif
 
 #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
 
@@ -53,7 +54,7 @@ int pop_parse_path (const char *path, ACCOUNT * acct)
       ret = 0;
   }
 
-  FREE (&c);
+  mem_free (&c);
   return ret;
 }
 
@@ -84,7 +85,7 @@ 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 = str_dup (c);
@@ -111,11 +112,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__ */
   }
@@ -148,7 +149,7 @@ 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;
-    FREE (&pop_data->auth_list);
+    mem_free (&pop_data->auth_list);
   }
 
   /* Execute CAPA command */
@@ -160,6 +161,7 @@ static pop_query_status pop_capabilities (POP_DATA * pop_data, int mode)
         pop_data->cmd_capa = CMD_AVAILABLE;
         break;
       }
+    case PFD_FUNCT_ERROR:
     case PQ_ERR:
       {
         pop_data->cmd_capa = CMD_NOT_AVAILABLE;
@@ -283,10 +285,8 @@ pop_query_status pop_open_connection (POP_DATA * pop_data)
         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"));
@@ -443,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 =
@@ -476,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;
 }