X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=nntp.c;h=4d810124886a4aac4dc022a7d2aa32f547d7e44f;hp=9796e8c225d1f0783916d3e666c9508e670c145a;hb=6a7c1f87b97c733b63c177d41a5aca3427e9521a;hpb=66940066b5771273920ec17ff08e60041b490951

diff --git a/nntp.c b/nntp.c
index 9796e8c..4d81012 100644
--- a/nntp.c
+++ b/nntp.c
@@ -27,116 +27,121 @@
 #define NNTP_PORT      119
 #define NNTP_SSL_PORT  563
 
-static int nntp_get_cache_all (NNTP_SERVER *);
-static int nntp_check_newgroups (NNTP_SERVER *, int);
-static void mutt_newsgroup_stat (nntp_data_t *);
-static void nntp_delete_cache (nntp_data_t *);
+static unsigned int _checked = 0;
+
+static int nntp_check_newgroups (nntp_server_t *, int);
 
 /* newsrc {{{ */
 
-static int nntp_parse_newsrc_line (NNTP_SERVER * news, char *line)
+static void mutt_newsgroup_stat(nntp_data_t *data)
 {
-  nntp_data_t *data;
-  char group[LONG_STRING];
-  int x = 1;
-  char *p, *b, *h;
+    data->unread = 0;
+    if (data->lastMessage == 0 || data->firstMessage > data->lastMessage)
+        return;
+
+    data->unread = data->lastMessage - data->firstMessage + 1;
+    for (int i = 0; i < data->num; i++) {
+        int first = MAX(data->entries[i].first, data->firstMessage);
+        int last  = MIN(data->entries[i].last,  data->lastMessage);
+        data->unread -= MAX(0, last - first + 1);
+    }
+}
 
-  for (p = line; p; p = strchr(p, ',')) {
-    x++;
-  }
+static int nntp_parse_newsrc_line(nntp_server_t * news, const char *line)
+{
+    nntp_data_t *data;
+    char group[LONG_STRING];
+    const char *p;
+    int x = 1;
 
-  p = strpbrk(line, ":!");
-  if (!p)
-    return -1;
+    for (p = line; *p; p++) {
+        x += *p == ',';
+    }
 
-  m_strncpy(group, ssizeof(group), line, p - line);
-  if ((data = hash_find(news->newsgroups, group)) == NULL) {
-    data = nntp_data_new();
-    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);
-  } else {
-    p_delete(&data->entries);
-  }
+    p = strpbrk(line, ":!");
+    if (!p)
+        return -1;
 
-  data->rc = 1;
-  data->entries = p_new(NEWSRC_ENTRY, x * 2);
-  data->max = x * 2;
+    m_strncpy(group, ssizeof(group), line, p - line);
+    data = hash_find(news->newsgroups, group);
+    if (!data) {
+        data = nntp_data_new();
+        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);
+    } else {
+        p_delete(&data->entries);
+    }
 
-  data->subscribed = (*p++ == ':');
+    data->rc = 1;
+    data->entries = p_new(NEWSRC_ENTRY, x * 2);
+    data->max = x * 2;
+    data->subscribed = (*p++ == ':');
+
+    for (x = 0; *p; p++) {
+        p = skipspaces(p);
+        data->entries[x].first = strtol(p, (char **)&p, 10);
+        p = skipspaces(p);
+        if (*p == '-') {
+            data->entries[x].last = strtol(p + 1, (char **)&p, 10);
+        } else {
+            data->entries[x].last = data->entries[x].first;
+        }
 
-  b = p;
-  x = 0;
-  while (*b) {
-    while (*p && *p != ',' && *p != '\n')
-      p++;
-    if (*p) {
-      *p = '\0';
-      p++;
-    }
-    if ((h = strchr (b, '-'))) {
-      *h = '\0';
-      h++;
-      data->entries[x].first = atoi (b);
-      data->entries[x].last = atoi (h);
-    }
-    else {
-      data->entries[x].first = atoi (b);
-      data->entries[x].last = data->entries[x].first;
+        p  = strchrnul(p, ',');
+        x += data->entries[x].last != 0;
     }
-    b = p;
-    if (data->entries[x].last != 0)
-      x++;
-  }
-  if (x && !data->lastMessage)
-    data->lastMessage = data->entries[x - 1].last;
-  data->num = x;
-  mutt_newsgroup_stat (data);
 
-  return 0;
+    if (x && !data->lastMessage)
+        data->lastMessage = data->entries[x - 1].last;
+    data->num = x;
+    mutt_newsgroup_stat(data);
+    return 0;
 }
 
