static int nntp_get_cache_all (NNTP_SERVER *);
static int nntp_check_newgroups (NNTP_SERVER *, int);
-static void mutt_newsgroup_stat (NNTP_DATA *);
-static void nntp_delete_cache (NNTP_DATA *);
-static void nntp_delete_data (void *p);
+static void mutt_newsgroup_stat (nntp_data_t *);
+static void nntp_delete_cache (nntp_data_t *);
/* newsrc {{{ */
-static void nntp_add_to_list(NNTP_SERVER *s, NNTP_DATA *d)
-{
- *s->tail = p_new(string_list_t, 1);
- (*s->tail)->data = (void *)d;
- s->tail = &(*s->tail)->next;
-}
-
static int nntp_parse_newsrc_line (NNTP_SERVER * news, char *line)
{
- NNTP_DATA *data;
+ nntp_data_t *data;
char group[LONG_STRING];
int x = 1;
- char *p = line, *b, *h;
- ssize_t len;
+ char *p, *b, *h;
- while (*p) {
- if (*p++ == ',')
- x++;
+ for (p = line; p; p = strchr(p, ',')) {
+ x++;
}
- p = line;
- while (*p && (*p != ':' && *p != '!'))
- p++;
- if (!*p)
+ p = strpbrk(line, ":!");
+ if (!p)
return -1;
- len = MIN(p + 1 - line, ssizeof(group));
- m_strcpy(group, len, line);
- if ((data = (NNTP_DATA *) hash_find (news->newsgroups, group)) == NULL) {
- data = xmalloc(sizeof(NNTP_DATA) + m_strlen(group) + 1);
- data->group = (char *) data + sizeof (NNTP_DATA);
+
+ m_strncpy(group, ssizeof(group), line, p - line);
+ if ((data = (nntp_data_t *) hash_find (news->newsgroups, group)) == NULL) {
+ data = xmalloc(sizeof(nntp_data_t) + m_strlen(group) + 1);
+ data->group = (char *) data + sizeof (nntp_data_t);
strcpy (data->group, group);
data->nserv = news;
data->deleted = 1;
if (news->newsgroups->nelem < news->newsgroups->curnelem * 2)
hash_resize (news->newsgroups, news->newsgroups->nelem * 2);
hash_insert (news->newsgroups, data->group, data);
- nntp_add_to_list (news, data);
- }
- else
+ nntp_data_list_append(&news->list, data);
+ } else {
p_delete(&data->entries);
+ }
data->rc = 1;
data->entries = p_new(NEWSRC_ENTRY, x * 2);
data->max = x * 2;
- if (*p == ':')
- data->subscribed = 1;
- else
- data->subscribed = 0;
+ data->subscribed = (*p++ == ':');
- p++;
b = p;
x = 0;
while (*b) {
char buf[HUGE_STRING], *cp;
char dir[_POSIX_PATH_MAX], file[_POSIX_PATH_MAX];
FILE *idx;
- NNTP_DATA *data;
+ nntp_data_t *data;
int l, m, t;
/* check is server name defined or not */
news->newgroups_time = m;
}
else if (news->newsgroups) {
- if ((data = (NNTP_DATA *) hash_find (news->newsgroups, buf)) == NULL) {
- data = xmalloc(sizeof(NNTP_DATA) + m_strlen(buf) + 1);
- data->group = (char *) data + sizeof (NNTP_DATA);
+ if ((data = (nntp_data_t *) hash_find (news->newsgroups, buf)) == NULL) {
+ data = xmalloc(sizeof(nntp_data_t) + m_strlen(buf) + 1);
+ data->group = (char *) data + sizeof (nntp_data_t);
strcpy (data->group, buf);
data->nserv = news;
data->deleted = 1;
if (news->newsgroups->nelem < news->newsgroups->curnelem * 2)
hash_resize (news->newsgroups, news->newsgroups->nelem * 2);
hash_insert (news->newsgroups, data->group, data);
- nntp_add_to_list (news, data);
+ nntp_data_list_append(&news->list, data);
}
data->cache = m_strdup(file);
t = 0;
{
char file[_POSIX_PATH_MAX];
char *buf, *p;
- string_list_t *list;
+ nntp_data_t *list;
ACCOUNT act;
NNTP_SERVER *serv;
CONNECTION *conn;
struct stat sb;
/* externally modified? */
- if (serv->stat != stat (file, &sb) || (!serv->stat &&
+ if (serv->stat != stat(file, &sb) || (!serv->stat &&
(serv->size != sb.st_size
- || serv->mtime != sb.st_mtime))) {
+ || serv->mtime != sb.st_mtime)))
+ {
for (list = serv->list; list; list = list->next) {
- NNTP_DATA *data = (NNTP_DATA *) list->data;
-
- if (data) {
- data->subscribed = 0;
- data->rc = 0;
- data->num = 0;
- }
+ list->subscribed = 0;
+ list->rc = 0;
+ list->num = 0;
}
slurp_newsrc (serv);
nntp_clear_cacheindex (serv);
/* New newsserver */
serv = p_new(NNTP_SERVER, 1);
- serv->tail = &serv->list;
serv->conn = conn;
serv->newsrc = m_strdup(file);
serv->newsgroups = hash_new(1009, false);
if (option (OPTNEWSCACHE) && serv->cache && nntp_get_cache_all (serv) >= 0)
nntp_check_newgroups (serv, 1);
else if (nntp_get_active (serv) < 0) {
- hash_delete (&serv->newsgroups, nntp_delete_data);
- for (list = serv->list; list; list = list->next)
- list->data = NULL;
- string_list_wipe(&serv->list);
+ hash_delete(&serv->newsgroups, NULL);
+ nntp_data_list_wipe(&serv->list);
p_delete(&serv->newsrc);
p_delete(&serv->cache);
p_delete(&serv);
*/
static void nntp_get_status(CONTEXT *ctx, HEADER *h, char *group, int article)
{
- NNTP_DATA *data = (NNTP_DATA *) ctx->data;
+ nntp_data_t *data = (nntp_data_t *) ctx->data;
int x;
if (group)
- data = (NNTP_DATA *) hash_find (data->nserv->newsgroups, group);
+ data = (nntp_data_t *) hash_find (data->nserv->newsgroups, group);
if (!data) {
return;
h->old = 1;
}
-static void mutt_newsgroup_stat (NNTP_DATA * data)
+static void mutt_newsgroup_stat (nntp_data_t * data)
{
int i, first, last;
return num;
}
-static void nntp_create_newsrc_line (NNTP_DATA * data, char **buf,
+static void nntp_create_newsrc_line (nntp_data_t * data, char **buf,
char **pline, ssize_t * buflen)
{
char *line = *pline;
static void newsrc_gen_entries (CONTEXT * ctx)
{
- NNTP_DATA *data = (NNTP_DATA *) ctx->data;
+ nntp_data_t *data = (nntp_data_t *) ctx->data;
int series, x;
int last = 0, first = 1;
int save_sort = SORT_ORDER;
int mutt_newsrc_update (NNTP_SERVER * news)
{
char *buf, *line;
- NNTP_DATA *data;
- string_list_t *tmp;
+ nntp_data_t *data;
int r = -1;
ssize_t len, llen;
llen = len = 10 * LONG_STRING;
line = buf = p_new(char, len);
/* we will generate full newsrc here */
- for (tmp = news->list; tmp; tmp = tmp->next) {
- data = (NNTP_DATA *) tmp->data;
+ for (data = news->list; data; data = data->next) {
if (!data || !data->rc)
continue;
nntp_create_newsrc_line (data, &buf, &line, &llen);
}
/* Updates info into .index file: ALL or about selected newsgroup */
-static int nntp_update_cacheindex (NNTP_SERVER * serv, NNTP_DATA * data)
+static int nntp_update_cacheindex (NNTP_SERVER * serv, nntp_data_t * data)
{
char buf[LONG_STRING];
char file[_POSIX_PATH_MAX];
/* Remove cache files of unsubscribed newsgroups */
void nntp_clear_cacheindex (NNTP_SERVER * news)
{
- NNTP_DATA *data;
- string_list_t *tmp;
+ nntp_data_t *data;
if (option (OPTSAVEUNSUB) || !news)
return;
- for (tmp = news->list; tmp; tmp = tmp->next) {
- data = (NNTP_DATA *) tmp->data;
+ for (data = news->list; data; data = data->next) {
if (!data || data->subscribed || !data->cache)
continue;
nntp_delete_cache (data);
{
char buf[HUGE_STRING];
char file[_POSIX_PATH_MAX];
- NNTP_DATA *d;
+ nntp_data_t *d;
FILE *f;
- string_list_t *l;
if (!news || !news->newsgroups)
return -1;
if (!f)
return -1;
- for (l = news->list; l; l = l->next) {
- if ((d = (NNTP_DATA *) l->data) && !d->deleted) {
+ for (d = news->list; d; d = d->next) {
+ if (!d->deleted) {
if (d->desc)
snprintf (buf, sizeof (buf), "%s %d %d %c %s\n", d->group,
d->lastMessage, d->firstMessage, d->allowed ? 'y' : 'n',
if (!ctx || !ctx->data || ctx->magic != M_NNTP)
return -1;
- if (((NNTP_DATA *) ctx->data)->cache) {
- nntp_cache_expand (file, ((NNTP_DATA *) ctx->data)->cache);
+ if (((nntp_data_t *) ctx->data)->cache) {
+ nntp_cache_expand (file, ((nntp_data_t *) ctx->data)->cache);
unlink (file);
f = safe_fopen (file, "w");
}
else {
snprintf (buf, sizeof (buf), "%s-%s",
- ((NNTP_DATA *) ctx->data)->nserv->conn->account.host,
- ((NNTP_DATA *) ctx->data)->group);
+ ((nntp_data_t *) ctx->data)->nserv->conn->account.host,
+ ((nntp_data_t *) ctx->data)->group);
f = mutt_mkname (buf);
- ((NNTP_DATA *) ctx->data)->cache = m_strdup(buf);
+ ((nntp_data_t *) ctx->data)->cache = m_strdup(buf);
nntp_cache_expand (file, buf);
}
if (!f)
}
/* Save only $nntp_context messages... */
- ((NNTP_DATA *) ctx->data)->lastCached = 0;
+ ((nntp_data_t *) ctx->data)->lastCached = 0;
if (NntpContext && ctx->msgcount > NntpContext)
i = ctx->msgcount - NntpContext;
for (; i < ctx->msgcount; i++) {
}
m_fclose(&f);
- if (nntp_update_cacheindex (((NNTP_DATA *) ctx->data)->nserv,
- (NNTP_DATA *) ctx->data)) {
+ if (nntp_update_cacheindex (((nntp_data_t *) ctx->data)->nserv,
+ (nntp_data_t *) ctx->data)) {
unlink (file);
return -1;
}
- ((NNTP_DATA *) ctx->data)->lastCached =
- ((NNTP_DATA *) ctx->data)->lastLoaded;
+ ((nntp_data_t *) ctx->data)->lastCached =
+ ((nntp_data_t *) ctx->data)->lastLoaded;
return 0;
}
-static void nntp_delete_cache (NNTP_DATA * data)
+static void nntp_delete_cache (nntp_data_t * data)
{
char buf[_POSIX_PATH_MAX];
NULL);
}
-NNTP_DATA *mutt_newsgroup_subscribe (NNTP_SERVER * news, char *group)
+nntp_data_t *mutt_newsgroup_subscribe (NNTP_SERVER * news, char *group)
{
- NNTP_DATA *data;
+ nntp_data_t *data;
if (!news || !news->newsgroups || !group || !*group)
return NULL;
- if (!(data = (NNTP_DATA *) hash_find (news->newsgroups, group))) {
- data = xmalloc(sizeof(NNTP_DATA) + m_strlen(group) + 1);
- data->group = (char *) data + sizeof (NNTP_DATA);
+ if (!(data = (nntp_data_t *) hash_find (news->newsgroups, group))) {
+ data = xmalloc(sizeof(nntp_data_t) + m_strlen(group) + 1);
+ data->group = (char *) data + sizeof (nntp_data_t);
strcpy (data->group, group);
data->nserv = news;
data->deleted = 1;
if (news->newsgroups->nelem < news->newsgroups->curnelem * 2)
hash_resize (news->newsgroups, news->newsgroups->nelem * 2);
hash_insert (news->newsgroups, data->group, data);
- nntp_add_to_list (news, data);
+ nntp_data_list_append(&news->list, data);
}
if (!data->subscribed) {
data->subscribed = 1;
return data;
}
-NNTP_DATA *mutt_newsgroup_unsubscribe (NNTP_SERVER * news, char *group)
+nntp_data_t *mutt_newsgroup_unsubscribe (NNTP_SERVER * news, char *group)
{
- NNTP_DATA *data;
+ nntp_data_t *data;
if (!news || !news->newsgroups || !group || !*group ||
- !(data = (NNTP_DATA *) hash_find (news->newsgroups, group)))
+ !(data = (nntp_data_t *) hash_find (news->newsgroups, group)))
return NULL;
if (data->subscribed) {
data->subscribed = 0;
return data;
}
-NNTP_DATA *mutt_newsgroup_catchup (NNTP_SERVER * news, char *group)
+nntp_data_t *mutt_newsgroup_catchup (NNTP_SERVER * news, char *group)
{
- NNTP_DATA *data;
+ nntp_data_t *data;
if (!news || !news->newsgroups || !group || !*group ||
- !(data = (NNTP_DATA *) hash_find (news->newsgroups, group)))
+ !(data = (nntp_data_t *) hash_find (news->newsgroups, group)))
return NULL;
if (!data->max) {
data->entries = p_new(NEWSRC_ENTRY, 5);
return data;
}
-NNTP_DATA *mutt_newsgroup_uncatchup (NNTP_SERVER * news, char *group)
+nntp_data_t *mutt_newsgroup_uncatchup (NNTP_SERVER * news, char *group)
{
- NNTP_DATA *data;
+ nntp_data_t *data;
if (!news || !news->newsgroups || !group || !*group ||
- !(data = (NNTP_DATA *) hash_find (news->newsgroups, group)))
+ !(data = (nntp_data_t *) hash_find (news->newsgroups, group)))
return NULL;
if (!data->max) {
data->entries = p_new(NEWSRC_ENTRY, 5);
/* this routine gives the first newsgroup with new messages */
void nntp_buffy (char* dst, ssize_t dstlen) {
- string_list_t *list;
+ nntp_data_t *list;
int count = 0;
/* forward to current group */
for (list = CurrentNewsSrv->list; list; list = list->next) {
- NNTP_DATA *data = (NNTP_DATA *) list->data;
- if (data && data->subscribed && data->unread &&
- Context && Context->magic == M_NNTP &&
- m_strcmp(data->group, ((NNTP_DATA *) Context->data)->group) == 0) {
+ if (list->subscribed && list->unread
+ && Context && Context->magic == M_NNTP
+ && m_strcmp(list->group, ((nntp_data_t *)Context->data)->group) == 0)
+ {
list = list->next;
break;
}
list = CurrentNewsSrv->list;
for (; list; list = list->next) {
- NNTP_DATA *data = (NNTP_DATA *) list->data;
-
- if (data && data->subscribed && data->unread) {
+ if (list->subscribed && list->unread) {
if (Context && Context->magic == M_NNTP &&
- !m_strcmp(data->group, ((NNTP_DATA *) Context->data)->group)) {
+ !m_strcmp(list->group, ((nntp_data_t *)Context->data)->group)) {
int i, unread = 0;
for (i = 0; i < Context->msgcount; i++)
if (!unread)
continue;
}
- m_strcpy(dst, dstlen, data->group);
+ m_strcpy(dst, dstlen, list->group);
break;
}
}
static unsigned int _checked = 0;
-void nntp_sync_sidebar (NNTP_DATA* data) {
+void nntp_sync_sidebar (nntp_data_t* data) {
int i = 0;
BUFFY* tmp = NULL;
char buf[STRING];
}
/* Send data from line[LONG_STRING] and receive answer to same line */
-static int mutt_nntp_query (NNTP_DATA * data, char *line, size_t linelen)
+static int mutt_nntp_query (nntp_data_t * data, char *line, size_t linelen)
{
char buf[LONG_STRING];
int done = TRUE;
* -2 - invalid command or execution error,
* -3 - error in funct(*line, *data).
*/
-static int mutt_nntp_fetch (NNTP_DATA * nntp_data, const char *query,
+static int mutt_nntp_fetch (nntp_data_t * nntp_data, const char *query,
const char *msg, progress_t* bar,
int (*funct) (char *, void *),
void *data, int tagged)
static int nntp_read_header (CONTEXT * ctx, const char *msgid,
int article_num)
{
- NNTP_DATA *nntp_data = ((NNTP_DATA *) ctx->data);
+ nntp_data_t *nntp_data = ((nntp_data_t *) ctx->data);
FILE *f;
char buf[LONG_STRING];
char tempfile[_POSIX_PATH_MAX];
static int parse_description (char *line, void *n)
{
register char *d = line;
- NNTP_DATA *data;
+ nntp_data_t *data;
NNTP_SERVER *news = n;
if (!line)
d++;
while (*d && (*d == '\t' || *d == ' '))
d++;
- if ((data = (NNTP_DATA *) hash_find (news->newsgroups, line)) != NULL &&
+ if ((data = (nntp_data_t *) hash_find (news->newsgroups, line)) != NULL &&
m_strcmp(d, data->desc)) {
p_delete(&data->desc);
data->desc = m_strdup(d);
return 0;
}
-static void nntp_get_desc (NNTP_DATA * data, const char *mask, char *msg, progress_t* bar)
+static void nntp_get_desc (nntp_data_t * data, const char *mask, char *msg, progress_t* bar)
{
char buf[STRING];
*/
static int nntp_parse_xover (CONTEXT * ctx, char *buf, HEADER * hdr)
{
- NNTP_DATA *nntp_data = (NNTP_DATA *) ctx->data;
+ nntp_data_t *nntp_data = (nntp_data_t *) ctx->data;
char *p, *b;
int x, done = 0;
int num, total;
FETCH_CONTEXT *fc = c;
CONTEXT *ctx = fc->ctx;
- NNTP_DATA *data = (NNTP_DATA *) ctx->data;
+ nntp_data_t *data = (nntp_data_t *) ctx->data;
if (!line)
return 0;
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);
+ nntp_data_t *nntp_data = ((nntp_data_t *) ctx->data);
int ret, num, oldmsgcount, current;
FILE *f;
FETCH_CONTEXT fc;
*/
static int nntp_open_mailbox (CONTEXT * ctx)
{
- NNTP_DATA *nntp_data;
+ nntp_data_t *nntp_data;
NNTP_SERVER *serv;
char buf[HUGE_STRING];
char server[LONG_STRING];
CurrentNewsSrv = serv;
/* create NNTP-specific state struct if nof found in list */
- if ((nntp_data = (NNTP_DATA *) hash_find (serv->newsgroups, buf)) == NULL) {
- nntp_data = xmalloc(sizeof(NNTP_DATA) + m_strlen(buf) + 1);
- nntp_data->group = (char *) nntp_data + sizeof (NNTP_DATA);
+ if ((nntp_data = (nntp_data_t *) hash_find (serv->newsgroups, buf)) == NULL) {
+ nntp_data = xmalloc(sizeof(nntp_data_t) + m_strlen(buf) + 1);
+ nntp_data->group = (char *) nntp_data + sizeof (nntp_data_t);
strcpy (nntp_data->group, buf);
hash_insert (serv->newsgroups, nntp_data->group, nntp_data);
- nntp_add_to_list (serv, nntp_data);
+ nntp_data_list_append(&serv->list, nntp_data);
}
ctx->data = nntp_data;
nntp_data->nserv = serv;
}
if (m_strncmp("211", buf, 3)) {
- string_list_t *l = serv->list;
+ nntp_data_t **l;
/* GROUP command failed */
if (!m_strncmp("411", buf, 3)) {
/* CACHE: delete cache and line from .index */
nntp_delete_cache (nntp_data);
- hash_remove (serv->newsgroups, nntp_data->group, NULL,
- nntp_delete_data);
- while (l && l->data != (void *) nntp_data)
- l = l->next;
- if (l)
- l->data = NULL;
-
+ hash_remove(serv->newsgroups, nntp_data->group, NULL, NULL);
+ for (l = &serv->list; *l; l = &(*l)->next) {
+ if ((*l) == nntp_data) {
+ nntp_data_list_pop(l);
+ nntp_data_delete(&nntp_data);
+ break;
+ }
+ }
+ nntp_data_delete(&nntp_data);
sleep (2);
}
/* see if we already have the message in our cache */
cache =
- &((NNTP_DATA *) ctx->data)->acache[ctx->hdrs[msgno]->index %
+ &((nntp_data_t *) ctx->data)->acache[ctx->hdrs[msgno]->index %
NNTP_CACHE_LEN];
/* if everything is fine, assign msg->fp and return */
bar.size = 0;
mutt_progress_bar (&bar, 0);
- ret = mutt_nntp_fetch ((NNTP_DATA *) ctx->data, buf, NULL, &bar, nntp_read_tempfile,
+ ret = mutt_nntp_fetch ((nntp_data_t *) ctx->data, buf, NULL, &bar, nntp_read_tempfile,
msg->fp, ctx->tagged);
if (ret == 1) {
mutt_error (_("Article %d not found on server"),
char buf[LONG_STRING];
size_t len;
FILE *f;
- NNTP_DATA *nntp_data;
+ nntp_data_t *nntp_data;
if (Context && Context->magic == M_NNTP)
- nntp_data = (NNTP_DATA *) Context->data;
+ nntp_data = (nntp_data_t *)Context->data;
else {
- if (!(CurrentNewsSrv = mutt_select_newsserver (NewsServer)) ||
- !CurrentNewsSrv->list || !CurrentNewsSrv->list->data) {
+ if (!(CurrentNewsSrv = mutt_select_newsserver(NewsServer)) ||
+ !CurrentNewsSrv->list)
+ {
mutt_error (_("Can't post article. No connection to news server."));
return -1;
}
- nntp_data = (NNTP_DATA *) CurrentNewsSrv->list->data;
+ nntp_data = CurrentNewsSrv->list;
}
if (!(f = safe_fopen (msg, "r"))) {
}
}
-static void nntp_free_acache (NNTP_DATA * data)
+static void nntp_free_acache (nntp_data_t * data)
{
int i;
}
}
-static void nntp_delete_data (void *p)
+void nntp_data_wipe(nntp_data_t *data)
{
- NNTP_DATA *data = (NNTP_DATA *)p;
-
- if (!p)
- return;
- p_delete(&data->entries);
- p_delete(&data->desc);
- p_delete(&data->cache);
- nntp_free_acache (data);
- p_delete(&data);
+ p_delete(&data->entries);
+ p_delete(&data->desc);
+ p_delete(&data->cache);
+ nntp_free_acache(data);
}
static int nntp_sync_mailbox (CONTEXT * ctx, int unused1, int* unused2)
{
- NNTP_DATA *data = ctx->data;
+ nntp_data_t *data = ctx->data;
/* CACHE: update cache and .index files */
if ((option (OPTSAVEUNSUB) || data->subscribed))
static void nntp_fastclose_mailbox (CONTEXT * ctx)
{
- NNTP_DATA *data = (NNTP_DATA *) ctx->data, *tmp;
+ nntp_data_t *data = (nntp_data_t *) ctx->data, *tmp;
if (!data)
return;
nntp_save_cache_index (data->nserv);
if ((tmp = hash_find (data->nserv->newsgroups, data->group)) == NULL
|| tmp != data)
- nntp_delete_data (data);
+ nntp_data_delete(&data);
else
nntp_sync_sidebar (data);
}
mutt_message _("Quitting newsgroup...");
if (ctx->data) {
- NNTP_DATA *data = (NNTP_DATA *) ctx->data;
+ nntp_data_t *data = (nntp_data_t *) ctx->data;
int ret;
if (data->nserv && data->nserv->conn && ctx->unread) {
}
}
nntp_sync_mailbox (ctx, 0, NULL);
- if (ctx->data && ((NNTP_DATA *) ctx->data)->nserv) {
+ if (ctx->data && ((nntp_data_t *) ctx->data)->nserv) {
NNTP_SERVER *news;
- news = ((NNTP_DATA *) ctx->data)->nserv;
+ news = ((nntp_data_t *) ctx->data)->nserv;
newsrc_gen_entries (ctx);
- ((NNTP_DATA *) ctx->data)->unread = ctx->unread;
+ ((nntp_data_t *) ctx->data)->unread = ctx->unread;
mutt_newsrc_update (news);
}
mutt_clear_error ();
}
/* use the GROUP command to poll for new mail */
-static int _nntp_check_mailbox (CONTEXT * ctx, NNTP_DATA * nntp_data)
+static int _nntp_check_mailbox (CONTEXT * ctx, nntp_data_t * nntp_data)
{
char buf[LONG_STRING];
int count = 0;
static int nntp_check_mailbox (CONTEXT * ctx, int* unused1, int unused2)
{
- return _nntp_check_mailbox (ctx, (NNTP_DATA *) ctx->data);
+ return _nntp_check_mailbox (ctx, (nntp_data_t *) ctx->data);
}
static int add_group (char *buf, void *serv)
NNTP_SERVER *s = serv;
char group[LONG_STRING], mod, desc[HUGE_STRING];
int first, last;
- NNTP_DATA *nntp_data;
+ nntp_data_t *nntp_data;
static int n = 0;
_checked = n; /* _checked have N, where N = number of groups */
sscanf (buf, "%s %d %d %c %[^\n]", group, &last, &first, &mod, desc);
if (!group)
return 0;
- if ((nntp_data = (NNTP_DATA *) hash_find (s->newsgroups, group)) == NULL) {
+ if ((nntp_data = (nntp_data_t *) hash_find (s->newsgroups, group)) == NULL) {
n++;
- nntp_data = xmalloc(sizeof(NNTP_DATA) + m_strlen(group) + 1);
- nntp_data->group = (char *) nntp_data + sizeof (NNTP_DATA);
+ nntp_data = xmalloc(sizeof(nntp_data_t) + m_strlen(group) + 1);
+ nntp_data->group = (char *) nntp_data + sizeof (nntp_data_t);
strcpy (nntp_data->group, group);
nntp_data->nserv = s;
if (s->newsgroups->nelem < s->newsgroups->curnelem * 2)
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_list_append(&s->list, nntp_data);
}
nntp_data->deleted = 0;
nntp_data->firstMessage = first;
static int nntp_check_newgroups (NNTP_SERVER * serv, int force)
{
char buf[LONG_STRING];
- NNTP_DATA nntp_data;
- string_list_t *l, **emp;
+ nntp_data_t nntp_data;
+ nntp_data_t *l, **emp;
time_t now;
struct tm *t;
for (l = serv->list; l; l = l->next) {
serv->check_time = 0; /* really check! */
- if (l->data && ((NNTP_DATA *) l->data)->subscribed)
- _nntp_check_mailbox (NULL, (NNTP_DATA *) l->data);
+ if (l->subscribed)
+ _nntp_check_mailbox (NULL, l);
}
sidebar_draw ();
}
t->tm_min, t->tm_sec);
nntp_data.nserv = serv;
if (Context && Context->magic == M_NNTP)
- nntp_data.group = ((NNTP_DATA *) Context->data)->group;
+ nntp_data.group = ((nntp_data_t *) Context->data)->group;
else
nntp_data.group = NULL;
- emp = serv->tail;
+ emp = nntp_data_list_last(&serv->list);
if (mutt_nntp_fetch (&nntp_data, buf, _("Adding new newsgroups..."), NULL,
add_group, serv, 0) != 0) {
return -1;
mutt_message _("Loading descriptions...");
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);
+ l->new = 1;
+ nntp_get_desc(l, l->group, NULL, NULL);
}
if (*emp)
nntp_save_cache_index(serv);
int nntp_get_active (NNTP_SERVER * serv)
{
char msg[STRING];
- NNTP_DATA nntp_data;
- string_list_t *tmp;
+ nntp_data_t nntp_data, **tmp = &serv->list;
if (nntp_open_connection (serv) < 0)
return -1;
mutt_message (msg);
nntp_get_desc (&nntp_data, "*", msg, NULL);
- for (tmp = serv->list; tmp; tmp = tmp->next) {
- NNTP_DATA *data = (NNTP_DATA *) tmp->data;
-
- if (data && data->deleted && !data->rc) {
- nntp_delete_cache (data);
- hash_remove (serv->newsgroups, data->group, NULL, nntp_delete_data);
- tmp->data = NULL;
+ while (*tmp) {
+ if ((*tmp)->deleted && !(*tmp)->rc) {
+ nntp_data_t *d = nntp_data_list_pop(tmp);
+ nntp_delete_cache(d);
+ hash_remove(serv->newsgroups, d->group, NULL, NULL);
+ nntp_data_delete(&d);
+ } else {
+ tmp = &(*tmp)->next;
}
}
nntp_save_cache_index (serv);
int nntp_check_children (CONTEXT * ctx, const char *msgid)
{
- NNTP_DATA *nntp_data = (NNTP_DATA *) ctx->data;
+ nntp_data_t *nntp_data = (nntp_data_t *) ctx->data;
char buf[STRING];
int i, ret = 0, tmp = 0;
CHILD_CONTEXT cc = { ctx, 0, 0, NULL };
projects / apps / madmutt.git / blobdiff