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.has_ssl ? "s" : "",
NONULL(data->nserv->conn->account.user),
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);
} while (!(buf[0] == '.' && buf[1] == '\0'));
}
+ serv->feat_known = 1;
return 0;
}
typedef struct {
CONTEXT *ctx;
- unsigned int base;
- unsigned int first;
- unsigned int last;
- unsigned short *messages;
- char *msg;
+ int base;
+ int first;
+ int last;
+ char *messages;
+ const char *msg;
} FETCH_CONTEXT;
static int nntp_fetch_numbers (char *line, void *c)
{
- unsigned int num;
+ int num;
FETCH_CONTEXT *fc = c;
if (!line)
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;
#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];
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;
fc.ctx = ctx;
fc.base = first;
fc.last = last;
- fc.messages = p_new(unsigned short, last - first + 1);
+ fc.messages = p_new(char, last - first + 1);
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) {
+ if (mutt_nntp_fetch(nntp_data, buf, NULL, NULL,
+ nntp_fetch_numbers, &fc, 0))
+ {
mutt_error (_("LISTGROUP command failed: %s"), buf);
sleep (2);
p_delete(&fc.messages);
fc.messages[num] = 1;
}
- /* 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);
- }
- 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;
+/* 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);
}
+ 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
- */
- mutt_message (msg);
- if (nntp_data->nserv->hasXOVER) {
- oldmsgcount = ctx->msgcount;
- fc.first = first;
- fc.last = last;
- fc.msg = msg;
- snprintf (buf, sizeof (buf), "XOVER %d-%d\r\n", first, last);
- ret = mutt_nntp_fetch (nntp_data, buf, NULL, NULL, add_xover_line, &fc, 0);
- if (ctx->msgcount > oldmsgcount)
- 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
- for (current = first; current <= last; current++) {
- HEADER *h;
+/*
+* 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;
+fc.first = first;
+fc.last = last;
+fc.msg = msg;
+snprintf (buf, sizeof (buf), "XOVER %d-%d\r\n", first, last);
+ret = mutt_nntp_fetch (nntp_data, buf, NULL, NULL, add_xover_line, &fc, 0);
+if (ctx->msgcount > oldmsgcount)
+ 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
+for (current = first; current <= last; current++) {
+ HEADER *h;
- ret = current - first + 1;
- mutt_message ("%s %d/%d", msg, ret, num);
+ ret = current - first + 1;
+ mutt_message ("%s %d/%d", msg, ret, num);
- if (!fc.messages[current - fc.base])
+ if (!fc.messages[current - fc.base])
continue;
if (ctx->msgcount >= ctx->hdrmax)
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);
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)
cc.ctx = ctx;
cc.num = 0;
cc.max = 25;
- cc.child = p_new(unsigned int, 25);
+ cc.child = p_new(int, 25);
if (mutt_nntp_fetch (nntp_data, buf, NULL, NULL, check_children, &cc, 0)) {
p_delete(&cc.child);
return -1;