#include <config.h>
#endif
+#include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
+
#include "mutt.h"
#include "mutt_curses.h"
#include "sort.h"
#include "mutt_crypt.h"
-#include "lib/mem.h"
#include "lib/str.h"
-#include "lib/intl.h"
#include "lib/debug.h"
#include <unistd.h>
#include <ctype.h>
#include <stdlib.h>
+#define WANT_LISTGROUP_COMMAND 0
+
static unsigned int _checked = 0;
void nntp_sync_sidebar (NNTP_DATA* data) {
*data->nserv->conn->account.pass ? data->nserv->conn->account.pass : "",
data->nserv->conn->account.host,
data->group);
- debug_print (4, ("group == '%s'\n", buf));
/* bail out if group not found via mailboxes */
if ((i = buffy_lookup (buf)) < 0)
if (str_ncmp ("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 (str_ncmp ("500", buf, 3))
serv->hasLISTGROUP = 1;
+#endif
mutt_socket_write (conn, "XGTITLE +\r\n");
if (mutt_socket_readln (buf, sizeof (buf), conn) < 0)
* -2 - invalid command or execution error,
* -3 - error in funct(*line, *data).
*/
-static int mutt_nntp_fetch (NNTP_DATA * nntp_data, char *query, char *msg,
- int (*funct) (char *, void *), void *data,
- int tagged)
+static int mutt_nntp_fetch (NNTP_DATA * nntp_data, const char *query, char *msg,
+ progress_t* bar, int (*funct) (char *, void *),
+ void *data, int tagged)
{
char buf[LONG_STRING];
char *inbuf, *p;
int done = FALSE;
int chunk, line;
+ long pos = 0;
size_t lenbuf = 0;
int ret;
ret = 0;
line = 0;
- inbuf = mem_malloc (sizeof (buf));
+ inbuf = p_new(char, sizeof(buf));
FOREVER {
chunk = mutt_socket_readln_d (buf, sizeof (buf), nntp_data->nserv->conn,
}
strfcpy (inbuf + lenbuf, p, sizeof (buf));
+ pos += chunk;
if (chunk >= sizeof (buf)) {
lenbuf += str_len (p);
}
else {
- line++;
- if (msg && ReadInc && (line % ReadInc == 0)) {
- if (tagged)
- mutt_message (_("%s (tagged: %d) %d"), msg, tagged, line);
- else
- mutt_message ("%s %d", msg, line);
+ if (bar) {
+ mutt_progress_bar (bar, pos);
+ } else if (msg) {
+ line++;
+ if (ReadInc && (line % ReadInc == 0)) {
+ if (tagged)
+ mutt_message (_("%s (tagged: %d) %d"), msg, tagged, line);
+ else
+ mutt_message ("%s %d", msg, line);
+ }
}
if (ret == 0 && funct (inbuf, data) < 0)
lenbuf = 0;
}
- mem_realloc (&inbuf, lenbuf + sizeof (buf));
+ p_realloc(&inbuf, lenbuf + sizeof (buf));
}
- mem_free (&inbuf);
+ p_delete(&inbuf);
funct (NULL, data);
}
while (!done);
else
snprintf (buf, sizeof (buf), "HEAD %s\r\n", msgid);
- ret = mutt_nntp_fetch (nntp_data, buf, NULL, nntp_read_tempfile, f, 0);
+ ret = mutt_nntp_fetch (nntp_data, buf, NULL, NULL, nntp_read_tempfile, f, 0);
if (ret) {
if (ret != -1)
debug_print (1, ("%s\n", buf));
debug_print (2, ("group: %s, desc: %s\n", line, d));
if ((data = (NNTP_DATA *) hash_find (news->newsgroups, line)) != NULL &&
str_cmp (d, data->desc)) {
- mem_free (&data->desc);
+ p_delete(&data->desc);
data->desc = str_dup (d);
}
return 0;
#undef news
}
-static void nntp_get_desc (NNTP_DATA * data, char *mask, char *msg)
+static void nntp_get_desc (NNTP_DATA * data, const char *mask, char *msg, progress_t* bar)
{
char buf[STRING];
snprintf (buf, sizeof (buf), "XGTITLE %s\r\n", mask);
else
snprintf (buf, sizeof (buf), "LIST NEWSGROUPS %s\r\n", mask);
- if (mutt_nntp_fetch (data, buf, msg, parse_description, data->nserv, 0) !=
+ if (mutt_nntp_fetch (data, buf, msg, bar, parse_description, data->nserv, 0) !=
0) {
#ifdef DEBUG
nntp_error ("nntp_get_desc()", buf);
hdr->received = hdr->date_sent;
break;
case 4:
- mem_free (&hdr->env->message_id);
+ p_delete(&hdr->env->message_id);
hdr->env->message_id = str_dup (b);
break;
case 5:
break;
case 8:
if (!hdr->read)
- mem_free (&hdr->env->xref);
+ p_delete(&hdr->env->xref);
b = b + 6; /* skips the "Xref: " */
hdr->env->xref = str_dup (b);
nntp_parse_xref (ctx, nntp_data->group, b, hdr);
} 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;
return (_nntp_fetch_numbers ((unsigned int) atoi (line), c));
}
+#endif
static int add_xover_line (char *line, void *c)
{
fc.ctx = ctx;
fc.base = first;
fc.last = last;
- fc.messages = mem_calloc (last - first + 1, sizeof (unsigned short));
+ 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, nntp_fetch_numbers, &fc, 0) !=
+ if (mutt_nntp_fetch (nntp_data, buf, NULL, NULL, nntp_fetch_numbers, &fc, 0) !=
0) {
mutt_error (_("LISTGROUP command failed: %s"), buf);
sleep (2);
#ifdef DEBUG
nntp_error ("nntp_fetch_headers()", buf);
#endif
- mem_free (&fc.messages);
+ 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
/* CACHE: must be loaded xover cache here */
num = nntp_data->lastCached - first + 1;
}
num = last - first + 1;
if (num <= 0) {
- mem_free (&fc.messages);
+ p_delete(&fc.messages);
return 0;
}
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, add_xover_line, &fc, 0);
+ 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) {
#ifdef DEBUG
nntp_error ("nntp_fetch_headers()", buf);
#endif
- mem_free (&fc.messages);
+ p_delete(&fc.messages);
return -1;
}
/* fetched OK */
else
mutt_free_header (&h); /* skip it */
if (ret == -1) {
- mem_free (&fc.messages);
+ p_delete(&fc.messages);
return -1;
}
if (current > nntp_data->lastLoaded)
nntp_data->lastLoaded = current;
}
- mem_free (&fc.messages);
+ p_delete(&fc.messages);
nntp_data->lastLoaded = last;
mutt_clear_error ();
return 0;
/* create NNTP-specific state struct if nof found in list */
if ((nntp_data = (NNTP_DATA *) hash_find (serv->newsgroups, buf)) == NULL) {
- nntp_data = mem_calloc (1, sizeof (NNTP_DATA) + str_len (buf) + 1);
+ nntp_data = xmalloc(sizeof(NNTP_DATA) + str_len(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);
mutt_message (_("Selecting %s..."), nntp_data->group);
if (!nntp_data->desc) {
- nntp_get_desc (nntp_data, nntp_data->group, NULL);
+ nntp_get_desc (nntp_data, nntp_data->group, NULL, NULL);
if (nntp_data->desc)
nntp_save_cache_index (serv);
}
char buf[LONG_STRING];
char path[_POSIX_PATH_MAX];
NNTP_CACHE *cache;
- char *m = _("Fetching message...");
int ret;
+ progress_t bar;
/* see if we already have the message in our cache */
cache =
/* clear the previous entry */
unlink (cache->path);
- free (cache->path);
-
- mutt_message (m);
+ p_delete(&cache->path);
cache->index = ctx->hdrs[msgno]->index;
mutt_mktemp (path);
cache->path = str_dup (path);
if (!(msg->fp = safe_fopen (path, "w+"))) {
- mem_free (&cache->path);
+ p_delete(&cache->path);
return -1;
}
snprintf (buf, sizeof (buf), "ARTICLE %d\r\n",
ctx->hdrs[msgno]->article_num);
- ret = mutt_nntp_fetch ((NNTP_DATA *) ctx->data, buf, m, nntp_read_tempfile,
+ bar.msg = _("Fetching message...");
+ bar.size = 0;
+ mutt_progress_bar (&bar, 0);
+
+ ret = mutt_nntp_fetch ((NNTP_DATA *) ctx->data, buf, NULL, &bar, nntp_read_tempfile,
msg->fp, ctx->tagged);
if (ret == 1) {
mutt_error (_("Article %d not found on server"),
if (ret) {
fclose (msg->fp);
unlink (path);
- mem_free (&cache->path);
+ p_delete(&cache->path);
return -1;
}
ctx->hdrs[msgno]->env =
mutt_read_rfc822_header (msg->fp, ctx->hdrs[msgno], 0, 0);
/* fix content length */
- fseek (msg->fp, 0, SEEK_END);
- ctx->hdrs[msgno]->content->length = ftell (msg->fp) -
+ fseeko (msg->fp, 0, SEEK_END);
+ ctx->hdrs[msgno]->content->length = ftello (msg->fp) -
ctx->hdrs[msgno]->content->offset;
/* this is called in mutt before the open which fetches the message,
for (i = 0; i < NNTP_CACHE_LEN; i++) {
if (data->acache[i].path) {
unlink (data->acache[i].path);
- mem_free (&data->acache[i].path);
+ p_delete(&data->acache[i].path);
}
}
}
void nntp_delete_data (void *p)
{
- NNTP_DATA *data = (NNTP_DATA *) p;
+ NNTP_DATA *data = (NNTP_DATA *)p;
if (!p)
return;
- mem_free (&data->entries);
- mem_free (&data->desc);
- mem_free (&data->cache);
+ p_delete(&data->entries);
+ p_delete(&data->desc);
+ p_delete(&data->cache);
nntp_free_acache (data);
- mem_free (p);
+ p_delete(&data);
}
int nntp_sync_mailbox (CONTEXT * ctx, int unused1, int* unused2)
/* active was renumbered? */
if (last < nntp_data->lastLoaded) {
if (!nntp_data->max) {
- nntp_data->entries = mem_calloc (5, sizeof (NEWSRC_ENTRY));
+ nntp_data->entries = p_new(NEWSRC_ENTRY, 5);
nntp_data->max = 5;
}
nntp_data->lastCached = 0;
return 0;
if ((nntp_data = (NNTP_DATA *) hash_find (s->newsgroups, group)) == NULL) {
n++;
- nntp_data = mem_calloc (1, sizeof (NNTP_DATA) + str_len (group) + 1);
+ nntp_data = xmalloc(sizeof(NNTP_DATA) + str_len(group) + 1);
nntp_data->group = (char *) nntp_data + sizeof (NNTP_DATA);
strcpy (nntp_data->group, group);
nntp_data->nserv = s;
else
nntp_data->allowed = 0;
if (nntp_data->desc)
- mem_free (&nntp_data->desc);
+ p_delete(&nntp_data->desc);
if (*desc)
nntp_data->desc = str_dup (desc);
if (nntp_data->rc || nntp_data->lastCached)
else
nntp_data.group = NULL;
l = serv->tail;
- if (mutt_nntp_fetch (&nntp_data, buf, _("Adding new newsgroups..."),
+ if (mutt_nntp_fetch (&nntp_data, buf, _("Adding new newsgroups..."), NULL,
add_group, serv, 0) != 0) {
#ifdef DEBUG
nntp_error ("nntp_check_newgroups()", buf);
l = l->next;
((NNTP_DATA *) l->data)->new = 1;
nntp_get_desc ((NNTP_DATA *) l->data, ((NNTP_DATA *) l->data)->group,
- NULL);
+ NULL, NULL);
}
if (emp.next)
nntp_save_cache_index (serv);
return 0;
}
else {
- mem_free (&serv->cache);
+ p_delete(&serv->cache);
return -1;
}
}
nntp_data.nserv = serv;
nntp_data.group = NULL;
- if (mutt_nntp_fetch (&nntp_data, "LIST\r\n", msg, add_group, serv, 0) < 0) {
+ if (mutt_nntp_fetch (&nntp_data, "LIST\r\n", msg, NULL, add_group, serv, 0) < 0) {
#ifdef DEBUG
nntp_error ("nntp_get_active()", "LIST\r\n");
#endif
strfcpy (msg, _("Loading descriptions..."), sizeof (msg));
mutt_message (msg);
- nntp_get_desc (&nntp_data, "*", msg);
+ nntp_get_desc (&nntp_data, "*", msg, NULL);
for (tmp = serv->list; tmp; tmp = tmp->next) {
NNTP_DATA *data = (NNTP_DATA *) tmp->data;
if (cc->ctx->hdrs[i]->article_num == n)
return 0;
if (cc->num >= cc->max)
- mem_realloc (&cc->child, sizeof (unsigned int) * (cc->max += 25));
+ p_realloc(&cc->child, cc->max += 25);
cc->child[cc->num++] = n;
return 0;
cc.ctx = ctx;
cc.num = 0;
cc.max = 25;
- cc.child = mem_malloc (sizeof (unsigned int) * 25);
- if (mutt_nntp_fetch (nntp_data, buf, NULL, check_children, &cc, 0)) {
- mem_free (&cc.child);
+ 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
}
if (tmp)
set_option (OPTNEWSCACHE);
- mem_free (&cc.child);
+ p_delete(&cc.child);
return ret;
}