use my own APIS for headers, parameters and so on

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

diff --git a/imap/command.c b/imap/command.c
index b4b3fc9..af4c2b2 100644 (file)
--- a/imap/command.c
+++ b/imap/command.c
@@ -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);


@@ -436,7 +434,7 @@ static void cmd_parse_capabilities (IMAP_DATA * idata, char *s)
   p_delete(&idata->capstr);
   idata->capstr = m_strdup(s);
 
   p_delete(&idata->capstr);
   idata->capstr = m_strdup(s);
 

-  memset (idata->capabilities, 0, sizeof (idata->capabilities));
+  p_clear(idata->capabilities, 1);

 
   while (*s) {
     for (x = 0; x < CAPMAX; x++)
 
   while (*s) {
     for (x = 0; x < CAPMAX; x++)


@@ -569,14 +567,14 @@ static void cmd_parse_lsub (IMAP_DATA* idata, char* s) {
     imap_unmunge_mbox_name (s);
     debug_print (2, ("Subscribing to %s\n", s));
 
     imap_unmunge_mbox_name (s);
     debug_print (2, ("Subscribing to %s\n", s));
 

-    strfcpy (buf, "mailboxes \"", sizeof (buf));
+    m_strcpy(buf, sizeof(buf), "mailboxes \"");

     mutt_account_tourl (&idata->conn->account, &url);
     url.path = s;
     mutt_account_tourl (&idata->conn->account, &url);
     url.path = s;

-    if (!str_cmp (url.user, ImapUser))
+    if (!m_strcmp(url.user, ImapUser))

       url.user = NULL;
     url_ciss_tostring (&url, buf + 11, sizeof (buf) - 10, 0);
       url.user = NULL;
     url_ciss_tostring (&url, buf + 11, sizeof (buf) - 10, 0);

-    str_cat (buf, sizeof (buf), "\"");
-    memset (&token, 0, sizeof (token));
+    m_strcat(buf, sizeof(buf), "\"");
+    p_clear(&token, 1);

     err.data = errstr;
     err.dsize = sizeof (errstr);
     if (mutt_parse_rc_line (buf, &token, &err))
     err.data = errstr;
     err.dsize = sizeof (errstr);
     if (mutt_parse_rc_line (buf, &token, &err))


@@ -596,7 +594,7 @@ static void cmd_parse_myrights (IMAP_DATA * idata, char *s)
   s = imap_next_word (s);
 
   /* zero out current rights set */
   s = imap_next_word (s);
 
   /* zero out current rights set */

-  memset (idata->rights, 0, sizeof (idata->rights));
+  p_clear(idata->rights, 1);

 
   while (*s && !isspace ((unsigned char) *s)) {
     switch (*s) {
 
   while (*s && !isspace ((unsigned char) *s)) {
     switch (*s) {