#include "sort.h"
#include "nntp.h"
#include "buffy.h"
-
-#include <lib-crypt/crypt.h>
+#include "crypt.h"
#define WANT_LISTGROUP_COMMAND 0
* mailboxes command ;-((( FIXME
*/
buf[0] = '\0';
- snprintf (buf, sizeof (buf), "nntp%s://%s%s%s%s/%s",
- (data->nserv->conn->account.flags & M_ACCT_SSL) ? "s" : "",
- NONULL (data->nserv->conn->account.user),
- *data->nserv->conn->account.pass ? ":" : "",
- *data->nserv->conn->account.pass ? data->nserv->conn->account.pass : "",
- data->nserv->conn->account.host,
- data->group);
+ snprintf(buf, sizeof (buf), "nntp%s://%s%s%s%s/%s",
+ data->nserv->conn->account.has_ssl ? "s" : "",
+ NONULL(data->nserv->conn->account.user),
+ *data->nserv->conn->account.pass ? ":" : "",
+ *data->nserv->conn->account.pass ? data->nserv->conn->account.pass : "",
+ data->nserv->conn->account.host,
+ data->group);
/* bail out if group not found via mailboxes */
if ((i = buffy_lookup (buf)) < 0)
char buf[STRING];
unsigned char flags = conn->account.flags;
- if (mutt_account_getuser (&conn->account) || !conn->account.user[0] ||
- mutt_account_getpass (&conn->account) || !conn->account.pass[0]) {
+ if (mutt_account_getuser(&conn->account) || !conn->account.user[0] ||
+ mutt_account_getpass(&conn->account) || !conn->account.pass[0]) {
conn->account.flags = flags;
return -2;
}
if (mutt_socket_readln (buf, sizeof (buf), conn) < 0)
return nntp_connect_error (serv);
- if (!(conn->account.flags & M_ACCT_USER) && m_strncmp("480", buf, 3)) {
+ if (!conn->account.has_user && m_strncmp("480", buf, 3)) {
serv->status = NNTP_OK;
return 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(mod_core.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;
nntp_data = xmalloc(sizeof(NNTP_DATA) + m_strlen(buf) + 1);
nntp_data->group = (char *) nntp_data + sizeof (NNTP_DATA);
strcpy (nntp_data->group, buf);
- hash_insert (serv->newsgroups, nntp_data->group, nntp_data, 0);
+ hash_insert (serv->newsgroups, nntp_data->group, nntp_data);
nntp_add_to_list (serv, nntp_data);
}
ctx->data = nntp_data;
/* 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(mod_core.tmpdir), NULL);
if (!msg->fp) {
return -1;
}
strcpy (nntp_data->group, group);
nntp_data->nserv = s;
if (s->newsgroups->nelem < s->newsgroups->curnelem * 2)
- s->newsgroups = hash_resize (s->newsgroups, s->newsgroups->nelem * 2);
- hash_insert (s->newsgroups, nntp_data->group, nntp_data, 0);
+ hash_resize (s->newsgroups, s->newsgroups->nelem * 2);
+ hash_insert (s->newsgroups, nntp_data->group, nntp_data);
nntp_add_to_list (s, nntp_data);
}
nntp_data->deleted = 0;
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;
}
}