#define NNTP_PORT 119
#define NNTP_SSL_PORT 563
-static unsigned int _checked = 0;
+static struct {
+ unsigned use_cache : 1;
+
+ int checked;
+} nntp = { true, 0 };
static int nntp_check_newgroups (nntp_server_t *, int);
}
}
-static int nntp_parse_newsrc_line(nntp_server_t * news, const char *line)
+static int nntp_parse_newsrc_line(nntp_server_t *news, const char *line)
{
nntp_data_t *data;
char group[LONG_STRING];
data->group = p_dupstr(line, p - line);
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_data_list_append(&news->list, data);
+ news->tail = nntp_data_list_append(news->tail, data);
} else {
p_delete(&data->entries);
}
data->entries = p_new(NEWSRC_ENTRY, x * 2);
data->max = x * 2;
data->subscribed = (*p++ == ':');
+ p = skipspaces(p);
for (x = 0; *p; p++) {
- p = skipspaces(p);
data->entries[x].first = strtol(p, (char **)&p, 10);
- p = skipspaces(p);
+ p += strcspn(p, "-,");
if (*p == '-') {
+ if (!*p)
+ break;
data->entries[x].last = strtol(p + 1, (char **)&p, 10);
} else {
data->entries[x].last = data->entries[x].first;
+ p = strchrnul(p, ',');
}
-
- p = strchrnul(p, ',');
x += data->entries[x].last != 0;
}
}
#define nntp_cache_expand(dst, dlen, fmt, ...) \
- do { \
- snprintf((dst), (dlen), "%s/" fmt, NewsCacheDir, ##__VA_ARGS__); \
- mutt_expand_path((dst), (dlen)); \
+ do { \
+ snprintf((dst), (dlen), "%s/" fmt, mod_core.cachedir, ##__VA_ARGS__);\
+ mutt_expand_path((dst), (dlen)); \
} while (0)
/* Loads $news_cache_dir/.index into memory, loads newsserver data
* and newsgroup cache names */
static int nntp_parse_cacheindex(nntp_server_t *news)
{
- struct stat st;
- char buf[HUGE_STRING], *cp;
- char dir[_POSIX_PATH_MAX], file[_POSIX_PATH_MAX];
- FILE *idx;
- nntp_data_t *data;
- int l, m, t;
+ char buf[HUGE_STRING];
+ FILE *idx;
+
+ p_delete(&news->cache);
+ if (m_strisempty(mod_core.cachedir))
+ return 0;
+
+ nntp_cache_expand(buf, sizeof(buf), "%s.index", news->conn->account.host);
+ if (!(idx = safe_fopen(buf, "a+")))
+ return 0;
+ rewind(idx);
+
+ while (fgets(buf, sizeof(buf), idx)) {
+ buf[m_strlen(buf) - 1] = 0; /* strip ending '\n' */
+ if (!m_strncmp(buf, "#: ", 3)
+ && !m_strcasecmp(buf + 3, news->conn->account.host)) {
+ break;
+ }
+ }
- unset_option (OPTNEWSCACHE);
- if (m_strisempty(NewsCacheDir))
- return 0;
+ while (fgets(buf, sizeof(buf), idx)) {
+ char *p, *q;
+ int l, m, t;
- m_strcpy(dir, sizeof(dir), NewsCacheDir);
- mutt_expand_path(dir, sizeof(dir));
+ if (m_strstart(buf, "#:", NULL))
+ break;
- if (lstat (dir, &st) || (st.st_mode & S_IFDIR) == 0) {
- snprintf(buf, sizeof(buf), _("Directory %s not exist. Create it?"), dir);
- if (mutt_yesorno (buf, M_YES) != M_YES
- || mkdir (dir, (S_IRWXU + S_IRWXG + S_IRWXO))) {
- mutt_error _("Cache directory not created!");
+ p = strchrnul(buf, ' ');
+ if (!*p)
+ continue;
+ *p++ = '\0';
+ p = vskipspaces(p);
+ q = strchrnul(p, ' ');
+ if (!*q)
+ continue;
+ *q++ = '\0';
+ l = strtol(q, &q, 10);
+ m = strtol(q, &q, 10);
- return -1;
- }
- mutt_clear_error ();
- }
+ if (!m_strcmp(buf, "ALL")) {
+ m_strreplace(&news->cache, m_strdup(p));
+ news->newgroups_time = m;
+ continue;
+ }
- set_option (OPTNEWSCACHE);
+ if (news->newsgroups) {
+ nntp_data_t *data = hash_find(news->newsgroups, buf);
+
+ if (!data) {
+ data = nntp_data_new();
+ data->group = m_strdup(buf);
+ data->nserv = news;
+ data->deleted = 1;
+ hash_insert (news->newsgroups, data->group, data);
+ news->tail = nntp_data_list_append(news->tail, data);
+ }
+ m_strreplace(&data->cache, p);
+
+ t = !data->firstMessage || data->lastMessage < m;
+ if (!data->firstMessage)
+ data->firstMessage = l;
+ if (data->lastMessage < m)
+ data->lastMessage = m;
+ data->lastCached = m;
+ if (t || !data->unread)
+ mutt_newsgroup_stat(data);
+ }
+ }
- p_delete(&news->cache);
- snprintf(buf, sizeof (buf), "%s/%s.index", dir, news->conn->account.host);
- if (!(idx = safe_fopen (buf, "a+")))
+ m_fclose(&idx);
return 0;
- rewind (idx);
- while (fgets (buf, sizeof (buf), idx)) {
- buf[m_strlen(buf) - 1] = 0; /* strip ending '\n' */
- if (!m_strncmp(buf, "#: ", 3) &&
- !m_strcasecmp(buf + 3, news->conn->account.host))
- break;
- }
- while (fgets (buf, sizeof (buf), idx)) {
- cp = buf;
- while (*cp && *cp != ' ')
- cp++;
- if (!*cp)
- continue;
- cp[0] = 0;
- if (!m_strcmp(buf, "#:"))
- break;
- sscanf (cp + 1, "%s %d %d", file, &l, &m);
- if (!m_strcmp(buf, "ALL")) {
- news->cache = m_strdup(file);
- news->newgroups_time = m;
- }
- else if (news->newsgroups) {
- if ((data = hash_find (news->newsgroups, buf)) == NULL) {
- data = nntp_data_new();
- data->group = m_strdup(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_data_list_append(&news->list, data);
- }
- data->cache = m_strdup(file);
- t = 0;
- if (!data->firstMessage || data->lastMessage < m)
- t = 1;
- if (!data->firstMessage)
- data->firstMessage = l;
- if (data->lastMessage < m)
- data->lastMessage = m;
- data->lastCached = m;
- if (t || !data->unread)
- mutt_newsgroup_stat (data);
- }
- }
- m_fclose(&idx);
- return 0;
}
/* nntp_parse_url: given an NNPT URL, return host, port,
* username, password and newsgroup will recognise. */
-static int nntp_parse_url(const char *server, ACCOUNT * act, char *group,
+static int nntp_parse_url(const char *server, ACCOUNT *act, char *group,
ssize_t group_len)
{
- ciss_url_t url;
- char *c;
- int ret = -1;
+ ciss_url_t url;
+ char s[STRING];
- /* Defaults */
- act->flags = 0;
- act->port = NNTP_PORT;
- act->type = M_ACCT_TYPE_NNTP;
+ act->flags = 0;
+ act->port = 0;
+ act->type = M_ACCT_TYPE_NNTP;
- c = m_strdup(server);
- url_parse_ciss (&url, c);
+ m_strcpy(s, sizeof(s), server);
+ url_parse_ciss(&url, s);
- if (url.scheme == U_NNTP || url.scheme == U_NNTPS) {
- if (url.scheme == U_NNTPS) {
- act->has_ssl = 1;
- act->port = NNTP_SSL_PORT;
- }
-
- *group = '\0';
- if (url.path)
- m_strcpy(group, group_len, url.path);
+ if (url.scheme != U_NNTP || url.scheme != U_NNTPS)
+ return -1;
- ret = mutt_account_fromurl (act, &url);
- }
+ act->has_ssl = (url.scheme == U_NNTPS);
+ if (!act->port) {
+ act->port = act->has_ssl ? NNTP_PORT : NNTP_SSL_PORT;
+ }
+ m_strcpy(group, group_len, url.path);
- p_delete(&c);
- return ret;
+ return mutt_account_fromurl(act, &url);
}
void nntp_expand_path (char *line, ssize_t len, ACCOUNT * act)
nntp_data_t *nntp_data;
static int n = 0;
- _checked = n; /* _checked have N, where N = number of groups */
- if (!buf) /* at EOF must be zerouth */
+ nntp.checked = n; /* nntp.checked have N, where N = number of groups */
+ if (!buf) /* at EOF must be zerouth */
n = 0;
if (!s || !buf)
nntp_data = nntp_data_new();
nntp_data->group = m_strdup(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_data_list_append(&s->list, nntp_data);
+ s->tail = nntp_data_list_append(s->tail, nntp_data);
}
nntp_data->deleted = 0;
nntp_data->firstMessage = first;
list->subscribed = list->rc = list->num = 0;
}
slurp_newsrc (serv);
- nntp_clear_cacheindex (serv);
}
if (serv->status == NNTP_BYE)
/* New newsserver */
serv = p_new(nntp_server_t, 1);
+ serv->tail = &serv->list;
serv->conn = conn;
serv->newsrc = m_strdup(file);
- serv->newsgroups = hash_new(1009, false);
+ serv->newsgroups = hash_new(SHRT_MAX, false);
slurp_newsrc (serv); /* load .newsrc */
nntp_parse_cacheindex (serv); /* load .index */
- if (option (OPTNEWSCACHE) && serv->cache && nntp_get_cache_all (serv) >= 0)
+ if (nntp.use_cache && serv->cache && nntp_get_cache_all (serv) >= 0)
nntp_check_newgroups (serv, 1);
else if (nntp_get_active (serv) < 0) {
hash_delete(&serv->newsgroups, NULL);
p_delete(&serv);
return NULL;
}
- nntp_clear_cacheindex (serv);
conn->data = (void *) serv;
return serv;
h->old = 1;
}
-static void nntp_create_newsrc_line(nntp_data_t *data, buffer_t *buf)
-{
- buffer_addstr(buf, data->group);
- buffer_addch(buf, data->subscribed ? ':' : '!');
- buffer_addch(buf, ' ');
-
- for (int x = 0; x < data->num; x++) {
- if (x) {
- buffer_addch(buf, ',');
- }
-
- buffer_addf(buf, "%d-%d", data->entries[x].first,
- data->entries[x].last);
- }
- buffer_addch(buf, '\n');
-}
-
static void newsrc_gen_entries (CONTEXT * ctx)
{
nntp_data_t *data = (nntp_data_t *) ctx->data;
for (data = news->list; data; data = data->next) {
if (!data || !data->rc)
continue;
- nntp_create_newsrc_line(data, &buf);
+
+ buffer_addstr(&buf, data->group);
+ buffer_addch(&buf, data->subscribed ? ':' : '!');
+
+ for (int x = 0; x < data->num; x++) {
+ buffer_addch(&buf, x ? ',' : ' ');
+ buffer_addf(&buf, "%d-%d", data->entries[x].first,
+ data->entries[x].last);
+ }
+ buffer_addch(&buf, '\n');
}
+
/* newrc being fully rewritten */
if (news->newsrc
&& (r = mutt_update_list_file(news->newsrc, NULL, "", buf.data)) == 0)
if (data && data->group) {
key = data->group;
- snprintf (buf, sizeof (buf), "%s %s %d %d", key, data->cache,
- data->firstMessage, data->lastLoaded);
- }
- else {
+ snprintf(buf, sizeof(buf), "%s %s %d %d", key, data->cache,
+ data->firstMessage, data->lastLoaded);
+ } else {
m_strcpy(file, sizeof(file), serv->cache);
- snprintf (buf, sizeof (buf), "ALL %s 0 %d", file,
- (int) serv->newgroups_time);
+ snprintf(buf, sizeof (buf), "ALL %s 0 %d", file,
+ (int)serv->newgroups_time);
}
nntp_cache_expand(file, ssizeof(file), "%s.index", serv->conn->account.host);
return mutt_update_list_file(file, serv->conn->account.host, key, buf);
{
char buf[_POSIX_PATH_MAX];
- if (!option (OPTNEWSCACHE) || !data || !data->cache || !data->nserv)
+ if (!nntp.use_cache || !data || !data->cache || !data->nserv)
return;
nntp_cache_expand(buf, ssizeof(buf), "%s", data->cache);
NULL);
}
-/* Remove cache files of unsubscribed newsgroups */
-void nntp_clear_cacheindex (nntp_server_t * news)
-{
- nntp_data_t *data;
-
- if (option (OPTSAVEUNSUB) || !news)
- return;
-
- for (data = news->list; data; data = data->next) {
- if (!data || data->subscribed || !data->cache)
- continue;
- nntp_delete_cache (data);
- }
- return;
-}
-
static int nntp_save_cache_index (nntp_server_t * news)
{
char buf[HUGE_STRING];
if (!news || !news->newsgroups)
return -1;
- if (!option (OPTNEWSCACHE))
+ if (!nntp.use_cache)
return 0;
if (news->cache) {
int i = 0, save = SORT_ORDER;
int prev = 0;
- if (!option (OPTNEWSCACHE))
+ if (!nntp.use_cache)
return 0;
if (!ctx || !ctx->data || ctx->magic != M_NNTP)
return -1;
data->group = m_strdup(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_data_list_append(&news->list, data);
+ news->tail = nntp_data_list_append(news->tail, data);
}
if (!data->subscribed) {
data->subscribed = 1;
return NULL;
if (data->subscribed) {
data->subscribed = 0;
- if (!option (OPTSAVEUNSUB))
- data->rc = 0;
}
return data;
}
/* CACHE: must be loaded xover cache here */
num = nntp_data->lastCached - first + 1;
- if (option (OPTNEWSCACHE) && nntp_data->cache && num > 0) {
+ if (nntp.use_cache && nntp_data->cache && num > 0) {
nntp_cache_expand(buf, ssizeof(buf), "%s", nntp_data->cache);
mutt_message (msg2);
nntp_data = nntp_data_new();
nntp_data->group = m_strdup(buf);
hash_insert(serv->newsgroups, nntp_data->group, nntp_data);
- nntp_data_list_append(&serv->list, nntp_data);
+ serv->tail = nntp_data_list_append(serv->tail, nntp_data);
}
ctx->data = nntp_data;
nntp_data->nserv = serv;
if ((*l) == nntp_data) {
nntp_data_list_pop(l);
nntp_data_delete(&nntp_data);
+ if (!*l)
+ serv->tail = l;
break;
}
}
{
nntp_data_t *data = ctx->data;
- /* CACHE: update cache and .index files */
- if ((option (OPTSAVEUNSUB) || data->subscribed))
- nntp_save_cache_group (ctx);
- nntp_free_acache (data);
+ nntp_save_cache_group(ctx);
+ nntp_free_acache(data);
data->nserv->check_time = 0; /* next nntp_check_mailbox() will really check */
return 0;
if (*emp)
nntp_save_cache_index(serv);
mutt_clear_error();
- return _checked;
+ return nntp.checked;
}
/* Load list of all newsgroups from active */
tmp = &(*tmp)->next;
}
}
- nntp_save_cache_index (serv);
+ serv->tail = tmp;
+ nntp_save_cache_index(serv);
mutt_clear_error ();
- return _checked;
+ return nntp.checked;
}
/*
* made sure that we dont have the article, so we need to visit
* the server. Reading the cache at this point is also bad
* because it would duplicate messages */
- if (option (OPTNEWSCACHE)) {
+ if (nntp.use_cache) {
tmp++;
- unset_option (OPTNEWSCACHE);
+ nntp.use_cache = false;
}
for (i = 0; i < cc.num; i++) {
if ((ret = nntp_fetch_headers (ctx, cc.child[i], cc.child[i])))
ctx->hdrs[ctx->msgcount - 1]->read = 0;
}
if (tmp)
- set_option (OPTNEWSCACHE);
+ nntp.use_cache = true;
p_delete(&cc.child);
return ret;
}
projects / apps / madmutt.git / blobdiff