X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=imap%2Fcommand.c;h=696833418a7195f264b148ed960db8f31f1c9573;hp=989bd6766bb3f7c49cbc50925388d6c00e0114be;hb=108f3c7ab59844591f7540347914ea57be5245e2;hpb=be393b838c5e0b8dfe9bedcc7a4a63f05caae7c4

diff --git a/imap/command.c b/imap/command.c
index 989bd67..6968334 100644
--- a/imap/command.c
+++ b/imap/command.c
@@ -16,14 +16,16 @@
 # include "config.h"
 #endif
 
+#include <lib-lib/mem.h>
+#include <lib-lib/ascii.h>
+#include <lib-lib/macros.h>
+#include <lib-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 "lib/debug.h"
+#include "imap_private.h"
 
 #include <ctype.h>
 #include <stdlib.h>
@@ -39,8 +41,9 @@ 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",
@@ -71,13 +74,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;
 }
@@ -101,11 +104,14 @@ int imap_cmd_step (IMAP_DATA * idata)
    * line */
   do {
     if (len == cmd->blen) {
-      mem_realloc (&cmd->buf, cmd->blen + IMAP_CMD_BUFSIZE);
+      p_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"));
@@ -122,7 +128,7 @@ 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)) {
-    mem_realloc (&cmd->buf, IMAP_CMD_BUFSIZE);
+    p_realloc(&cmd->buf, IMAP_CMD_BUFSIZE);
     cmd->blen = IMAP_CMD_BUFSIZE;
     debug_print (3, ("shrank buffer to %u bytes\n", cmd->blen));
   }
@@ -134,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)) {
@@ -150,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.
@@ -183,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 = 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);
+  p_delete(&out);
 
   if (rc < 0) {
     cmd_handle_fatal (idata);
@@ -352,6 +356,8 @@ static int cmd_handle_untagged (IMAP_DATA * idata)
     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) {
     debug_print (2, ("Handling BYE\n"));
 
@@ -360,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);
@@ -379,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)
 {
@@ -397,10 +431,10 @@ static void cmd_parse_capabilities (IMAP_DATA * idata, char *s)
   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++)
@@ -457,6 +491,9 @@ 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;
@@ -530,19 +567,19 @@ static void cmd_parse_lsub (IMAP_DATA* idata, char* 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;
-    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));
+    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));
-    mem_free (&token.data);
+    p_delete(&token.data);
   }
   else
     debug_print (1, ("Bad LSUB response\n"));
@@ -557,7 +594,7 @@ static void cmd_parse_myrights (IMAP_DATA * idata, char *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) {