X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=imap%2Fcommand.c;h=e915320b4be5cb8b2bb7ee4ae4c9753509d439fc;hp=ac192981d11eb6fffd74c66aab305f2cc9653c8f;hb=819c071fa7efc8dffb4dd92f36f0111227ff692f;hpb=355d6c883e8aafb8f424c22aa576cf8262ed9e58

diff --git a/imap/command.c b/imap/command.c
index ac19298..e915320 100644
--- a/imap/command.c
+++ b/imap/command.c
@@ -12,18 +12,12 @@
 /* command.c: routines for sending commands to an IMAP server and parsing
  *  responses */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/debug.h"
+#include <lib-lib/lib-lib.h>
+#include <lib-mx/mx.h>
 
 #include "mutt.h"
+#include "buffy.h"
 #include "message.h"
-#include "mx.h"
-#include "ascii.h"
 #include "imap_private.h"
 
 #include <ctype.h>
@@ -42,7 +36,7 @@ static void cmd_parse_fetch (IMAP_DATA * idata, char *s);
 static void cmd_parse_myrights (IMAP_DATA * idata, char *s);
 static void cmd_parse_search (IMAP_DATA* idata, char* s);
 
-static char *Capabilities[] = {
+static const char *Capabilities[] = {
   "IMAP4",
   "IMAP4rev1",
   "STATUS",
@@ -73,13 +67,13 @@ int imap_cmd_start (IMAP_DATA * idata, const char *cmd)
 
   cmd_make_sequence (idata);
   /* seq, space, cmd, \r\n\0 */
-  outlen = str_len (idata->cmd.seq) + str_len (cmd) + 4;
-  out = (char *) mem_malloc (outlen);
+  outlen = m_strlen(idata->cmd.seq) + m_strlen(cmd) + 4;
+  out = p_new(char, outlen);
   snprintf (out, outlen, "%s %s\r\n", idata->cmd.seq, cmd);
 
   rc = mutt_socket_write (idata->conn, out);
 
-  mem_free (&out);
+  p_delete(&out);
 
   return (rc < 0) ? IMAP_CMD_BAD : 0;
 }
@@ -91,62 +85,32 @@ int imap_cmd_start (IMAP_DATA * idata, const char *cmd)
 int imap_cmd_step (IMAP_DATA * idata)
 {
   IMAP_COMMAND *cmd = &idata->cmd;
-  unsigned int len = 0;
-  int c;
 
   if (idata->status == IMAP_FATAL) {
     cmd_handle_fatal (idata);
     return IMAP_CMD_BAD;
   }
 
-  /* read into buffer, expanding buffer as necessary until we have a full
-   * line */
-  do {
-    if (len == cmd->blen) {
-      mem_realloc (&cmd->buf, cmd->blen + IMAP_CMD_BUFSIZE);
-      cmd->blen = cmd->blen + IMAP_CMD_BUFSIZE;
-      debug_print (3, ("grew buffer to %u bytes\n", cmd->blen));
-    }
-
-    if (len)
-      len--;
-
-    c = mutt_socket_readln (cmd->buf + len, cmd->blen - len, idata->conn);
-    if (c <= 0) {
-      debug_print (1, ("Error reading server response.\n"));
-      /* cmd_handle_fatal (idata); */
-      return IMAP_CMD_BAD;
-    }
-
-    len += c;
-  }
-  /* if we've read all the way to the end of the buffer, we haven't read a
-   * full line (mutt_socket_readln strips the \r, so we always have at least
-   * one character free when we've read a full line) */
-  while (len == cmd->blen);
-
-  /* don't let one large string make cmd->buf hog memory forever */
-  if ((cmd->blen > IMAP_CMD_BUFSIZE) && (len <= IMAP_CMD_BUFSIZE)) {
-    mem_realloc (&cmd->buf, IMAP_CMD_BUFSIZE);
-    cmd->blen = IMAP_CMD_BUFSIZE;
-    debug_print (3, ("shrank buffer to %u bytes\n", cmd->blen));
+  buffer_reset(&cmd->buf);
+  if (mutt_socket_readln2(&cmd->buf, idata->conn) < 0) {
+    /* cmd_handle_fatal (idata); */
+    return IMAP_CMD_BAD;
   }
 
-  idata->lastread = time (NULL);
+  idata->lastread = time(NULL);
 
   /* handle untagged messages. The caller still gets its shot afterwards. */
-  if (!ascii_strncmp (cmd->buf, "* ", 2) && cmd_handle_untagged (idata))
+  if (!m_strncmp(cmd->buf.data, "* ", 2) && cmd_handle_untagged (idata))
     return IMAP_CMD_BAD;
 
   /* server demands a continuation response from us */
-  if (!ascii_strncmp (cmd->buf, "+ ", 2)) {
+  if (cmd->buf.data[0] == '+')
     return IMAP_CMD_RESPOND;
-  }
 
   /* tagged completion code */
-  if (!ascii_strncmp (cmd->buf, cmd->seq, SEQLEN)) {
+  if (!m_strncmp(cmd->buf.data, cmd->seq, SEQLEN)) {
     imap_cmd_finish (idata);
-    return imap_code (cmd->buf) ? IMAP_CMD_OK : IMAP_CMD_NO;
+    return imap_code(cmd->buf.data) ? IMAP_CMD_OK : IMAP_CMD_NO;
   }
 
   return IMAP_CMD_CONTINUE;
@@ -155,9 +119,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.
@@ -188,14 +151,12 @@ int imap_exec (IMAP_DATA * idata, const char *cmd, int flags)
   /* create sequence for command */
   cmd_make_sequence (idata);
   /* seq, space, cmd, \r\n\0 */
-  outlen = str_len (idata->cmd.seq) + str_len (cmd) + 4;
-  out = (char *) mem_malloc (outlen);
+  outlen = m_strlen(idata->cmd.seq) + m_strlen(cmd) + 4;
+  out = p_new(char, outlen);
   snprintf (out, outlen, "%s %s\r\n", idata->cmd.seq, cmd);
 
-  rc = mutt_socket_write_d (idata->conn, out,
-                            flags & IMAP_CMD_PASS ? IMAP_LOG_PASS :
-                            IMAP_LOG_CMD);
-  mem_free (&out);
+  rc = mutt_socket_write(idata->conn, out);
+  p_delete(&out);
 
   if (rc < 0) {
     cmd_handle_fatal (idata);
@@ -217,26 +178,12 @@ int imap_exec (IMAP_DATA * idata, const char *cmd, int flags)
     return -2;
 
   if (rc != IMAP_CMD_OK) {
-    if (flags & IMAP_CMD_FAIL_OK)
-      return -2;
-
-    debug_print (1, ("command failed: %s\n", idata->cmd.buf));
-    return -1;
+    return (flags & IMAP_CMD_FAIL_OK) ? -2 : -1;
   }
 
   return 0;
 }
 
-/* imap_cmd_running: Returns whether an IMAP command is in progress. */
-int imap_cmd_running (IMAP_DATA * idata)
-{
-  if (idata->cmd.state == IMAP_CMD_CONTINUE ||
-      idata->cmd.state == IMAP_CMD_RESPOND)
-    return 1;
-
-  return 0;
-}
-
 /* imap_cmd_finish: Attempts to perform cleanup (eg fetch new mail if
  *   detected, do expunge). Called automatically by imap_cmd_step, but
  *   may be called at any time. Called by imap_check_mailbox just before
@@ -258,14 +205,12 @@ void imap_cmd_finish (IMAP_DATA * idata)
         (idata->reopen & IMAP_NEWMAIL_PENDING)
         && count > idata->ctx->msgcount) {
       /* read new mail messages */
-      debug_print (2, ("Fetching new mail\n"));
       /* check_status: curs_main uses imap_check_mailbox to detect
        *   whether the index needs updating */
       idata->check_status = IMAP_NEWMAIL_PENDING;
       imap_read_headers (idata, idata->ctx->msgcount, count - 1);
     }
     else if (idata->reopen & IMAP_EXPUNGE_PENDING) {
-      debug_print (2, ("Expunging mailbox\n"));
       imap_expunge_mailbox (idata);
       /* Detect whether we've gotten unexpected EXPUNGE messages */
       if (idata->reopen & IMAP_EXPUNGE_PENDING &&
@@ -308,7 +253,7 @@ static int cmd_handle_untagged (IMAP_DATA * idata)
   char *pn;
   int count;
 
-  s = imap_next_word (idata->cmd.buf);
+  s = imap_next_word (idata->cmd.buf.data);
 
   if ((idata->state == IMAP_SELECTED) && isdigit ((unsigned char) *s)) {
     pn = s;
@@ -318,8 +263,6 @@ static int cmd_handle_untagged (IMAP_DATA * idata)
      * connection, so update that one.
      */
     if (ascii_strncasecmp ("EXISTS", s, 6) == 0) {
-      debug_print (2, ("Handling EXISTS\n"));
-
       /* new mail arrived */
       count = atoi (pn);
 
@@ -336,10 +279,9 @@ static int cmd_handle_untagged (IMAP_DATA * idata)
       /* at least the InterChange server sends EXISTS messages freely,
        * even when there is no new mail */
       else if (count == idata->ctx->msgcount)
-        debug_print (3, ("superfluous EXISTS message.\n"));
+        ;
       else {
         if (!(idata->reopen & IMAP_EXPUNGE_PENDING)) {
-          debug_print (2, ("New mail in %s - %d messages total.\n", idata->mailbox, count));
           idata->reopen |= IMAP_NEWMAIL_PENDING;
         }
         idata->newMailCount = count;
@@ -360,15 +302,12 @@ static int cmd_handle_untagged (IMAP_DATA * idata)
   else if (ascii_strncasecmp ("SEARCH", s, 6) == 0)
     cmd_parse_search (idata, s);
   else if (ascii_strncasecmp ("BYE", s, 3) == 0) {
-    debug_print (2, ("Handling BYE\n"));
-
     /* check if we're logging out */
     if (idata->status == IMAP_BYE)
       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);
@@ -376,8 +315,6 @@ static int cmd_handle_untagged (IMAP_DATA * idata)
   }
   else if (option (OPTIMAPSERVERNOISE)
            && (ascii_strncasecmp ("NO", s, 2) == 0)) {
-    debug_print (2, ("Handling untagged NO\n"));
-
     /* Display the warning message from the server */
     mutt_error ("%s", s + 3);
     mutt_sleep (2);
@@ -387,7 +324,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++) {
@@ -404,12 +341,10 @@ static void cmd_parse_search (IMAP_DATA* idata, char* s) {
   unsigned int uid;
   int msgno;
 
-  debug_print (2, ("Handling SEARCH\n"));
-
   while ((s = imap_next_word (s)) && *s != '\0') {
     uid = atoi (s);
     msgno = uid2msgno (idata, uid);
-    
+
     if (msgno >= 0)
       idata->ctx->hdrs[uid2msgno (idata, uid)]->matched = 1;
   }
@@ -430,13 +365,11 @@ static void cmd_parse_capabilities (IMAP_DATA * idata, char *s)
 {
   int x;
 
-  debug_print (2, ("Handling CAPABILITY\n"));
-
   s = imap_next_word (s);
-  mem_free (&idata->capstr);
-  idata->capstr = str_dup (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++)
@@ -455,8 +388,6 @@ static void cmd_parse_expunge (IMAP_DATA * idata, const char *s)
   int expno, cur;
   HEADER *h;
 
-  debug_print (2, ("Handling EXPUNGE\n"));
-
   expno = atoi (s);
 
   /* walk headers, zero seqno of expunged message, decrement seqno of those
@@ -484,8 +415,6 @@ static void cmd_parse_fetch (IMAP_DATA * idata, char *s)
   int msgno, cur;
   HEADER *h = NULL;
 
-  debug_print (2, ("Handling FETCH\n"));
-
   msgno = atoi (s);
 
   if (msgno <= idata->ctx->msgcount)
@@ -493,8 +422,10 @@ static void cmd_parse_fetch (IMAP_DATA * idata, char *s)
     for (cur = 0; cur < idata->ctx->msgcount; cur++) {
       h = idata->ctx->hdrs[cur];
 
+      if (!h)
+        break;
+
       if (h->active && h->index + 1 == msgno) {
-        debug_print (2, ("Message UID %d updated\n", HEADER_DATA (h)->uid));
         break;
       }
 
@@ -502,7 +433,6 @@ static void cmd_parse_fetch (IMAP_DATA * idata, char *s)
     }
 
   if (!h) {
-    debug_print (1, ("FETCH response ignored for this message\n"));
     return;
   }
 
@@ -511,13 +441,11 @@ static void cmd_parse_fetch (IMAP_DATA * idata, char *s)
   s = imap_next_word (s);
 
   if (*s != '(') {
-    debug_print (1, ("Malformed FETCH response\n"));
     return;
   }
   s++;
 
   if (ascii_strncasecmp ("FLAGS", s, 5) != 0) {
-    debug_print (2, ("Only handle FLAGS updates\n"));
     return;
   }
 
@@ -532,8 +460,6 @@ static void cmd_parse_fetch (IMAP_DATA * idata, char *s)
 
 static void cmd_parse_lsub (IMAP_DATA* idata, char* s) {
   char buf[STRING];
-  char errstr[STRING];
-  BUFFER err, token;
   ciss_url_t url;
   char *ep;
 
@@ -543,7 +469,6 @@ static void cmd_parse_lsub (IMAP_DATA* idata, char* s) {
   s = imap_next_word (s); /* flags */
 
   if (*s != '(') {
-    debug_print (1, ("Bad LSUB response\n"));
     return;
   }
 
@@ -564,36 +489,24 @@ static void cmd_parse_lsub (IMAP_DATA* idata, char* s) {
 
   if (s) {
     imap_unmunge_mbox_name (s);
-    debug_print (2, ("Subscribing to %s\n", s));
 
-    strfcpy (buf, "mailboxes \"", sizeof (buf));
-    mutt_account_tourl (&idata->conn->account, &url);
+    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);
-    str_cat (buf, sizeof (buf), "\"");
-    memset (&token, 0, sizeof (token));
-    err.data = errstr;
-    err.dsize = sizeof (errstr);
-    if (mutt_parse_rc_line (buf, &token, &err))
-      debug_print (1, ("Error adding subscribed mailbox: %s\n", errstr));
-    mem_free (&token.data);
+    url_ciss_tostring(&url, buf, sizeof(buf), 0);
+    buffy_do_mailboxes(buf, 1);
   }
-  else
-    debug_print (1, ("Bad LSUB response\n"));
 }
 
 /* cmd_parse_myrights: set rights bits according to MYRIGHTS response */
 static void cmd_parse_myrights (IMAP_DATA * idata, char *s)
 {
-  debug_print (2, ("Handling MYRIGHTS\n"));
-
   s = imap_next_word (s);
   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) {