X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=imap%2Fcommand.c;h=83ebbe73d00997f64b8d04d581f5d5362b9a91f4;hp=ba9d66631cdc610c5216d7a6c2aff6087cccccfe;hb=1ee89902de184a640c171ae3285bff6882a791bd;hpb=3f3ce3e32da45b2626dfa40a994cb37ca4021e5b diff --git a/imap/command.c b/imap/command.c index ba9d666..83ebbe7 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 * Copyright (C) 1996-9 Brandon Long - * Copyright (C) 1999-2002 Brendan Cully + * Copyright (C) 1999-2005 Brendan Cully * * This file is part of mutt-ng, see http://www.muttng.org/. * It's licensed under the GNU General Public License, @@ -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 #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 #include @@ -36,10 +30,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", @@ -70,13 +66,13 @@ int imap_cmd_start (IMAP_DATA * idata, const char *cmd) cmd_make_sequence (idata); /* seq, space, cmd, \r\n\0 */ - outlen = mutt_strlen (idata->cmd.seq) + mutt_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; } @@ -100,14 +96,15 @@ 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; - 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; } @@ -121,9 +118,8 @@ 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; - debug_print (3, ("shrank buffer to %u bytes\n", cmd->blen)); } idata->lastread = time (NULL); @@ -133,9 +129,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)) { @@ -149,9 +144,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. @@ -182,14 +176,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 = mutt_strlen (idata->cmd.seq) + mutt_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); + rc = mutt_socket_write(idata->conn, out); + p_delete(&out); if (rc < 0) { cmd_handle_fatal (idata); @@ -211,11 +203,7 @@ 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; @@ -252,14 +240,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 && @@ -279,8 +265,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; @@ -290,6 +276,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; } } @@ -311,8 +298,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); @@ -329,10 +314,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; @@ -346,35 +330,26 @@ 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) { - 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)) { - debug_print (2, ("Handling untagged NO\n")); - /* Display the warning message from the server */ mutt_error ("%s", s + 3); mutt_sleep (2); @@ -383,6 +358,33 @@ 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, 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; + + 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) { @@ -398,13 +400,11 @@ static void cmd_parse_capabilities (IMAP_DATA * idata, char *s) { int x; - 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++) @@ -423,8 +423,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 @@ -452,8 +450,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) @@ -461,8 +457,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; } @@ -470,7 +468,6 @@ static void cmd_parse_fetch (IMAP_DATA * idata, char *s) } if (!h) { - debug_print (1, ("FETCH response ignored for this message\n")); return; } @@ -479,13 +476,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; } @@ -498,16 +493,63 @@ 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 != '(') { + 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); + + 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); + mutt_parse_rc_line (buf, &token, &err); + p_delete(&token.data); + } +} + /* 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) {