* 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,
/* command.c: routines for sending commands to an IMAP server and parsing
* responses */
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <lib-lib/lib-lib.h>
+#include <lib-mx/mx.h>
#include "mutt.h"
-#include "imap_private.h"
+#include "buffy.h"
#include "message.h"
-#include "mx.h"
+#include "imap_private.h"
#include <ctype.h>
#include <stdlib.h>
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",
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;
}
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) {
- safe_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));
- }
-
- 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"));
- /* 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)) {
- safe_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));
+ 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;
/* 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.
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;
/* 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);
return -2;
if (rc != IMAP_CMD_OK) {
- if (flags & IMAP_CMD_FAIL_OK)
- return -2;
-
- dprint (1,
- (debugfile, "imap_exec: 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
(idata->reopen & IMAP_NEWMAIL_PENDING)
&& count > idata->ctx->msgcount) {
/* read new mail messages */
- dprint (2, (debugfile, "imap_cmd_finish: 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"));
imap_expunge_mailbox (idata);
/* Detect whether we've gotten unexpected EXPUNGE messages */
if (idata->reopen & IMAP_EXPUNGE_PENDING &&
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;
if (idata->state != IMAP_SELECTED) {
idata->state = IMAP_DISCONNECTED;
+ mutt_socket_close (idata->conn);
idata->status = 0;
}
}
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;
* connection, so update that one.
*/
if (ascii_strncasecmp ("EXISTS", s, 6) == 0) {
- dprint (2, (debugfile, "Handling EXISTS\n"));
-
/* new mail arrived */
count = atoi (pn);
/* 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"));
+ ;
else {
if (!(idata->reopen & IMAP_EXPUNGE_PENDING)) {
- dprint (2, (debugfile,
- "cmd_handle_untagged: New mail in %s - %d messages total.\n",
- idata->mailbox, count));
idata->reopen |= IMAP_NEWMAIL_PENDING;
}
idata->newMailCount = count;
}
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"));
-
/* 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"));
-
/* Display the warning message from the server */
mutt_error ("%s", s + 3);
mutt_sleep (2);
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)
{
{
int x;
- dprint (2, (debugfile, "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++)
int expno, cur;
HEADER *h;
- dprint (2, (debugfile, "Handling EXPUNGE\n"));
-
expno = atoi (s);
/* walk headers, zero seqno of expunged message, decrement seqno of those
int msgno, cur;
HEADER *h = NULL;
- dprint (2, (debugfile, "Handling FETCH\n"));
-
msgno = atoi (s);
if (msgno <= idata->ctx->msgcount)
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));
break;
}
}
if (!h) {
- dprint (1, (debugfile, "FETCH response ignored for this message\n"));
return;
}
s = imap_next_word (s);
if (*s != '(') {
- dprint (1, (debugfile, "Malformed FETCH response"));
return;
}
s++;
if (ascii_strncasecmp ("FLAGS", s, 5) != 0) {
- dprint (2, (debugfile, "Only handle FLAGS updates\n"));
return;
}
}
}
+static void cmd_parse_lsub (IMAP_DATA* idata, char* s) {
+ char buf[STRING];
+ 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);
+
+ mutt_account_tourl(&idata->conn->account, &url);
+ url.path = s;
+ if (!m_strcmp(url.user, ImapUser))
+ url.user = NULL;
+ url_ciss_tostring(&url, buf, sizeof(buf), 0);
+ buffy_do_mailboxes(buf, 1);
+ }
+}
+
/* 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"));
-
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++;
projects / apps / madmutt.git / blobdiff