X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mh.c;h=5a6817181f3e4f81586455fc88d24626a06eb0aa;hp=bba47aec963a43ec46bf55eeefea04520924ba72;hb=108f3c7ab59844591f7540347914ea57be5245e2;hpb=ae0ce4dfcafa0c3820f107c5bfa8bd06e5272b57 diff --git a/mh.c b/mh.c index bba47ae..5a68171 100644 --- a/mh.c +++ b/mh.c @@ -17,23 +17,6 @@ # include "config.h" #endif -#include -#include -#include -#include - -#include "mutt.h" -#include "mx.h" -#include "mh.h" -#include "mbox.h" -#include "copy.h" -#include "buffy.h" -#include "sort.h" -#include "thread.h" -#include "hcache.h" - -#include "lib/debug.h" - #include #include #include @@ -52,13 +35,26 @@ #include #endif +#include +#include +#include +#include +#include + +#include "mutt.h" +#include "mx.h" +#include "mh.h" +#include "mbox.h" +#include "copy.h" +#include "buffy.h" +#include "sort.h" +#include "thread.h" +#include "hcache.h" + struct maildir { HEADER *h; char *canon_fname; unsigned header_parsed:1; -#ifdef USE_INODESORT - ino_t inode; -#endif /* USE_INODESORT */ struct maildir *next; }; @@ -308,11 +304,11 @@ void mh_update_sequences (CONTEXT * ctx) /* first, copy unknown sequences */ if ((ofp = fopen (sequences, "r"))) { while ((buff = mutt_read_line (buff, &s, ofp, &l))) { - if (!str_ncmp (buff, seq_unseen, m_strlen(seq_unseen))) + if (!m_strncmp(buff, seq_unseen, m_strlen(seq_unseen))) continue; - if (!str_ncmp (buff, seq_flagged, m_strlen(seq_flagged))) + if (!m_strncmp(buff, seq_flagged, m_strlen(seq_flagged))) continue; - if (!str_ncmp (buff, seq_replied, m_strlen(seq_replied))) + if (!m_strncmp(buff, seq_replied, m_strlen(seq_replied))) continue; fprintf (nfp, "%s\n", buff); @@ -466,7 +462,7 @@ static void maildir_free_entry (struct maildir **md) p_delete(&(*md)->canon_fname); if ((*md)->h) - mutt_free_header (&(*md)->h); + header_delete(&(*md)->h); p_delete(md); } @@ -492,10 +488,10 @@ static void maildir_parse_flags (HEADER * h, const char *path) h->read = 0; h->replied = 0; - if ((p = strrchr (path, ':')) != NULL && str_ncmp (p + 1, "2,", 2) == 0) { + if ((p = strrchr (path, ':')) != NULL && m_strncmp(p + 1, "2,", 2) == 0) { p += 3; - str_replace (&h->maildir_flags, p); + m_strreplace(&h->maildir_flags, p); q = h->maildir_flags; while (*p) { @@ -550,7 +546,7 @@ static void maildir_update_mtime (CONTEXT * ctx) if (stat (buf, &st) == 0) ctx->mtime_cur = st.st_mtime; - strfcpy (buf, ctx->path, sizeof (buf)); + m_strcpy(buf, sizeof(buf), ctx->path); } if (stat (buf, &st) == 0) @@ -570,7 +566,7 @@ static HEADER *maildir_parse_message (int magic, const char *fname, if ((f = fopen (fname, "r")) != NULL) { if (!h) - h = mutt_new_header (); + h = header_new(); h->env = mutt_read_rfc822_header (f, h, 0, 0); fstat (fileno (f), &st); @@ -613,7 +609,7 @@ static HEADER *maildir_parse_message (int magic, const char *fname, static int maildir_parse_entry (CONTEXT * ctx, struct maildir ***last, const char *subdir, const char *fname, - int *count, int is_old, ino_t inode) + int *count, int is_old, ino_t inode __attribute__ ((unused))) { struct maildir *entry; HEADER *h = NULL; @@ -627,7 +623,7 @@ static int maildir_parse_entry (CONTEXT * ctx, struct maildir ***last, if (ctx->magic == M_MH) h = maildir_parse_message (ctx->magic, buf, is_old, NULL); else { - h = mutt_new_header (); + h = header_new(); h->old = is_old; maildir_parse_flags (h, buf); } @@ -649,9 +645,6 @@ static int maildir_parse_entry (CONTEXT * ctx, struct maildir ***last, entry = p_new(struct maildir, 1); entry->h = h; entry->header_parsed = (ctx->magic == M_MH); -#ifdef USE_INODESORT - entry->inode = inode; -#endif /* USE_INODESORT */ **last = entry; *last = &entry->next; @@ -690,7 +683,7 @@ static int maildir_parse_dir (CONTEXT * ctx, struct maildir ***last, is_old = (m_strcmp("cur", subdir) == 0); } else - strfcpy (buf, ctx->path, sizeof (buf)); + m_strcpy(buf, sizeof(buf), ctx->path); if ((dirp = opendir (buf)) == NULL) return -1; @@ -760,85 +753,6 @@ static int maildir_move_to_context (CONTEXT * ctx, struct maildir **md) return r; } -#ifdef USE_INODESORT -/* - * Merge two maildir lists according to the inode numbers. - */ -static struct maildir *maildir_merge_inode (struct maildir *left, - struct maildir *right) -{ - struct maildir *head; - struct maildir *tail; - - if (left && right) { - if (left->inode < right->inode) { - head = left; - left = left->next; - } - else { - head = right; - right = right->next; - } - } - else { - if (left) - return left; - else - return right; - } - - tail = head; - - while (left && right) { - if (left->inode < right->inode) { - tail->next = left; - left = left->next; - } - else { - tail->next = right; - right = right->next; - } - tail = tail->next; - } - - if (left) { - tail->next = left; - } - else { - tail->next = right; - } - - return head; -} - -/* - * Sort maildir list according to inode. - */ -static struct maildir *maildir_sort_inode (struct maildir *list) -{ - struct maildir *left = list; - struct maildir *right = list; - - if (!list || !list->next) { - return list; - } - - list = list->next; - while (list && list->next) { - right = right->next; - list = list->next->next; - } - - list = right; - right = right->next; - list->next = 0; - - left = maildir_sort_inode (left); - right = maildir_sort_inode (right); - return maildir_merge_inode (left, right); -} -#endif /* USE_INODESORT */ - #ifdef USE_HCACHE static size_t maildir_hcache_keylen (const char *fn) { @@ -904,7 +818,7 @@ void maildir_delayed_parsing (CONTEXT * ctx, struct maildir *md) #endif } else - mutt_free_header (&p->h); + header_delete(&p->h); #ifdef USE_HCACHE p_delete(&data); #endif @@ -945,10 +859,6 @@ static int _mh_read_dir (CONTEXT * ctx, const char *subdir) mhs_free_sequences (&mhs); } -#ifdef USE_INODESORT - md = maildir_sort_inode (md); -#endif /* USE_INODESORT */ - if (ctx->magic == M_MAILDIR) maildir_delayed_parsing (ctx, md); @@ -976,7 +886,7 @@ static int maildir_read_dir (CONTEXT * ctx) * Open a new (temporary) message in an MH folder. */ -static int mh_open_new_message (MESSAGE * msg, CONTEXT * dest, HEADER * hdr) +static int mh_open_new_message (MESSAGE * msg, CONTEXT * dest, HEADER * hdr __attribute__ ((unused))) { return mh_mkstemp (dest, &msg->fp, &msg->path); } @@ -1044,9 +954,9 @@ static int maildir_open_new_message (MESSAGE * msg, CONTEXT * dest, HEADER * hdr *suffix = '\0'; if (hdr && (hdr->read || hdr->old)) - strfcpy (subdir, "cur", sizeof (subdir)); + m_strcpy(subdir, sizeof(subdir), "cur"); else - strfcpy (subdir, "new", sizeof (subdir)); + m_strcpy(subdir, sizeof(subdir), "new"); for (;;) { snprintf (path, _POSIX_PATH_MAX, "%s/tmp/%s.%ld.%u_%d.%s%s", @@ -1115,11 +1025,11 @@ static int maildir_commit_message (MESSAGE * msg, CONTEXT * ctx, HEADER * hdr) /* extract the subdir */ s = strrchr (msg->path, '/') + 1; - strfcpy (subdir, s, 4); + m_strcpy(subdir, sizeof(subdir), s); /* extract the flags */ if ((s = strchr (s, ':'))) - strfcpy (suffix, s, sizeof (suffix)); + m_strcpy(suffix, sizeof(suffix), s); else suffix[0] = '\0'; @@ -1134,7 +1044,7 @@ static int maildir_commit_message (MESSAGE * msg, CONTEXT * ctx, HEADER * hdr) if (safe_rename (msg->path, full) == 0) { if (hdr) - str_replace (&hdr->path, path); + m_strreplace(&hdr->path, path); p_delete(&msg->path); /* @@ -1220,7 +1130,7 @@ static int _mh_commit_message (MESSAGE * msg, CONTEXT * ctx, HEADER * hdr, snprintf (path, sizeof (path), "%s/%s", ctx->path, tmp); if (safe_rename (msg->path, path) == 0) { if (hdr) - str_replace (&hdr->path, tmp); + m_strreplace(&hdr->path, tmp); p_delete(&msg->path); break; } @@ -1266,8 +1176,8 @@ static int mh_rewrite_message (CONTEXT * ctx, int msgno) if ((rc = mutt_copy_message (dest->fp, ctx, h, M_CM_UPDATE, CH_UPDATE | CH_UPDATE_LEN)) == 0) { - snprintf (oldpath, _POSIX_PATH_MAX, "%s/%s", ctx->path, h->path); - strfcpy (partpath, h->path, _POSIX_PATH_MAX); + snprintf (oldpath, sizeof(oldpath), "%s/%s", ctx->path, h->path); + m_strcpy(partpath, sizeof(partpath), h->path); if (ctx->magic == M_MAILDIR) rc = maildir_commit_message (dest, ctx, h); @@ -1299,7 +1209,7 @@ static int mh_rewrite_message (CONTEXT * ctx, int msgno) if (ctx->magic == M_MH && rc == 0) { snprintf (newpath, _POSIX_PATH_MAX, "%s/%s", ctx->path, h->path); if ((rc = safe_rename (newpath, oldpath)) == 0) - str_replace (&h->path, partpath); + m_strreplace(&h->path, partpath); } } else @@ -1352,7 +1262,7 @@ static int maildir_sync_message (CONTEXT * ctx, int msgno) return (-1); } p++; - strfcpy (newpath, p, sizeof (newpath)); + m_strcpy(newpath, sizeof(newpath), p); /* kill the previous flags */ if ((p = strchr (newpath, ':')) != NULL) @@ -1377,12 +1287,12 @@ static int maildir_sync_message (CONTEXT * ctx, int msgno) mutt_perror ("rename"); return (-1); } - str_replace (&h->path, partpath); + m_strreplace(&h->path, partpath); } return (0); } -static int mh_sync_mailbox (CONTEXT * ctx, int unused, int *index_hint) +static int mh_sync_mailbox (CONTEXT * ctx, int unused __attribute__ ((unused)), int *index_hint) { char path[_POSIX_PATH_MAX], tmp[_POSIX_PATH_MAX]; int i, j; @@ -1482,7 +1392,7 @@ static char *maildir_canon_filename (char *dest, const char *src, size_t l) if ((t = strrchr (src, '/'))) src = t + 1; - strfcpy (dest, src, l); + m_strcpy(dest, l, src); if ((u = strrchr (dest, ':'))) *u = '\0'; @@ -1557,7 +1467,7 @@ static void maildir_update_flags (CONTEXT * ctx, HEADER * o, HEADER * n) * either subdirectory differently, as mail could be copied directly into * the cur directory from another agent. */ -static int maildir_check_mailbox (CONTEXT * ctx, int *index_hint, int unused) +static int maildir_check_mailbox (CONTEXT * ctx, int *index_hint, int unused __attribute__ ((unused))) { struct stat st_new; /* status of the "new" subdirectory */ struct stat st_cur; /* status of the "cur" subdirectory */ @@ -1631,7 +1541,7 @@ static int maildir_check_mailbox (CONTEXT * ctx, int *index_hint, int unused) * subdirectory. If so, update the associated filename. */ if (m_strcmp(ctx->hdrs[i]->path, p->h->path)) - str_replace (&ctx->hdrs[i]->path, p->h->path); + m_strreplace(&ctx->hdrs[i]->path, p->h->path); /* if the user hasn't modified the flags on this message, update * the flags we just detected. @@ -1644,7 +1554,7 @@ static int maildir_check_mailbox (CONTEXT * ctx, int *index_hint, int unused) ctx->hdrs[i]->trash = p->h->trash; /* this is a duplicate of an existing header, so remove it */ - mutt_free_header (&p->h); + header_delete(&p->h); } /* This message was not in the list of messages we just scanned. * Check to see if we have enough information to know if the @@ -1694,7 +1604,7 @@ static int maildir_check_mailbox (CONTEXT * ctx, int *index_hint, int unused) * */ -static int mh_check_mailbox (CONTEXT * ctx, int *index_hint, int unused) +static int mh_check_mailbox (CONTEXT * ctx, int *index_hint, int unused __attribute__ ((unused))) { char buf[_POSIX_PATH_MAX]; struct stat st, st_cur; @@ -1708,7 +1618,7 @@ static int mh_check_mailbox (CONTEXT * ctx, int *index_hint, int unused) if (!option (OPTCHECKNEW)) return 0; - strfcpy (buf, ctx->path, sizeof (buf)); + m_strcpy(buf, sizeof(buf), ctx->path); if (stat (buf, &st) == -1) return -1; @@ -1763,7 +1673,7 @@ static int mh_check_mailbox (CONTEXT * ctx, int *index_hint, int unused) if (!ctx->hdrs[i]->changed) maildir_update_flags (ctx, ctx->hdrs[i], p->h); - mutt_free_header (&p->h); + header_delete(&p->h); } else /* message has disappeared */ occult = 1; @@ -1877,7 +1787,7 @@ static int maildir_check_empty (const char *path) DIR *dp; struct dirent *de; int r = 1; /* assume empty until we find a message */ - char realpath[_POSIX_PATH_MAX]; + char frealpath[_POSIX_PATH_MAX]; int iter = 0; /* Strategy here is to look for any file not beginning with a period */ @@ -1886,9 +1796,9 @@ static int maildir_check_empty (const char *path) /* we do "cur" on the first iteration since its more likely that we'll * find old messages without having to scan both subdirs */ - snprintf (realpath, sizeof (realpath), "%s/%s", path, + snprintf (frealpath, sizeof (frealpath), "%s/%s", path, iter == 0 ? "cur" : "new"); - if ((dp = opendir (realpath)) == NULL) + if ((dp = opendir (frealpath)) == NULL) return -1; while ((de = readdir (dp))) { if (*de->d_name != '.') {