X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=imap%2Fcommand.c;h=af4c2b22e8a960034abe95c00458a56d8274998d;hp=8451386b2b72b01cc485622142d47115353d710d;hb=22601f25ede6703ba7cd06ee84eddd2045308570;hpb=0f44dc85fc1280372ffab911d701e703d803fb4b

diff --git a/imap/command.c b/imap/command.c
index 8451386..af4c2b2 100644
--- a/imap/command.c
+++ b/imap/command.c
@@ -2,7 +2,7 @@
  * Copyright notice from original mutt:
  * Copyright (C) 1996-8 Michael R. Elkins <me@mutt.org>
  * Copyright (C) 1996-9 Brandon Long <blong@fiction.net>
- * Copyright (C) 1999-2002 Brendan Cully <brendan@kublai.com>
+ * Copyright (C) 1999-2005 Brendan Cully <brendan@kublai.com>
  *
  * This file is part of mutt-ng, see http://www.muttng.org/.
  * It's licensed under the GNU General Public License,
@@ -16,13 +16,16 @@
 # include "config.h"
 #endif
 
+#include <lib-lib/mem.h>
+#include <lib-lib/ascii.h>
+#include <lib-lib/macros.h>
+
+#include "lib/debug.h"
+
 #include "mutt.h"
-#include "imap_private.h"
 #include "message.h"
 #include "mx.h"
-
-#include "lib/mem.h"
-#include "lib/intl.h"
+#include "imap_private.h"
 
 #include <ctype.h>
 #include <stdlib.h>
@@ -35,10 +38,12 @@ static int cmd_handle_untagged (IMAP_DATA * idata);
 static void cmd_make_sequence (IMAP_DATA * idata);
 static void cmd_parse_capabilities (IMAP_DATA * idata, char *s);
 static void cmd_parse_expunge (IMAP_DATA * idata, const char *s);
+static void cmd_parse_lsub (IMAP_DATA* idata, char* s);
 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",
@@ -69,13 +74,13 @@ int imap_cmd_start (IMAP_DATA * idata, const char *cmd)
 
   cmd_make_sequence (idata);
   /* seq, space, cmd, \r\n\0 */
-  outlen = safe_strlen (idata->cmd.seq) + safe_strlen (cmd) + 4;
-  out = (char *) safe_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);
 
-  FREE (&out);
+  p_delete(&out);
 
   return (rc < 0) ? IMAP_CMD_BAD : 0;
 }
