X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=nntp%2Fnntp.c;h=967431691387b1eb427385483532a0c115a2e5f4;hp=d0fae27ad7503553c7b7eefa197c34b19d8b82fc;hb=b3cb6ed8d36c550a2e589910ce51bbc8352ff57c;hpb=c8ceef3ed6424dcb5a6ec835e7d8d9cc00595372

diff --git a/nntp/nntp.c b/nntp/nntp.c
index d0fae27..9674316 100644
--- a/nntp/nntp.c
+++ b/nntp/nntp.c
@@ -13,6 +13,8 @@
 #include <config.h>
 #endif
 
+#include <lib-lib/mem.h>
+
 #include "mutt.h"
 #include "mutt_curses.h"
 #include "sort.h"
@@ -37,6 +39,8 @@
 #include <ctype.h>
 #include <stdlib.h>
 
+#define WANT_LISTGROUP_COMMAND          0
+
 static unsigned int _checked = 0;
 
 void nntp_sync_sidebar (NNTP_DATA* data) {
@@ -60,7 +64,6 @@ void nntp_sync_sidebar (NNTP_DATA* data) {
             *data->nserv->conn->account.pass ? data->nserv->conn->account.pass : "",
             data->nserv->conn->account.host,
             data->group);
-  debug_print (4, ("group == '%s'\n", buf));
 
   /* bail out if group not found via mailboxes */
   if ((i = buffy_lookup (buf)) < 0)
@@ -216,11 +219,13 @@ static int nntp_attempt_features (NNTP_SERVER * serv)
   if (str_ncmp ("500", buf, 3))
     serv->hasXPAT = 1;
 
+#if WANT_LISTGROUP_COMMAND
   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;
+#endif
 
   mutt_socket_write (conn, "XGTITLE +\r\n");
   if (mutt_socket_readln (buf, sizeof (buf), conn) < 0)
@@ -320,7 +325,7 @@ static int mutt_nntp_query (NNTP_DATA * data, char *line, size_t linelen)
  * -2 - invalid command or execution error,
  * -3 - error in funct(*line, *data).
  */
-static int mutt_nntp_fetch (NNTP_DATA * nntp_data, char *query, char *msg,
+static int mutt_nntp_fetch (NNTP_DATA * nntp_data, const char *query, char *msg,
                             progress_t* bar, int (*funct) (char *, void *),
                             void *data, int tagged)
 {
@@ -343,7 +348,7 @@ static int mutt_nntp_fetch (NNTP_DATA * nntp_data, char *query, char *msg,
 
     ret = 0;
     line = 0;
-    inbuf = mem_malloc (sizeof (buf));
+    inbuf = p_new(char, sizeof(buf));
 
     FOREVER {
       chunk = mutt_socket_readln_d (buf, sizeof (buf), nntp_data->nserv->conn,
@@ -387,7 +392,7 @@ static int mutt_nntp_fetch (NNTP_DATA * nntp_data, char *query, char *msg,
 
       mem_realloc (&inbuf, lenbuf + sizeof (buf));
     }
-    mem_free (&inbuf);
+    p_delete(&inbuf);
     funct (NULL, data);
   }
   while (!done);
@@ -509,14 +514,14 @@ static int parse_description (char *line, void *n)
   debug_print (2, ("group: %s, desc: %s\n", line, d));
   if ((data = (NNTP_DATA *) hash_find (news->newsgroups, line)) != NULL &&
       str_cmp (d, data->desc)) {
-    mem_free (&data->desc);
+    p_delete(&data->desc);
     data->desc = str_dup (d);
   }
   return 0;
 #undef news
 }
 
-static void nntp_get_desc (NNTP_DATA * data, char *mask, char *msg, progress_t* bar)
+static void nntp_get_desc (NNTP_DATA * data, const char *mask, char *msg, progress_t* bar)
 {
   char buf[STRING];
 
@@ -595,7 +600,7 @@ static int nntp_parse_xover (CONTEXT * ctx, char *buf, HEADER * hdr)
       hdr->received = hdr->date_sent;
       break;
     case 4:
-      mem_free (&hdr->env->message_id);
+      p_delete(&hdr->env->message_id);
       hdr->env->message_id = str_dup (b);
       break;
     case 5:
@@ -610,7 +615,7 @@ static int nntp_parse_xover (CONTEXT * ctx, char *buf, HEADER * hdr)
       break;
     case 8:
       if (!hdr->read)
-        mem_free (&hdr->env->xref);
+        p_delete(&hdr->env->xref);
       b = b + 6;                /* skips the "Xref: " */
       hdr->env->xref = str_dup (b);
       nntp_parse_xref (ctx, nntp_data->group, b, hdr);
@@ -633,6 +638,8 @@ typedef struct {
 } FETCH_CONTEXT;
 
 #define fc ((FETCH_CONTEXT *) c)
+
+#if WANT_LISTGROUP_COMMAND
 static int _nntp_fetch_numbers (unsigned int num, void *c)
 {
   if (num < fc->base || num > fc->last)
@@ -646,6 +653,7 @@ static int nntp_fetch_numbers (char *line, void *c)
     return 0;
   return (_nntp_fetch_numbers ((unsigned int) atoi (line), c));
 }
+#endif
 
 static int add_xover_line (char *line, void *c)
 {
@@ -705,7 +713,8 @@ static int nntp_fetch_headers (CONTEXT * ctx, unsigned int first,
   fc.ctx = ctx;
   fc.base = first;
   fc.last = last;
-  fc.messages = mem_calloc (last - first + 1, sizeof (unsigned short));
+  fc.messages = p_new(unsigned short, last - first + 1);
+#if WANT_LISTGROUP_COMMAND
   if (nntp_data->nserv->hasLISTGROUP) {
     snprintf (buf, sizeof (buf), "LISTGROUP %s\r\n", nntp_data->group);
     if (mutt_nntp_fetch (nntp_data, buf, NULL, NULL, nntp_fetch_numbers, &fc, 0) !=
@@ -715,14 +724,17 @@ static int nntp_fetch_headers (CONTEXT * ctx, unsigned int first,
 #ifdef DEBUG
       nntp_error ("nntp_fetch_headers()", buf);
 #endif
-      mem_free (&fc.messages);
+      p_delete(&fc.messages);
       return -1;
     }
   }
   else {
+#endif
     for (num = 0; num < last - first + 1; num++)
       fc.messages[num] = 1;
+#if WANT_LISTGROUP_COMMAND
   }
+#endif
 
   /* CACHE: must be loaded xover cache here */
   num = nntp_data->lastCached - first + 1;
@@ -759,7 +771,7 @@ static int nntp_fetch_headers (CONTEXT * ctx, unsigned int first,
   }
   num = last - first + 1;
   if (num <= 0) {
-    mem_free (&fc.messages);
+    p_delete(&fc.messages);
     return 0;
   }
 
@@ -782,7 +794,7 @@ static int nntp_fetch_headers (CONTEXT * ctx, unsigned int first,
 #ifdef DEBUG
       nntp_error ("nntp_fetch_headers()", buf);
 #endif
-      mem_free (&fc.messages);
+      p_delete(&fc.messages);
       return -1;
     }
     /* fetched OK */
@@ -811,14 +823,14 @@ static int nntp_fetch_headers (CONTEXT * ctx, unsigned int first,
       else
         mutt_free_header (&h);  /* skip it */
       if (ret == -1) {
-        mem_free (&fc.messages);
+        p_delete(&fc.messages);
         return -1;
       }
 
       if (current > nntp_data->lastLoaded)
         nntp_data->lastLoaded = current;
     }
-  mem_free (&fc.messages);
+  p_delete(&fc.messages);
   nntp_data->lastLoaded = last;
   mutt_clear_error ();
   return 0;
@@ -854,7 +866,7 @@ int nntp_open_mailbox (CONTEXT * ctx)
 
   /* create NNTP-specific state struct if nof found in list */
   if ((nntp_data = (NNTP_DATA *) hash_find (serv->newsgroups, buf)) == NULL) {
-    nntp_data = mem_calloc (1, sizeof (NNTP_DATA) + str_len (buf) + 1);
+    nntp_data = xmalloc(sizeof(NNTP_DATA) + str_len(buf) + 1);
     nntp_data->group = (char *) nntp_data + sizeof (NNTP_DATA);
     strcpy (nntp_data->group, buf);
     hash_insert (serv->newsgroups, nntp_data->group, nntp_data, 0);
@@ -941,13 +953,13 @@ int nntp_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno)
 
   /* clear the previous entry */
   unlink (cache->path);
-  free (cache->path);
+  p_delete(&cache->path);
 
   cache->index = ctx->hdrs[msgno]->index;
   mutt_mktemp (path);
   cache->path = str_dup (path);
   if (!(msg->fp = safe_fopen (path, "w+"))) {
-    mem_free (&cache->path);
+    p_delete(&cache->path);
     return -1;
   }
 
@@ -973,7 +985,7 @@ int nntp_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno)
   if (ret) {
     fclose (msg->fp);
     unlink (path);
-    mem_free (&cache->path);
+    p_delete(&cache->path);
     return -1;
   }
 
@@ -1100,22 +1112,22 @@ static void nntp_free_acache (NNTP_DATA * data)
   for (i = 0; i < NNTP_CACHE_LEN; i++) {
     if (data->acache[i].path) {
       unlink (data->acache[i].path);
-      mem_free (&data->acache[i].path);
+      p_delete(&data->acache[i].path);
     }
   }
 }
 
 void nntp_delete_data (void *p)
 {
-  NNTP_DATA *data = (NNTP_DATA *) p;
+  NNTP_DATA *data = (NNTP_DATA *)p;
 
   if (!p)
     return;
-  mem_free (&data->entries);
-  mem_free (&data->desc);
-  mem_free (&data->cache);
+  p_delete(&data->entries);
+  p_delete(&data->desc);
+  p_delete(&data->cache);
   nntp_free_acache (data);
-  mem_free (p);
+  p_delete(&data);
 }
 
 int nntp_sync_mailbox (CONTEXT * ctx, int unused1, int* unused2)
@@ -1224,7 +1236,7 @@ static int _nntp_check_mailbox (CONTEXT * ctx, NNTP_DATA * nntp_data)
     /* active was renumbered? */
     if (last < nntp_data->lastLoaded) {
       if (!nntp_data->max) {
-        nntp_data->entries = mem_calloc (5, sizeof (NEWSRC_ENTRY));
+        nntp_data->entries = p_new(NEWSRC_ENTRY, 5);
         nntp_data->max = 5;
       }
       nntp_data->lastCached = 0;
@@ -1265,7 +1277,7 @@ static int add_group (char *buf, void *serv)
     return 0;
   if ((nntp_data = (NNTP_DATA *) hash_find (s->newsgroups, group)) == NULL) {
     n++;
-    nntp_data = mem_calloc (1, sizeof (NNTP_DATA) + str_len (group) + 1);
+    nntp_data = xmalloc(sizeof(NNTP_DATA) + str_len(group) + 1);
     nntp_data->group = (char *) nntp_data + sizeof (NNTP_DATA);
     strcpy (nntp_data->group, group);
     nntp_data->nserv = s;
@@ -1282,7 +1294,7 @@ static int add_group (char *buf, void *serv)
   else
     nntp_data->allowed = 0;
   if (nntp_data->desc)
-    mem_free (&nntp_data->desc);
+    p_delete(&nntp_data->desc);
   if (*desc)
     nntp_data->desc = str_dup (desc);
   if (nntp_data->rc || nntp_data->lastCached)
@@ -1389,7 +1401,7 @@ int nntp_get_cache_all (NNTP_SERVER * serv)
     return 0;
   }
   else {
-    mem_free (&serv->cache);
+    p_delete(&serv->cache);
     return -1;
   }
 }
@@ -1517,9 +1529,9 @@ int nntp_check_children (CONTEXT * ctx, const char *msgid)
   cc.ctx = ctx;
   cc.num = 0;
   cc.max = 25;
-  cc.child = mem_malloc (sizeof (unsigned int) * 25);
+  cc.child = p_new(unsigned int, 25);
   if (mutt_nntp_fetch (nntp_data, buf, NULL, NULL, check_children, &cc, 0)) {
-    mem_free (&cc.child);
+    p_delete(&cc.child);
     return -1;
   }
   /* dont try to read the xover cache. check_children() already
@@ -1539,6 +1551,6 @@ int nntp_check_children (CONTEXT * ctx, const char *msgid)
   }
   if (tmp)
     set_option (OPTNEWSCACHE);
-  mem_free (&cc.child);
+  p_delete(&cc.child);
   return ret;
 }