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

diff --git a/imap/command.c b/imap/command.c
index 15aa019..3893f89 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);
@@ -387,7 +385,7 @@ static int cmd_handle_untagged (IMAP_DATA * idata)
 }
 
 /* This should be optimised (eg with a tree or hash) */
-static int uid2msgno (IMAP_DATA* idata, unsigned int uid) {
+static int uid2msgno (IMAP_DATA* idata, int uid) {
   int i;
 
   for (i = 0; i < idata->ctx->msgcount; i++) {