projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rocco Rutte:
[apps/madmutt.git]
/
mh.c
diff --git
a/mh.c
b/mh.c
index
91d584c
..
73a5638
100644
(file)
--- a/
mh.c
+++ b/
mh.c
@@
-71,6
+71,8
@@
struct mh_sequences {
/* prototypes */
static int maildir_check_empty (const char*);
/* 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)
{
static void mhs_alloc (struct mh_sequences *mhs, int i)
{
@@
-155,11
+157,11
@@
static void mh_read_sequences (struct mh_sequences *mhs, const char *path)
if (!(t = strtok (buff, " \t:")))
continue;
if (!(t = strtok (buff, " \t:")))
continue;
- if (!s
afe_str
cmp (t, MhUnseen))
+ if (!s
tr_
cmp (t, MhUnseen))
f = MH_SEQ_UNSEEN;
f = MH_SEQ_UNSEEN;
- else if (!s
afe_str
cmp (t, MhFlagged))
+ else if (!s
tr_
cmp (t, MhFlagged))
f = MH_SEQ_FLAGGED;
f = MH_SEQ_FLAGGED;
- else if (!s
afe_str
cmp (t, MhReplied))
+ else if (!s
tr_
cmp (t, MhReplied))
f = MH_SEQ_REPLIED;
else /* unknown sequence */
continue;
f = MH_SEQ_REPLIED;
else /* unknown sequence */
continue;
@@
-206,7
+208,7
@@
static int mh_mkstemp (CONTEXT * dest, FILE ** fp, char **tgt)
}
}
else {
}
}
else {
- *tgt = s
afe_str
dup (path);
+ *tgt = s
tr_
dup (path);
break;
}
}
break;
}
}
@@
-302,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))) {
/* first, copy unknown sequences */
if ((ofp = fopen (sequences, "r"))) {
while ((buff = mutt_read_line (buff, &s, ofp, &l))) {
- if (!s
afe_strncmp (buff, seq_unseen, safe_str
len (seq_unseen)))
+ if (!s
tr_ncmp (buff, seq_unseen, str_
len (seq_unseen)))
continue;
continue;
- if (!s
afe_strncmp (buff, seq_flagged, safe_str
len (seq_flagged)))
+ if (!s
tr_ncmp (buff, seq_flagged, str_
len (seq_flagged)))
continue;
continue;
- if (!s
afe_strncmp (buff, seq_replied, safe_str
len (seq_replied)))
+ if (!s
tr_ncmp (buff, seq_replied, str_
len (seq_replied)))
continue;
fprintf (nfp, "%s\n", buff);
continue;
fprintf (nfp, "%s\n", buff);
@@
-393,17
+395,17
@@
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))) {
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, s
afe_str
len (seq_unseen))) {
+ if (unseen && !strncmp (buff, seq_unseen, s
tr_
len (seq_unseen))) {
fprintf (nfp, "%s %d\n", buff, n);
unseen_done = 1;
}
else if (flagged
fprintf (nfp, "%s %d\n", buff, n);
unseen_done = 1;
}
else if (flagged
- && !strncmp (buff, seq_flagged, s
afe_str
len (seq_flagged))) {
+ && !strncmp (buff, seq_flagged, s
tr_
len (seq_flagged))) {
fprintf (nfp, "%s %d\n", buff, n);
flagged_done = 1;
}
else if (replied
fprintf (nfp, "%s %d\n", buff, n);
flagged_done = 1;
}
else if (replied
- && !strncmp (buff, seq_replied, s
afe_str
len (seq_replied))) {
+ && !strncmp (buff, seq_replied, s
tr_
len (seq_replied))) {
fprintf (nfp, "%s %d\n", buff, n);
replied_done = 1;
}
fprintf (nfp, "%s %d\n", buff, n);
replied_done = 1;
}
@@
-486,7
+488,7
@@
static void maildir_parse_flags (HEADER * h, const char *path)
h->read = 0;
h->replied = 0;
h->read = 0;
h->replied = 0;
- if ((p = strrchr (path, ':')) != NULL && s
afe_str
ncmp (p + 1, "2,", 2) == 0) {
+ if ((p = strrchr (path, ':')) != NULL && s
tr_
ncmp (p + 1, "2,", 2) == 0) {
p += 3;
str_replace (&h->maildir_flags, p);
p += 3;
str_replace (&h->maildir_flags, p);
@@
-635,10
+637,10
@@
static int maildir_parse_entry (CONTEXT * ctx, struct maildir ***last,
if (subdir) {
snprintf (buf, sizeof (buf), "%s/%s", subdir, fname);
if (subdir) {
snprintf (buf, sizeof (buf), "%s/%s", subdir, fname);
- h->path = s
afe_str
dup (buf);
+ h->path = s
tr_
dup (buf);
}
else
}
else
- h->path = s
afe_str
dup (fname);
+ h->path = s
tr_
dup (fname);
entry = safe_calloc (sizeof (struct maildir), 1);
entry->h = h;
entry = safe_calloc (sizeof (struct maildir), 1);
entry->h = h;
@@
-681,7
+683,7
@@
static int maildir_parse_dir (CONTEXT * ctx, struct maildir ***last,
if (subdir) {
snprintf (buf, sizeof (buf), "%s/%s", ctx->path, subdir);
if (subdir) {
snprintf (buf, sizeof (buf), "%s/%s", ctx->path, subdir);
- is_old = (s
afe_str
cmp ("cur", subdir) == 0);
+ is_old = (s
tr_
cmp ("cur", subdir) == 0);
}
else
strfcpy (buf, ctx->path, sizeof (buf));
}
else
strfcpy (buf, ctx->path, sizeof (buf));
@@
-833,7
+835,7
@@
static size_t maildir_hcache_keylen (const char *fn)
{
const char *p = strchr (fn, ':');
{
const char *p = strchr (fn, ':');
- return p ? (size_t) (p - fn) : s
afe_str
len (fn);
+ return p ? (size_t) (p - fn) : s
tr_
len (fn);
}
#endif
}
#endif
@@
-999,7
+1001,7
@@
static void maildir_flags (char *dest, size_t destlen, HEADER * hdr)
hdr->read ? "S" : "", hdr->deleted ? "T" : "",
NONULL (hdr->maildir_flags));
if (hdr->maildir_flags)
hdr->read ? "S" : "", hdr->deleted ? "T" : "",
NONULL (hdr->maildir_flags));
if (hdr->maildir_flags)
- qsort (tmp, s
afe_str
len (tmp), 1, ch_compar);
+ qsort (tmp, s
tr_
len (tmp), 1, ch_compar);
snprintf (dest, destlen, ":2,%s", tmp);
}
}
snprintf (dest, destlen, ":2,%s", tmp);
}
}
@@
-1053,7
+1055,7
@@
static int maildir_open_new_message (MESSAGE * msg, CONTEXT * dest, HEADER * hdr
}
else {
debug_print (2, ("success.\n"));
}
else {
debug_print (2, ("success.\n"));
- msg->path = s
afe_str
dup (path);
+ msg->path = s
tr_
dup (path);
break;
}
}
break;
}
}
@@
-1091,7
+1093,7
@@
static int maildir_open_new_message (MESSAGE * msg, CONTEXT * dest, HEADER * hdr
*
*/
*
*/
-
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];
{
char subdir[4];
char suffix[16];
@@
-1159,7
+1161,7
@@
int maildir_commit_message (CONTEXT * ctx, MESSAGE * msg, HEADER * hdr)
*/
*/
-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;
short updseq)
{
DIR *dirp;
@@
-1224,12
+1226,10
@@
static int _mh_commit_message (CONTEXT * ctx, MESSAGE * msg, HEADER * hdr,
return 0;
}
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
/* Sync a message in an MH folder.
*
* This code is also used for attachment deletion in maildir
@@
-1261,9
+1261,9
@@
static int mh_rewrite_message (CONTEXT * ctx, int msgno)
strfcpy (partpath, h->path, _POSIX_PATH_MAX);
if (ctx->magic == M_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
else
- rc = _mh_commit_message (
ctx, dest
, h, 0);
+ rc = _mh_commit_message (
dest, ctx
, h, 0);
mx_close_message (&dest);
mx_close_message (&dest);
@@
-1310,7
+1310,8
@@
static int mh_sync_message (CONTEXT * ctx, int msgno)
{
HEADER *h = ctx->hdrs[msgno];
{
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;
if (mh_rewrite_message (ctx, msgno) != 0)
return -1;
@@
-1321,7
+1322,8
@@
static int maildir_sync_message (CONTEXT * ctx, int msgno)
{
HEADER *h = ctx->hdrs[msgno];
{
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);
/* when doing attachment deletion/rethreading, fall back to the MH case. */
if (mh_rewrite_message (ctx, msgno) != 0)
return (-1);
@@
-1354,7
+1356,7
@@
static int maildir_sync_message (CONTEXT * ctx, int msgno)
snprintf (fullpath, sizeof (fullpath), "%s/%s", ctx->path, partpath);
snprintf (oldpath, sizeof (oldpath), "%s/%s", ctx->path, h->path);
snprintf (fullpath, sizeof (fullpath), "%s/%s", ctx->path, partpath);
snprintf (oldpath, sizeof (oldpath), "%s/%s", ctx->path, h->path);
- if (s
afe_str
cmp (fullpath, oldpath) == 0) {
+ if (s
tr_
cmp (fullpath, oldpath) == 0) {
/* message hasn't really changed */
return 0;
}
/* message hasn't really changed */
return 0;
}
@@
-1381,9
+1383,9
@@
static int mh_sync_mailbox (CONTEXT * ctx, int unused, int *index_hint)
#endif /* USE_HCACHE */
if (ctx->magic == M_MH)
#endif /* USE_HCACHE */
if (ctx->magic == M_MH)
- i = mh_check_mailbox (ctx, index_hint);
+ i = mh_check_mailbox (ctx, index_hint
, 0
);
else
else
- i = maildir_check_mailbox (ctx, index_hint);
+ i = maildir_check_mailbox (ctx, index_hint
, 0
);
if (i != 0)
return i;
if (i != 0)
return i;
@@
-1546,7
+1548,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.
*/
* 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 */
{
struct stat st_new; /* status of the "new" subdirectory */
struct stat st_cur; /* status of the "cur" subdirectory */
@@
-1561,9
+1563,6
@@
int maildir_check_mailbox (CONTEXT * ctx, int *index_hint)
HASH *fnames; /* hash table for quickly looking up the base filename
for a maildir message */
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;
if (!option (OPTCHECKNEW))
return 0;
@@
-1606,7
+1605,7
@@
int maildir_check_mailbox (CONTEXT * ctx, int *index_hint)
for (p = md; p; p = p->next) {
maildir_canon_filename (buf, p->h->path, sizeof (buf));
for (p = md; p; p = p->next) {
maildir_canon_filename (buf, p->h->path, sizeof (buf));
- p->canon_fname = s
afe_str
dup (buf);
+ p->canon_fname = s
tr_
dup (buf);
hash_insert (fnames, p->canon_fname, p, 0);
}
hash_insert (fnames, p->canon_fname, p, 0);
}
@@
-1622,7
+1621,7
@@
int maildir_check_mailbox (CONTEXT * ctx, int *index_hint)
/* check to see if the message has moved to a different
* subdirectory. If so, update the associated filename.
*/
/* check to see if the message has moved to a different
* subdirectory. If so, update the associated filename.
*/
- if (s
afe_str
cmp (ctx->hdrs[i]->path, p->h->path))
+ if (s
tr_
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
str_replace (&ctx->hdrs[i]->path, p->h->path);
/* if the user hasn't modified the flags on this message, update
@@
-1686,7
+1685,7
@@
int maildir_check_mailbox (CONTEXT * ctx, int *index_hint)
*
*/
*
*/
-
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;
{
char buf[_POSIX_PATH_MAX];
struct stat st, st_cur;
@@
-1749,7
+1748,7
@@
int mh_check_mailbox (CONTEXT * ctx, int *index_hint)
ctx->hdrs[i]->active = 0;
if ((p = hash_find (fnames, ctx->hdrs[i]->path)) && p->h &&
ctx->hdrs[i]->active = 0;
if ((p = hash_find (fnames, ctx->hdrs[i]->path)) && p->h &&
- (m
box_strict_cmp_headers
(ctx->hdrs[i], p->h))) {
+ (m
utt_cmp_header
(ctx->hdrs[i], p->h))) {
ctx->hdrs[i]->active = 1;
/* found the right message */
if (!ctx->hdrs[i]->changed)
ctx->hdrs[i]->active = 1;
/* found the right message */
if (!ctx->hdrs[i]->changed)
@@
-1807,7
+1806,7
@@
FILE *_maildir_open_find_message (const char *folder, const char *unique,
while ((de = readdir (dp))) {
maildir_canon_filename (tunique, de->d_name, sizeof (tunique));
while ((de = readdir (dp))) {
maildir_canon_filename (tunique, de->d_name, sizeof (tunique));
- if (!s
afe_str
cmp (tunique, unique)) {
+ if (!s
tr_
cmp (tunique, unique)) {
snprintf (fname, sizeof (fname), "%s/%s/%s", folder, subfolder,
de->d_name);
fp = fopen (fname, "r"); /* __FOPEN_CHECKED__ */
snprintf (fname, sizeof (fname), "%s/%s/%s", folder, subfolder,
de->d_name);
fp = fopen (fname, "r"); /* __FOPEN_CHECKED__ */
@@
-1977,6
+1976,14
@@
static mx_t* reg_mx (void) {
return (fmt);
}
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;
mx_t* mh_reg_mx (void) {
mx_t* fmt = reg_mx ();
fmt->type = M_MH;
@@
-1984,6
+1991,8
@@
mx_t* mh_reg_mx (void) {
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_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);
}
return (fmt);
}
@@
-1994,5
+2003,7
@@
mx_t* maildir_reg_mx (void) {
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_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);
}
return (fmt);
}