/* message parsing/updating functions */
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <stdlib.h>
-#include <ctype.h>
-
-#include <lib-lib/mem.h>
-#include <lib-lib/ascii.h>
-#include <lib-lib/str.h>
-#include <lib-lib/buffer.h>
+#include <lib-lib/lib-lib.h>
#include <lib-ui/curses.h>
#include "pgp.h"
#endif
-#include <lib-lib/macros.h>
-#include <lib-lib/file.h>
-#include "lib/debug.h"
-
-#if HAVE_STDINT_H
-#include <stdint.h>
-#elif HAVE_INTTYPES_H
-#include <inttypes.h>
-#endif
-
static void flush_buffer (char *buf, size_t * len, CONNECTION * conn);
static int msg_fetch_header (CONTEXT * ctx, IMAP_HEADER * h, char *buf,
FILE * fp);
-static int msg_has_flag (LIST * flag_list, const char *flag);
+static int msg_has_flag (string_list_t * flag_list, const char *flag);
static int msg_parse_fetch (IMAP_HEADER * h, char *s);
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:
int rc, mfhrc, oldmsgcount;
int fetchlast = 0;
const char *want_headers =
- "DATE FROM SUBJECT TO CC MESSAGE-ID REFERENCES CONTENT-TYPE CONTENT-DESCRIPTION IN-REPLY-TO REPLY-TO LINES LIST-POST X-LABEL";
+ "DATE FROM SUBJECT TO CC MESSAGE-ID REFERENCES CONTENT-TYPE CONTENT-DESCRIPTION IN-REPLY-TO REPLY-TO LINES string_list_t-POST X-LABEL";
#ifdef USE_HCACHE
void *hc = NULL;
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;
((msgno + 1) >= fetchlast)));
if ((mfhrc < -1) || ((rc != IMAP_CMD_CONTINUE) && (rc != IMAP_CMD_OK))) {
- imap_free_header_data ((void **) &h.data);
+ imap_free_header_data((void *)&h.data);
fclose (fp);
mutt_hcache_close (hc);
return -1;
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;
int uid;
int cacheno;
IMAP_CACHE *cache;
- int read;
+ int isread;
int rc;
progress_t bar;
if (ascii_strncasecmp ("UID", pc, 3) == 0) {
pc = imap_next_word (pc);
uid = atoi (pc);
- if (uid != HEADER_DATA (h)->uid)
+ if (uid != HEADER_DATA(h)->uid)
mutt_error (_
("The message index is incorrect. Try reopening the mailbox."));
}
* the server's notion of 'read' and if it differs from the message info
* picked up in mutt_read_rfc822_header, we mark the message (and context
* changed). Another possiblity: ignore Status on IMAP?*/
- read = h->read;
+ isread = h->read;
newenv = mutt_read_rfc822_header (msg->fp, h, 0, 0);
mutt_merge_envelopes(h->env, &newenv);
/* see above. We want the new status in h->read, so we unset it manually
* and let mutt_set_flag set it correctly, updating context. */
- if (read != h->read) {
- h->read = read;
- mutt_set_flag (ctx, h, M_NEW, read);
+ if (isread != h->read) {
+ h->read = isread;
+ mutt_set_flag (ctx, h, M_NEW, isread);
}
h->lines = 0;
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);
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);
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;
}
* 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;
}
rc = imap_sync_message (idata, ctx->hdrs[n], &sync_cmd, &err_continue);
if (rc < 0)
{
- debug_print (1, ("could not sync\n"));
goto fail;
}
}
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);
rc = imap_sync_message (idata, h, &sync_cmd, &err_continue);
if (rc < 0)
{
- debug_print (1, ("could not sync\n"));
goto fail;
}
}
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 ();
/* imap_add_keywords: concatenate custom IMAP tags to list, if they
* appear in the folder flags list. Why wouldn't they? */
-void imap_add_keywords (char *s, HEADER * h, LIST * mailbox_flags,
+void imap_add_keywords (char *s, HEADER * h, string_list_t * mailbox_flags,
size_t slen)
{
- LIST *keywords;
+ string_list_t *keywords;
if (!mailbox_flags || !HEADER_DATA (h) || !HEADER_DATA (h)->keywords)
return;
void imap_free_header_data (void **data)
{
/* this should be safe even if the list wasn't used */
- mutt_free_list (&(((IMAP_HEADER_DATA *) * data)->keywords));
+ string_list_wipe(&(((IMAP_HEADER_DATA *) * data)->keywords));
p_delete(data);
}
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;
ctx->changed &= ~readonly;
ctx->readonly = readonly;
- mutt_free_list (&(HEADER_DATA (h)->keywords));
+ string_list_wipe(&(HEADER_DATA (h)->keywords));
HEADER_DATA (h)->keywords = newh.data->keywords;
p_delete(&newh.data);
}
#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);
}
* -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 */
/* msg_has_flag: do a caseless comparison of the flag against a flag list,
* return 1 if found or flag list has '\*', 0 otherwise */
-static int msg_has_flag (LIST * flag_list, const char *flag)
+static int msg_has_flag (string_list_t * flag_list, const char *flag)
{
if (!flag_list)
return 0;
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++;
/* 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++;
char *flag_word = s;
if (!h->data->keywords)
- h->data->keywords = mutt_new_list ();
+ h->data->keywords = string_item_new();
while (*s && !ISSPACE (*s) && *s != ')')
s++;
s++;
}
else {
- debug_print (1, ("Unterminated FLAGS response: %s\n", s));
return NULL;
}
projects / apps / madmutt.git / blobdiff