#endif
#include "mutt.h"
-#include "mailbox.h"
#include "mx.h"
+#include "mh.h"
+#include "mbox.h"
#include "copy.h"
#include "buffy.h"
#include "sort.h"
#include <string.h>
#include <utime.h>
+#if HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+
struct maildir {
HEADER *h;
char *canon_fname;
unsigned header_parsed:1;
+#ifdef USE_INODESORT
ino_t inode;
+#endif /* USE_INODESORT */
struct maildir *next;
};
if (!(t = strtok (buff, " \t:")))
continue;
- if (!mutt_strcmp (t, MhUnseen))
+ if (!safe_strcmp (t, MhUnseen))
f = MH_SEQ_UNSEEN;
- else if (!mutt_strcmp (t, MhFlagged))
+ else if (!safe_strcmp (t, MhFlagged))
f = MH_SEQ_FLAGGED;
- else if (!mutt_strcmp (t, MhReplied))
+ else if (!safe_strcmp (t, MhReplied))
f = MH_SEQ_REPLIED;
else /* unknown sequence */
continue;
/* first, copy unknown sequences */
if ((ofp = fopen (sequences, "r"))) {
while ((buff = mutt_read_line (buff, &s, ofp, &l))) {
- if (!mutt_strncmp (buff, seq_unseen, mutt_strlen (seq_unseen)))
+ if (!safe_strncmp (buff, seq_unseen, safe_strlen (seq_unseen)))
continue;
- if (!mutt_strncmp (buff, seq_flagged, mutt_strlen (seq_flagged)))
+ if (!safe_strncmp (buff, seq_flagged, safe_strlen (seq_flagged)))
continue;
- if (!mutt_strncmp (buff, seq_replied, mutt_strlen (seq_replied)))
+ if (!safe_strncmp (buff, seq_replied, safe_strlen (seq_replied)))
continue;
fprintf (nfp, "%s\n", buff);
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, mutt_strlen (seq_unseen))) {
+ if (unseen && !strncmp (buff, seq_unseen, safe_strlen (seq_unseen))) {
fprintf (nfp, "%s %d\n", buff, n);
unseen_done = 1;
}
else if (flagged
- && !strncmp (buff, seq_flagged, mutt_strlen (seq_flagged))) {
+ && !strncmp (buff, seq_flagged, safe_strlen (seq_flagged))) {
fprintf (nfp, "%s %d\n", buff, n);
flagged_done = 1;
}
else if (replied
- && !strncmp (buff, seq_replied, mutt_strlen (seq_replied))) {
+ && !strncmp (buff, seq_replied, safe_strlen (seq_replied))) {
fprintf (nfp, "%s %d\n", buff, n);
replied_done = 1;
}
h->read = 0;
h->replied = 0;
- if ((p = strrchr (path, ':')) != NULL && mutt_strncmp (p + 1, "2,", 2) == 0) {
+ if ((p = strrchr (path, ':')) != NULL && safe_strncmp (p + 1, "2,", 2) == 0) {
p += 3;
- mutt_str_replace (&h->maildir_flags, p);
+ str_replace (&h->maildir_flags, p);
q = h->maildir_flags;
while (*p) {
entry = safe_calloc (sizeof (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;
if (subdir) {
snprintf (buf, sizeof (buf), "%s/%s", ctx->path, subdir);
- is_old = (mutt_strcmp ("cur", subdir) == 0);
+ is_old = (safe_strcmp ("cur", subdir) == 0);
}
else
strfcpy (buf, ctx->path, sizeof (buf));
return r;
}
+#ifdef USE_INODESORT
/*
* Merge two maildir lists according to the inode numbers.
*/
right = maildir_sort_inode (right);
return maildir_merge_inode (left, right);
}
+#endif /* USE_INODESORT */
#if USE_HCACHE
static size_t maildir_hcache_keylen (const char *fn)
{
const char *p = strchr (fn, ':');
- return p ? (size_t) (p - fn) : mutt_strlen (fn);
+ return p ? (size_t) (p - fn) : safe_strlen (fn);
}
#endif
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);
hdr->read ? "S" : "", hdr->deleted ? "T" : "",
NONULL (hdr->maildir_flags));
if (hdr->maildir_flags)
- qsort (tmp, mutt_strlen (tmp), 1, ch_compar);
+ qsort (tmp, safe_strlen (tmp), 1, ch_compar);
snprintf (dest, destlen, ":2,%s", tmp);
}
}
if (safe_rename (msg->path, full) == 0) {
if (hdr)
- mutt_str_replace (&hdr->path, path);
+ str_replace (&hdr->path, path);
FREE (&msg->path);
/*
snprintf (path, sizeof (path), "%s/%s", ctx->path, tmp);
if (safe_rename (msg->path, path) == 0) {
if (hdr)
- mutt_str_replace (&hdr->path, tmp);
+ str_replace (&hdr->path, tmp);
FREE (&msg->path);
break;
}
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)
- mutt_str_replace (&h->path, partpath);
+ str_replace (&h->path, partpath);
}
}
else
snprintf (fullpath, sizeof (fullpath), "%s/%s", ctx->path, partpath);
snprintf (oldpath, sizeof (oldpath), "%s/%s", ctx->path, h->path);
- if (mutt_strcmp (fullpath, oldpath) == 0) {
+ if (safe_strcmp (fullpath, oldpath) == 0) {
/* message hasn't really changed */
return 0;
}
mutt_perror ("rename");
return (-1);
}
- mutt_str_replace (&h->path, partpath);
+ str_replace (&h->path, partpath);
}
return (0);
}
/* check to see if the message has moved to a different
* subdirectory. If so, update the associated filename.
*/
- if (mutt_strcmp (ctx->hdrs[i]->path, p->h->path))
- mutt_str_replace (&ctx->hdrs[i]->path, p->h->path);
+ if (safe_strcmp (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
* the flags we just detected.
while ((de = readdir (dp))) {
maildir_canon_filename (tunique, de->d_name, sizeof (tunique));
- if (!mutt_strcmp (tunique, unique)) {
+ if (!safe_strcmp (tunique, unique)) {
snprintf (fname, sizeof (fname), "%s/%s/%s", folder, subfolder,
de->d_name);
fp = fopen (fname, "r"); /* __FOPEN_CHECKED__ */