#include "lib/mem.h"
#include "lib/intl.h"
#include "lib/str.h"
+#include "lib/debug.h"
#include <unistd.h>
#include <ctype.h>
else if (mutt_bit_isset (idata->capabilities, STATUS))
snprintf (buf, sizeof (buf), "STATUS %s (UID-VALIDITY)", mbox);
else {
- dprint (2, (debugfile, "imap_access: STATUS not supported?\n"));
+ debug_print (2, ("STATUS not supported?\n"));
return -1;
}
if (imap_exec (idata, buf, IMAP_CMD_FAIL_OK) < 0) {
- dprint (1, (debugfile, "imap_access: Can't check STATUS of %s\n", mbox));
+ debug_print (1, ("Can't check STATUS of %s\n", mbox));
return -1;
}
int r = 0;
- dprint (2, (debugfile, "imap_read_literal: reading %ld bytes\n", bytes));
+ debug_print (2, ("reading %ld bytes\n", bytes));
for (pos = 0; pos < bytes; pos++) {
if (mutt_socket_readchar (idata->conn, &c) != 1) {
- dprint (1,
- (debugfile,
- "imap_read_literal: error during read, %ld bytes read\n",
- pos));
+ debug_print (1, ("error during read, %ld bytes read\n", pos));
idata->status = IMAP_FATAL;
return -1;
#endif
fputc (c, fp);
#ifdef DEBUG
- if (debuglevel >= IMAP_LOG_LTRL)
- fputc (c, debugfile);
+ if (DebugLevel >= IMAP_LOG_LTRL)
+ fputc (c, DebugFile);
#endif
}
h = idata->ctx->hdrs[i];
if (h->index == -1) {
- dprint (2,
- (debugfile, "Expunging message UID %d.\n",
- HEADER_DATA (h)->uid));
+ debug_print (2, ("Expunging message UID %d.\n", HEADER_DATA (h)->uid));
h->active = 0;
while (rc == IMAP_CMD_CONTINUE);
if (rc != IMAP_CMD_OK) {
- dprint (1, (debugfile, "imap_get_delim: failed.\n"));
+ debug_print (1, ("failed.\n"));
return -1;
}
- dprint (2, (debugfile, "Delimiter: %c\n", idata->delim));
+ debug_print (2, ("Delimiter: %c\n", idata->delim));
return -1;
}
if (!imap_authenticate (idata)) {
idata->state = IMAP_AUTHENTICATED;
if (idata->conn->ssf)
- dprint (2, (debugfile, "Communication encrypted at %d bits\n",
- idata->conn->ssf));
+ debug_print (2, ("Communication encrypted at %d bits\n", idata->conn->ssf));
}
else
mutt_account_unsetpass (&idata->conn->account);
/* sanity-check string */
if (ascii_strncasecmp ("FLAGS", s, 5) != 0) {
- dprint (1, (debugfile, "imap_get_flags: not a FLAGS response: %s\n", s));
+ debug_print (1, ("not a FLAGS response: %s\n", s));
return NULL;
}
s += 5;
SKIPWS (s);
if (*s != '(') {
- dprint (1, (debugfile, "imap_get_flags: bogus FLAGS response: %s\n", s));
+ debug_print (1, ("bogus FLAGS response: %s\n", s));
return NULL;
}
/* note bad flags response */
if (*s != ')') {
- dprint (1, (debugfile,
- "imap_get_flags: Unterminated FLAGS response: %s\n", s));
+ debug_print (1, ("Unterminated FLAGS response: %s\n", s));
mutt_free_list (hflags);
return NULL;
if (ascii_strncasecmp ("FLAGS", pc, 5) == 0) {
/* don't override PERMANENTFLAGS */
if (!idata->flags) {
- dprint (2, (debugfile, "Getting mailbox FLAGS\n"));
+ debug_print (2, ("Getting mailbox FLAGS\n"));
if ((pc = imap_get_flags (&(idata->flags), pc)) == NULL)
goto fail;
}
}
/* PERMANENTFLAGS are massaged to look like FLAGS, then override FLAGS */
else if (ascii_strncasecmp ("OK [PERMANENTFLAGS", pc, 18) == 0) {
- dprint (2, (debugfile, "Getting mailbox PERMANENTFLAGS\n"));
+ debug_print (2, ("Getting mailbox PERMANENTFLAGS\n"));
/* safe to call on NULL */
mutt_free_list (&(idata->flags));
/* skip "OK [PERMANENT" so syntax is the same as FLAGS */
#ifdef USE_HCACHE
/* save UIDVALIDITY for the header cache */
else if (ascii_strncasecmp ("OK [UIDVALIDITY", pc, 14) == 0) {
- dprint (2, (debugfile, "Getting mailbox UIDVALIDITY\n"));
+ debug_print (2, ("Getting mailbox UIDVALIDITY\n"));
pc += 3;
pc = imap_next_word (pc);
if (!ascii_strncasecmp
(imap_get_qualifier (idata->cmd.buf), "[READ-ONLY]", 11)
&& !mutt_bit_isset (idata->capabilities, ACL)) {
- dprint (2, (debugfile, "Mailbox is read-only.\n"));
+ debug_print (2, ("Mailbox is read-only.\n"));
ctx->readonly = 1;
}
#ifdef DEBUG
/* dump the mailbox flags we've found */
- if (debuglevel > 2) {
+ if (DebugLevel > 2) {
if (!idata->flags)
- dprint (3, (debugfile, "No folder flags found\n"));
+ debug_print (3, ("No folder flags found\n"));
else {
LIST *t = idata->flags;
- dprint (3, (debugfile, "Mailbox flags: "));
+ debug_print (3, ("Mailbox flags:\n"));
t = t->next;
while (t) {
- dprint (3, (debugfile, "[%s] ", t->data));
+ debug_print (3, ("[%s]\n", t->data));
t = t->next;
}
- dprint (3, (debugfile, "\n"));
}
}
#endif
goto fail;
}
- dprint (2,
- (debugfile, "imap_open_mailbox: msgcount is %d\n", ctx->msgcount));
+ debug_print (2, ("msgcount is %d\n", ctx->msgcount));
FREE (&mx.mbox);
return 0;
/*
int imap_close_connection (CONTEXT *ctx)
{
- dprint (1, (debugfile, "imap_close_connection(): closing connection\n"));
+ debug_print (1, (debugfile, "imap_close_connection(): closing connection\n"));
if (CTX_DATA->status != IMAP_BYE)
{
mutt_message _("Closing connection to IMAP server...");
if (mutt_bit_isset (idata->rights, ACL_WRITE))
imap_add_keywords (flags, hdr, idata->flags, sizeof (flags));
- mutt_remove_trailing_ws (flags);
+ str_skip_trailws (flags);
/* UW-IMAP is OK with null flags, Cyrus isn't. The only solution is to
* explicitly revoke all system flags (if we have permission) */
imap_set_flag (idata, ACL_WRITE, 1, "\\Answered ", flags, sizeof (flags));
imap_set_flag (idata, ACL_DELETE, 1, "\\Deleted ", flags, sizeof (flags));
- mutt_remove_trailing_ws (flags);
+ str_skip_trailws (flags);
mutt_buffer_addstr (cmd, " -FLAGS.SILENT (");
} else
idata = (IMAP_DATA *) ctx->data;
if (idata->state != IMAP_SELECTED) {
- dprint (2, (debugfile, "imap_sync_mailbox: no mailbox selected\n"));
+ debug_print (2, ("no mailbox selected\n"));
return -1;
}
- /* CLOSE purges deleted messages. If we don't want to purge them, we must
- * tell imap_close_mailbox not to issue the CLOSE command */
- if (expunge)
- idata->noclose = 0;
- else
- idata->noclose = 1;
-
/* This function is only called when the calling code expects the context
* to be changed. */
imap_allow_reopen (ctx);
/* if the message has been rethreaded or attachments have been deleted
* we delete the message and reupload it.
* This works better if we're expunging, of course. */
- if (ctx->hdrs[n]->refs_changed || ctx->hdrs[n]->irt_changed ||
+ if ((ctx->hdrs[n]->env && (ctx->hdrs[n]->env->refs_changed || ctx->hdrs[n]->env->irt_changed)) ||
ctx->hdrs[n]->attach_del) {
- dprint (3,
- (debugfile,
- "imap_sync_mailbox: Attachments to be deleted, falling back to _mutt_save_message\n"));
+ debug_print (3, ("Attachments to be deleted, falling back to _mutt_save_message\n"));
if (!appendctx)
appendctx = mx_open_mailbox (ctx->path, M_APPEND | M_QUIET, NULL);
if (!appendctx) {
- dprint (1,
- (debugfile,
- "imap_sync_mailbox: Error opening mailbox in append mode\n"));
+ debug_print (1, ("Error opening mailbox in append mode\n"));
}
else
_mutt_save_message (ctx->hdrs[n], appendctx, 1, 0, 0);
idata->reopen |= IMAP_EXPUNGE_EXPECTED;
if (imap_exec (idata, "EXPUNGE", 0) != 0) {
imap_error (_("imap_sync_mailbox: EXPUNGE failed"), idata->cmd.buf);
- rc = -1;
+ rc = imap_reconnect (ctx);
goto out;
}
}
+ if (ctx->closing) {
+ if (imap_exec (idata, "CLOSE", 0))
+ mutt_error (_("CLOSE failed"));
+ idata->state = IMAP_AUTHENTICATED;
+ }
+
rc = 0;
out:
if (cmd.data)
return rc;
}
-/* imap_close_mailbox: issue close command if neccessary, reset IMAP_DATA */
+/* imap_close_mailbox: clean up IMAP data in CONTEXT */
void imap_close_mailbox (CONTEXT * ctx)
{
IMAP_DATA *idata;
if (!idata)
return;
- if ((idata->status != IMAP_FATAL) &&
- (idata->state == IMAP_SELECTED) && (ctx == idata->ctx)) {
- if (!(idata->noclose) && imap_exec (idata, "CLOSE", 0))
+ if (ctx == idata->ctx) {
+ if (idata->state = IMAP_SELECTED) {
+ /* mx_close_mailbox won't sync if there are no deleted messages
+ * and the mailbox is unchanged, so we may have to close here */
+ if (idata->status != IMAP_FATAL && !ctx->deleted &&
+ imap_exec (idata, "CLOSE", 0))
mutt_error (_("CLOSE failed"));
+ idata->state = IMAP_AUTHENTICATED;
+ }
idata->reopen &= IMAP_REOPEN_ALLOW;
- idata->state = IMAP_AUTHENTICATED;
FREE (&(idata->mailbox));
mutt_free_list (&idata->flags);
idata->ctx = NULL;
* command on a mailbox that you have selected
*/
- if (safe_strcmp (mbox_unquoted, idata->mailbox) == 0
+ if (mutt_strcmp (mbox_unquoted, idata->mailbox) == 0
|| (ascii_strcasecmp (mbox_unquoted, "INBOX") == 0
&& safe_strcasecmp (mbox_unquoted, idata->mailbox) == 0)) {
strfcpy (buf, "NOOP", sizeof (buf));
/* The mailbox name may or may not be quoted here. We could try to
* munge the server response and compare with quoted (or vise versa)
* but it is probably more efficient to just strncmp against both. */
- if (safe_strncmp (mbox_unquoted, s, safe_strlen (mbox_unquoted)) == 0
- || safe_strncmp (mbox, s, safe_strlen (mbox)) == 0) {
+ if (safe_strncmp (mbox_unquoted, s, mutt_strlen (mbox_unquoted)) == 0
+ || safe_strncmp (mbox, s, mutt_strlen (mbox)) == 0) {
s = imap_next_word (s);
s = imap_next_word (s);
if (isdigit ((unsigned char) *s)) {
if (*s != '0') {
msgcount = atoi (s);
- dprint (2,
- (debugfile, "%d new messages in %s\n", msgcount, path));
+ debug_print (2, ("%d new messages in %s\n", msgcount, path));
}
}
}
else
- dprint (1,
- (debugfile,
- "imap_mailbox_check: STATUS response doesn't match requested mailbox.\n"));
+ debug_print (1, ("STATUS response doesn't match requested mailbox.\n"));
}
}
while (rc == IMAP_CMD_CONTINUE);
/* verify passed in path is an IMAP path */
if (imap_parse_path (path, &mx)) {
- dprint (2, (debugfile, "imap_complete: bad path %s\n", path));
+ debug_print (2, ("bad path %s\n", path));
return -1;
}
/* if the folder isn't selectable, append delimiter to force browse
* to enter it on second tab. */
if (noselect) {
- clen = safe_strlen (list_word);
+ clen = mutt_strlen (list_word);
list_word[clen++] = delim;
list_word[clen] = '\0';
}
/* copy in first word */
if (!completions) {
strfcpy (completion, list_word, sizeof (completion));
- matchlen = safe_strlen (completion);
+ matchlen = mutt_strlen (completion);
completions++;
continue;
}
projects / apps / madmutt.git / blobdiff