projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
more muttng -> madmutt
[apps/madmutt.git]
/
mbox.c
diff --git
a/mbox.c
b/mbox.c
index
cd171b3
..
267cd7b
100644
(file)
--- a/
mbox.c
+++ b/
mbox.c
@@
-48,7
+48,7
@@
struct m_update_t {
};
};
-static int mbox_open_new_message (MESSAGE * msg, CONTEXT * dest, HEADER * hdr)
+static int mbox_open_new_message (MESSAGE * msg, CONTEXT * dest, HEADER * hdr
__attribute__ ((unused))
)
{
msg->fp = dest->fp;
return 0;
{
msg->fp = dest->fp;
return 0;
@@
-97,10
+97,6
@@
static int mmdf_parse_mailbox (CONTEXT * ctx)
HEADER *hdr;
struct stat sb;
HEADER *hdr;
struct stat sb;
-#ifdef NFS_ATTRIBUTE_HACK
- struct utimbuf newtime;
-#endif
-
if (stat (ctx->path, &sb) == -1) {
mutt_perror (ctx->path);
return (-1);
if (stat (ctx->path, &sb) == -1) {
mutt_perror (ctx->path);
return (-1);
@@
-108,14
+104,6
@@
static int mmdf_parse_mailbox (CONTEXT * ctx)
ctx->mtime = sb.st_mtime;
ctx->size = sb.st_size;
ctx->mtime = sb.st_mtime;
ctx->size = sb.st_size;
-#ifdef NFS_ATTRIBUTE_HACK
- if (sb.st_mtime > sb.st_atime) {
- newtime.modtime = sb.st_mtime;
- newtime.actime = time (NULL);
- utime (ctx->path, &newtime);
- }
-#endif
-
/* precompute the local timezone to speed up calculation of the
received time */
tz = mutt_local_tz (0);
/* precompute the local timezone to speed up calculation of the
received time */
tz = mutt_local_tz (0);
@@
-137,7
+125,7
@@
static int mmdf_parse_mailbox (CONTEXT * ctx)
if (ctx->msgcount == ctx->hdrmax)
mx_alloc_memory (ctx);
if (ctx->msgcount == ctx->hdrmax)
mx_alloc_memory (ctx);
- ctx->hdrs[ctx->msgcount] = hdr =
mutt_new_header
();
+ ctx->hdrs[ctx->msgcount] = hdr =
header_new
();
hdr->offset = loc;
hdr->index = ctx->msgcount;
hdr->offset = loc;
hdr->index = ctx->msgcount;
@@
-233,10
+221,6
@@
static int mbox_parse_mailbox (CONTEXT * ctx)
int count = 0, lines = 0;
off_t loc;
int count = 0, lines = 0;
off_t loc;
-#ifdef NFS_ATTRIBUTE_HACK
- struct utimbuf newtime;
-#endif
-
/* Save information about the folder at the time we opened it. */
if (stat (ctx->path, &sb) == -1) {
mutt_perror (ctx->path);
/* Save information about the folder at the time we opened it. */
if (stat (ctx->path, &sb) == -1) {
mutt_perror (ctx->path);
@@
-246,14
+230,6
@@
static int mbox_parse_mailbox (CONTEXT * ctx)
ctx->size = sb.st_size;
ctx->mtime = sb.st_mtime;
ctx->size = sb.st_size;
ctx->mtime = sb.st_mtime;
-#ifdef NFS_ATTRIBUTE_HACK
- if (sb.st_mtime > sb.st_atime) {
- newtime.modtime = sb.st_mtime;
- newtime.actime = time (NULL);
- utime (ctx->path, &newtime);
- }
-#endif
-
if (!ctx->readonly)
ctx->readonly = access (ctx->path, W_OK) ? 1 : 0;
if (!ctx->readonly)
ctx->readonly = access (ctx->path, W_OK) ? 1 : 0;
@@
-286,7
+262,7
@@
static int mbox_parse_mailbox (CONTEXT * ctx)
if (ctx->msgcount == ctx->hdrmax)
mx_alloc_memory (ctx);
if (ctx->msgcount == ctx->hdrmax)
mx_alloc_memory (ctx);
- curhdr = ctx->hdrs[ctx->msgcount] =
mutt_new_header
();
+ curhdr = ctx->hdrs[ctx->msgcount] =
header_new
();
curhdr->received = t - tz;
curhdr->offset = loc;
curhdr->index = ctx->msgcount;
curhdr->received = t - tz;
curhdr->offset = loc;
curhdr->index = ctx->msgcount;
@@
-544,7
+520,7
@@
static int mbox_check_mailbox (CONTEXT* ctx, int* index_hint, int lock) {
* 0 success
* -1 failure
*/
* 0 success
* -1 failure
*/
-static int _mbox_sync_mailbox (CONTEXT * ctx, int unused, int *index_hint)
+static int _mbox_sync_mailbox (CONTEXT * ctx, int unused
__attribute__ ((unused))
, int *index_hint)
{
char tempfile[_POSIX_PATH_MAX];
char buf[32];
{
char tempfile[_POSIX_PATH_MAX];
char buf[32];
@@
-930,7
+906,7
@@
static int mbox_reopen_mailbox (CONTEXT * ctx, int *index_hint)
p_delete(&ctx->v2r);
if (ctx->readonly) {
for (i = 0; i < ctx->msgcount; i++)
p_delete(&ctx->v2r);
if (ctx->readonly) {
for (i = 0; i < ctx->msgcount; i++)
-
mutt_free_header
(&(ctx->hdrs[i])); /* nothing to do! */
+
header_delete
(&(ctx->hdrs[i])); /* nothing to do! */
p_delete(&ctx->hdrs);
}
else {
p_delete(&ctx->hdrs);
}
else {
@@
-976,7
+952,7
@@
static int mbox_reopen_mailbox (CONTEXT * ctx, int *index_hint)
if (rc == -1) {
/* free the old headers */
for (j = 0; j < old_msgcount; j++)
if (rc == -1) {
/* free the old headers */
for (j = 0; j < old_msgcount; j++)
-
mutt_free_header
(&(old_hdrs[j]));
+
header_delete
(&(old_hdrs[j]));
p_delete(&old_hdrs);
ctx->quiet = 0;
p_delete(&old_hdrs);
ctx->quiet = 0;
@@
-1034,14
+1010,14
@@
static int mbox_reopen_mailbox (CONTEXT * ctx, int *index_hint)
mutt_set_flag (ctx, ctx->hdrs[i], M_TAG, old_hdrs[j]->tagged);
/* we don't need this header any more */
mutt_set_flag (ctx, ctx->hdrs[i], M_TAG, old_hdrs[j]->tagged);
/* we don't need this header any more */
-
mutt_free_header
(&(old_hdrs[j]));
+
header_delete
(&(old_hdrs[j]));
}
}
/* free the remaining old headers */
for (j = 0; j < old_msgcount; j++) {
if (old_hdrs[j]) {
}
}
/* free the remaining old headers */
for (j = 0; j < old_msgcount; j++) {
if (old_hdrs[j]) {
-
mutt_free_header
(&(old_hdrs[j]));
+
header_delete
(&(old_hdrs[j]));
msg_mod = 1;
}
}
msg_mod = 1;
}
}
@@
-1113,7
+1089,7
@@
int mbox_is_magic (const char* path, struct stat* st) {
return (magic);
}
return (magic);
}
-static int commit_message (MESSAGE* msg, CONTEXT* ctx, int mbox) {
+static int commit_message (MESSAGE* msg, CONTEXT* ctx
__attribute__ ((unused))
, int mbox) {
if ((mbox && fputc ('\n', msg->fp) == EOF) ||
(!mbox && fputs (MMDF_SEP, msg->fp) == EOF))
return (-1);
if ((mbox && fputc ('\n', msg->fp) == EOF) ||
(!mbox && fputs (MMDF_SEP, msg->fp) == EOF))
return (-1);