#include <lib-lua/lib-lua.h>
#include <lib-sys/unix.h>
#include <lib-mime/mime.h>
-#include <lib-ui/sidebar.h>
+#include <lib-ui/lib-ui.h>
#include "mutt.h"
#include "crypt.h"
#include <imap/imap.h>
#include "pop.h"
-#ifdef USE_NNTP
-#include "nntp.h"
-#endif
+
+#define MAXLOCKATTEMPT 5
+
static mx_t const *mxfmts[] = {
&mbox_mx,
&maildir_mx,
&imap_mx,
&pop_mx,
-#ifdef USE_NNTP
- &nntp_mx,
-#endif
&compress_mx,
};
if (!mxfmts[i]->local)
t = mxfmts[i]->mx_is_magic(path, NULL);
if (t >= 1)
- return (t-1);
+ return t-1;
}
if (stat (path, &st) == 0) {
/* if stat() succeeded, keep testing until success and
if (mxfmts[i]->local)
t = mxfmts[i]->mx_is_magic(path, &st);
if (t >= 1)
- return (t-1);
+ return t-1;
}
}
- return (-1);
+ return -1;
}
/* Args:
* excl if excl != 0, request an exclusive lock
- * dot if dot != 0, try to dotlock the file
* time_out should retry locking?
*/
-int mx_lock_file (const char *path, int fd, int excl, int dot, int time_out)
+int mx_lock_file(const char *path, int fd, int excl, int time_out)
{
-#if defined (USE_FCNTL) || defined (USE_FLOCK)
- int count;
- int attempt;
- struct stat prev_sb;
-#endif
- int r = 0;
-
-#ifdef USE_FCNTL
- struct flock lck;
-
- p_clear(&lck, 1);
- lck.l_type = excl ? F_WRLCK : F_RDLCK;
- lck.l_whence = SEEK_SET;
-
- count = 0;
- attempt = 0;
- prev_sb.st_size = 0;
- while (fcntl (fd, F_SETLK, &lck) == -1) {
- struct stat sb;
+ int count = 0, attempt = 0;
+ struct flock lck = {
+ .l_type = excl ? F_WRLCK : F_RDLCK,
+ .l_whence = SEEK_SET,
+ };
+ if (dotlock_file(path, time_out) < 0)
+ return -1;
+
+ while (fcntl(fd, F_SETLK, &lck) == -1) {
if (errno != EAGAIN && errno != EACCES) {
- mutt_perror ("fcntl");
- return (-1);
+ mutt_perror("fcntl");
+ goto error;
}
- if (fstat (fd, &sb) != 0)
- sb.st_size = 0;
-
- if (count == 0)
- prev_sb = sb;
-
- /* only unlock file if it is unchanged */
- if (prev_sb.st_size == sb.st_size
- && ++count >= (time_out ? MAXLOCKATTEMPT : 0)) {
+ if (++count >= (time_out ? MAXLOCKATTEMPT : 0)) {
if (time_out)
mutt_error _("Timeout exceeded while attempting fcntl lock!");
-
- return (-1);
- }
-
- prev_sb = sb;
-
- mutt_message (_("Waiting for fcntl lock... %d"), ++attempt);
- sleep (1);
- }
-#endif /* USE_FCNTL */
-
-#ifdef USE_FLOCK
- count = 0;
- attempt = 0;
- while (flock (fd, (excl ? LOCK_EX : LOCK_SH) | LOCK_NB) == -1) {
- struct stat sb;
-
- if (errno != EWOULDBLOCK) {
- mutt_perror ("flock");
- r = -1;
- break;
+ goto error;
}
-
- if (fstat (fd, &sb) != 0)
- sb.st_size = 0;
-
- if (count == 0)
- prev_sb = sb;
-
- /* only unlock file if it is unchanged */
- if (prev_sb.st_size == sb.st_size
- && ++count >= (time_out ? MAXLOCKATTEMPT : 0)) {
- if (time_out)
- mutt_error _("Timeout exceeded while attempting flock lock!");
-
- r = -1;
- break;
- }
-
- prev_sb = sb;
-
- mutt_message (_("Waiting for flock attempt... %d"), ++attempt);
- sleep (1);
- }
-#endif /* USE_FLOCK */
-
- if (r == 0 && dot)
- r = dotlock_file(path, time_out);
-
- if (r == -1) {
- /* release any other locks obtained in this routine */
-
-#ifdef USE_FCNTL
- lck.l_type = F_UNLCK;
- fcntl (fd, F_SETLK, &lck);
-#endif /* USE_FCNTL */
-
-#ifdef USE_FLOCK
- flock (fd, LOCK_UN);
-#endif /* USE_FLOCK */
-
- return (-1);
+ mutt_message(_("Waiting for fcntl lock... %d"), ++attempt);
+ mutt_sleep(1);
}
-
return 0;
+
+ error:
+ undotlock_file(path);
+ return -1;
}
-int mx_unlock_file (const char *path, int fd, int dot)
+int mx_unlock_file(const char *path, int fd)
{
-#ifdef USE_FCNTL
struct flock unlockit;
p_clear(&unlockit, 1);
unlockit.l_type = F_UNLCK;
unlockit.l_whence = SEEK_SET;
- fcntl (fd, F_SETLK, &unlockit);
-#endif
-
-#ifdef USE_FLOCK
- flock (fd, LOCK_UN);
-#endif
-
- if (dot)
- undotlock_file (path);
-
+ fcntl(fd, F_SETLK, &unlockit);
+ undotlock_file(path);
return 0;
}
int i = 0;
if (m_strlen(path) == 0)
- return (-1);
+ return -1;
if ((i = mx_get_idx (path)) >= 0)
- return (mxfmts[i]->type);
- return (-1);
+ return mxfmts[i]->type;
+ return -1;
}
int mx_is_local (int m) {
if (!MX_IDX(m))
- return (0);
- return (mxfmts[m]->local);
-}
-
-/*
- * set DefaultMagic to the given value
- */
-int mx_set_magic (const char *s)
-{
- if (ascii_strcasecmp (s, "mbox") == 0)
- DefaultMagic = M_MBOX;
- else if (ascii_strcasecmp (s, "mh") == 0)
- DefaultMagic = M_MH;
- else if (ascii_strcasecmp (s, "maildir") == 0)
- DefaultMagic = M_MAILDIR;
- else
- return (-1);
-
- return 0;
+ return 0;
+ return mxfmts[m]->local;
}
/* mx_access: Wrapper for access, checks permissions on a given mailbox.
int i = 0;
if ((i = mx_get_idx (path)) >= 0 && mxfmts[i]->mx_access)
- return (mxfmts[i]->mx_access(path,flags));
- return (0);
+ return mxfmts[i]->mx_access(path,flags);
+ return 0;
}
static int mx_open_mailbox_append (CONTEXT * ctx, int flags)
mutt_error (_("%s is not a mailbox."), ctx->path);
/* fall through */
case -1:
- return (-1);
+ return -1;
}
- }
- else if (errno == ENOENT) {
- ctx->magic = DefaultMagic;
-
- if (ctx->magic == M_MH || ctx->magic == M_MAILDIR) {
+ } else if (errno == ENOENT) {
+ int len = m_strlen(ctx->path);
+ if (len > 0 && ctx->path[len - 1] == '/') {
char tmp[_POSIX_PATH_MAX];
if (mkdir (ctx->path, S_IRWXU)) {
mutt_perror (ctx->path);
- return (-1);
+ return -1;
}
- if (ctx->magic == M_MAILDIR) {
- snprintf (tmp, sizeof (tmp), "%s/cur", ctx->path);
- if (mkdir (tmp, S_IRWXU)) {
- mutt_perror (tmp);
- rmdir (ctx->path);
- return (-1);
- }
+ snprintf (tmp, sizeof (tmp), "%s/cur", ctx->path);
+ if (mkdir (tmp, S_IRWXU)) {
+ mutt_perror (tmp);
+ rmdir (ctx->path);
+ return -1;
+ }
- snprintf (tmp, sizeof (tmp), "%s/new", ctx->path);
- if (mkdir (tmp, S_IRWXU)) {
- mutt_perror (tmp);
- snprintf (tmp, sizeof (tmp), "%s/cur", ctx->path);
- rmdir (tmp);
- rmdir (ctx->path);
- return (-1);
- }
- snprintf (tmp, sizeof (tmp), "%s/tmp", ctx->path);
- if (mkdir (tmp, S_IRWXU)) {
- mutt_perror (tmp);
- snprintf (tmp, sizeof (tmp), "%s/cur", ctx->path);
- rmdir (tmp);
- snprintf (tmp, sizeof (tmp), "%s/new", ctx->path);
- rmdir (tmp);
- rmdir (ctx->path);
- return (-1);
- }
+ snprintf (tmp, sizeof (tmp), "%s/new", ctx->path);
+ if (mkdir (tmp, S_IRWXU)) {
+ mutt_perror (tmp);
+ snprintf (tmp, sizeof (tmp), "%s/cur", ctx->path);
+ rmdir (tmp);
+ rmdir (ctx->path);
+ return -1;
}
- else {
- int i;
-
- snprintf (tmp, sizeof (tmp), "%s/.mh_sequences", ctx->path);
- if ((i = creat (tmp, S_IRWXU)) == -1) {
- mutt_perror (tmp);
- rmdir (ctx->path);
- return (-1);
- }
- close (i);
+ snprintf (tmp, sizeof (tmp), "%s/tmp", ctx->path);
+ if (mkdir (tmp, S_IRWXU)) {
+ mutt_perror (tmp);
+ snprintf (tmp, sizeof (tmp), "%s/cur", ctx->path);
+ rmdir (tmp);
+ snprintf (tmp, sizeof (tmp), "%s/new", ctx->path);
+ rmdir (tmp);
+ rmdir (ctx->path);
+ return -1;
}
+ ctx->magic = M_MAILDIR;
+ } else {
+ ctx->magic = M_MBOX;
}
- }
- else {
+ } else {
mutt_perror (ctx->path);
- return (-1);
+ return -1;
}
- switch (ctx->magic) {
- case M_MBOX:
- if ((ctx->fp =
- safe_fopen (ctx->path, flags & M_NEWFOLDER ? "w" : "a")) == NULL
- || mbox_lock_mailbox (ctx, 1, 1) != 0) {
- if (!ctx->fp)
- mutt_perror (ctx->path);
- else {
- mutt_error (_("Couldn't lock %s\n"), ctx->path);
- m_fclose(&ctx->fp);
- }
- return (-1);
+ if (ctx->magic == M_MBOX) {
+ if (!(ctx->fp = safe_fopen(ctx->path, flags & M_NEWFOLDER ? "w" : "a"))) {
+ mutt_perror(ctx->path);
+ return -1;
}
- fseeko (ctx->fp, 0, 2);
- break;
-
- case M_MH:
- case M_MAILDIR:
- /* nothing to do */
- break;
-
- default:
- return (-1);
+ if (mbox_lock_mailbox(ctx, 1, 1) != 0) {
+ mutt_error(_("Couldn't lock %s\n"), ctx->path);
+ m_fclose(&ctx->fp);
+ return -1;
+ }
+ fseeko(ctx->fp, 0, 2);
}
-
return 0;
}
mx_fastclose_mailbox (ctx);
if (!pctx)
p_delete(&ctx);
- return (NULL);
+ return NULL;
}
/* if the user has a `push' command in their .muttrc, or in a folder-hook,
}
unset_option (OPTFORCEREFRESH);
- return (ctx);
+ return ctx;
}
/* free up memory associated with the mailbox context */
ctx->closing = 1;
-#ifdef USE_NNTP
- if (ctx->magic == M_NNTP) {
- int ret;
-
- ret = nntp_close_mailbox (ctx);
- mx_fastclose_mailbox (ctx);
- return ret;
- }
-#endif
if (ctx->readonly || ctx->dontwrite) {
/* mailbox is readonly or we don't want to write */
mx_fastclose_mailbox (ctx);
}
if (read_msgs && quadoption (OPT_MOVE) != M_NO) {
- char *p;
-
- if ((p = mutt_find_hook (M_MBOXHOOK, ctx->path))) {
- isSpool = 1;
- m_strcpy(mbox, sizeof(mbox), p);
- }
- else {
- m_strcpy(mbox, sizeof(mbox), NONULL(Inbox));
- isSpool = mutt_is_spool (ctx->path) && !mutt_is_spool (mbox);
- }
+ m_strcpy(mbox, sizeof(mbox), NONULL(Inbox));
+ isSpool = mutt_is_spool (ctx->path) && !mutt_is_spool (mbox);
mutt_expand_path (mbox, sizeof (mbox));
if (isSpool) {
snprintf (buf, sizeof (buf), _("Move read messages to %s?"), mbox);
if ((move_messages = query_quadoption (OPT_MOVE, buf)) == -1) {
ctx->closing = 0;
- return (-1);
+ return -1;
}
}
}
_("Purge %d deleted messages?"), ctx->deleted);
if ((purge = query_quadoption (OPT_DELETE, buf)) < 0) {
ctx->closing = 0;
- return (-1);
+ return -1;
}
}
ctx->msgcount - ctx->deleted, ctx->deleted);
if (ctx->cinfo && mutt_slow_close_compressed (ctx))
- return (-1);
+ return -1;
mx_fastclose_mailbox (ctx);
int mx_close_mailbox (CONTEXT * ctx, int *index_hint) {
int ret = 0;
if (!ctx)
- return (0);
+ return 0;
ret = _mx_close_mailbox (ctx, index_hint);
sidebar_set_buffystats (ctx);
- return (ret);
+ return ret;
}
/* update a Context structure's internal tables. */
if (!ctx->changed && !ctx->deleted) {
mutt_message _("Mailbox is unchanged.");
- return (0);
+ return 0;
}
if (ctx->deleted) {
? _("Purge %d deleted message?") :
_("Purge %d deleted messages?"), ctx->deleted);
if ((purge = query_quadoption (OPT_DELETE, buf)) < 0)
- return (-1);
+ return -1;
else if (purge == M_NO) {
if (!ctx->changed)
return 0; /* nothing to do! */
}
}
- return (rc);
+ return rc;
}
int mx_sync_mailbox (CONTEXT* ctx, int* index_hint) {
int ret = _mx_sync_mailbox (ctx, index_hint);
sidebar_set_buffystats (ctx);
- return (ret);
+ return ret;
}
/* args:
address_t *p = NULL;
if (!MX_IDX(dest->magic-1)) {
- return (NULL);
+ return NULL;
}
msg = p_new(MESSAGE, 1);
if (ctx->locked)
lock = 0;
if (MX_IDX(ctx->magic-1) && mxfmts[ctx->magic-1]->mx_check_mailbox)
- return (mxfmts[ctx->magic-1]->mx_check_mailbox(ctx, index_hint, lock));
+ return mxfmts[ctx->magic-1]->mx_check_mailbox(ctx, index_hint, lock);
}
- return (-1);
+ return -1;
}
/* return a stream pointer for a message */
break;
}
-#ifdef USE_NNTP
- case M_NNTP:
- {
- if (nntp_fetch_message (msg, ctx, msgno) != 0)
- p_delete(&msg);
- break;
- }
-#endif /* USE_NNTP */
-
default:
p_delete(&msg);
break;
}
- return (msg);
+ return msg;
}
/* commit a message to a folder */
return -1;
}
if (!ctx || !MX_IDX(ctx->magic-1) || !mxfmts[ctx->magic-1]->mx_commit_message)
- return (-1);
- return (mxfmts[ctx->magic-1]->mx_commit_message (msg, ctx));
+ return -1;
+ return mxfmts[ctx->magic-1]->mx_commit_message (msg, ctx);
}
/* close a pointer to a message */
int r = 0;
if ((*msg)->magic == M_MH || (*msg)->magic == M_MAILDIR
- || (*msg)->magic == M_IMAP
- || (*msg)->magic == M_POP
-#ifdef USE_NNTP
- || (*msg)->magic == M_NNTP
-#endif
- ) {
+ || (*msg)->magic == M_IMAP || (*msg)->magic == M_POP)
+ {
r = m_fclose(&(*msg)->fp);
}
else
}
p_delete(msg);
- return (r);
+ return r;
}
void mx_alloc_memory (CONTEXT * ctx)
{
int i = 0;
if ((i = mx_get_idx (path)) >= 0 && mxfmts[i]->mx_check_empty)
- return (mxfmts[i]->mx_check_empty(path));
+ return mxfmts[i]->mx_check_empty(path);
errno = EINVAL;
- return (-1);
+ return -1;
}
int mx_acl_check(CONTEXT *ctx, int flag)
projects / apps / madmutt.git / blobdiff