-static int slurp_newsrc (NNTP_SERVER * news)
+static int slurp_newsrc (nntp_server_t * news)
 {
-  FILE *fp;
-  char *buf;
-  struct stat sb;
+    FILE *fp;
+    char *buf = NULL;
+    size_t n  = 0;
+    struct stat sb;
 
-  news->stat = stat (news->newsrc, &sb);
-  news->size = sb.st_size;
-  news->mtime = sb.st_mtime;
+    news->stat  = stat(news->newsrc, &sb);
+    news->size  = sb.st_size;
+    news->mtime = sb.st_mtime;
 
-  if ((fp = safe_fopen (news->newsrc, "r")) == NULL)
-    return -1;
-  /* hmm, should we use dotlock? */
-  if (mx_lock_file (news->newsrc, fileno (fp), 0, 0, 1)) {
-    m_fclose(&fp);
-    return -1;
-  }
+    if ((fp = safe_fopen(news->newsrc, "r")) == NULL)
+        return -1;
 
-  buf = p_new(char, sb.st_size + 1);
-  while (fgets (buf, sb.st_size + 1, fp))
-    nntp_parse_newsrc_line (news, buf);
-  p_delete(&buf);
+    /* hmm, should we use dotlock? */
+    if (mx_lock_file(news->newsrc, fileno (fp), 0, 0, 1)) {
+        m_fclose(&fp);
+        return -1;
+    }
 
-  mx_unlock_file (news->newsrc, fileno (fp), 0);
-  m_fclose(&fp);
-  return 0;
-}
+    while (getline(&buf, &n, fp) >= 0) {
+        nntp_parse_newsrc_line(news, buf);
+    }
+    p_delete(&buf);
 
-static void nntp_cache_expand (char *dst, const char *src)
-{
-  snprintf (dst, _POSIX_PATH_MAX, "%s/%s", NewsCacheDir, src);
-  mutt_expand_path (dst, _POSIX_PATH_MAX);
+    mx_unlock_file (news->newsrc, fileno (fp), 0);
+    m_fclose(&fp);
+    return 0;
 }
 
