return (t-1);
}
}
- return (-1);
+ return -1;
}
/* Args:
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 -1;
}
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. */
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;
}
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);
? _("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 (mxfmts[ctx->magic-1]->mx_check_mailbox(ctx, index_hint, lock));
}
- return (-1);
+ return -1;
}
/* return a stream pointer for a message */
return -1;
}
if (!ctx || !MX_IDX(ctx->magic-1) || !mxfmts[ctx->magic-1]->mx_commit_message)
- return (-1);
+ return -1;
return (mxfmts[ctx->magic-1]->mx_commit_message (msg, ctx));
}
if ((i = mx_get_idx (path)) >= 0 && mxfmts[i]->mx_check_empty)
return (mxfmts[i]->mx_check_empty(path));
errno = EINVAL;
- return (-1);
+ return -1;
}
int mx_acl_check(CONTEXT *ctx, int flag)