X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-mx%2Fmx.c;h=38edb8ac5a01cc5ac909f4854e68af28e1df5f8f;hp=6693d27d83c97b8f45cc2e7e08e6d6a7f8b9b0b9;hb=1d76b29d79137330c8f42d489fe3f67a23f2390b;hpb=cfd5f411041c7ef44087b032751792fadc74586d diff --git a/lib-mx/mx.c b/lib-mx/mx.c index 6693d27..38edb8a 100644 --- a/lib-mx/mx.c +++ b/lib-mx/mx.c @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include "mutt.h" #include "crypt.h" @@ -33,6 +33,9 @@ #include #include "pop.h" +#define MAXLOCKATTEMPT 5 + + static mx_t const *mxfmts[] = { &mbox_mx, &mh_mx, @@ -91,132 +94,49 @@ static int mx_get_idx (const char* path) { /* 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; - } - - 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; + goto error; } - - 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; } @@ -237,23 +157,6 @@ int mx_is_local (int m) { 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; -} - /* mx_access: Wrapper for access, checks permissions on a given mailbox. * We may be interested in using ACL-style flags at some point, currently * we use the normal access() flags. */ @@ -292,9 +195,8 @@ static int mx_open_mailbox_append (CONTEXT * ctx, int flags) } } else if (errno == ENOENT) { - ctx->magic = DefaultMagic; - - if (ctx->magic == M_MH || ctx->magic == M_MAILDIR) { + int len = m_strlen(ctx->path); + if (len > 0 && ctx->path[len - 1] == '/') { char tmp[_POSIX_PATH_MAX]; if (mkdir (ctx->path, S_IRWXU)) { @@ -302,47 +204,36 @@ static int mx_open_mailbox_append (CONTEXT * ctx, int flags) 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/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/cur", ctx->path); + if (mkdir (tmp, S_IRWXU)) { + mutt_perror (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/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); + } + ctx->magic = M_MAILDIR; + } else { + ctx->magic = M_MBOX; } - } - else { + } else { mutt_perror (ctx->path); return (-1); } @@ -351,7 +242,7 @@ static int mx_open_mailbox_append (CONTEXT * ctx, int flags) case M_MBOX: if ((ctx->fp = safe_fopen (ctx->path, flags & M_NEWFOLDER ? "w" : "a")) == NULL - || mbox_lock_mailbox (ctx, 1, 1) != 0) { + || mbox_lock_mailbox(ctx, 1, 1) != 0) { if (!ctx->fp) mutt_perror (ctx->path); else { @@ -598,16 +489,8 @@ static int _mx_close_mailbox (CONTEXT * ctx, int *index_hint) } 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) {