Rocco Rutte:

[apps/madmutt.git] / nntp / nntp.c

diff --git a/nntp/nntp.c b/nntp/nntp.c
index ed934eb..29ac491 100644 (file)
--- a/nntp/nntp.c
+++ b/nntp/nntp.c
@@ -162,12 +162,6 @@ static int nntp_attempt_features (NNTP_SERVER * serv)
   char buf[LONG_STRING];
   CONNECTION *conn = serv->conn;
 
-  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;
-
   mutt_socket_write (conn, "XOVER\r\n");
   if (mutt_socket_readln (buf, sizeof (buf), conn) < 0)
     return nntp_connect_error (serv);
@@ -180,6 +174,12 @@ static int nntp_attempt_features (NNTP_SERVER * serv)
   if (str_ncmp ("500", buf, 3))
     serv->hasXPAT = 1;
 
+  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;
+
   mutt_socket_write (conn, "XGTITLE +\r\n");
   if (mutt_socket_readln (buf, sizeof (buf), conn) < 0)
     return nntp_connect_error (serv);
@@ -641,6 +641,7 @@ static int nntp_fetch_headers (CONTEXT * ctx, unsigned int first,
 {
   char buf[HUGE_STRING];
   char *msg = _("Fetching message headers...");
+  char *msg2 = _("Fetching headers from cache...");
   NNTP_DATA *nntp_data = ((NNTP_DATA *) ctx->data);
   int ret;
   int num;
@@ -674,29 +675,18 @@ static int nntp_fetch_headers (CONTEXT * ctx, unsigned int first,
     }
   }
   else {
-    /* mutt_nntp_query() issues a 'GROUP nntp_data->group' 
-     * command on its own if !*buf */
-    buf[0] = '\0';
-    mutt_nntp_query (nntp_data, buf, sizeof (buf));
-    if (sscanf (buf + 4, "%d %u %u %s", &num, &fc.first, &fc.last, buf) != 4) {
-      mutt_error (_("GROUP command failed: %s"), buf);
-      mem_free (&fc.messages);
-      return (-1);
-    }
-    else {
-      for (num = fc.first; num < fc.last; num++)
-        _nntp_fetch_numbers (num, &fc);
-    }
+    for (num = 0; num < last - first + 1; num++)
+      fc.messages[num] = 1;
   }
 
   /* 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);
-    mutt_message _("Fetching headers from cache...");
+    mutt_message (msg2);
 
     if ((f = safe_fopen (buf, "r"))) {
-      int r = 0;
+      int r = 0, c = 0;
 
       /* counting number of lines */
       while (fgets (buf, sizeof (buf), f) != NULL)
@@ -708,8 +698,11 @@ static int nntp_fetch_headers (CONTEXT * ctx, unsigned int first,
       fc.first = first;
       fc.last = first + num - 1;
       fc.msg = NULL;
-      while (fgets (buf, sizeof (buf), f) != NULL)
+      while (fgets (buf, sizeof (buf), f) != NULL) {
+        if (ReadInc && ((++c) % ReadInc == 0))
+          mutt_message ("%s %d/%d", msg2, c, r);
         add_xover_line (buf, &fc);
+      }
       fclose (f);
       nntp_data->lastLoaded = fc.last;
       first = fc.last + 1;
@@ -1034,24 +1027,20 @@ void nntp_logout_all (void)
 {
   char buf[LONG_STRING];
   CONNECTION *conn;
-  CONNECTION *tmp;
 
   conn = mutt_socket_head ();
 
   while (conn) {
-    tmp = conn;
-
+    CONNECTION* next = conn->next;
     if (conn->account.type == M_ACCT_TYPE_NNTP) {
       mutt_message (_("Closing connection to %s..."), conn->account.host);
       mutt_socket_write (conn, "QUIT\r\n");
       mutt_socket_readln (buf, sizeof (buf), conn);
       mutt_clear_error ();
       mutt_socket_close (conn);
-
-      mutt_socket_free (tmp);
+      mutt_socket_free (conn);
     }
-
-    conn = conn->next;
+    conn = next;
   }
 }