+#define nntp_cache_expand(dst, dlen, fmt, ...)     \
+    do {                                                                   \
+        snprintf((dst), (dlen), "%s/" fmt, NewsCacheDir, ##__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 * news)
+static int nntp_parse_cacheindex(nntp_server_t *news)
 {
   struct stat st;
   char buf[HUGE_STRING], *cp;
@@ -156,8 +161,7 @@ static int nntp_parse_cacheindex (NNTP_SERVER * news)
   mutt_expand_path (dir, sizeof (dir));
 
   if (lstat (dir, &st) || (st.st_mode & S_IFDIR) == 0) {
-    snprintf (buf, sizeof (buf), _("Directory %s not exist. Create it?"),
-              dir);
+    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!");
@@ -170,7 +174,7 @@ static int nntp_parse_cacheindex (NNTP_SERVER * news)
   set_option (OPTNEWSCACHE);
 
   p_delete(&news->cache);
-  snprintf (buf, sizeof (buf), "%s/.index", dir);
+  snprintf(buf, sizeof (buf), "%s/%s.index", dir, news->conn->account.host);
   if (!(idx = safe_fopen (buf, "a+")))
     return 0;
   rewind (idx);
@@ -222,26 +226,6 @@ static int nntp_parse_cacheindex (NNTP_SERVER * news)
   return 0;
 }
 
-const char *nntp_format_str(char *dest, ssize_t destlen, char op,
-                            const char *src, const char *fmt,
-                            const char *ifstr __attribute__((unused)),
-                            const char *elstr __attribute__((unused)),
-                            anytype data __attribute__((unused)),
-                            format_flag flags __attribute__((unused)))
-{
-  char fn[STRING], tmp[STRING];
-
-  switch (op) {
-  case 's':
-    m_strcpy(fn, sizeof (fn), NewsServer);
-    m_strtolower(fn);
-    snprintf (tmp, sizeof (tmp), "%%%ss", fmt);
-    snprintf (dest, destlen, tmp, fn);
-    break;
-  }
-  return (src);
-}
-
 /* 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,
@@ -286,6 +270,84 @@ void nntp_expand_path (char *line, ssize_t len, ACCOUNT * act)
   p_delete(&url.path);
 }
 
+static int add_group (char *buf, void *serv)
+{
+  nntp_server_t *s = serv;
+  char group[LONG_STRING], mod, desc[HUGE_STRING];
+  int first, last;
+  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 */
+    n = 0;
+
+  if (!s || !buf)
+    return 0;
+
+  *desc = 0;
+  sscanf (buf, "%s %d %d %c %[^\n]", group, &last, &first, &mod, desc);
+  if (!group)
+    return 0;
+  if ((nntp_data = hash_find(s->newsgroups, group)) == NULL) {
+    n++;
+    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);
+  }
+  nntp_data->deleted = 0;
+  nntp_data->firstMessage = first;
+  nntp_data->lastMessage = last;
+  if (mod == 'y')
+    nntp_data->allowed = 1;
+  else
+    nntp_data->allowed = 0;
+  if (nntp_data->desc)
+    p_delete(&nntp_data->desc);
+  if (*desc)
+    nntp_data->desc = m_strdup(desc);
+  if (nntp_data->rc || nntp_data->lastCached)
+    mutt_newsgroup_stat (nntp_data);
+  else if (nntp_data->lastMessage &&
+           nntp_data->firstMessage <= nntp_data->lastMessage)
+    nntp_data->unread = nntp_data->lastMessage - nntp_data->firstMessage + 1;
+  else
+    nntp_data->unread = 0;
+
+  return 0;
+}
+
+/* Load list of all newsgroups from cache ALL */
+static int nntp_get_cache_all (nntp_server_t * serv)
+{
+  char buf[HUGE_STRING];
+  FILE *f;
+
+  nntp_cache_expand(buf, ssizeof(buf), "%s", serv->cache);
+  if ((f = safe_fopen (buf, "r"))) {
+    int i = 0;
+
+    while (fgets (buf, sizeof (buf), f) != NULL) {
+      if (ReadInc && (i % ReadInc == 0))
+        mutt_message (_("Loading list from cache... %d"), i);
+      add_group (buf, serv);
+      i++;
+    }
+    add_group (NULL, NULL);
+    m_fclose(&f);
+    mutt_clear_error ();
+    return 0;
+  }
+  else {
+    p_delete(&serv->cache);
+    return -1;
+  }
+}
+
 /*
  * Automatically loads a newsrc into memory, if necessary.
  * Checks the size/mtime of a newsrc file, if it doesn't match, load
@@ -296,13 +358,13 @@ void nntp_expand_path (char *line, ssize_t len, ACCOUNT * act)
  * ':' denoting subscribed or '!' denoting unsubscribed, then a 
  * comma separated list of article numbers and ranges.
  */
-NNTP_SERVER *mutt_select_newsserver (char *server)
+nntp_server_t *mutt_select_newsserver (char *server)
 {
   char file[_POSIX_PATH_MAX];
   char *buf, *p;
   nntp_data_t *list;
   ACCOUNT act;
-  NNTP_SERVER *serv;
+  nntp_server_t *serv;
   CONNECTION *conn;
 
   p_clear(&act, 1);
@@ -331,10 +393,8 @@ NNTP_SERVER *mutt_select_newsserver (char *server)
   if (!conn)
     return NULL;
 
-  m_strformat(file, sizeof(file), 0, NewsRc, nntp_format_str, NULL, 0);
-  mutt_expand_path(file, sizeof(file));
-
-  serv = (NNTP_SERVER *) conn->data;
+  nntp_cache_expand(file, sizeof(file), "%s.newsrc", conn->account.host);
+  serv = (nntp_server_t *) conn->data;
   if (serv) {
     struct stat sb;
 
@@ -344,9 +404,7 @@ NNTP_SERVER *mutt_select_newsserver (char *server)
                                             || serv->mtime != sb.st_mtime)))
     {
       for (list = serv->list; list; list = list->next) {
-        list->subscribed = 0;
-        list->rc = 0;
-        list->num = 0;
+        list->subscribed = list->rc = list->num = 0;
       }
       slurp_newsrc (serv);
       nntp_clear_cacheindex (serv);
@@ -359,7 +417,7 @@ NNTP_SERVER *mutt_select_newsserver (char *server)
   }
 
   /* New newsserver */
