X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=imap%2Fmessage.c;h=466d2dcaa66c0f2b5d7735db0be7f981bd583fdb;hp=92afea84c37765dd6ec92b6b57a4100d43b302d6;hb=230399f9632c37b66c1c117a17e8327eae6b3235;hpb=ac813896ca32d850febc2d95065ac4fa040f11f9 diff --git a/imap/message.c b/imap/message.c index 92afea8..466d2dc 100644 --- a/imap/message.c +++ b/imap/message.c @@ -17,11 +17,7 @@ #include #include -#include -#include -#include -#include -#include +#include #include @@ -35,9 +31,6 @@ #include "pgp.h" #endif -#include -#include - #if HAVE_STDINT_H #include #elif HAVE_INTTYPES_H @@ -54,7 +47,7 @@ static char *msg_parse_flags (IMAP_HEADER * h, char *s); #ifdef USE_HCACHE static int msg_fetch_header_fetch (CONTEXT * ctx, IMAP_HEADER * h, char *buf, FILE * fp); -static size_t imap_hcache_keylen (const char *fn); +static ssize_t imap_hcache_keylen (const char *fn); #endif /* USE_HCACHE */ /* imap_read_headers: @@ -158,8 +151,6 @@ int imap_read_headers (IMAP_DATA * idata, int msgbegin, int msgend) if (uid_validity != NULL && *uid_validity == idata->uid_validity) { ctx->hdrs[msgno] = mutt_hcache_restore((unsigned char *) uid_validity, 0); ctx->hdrs[msgno]->index = h.sid - 1; - if (h.sid != ctx->msgcount + 1) - debug_print (1, ("imap_read_headers: msgcount and sequence ID are inconsistent!")); /* messages which have not been expunged are ACTIVE (borrowed from mh * folders) */ ctx->hdrs[msgno]->active = 1; @@ -251,8 +242,6 @@ int imap_read_headers (IMAP_DATA * idata, int msgbegin, int msgend) ctx->hdrs[msgno] = header_new(); ctx->hdrs[msgno]->index = h.sid - 1; - if (h.sid != ctx->msgcount + 1) - debug_print (1, ("msgcount and sequence ID are inconsistent!\n")); /* messages which have not been expunged are ACTIVE (borrowed from mh * folders) */ ctx->hdrs[msgno]->active = 1; @@ -551,8 +540,6 @@ int imap_append_message (CONTEXT * ctx, MESSAGE * msg) if (rc != IMAP_CMD_RESPOND) { char *pc; - debug_print (1, ("command failed: %s\n", idata->cmd.buf)); - pc = vskipspaces(idata->cmd.buf + SEQLEN); pc = imap_next_word (pc); mutt_error ("%s", pc); @@ -587,7 +574,6 @@ int imap_append_message (CONTEXT * ctx, MESSAGE * msg) if (!imap_code (idata->cmd.buf)) { char *pc; - debug_print (1, ("command failed: %s\n", idata->cmd.buf)); pc = vskipspaces(idata->cmd.buf + SEQLEN); pc = imap_next_word (pc); mutt_error ("%s", pc); @@ -624,18 +610,15 @@ int imap_copy_messages (CONTEXT * ctx, HEADER * h, char *dest, int delete) idata = (IMAP_DATA *) ctx->data; if (imap_parse_path (dest, &mx)) { - debug_print (1, ("bad destination %s\n", dest)); return -1; } /* check that the save-to folder is in the same account */ if (!mutt_account_match (&(CTX_DATA->conn->account), &(mx.account))) { - debug_print (3, ("%s not same server as %s\n", dest, ctx->path)); return 1; } if (h && h->attach_del) { - debug_print (3, ("Message contains attachments to be deleted\n")); return 1; } @@ -652,7 +635,6 @@ int imap_copy_messages (CONTEXT * ctx, HEADER * h, char *dest, int delete) * remainder. */ for (n = 0; n < ctx->msgcount; n++) { if (ctx->hdrs[n]->tagged && ctx->hdrs[n]->attach_del) { - debug_print (3, ("Message contains attachments to be deleted\n")); return 1; } @@ -662,7 +644,6 @@ int imap_copy_messages (CONTEXT * ctx, HEADER * h, char *dest, int delete) rc = imap_sync_message (idata, ctx->hdrs[n], &sync_cmd, &err_continue); if (rc < 0) { - debug_print (1, ("could not sync\n")); goto fail; } } @@ -670,7 +651,6 @@ int imap_copy_messages (CONTEXT * ctx, HEADER * h, char *dest, int delete) rc = imap_make_msg_set (idata, &cmd, M_TAG, 0); if (!rc) { - debug_print (1, ("No messages tagged\n")); goto fail; } mutt_message (_("Copying %d messages to %s..."), rc, mbox); @@ -685,7 +665,6 @@ int imap_copy_messages (CONTEXT * ctx, HEADER * h, char *dest, int delete) rc = imap_sync_message (idata, h, &sync_cmd, &err_continue); if (rc < 0) { - debug_print (1, ("could not sync\n")); goto fail; } } @@ -704,7 +683,6 @@ int imap_copy_messages (CONTEXT * ctx, HEADER * h, char *dest, int delete) imap_error ("imap_copy_messages", idata->cmd.buf); goto fail; } - debug_print (2, ("server suggests TRYCREATE\n")); snprintf (mmbox, sizeof (mmbox), _("Create %s?"), mbox); if (option (OPTCONFIRMCREATE) && mutt_yesorno (mmbox, 1) < 1) { mutt_clear_error (); @@ -797,7 +775,6 @@ char *imap_set_flags (IMAP_DATA * idata, HEADER * h, char *s) p_clear(&newh, 1); newh.data = p_new(IMAP_HEADER_DATA, 1); - debug_print (2, ("parsing FLAGS\n")); if ((s = msg_parse_flags (&newh, s)) == NULL) { p_delete(&newh.data); return NULL; @@ -892,7 +869,7 @@ static int msg_fetch_header (CONTEXT * ctx, IMAP_HEADER * h, char *buf, } #ifdef USE_HCACHE -static size_t imap_hcache_keylen (const char *fn) +static ssize_t imap_hcache_keylen (const char *fn) { return m_strlen(fn); } @@ -904,7 +881,7 @@ static size_t imap_hcache_keylen (const char *fn) * -1 if the string is not a fetch response * -2 if the string is a corrupt fetch response */ static int msg_fetch_header_fetch (CONTEXT * ctx, IMAP_HEADER * h, char *buf, - FILE * fp) + FILE * fp __attribute__ ((unused))) { IMAP_DATA *idata; int rc = -1; /* default now is that string isn't FETCH response */ @@ -984,7 +961,6 @@ static int msg_parse_fetch (IMAP_HEADER * h, char *s) else if (ascii_strncasecmp ("INTERNALDATE", s, 12) == 0) { s = vskipspaces(s + 12); if (*s != '\"') { - debug_print (1, ("bogus INTERNALDATE entry: %s\n", s)); return -1; } s++; @@ -1029,12 +1005,10 @@ static char *msg_parse_flags (IMAP_HEADER * h, char *s) /* sanity-check string */ if (ascii_strncasecmp ("FLAGS", s, 5) != 0) { - debug_print (1, ("not a FLAGS response: %s\n", s)); return NULL; } s = vskipspaces(s + 5); if (*s != '(') { - debug_print (1, ("bogus FLAGS response: %s\n", s)); return NULL; } s++; @@ -1087,7 +1061,6 @@ static char *msg_parse_flags (IMAP_HEADER * h, char *s) s++; } else { - debug_print (1, ("Unterminated FLAGS response: %s\n", s)); return NULL; }