X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=lib-mx%2Fmx.c;h=1d6ebf1f0218373bece7ee3484c1b69549496065;hb=488a60c8ef78872f38bbb3439a75cb2cda985a12;hp=1caefe580265ad7845081d869f2e6d385c5a1925;hpb=8e075eda08c6f099ec6988e16607fb4f6a10ba92;p=apps%2Fmadmutt.git diff --git a/lib-mx/mx.c b/lib-mx/mx.c index 1caefe5..1d6ebf1 100644 --- a/lib-mx/mx.c +++ b/lib-mx/mx.c @@ -12,9 +12,11 @@ #include +#include #include #include #include +#include #include "mutt.h" #include "pattern.h" @@ -36,8 +38,6 @@ #include #endif -#include - static mx_t const *mxfmts[] = { &mbox_mx, &mmdf_mx, @@ -61,17 +61,16 @@ static mx_t const *mxfmts[] = { static int invoke_dotlock (const char *path, int flags, int retry) { char cmd[LONG_STRING + _POSIX_PATH_MAX]; - char f[SHORT_STRING + _POSIX_PATH_MAX]; - char r[SHORT_STRING]; + char f[STRING + _POSIX_PATH_MAX]; + char r[STRING]; if (flags & DL_FL_RETRY) snprintf (r, sizeof (r), "-r %d ", retry ? MAXLOCKATTEMPT : 0); mutt_quote_filename (f, sizeof (f), path); - snprintf (cmd, sizeof (cmd), - "%s %s%s%s%s%s%s%s", - NONULL (MuttDotlock), + snprintf(cmd, sizeof(cmd), "%s %s%s%s%s%s%s%s", + mlua_reggets(LTK_DOTLOCK), flags & DL_FL_TRY ? "-t " : "", flags & DL_FL_UNLOCK ? "-u " : "", flags & DL_FL_USEPRIV ? "-p " : "", @@ -644,7 +643,7 @@ static int _mx_close_mailbox (CONTEXT * ctx, int *index_hint) int isSpool = 0; CONTEXT f; char mbox[_POSIX_PATH_MAX]; - char buf[SHORT_STRING]; + char buf[STRING]; if (!ctx) return 0; @@ -960,7 +959,7 @@ static int _mx_sync_mailbox (CONTEXT * ctx, int *index_hint) } if (ctx->deleted) { - char buf[SHORT_STRING]; + char buf[STRING]; snprintf (buf, sizeof (buf), ctx->deleted == 1 ? _("Purge %d deleted message?") :