-  serv = p_new(NNTP_SERVER, 1);
+  serv = p_new(nntp_server_t, 1);
   serv->conn = conn;
   serv->newsrc = m_strdup(file);
   serv->newsgroups = hash_new(1009, false);
@@ -391,120 +449,52 @@ NNTP_SERVER *mutt_select_newsserver (char *server)
  * "skipped" in the newsrc, and new is anything not in the newsrc nor
  * in the cache. By skipped, I mean before the last unread message
  */
-static void nntp_get_status(CONTEXT *ctx, HEADER *h, char *group, int article)
+static void
+nntp_get_status(CONTEXT *ctx, HEADER *h, const char *group, int article)
 {
-  nntp_data_t *data = (nntp_data_t *) ctx->data;
-  int x;
-
-  if (group)
-    data = (nntp_data_t *) hash_find (data->nserv->newsgroups, group);
-
-  if (!data) {
-    return;
-  }
-
-  for (x = 0; x < data->num; x++) {
-    if ((article >= data->entries[x].first) &&
-        (article <= data->entries[x].last)) {
-      /* we cannot use mutt_set_flag() because mx_update_context()
-         didn't called yet */
-      h->read = 1;
-      return;
+    nntp_data_t *data = ctx->data;
+
+    if (group)
+        data = hash_find(data->nserv->newsgroups, group);
+    if (!data)
+        return;
+
+    for (int i = 0; i < data->num; i++) {
+        if ((article >= data->entries[i].first) &&
+            (article <= data->entries[i].last))
+        {
+            /* we cannot use mutt_set_flag() because mx_update_context()
+               didn't called yet */
+            h->read = 1;
+            return;
+        }
     }
-  }
-  /* If article was not cached yet, it is new! :) */
-  if (!data->cache || article > data->lastCached)
-    return;
-  /* Old articles are articles which aren't read but an article after them
-   * has been cached */
-  if (option (OPTMARKOLD))
-    h->old = 1;
-}
-
-static void mutt_newsgroup_stat (nntp_data_t * data)
-{
-  int i, first, last;
 
-  data->unread = 0;
-  if (data->lastMessage == 0 || data->firstMessage > data->lastMessage)
-    return;
+    /* If article was not cached yet, it is new! :) */
+    if (!data->cache || article > data->lastCached)
+        return;
 
-  data->unread = data->lastMessage - data->firstMessage + 1;
-  for (i = 0; i < data->num; i++) {
-    first = data->entries[i].first;
-    if (first < data->firstMessage)
-      first = data->firstMessage;
-    last = data->entries[i].last;
-    if (last > data->lastMessage)
-      last = data->lastMessage;
-    if (first <= last)
-      data->unread -= last - first + 1;
-  }
+    /* Old articles are articles which aren't read but an article after them
+     * has been cached */
+    if (option(OPTMARKOLD))
+        h->old = 1;
 }
 
-static int puti (char *line, int num)
+static void nntp_create_newsrc_line(nntp_data_t *data, buffer_t *buf)
 {
-  char *p, s[32];
-
-  for (p = s; num;) {
-    *p++ = '0' + num % 10;
-    num /= 10;
-  }
-  while (p > s)
-    *line++ = *--p, num++;
-  *line = '\0';
-  return num;
-}
+    buffer_addstr(buf, data->group);
+    buffer_addch(buf, data->subscribed ? ':' : '!');
+    buffer_addch(buf, ' ');
 
-static void nntp_create_newsrc_line (nntp_data_t * data, char **buf,
-                                     char **pline, ssize_t * buflen)
-{
-  char *line = *pline;
-  ssize_t len = *buflen - (*pline - *buf);
-  int x, i;
-
-  if (len < LONG_STRING * 10) {
-    len += *buflen;
-    *buflen *= 2;
-    line = *buf;
-    p_realloc(buf, *buflen);
-    line = *buf + (*pline - line);
-  }
-  strcpy (line, data->group);
-  len -= m_strlen(line) + 1;
-  line += m_strlen(line);
-  *line++ = data->subscribed ? ':' : '!';
-  *line++ = ' ';
-  *line = '\0';
-
-  for (x = 0; x < data->num; x++) {
-    if (len < LONG_STRING) {
-      len += *buflen;
-      *buflen *= 2;
-      *pline = line;
-      line = *buf;
-      p_realloc(buf, *buflen);
-      line = *buf + (*pline - line);
-    }
-    if (x) {
-      *line++ = ',';
-      len--;
-    }
+    for (int x = 0; x < data->num; x++) {
+        if (x) {
+            buffer_addch(buf, ',');
+        }
 
-    i = puti (line, data->entries[x].first);
-    line += i;
-    len -= i;
-    if (data->entries[x].first != data->entries[x].last) {
-      *line++ = '-';
-      len--;
-      i = puti (line, data->entries[x].last);
-      line += i;
-      len -= i;
+        buffer_addf(buf, "%d-%d", data->entries[x].first,
+                    data->entries[x].last);
     }
-  }
-  *line++ = '\n';
-  *line = '\0';
-  *pline = line;
+    buffer_addch(buf, '\n');
 }
 
 static void newsrc_gen_entries (CONTEXT * ctx)
@@ -577,7 +567,8 @@ static void newsrc_gen_entries (CONTEXT * ctx)
 }
 
 static int mutt_update_list_file (char *filename, char *section,
-                                  const char *key, char *line) {
+                                  const char *key, const char *line)
+{
   FILE *ifp;
   FILE *ofp;
   char buf[HUGE_STRING];
@@ -686,35 +677,36 @@ static int mutt_update_list_file (char *filename, char *section,
   return 0;
 }
 
-int mutt_newsrc_update (NNTP_SERVER * news)
+int mutt_newsrc_update (nntp_server_t * news)
 {
-  char *buf, *line;
-  nntp_data_t *data;
-  int r = -1;
-  ssize_t len, llen;
+    buffer_t buf;
+    nntp_data_t *data;
+    int r = -1;
 
-  if (!news)
-    return -1;
-  llen = len = 10 * LONG_STRING;
-  line = buf = p_new(char, len);
-  /* we will generate full newsrc here */
-  for (data = news->list; data; data = data->next) {
-    if (!data || !data->rc)
-      continue;
-    nntp_create_newsrc_line (data, &buf, &line, &llen);
-    line += m_strlen(line);
-  }
-  /* newrc being fully rewritten */
-  if (news->newsrc &&
-      (r = mutt_update_list_file(news->newsrc, NULL, "", buf)) == 0) {
-    struct stat st;
+    if (!news)
+        return -1;
 
-    stat (news->newsrc, &st);
-    news->size = st.st_size;
-    news->mtime = st.st_mtime;
-  }
-  p_delete(&buf);
-  return r;
+    buffer_init(&buf);
+
+    /* we will generate full newsrc here */
+    for (data = news->list; data; data = data->next) {
+        if (!data || !data->rc)
+            continue;
+        nntp_create_newsrc_line(data, &buf);
+    }
+    /* newrc being fully rewritten */
+    if (news->newsrc
+    &&  (r = mutt_update_list_file(news->newsrc, NULL, "", buf.data)) == 0)
+    {
+        struct stat st;
+
+        stat (news->newsrc, &st);
+        news->size = st.st_size;
+        news->mtime = st.st_mtime;
+    }
+
+    buffer_wipe(&buf);
+    return r;
 }
 
 static FILE *mutt_mkname (char *s)
@@ -723,11 +715,11 @@ static FILE *mutt_mkname (char *s)
   int fd;
   FILE *fp;
 
-  nntp_cache_expand (buf, s);
+  nntp_cache_expand(buf, ssizeof(buf), "%s", s);
   if ((fp = safe_fopen (buf, "w")))
     return fp;
 
-  nntp_cache_expand (buf, "cache-XXXXXX");
+  nntp_cache_expand(buf, ssizeof(buf), "cache-XXXXXX");
   pc = buf + m_strlen(buf) - 12; /* positioning to "cache-XXXXXX" */
   if ((fd = mkstemp (buf)) == -1)
     return NULL;
@@ -736,7 +728,7 @@ static FILE *mutt_mkname (char *s)
 }
 
 /* Updates info into .index file: ALL or about selected newsgroup */
-static int nntp_update_cacheindex (NNTP_SERVER * serv, nntp_data_t * data)
+static int nntp_update_cacheindex (nntp_server_t * serv, nntp_data_t * data)
 {
   char buf[LONG_STRING];
   char file[_POSIX_PATH_MAX];
@@ -755,12 +747,29 @@ static int nntp_update_cacheindex (NNTP_SERVER * serv, nntp_data_t * data)
     snprintf (buf, sizeof (buf), "ALL %s 0 %d", file,
               (int) serv->newgroups_time);
   }
-  nntp_cache_expand (file, ".index");
-  return mutt_update_list_file (file, serv->conn->account.host, key, buf);
+  nntp_cache_expand(file, ssizeof(file), "%s.index", serv->conn->account.host);
+  return mutt_update_list_file(file, serv->conn->account.host, key, buf);
+}
+
+static void nntp_delete_cache (nntp_data_t * data)
+{
+  char buf[_POSIX_PATH_MAX];
+
+  if (!option (OPTNEWSCACHE) || !data || !data->cache || !data->nserv)
+    return;
+
+  nntp_cache_expand(buf, ssizeof(buf), "%s", data->cache);
+  unlink (buf);
+  p_delete(&data->cache);
+  data->lastCached = 0;
+  nntp_cache_expand(buf, ssizeof(buf), "%s.index",
+                    data->nserv->conn->account.host);
+  mutt_update_list_file(buf, data->nserv->conn->account.host, data->group,
+                        NULL);
 }
 
 /* Remove cache files of unsubscribed newsgroups */
