#include "sort.h"
#include "nntp.h"
#include "buffy.h"
-
-#include <lib-crypt/crypt.h>
+#include "crypt.h"
#define WANT_LISTGROUP_COMMAND 0
* -2 - invalid command or execution error,
* -3 - error in funct(*line, *data).
*/
-static int mutt_nntp_fetch (NNTP_DATA * nntp_data, const char *query, char *msg,
- progress_t* bar, int (*funct) (char *, void *),
+static int mutt_nntp_fetch (NNTP_DATA * nntp_data, const char *query,
+ const char *msg, progress_t* bar,
+ int (*funct) (char *, void *),
void *data, int tagged)
{
char buf[LONG_STRING];
int ret;
HEADER *h = ctx->hdrs[ctx->msgcount];
- f = m_tempfile(tempfile, sizeof(tempfile), NONULL(Tempdir), NULL);
+ f = m_tempfile(tempfile, sizeof(tempfile), NONULL(MCore.tmpdir), NULL);
if (!f)
return -1;
unsigned int last)
{
char buf[HUGE_STRING];
- char *msg = _("Fetching message headers...");
- char *msg2 = _("Fetching headers from cache...");
+ const char *msg = _("Fetching message headers...");
+ const char *msg2 = _("Fetching headers from cache...");
NNTP_DATA *nntp_data = ((NNTP_DATA *) ctx->data);
int ret;
int num;
/* CACHE: delete cache and line from .index */
nntp_delete_cache (nntp_data);
- hash_delete (serv->newsgroups, nntp_data->group, NULL,
+ hash_remove (serv->newsgroups, nntp_data->group, NULL,
nntp_delete_data);
while (l && l->data != (void *) nntp_data)
l = l->next;
p_delete(&cache->path);
cache->index = ctx->hdrs[msgno]->index;
- msg->fp = m_tempfile(path, sizeof(path), NONULL(Tempdir), NULL);
+ msg->fp = m_tempfile(path, sizeof(path), NONULL(MCore.tmpdir), NULL);
if (!msg->fp) {
return -1;
}
if (data && data->deleted && !data->rc) {
nntp_delete_cache (data);
- hash_delete (serv->newsgroups, data->group, NULL, nntp_delete_data);
+ hash_remove (serv->newsgroups, data->group, NULL, nntp_delete_data);
tmp->data = NULL;
}
}