fix parsing issues in slurp_newsrc

[apps/madmutt.git] / nntp.c

diff --git a/nntp.c b/nntp.c
index eb5cd42..d3bf60f 100644 (file)
--- a/nntp.c
+++ b/nntp.c
@@ -47,11 +47,12 @@ static void mutt_newsgroup_stat(nntp_data_t *data)
     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);
+        if (first <= last)
+            data->unread -= last - first + 1;
     }
 }
 
-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];
@@ -76,7 +77,7 @@ static int nntp_parse_newsrc_line(nntp_server_t * news, const char *line)
         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);
     }
@@ -85,18 +86,19 @@ static int nntp_parse_newsrc_line(nntp_server_t * news, const char *line)
     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;
     }
 
@@ -203,7 +205,7 @@ static int nntp_parse_cacheindex(nntp_server_t *news)
                 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);
             }
             m_strreplace(&data->cache, p);
 
@@ -293,7 +295,7 @@ static int add_group (char *buf, void *serv)
     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;
@@ -403,7 +405,6 @@ nntp_server_t *mutt_select_newsserver (char *server)
         list->subscribed = list->rc = list->num = 0;
       }
       slurp_newsrc (serv);
-      nntp_clear_cacheindex (serv);
     }
 
     if (serv->status == NNTP_BYE)
@@ -414,9 +415,10 @@ nntp_server_t *mutt_select_newsserver (char *server)
 
   /* 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 (nntp.use_cache && serv->cache && nntp_get_cache_all (serv) >= 0)
@@ -429,7 +431,6 @@ nntp_server_t *mutt_select_newsserver (char *server)
     p_delete(&serv);
     return NULL;
   }
-  nntp_clear_cacheindex (serv);
   conn->data = (void *) serv;
 
   return serv;
@@ -764,22 +765,6 @@ static void nntp_delete_cache (nntp_data_t * data)
                         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];
@@ -927,7 +912,7 @@ nntp_data_t *mutt_newsgroup_subscribe (nntp_server_t * news, char *group)
     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;
@@ -945,8 +930,6 @@ nntp_data_t *mutt_newsgroup_unsubscribe (nntp_server_t * news, char *group)
     return NULL;
   if (data->subscribed) {
     data->subscribed = 0;
-    if (!option (OPTSAVEUNSUB))
-      data->rc = 0;
   }
   return data;
 }
@@ -1832,7 +1815,7 @@ static int nntp_open_mailbox (CONTEXT * ctx)
     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;
@@ -1865,6 +1848,8 @@ static int nntp_open_mailbox (CONTEXT * ctx)
           if ((*l) == nntp_data) {
               nntp_data_list_pop(l);
               nntp_data_delete(&nntp_data);
+              if (!*l)
+                  serv->tail = l;
               break;
           }
       }
@@ -2090,10 +2075,8 @@ static int nntp_sync_mailbox (CONTEXT * ctx, int unused1, int* unused2)
 {
   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;
@@ -2301,7 +2284,8 @@ int nntp_get_active (nntp_server_t * serv)
       tmp = &(*tmp)->next;
     }
   }
-  nntp_save_cache_index (serv);
+  serv->tail = tmp;
+  nntp_save_cache_index(serv);
 
   mutt_clear_error ();
   return nntp.checked;