#include "copy.h"
#include "buffy.h"
#include "sort.h"
+#include "thread.h"
+#include "hcache.h"
#include "lib/mem.h"
#include "lib/intl.h"
#include "lib/str.h"
+#include "lib/debug.h"
#include <sys/stat.h>
#include <sys/types.h>
/* prototypes */
static int maildir_check_empty (const char*);
+static int maildir_check_mailbox (CONTEXT*, int*, int);
+static int mh_check_mailbox (CONTEXT*, int*, int);
static void mhs_alloc (struct mh_sequences *mhs, int i)
{
if (i > mhs->max || !mhs->flags) {
newmax = i + 128;
- safe_realloc (&mhs->flags, sizeof (mhs->flags[0]) * (newmax + 1));
+ mem_realloc (&mhs->flags, sizeof (mhs->flags[0]) * (newmax + 1));
for (j = mhs->max + 1; j <= newmax; j++)
mhs->flags[j] = 0;
static void mhs_free_sequences (struct mh_sequences *mhs)
{
- FREE (&mhs->flags);
+ mem_free (&mhs->flags);
}
static short mhs_check (struct mh_sequences *mhs, int i)
if (!(t = strtok (buff, " \t:")))
continue;
- if (!safe_strcmp (t, MhUnseen))
+ if (!str_cmp (t, MhUnseen))
f = MH_SEQ_UNSEEN;
- else if (!safe_strcmp (t, MhFlagged))
+ else if (!str_cmp (t, MhFlagged))
f = MH_SEQ_FLAGGED;
- else if (!safe_strcmp (t, MhReplied))
+ else if (!str_cmp (t, MhReplied))
f = MH_SEQ_REPLIED;
else /* unknown sequence */
continue;
}
}
- FREE (&buff);
+ mem_free (&buff);
safe_fclose (&fp);
}
}
}
else {
- *tgt = safe_strdup (path);
+ *tgt = str_dup (path);
break;
}
}
if ((*fp = fdopen (fd, "w")) == NULL) {
- FREE (tgt);
+ mem_free (tgt);
close (fd);
unlink (path);
return (-1);
/* first, copy unknown sequences */
if ((ofp = fopen (sequences, "r"))) {
while ((buff = mutt_read_line (buff, &s, ofp, &l))) {
- if (!safe_strncmp (buff, seq_unseen, safe_strlen (seq_unseen)))
+ if (!str_ncmp (buff, seq_unseen, str_len (seq_unseen)))
continue;
- if (!safe_strncmp (buff, seq_flagged, safe_strlen (seq_flagged)))
+ if (!str_ncmp (buff, seq_flagged, str_len (seq_flagged)))
continue;
- if (!safe_strncmp (buff, seq_replied, safe_strlen (seq_replied)))
+ if (!str_ncmp (buff, seq_replied, str_len (seq_replied)))
continue;
fprintf (nfp, "%s\n", buff);
unlink (tmpfname);
}
- FREE (&tmpfname);
+ mem_free (&tmpfname);
}
static void mh_sequences_add_one (CONTEXT * ctx, int n, short unseen,
snprintf (sequences, sizeof (sequences), "%s/.mh_sequences", ctx->path);
if ((ofp = fopen (sequences, "r"))) {
while ((buff = mutt_read_line (buff, &sz, ofp, &line))) {
- if (unseen && !strncmp (buff, seq_unseen, safe_strlen (seq_unseen))) {
+ if (unseen && !strncmp (buff, seq_unseen, str_len (seq_unseen))) {
fprintf (nfp, "%s %d\n", buff, n);
unseen_done = 1;
}
else if (flagged
- && !strncmp (buff, seq_flagged, safe_strlen (seq_flagged))) {
+ && !strncmp (buff, seq_flagged, str_len (seq_flagged))) {
fprintf (nfp, "%s %d\n", buff, n);
flagged_done = 1;
}
else if (replied
- && !strncmp (buff, seq_replied, safe_strlen (seq_replied))) {
+ && !strncmp (buff, seq_replied, str_len (seq_replied))) {
fprintf (nfp, "%s %d\n", buff, n);
replied_done = 1;
}
}
}
safe_fclose (&ofp);
- FREE (&buff);
+ mem_free (&buff);
if (!unseen_done && unseen)
fprintf (nfp, "%s: %d\n", NONULL (MhUnseen), n);
if (safe_rename (tmpfname, sequences) != 0)
unlink (tmpfname);
- FREE (&tmpfname);
+ mem_free (&tmpfname);
}
static void mh_update_maildir (struct maildir *md, struct mh_sequences *mhs)
if (!md || !*md)
return;
- FREE (&(*md)->canon_fname);
+ mem_free (&(*md)->canon_fname);
if ((*md)->h)
mutt_free_header (&(*md)->h);
- FREE (md);
+ mem_free (md);
}
static void maildir_free_maildir (struct maildir **md)
h->read = 0;
h->replied = 0;
- if ((p = strrchr (path, ':')) != NULL && safe_strncmp (p + 1, "2,", 2) == 0) {
+ if ((p = strrchr (path, ':')) != NULL && str_ncmp (p + 1, "2,", 2) == 0) {
p += 3;
str_replace (&h->maildir_flags, p);
}
if (q == h->maildir_flags)
- FREE (&h->maildir_flags);
+ mem_free (&h->maildir_flags);
else if (q)
*q = '\0';
}
if (subdir) {
snprintf (buf, sizeof (buf), "%s/%s", subdir, fname);
- h->path = safe_strdup (buf);
+ h->path = str_dup (buf);
}
else
- h->path = safe_strdup (fname);
+ h->path = str_dup (fname);
- entry = safe_calloc (sizeof (struct maildir), 1);
+ entry = mem_calloc (sizeof (struct maildir), 1);
entry->h = h;
entry->header_parsed = (ctx->magic == M_MH);
#ifdef USE_INODESORT
if (subdir) {
snprintf (buf, sizeof (buf), "%s/%s", ctx->path, subdir);
- is_old = (safe_strcmp ("cur", subdir) == 0);
+ is_old = (str_cmp ("cur", subdir) == 0);
}
else
strfcpy (buf, ctx->path, sizeof (buf));
/* FOO - really ignore the return value? */
- dprint (2,
- (debugfile, "%s:%d: parsing %s\n", __FILE__, __LINE__,
- de->d_name));
+ debug_print (2, ("parsing %s\n", de->d_name));
maildir_parse_entry (ctx, last, subdir, de->d_name, count, is_old,
de->d_ino);
}
while (md) {
- dprint (2, (debugfile, "%s:%d maildir_add_to_context(): Considering %s\n",
- __FILE__, __LINE__, NONULL (md->canon_fname)));
+ debug_print (2, ("considering %s\n", NONULL (md->canon_fname)));
if (md->h) {
- dprint (2,
- (debugfile,
- "%s:%d Adding header structure. Flags: %s%s%s%s%s\n", __FILE__,
- __LINE__, md->h->flagged ? "f" : "", md->h->deleted ? "D" : "",
- md->h->replied ? "r" : "", md->h->old ? "O" : "",
- md->h->read ? "R" : ""));
+ debug_print (2, ("flags: %s%s%s%s%s\n", md->h->flagged ? "f" : "",
+ md->h->deleted ? "D" : "", md->h->replied ? "r" : "",
+ md->h->old ? "O" : "", md->h->read ? "R" : ""));
if (ctx->msgcount == ctx->hdrmax)
mx_alloc_memory (ctx);
{
const char *p = strchr (fn, ':');
- return p ? (size_t) (p - fn) : safe_strlen (fn);
+ return p ? (size_t) (p - fn) : str_len (fn);
}
#endif
else
mutt_free_header (&p->h);
#if USE_HCACHE
- FREE (&data);
+ mem_free (&data);
#endif
}
#if USE_HCACHE
hdr->read ? "S" : "", hdr->deleted ? "T" : "",
NONULL (hdr->maildir_flags));
if (hdr->maildir_flags)
- qsort (tmp, safe_strlen (tmp), 1, ch_compar);
+ qsort (tmp, str_len (tmp), 1, ch_compar);
snprintf (dest, destlen, ":2,%s", tmp);
}
}
dest->path, subdir, (long) time (NULL),
(unsigned int) getpid (), Counter++, NONULL (Hostname), suffix);
- dprint (2, (debugfile, "maildir_open_new_message (): Trying %s.\n",
- path));
+ debug_print (2, ("trying %s.\n", path));
umask (Umask);
if ((fd = open (path, O_WRONLY | O_EXCL | O_CREAT, 0666)) == -1) {
}
}
else {
- dprint (2, (debugfile, "maildir_open_new_message (): Success.\n"));
- msg->path = safe_strdup (path);
+ debug_print (2, ("success.\n"));
+ msg->path = str_dup (path);
break;
}
}
if ((msg->fp = fdopen (fd, "w")) == NULL) {
- FREE (&msg->path);
+ mem_free (&msg->path);
close (fd);
unlink (path);
return (-1);
*
*/
-int maildir_commit_message (CONTEXT * ctx, MESSAGE * msg, HEADER * hdr)
+static int maildir_commit_message (MESSAGE * msg, CONTEXT * ctx, HEADER * hdr)
{
char subdir[4];
char suffix[16];
NONULL (Hostname), suffix);
snprintf (full, _POSIX_PATH_MAX, "%s/%s", ctx->path, path);
- dprint (2, (debugfile, "maildir_commit_message (): renaming %s to %s.\n",
- msg->path, full));
+ debug_print (2, ("renaming %s to %s.\n", msg->path, full));
if (safe_rename (msg->path, full) == 0) {
if (hdr)
str_replace (&hdr->path, path);
- FREE (&msg->path);
+ mem_free (&msg->path);
/*
* Adjust the mtime on the file to match the time at which this
*/
-static int _mh_commit_message (CONTEXT * ctx, MESSAGE * msg, HEADER * hdr,
+static int _mh_commit_message (MESSAGE * msg, CONTEXT * ctx, HEADER * hdr,
short updseq)
{
DIR *dirp;
if (safe_rename (msg->path, path) == 0) {
if (hdr)
str_replace (&hdr->path, tmp);
- FREE (&msg->path);
+ mem_free (&msg->path);
break;
}
else if (errno != EEXIST) {
return 0;
}
-int mh_commit_message (CONTEXT * ctx, MESSAGE * msg, HEADER * hdr)
-{
- return _mh_commit_message (ctx, msg, hdr, 1);
+static int mh_commit_message (MESSAGE * msg, CONTEXT * ctx, HEADER * hdr) {
+ return _mh_commit_message (msg, ctx, hdr, 1);
}
-
/* Sync a message in an MH folder.
*
* This code is also used for attachment deletion in maildir
strfcpy (partpath, h->path, _POSIX_PATH_MAX);
if (ctx->magic == M_MAILDIR)
- rc = maildir_commit_message (ctx, dest, h);
+ rc = maildir_commit_message (dest, ctx, h);
else
- rc = _mh_commit_message (ctx, dest, h, 0);
+ rc = _mh_commit_message (dest, ctx, h, 0);
mx_close_message (&dest);
{
HEADER *h = ctx->hdrs[msgno];
- if (h->attach_del || h->refs_changed || h->irt_changed)
+ if (h->attach_del ||
+ (h->env && (h->env->refs_changed || h->env->irt_changed)))
if (mh_rewrite_message (ctx, msgno) != 0)
return -1;
{
HEADER *h = ctx->hdrs[msgno];
- if (h->attach_del || h->refs_changed || h->irt_changed) {
+ if (h->attach_del ||
+ (h->env && (h->env->refs_changed || h->env->irt_changed))) {
/* when doing attachment deletion/rethreading, fall back to the MH case. */
if (mh_rewrite_message (ctx, msgno) != 0)
return (-1);
char *p;
if ((p = strrchr (h->path, '/')) == NULL) {
- dprint (1,
- (debugfile,
- "maildir_sync_message: %s: unable to find subdir!\n",
- h->path));
+ debug_print (1, ("%s: unable to find subdir!\n", h->path));
return (-1);
}
p++;
snprintf (fullpath, sizeof (fullpath), "%s/%s", ctx->path, partpath);
snprintf (oldpath, sizeof (oldpath), "%s/%s", ctx->path, h->path);
- if (safe_strcmp (fullpath, oldpath) == 0) {
+ if (str_cmp (fullpath, oldpath) == 0) {
/* message hasn't really changed */
return 0;
}
#endif /* USE_HCACHE */
if (ctx->magic == M_MH)
- i = mh_check_mailbox (ctx, index_hint);
+ i = mh_check_mailbox (ctx, index_hint, 0);
else
- i = maildir_check_mailbox (ctx, index_hint);
+ i = maildir_check_mailbox (ctx, index_hint, 0);
if (i != 0)
return i;
* either subdirectory differently, as mail could be copied directly into
* the cur directory from another agent.
*/
-int maildir_check_mailbox (CONTEXT * ctx, int *index_hint)
+static int maildir_check_mailbox (CONTEXT * ctx, int *index_hint, int unused)
{
struct stat st_new; /* status of the "new" subdirectory */
struct stat st_cur; /* status of the "cur" subdirectory */
HASH *fnames; /* hash table for quickly looking up the base filename
for a maildir message */
- /* XXX seems like this check belongs in mx_check_mailbox()
- * rather than here.
- */
if (!option (OPTCHECKNEW))
return 0;
for (p = md; p; p = p->next) {
maildir_canon_filename (buf, p->h->path, sizeof (buf));
- p->canon_fname = safe_strdup (buf);
+ p->canon_fname = str_dup (buf);
hash_insert (fnames, p->canon_fname, p, 0);
}
/* check to see if the message has moved to a different
* subdirectory. If so, update the associated filename.
*/
- if (safe_strcmp (ctx->hdrs[i]->path, p->h->path))
+ if (str_cmp (ctx->hdrs[i]->path, p->h->path))
str_replace (&ctx->hdrs[i]->path, p->h->path);
/* if the user hasn't modified the flags on this message, update
*
*/
-int mh_check_mailbox (CONTEXT * ctx, int *index_hint)
+static int mh_check_mailbox (CONTEXT * ctx, int *index_hint, int unused)
{
char buf[_POSIX_PATH_MAX];
struct stat st, st_cur;
safe_fclose (&fp);
if (safe_rename (tmp, buf) == -1)
unlink (tmp);
- FREE (&tmp);
+ mem_free (&tmp);
}
}
ctx->hdrs[i]->active = 0;
if ((p = hash_find (fnames, ctx->hdrs[i]->path)) && p->h &&
- (mbox_strict_cmp_headers (ctx->hdrs[i], p->h))) {
+ (mutt_cmp_header (ctx->hdrs[i], p->h))) {
ctx->hdrs[i]->active = 1;
/* found the right message */
if (!ctx->hdrs[i]->changed)
while ((de = readdir (dp))) {
maildir_canon_filename (tunique, de->d_name, sizeof (tunique));
- if (!safe_strcmp (tunique, unique)) {
+ if (!str_cmp (tunique, unique)) {
snprintf (fname, sizeof (fname), "%s/%s/%s", folder, subfolder,
de->d_name);
fp = fopen (fname, "r"); /* __FOPEN_CHECKED__ */
/* routines common to maildir and mh */
static mx_t* reg_mx (void) {
- mx_t* fmt = safe_calloc (1, sizeof (mx_t));
+ mx_t* fmt = mem_calloc (1, sizeof (mx_t));
fmt->local = 1;
fmt->mx_access = access;
fmt->mx_sync_mailbox = mh_sync_mailbox;
return (fmt);
}
+static int mh_commit (MESSAGE* msg, CONTEXT* ctx) {
+ return (mh_commit_message (msg, ctx, NULL));
+}
+
+static int maildir_commit (MESSAGE* msg, CONTEXT* ctx) {
+ return (maildir_commit_message (msg, ctx, NULL));
+}
+
mx_t* mh_reg_mx (void) {
mx_t* fmt = reg_mx ();
fmt->type = M_MH;
fmt->mx_is_magic = mh_is_magic;
fmt->mx_open_mailbox = mh_read_dir;
fmt->mx_open_new_message = mh_open_new_message;
+ fmt->mx_check_mailbox = mh_check_mailbox;
+ fmt->mx_commit_message = mh_commit;
return (fmt);
}
fmt->mx_is_magic = maildir_is_magic;
fmt->mx_open_mailbox = maildir_read_dir;
fmt->mx_open_new_message = maildir_open_new_message;
+ fmt->mx_check_mailbox = maildir_check_mailbox;
+ fmt->mx_commit_message = maildir_commit;
return (fmt);
}
projects / apps / madmutt.git / blobdiff