@@ -99,16 +104,17 @@ int imap_cmd_step (IMAP_DATA * idata)
    * line */
   do {
     if (len == cmd->blen) {
-      safe_realloc (&cmd->buf, cmd->blen + IMAP_CMD_BUFSIZE);
+      p_realloc(&cmd->buf, cmd->blen + IMAP_CMD_BUFSIZE);
       cmd->blen = cmd->blen + IMAP_CMD_BUFSIZE;
-      dprint (3, (debugfile, "imap_cmd_step: grew buffer to %u bytes\n",
-                  cmd->blen));
+      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) {
-      dprint (1,
-              (debugfile, "imap_cmd_step: Error reading server response.\n"));
+      debug_print (1, ("Error reading server response.\n"));
       /* cmd_handle_fatal (idata); */
       return IMAP_CMD_BAD;
     }
@@ -122,11 +128,9 @@ int imap_cmd_step (IMAP_DATA * idata)
 
   /* don't let one large string make cmd->buf hog memory forever */
   if ((cmd->blen > IMAP_CMD_BUFSIZE) && (len <= IMAP_CMD_BUFSIZE)) {
-    safe_realloc (&cmd->buf, IMAP_CMD_BUFSIZE);
+    p_realloc(&cmd->buf, IMAP_CMD_BUFSIZE);
     cmd->blen = IMAP_CMD_BUFSIZE;
-    dprint (3,
-            (debugfile, "imap_cmd_step: shrank buffer to %u bytes\n",
-             cmd->blen));
+    debug_print (3, ("shrank buffer to %u bytes\n", cmd->blen));
   }
 
   idata->lastread = time (NULL);
@@ -136,9 +140,8 @@ int imap_cmd_step (IMAP_DATA * idata)
     return IMAP_CMD_BAD;
 
   /* server demands a continuation response from us */
-  if (!ascii_strncmp (cmd->buf, "+ ", 2)) {
+  if (cmd->buf[0] == '+')
     return IMAP_CMD_RESPOND;
-  }
 
   /* tagged completion code */
   if (!ascii_strncmp (cmd->buf, cmd->seq, SEQLEN)) {
@@ -152,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.
@@ -171,6 +173,12 @@ int imap_exec (IMAP_DATA * idata, const char *cmd, int flags)
   int outlen;
   int rc;
 
+  if (!idata) {
+    mutt_error (_("No mailbox is open."));
+    mutt_sleep (1);
+    return (-1);
+  }
+
   if (idata->status == IMAP_FATAL) {
     cmd_handle_fatal (idata);
     return -1;
@@ -179,14 +187,14 @@ 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 = safe_strlen (idata->cmd.seq) + safe_strlen (cmd) + 4;
-  out = (char *) safe_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);
-  FREE (&out);
+  p_delete(&out);
 
   if (rc < 0) {
     cmd_handle_fatal (idata);
@@ -211,8 +219,7 @@ int imap_exec (IMAP_DATA * idata, const char *cmd, int flags)
     if (flags & IMAP_CMD_FAIL_OK)
       return -2;
 
-    dprint (1,
-            (debugfile, "imap_exec: command failed: %s\n", idata->cmd.buf));
+    debug_print (1, ("command failed: %s\n", idata->cmd.buf));
     return -1;
   }
 
@@ -250,14 +257,14 @@ void imap_cmd_finish (IMAP_DATA * idata)
         (idata->reopen & IMAP_NEWMAIL_PENDING)
         && count > idata->ctx->msgcount) {
       /* read new mail messages */
-      dprint (2, (debugfile, "imap_cmd_finish: Fetching new mail\n"));
+      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) {
-      dprint (2, (debugfile, "imap_cmd_finish: Expunging mailbox\n"));
+      debug_print (2, ("Expunging mailbox\n"));
       imap_expunge_mailbox (idata);
       /* Detect whether we've gotten unexpected EXPUNGE messages */
       if (idata->reopen & IMAP_EXPUNGE_PENDING &&
@@ -277,8 +284,8 @@ static void cmd_handle_fatal (IMAP_DATA * idata)
   idata->status = IMAP_FATAL;
 
   if ((idata->state == IMAP_SELECTED) &&
-      (idata->reopen & IMAP_REOPEN_ALLOW) && !idata->ctx->closing) {
-    /*mx_fastclose_mailbox (idata->ctx); */
+      (idata->reopen & IMAP_REOPEN_ALLOW)) {
+    /* mx_fastclose_mailbox (idata->ctx); */
     mutt_error (_("Mailbox closed"));
     mutt_sleep (1);
     idata->state = IMAP_DISCONNECTED;
@@ -288,6 +295,7 @@ static void cmd_handle_fatal (IMAP_DATA * idata)
 
   if (idata->state != IMAP_SELECTED) {
     idata->state = IMAP_DISCONNECTED;
+    mutt_socket_close (idata->conn);
     idata->status = 0;
   }
 }
@@ -309,7 +317,7 @@ static int cmd_handle_untagged (IMAP_DATA * idata)
      * connection, so update that one.
      */
     if (ascii_strncasecmp ("EXISTS", s, 6) == 0) {
-      dprint (2, (debugfile, "Handling EXISTS\n"));
+      debug_print (2, ("Handling EXISTS\n"));
 
       /* new mail arrived */
       count = atoi (pn);
@@ -327,13 +335,10 @@ 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)
-        dprint (3, (debugfile,
-                    "cmd_handle_untagged: superfluous EXISTS message.\n"));
+        debug_print (3, ("superfluous EXISTS message.\n"));
       else {
         if (!(idata->reopen & IMAP_EXPUNGE_PENDING)) {
-          dprint (2, (debugfile,
-                      "cmd_handle_untagged: New mail in %s - %d messages total.\n",
-                      idata->mailbox, count));
+          debug_print (2, ("New mail in %s - %d messages total.\n", idata->mailbox, count));
           idata->reopen |= IMAP_NEWMAIL_PENDING;
         }
         idata->newMailCount = count;
@@ -347,34 +352,29 @@ static int cmd_handle_untagged (IMAP_DATA * idata)
   }
   else if (ascii_strncasecmp ("CAPABILITY", s, 10) == 0)
     cmd_parse_capabilities (idata, s);
+  else if (ascii_strncasecmp ("LSUB", s, 4) == 0)
+    cmd_parse_lsub (idata, s);
   else if (ascii_strncasecmp ("MYRIGHTS", s, 8) == 0)
     cmd_parse_myrights (idata, s);
+  else if (ascii_strncasecmp ("SEARCH", s, 6) == 0)
+    cmd_parse_search (idata, s);
   else if (ascii_strncasecmp ("BYE", s, 3) == 0) {
-    dprint (2, (debugfile, "Handling BYE\n"));
+    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);
-    idata->status = IMAP_BYE;
-
-    /*if (imap_reconnect(idata->ctx)!=0) {
-       if (idata->state == IMAP_SELECTED)
-       mx_fastclose_mailbox (idata->ctx); *//* XXX memleak? */
-    mutt_socket_close (idata->conn);
-    idata->state = IMAP_DISCONNECTED;
+    mutt_sleep (2);
+    cmd_handle_fatal (idata);
     return -1;
-    /*} else {
-       return 0;
-       } */
   }
   else if (option (OPTIMAPSERVERNOISE)
            && (ascii_strncasecmp ("NO", s, 2) == 0)) {
-    dprint (2, (debugfile, "Handling untagged NO\n"));
+    debug_print (2, ("Handling untagged NO\n"));
 
     /* Display the warning message from the server */
     mutt_error ("%s", s + 3);
@@ -384,6 +384,35 @@ static int cmd_handle_untagged (IMAP_DATA * idata)
   return 0;
 }
 
+/* This should be optimised (eg with a tree or hash) */
+static int uid2msgno (IMAP_DATA* idata, unsigned int uid) {
+  int i;
+
+  for (i = 0; i < idata->ctx->msgcount; i++) {
+    HEADER* h = idata->ctx->hdrs[i];
+    if (HEADER_DATA(h)->uid == uid)
+      return i;
+  }
+
+ return -1;
+}
+
+/* cmd_parse_search: store SEARCH response for later use */
+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;
+  }
+}
+
 /* cmd_make_sequence: make a tag suitable for starting an IMAP command */
 static void cmd_make_sequence (IMAP_DATA * idata)
 {
@@ -399,13 +428,13 @@ static void cmd_parse_capabilities (IMAP_DATA * idata, char *s)
 {
   int x;
 
-  dprint (2, (debugfile, "Handling CAPABILITY\n"));
+  debug_print (2, ("Handling CAPABILITY\n"));
 
   s = imap_next_word (s);
-  FREE (&idata->capstr);
-  idata->capstr = safe_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++)
@@ -424,7 +453,7 @@ static void cmd_parse_expunge (IMAP_DATA * idata, const char *s)
   int expno, cur;
   HEADER *h;
 
-  dprint (2, (debugfile, "Handling EXPUNGE\n"));
+  debug_print (2, ("Handling EXPUNGE\n"));
 
   expno = atoi (s);
 
@@ -453,7 +482,7 @@ static void cmd_parse_fetch (IMAP_DATA * idata, char *s)
   int msgno, cur;
   HEADER *h = NULL;
 
-  dprint (2, (debugfile, "Handling FETCH\n"));
+  debug_print (2, ("Handling FETCH\n"));
 
   msgno = atoi (s);
 
@@ -462,10 +491,11 @@ 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) {
-        dprint (2,
-                (debugfile, "Message UID %d updated\n",
-                 HEADER_DATA (h)->uid));
+        debug_print (2, ("Message UID %d updated\n", HEADER_DATA (h)->uid));
         break;
       }
 
