#include "sort.h"
#include "nntp.h"
#include "buffy.h"
-
-#include <lib-crypt/crypt.h>
-
-#define WANT_LISTGROUP_COMMAND 0
+#include "crypt.h"
static unsigned int _checked = 0;
if (!Incoming.len)
return;
- /* unfortunately, NNTP_DATA::group only is the plain
- * group name, so for every single update, we need to
- * compose the full string which must be defined via
- * 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;
}
return -1;
}
- sleep (1);
-
/* Tell INN to switch to mode reader if it isn't so. Ignore all
returned codes and messages. */
mutt_socket_write (conn, "MODE READER\r\n");
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;
}
char buf[LONG_STRING];
CONNECTION *conn = serv->conn;
+ if (serv->feat_known)
+ return 0;
+
mutt_socket_write (conn, "XOVER\r\n");
if (mutt_socket_readln (buf, sizeof (buf), conn) < 0)
return nntp_connect_error (serv);
if (m_strncmp("500", buf, 3))
serv->hasXPAT = 1;
-#if WANT_LISTGROUP_COMMAND
mutt_socket_write (conn, "LISTGROUP\r\n");
if (mutt_socket_readln (buf, sizeof (buf), conn) < 0)
return (nntp_connect_error (serv));
if (m_strncmp("500", buf, 3))
serv->hasLISTGROUP = 1;
-#endif
mutt_socket_write (conn, "XGTITLE +\r\n");
if (mutt_socket_readln (buf, sizeof (buf), conn) < 0)
} while (!(buf[0] == '.' && buf[1] == '\0'));
}
+ serv->feat_known = 1;
return 0;
}
static int nntp_reconnect (NNTP_SERVER * serv)
{
- char buf[SHORT_STRING];
+ char buf[STRING];
mutt_socket_close (serv->conn);
* -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;
ret = mutt_nntp_fetch (nntp_data, buf, NULL, NULL, nntp_read_tempfile, f, 0);
if (ret) {
- fclose (f);
+ m_fclose(&f);
unlink (tempfile);
return (ret == -1 ? -1 : 1);
}
h->article_num = article_num;
h->env = mutt_read_rfc822_header (f, h, 0, 0);
- fclose (f);
+ m_fclose(&f);
unlink (tempfile);
if (h->env->xref != NULL)
static int parse_description (char *line, void *n)
{
-#define news ((NNTP_SERVER *) n)
register char *d = line;
NNTP_DATA *data;
+ NNTP_SERVER *news = n;
if (!line)
return 0;
data->desc = m_strdup(d);
}
return 0;
-#undef news
}
static void nntp_get_desc (NNTP_DATA * data, const char *mask, char *msg, progress_t* bar)
if (data->nserv->hasXGTITLE)
snprintf (buf, sizeof (buf), "XGTITLE %s\r\n", mask);
else
- snprintf (buf, sizeof (buf), "string_list_t NEWSGROUPS %s\r\n", mask);
+ snprintf (buf, sizeof (buf), "LIST NEWSGROUPS %s\r\n", mask);
if (mutt_nntp_fetch (data, buf, msg, bar, parse_description, data->nserv, 0) !=
0) {
}
typedef struct {
CONTEXT *ctx;
- unsigned int base;
- unsigned int first;
- unsigned int last;
- unsigned short *messages;
- char *msg;
+ int first;
+ int last;
+ bits_t messages;
+ const char *msg;
} FETCH_CONTEXT;
-#define fc ((FETCH_CONTEXT *) c)
-
-#if WANT_LISTGROUP_COMMAND
-static int _nntp_fetch_numbers (unsigned int num, void *c)
-{
- if (num < fc->base || num > fc->last)
- return 0;
- fc->messages[num - fc->base] = 1;
- return 0;
-}
static int nntp_fetch_numbers (char *line, void *c)
{
- if (!line)
+ FETCH_CONTEXT *fc = c;
+
+ if (line) {
+ int num = atoi(line);
+ if (num < fc->first || num > fc->last)
+ return 0;
+
+ bit_set(&fc->messages, num);
+ }
return 0;
- return (_nntp_fetch_numbers ((unsigned int) atoi (line), c));
}
-#endif
static int add_xover_line (char *line, void *c)
{
- unsigned int num, total;
+ int num, total;
+ FETCH_CONTEXT *fc = c;
CONTEXT *ctx = fc->ctx;
NNTP_DATA *data = (NNTP_DATA *) ctx->data;
nntp_parse_xover (ctx, line, ctx->hdrs[ctx->msgcount]);
num = ctx->hdrs[ctx->msgcount]->article_num;
- if (num >= fc->first && num <= fc->last && fc->messages[num - fc->base]) {
+ if (num >= fc->first && num <= fc->last) {
ctx->msgcount++;
if (num > data->lastLoaded)
data->lastLoaded = num;
total = fc->last - fc->first + 1;
if (!ctx->quiet && fc->msg && ReadInc && (num % ReadInc == 0))
mutt_message ("%s %d/%d", fc->msg, num, total);
- }
- else
+ } else {
header_delete(&ctx->hdrs[ctx->msgcount]); /* skip it */
+ }
return 0;
}
-#undef fc
-static int nntp_fetch_headers (CONTEXT * ctx, unsigned int first,
- unsigned int last)
+static int nntp_fetch_headers(CONTEXT * ctx, int first, 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;
- int oldmsgcount;
- unsigned int current;
+ int ret, num, oldmsgcount, current;
FILE *f;
FETCH_CONTEXT fc;
/* fetch list of articles */
mutt_message _("Fetching list of articles...");
- fc.ctx = ctx;
- fc.base = first;
- fc.last = last;
- fc.messages = p_new(unsigned short, last - first + 1);
-#if WANT_LISTGROUP_COMMAND
- if (nntp_data->nserv->hasLISTGROUP) {
- snprintf (buf, sizeof (buf), "LISTGROUP %s\r\n", nntp_data->group);
- if (mutt_nntp_fetch (nntp_data, buf, NULL, NULL, nntp_fetch_numbers, &fc, 0) !=
- 0) {
- mutt_error (_("LISTGROUP command failed: %s"), buf);
- sleep (2);
- p_delete(&fc.messages);
- return -1;
- }
- }
- else {
-#endif
- for (num = 0; num < last - first + 1; num++)
- fc.messages[num] = 1;
-#if WANT_LISTGROUP_COMMAND
- }
-#endif
+ fc.ctx = ctx;
+ fc.first = first;
+ fc.last = last;
/* CACHE: must be loaded xover cache here */
num = nntp_data->lastCached - first + 1;
if (option (OPTNEWSCACHE) && nntp_data->cache && num > 0) {
- nntp_cache_expand (buf, nntp_data->cache);
- mutt_message (msg2);
-
- if ((f = safe_fopen (buf, "r"))) {
- int r = 0, c = 0;
-
- /* counting number of lines */
- while (fgets (buf, sizeof (buf), f) != NULL)
- r++;
- rewind (f);
- while (r > num && fgets (buf, sizeof (buf), f) != NULL)
- r--;
- oldmsgcount = ctx->msgcount;
- fc.first = first;
- fc.last = first + num - 1;
- fc.msg = NULL;
- while (fgets (buf, sizeof (buf), f) != NULL) {
- if (ReadInc && ((++c) % ReadInc == 0))
- mutt_message ("%s %d/%d", msg2, c, r);
- add_xover_line (buf, &fc);
- }
- fclose (f);
- nntp_data->lastLoaded = fc.last;
- first = fc.last + 1;
- if (ctx->msgcount > oldmsgcount)
- mx_update_context (ctx, ctx->msgcount - oldmsgcount);
+ nntp_cache_expand (buf, nntp_data->cache);
+ mutt_message (msg2);
+
+ if ((f = safe_fopen (buf, "r"))) {
+ int r = 0, c = 0;
+
+ /* counting number of lines */
+ while (fgets (buf, sizeof (buf), f) != NULL)
+ r++;
+ rewind (f);
+ while (r > num && fgets (buf, sizeof (buf), f) != NULL)
+ r--;
+ oldmsgcount = ctx->msgcount;
+ fc.first = first;
+ fc.last = first + num - 1;
+ fc.msg = NULL;
+ while (fgets (buf, sizeof (buf), f) != NULL) {
+ if (ReadInc && ((++c) % ReadInc == 0))
+ mutt_message ("%s %d/%d", msg2, c, r);
+ add_xover_line (buf, &fc);
}
- else
- nntp_delete_cache (nntp_data);
+ m_fclose(&f);
+ nntp_data->lastLoaded = fc.last;
+ first = fc.last + 1;
+ if (ctx->msgcount > oldmsgcount)
+ mx_update_context (ctx, ctx->msgcount - oldmsgcount);
+ }
+ else
+ nntp_delete_cache (nntp_data);
}
num = last - first + 1;
if (num <= 0) {
- p_delete(&fc.messages);
return 0;
}
/*
- * Without XOVER, we have to fetch each article header and parse
- * it. With XOVER, we ask for all of them
- */
+ * Without XOVER, we have to fetch each article header and parse
+ * it. With XOVER, we ask for all of them
+ */
mutt_message (msg);
if (nntp_data->nserv->hasXOVER) {
oldmsgcount = ctx->msgcount;
mx_update_context (ctx, ctx->msgcount - oldmsgcount);
if (ret != 0) {
mutt_error (_("XOVER command failed: %s"), buf);
- p_delete(&fc.messages);
return -1;
}
- /* fetched OK */
- }
- else
+ } else {
+ bits_init(&fc.messages);
+
+ if (nntp_data->nserv->hasLISTGROUP) {
+ snprintf (buf, sizeof (buf), "LISTGROUP %s\r\n", nntp_data->group);
+ if (mutt_nntp_fetch(nntp_data, buf, NULL, NULL,
+ nntp_fetch_numbers, &fc, 0))
+ {
+ mutt_error (_("LISTGROUP command failed: %s"), buf);
+ sleep (2);
+ bits_wipe(&fc.messages);
+ return -1;
+ }
+ } else {
+ for (num = first; num <= last; num++)
+ bit_set(&fc.messages, num);
+ }
+
for (current = first; current <= last; current++) {
HEADER *h;
ret = current - first + 1;
mutt_message ("%s %d/%d", msg, ret, num);
- if (!fc.messages[current - fc.base])
+ if (!bit_isset(&fc.messages, current))
continue;
if (ctx->msgcount >= ctx->hdrmax)
else
header_delete(&h); /* skip it */
if (ret == -1) {
- p_delete(&fc.messages);
+ bits_wipe(&fc.messages);
return -1;
}
if (current > nntp_data->lastLoaded)
nntp_data->lastLoaded = current;
}
- p_delete(&fc.messages);
+ bits_wipe(&fc.messages);
+ }
+
nntp_data->lastLoaded = last;
mutt_clear_error ();
return 0;
}
-/*
+/*
* currently, nntp "mailbox" is "newsgroup"
*/
static int nntp_open_mailbox (CONTEXT * ctx)
NNTP_SERVER *serv;
char buf[HUGE_STRING];
char server[LONG_STRING];
- int count = 0;
- unsigned int first;
+ int count = 0, first;
ACCOUNT act;
p_clear(&act, 1);
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;
}
}
if (ret) {
- fclose (msg->fp);
+ m_fclose(&msg->fp);
unlink (path);
p_delete(&cache->path);
return -1;
else
mutt_socket_write(nntp_data->nserv->conn, buf + 1);
}
- fclose (f);
+ m_fclose(&f);
if (buf[m_strlen(buf) - 1] != '\n')
mutt_socket_write(nntp_data->nserv->conn, "\r\n");
static int add_group (char *buf, void *serv)
{
-#define s ((NNTP_SERVER *) serv)
+ NNTP_SERVER *s = serv;
char group[LONG_STRING], mod, desc[HUGE_STRING];
int first, last;
NNTP_DATA *nntp_data;
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;
nntp_data->unread = 0;
return 0;
-#undef s
}
int nntp_check_newgroups (NNTP_SERVER * serv, int force)
{
char buf[LONG_STRING];
NNTP_DATA nntp_data;
- string_list_t *l;
- string_list_t emp;
+ string_list_t *l, **emp;
time_t now;
struct tm *t;
nntp_data.group = ((NNTP_DATA *) Context->data)->group;
else
nntp_data.group = NULL;
- l = serv->tail;
+
+ emp = serv->tail;
if (mutt_nntp_fetch (&nntp_data, buf, _("Adding new newsgroups..."), NULL,
add_group, serv, 0) != 0) {
return -1;
mutt_message _("Loading descriptions...");
- if (l)
- emp.next = l->next;
- else
- emp.next = serv->list;
- l = &emp;
- while (l->next) {
- l = l->next;
- ((NNTP_DATA *) l->data)->new = 1;
- nntp_get_desc ((NNTP_DATA *) l->data, ((NNTP_DATA *) l->data)->group,
- NULL, NULL);
+ for (l = *emp; l; l = l->next) {
+ ((NNTP_DATA *)l->data)->new = 1;
+ nntp_get_desc((NNTP_DATA *) l->data, ((NNTP_DATA *)l->data)->group,
+ NULL, NULL);
}
- if (emp.next)
- nntp_save_cache_index (serv);
- mutt_clear_error ();
+ if (*emp)
+ nntp_save_cache_index(serv);
+ mutt_clear_error();
return _checked;
}
i++;
}
add_group (NULL, NULL);
- fclose (f);
+ m_fclose(&f);
mutt_clear_error ();
return 0;
}
/* Load list of all newsgroups from active */
int nntp_get_active (NNTP_SERVER * serv)
{
- char msg[SHORT_STRING];
+ char msg[STRING];
NNTP_DATA nntp_data;
string_list_t *tmp;
nntp_data.nserv = serv;
nntp_data.group = NULL;
- if (mutt_nntp_fetch (&nntp_data, "string_list_t\r\n", msg, NULL, add_group, serv, 0) < 0) {
+ if (mutt_nntp_fetch (&nntp_data, "LIST\r\n", msg, NULL, add_group, serv, 0) < 0) {
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;
}
}
typedef struct {
CONTEXT *ctx;
- unsigned int num;
- unsigned int max;
- unsigned int *child;
+ int num;
+ int max;
+ int *child;
} CHILD_CONTEXT;
static int check_children (char *s, void *c)
{
-#define cc ((CHILD_CONTEXT *) c)
- unsigned int i, n;
+ CHILD_CONTEXT *cc = c;
+ int i, n;
if (!s || (n = atoi (s)) == 0)
return 0;
cc->child[cc->num++] = n;
return 0;
-#undef cc
}
int nntp_check_children (CONTEXT * ctx, const char *msgid)
NNTP_DATA *nntp_data = (NNTP_DATA *) ctx->data;
char buf[STRING];
int i, ret = 0, tmp = 0;
- CHILD_CONTEXT cc;
+ CHILD_CONTEXT cc = { ctx, 0, 0, NULL };
if (!nntp_data || !nntp_data->nserv || !nntp_data->nserv->conn ||
!nntp_data->nserv->conn->account.host)
snprintf (buf, sizeof (buf), "XPAT References %d-%d *%s*\r\n",
nntp_data->firstMessage, nntp_data->lastLoaded, msgid);
- cc.ctx = ctx;
- cc.num = 0;
- cc.max = 25;
- cc.child = p_new(unsigned int, 25);
if (mutt_nntp_fetch (nntp_data, buf, NULL, NULL, check_children, &cc, 0)) {
p_delete(&cc.child);
return -1;
}
+
/* dont try to read the xover cache. check_children() already
* made sure that we dont have the article, so we need to visit
* the server. Reading the cache at this point is also bad
}
static int nntp_is_magic (const char* path, struct stat* st) {
- url_scheme_t s = url_check_scheme (NONULL (path));
- return ((s == U_NNTP || s == U_NNTPS) ? M_NNTP : -1);
+ url_scheme_t s = url_check_scheme(NONULL(path));
+ return s == U_NNTP || s == U_NNTPS ? M_NNTP : -1;
}
static int acl_check_nntp (CONTEXT* ctx, int bit) {
projects / apps / madmutt.git / blobdiff