projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Only use fcntl, simplify locking.
[apps/madmutt.git]
/
lib-mx
/
mbox.c
diff --git
a/lib-mx/mbox.c
b/lib-mx/mbox.c
index
9729c5e
..
9fd7a40
100644
(file)
--- a/
lib-mx/mbox.c
+++ b/
lib-mx/mbox.c
@@
-11,7
+11,7
@@
#include <lib-lib/lib-lib.h>
#include <lib-lib/lib-lib.h>
-#include <lib-ui/
curses
.h>
+#include <lib-ui/
lib-ui
.h>
#include <lib-sys/mutt_signal.h>
#include "mutt.h"
#include <lib-sys/mutt_signal.h>
#include "mutt.h"
@@
-50,7
+50,7
@@
int mbox_lock_mailbox(CONTEXT *ctx, int excl, int retry)
{
int r;
{
int r;
- if ((r = mx_lock_file(ctx->path, fileno(ctx->fp), excl,
1,
retry)) == 0)
+ if ((r = mx_lock_file(ctx->path, fileno(ctx->fp), excl, retry)) == 0)
ctx->locked = 1;
else if (retry && !excl) {
ctx->readonly = 1;
ctx->locked = 1;
else if (retry && !excl) {
ctx->readonly = 1;
@@
-65,7
+65,7
@@
static void mbox_unlock_mailbox (CONTEXT * ctx)
if (ctx->locked) {
fflush (ctx->fp);
if (ctx->locked) {
fflush (ctx->fp);
- mx_unlock_file
(ctx->path, fileno (ctx->fp), 1
);
+ mx_unlock_file
(ctx->path, fileno(ctx->fp)
);
ctx->locked = 0;
}
}
ctx->locked = 0;
}
}
@@
-99,7
+99,8
@@
static int mbox_parse_mailbox (CONTEXT * ctx)
/* precompute the local timezone to speed up calculation of the
date received */
/* precompute the local timezone to speed up calculation of the
date received */
- tz = mutt_local_tz (0);
+ t = time(NULL);
+ tz = localtime(&t)->tm_gmtoff;
loc = ftello (ctx->fp);
while (fgets (buf, sizeof (buf), ctx->fp) != NULL) {
loc = ftello (ctx->fp);
while (fgets (buf, sizeof (buf), ctx->fp) != NULL) {
@@
-648,7
+649,7
@@
bail: /* Come here in case of disaster */
/* close a mailbox opened in write-mode */
int mbox_close_mailbox (CONTEXT * ctx)
{
/* close a mailbox opened in write-mode */
int mbox_close_mailbox (CONTEXT * ctx)
{
- mx_unlock_file
(ctx->path, fileno (ctx->fp), 1
);
+ mx_unlock_file
(ctx->path, fileno(ctx->fp)
);
if (ctx->cinfo)
mutt_slow_close_compressed (ctx);
if (ctx->cinfo)
mutt_slow_close_compressed (ctx);