move url.[hc] into the lib-lib.

[apps/madmutt.git] / imap / command.c

diff --git a/imap/command.c b/imap/command.c
index 15aa019..6968334 100644 (file)
--- 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/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"
 
 #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)
 {
 /* 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.
 }
 
 /* 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 */
       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);
     mutt_error ("%s", s);
     mutt_sleep (2);
     cmd_handle_fatal (idata);