# 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 <lib-lib/url.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)
{
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 */
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);
}