-void nntp_clear_cacheindex (NNTP_SERVER * news)
+void nntp_clear_cacheindex (nntp_server_t * news)
 {
   nntp_data_t *data;
 
@@ -775,7 +784,7 @@ void nntp_clear_cacheindex (NNTP_SERVER * news)
   return;
 }
 
-static int nntp_save_cache_index (NNTP_SERVER * news)
+static int nntp_save_cache_index (nntp_server_t * news)
 {
   char buf[HUGE_STRING];
   char file[_POSIX_PATH_MAX];
@@ -788,15 +797,14 @@ static int nntp_save_cache_index (NNTP_SERVER * news)
     return 0;
 
   if (news->cache) {
-    nntp_cache_expand (file, news->cache);
-    unlink (file);
-    f = safe_fopen (file, "w");
-  }
-  else {
-    m_strcpy(buf, sizeof(buf), news->conn->account.host);
-    f = mutt_mkname (buf);
+    nntp_cache_expand(file, ssizeof(file), "%s", news->cache);
+    unlink(file);
+    f = safe_fopen(file, "w");
+  } else {
+    m_strcpy(buf, ssizeof(buf), news->conn->account.host);
+    f = mutt_mkname(buf);
     news->cache = m_strdup(buf);
-    nntp_cache_expand (file, buf);
+    nntp_cache_expand(file, ssizeof(file), "%s", buf);
   }
   if (!f)
     return -1;
@@ -842,17 +850,18 @@ static int nntp_save_cache_group (CONTEXT * ctx)
     return -1;
 
   if (((nntp_data_t *) ctx->data)->cache) {
-    nntp_cache_expand (file, ((nntp_data_t *) ctx->data)->cache);
+    nntp_cache_expand(file, ssizeof(file), "%s",
+                      ((nntp_data_t *)ctx->data)->cache);
     unlink (file);
     f = safe_fopen (file, "w");
   }
   else {
-    snprintf (buf, sizeof (buf), "%s-%s",
-              ((nntp_data_t *) ctx->data)->nserv->conn->account.host,
-              ((nntp_data_t *) ctx->data)->group);
+    snprintf(buf, ssizeof(buf), "%s-%s",
+             ((nntp_data_t *)ctx->data)->nserv->conn->account.host,
+             ((nntp_data_t *)ctx->data)->group);
     f = mutt_mkname (buf);
-    ((nntp_data_t *) ctx->data)->cache = m_strdup(buf);
-    nntp_cache_expand (file, buf);
+    ((nntp_data_t *)ctx->data)->cache = m_strdup(buf);
+    nntp_cache_expand(file, ssizeof(file), "%s", buf);
   }
   if (!f)
     return -1;
@@ -908,23 +917,7 @@ static int nntp_save_cache_group (CONTEXT * ctx)
   return 0;
 }
 
