#include <lib-sys/unix.h>
#include <lib-mime/mime.h>
#include <lib-ui/sidebar.h>
-#include <lib-crypt/crypt.h>
#include "mutt.h"
+#include "crypt.h"
#include "pattern.h"
#include "buffy.h"
#include "mx.h"
char cmd[LONG_STRING + _POSIX_PATH_MAX];
char f[STRING + _POSIX_PATH_MAX];
char r[STRING];
- int pos;
if (flags & DL_FL_RETRY)
snprintf (r, sizeof (r), "-r %d ", retry ? MAXLOCKATTEMPT : 0);
mutt_quote_filename (f, sizeof (f), path);
- pos = mlua_value(cmd, sizeof(cmd), "madmutt", "dotlock");
-
- snprintf(cmd + pos, sizeof(cmd) - pos,
- " %s%s%s%s%s%s%s",
- flags & DL_FL_TRY ? "-t " : "",
- flags & DL_FL_UNLOCK ? "-u " : "",
- flags & DL_FL_USEPRIV ? "-p " : "",
- flags & DL_FL_FORCE ? "-f " : "",
- flags & DL_FL_UNLINK ? "-d " : "",
- flags & DL_FL_RETRY ? r : "", f);
+ snprintf(cmd, sizeof(cmd), "%s %s%s%s%s%s%s%s",
+ MCore.dotlock,
+ flags & DL_FL_TRY ? "-t " : "",
+ flags & DL_FL_UNLOCK ? "-u " : "",
+ flags & DL_FL_USEPRIV ? "-p " : "",
+ flags & DL_FL_FORCE ? "-f " : "",
+ flags & DL_FL_UNLINK ? "-d " : "",
+ flags & DL_FL_RETRY ? r : "", f);
return mutt_system (cmd);
}
if (MX_IDX(ctx->magic-1) && mxfmts[ctx->magic-1]->mx_fastclose_mailbox)
mxfmts[ctx->magic-1]->mx_fastclose_mailbox(ctx);
if (ctx->subj_hash)
- hash_destroy (&ctx->subj_hash, NULL);
+ hash_delete (&ctx->subj_hash, NULL);
if (ctx->id_hash)
- hash_destroy (&ctx->id_hash, NULL);
+ hash_delete (&ctx->id_hash, NULL);
mutt_clear_threads (ctx);
for (i = 0; i < ctx->msgcount; i++)
header_delete(&ctx->hdrs[i]);
ctx->hdrs[i]->content->hdr_offset);
/* remove message from the hash tables */
if (ctx->subj_hash && ctx->hdrs[i]->env->real_subj)
- hash_delete (ctx->subj_hash, ctx->hdrs[i]->env->real_subj,
+ hash_remove (ctx->subj_hash, ctx->hdrs[i]->env->real_subj,
ctx->hdrs[i], NULL);
if (ctx->id_hash && ctx->hdrs[i]->env->message_id)
- hash_delete (ctx->id_hash, ctx->hdrs[i]->env->message_id,
+ hash_remove (ctx->id_hash, ctx->hdrs[i]->env->message_id,
ctx->hdrs[i], NULL);
header_delete(&ctx->hdrs[i]);
}
p = hdr->env->from;
}
- fprintf (msg->fp, "From %s %s", p ? p->mailbox : NONULL (Username),
+ fprintf (msg->fp, "From %s %s", p ? p->mailbox : NONULL(MCore.username),
ctime (&msg->received));
}
}
/* add this message to the hash tables */
if (ctx->id_hash && h->env->message_id)
- hash_insert (ctx->id_hash, h->env->message_id, h, 0);
+ hash_insert (ctx->id_hash, h->env->message_id, h);
if (!ctx->counting) {
if (ctx->subj_hash && h->env->real_subj)
- hash_insert (ctx->subj_hash, h->env->real_subj, h, 1);
+ hash_insert (ctx->subj_hash, h->env->real_subj, h);
if (option (OPTSCORE))
mutt_score_message (ctx, h, 0);