#endif
#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
#include <lib-lib/macros.h>
#include "mutt.h"
#include "thread.h"
#include "hcache.h"
-#include "lib/str.h"
#include "lib/debug.h"
#include <sys/stat.h>
if (!(t = strtok (buff, " \t:")))
continue;
- if (!str_cmp (t, MhUnseen))
+ if (!m_strcmp(t, MhUnseen))
f = MH_SEQ_UNSEEN;
- else if (!str_cmp (t, MhFlagged))
+ else if (!m_strcmp(t, MhFlagged))
f = MH_SEQ_FLAGGED;
- else if (!str_cmp (t, MhReplied))
+ else if (!m_strcmp(t, MhReplied))
f = MH_SEQ_REPLIED;
else /* unknown sequence */
continue;
int i, r = 0;
struct mh_sequences mhs;
- memset (&mhs, 0, sizeof (mhs));
+ p_clear(&mhs, 1);
mh_read_sequences (&mhs, path);
for (i = 0; !r && i <= mhs.max; i++)
}
}
else {
- *tgt = str_dup (path);
+ *tgt = m_strdup(path);
break;
}
}
struct mh_sequences mhs;
- memset (&mhs, 0, sizeof (mhs));
+ p_clear(&mhs, 1);
snprintf (seq_unseen, sizeof (seq_unseen), "%s:", NONULL (MhUnseen));
snprintf (seq_replied, sizeof (seq_replied), "%s:", NONULL (MhReplied));
/* first, copy unknown sequences */
if ((ofp = fopen (sequences, "r"))) {
while ((buff = mutt_read_line (buff, &s, ofp, &l))) {
- if (!str_ncmp (buff, seq_unseen, str_len (seq_unseen)))
+ if (!str_ncmp (buff, seq_unseen, m_strlen(seq_unseen)))
continue;
- if (!str_ncmp (buff, seq_flagged, str_len (seq_flagged)))
+ if (!str_ncmp (buff, seq_flagged, m_strlen(seq_flagged)))
continue;
- if (!str_ncmp (buff, seq_replied, str_len (seq_replied)))
+ if (!str_ncmp (buff, seq_replied, m_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, str_len (seq_unseen))) {
+ if (unseen && !strncmp (buff, seq_unseen, m_strlen(seq_unseen))) {
fprintf (nfp, "%s %d\n", buff, n);
unseen_done = 1;
}
else if (flagged
- && !strncmp (buff, seq_flagged, str_len (seq_flagged))) {
+ && !strncmp (buff, seq_flagged, m_strlen(seq_flagged))) {
fprintf (nfp, "%s %d\n", buff, n);
flagged_done = 1;
}
else if (replied
- && !strncmp (buff, seq_replied, str_len (seq_replied))) {
+ && !strncmp (buff, seq_replied, m_strlen(seq_replied))) {
fprintf (nfp, "%s %d\n", buff, n);
replied_done = 1;
}
if (subdir) {
snprintf (buf, sizeof (buf), "%s/%s", subdir, fname);
- h->path = str_dup (buf);
+ h->path = m_strdup(buf);
}
else
- h->path = str_dup (fname);
+ h->path = m_strdup(fname);
entry = p_new(struct maildir, 1);
entry->h = h;
if (subdir) {
snprintf (buf, sizeof (buf), "%s/%s", ctx->path, subdir);
- is_old = (str_cmp ("cur", subdir) == 0);
+ is_old = (m_strcmp("cur", subdir) == 0);
}
else
strfcpy (buf, ctx->path, sizeof (buf));
{
const char *p = strchr (fn, ':');
- return p ? (size_t) (p - fn) : str_len (fn);
+ return p ? (size_t) (p - fn) : m_strlen(fn);
}
#endif
int count;
- memset (&mhs, 0, sizeof (mhs));
+ p_clear(&mhs, 1);
maildir_update_mtime (ctx);
hdr->read ? "S" : "", hdr->deleted ? "T" : "",
NONULL (hdr->maildir_flags));
if (hdr->maildir_flags)
- qsort (tmp, str_len (tmp), 1, ch_compar);
+ qsort (tmp, m_strlen(tmp), 1, ch_compar);
snprintf (dest, destlen, ":2,%s", tmp);
}
}
}
else {
debug_print (2, ("success.\n"));
- msg->path = str_dup (path);
+ msg->path = m_strdup(path);
break;
}
}
snprintf (fullpath, sizeof (fullpath), "%s/%s", ctx->path, partpath);
snprintf (oldpath, sizeof (oldpath), "%s/%s", ctx->path, h->path);
- if (str_cmp (fullpath, oldpath) == 0) {
+ if (m_strcmp(fullpath, oldpath) == 0) {
/* message hasn't really changed */
return 0;
}
for (p = md; p; p = p->next) {
maildir_canon_filename (buf, p->h->path, sizeof (buf));
- p->canon_fname = str_dup (buf);
+ p->canon_fname = m_strdup(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 (str_cmp (ctx->hdrs[i]->path, p->h->path))
+ if (m_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
ctx->mtime_cur = st_cur.st_mtime;
ctx->mtime = st.st_mtime;
- memset (&mhs, 0, sizeof (mhs));
+ p_clear(&mhs, 1);
md = NULL;
last = &md;
while ((de = readdir (dp))) {
maildir_canon_filename (tunique, de->d_name, sizeof (tunique));
- if (!str_cmp (tunique, unique)) {
+ if (!m_strcmp(tunique, unique)) {
snprintf (fname, sizeof (fname), "%s/%s/%s", folder, subfolder,
de->d_name);
fp = fopen (fname, "r"); /* __FOPEN_CHECKED__ */