move debug.c

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

diff --git a/nntp/nntp.c b/nntp/nntp.c
index 24850c8..159d2e1 100644 (file)
--- a/nntp/nntp.c
+++ b/nntp/nntp.c
@@ -15,23 +15,25 @@
 
 #include <lib-lib/mem.h>
 #include <lib-lib/str.h>
+#include <lib-lib/file.h>
 #include <lib-lib/macros.h>
+#include <lib-lib/debug.h>
+
+#include <lib-mime/mime.h>
+
+#include <lib-ui/curses.h>
 
 #include "mutt.h"
-#include "mutt_curses.h"
 #include "sort.h"
 #include "mx.h"
 #include "mx_nntp.h"
-#include "mime.h"
 #include "rfc1524.h"
-#include "rfc2047.h"
 #include "nntp.h"
 #include "sidebar.h"
 #include "buffy.h"
 
-#include "mutt_crypt.h"
+#include <lib-crypt/crypt.h>
 
-#include "lib/debug.h"
 
 #include <unistd.h>
 #include <string.h>
@@ -118,7 +120,7 @@ static int nntp_auth (NNTP_SERVER * serv)
     return -1;
   }
 
-  if (str_ncmp ("281", buf, 3)) {
+  if (m_strncmp("281", buf, 3)) {
     conn->account.flags = flags;
     mutt_error _("Login failed.");
 
@@ -153,14 +155,14 @@ static int nntp_connect_and_auth (NNTP_SERVER * serv)
   if (mutt_socket_readln (buf, sizeof (buf), conn) < 0)
     return nntp_connect_error (serv);
 
-  if (!str_ncmp ("200", buf, 3))
+  if (!m_strncmp("200", buf, 3))
     mutt_message (_("Connected to %s. Posting ok."), conn->account.host);
-  else if (!str_ncmp ("201", buf, 3))
+  else if (!m_strncmp("201", buf, 3))
     mutt_message (_("Connected to %s. Posting NOT ok."), conn->account.host);
   else {
-    mutt_socket_close (conn);
-    str_skip_trailws (buf);
-    mutt_error ("%s", buf);
+    mutt_socket_close(conn);
+    m_strrtrim(buf);
+    mutt_error("%s", buf);
     sleep (2);
     return -1;
   }
@@ -177,7 +179,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) && str_ncmp ("480", buf, 3)) {
+  if (!(conn->account.flags & M_ACCT_USER) && m_strncmp("480", buf, 3)) {
     serv->status = NNTP_OK;
     return 0;
   }
@@ -209,30 +211,30 @@ static int nntp_attempt_features (NNTP_SERVER * serv)
   mutt_socket_write (conn, "XOVER\r\n");
   if (mutt_socket_readln (buf, sizeof (buf), conn) < 0)
     return nntp_connect_error (serv);
-  if (str_ncmp ("500", buf, 3))
+  if (m_strncmp("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 (str_ncmp ("500", buf, 3))
+  if (m_strncmp("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))
+  if (m_strncmp("500", buf, 3))
     serv->hasLISTGROUP = 1;
 #endif
 
   mutt_socket_write (conn, "XGTITLE +\r\n");
   if (mutt_socket_readln (buf, sizeof (buf), conn) < 0)
     return nntp_connect_error (serv);
-  if (str_ncmp ("500", buf, 3))
+  if (m_strncmp("500", buf, 3))
     serv->hasXGTITLE = 1;
 
-  if (!str_ncmp ("282", buf, 3)) {
+  if (!m_strncmp("282", buf, 3)) {
     do {
       if (mutt_socket_readln (buf, sizeof (buf), conn) < 0)
         return nntp_connect_error (serv);
@@ -261,7 +263,7 @@ static int nntp_reconnect (NNTP_SERVER * serv)
 
   mutt_socket_close (serv->conn);
 
-  FOREVER {
+  for (;;) {
     if (nntp_connect_and_auth (serv) == 0)
       return 0;
 
@@ -306,11 +308,11 @@ static int mutt_nntp_query (NNTP_DATA * data, char *line, size_t linelen)
       if (*line)
         done = FALSE;
     }
-    else if ((!str_ncmp ("480", buf, 3)) && nntp_auth (data->nserv) < 0)
+    else if ((!m_strncmp("480", buf, 3)) && nntp_auth (data->nserv) < 0)
       return -1;
   } while (!done);
 
-  strfcpy (line, buf, linelen);
+  m_strcpy(line, linelen, buf);
   return 0;
 }
 
@@ -337,7 +339,7 @@ static int mutt_nntp_fetch (NNTP_DATA * nntp_data, const char *query, char *msg,
   int ret;
 
   do {
-    strfcpy (buf, query, sizeof (buf));
+    m_strcpy(buf, sizeof(buf), query);
     if (mutt_nntp_query (nntp_data, buf, sizeof (buf)) < 0)
       return -1;
     if (buf[0] == '5')
@@ -349,7 +351,7 @@ static int mutt_nntp_fetch (NNTP_DATA * nntp_data, const char *query, char *msg,
     line = 0;
     inbuf = p_new(char, sizeof(buf));
 
-    FOREVER {
+    for (;;) {
       chunk = mutt_socket_readln_d (buf, sizeof (buf), nntp_data->nserv->conn,
                                     M_SOCK_LOG_HDR);
       if (chunk < 0)
@@ -365,7 +367,7 @@ static int mutt_nntp_fetch (NNTP_DATA * nntp_data, const char *query, char *msg,
           p++;
       }
 
-      strfcpy (inbuf + lenbuf, p, sizeof (buf));
+      m_strcpy(inbuf + lenbuf, sizeof(buf), p);
       pos += chunk;
 
       if (chunk >= sizeof (buf)) {
@@ -440,7 +442,7 @@ static void nntp_parse_xref (CONTEXT * ctx, char *group, char *xref,
       *colon = '\0';
       colon++;
       nntp_get_status (ctx, h, b, atoi (colon));
-      if (h && h->article_num == 0 && str_cmp (group, b) == 0)
+      if (h && h->article_num == 0 && m_strcmp(group, b) == 0)
         h->article_num = atoi (colon);
     }
   }
@@ -512,7 +514,7 @@ 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 &&
-      str_cmp (d, data->desc)) {
+      m_strcmp(d, data->desc)) {
     p_delete(&data->desc);
     data->desc = m_strdup(d);
   }
@@ -554,7 +556,7 @@ static int nntp_parse_xover (CONTEXT * ctx, char *buf, HEADER * hdr)
   char *p, *b;
   int x, done = 0;
 
-  hdr->env = mutt_new_envelope ();
+  hdr->env = envelope_new();
   hdr->env->newsgroups = m_strdup(nntp_data->group);
   hdr->content = mutt_new_body ();
   hdr->content->type = TYPETEXT;
@@ -582,7 +584,7 @@ static int nntp_parse_xover (CONTEXT * ctx, char *buf, HEADER * hdr)
       hdr->env->subject = m_strdup(b);
       break;
     case 2:
-      rfc822_free_address (&hdr->env->from);
+      address_delete (&hdr->env->from);
       hdr->env->from = rfc822_parse_adrlist (hdr->env->from, b);
       /* same as for mutt_parse_rfc822_line():
        * don't leave from info NULL if there's an invalid address (or
@@ -590,7 +592,7 @@ static int nntp_parse_xover (CONTEXT * ctx, char *buf, HEADER * hdr)
        * and mark mail/(esp.) news article as your own. aaargh! this
        * bothered me for _years_ */
       if (!hdr->env->from) {
-        hdr->env->from = rfc822_new_address ();
+        hdr->env->from = address_new ();
         hdr->env->from->personal = m_strdup(b);
       }
       break;
@@ -619,7 +621,7 @@ static int nntp_parse_xover (CONTEXT * ctx, char *buf, HEADER * hdr)
       hdr->env->xref = m_strdup(b);
       nntp_parse_xref (ctx, nntp_data->group, b, hdr);
     }
-    rfc2047_decode_envelope (hdr->env);
+    rfc2047_decode_envelope(hdr->env);
     if (!*p)
       return -1;
     b = p;
@@ -665,7 +667,7 @@ static int add_xover_line (char *line, void *c)
 
   if (ctx->msgcount >= ctx->hdrmax)
     mx_alloc_memory (ctx);
-  ctx->hdrs[ctx->msgcount] = mutt_new_header ();
+  ctx->hdrs[ctx->msgcount] = header_new();
   ctx->hdrs[ctx->msgcount]->index = ctx->msgcount;
 
   nntp_parse_xover (ctx, line, ctx->hdrs[ctx->msgcount]);
@@ -681,7 +683,7 @@ static int add_xover_line (char *line, void *c)
       mutt_message ("%s %d/%d", fc->msg, num, total);
   }
   else
-    mutt_free_header (&ctx->hdrs[ctx->msgcount]);       /* skip it */
+    header_delete(&ctx->hdrs[ctx->msgcount]);       /* skip it */
 
   return 0;
 }
@@ -810,7 +812,7 @@ static int nntp_fetch_headers (CONTEXT * ctx, unsigned int first,
 
       if (ctx->msgcount >= ctx->hdrmax)
         mx_alloc_memory (ctx);
-      h = ctx->hdrs[ctx->msgcount] = mutt_new_header ();
+      h = ctx->hdrs[ctx->msgcount] = header_new();
       h->index = ctx->msgcount;
 
       ret = nntp_read_header (ctx, NULL, current);
@@ -820,7 +822,7 @@ static int nntp_fetch_headers (CONTEXT * ctx, unsigned int first,
         mx_update_context (ctx, 1);
       }
       else
-        mutt_free_header (&h);  /* skip it */
+        header_delete(&h);  /* skip it */
       if (ret == -1) {
         p_delete(&fc.messages);
         return -1;
@@ -890,11 +892,11 @@ int nntp_open_mailbox (CONTEXT * ctx)
     return -1;
   }
 
-  if (str_ncmp ("211", buf, 3)) {
+  if (m_strncmp("211", buf, 3)) {
     LIST *l = serv->list;
 
     /* GROUP command failed */
-    if (!str_ncmp ("411", buf, 3)) {
+    if (!m_strncmp("411", buf, 3)) {
       mutt_error (_("Newsgroup %s not found on server %s"),
                   nntp_data->group, serv->conn->account.host);
 
@@ -988,7 +990,7 @@ int nntp_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno)
     return -1;
   }
 
-  mutt_free_envelope (&ctx->hdrs[msgno]->env);
+  envelope_delete(&ctx->hdrs[msgno]->env);
   ctx->hdrs[msgno]->env =
     mutt_read_rfc822_header (msg->fp, ctx->hdrs[msgno], 0, 0);
   /* fix content length */
@@ -1038,7 +1040,7 @@ int nntp_post (const char *msg)
     return -1;
   }
 
-  strfcpy (buf, "POST\r\n", sizeof (buf));
+  m_strcpy(buf, sizeof(buf), "POST\r\n");
   if (mutt_nntp_query (nntp_data, buf, sizeof (buf)) < 0) {
     mutt_error (_("Can't post article. Connection to %s lost."),
                 nntp_data->nserv->conn->account.host);
@@ -1207,7 +1209,7 @@ static int _nntp_check_mailbox (CONTEXT * ctx, NNTP_DATA * nntp_data)
 #endif
     return -1;
   }
-  if (str_ncmp ("211", buf, 3)) {
+  if (m_strncmp("211", buf, 3)) {
     buf[0] = 0;
     if (mutt_nntp_query (nntp_data, buf, sizeof (buf)) < 0) {
 #ifdef DEBUG
@@ -1216,7 +1218,7 @@ static int _nntp_check_mailbox (CONTEXT * ctx, NNTP_DATA * nntp_data)
       return -1;
     }
   }
-  if (!str_ncmp ("211", buf, 3)) {
+  if (!m_strncmp("211", buf, 3)) {
     int first;
     int last;
 
@@ -1430,7 +1432,7 @@ int nntp_get_active (NNTP_SERVER * serv)
     return -1;
   }
 
-  strfcpy (msg, _("Loading descriptions..."), sizeof (msg));
+  m_strcpy(msg, sizeof(msg), _("Loading descriptions..."));
   mutt_message (msg);
   nntp_get_desc (&nntp_data, "*", msg, NULL);
 
@@ -1462,7 +1464,7 @@ int nntp_check_msgid (CONTEXT * ctx, const char *msgid)
     return 1;
   if (ctx->msgcount == ctx->hdrmax)
     mx_alloc_memory (ctx);
-  ctx->hdrs[ctx->msgcount] = mutt_new_header ();
+  ctx->hdrs[ctx->msgcount] = header_new();
   ctx->hdrs[ctx->msgcount]->index = ctx->msgcount;
 
   mutt_message (_("Fetching %s from server..."), msgid);
@@ -1470,7 +1472,7 @@ int nntp_check_msgid (CONTEXT * ctx, const char *msgid)
   /* since nntp_read_header() may set read flag, we must reset it */
   ctx->hdrs[ctx->msgcount]->read = 0;
   if (ret != 0)
-    mutt_free_header (&ctx->hdrs[ctx->msgcount]);
+    header_delete(&ctx->hdrs[ctx->msgcount]);
   else {
     ctx->msgcount++;
     mx_update_context (ctx, 1);