@@ -473,7 +503,7 @@ static void cmd_parse_fetch (IMAP_DATA * idata, char *s)
     }
 
   if (!h) {
-    dprint (1, (debugfile, "FETCH response ignored for this message\n"));
+    debug_print (1, ("FETCH response ignored for this message\n"));
     return;
   }
 
@@ -482,13 +512,13 @@ static void cmd_parse_fetch (IMAP_DATA * idata, char *s)
   s = imap_next_word (s);
 
   if (*s != '(') {
-    dprint (1, (debugfile, "Malformed FETCH response"));
+    debug_print (1, ("Malformed FETCH response\n"));
     return;
   }
   s++;
 
   if (ascii_strncasecmp ("FLAGS", s, 5) != 0) {
-    dprint (2, (debugfile, "Only handle FLAGS updates\n"));
+    debug_print (2, ("Only handle FLAGS updates\n"));
     return;
   }
 
@@ -501,45 +531,99 @@ 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;
+
+  if (!option (OPTIMAPCHECKSUBSCRIBED))
+    return;
+
+  s = imap_next_word (s); /* flags */
+
+  if (*s != '(') {
+    debug_print (1, ("Bad LSUB response\n"));
+    return;
+  }
+
+  s++;
+  ep = s;
+  for (ep = s; *ep && *ep != ')'; ep++);
+  do {
+    if (!ascii_strncasecmp (s, "\\NoSelect", 9))
+      return;
+    while (s < ep && *s != ' ' && *s != ')')
+      s++;
+    if (*s == ' ')
+      s++;
+  } while (s != ep);
+
+  s = imap_next_word (s); /* delim */
+  s = imap_next_word (s); /* name */
+
+  if (s) {
+    imap_unmunge_mbox_name (s);
+    debug_print (2, ("Subscribing to %s\n", s));
+
+    m_strcpy(buf, sizeof(buf), "mailboxes \"");
+    mutt_account_tourl (&idata->conn->account, &url);
+    url.path = s;
+    if (!m_strcmp(url.user, ImapUser))
+      url.user = NULL;
+    url_ciss_tostring (&url, buf + 11, sizeof (buf) - 10, 0);
+    m_strcat(buf, sizeof(buf), "\"");
+    p_clear(&token, 1);
+    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));
+    p_delete(&token.data);
+  }
+  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)
 {
-  dprint (2, (debugfile, "Handling MYRIGHTS\n"));
+  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) {
     case 'l':
-      mutt_bit_set (idata->rights, IMAP_ACL_LOOKUP);
+      mutt_bit_set (idata->rights, ACL_LOOKUP);
       break;
     case 'r':
-      mutt_bit_set (idata->rights, IMAP_ACL_READ);
+      mutt_bit_set (idata->rights, ACL_READ);
       break;
     case 's':
-      mutt_bit_set (idata->rights, IMAP_ACL_SEEN);
+      mutt_bit_set (idata->rights, ACL_SEEN);
       break;
     case 'w':
-      mutt_bit_set (idata->rights, IMAP_ACL_WRITE);
+      mutt_bit_set (idata->rights, ACL_WRITE);
       break;
     case 'i':
-      mutt_bit_set (idata->rights, IMAP_ACL_INSERT);
+      mutt_bit_set (idata->rights, ACL_INSERT);
       break;
     case 'p':
-      mutt_bit_set (idata->rights, IMAP_ACL_POST);
+      mutt_bit_set (idata->rights, ACL_POST);
       break;
     case 'c':
-      mutt_bit_set (idata->rights, IMAP_ACL_CREATE);
+      mutt_bit_set (idata->rights, ACL_CREATE);
       break;
     case 'd':
-      mutt_bit_set (idata->rights, IMAP_ACL_DELETE);
+      mutt_bit_set (idata->rights, ACL_DELETE);
       break;
     case 'a':
-      mutt_bit_set (idata->rights, IMAP_ACL_ADMIN);
+      mutt_bit_set (idata->rights, ACL_ADMIN);
       break;
     }
     s++;