#include <lib-lib/mem.h>
#include <lib-lib/str.h>
#include <lib-lib/macros.h>
+#include <lib-lib/file.h>
#include "mutt.h"
#include "mx.h"
#include "sort.h"
#include "thread.h"
#include "copy.h"
-
-#ifdef USE_COMPRESSED
#include "compress.h"
-#endif
#include "lib/debug.h"
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);
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);
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++;
}
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);
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 (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));
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;
}
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"));
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));
{
mx_unlock_file (ctx->path, fileno (ctx->fp), 1);
-#ifdef USE_COMPRESSED
if (ctx->compressinfo)
mutt_slow_close_compressed (ctx);
-#endif
mutt_unblock_signals ();
mx_fastclose_mailbox (ctx);
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;
return (-1); /* fopen failed */
}
-#ifdef USE_COMPRESSED
if (magic == -1 && mutt_can_read_compressed (path))
return (M_COMPRESSED);
-#endif
return (magic);
}