X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=nntp%2Fnntp.c;h=de689161f80b6fb0eb97748a8398dfe1d1f7b038;hp=d21f30d3306897dc5b36670c1c785999b407167c;hb=ca1036a5694287e6ccf6d95af9e33a7e1d5a75fd;hpb=e16543ec43d80694edd9d727ccbd36079198a82b

diff --git a/nntp/nntp.c b/nntp/nntp.c
index d21f30d..de68916 100644
--- a/nntp/nntp.c
+++ b/nntp/nntp.c
@@ -74,7 +74,7 @@ static int nntp_auth (NNTP_SERVER * serv)
     return -1;
   }
 
-  if (safe_strncmp ("281", buf, 3)) {
+  if (str_ncmp ("281", buf, 3)) {
     conn->account.flags = flags;
     mutt_error _("Login failed.");
 
@@ -109,13 +109,13 @@ static int nntp_connect_and_auth (NNTP_SERVER * serv)
   if (mutt_socket_readln (buf, sizeof (buf), conn) < 0)
     return nntp_connect_error (serv);
 
-  if (!safe_strncmp ("200", buf, 3))
+  if (!str_ncmp ("200", buf, 3))
     mutt_message (_("Connected to %s. Posting ok."), conn->account.host);
-  else if (!safe_strncmp ("201", buf, 3))
+  else if (!str_ncmp ("201", buf, 3))
     mutt_message (_("Connected to %s. Posting NOT ok."), conn->account.host);
   else {
     mutt_socket_close (conn);
-    mutt_remove_trailing_ws (buf);
+    str_skip_trailws (buf);
     mutt_error ("%s", buf);
     sleep (2);
     return -1;
@@ -133,7 +133,7 @@ static int nntp_connect_and_auth (NNTP_SERVER * serv)
   if (mutt_socket_readln (buf, sizeof (buf), conn) < 0)
     return nntp_connect_error (serv);
 
-  if (!(conn->account.flags & M_ACCT_USER) && safe_strncmp ("480", buf, 3)) {
+  if (!(conn->account.flags & M_ACCT_USER) && str_ncmp ("480", buf, 3)) {
     serv->status = NNTP_OK;
     return 0;
   }
@@ -162,31 +162,31 @@ 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 (safe_strncmp ("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);
-  if (safe_strncmp ("500", buf, 3))
+  if (str_ncmp ("500", buf, 3))
     serv->hasXOVER = 1;
 
   mutt_socket_write (conn, "XPAT\r\n");
   if (mutt_socket_readln (buf, sizeof (buf), conn) < 0)
     return nntp_connect_error (serv);
-  if (safe_strncmp ("500", buf, 3))
+  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);
-  if (safe_strncmp ("500", buf, 3))
+  if (str_ncmp ("500", buf, 3))
     serv->hasXGTITLE = 1;
 
-  if (!safe_strncmp ("282", buf, 3)) {
+  if (!str_ncmp ("282", buf, 3)) {
     do {
       if (mutt_socket_readln (buf, sizeof (buf), conn) < 0)
         return nntp_connect_error (serv);
@@ -260,7 +260,7 @@ static int mutt_nntp_query (NNTP_DATA * data, char *line, size_t linelen)
       if (*line)
         done = FALSE;
     }
-    else if ((!safe_strncmp ("480", buf, 3)) && nntp_auth (data->nserv) < 0)
+    else if ((!str_ncmp ("480", buf, 3)) && nntp_auth (data->nserv) < 0)
       return -1;
   } while (!done);
 
@@ -300,7 +300,7 @@ static int mutt_nntp_fetch (NNTP_DATA * nntp_data, char *query, char *msg,
 
     ret = 0;
     line = 0;
-    inbuf = safe_malloc (sizeof (buf));
+    inbuf = mem_malloc (sizeof (buf));
 
     FOREVER {
       chunk = mutt_socket_readln_d (buf, sizeof (buf), nntp_data->nserv->conn,
@@ -321,7 +321,7 @@ static int mutt_nntp_fetch (NNTP_DATA * nntp_data, char *query, char *msg,
       strfcpy (inbuf + lenbuf, p, sizeof (buf));
 
       if (chunk >= sizeof (buf)) {
-        lenbuf += safe_strlen (p);
+        lenbuf += str_len (p);
       }
       else {
         line++;
@@ -337,9 +337,9 @@ static int mutt_nntp_fetch (NNTP_DATA * nntp_data, char *query, char *msg,
         lenbuf = 0;
       }
 
-      safe_realloc (&inbuf, lenbuf + sizeof (buf));
+      mem_realloc (&inbuf, lenbuf + sizeof (buf));
     }
-    FREE (&inbuf);
+    mem_free (&inbuf);
     funct (NULL, data);
   }
   while (!done);
@@ -388,7 +388,7 @@ static void nntp_parse_xref (CONTEXT * ctx, char *group, char *xref,
       *colon = '\0';
       colon++;
       nntp_get_status (ctx, h, p, atoi (colon));
-      if (h && h->article_num == 0 && safe_strcmp (group, b) == 0)
+      if (h && h->article_num == 0 && str_cmp (group, b) == 0)
         h->article_num = atoi (colon);
     }
   }
@@ -460,9 +460,9 @@ static int parse_description (char *line, void *n)
     d++;
   debug_print (2, ("group: %s, desc: %s\n", line, d));
   if ((data = (NNTP_DATA *) hash_find (news->newsgroups, line)) != NULL &&
-      safe_strcmp (d, data->desc)) {
-    FREE (&data->desc);
-    data->desc = safe_strdup (d);
+      str_cmp (d, data->desc)) {
+    mem_free (&data->desc);
+    data->desc = str_dup (d);
   }
   return 0;
 #undef news
@@ -503,10 +503,10 @@ static int nntp_parse_xover (CONTEXT * ctx, char *buf, HEADER * hdr)
   int x, done = 0;
 
   hdr->env = mutt_new_envelope ();
-  hdr->env->newsgroups = safe_strdup (nntp_data->group);
+  hdr->env->newsgroups = str_dup (nntp_data->group);
   hdr->content = mutt_new_body ();
   hdr->content->type = TYPETEXT;
-  hdr->content->subtype = safe_strdup ("plain");
+  hdr->content->subtype = str_dup ("plain");
   hdr->content->encoding = ENC7BIT;
   hdr->content->disposition = DISPINLINE;
   hdr->content->length = -1;
@@ -527,7 +527,7 @@ static int nntp_parse_xover (CONTEXT * ctx, char *buf, HEADER * hdr)
       nntp_get_status (ctx, hdr, NULL, hdr->article_num);
       break;
     case 1:
-      hdr->env->subject = safe_strdup (b);
+      hdr->env->subject = str_dup (b);
       /* Now we need to do the things which would normally be done in 
        * mutt_read_rfc822_header() */
       if (hdr->env->subject) {
@@ -551,8 +551,8 @@ static int nntp_parse_xover (CONTEXT * ctx, char *buf, HEADER * hdr)
       hdr->received = hdr->date_sent;
       break;
     case 4:
-      FREE (&hdr->env->message_id);
-      hdr->env->message_id = safe_strdup (b);
+      mem_free (&hdr->env->message_id);
+      hdr->env->message_id = str_dup (b);
       break;
     case 5:
       mutt_free_list (&hdr->env->references);
@@ -566,9 +566,9 @@ static int nntp_parse_xover (CONTEXT * ctx, char *buf, HEADER * hdr)
       break;
     case 8:
       if (!hdr->read)
-        FREE (&hdr->env->xref);
+        mem_free (&hdr->env->xref);
       b = b + 6;                /* skips the "Xref: " */
-      hdr->env->xref = safe_strdup (b);
+      hdr->env->xref = str_dup (b);
       nntp_parse_xref (ctx, nntp_data->group, b, hdr);
     }
     if (!*p)
@@ -659,7 +659,7 @@ static int nntp_fetch_headers (CONTEXT * ctx, unsigned int first,
   fc.ctx = ctx;
   fc.base = first;
   fc.last = last;
-  fc.messages = safe_calloc (last - first + 1, sizeof (unsigned short));
+  fc.messages = mem_calloc (last - first + 1, sizeof (unsigned short));
   if (nntp_data->nserv->hasLISTGROUP) {
     snprintf (buf, sizeof (buf), "LISTGROUP %s\r\n", nntp_data->group);
     if (mutt_nntp_fetch (nntp_data, buf, NULL, nntp_fetch_numbers, &fc, 0) !=
@@ -669,24 +669,13 @@ static int nntp_fetch_headers (CONTEXT * ctx, unsigned int first,
 #ifdef DEBUG
       nntp_error ("nntp_fetch_headers()", buf);
 #endif
-      FREE (&fc.messages);
+      mem_free (&fc.messages);
       return -1;
     }
   }
   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);
-      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 */
@@ -721,7 +710,7 @@ static int nntp_fetch_headers (CONTEXT * ctx, unsigned int first,
   }
   num = last - first + 1;
   if (num <= 0) {
-    FREE (&fc.messages);
+    mem_free (&fc.messages);
     return 0;
   }
 
@@ -744,7 +733,7 @@ static int nntp_fetch_headers (CONTEXT * ctx, unsigned int first,
 #ifdef DEBUG
       nntp_error ("nntp_fetch_headers()", buf);
 #endif
-      FREE (&fc.messages);
+      mem_free (&fc.messages);
       return -1;
     }
     /* fetched OK */
@@ -773,14 +762,14 @@ static int nntp_fetch_headers (CONTEXT * ctx, unsigned int first,
       else
         mutt_free_header (&h);  /* skip it */
       if (ret == -1) {
-        FREE (&fc.messages);
+        mem_free (&fc.messages);
         return -1;
       }
 
       if (current > nntp_data->lastLoaded)
         nntp_data->lastLoaded = current;
     }
-  FREE (&fc.messages);
+  mem_free (&fc.messages);
   nntp_data->lastLoaded = last;
   mutt_clear_error ();
   return 0;
@@ -814,7 +803,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 = safe_calloc (1, sizeof (NNTP_DATA) + safe_strlen (buf) + 1);
+    nntp_data = mem_calloc (1, 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);
@@ -839,11 +828,11 @@ int nntp_open_mailbox (CONTEXT * ctx)
     return -1;
   }
 
-  if (safe_strncmp ("211", buf, 3)) {
+  if (str_ncmp ("211", buf, 3)) {
     LIST *l = serv->list;
 
     /* GROUP command failed */
-    if (!safe_strncmp ("411", buf, 3)) {
+    if (!str_ncmp ("411", buf, 3)) {
       mutt_error (_("Newsgroup %s not found on server %s"),
                   nntp_data->group, serv->conn->account.host);
 
@@ -907,9 +896,9 @@ int nntp_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno)
 
   cache->index = ctx->hdrs[msgno]->index;
   mutt_mktemp (path);
-  cache->path = safe_strdup (path);
+  cache->path = str_dup (path);
   if (!(msg->fp = safe_fopen (path, "w+"))) {
-    FREE (&cache->path);
+    mem_free (&cache->path);
     return -1;
   }
 
@@ -931,7 +920,7 @@ int nntp_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno)
   if (ret) {
     fclose (msg->fp);
     unlink (path);
-    FREE (&cache->path);
+    mem_free (&cache->path);
     return -1;
   }
 
@@ -999,7 +988,7 @@ int nntp_post (const char *msg)
   buf[0] = '.';
   buf[1] = '\0';
   while (fgets (buf + 1, sizeof (buf) - 2, f) != NULL) {
-    len = safe_strlen (buf);
+    len = str_len (buf);
     if (buf[len - 1] == '\n') {
       buf[len - 1] = '\r';
       buf[len] = '\n';
@@ -1013,7 +1002,7 @@ int nntp_post (const char *msg)
   }
   fclose (f);
 
-  if (buf[safe_strlen (buf) - 1] != '\n')
+  if (buf[str_len (buf) - 1] != '\n')
     mutt_socket_write_d (nntp_data->nserv->conn, "\r\n", M_SOCK_LOG_HDR);
   mutt_socket_write_d (nntp_data->nserv->conn, ".\r\n", M_SOCK_LOG_HDR);
   if (mutt_socket_readln (buf, sizeof (buf), nntp_data->nserv->conn) < 0) {
@@ -1034,24 +1023,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;
   }
 }
 
@@ -1062,7 +1047,7 @@ 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);
-      FREE (&data->acache[i].path);
+      mem_free (&data->acache[i].path);
     }
   }
 }
@@ -1073,11 +1058,11 @@ void nntp_delete_data (void *p)
 
   if (!p)
     return;
-  FREE (&data->entries);
-  FREE (&data->desc);
-  FREE (&data->cache);
+  mem_free (&data->entries);
+  mem_free (&data->desc);
+  mem_free (&data->cache);
   nntp_free_acache (data);
-  FREE (p);
+  mem_free (p);
 }
 
 int nntp_sync_mailbox (CONTEXT * ctx, int unused1, int* unused2)
@@ -1156,7 +1141,7 @@ static int _nntp_check_mailbox (CONTEXT * ctx, NNTP_DATA * nntp_data)
 #endif
     return -1;
   }
-  if (safe_strncmp ("211", buf, 3)) {
+  if (str_ncmp ("211", buf, 3)) {
     buf[0] = 0;
     if (mutt_nntp_query (nntp_data, buf, sizeof (buf)) < 0) {
 #ifdef DEBUG
@@ -1165,7 +1150,7 @@ static int _nntp_check_mailbox (CONTEXT * ctx, NNTP_DATA * nntp_data)
       return -1;
     }
   }
-  if (!safe_strncmp ("211", buf, 3)) {
+  if (!str_ncmp ("211", buf, 3)) {
     int first;
     int last;
 
@@ -1184,7 +1169,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 = safe_calloc (5, sizeof (NEWSRC_ENTRY));
+        nntp_data->entries = mem_calloc (5, sizeof (NEWSRC_ENTRY));
         nntp_data->max = 5;
       }
       nntp_data->lastCached = 0;
@@ -1198,7 +1183,7 @@ static int _nntp_check_mailbox (CONTEXT * ctx, NNTP_DATA * nntp_data)
   return 0;
 }
 
-int nntp_check_mailbox (CONTEXT * ctx)
+int nntp_check_mailbox (CONTEXT * ctx, int* unused1, int unused2)
 {
   return _nntp_check_mailbox (ctx, (NNTP_DATA *) ctx->data);
 }
@@ -1224,7 +1209,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 = safe_calloc (1, sizeof (NNTP_DATA) + safe_strlen (group) + 1);
+    nntp_data = mem_calloc (1, 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;
@@ -1241,9 +1226,9 @@ static int add_group (char *buf, void *serv)
   else
     nntp_data->allowed = 0;
   if (nntp_data->desc)
-    FREE (&nntp_data->desc);
+    mem_free (&nntp_data->desc);
   if (*desc)
-    nntp_data->desc = safe_strdup (desc);
+    nntp_data->desc = str_dup (desc);
   if (nntp_data->rc || nntp_data->lastCached)
     mutt_newsgroup_stat (nntp_data);
   else if (nntp_data->lastMessage &&
@@ -1347,7 +1332,7 @@ int nntp_get_cache_all (NNTP_SERVER * serv)
     return 0;
   }
   else {
-    FREE (&serv->cache);
+    mem_free (&serv->cache);
     return -1;
   }
 }
@@ -1444,7 +1429,7 @@ static int check_children (char *s, void *c)
     if (cc->ctx->hdrs[i]->article_num == n)
       return 0;
   if (cc->num >= cc->max)
-    safe_realloc (&cc->child, sizeof (unsigned int) * (cc->max += 25));
+    mem_realloc (&cc->child, sizeof (unsigned int) * (cc->max += 25));
   cc->child[cc->num++] = n;
 
   return 0;
@@ -1475,9 +1460,9 @@ int nntp_check_children (CONTEXT * ctx, const char *msgid)
   cc.ctx = ctx;
   cc.num = 0;
   cc.max = 25;
-  cc.child = safe_malloc (sizeof (unsigned int) * 25);
+  cc.child = mem_malloc (sizeof (unsigned int) * 25);
   if (mutt_nntp_fetch (nntp_data, buf, NULL, check_children, &cc, 0)) {
-    FREE (&cc.child);
+    mem_free (&cc.child);
     return -1;
   }
   /* dont try to read the xover cache. check_children() already
@@ -1497,6 +1482,6 @@ int nntp_check_children (CONTEXT * ctx, const char *msgid)
   }
   if (tmp)
     set_option (OPTNEWSCACHE);
-  FREE (&cc.child);
+  mem_free (&cc.child);
   return ret;
 }