-static void nntp_delete_cache (nntp_data_t * data)
-{
-  char buf[_POSIX_PATH_MAX];
-
-  if (!option (OPTNEWSCACHE) || !data || !data->cache || !data->nserv)
-    return;
-
-  nntp_cache_expand (buf, data->cache);
-  unlink (buf);
-  p_delete(&data->cache);
-  data->lastCached = 0;
-  nntp_cache_expand (buf, ".index");
-  mutt_update_list_file (buf, data->nserv->conn->account.host, data->group,
-                         NULL);
-}
-
-nntp_data_t *mutt_newsgroup_subscribe (NNTP_SERVER * news, char *group)
+nntp_data_t *mutt_newsgroup_subscribe (nntp_server_t * news, char *group)
 {
   nntp_data_t *data;
 
@@ -947,7 +940,7 @@ nntp_data_t *mutt_newsgroup_subscribe (NNTP_SERVER * news, char *group)
   return data;
 }
 
-nntp_data_t *mutt_newsgroup_unsubscribe (NNTP_SERVER * news, char *group)
+nntp_data_t *mutt_newsgroup_unsubscribe (nntp_server_t * news, char *group)
 {
   nntp_data_t *data;
 
@@ -962,7 +955,7 @@ nntp_data_t *mutt_newsgroup_unsubscribe (NNTP_SERVER * news, char *group)
   return data;
 }
 
