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
1bcf9c1
..
5c0d664
100644
(file)
--- a/
mh.c
+++ b/
mh.c
@@
-157,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 (!
safe
_strcmp (t, MhUnseen))
+ if (!
mutt
_strcmp (t, MhUnseen))
f = MH_SEQ_UNSEEN;
f = MH_SEQ_UNSEEN;
- else if (!
safe
_strcmp (t, MhFlagged))
+ else if (!
mutt
_strcmp (t, MhFlagged))
f = MH_SEQ_FLAGGED;
f = MH_SEQ_FLAGGED;
- else if (!
safe
_strcmp (t, MhReplied))
+ else if (!
mutt
_strcmp (t, MhReplied))
f = MH_SEQ_REPLIED;
else /* unknown sequence */
continue;
f = MH_SEQ_REPLIED;
else /* unknown sequence */
continue;
@@
-304,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 (!safe_strncmp (buff, seq_unseen,
safe
_strlen (seq_unseen)))
+ if (!safe_strncmp (buff, seq_unseen,
mutt
_strlen (seq_unseen)))
continue;
continue;
- if (!safe_strncmp (buff, seq_flagged,
safe
_strlen (seq_flagged)))
+ if (!safe_strncmp (buff, seq_flagged,
mutt
_strlen (seq_flagged)))
continue;
continue;
- if (!safe_strncmp (buff, seq_replied,
safe
_strlen (seq_replied)))
+ if (!safe_strncmp (buff, seq_replied,
mutt
_strlen (seq_replied)))
continue;
fprintf (nfp, "%s\n", buff);
continue;
fprintf (nfp, "%s\n", buff);
@@
-395,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,
safe
_strlen (seq_unseen))) {
+ if (unseen && !strncmp (buff, seq_unseen,
mutt
_strlen (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,
safe
_strlen (seq_flagged))) {
+ && !strncmp (buff, seq_flagged,
mutt
_strlen (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,
safe
_strlen (seq_replied))) {
+ && !strncmp (buff, seq_replied,
mutt
_strlen (seq_replied))) {
fprintf (nfp, "%s %d\n", buff, n);
replied_done = 1;
}
fprintf (nfp, "%s %d\n", buff, n);
replied_done = 1;
}
@@
-683,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 = (
safe
_strcmp ("cur", subdir) == 0);
+ is_old = (
mutt
_strcmp ("cur", subdir) == 0);
}
else
strfcpy (buf, ctx->path, sizeof (buf));
}
else
strfcpy (buf, ctx->path, sizeof (buf));
@@
-835,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) :
safe
_strlen (fn);
+ return p ? (size_t) (p - fn) :
mutt
_strlen (fn);
}
#endif
}
#endif
@@
-1001,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,
safe
_strlen (tmp), 1, ch_compar);
+ qsort (tmp,
mutt
_strlen (tmp), 1, ch_compar);
snprintf (dest, destlen, ":2,%s", tmp);
}
}
snprintf (dest, destlen, ":2,%s", tmp);
}
}
@@
-1093,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];
@@
-1161,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;
@@
-1226,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
@@
-1263,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);
@@
-1312,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;
@@
-1323,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);
@@
-1356,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 (
safe
_strcmp (fullpath, oldpath) == 0) {
+ if (
mutt
_strcmp (fullpath, oldpath) == 0) {
/* message hasn't really changed */
return 0;
}
/* message hasn't really changed */
return 0;
}
@@
-1621,7
+1621,7
@@
static int maildir_check_mailbox (CONTEXT * ctx, int *index_hint, int unused)
/* 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 (
safe
_strcmp (ctx->hdrs[i]->path, p->h->path))
+ if (
mutt
_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
str_replace (&ctx->hdrs[i]->path, p->h->path);
/* if the user hasn't modified the flags on this message, update
@@
-1748,7
+1748,7
@@
static int mh_check_mailbox (CONTEXT * ctx, int *index_hint, int unused)
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)
@@
-1806,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 (!
safe
_strcmp (tunique, unique)) {
+ if (!
mutt
_strcmp (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__ */
@@
-1976,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
+1992,7
@@
mx_t* mh_reg_mx (void) {
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_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);
}
@@
-1995,5
+2004,6
@@
mx_t* maildir_reg_mx (void) {
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_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);
}