#include "mutt.h"
#include "mx.h"
+#include "buffy.h"
#include "mbox.h"
#include "sort.h"
#include "copy.h"
#include "lib/mem.h"
#include "lib/intl.h"
#include "lib/str.h"
+#include "lib/debug.h"
#include <sys/stat.h>
#include <dirent.h>
};
-int mbox_open_new_message (MESSAGE * msg, CONTEXT * dest, HEADER * hdr)
+static int mbox_open_new_message (MESSAGE * msg, CONTEXT * dest, HEADER * hdr)
{
msg->fp = dest->fp;
return 0;
}
+/* prototypes */
+static int mbox_reopen_mailbox (CONTEXT*, int*);
+
/* parameters:
* ctx - context to lock
* excl - exclusive lock?
}
}
-int mmdf_parse_mailbox (CONTEXT * ctx)
+static int mmdf_parse_mailbox (CONTEXT * ctx)
{
char buf[HUGE_STRING];
char return_path[LONG_STRING];
if (fgets (buf, sizeof (buf) - 1, ctx->fp) == NULL) {
/* TODO: memory leak??? */
- dprint (1, (debugfile, "mmdf_parse_mailbox: unexpected EOF\n"));
+ debug_print (1, ("unexpected EOF\n"));
break;
}
if (!is_from (buf, return_path, sizeof (return_path), &t)) {
if (fseek (ctx->fp, loc, SEEK_SET) != 0) {
- dprint (1, (debugfile, "mmdf_parse_mailbox: fseek() failed\n"));
+ debug_print (1, ("fseek() failed\n"));
mutt_error _("Mailbox is corrupt!");
return (-1);
fgets (buf, sizeof (buf) - 1, ctx->fp) == NULL ||
safe_strcmp (MMDF_SEP, buf) != 0) {
if (fseek (ctx->fp, loc, SEEK_SET) != 0)
- dprint (1, (debugfile, "mmdf_parse_mailbox: fseek() failed\n"));
+ debug_print (1, ("fseek() failed\n"));
hdr->content->length = -1;
}
}
ctx->msgcount++;
}
else {
- dprint (1, (debugfile, "mmdf_parse_mailbox: corrupt mailbox!\n"));
+ debug_print (1, ("corrupt mailbox!\n"));
mutt_error _("Mailbox is corrupt!");
return (-1);
* NOTE: it is assumed that the mailbox being read has been locked before
* this routine gets called. Strange things could happen if it's not!
*/
-int mbox_parse_mailbox (CONTEXT * ctx)
+static int mbox_parse_mailbox (CONTEXT * ctx)
{
struct stat sb;
char buf[HUGE_STRING], return_path[STRING];
if (fseek (ctx->fp, tmploc, SEEK_SET) != 0 ||
fgets (buf, sizeof (buf), ctx->fp) == NULL ||
safe_strncmp ("From ", buf, 5) != 0) {
- dprint (1,
- (debugfile,
- "mbox_parse_mailbox: bad content-length in message %d (cl=%ld)\n",
- curhdr->index, curhdr->content->length));
- dprint (1, (debugfile, "\tLINE: %s", buf));
+ debug_print (1, ("bad content-length in message %d (cl=%ld)\n",
+ curhdr->index, curhdr->content->length));
+ debug_print (1, ("LINE: %s\n", buf));
if (fseek (ctx->fp, loc, SEEK_SET) != 0) { /* nope, return the previous position */
- dprint (1, (debugfile, "mbox_parse_mailbox: fseek() failed\n"));
+ debug_print (1, ("fseek() failed\n"));
}
curhdr->content->length = -1;
}
/* count the number of lines in this message */
if (fseek (ctx->fp, loc, SEEK_SET) != 0)
- dprint (1, (debugfile, "mbox_parse_mailbox: fseek() failed\n"));
+ debug_print (1, ("fseek() failed\n"));
while (cl-- > 0) {
if (fgetc (ctx->fp) == '\n')
curhdr->lines++;
/* return to the offset of the next message separator */
if (fseek (ctx->fp, tmploc, SEEK_SET) != 0)
- dprint (1, (debugfile, "mbox_parse_mailbox: fseek() failed\n"));
+ debug_print (1, ("fseek() failed\n"));
}
}
#undef PREV
/* open a mbox or mmdf style mailbox */
-int mbox_open_mailbox (CONTEXT * ctx)
+static int mbox_open_mailbox (CONTEXT * ctx)
{
int rc;
* 0 no change
* -1 error
*/
-int mbox_check_mailbox (CONTEXT * ctx, int *index_hint)
+static int _mbox_check_mailbox (CONTEXT * ctx, int *index_hint)
{
struct stat st;
char buffer[LONG_STRING];
* folder.
*/
if (fseek (ctx->fp, ctx->size, SEEK_SET) != 0)
- dprint (1, (debugfile, "mbox_check_mailbox: fseek() failed\n"));
+ debug_print (1, ("fseek() failed\n"));
if (fgets (buffer, sizeof (buffer), ctx->fp) != NULL) {
if ((ctx->magic == M_MBOX && safe_strncmp ("From ", buffer, 5) == 0)
|| (ctx->magic == M_MMDF && safe_strcmp (MMDF_SEP, buffer) == 0)) {
if (fseek (ctx->fp, ctx->size, SEEK_SET) != 0)
- dprint (1, (debugfile, "mbox_check_mailbox: fseek() failed\n"));
+ debug_print (1, ("fseek() failed\n"));
if (ctx->magic == M_MBOX)
mbox_parse_mailbox (ctx);
else
modified = 1;
}
else {
- dprint (1, (debugfile, "mbox_check_mailbox: fgets returned NULL.\n"));
+ debug_print (1, ("fgets returned NULL.\n"));
modified = 1;
}
}
return (-1);
}
+static int mbox_check_mailbox (CONTEXT* ctx, int* index_hint, int lock) {
+ int rc = 0;
+
+ if (lock) {
+ mutt_block_signals ();
+ if (mbox_lock_mailbox (ctx, 0, 0) == -1) {
+ mutt_unblock_signals ();
+ return M_LOCKED;
+ }
+ }
+
+ rc = _mbox_check_mailbox (ctx, index_hint);
+
+ if (lock) {
+ mutt_unblock_signals ();
+ mbox_unlock_mailbox (ctx);
+ }
+ return rc;
+}
+
/* return values:
* 0 success
* -1 failure
*/
-int mbox_sync_mailbox (CONTEXT * ctx, int *index_hint)
+static int _mbox_sync_mailbox (CONTEXT * ctx, int unused, int *index_hint)
{
char tempfile[_POSIX_PATH_MAX];
char buf[32];
}
/* Check to make sure that the file hasn't changed on disk */
- if ((i = mbox_check_mailbox (ctx, index_hint)) == M_NEW_MAIL
+ if ((i = _mbox_check_mailbox (ctx, index_hint)) == M_NEW_MAIL
|| i == M_REOPENED) {
/* new mail arrived, or mailbox reopened */
need_sort = i;
mutt_error
_("sync: mbox modified, but no modified messages! (report this bug)");
mutt_sleep (5); /* the mutt_error /will/ get cleared! */
- dprint (1, (debugfile, "mbox_sync_mailbox(): no modified messages.\n"));
+ debug_print (1, ("no modified messages.\n"));
unlink (tempfile);
goto bail;
}
if (fclose (fp) != 0) {
fp = NULL;
- dprint (1,
- (debugfile, "mbox_sync_mailbox: fclose() returned non-zero.\n"));
+ debug_print (1, ("fclose() returned non-zero.\n"));
unlink (tempfile);
mutt_perror (tempfile);
mutt_sleep (5);
if ((fp = fopen (tempfile, "r")) == NULL) {
mutt_unblock_signals ();
mx_fastclose_mailbox (ctx);
- dprint (1,
- (debugfile,
- "mbox_sync_mailbox: unable to reopen temp copy of mailbox!\n"));
+ debug_print (1, ("unable to reopen temp copy of mailbox!\n"));
mutt_perror (tempfile);
mutt_sleep (5);
return (-1);
fgets (buf, sizeof (buf), ctx->fp) == NULL ||
(ctx->magic == M_MBOX && safe_strncmp ("From ", buf, 5) != 0) ||
(ctx->magic == M_MMDF && safe_strcmp (MMDF_SEP, buf) != 0)) {
- dprint (1,
- (debugfile,
- "mbox_sync_mailbox: message not in expected position."));
- dprint (1, (debugfile, "\tLINE: %s\n", buf));
+ debug_print (1, ("message not in expected position.\n"));
+ debug_print (1, ("LINE: %s\n", buf));
i = -1;
}
else {
if (fseek (ctx->fp, offset, SEEK_SET) != 0) { /* return to proper offset */
i = -1;
- dprint (1, (debugfile, "mbox_sync_mailbox: fseek() failed\n"));
+ debug_print (1, ("fseek() failed\n"));
}
else {
/* copy the temp mailbox back into place starting at the first
return rc;
}
+static int mbox_sync_mailbox (CONTEXT * ctx, int unused, int *index_hint) {
+#ifdef BUFFY_SIZE
+ BUFFY* tmp = NULL;
+#endif
+ int rc = _mbox_sync_mailbox (ctx, unused, index_hint);
+
+#ifdef BUFFY_SIZE
+ if ((tmp = buffy_find_mailbox (ctx->path)) && tmp->new == 0)
+ buffy_update_mailbox (tmp);
+#endif
+ return (rc);
+}
+
/* close a mailbox opened in write-mode */
int mbox_close_mailbox (CONTEXT * ctx)
{
return 0;
}
-int mbox_reopen_mailbox (CONTEXT * ctx, int *index_hint)
+static int mbox_reopen_mailbox (CONTEXT * ctx, int *index_hint)
{
int (*cmp_headers) (const HEADER *, const HEADER *) = NULL;
HEADER **old_hdrs;
case M_MBOX:
case M_MMDF:
if (fseek (ctx->fp, 0, SEEK_SET) != 0) {
- dprint (1, (debugfile, "mbox_reopen_mailbox: fseek() failed\n"));
+ debug_print (1, ("fseek() failed\n"));
rc = -1;
}
else {
fmt->mx_is_magic = mbox_is_magic;
fmt->mx_access = access;
fmt->mx_open_mailbox = mbox_open_mailbox;
+ fmt->mx_open_new_message = mbox_open_new_message;
+ fmt->mx_sync_mailbox = mbox_sync_mailbox;
+ fmt->mx_check_mailbox = mbox_check_mailbox;
return (fmt);
}