-nntp_data_t *mutt_newsgroup_catchup (NNTP_SERVER * news, char *group)
+nntp_data_t *mutt_newsgroup_catchup (nntp_server_t * news, char *group)
 {
   nntp_data_t *data;
 
@@ -986,7 +979,7 @@ nntp_data_t *mutt_newsgroup_catchup (NNTP_SERVER * news, char *group)
   return data;
 }
 
-nntp_data_t *mutt_newsgroup_uncatchup (NNTP_SERVER * news, char *group)
+nntp_data_t *mutt_newsgroup_uncatchup (nntp_server_t * news, char *group)
 {
   nntp_data_t *data;
 
@@ -1062,8 +1055,6 @@ void nntp_buffy (char* dst, ssize_t dstlen) {
 /* }}} */
 /* nntp protocol {{{ */
 
-static unsigned int _checked = 0;
-
 void nntp_sync_sidebar (nntp_data_t* data) {
   int i = 0;
   BUFFY* tmp = NULL;
@@ -1097,7 +1088,7 @@ void nntp_sync_sidebar (nntp_data_t* data) {
   tmp->msgcount = data->lastMessage - data->firstMessage;
 }
 
-static int nntp_auth (NNTP_SERVER * serv)
+static int nntp_auth (nntp_server_t * serv)
 {
   CONNECTION *conn = serv->conn;
   char buf[STRING];
@@ -1136,7 +1127,7 @@ static int nntp_auth (NNTP_SERVER * serv)
   return 0;
 }
 
-static int nntp_connect_error (NNTP_SERVER * serv)
+static int nntp_connect_error (nntp_server_t * serv)
 {
   serv->status = NNTP_NONE;
   mutt_socket_close (serv->conn);
@@ -1146,7 +1137,7 @@ static int nntp_connect_error (NNTP_SERVER * serv)
   return -1;
 }
 
-static int nntp_connect_and_auth (NNTP_SERVER * serv)
+static int nntp_connect_and_auth (nntp_server_t * serv)
 {
   CONNECTION *conn = serv->conn;
   char buf[STRING];
@@ -1206,7 +1197,7 @@ static int nntp_connect_and_auth (NNTP_SERVER * serv)
   return 0;
 }
 
-static int nntp_attempt_features (NNTP_SERVER * serv)
+static int nntp_attempt_features (nntp_server_t * serv)
 {
   char buf[LONG_STRING];
   CONNECTION *conn = serv->conn;
@@ -1249,7 +1240,7 @@ static int nntp_attempt_features (NNTP_SERVER * serv)
   return 0;
 }
 
-static int nntp_open_connection (NNTP_SERVER * serv)
+static int nntp_open_connection (nntp_server_t * serv)
 {
   if (serv->status == NNTP_OK)
     return 0;
@@ -1262,7 +1253,7 @@ static int nntp_open_connection (NNTP_SERVER * serv)
   return 0;
 }
 
-static int nntp_reconnect (NNTP_SERVER * serv)
+static int nntp_reconnect (nntp_server_t * serv)
 {
   char buf[STRING];
 
@@ -1505,7 +1496,7 @@ static int parse_description (char *line, void *n)
 {
   register char *d = line;
   nntp_data_t *data;
-  NNTP_SERVER *news = n;
+  nntp_server_t *news = n;
 
   if (!line)
     return 0;
@@ -1574,7 +1565,6 @@ static int nntp_parse_xover (CONTEXT * ctx, char *buf, HEADER * hdr)
     p++;
     switch (x) {
     case 0:
-
       hdr->article_num = atoi (b);
       nntp_get_status (ctx, hdr, NULL, hdr->article_num);
       break;
@@ -1707,7 +1697,7 @@ static int nntp_fetch_headers(CONTEXT * ctx, int first, int 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);
+  nntp_cache_expand(buf, ssizeof(buf), "%s", nntp_data->cache);
   mutt_message (msg2);
 
   if ((f = safe_fopen (buf, "r"))) {
@@ -1822,7 +1812,7 @@ static int nntp_fetch_headers(CONTEXT * ctx, int first, int last)
 static int nntp_open_mailbox (CONTEXT * ctx)
 {
   nntp_data_t *nntp_data;
-  NNTP_SERVER *serv;
+  nntp_server_t *serv;
   char buf[HUGE_STRING];
   char server[LONG_STRING];
   int count = 0, first;
@@ -2153,7 +2143,7 @@ int nntp_close_mailbox (CONTEXT * ctx)
   }
   nntp_sync_mailbox (ctx, 0, NULL);
   if (ctx->data && ((nntp_data_t *) ctx->data)->nserv) {
-    NNTP_SERVER *news;
+    nntp_server_t *news;
 
     news = ((nntp_data_t *) ctx->data)->nserv;
     newsrc_gen_entries (ctx);
@@ -2222,58 +2212,7 @@ static int nntp_check_mailbox (CONTEXT * ctx, int* unused1, int unused2)
   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_t *nntp_data;
-  static int n = 0;
-
-  _checked = n;                 /* _checked have N, where N = number of groups */
-  if (!buf)                     /* at EOF must be zerouth */
-    n = 0;
-
-  if (!s || !buf)
-    return 0;
-
-  *desc = 0;
-  sscanf (buf, "%s %d %d %c %[^\n]", group, &last, &first, &mod, desc);
-  if (!group)
-    return 0;
-  if ((nntp_data = hash_find(s->newsgroups, group)) == NULL) {
-    n++;
-    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);
-  }
-  nntp_data->deleted = 0;
-  nntp_data->firstMessage = first;
-  nntp_data->lastMessage = last;
-  if (mod == 'y')
-    nntp_data->allowed = 1;
-  else
-    nntp_data->allowed = 0;
-  if (nntp_data->desc)
-    p_delete(&nntp_data->desc);
-  if (*desc)
-    nntp_data->desc = m_strdup(desc);
-  if (nntp_data->rc || nntp_data->lastCached)
-    mutt_newsgroup_stat (nntp_data);
-  else if (nntp_data->lastMessage &&
-           nntp_data->firstMessage <= nntp_data->lastMessage)
-    nntp_data->unread = nntp_data->lastMessage - nntp_data->firstMessage + 1;
-  else
-    nntp_data->unread = 0;
-
-  return 0;
-}
-
-static int nntp_check_newgroups (NNTP_SERVER * serv, int force)
+static int nntp_check_newgroups (nntp_server_t * serv, int force)
 {
   char buf[LONG_STRING];
   nntp_data_t nntp_data;
@@ -2333,35 +2272,8 @@ static int nntp_check_newgroups (NNTP_SERVER * serv, int force)
   return _checked;
 }
 
-/* Load list of all newsgroups from cache ALL */
-static int nntp_get_cache_all (NNTP_SERVER * serv)
-{
-  char buf[HUGE_STRING];
-  FILE *f;
-
-  nntp_cache_expand (buf, serv->cache);
-  if ((f = safe_fopen (buf, "r"))) {
-    int i = 0;
-
-    while (fgets (buf, sizeof (buf), f) != NULL) {
-      if (ReadInc && (i % ReadInc == 0))
-        mutt_message (_("Loading list from cache... %d"), i);
-      add_group (buf, serv);
-      i++;
-    }
-    add_group (NULL, NULL);
-    m_fclose(&f);
-    mutt_clear_error ();
-    return 0;
-  }
-  else {
-    p_delete(&serv->cache);
-    return -1;
-  }
-}
-
 /* Load list of all newsgroups from active */
-int nntp_get_active (NNTP_SERVER * serv)
+int nntp_get_active (nntp_server_t * serv)
 {
   char msg[STRING];
   nntp_data_t nntp_data, **tmp = &serv->list;