X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=imap%2Fcommand.c;h=696833418a7195f264b148ed960db8f31f1c9573;hp=15aa0190667f86a2ad0f53a53d1d9e5021f5cbb0;hb=3e9a92ab72e04aecb0fc4098098a1b57c5101d84;hpb=238b70e39b78f585c586bd51aef41988b3cc73d1

diff --git a/imap/command.c b/imap/command.c
index 15aa019..6968334 100644
--- a/imap/command.c
+++ b/imap/command.c
@@ -19,8 +19,8 @@
 #include <lib-lib/mem.h>
 #include <lib-lib/ascii.h>
 #include <lib-lib/macros.h>
+#include <lib-lib/debug.h>
 
-#include "lib/debug.h"
 
 #include "mutt.h"
 #include "message.h"
@@ -155,9 +155,8 @@ int imap_cmd_step (IMAP_DATA * idata)
 /* imap_code: returns 1 if the command result was OK, or 0 if NO or BAD */
 int imap_code (const char *s)
 {
-  s += SEQLEN;
-  SKIPWS (s);
-  return (ascii_strncasecmp ("OK", s, 2) == 0);
+  s = vskipspaces(s + SEQLEN);
+  return !ascii_strncasecmp("OK", s, 2);
 }
 
 /* imap_exec: execute a command, and wait for the response from the server.
@@ -367,8 +366,7 @@ static int cmd_handle_untagged (IMAP_DATA * idata)
       return 0;
 
     /* server shut down our connection */
-    s += 3;
-    SKIPWS (s);
+    s = vskipspaces(s + 3);
     mutt_error ("%s", s);
     mutt_sleep (2);
     cmd_handle_fatal (idata);