X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=pop%2Fpop_lib.c;h=f4c17e993be5d44ed008790dd18c0df97c1a2abb;hb=38dacbf03fe1a0daa9ce426caaef5582b90006b2;hp=e780215ca3f5ec046c76a9713ce3778de4852b11;hpb=230399f9632c37b66c1c117a17e8327eae6b3235;p=apps%2Fmadmutt.git

diff --git a/pop/pop_lib.c b/pop/pop_lib.c
index e780215..f4c17e9 100644
--- a/pop/pop_lib.c
+++ b/pop/pop_lib.c
@@ -7,18 +7,10 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <string.h>
-#include <unistd.h>
-#include <ctype.h>
-
 #include <lib-lib/lib-lib.h>
+#include <lib-mx/mx.h>
 
 #include "mutt.h"
-#include "mx.h"
 #include "pop.h"
 #if defined (USE_SSL) || defined (USE_GNUTLS)
 # include <lib-sys/mutt_ssl.h>
@@ -102,15 +94,17 @@ static int fetch_capa (char *line, void *data)
 static int fetch_auth (char *line, void *data)
 {
   POP_DATA *pop_data = (POP_DATA *) data;
+  ssize_t auth_list_len;
 
   if (!pop_data->auth_list) {
-    pop_data->auth_list = p_new(char, strlen(line) + 1);
+    auth_list_len = m_strlen(line) + 1;
+    pop_data->auth_list = p_new(char, auth_list_len);
   } else {
-    p_realloc(&pop_data->auth_list,
-              strlen(pop_data->auth_list) + strlen(line) + 2);
-    strcat (pop_data->auth_list, " ");  /* __STRCAT_CHECKED__ */
+    auth_list_len = m_strlen(pop_data->auth_list) + m_strlen(line) + 2;
+    p_realloc(&pop_data->auth_list, auth_list_len);
+    m_strcat(pop_data->auth_list, auth_list_len, " ");
   }
-  strcat (pop_data->auth_list, line);   /* __STRCAT_CHECKED__ */
+  m_strcat(pop_data->auth_list, auth_list_len, line);
 
   return 0;
 }
@@ -376,7 +370,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, const char *msg)
+pop_query_status pop_query (POP_DATA * pop_data, char *buf, size_t buflen)
 {
   char *c;