X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=imap%2Futil.c;h=6088321f11627c1d72d953e7efc6a1643ddf7b19;hb=05a3bbbe420e4afc76e0eea24ce32f859405dc4a;hp=5ca2fad88e2e2ca75b49fa1f86011db5e2dd8453;hpb=c98480f8568e6c1bc927c6c5f2b5e80b4aa6548c;p=apps%2Fmadmutt.git

diff --git a/imap/util.c b/imap/util.c
index 5ca2fad..6088321 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-network/mutt_ssl.h>
 
 #include <lib-lib/macros.h>
-#include "lib/debug.h"
+#include <lib-lib/debug.h>
 
 #include <stdlib.h>
 #include <ctype.h>
@@ -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 */