projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change generated files to madmutt
[apps/madmutt.git]
/
mbox.c
diff --git
a/mbox.c
b/mbox.c
index
cab71ac
..
e140ee4
100644
(file)
--- a/
mbox.c
+++ b/
mbox.c
@@
-25,10
+25,7
@@
#include "sort.h"
#include "thread.h"
#include "copy.h"
#include "sort.h"
#include "thread.h"
#include "copy.h"
-
-#ifdef USE_COMPRESSED
#include "compress.h"
#include "compress.h"
-#endif
#include "lib/debug.h"
#include "lib/debug.h"
@@
-100,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);
@@
-111,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);
@@
-140,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;
@@
-203,7
+188,7
@@
static int mmdf_parse_mailbox (CONTEXT * ctx)
rfc822_parse_adrlist (hdr->env->return_path, return_path);
if (!hdr->env->from)
rfc822_parse_adrlist (hdr->env->return_path, return_path);
if (!hdr->env->from)
- hdr->env->from =
rfc822_cpy_adr
(hdr->env->return_path);
+ hdr->env->from =
address_list_dup
(hdr->env->return_path);
ctx->msgcount++;
}
ctx->msgcount++;
}
@@
-236,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);
@@
-249,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;
@@
-289,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;
@@
-313,7
+286,7
@@
static int mbox_parse_mailbox (CONTEXT * ctx)
*/
if (fseeko (ctx->fp, tmploc, SEEK_SET) != 0 ||
fgets (buf, sizeof (buf), ctx->fp) == NULL ||
*/
if (fseeko (ctx->fp, tmploc, SEEK_SET) != 0 ||
fgets (buf, sizeof (buf), ctx->fp) == NULL ||
-
str_ncmp
("From ", buf, 5) != 0) {
+
m_strncmp
("From ", buf, 5) != 0) {
debug_print (1, ("bad content-length in message %d (cl=%zd)\n",
curhdr->index, curhdr->content->length));
debug_print (1, ("LINE: %s\n", buf));
debug_print (1, ("bad content-length in message %d (cl=%zd)\n",
curhdr->index, curhdr->content->length));
debug_print (1, ("LINE: %s\n", buf));
@@
-359,7
+332,7
@@
static int mbox_parse_mailbox (CONTEXT * ctx)
rfc822_parse_adrlist (curhdr->env->return_path, return_path);
if (!curhdr->env->from)
rfc822_parse_adrlist (curhdr->env->return_path, return_path);
if (!curhdr->env->from)
- curhdr->env->from =
rfc822_cpy_adr
(curhdr->env->return_path);
+ curhdr->env->from =
address_list_dup
(curhdr->env->return_path);
lines = 0;
}
lines = 0;
}
@@
-470,7
+443,7
@@
static int _mbox_check_mailbox (CONTEXT * ctx, int *index_hint)
if (fseeko (ctx->fp, ctx->size, SEEK_SET) != 0)
debug_print (1, ("fseeko() failed\n"));
if (fgets (buffer, sizeof (buffer), ctx->fp) != NULL) {
if (fseeko (ctx->fp, ctx->size, SEEK_SET) != 0)
debug_print (1, ("fseeko() failed\n"));
if (fgets (buffer, sizeof (buffer), ctx->fp) != NULL) {
- if ((ctx->magic == M_MBOX &&
str_ncmp
("From ", buffer, 5) == 0)
+ if ((ctx->magic == M_MBOX &&
m_strncmp
("From ", buffer, 5) == 0)
|| (ctx->magic == M_MMDF && m_strcmp(MMDF_SEP, buffer) == 0)) {
if (fseeko (ctx->fp, ctx->size, SEEK_SET) != 0)
debug_print (1, ("fseeko() failed\n"));
|| (ctx->magic == M_MMDF && m_strcmp(MMDF_SEP, buffer) == 0)) {
if (fseeko (ctx->fp, ctx->size, SEEK_SET) != 0)
debug_print (1, ("fseeko() failed\n"));
@@
-752,7
+725,7
@@
static int _mbox_sync_mailbox (CONTEXT * ctx, int unused, int *index_hint)
if (fseeko (ctx->fp, offset, SEEK_SET) != 0 || /* seek the append location */
/* do a sanity check to make sure the mailbox looks ok */
fgets (buf, sizeof (buf), ctx->fp) == NULL ||
if (fseeko (ctx->fp, offset, SEEK_SET) != 0 || /* seek the append location */
/* do a sanity check to make sure the mailbox looks ok */
fgets (buf, sizeof (buf), ctx->fp) == NULL ||
- (ctx->magic == M_MBOX &&
str_ncmp
("From ", buf, 5) != 0) ||
+ (ctx->magic == M_MBOX &&
m_strncmp
("From ", buf, 5) != 0) ||
(ctx->magic == M_MMDF && m_strcmp(MMDF_SEP, buf) != 0)) {
debug_print (1, ("message not in expected position.\n"));
debug_print (1, ("LINE: %s\n", buf));
(ctx->magic == M_MMDF && m_strcmp(MMDF_SEP, buf) != 0)) {
debug_print (1, ("message not in expected position.\n"));
debug_print (1, ("LINE: %s\n", buf));
@@
-888,10
+861,8
@@
int mbox_close_mailbox (CONTEXT * ctx)
{
mx_unlock_file (ctx->path, fileno (ctx->fp), 1);
{
mx_unlock_file (ctx->path, fileno (ctx->fp), 1);
-#ifdef USE_COMPRESSED
if (ctx->compressinfo)
mutt_slow_close_compressed (ctx);
if (ctx->compressinfo)
mutt_slow_close_compressed (ctx);
-#endif
mutt_unblock_signals ();
mx_fastclose_mailbox (ctx);
mutt_unblock_signals ();
mx_fastclose_mailbox (ctx);
@@
-935,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 {
@@
-981,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;
@@
-1039,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;
}
}
@@
-1094,7
+1065,7
@@
int mbox_is_magic (const char* path, struct stat* st) {
struct utimbuf times;
#endif
fgets (tmp, sizeof (tmp), f);
struct utimbuf times;
#endif
fgets (tmp, sizeof (tmp), f);
- if (
str_ncmp
("From ", tmp, 5) == 0)
+ if (
m_strncmp
("From ", tmp, 5) == 0)
magic = M_MBOX;
else if (m_strcmp(MMDF_SEP, tmp) == 0)
magic = M_MMDF;
magic = M_MBOX;
else if (m_strcmp(MMDF_SEP, tmp) == 0)
magic = M_MMDF;
@@
-1113,10
+1084,8
@@
int mbox_is_magic (const char* path, struct stat* st) {
return (-1); /* fopen failed */
}
return (-1); /* fopen failed */
}
-#ifdef USE_COMPRESSED
if (magic == -1 && mutt_can_read_compressed (path))
return (M_COMPRESSED);
if (magic == -1 && mutt_can_read_compressed (path))
return (M_COMPRESSED);
-#endif
return (magic);
}
return (magic);
}