#include "message.h"
#include "mx.h"
+#include "lib/mem.h"
+#include "lib/intl.h"
+#include "lib/debug.h"
+
#include <ctype.h>
#include <stdlib.h>
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));
+ debug_print (3, ("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"));
+ 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)) {
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));
+ debug_print (3, ("shrank buffer to %u bytes\n", cmd->blen));
}
idata->lastread = time (NULL);
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;
}
(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 &&
* 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);
/* 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;
else if (ascii_strncasecmp ("MYRIGHTS", s, 8) == 0)
cmd_parse_myrights (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)
}
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);
{
int x;
- dprint (2, (debugfile, "Handling CAPABILITY\n"));
+ debug_print (2, ("Handling CAPABILITY\n"));
s = imap_next_word (s);
FREE (&idata->capstr);
int expno, cur;
HEADER *h;
- dprint (2, (debugfile, "Handling EXPUNGE\n"));
+ debug_print (2, ("Handling EXPUNGE\n"));
expno = atoi (s);
int msgno, cur;
HEADER *h = NULL;
- dprint (2, (debugfile, "Handling FETCH\n"));
+ debug_print (2, ("Handling FETCH\n"));
msgno = atoi (s);
h = idata->ctx->hdrs[cur];
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;
}
}
if (!h) {
- dprint (1, (debugfile, "FETCH response ignored for this message\n"));
+ debug_print (1, ("FETCH response ignored for this message\n"));
return;
}
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;
}
/* 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);
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++;