X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=pop%2Fpop_lib.c;h=38454ef1476807b108a7038fb3eca2709b433afc;hb=334faeb80904ba5b8ced869abfea2731440d52e5;hp=763dffc3051ed1bd8d8be82ce803a3604cf48adc;hpb=238b70e39b78f585c586bd51aef41988b3cc73d1;p=apps%2Fmadmutt.git

diff --git a/pop/pop_lib.c b/pop/pop_lib.c
index 763dffc..38454ef 100644
--- a/pop/pop_lib.c
+++ b/pop/pop_lib.c
@@ -11,25 +11,24 @@
 # include "config.h"
 #endif
 
+#include <string.h>
+#include <unistd.h>
+#include <ctype.h>
+
 #include <lib-lib/mem.h>
 #include <lib-lib/str.h>
 #include <lib-lib/ascii.h>
 #include <lib-lib/macros.h>
+#include <lib-lib/debug.h>
 
 #include "mutt.h"
 #include "mx.h"
 #include "url.h"
 #include "pop.h"
 #if defined (USE_SSL) || defined (USE_GNUTLS)
-# include "mutt_ssl.h"
+# include <lib-sys/mutt_ssl.h>
 #endif
 
-#include "lib/debug.h"
-
-#include <string.h>
-#include <unistd.h>
-#include <ctype.h>
-
 /* given an POP mailbox name, return host, port, username and password */
 int pop_parse_path (const char *path, ACCOUNT * acct)
 {
@@ -68,15 +67,13 @@ void pop_error (POP_DATA * pop_data, char *msg)
   c = msg;
 
   if (!m_strncmp(msg, "-ERR ", 5)) {
-    c2 = msg + 5;
-    SKIPWS (c2);
-
+    c2 = vskipspaces(msg + 5);
     if (*c2)
       c = c2;
   }
 
   m_strcpy(t, sizeof(pop_data->err_msg) - strlen(pop_data->err_msg), c);
-  str_skip_trailws (pop_data->err_msg);
+  m_strrtrim(pop_data->err_msg);
 }
 
 /* Parse CAPA output */
@@ -87,8 +84,7 @@ static int fetch_capa (char *line, void *data)
 
   if (!ascii_strncasecmp (line, "SASL", 4)) {
     p_delete(&pop_data->auth_list);
-    c = line + 4;
-    SKIPWS (c);
+    c = vskipspaces(line + 4);
     pop_data->auth_list = m_strdup(c);
   }