/* command.c: routines for sending commands to an IMAP server and parsing
* responses */
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <lib-lib/mem.h>
-#include <lib-lib/ascii.h>
-#include <lib-lib/macros.h>
-
-#include "lib/debug.h"
+#include <lib-lib/lib-lib.h>
#include "mutt.h"
#include "message.h"
if (len == cmd->blen) {
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)
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;
}
if ((cmd->blen > IMAP_CMD_BUFSIZE) && (len <= 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);
/* 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.
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);
+ rc = mutt_socket_write(idata->conn, out);
p_delete(&out);
if (rc < 0) {
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;
(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 &&
* connection, so update that one.
*/
if (ascii_strncasecmp ("EXISTS", s, 6) == 0) {
- debug_print (2, ("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)
- 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;
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);
}
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);
}
/* 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++) {
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;
}
{
int x;
- debug_print (2, ("Handling CAPABILITY\n"));
-
s = imap_next_word (s);
p_delete(&idata->capstr);
idata->capstr = m_strdup(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
int msgno, cur;
HEADER *h = NULL;
- debug_print (2, ("Handling FETCH\n"));
-
msgno = atoi (s);
if (msgno <= idata->ctx->msgcount)
break;
if (h->active && h->index + 1 == msgno) {
- debug_print (2, ("Message UID %d updated\n", HEADER_DATA (h)->uid));
break;
}
}
if (!h) {
- debug_print (1, ("FETCH response ignored for this message\n"));
return;
}
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;
}
s = imap_next_word (s); /* flags */
if (*s != '(') {
- debug_print (1, ("Bad LSUB response\n"));
return;
}
if (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 (!m_strcmp(url.user, ImapUser))
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));
+ mutt_parse_rc_line (buf, &token, &err);
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)
{
- debug_print (2, ("Handling MYRIGHTS\n"));
-
s = imap_next_word (s);
s = imap_next_word (s);
projects / apps / madmutt.git / blobdiff