X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=pop%2Fpop_lib.c;h=2880de52f5daeead48b88262fb99dbc79d30bb49;hb=3ea753c6005292b3e3153ac7e1f7b7d2363955c9;hp=b17cb25c108847b1f6e115d1a53cf9457c685f50;hpb=203e950e3d3c76795fa49895d040f732adad2049;p=apps%2Fmadmutt.git

diff --git a/pop/pop_lib.c b/pop/pop_lib.c
index b17cb25..2880de5 100644
--- a/pop/pop_lib.c
+++ b/pop/pop_lib.c
@@ -21,6 +21,8 @@
 
 #include "lib/mem.h"
 #include "lib/intl.h"
+#include "lib/debug.h"
+#include "lib/str.h"
 
 #include <string.h>
 #include <unistd.h>
@@ -63,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 (!safe_strncmp (msg, "-ERR ", 5)) {
     c2 = msg + 5;
     SKIPWS (c2);
 
@@ -72,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 */
@@ -219,7 +221,7 @@ pop_query_status pop_connect (POP_DATA * pop_data)
 
   pop_data->status = POP_CONNECTED;
 
-  if (mutt_strncmp (buf, "+OK", 3)) {
+  if (safe_strncmp (buf, "+OK", 3)) {
     *pop_data->err_msg = '\0';
     pop_error (pop_data, buf);
     mutt_error ("%s", pop_data->err_msg);
@@ -388,7 +390,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
 
@@ -402,7 +404,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 (!safe_strncmp (buf, "+OK", 3))
     return PQ_OK;
 
   pop_error (pop_data, buf);