X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=imap%2Futil.c;h=373cad099225b9acb2242203de94a3d4283503b3;hp=8e6832be3b41ebad82fdbb0049e33f03d9f5875e;hb=ccf2b75a9ed50a79c4d8e5d6235c7313fcd3719a;hpb=c6b9d35ed9361e4defab9762a7480d5126405ae9

diff --git a/imap/util.c b/imap/util.c
index 8e6832b..373cad0 100644
--- a/imap/util.c
+++ b/imap/util.c
@@ -20,10 +20,10 @@
 #include "mx.h"                 /* for M_IMAP */
 #include "url.h"
 #include "imap_private.h"
-#include "mutt_ssl.h"
+#include <lib-sys/mutt_ssl.h>
 
 #include <lib-lib/macros.h>
-#include "lib/debug.h"
+#include <lib-lib/debug.h>
 
 #include <stdlib.h>
 #include <ctype.h>
@@ -137,7 +137,7 @@ void imap_pretty_mailbox (char *path)
   if (mx_get_magic (Maildir) == M_IMAP && !imap_parse_path (Maildir, &home)) {
     hlen = m_strlen(home.mbox);
     if (tlen && mutt_account_match (&home.account, &target.account) &&
-        !str_ncmp (home.mbox, target.mbox, hlen)) {
+        !m_strncmp(home.mbox, target.mbox, hlen)) {
       if (!hlen)
         home_match = 1;
       else
@@ -219,7 +219,7 @@ char *imap_fix_path (IMAP_DATA * idata, char *mailbox, char *path,
   int x = 0;
 
   if (!mailbox || !*mailbox) {
-    strfcpy (path, "INBOX", plen);
+    m_strcpy(path, plen, "INBOX");
     return path;
   }
 
@@ -292,8 +292,7 @@ char *imap_next_word (char *s)
     s++;
   }
 
-  SKIPWS (s);
-  return s;
+  return vskipspaces(s);
 }
 
 /* imap_parse_date: date is of the form: DD-MMM-YYYY HH:MM:SS +ZZzz */