X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=nntp%2Fnntp.c;h=2141454cf26469bad330fb80c716d79b0045b72a;hb=011e430fa558910ad28eb49937c328602dadb198;hp=2977f0c94ed5c7c5177b6a3e53437e99b76ab4bf;hpb=108f3c7ab59844591f7540347914ea57be5245e2;p=apps%2Fmadmutt.git

diff --git a/nntp/nntp.c b/nntp/nntp.c
index 2977f0c..2141454 100644
--- a/nntp/nntp.c
+++ b/nntp/nntp.c
@@ -9,37 +9,20 @@
  * please see the file GPL in the top level source directory.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#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-lib/lib-lib.h>
 
 #include <lib-mime/mime.h>
-
 #include <lib-ui/curses.h>
+#include <lib-ui/sidebar.h>
+#include <lib-mx/mx.h>
 
 #include "mutt.h"
 #include "sort.h"
-#include "mx.h"
-#include "mx_nntp.h"
-#include "rfc1524.h"
 #include "nntp.h"
-#include "sidebar.h"
 #include "buffy.h"
 
 #include <lib-crypt/crypt.h>
 
-
-#include <unistd.h>
-#include <string.h>
-#include <ctype.h>
-#include <stdlib.h>
-
 #define WANT_LISTGROUP_COMMAND          0
 
 static unsigned int _checked = 0;
@@ -49,7 +32,7 @@ void nntp_sync_sidebar (NNTP_DATA* data) {
   BUFFY* tmp = NULL;
   char buf[STRING];
 
-  if (list_empty (Incoming))
+  if (!Incoming.len)
     return;
 
   /* unfortunately, NNTP_DATA::group only is the plain
@@ -70,7 +53,7 @@ void nntp_sync_sidebar (NNTP_DATA* data) {
   if ((i = buffy_lookup (buf)) < 0)
     return;
 
-  tmp = (BUFFY*) Incoming->data[i];
+  tmp = Incoming.arr[i];
   /* copied from browser.c */
   if (option (OPTMARKOLD) &&
       data->lastCached >= data->firstMessage &&
@@ -83,10 +66,6 @@ void nntp_sync_sidebar (NNTP_DATA* data) {
   tmp->msgcount = data->lastMessage - data->firstMessage;
 }
 
-static void nntp_error (const char *where, const char *msg) {
-  debug_print (1, ("unexpected response in %s: %s\n", where, msg));
-}
-
 static int nntp_auth (NNTP_SERVER * serv)
 {
   CONNECTION *conn = serv->conn;
@@ -108,13 +87,8 @@ static int nntp_auth (NNTP_SERVER * serv)
     return -1;
   }
 
-#ifdef DEBUG
-  /* don't print the password unless we're at the ungodly debugging level */
-  if (DebugLevel < M_SOCK_LOG_FULL)
-    debug_print (M_SOCK_LOG_CMD, ("> AUTHINFO PASS *\n"));
-#endif
   snprintf (buf, sizeof (buf), "AUTHINFO PASS %s\r\n", conn->account.pass);
-  mutt_socket_write_d (conn, buf, M_SOCK_LOG_FULL);
+  mutt_socket_write(conn, buf);
   if (mutt_socket_readln (buf, sizeof (buf), conn) < 0) {
     conn->account.flags = flags;
     return -1;
@@ -352,8 +326,7 @@ static int mutt_nntp_fetch (NNTP_DATA * nntp_data, const char *query, char *msg,
     inbuf = p_new(char, sizeof(buf));
 
     for (;;) {
-      chunk = mutt_socket_readln_d (buf, sizeof (buf), nntp_data->nserv->conn,
-                                    M_SOCK_LOG_HDR);
+      chunk = mutt_socket_readln(buf, sizeof (buf), nntp_data->nserv->conn);
       if (chunk < 0)
         break;
 
@@ -370,7 +343,7 @@ static int mutt_nntp_fetch (NNTP_DATA * nntp_data, const char *query, char *msg,
       m_strcpy(inbuf + lenbuf, sizeof(buf), p);
       pos += chunk;
 
-      if (chunk >= sizeof (buf)) {
+      if (chunk >= ssizeof (buf)) {
         lenbuf += m_strlen(p);
       }
       else {
@@ -475,8 +448,6 @@ static int nntp_read_header (CONTEXT * ctx, const char *msgid,
 
   ret = mutt_nntp_fetch (nntp_data, buf, NULL, NULL, nntp_read_tempfile, f, 0);
   if (ret) {
-    if (ret != -1)
-      debug_print (1, ("%s\n", buf));
     fclose (f);
     unlink (tempfile);
     return (ret == -1 ? -1 : 1);
@@ -512,7 +483,6 @@ static int parse_description (char *line, void *n)
   d++;
   while (*d && (*d == '\t' || *d == ' '))
     d++;
-  debug_print (2, ("group: %s, desc: %s\n", line, d));
   if ((data = (NNTP_DATA *) hash_find (news->newsgroups, line)) != NULL &&
       m_strcmp(d, data->desc)) {
     p_delete(&data->desc);
@@ -536,9 +506,6 @@ static void nntp_get_desc (NNTP_DATA * data, const char *mask, char *msg, progre
     snprintf (buf, sizeof (buf), "string_list_t NEWSGROUPS %s\r\n", mask);
   if (mutt_nntp_fetch (data, buf, msg, bar, parse_description, data->nserv, 0) !=
       0) {
-#ifdef DEBUG
-    nntp_error ("nntp_get_desc()", buf);
-#endif
   }
 }
 
@@ -558,7 +525,7 @@ static int nntp_parse_xover (CONTEXT * ctx, char *buf, HEADER * hdr)
 
   hdr->env = envelope_new();
   hdr->env->newsgroups = m_strdup(nntp_data->group);
-  hdr->content = mutt_new_body ();
+  hdr->content = body_new();
   hdr->content->type = TYPETEXT;
   hdr->content->subtype = m_strdup("plain");
   hdr->content->encoding = ENC7BIT;
@@ -722,9 +689,6 @@ static int nntp_fetch_headers (CONTEXT * ctx, unsigned int first,
         0) {
       mutt_error (_("LISTGROUP command failed: %s"), buf);
       sleep (2);
-#ifdef DEBUG
-      nntp_error ("nntp_fetch_headers()", buf);
-#endif
       p_delete(&fc.messages);
       return -1;
     }
@@ -792,9 +756,6 @@ static int nntp_fetch_headers (CONTEXT * ctx, unsigned int first,
       mx_update_context (ctx, ctx->msgcount - oldmsgcount);
     if (ret != 0) {
       mutt_error (_("XOVER command failed: %s"), buf);
-#ifdef DEBUG
-      nntp_error ("nntp_fetch_headers()", buf);
-#endif
       p_delete(&fc.messages);
       return -1;
     }
@@ -840,7 +801,7 @@ static int nntp_fetch_headers (CONTEXT * ctx, unsigned int first,
 /* 
  * currently, nntp "mailbox" is "newsgroup"
  */
-int nntp_open_mailbox (CONTEXT * ctx)
+static int nntp_open_mailbox (CONTEXT * ctx)
 {
   NNTP_DATA *nntp_data;
   NNTP_SERVER *serv;
@@ -848,18 +809,18 @@ int nntp_open_mailbox (CONTEXT * ctx)
   char server[LONG_STRING];
   int count = 0;
   unsigned int first;
-  ACCOUNT acct;
+  ACCOUNT act;
 
-  p_clear(&acct, 1);
+  p_clear(&act, 1);
 
-  if (nntp_parse_url (ctx->path, &acct, buf, sizeof (buf)) < 0 || !*buf) {
+  if (nntp_parse_url (ctx->path, &act, buf, sizeof (buf)) < 0 || !*buf) {
     mutt_error (_("%s is an invalid newsgroup specification!"), ctx->path);
     mutt_sleep (2);
     return -1;
   }
 
   server[0] = '\0';
-  nntp_expand_path (server, sizeof (server), &acct);
+  nntp_expand_path (server, sizeof (server), &act);
   if (!(serv = mutt_select_newsserver (server)) || serv->status != NNTP_OK)
     return -1;
 
@@ -886,9 +847,6 @@ int nntp_open_mailbox (CONTEXT * ctx)
 
   buf[0] = 0;
   if (mutt_nntp_query (nntp_data, buf, sizeof (buf)) < 0) {
-#ifdef DEBUG
-    nntp_error ("nntp_open_mailbox()", buf);
-#endif
     return -1;
   }
 
@@ -980,7 +938,6 @@ int nntp_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno)
   if (ret == 1) {
     mutt_error (_("Article %d not found on server"),
                 ctx->hdrs[msgno]->article_num);
-    debug_print (1, ("%s\n", buf));
   }
 
   if (ret) {
@@ -1062,15 +1019,15 @@ int nntp_post (const char *msg)
       buf[len] = '\0';
     }
     if (buf[1] == '.')
-      mutt_socket_write_d (nntp_data->nserv->conn, buf, M_SOCK_LOG_HDR);
+      mutt_socket_write(nntp_data->nserv->conn, buf);
     else
-      mutt_socket_write_d (nntp_data->nserv->conn, buf + 1, M_SOCK_LOG_HDR);
+      mutt_socket_write(nntp_data->nserv->conn, buf + 1);
   }
   fclose (f);
 
   if (buf[m_strlen(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);
+    mutt_socket_write(nntp_data->nserv->conn, "\r\n");
+  mutt_socket_write(nntp_data->nserv->conn, ".\r\n");
   if (mutt_socket_readln (buf, sizeof (buf), nntp_data->nserv->conn) < 0) {
     mutt_error (_("Can't post article. Connection to %s lost."),
                 nntp_data->nserv->conn->account.host);
@@ -1131,7 +1088,7 @@ void nntp_delete_data (void *p)
   p_delete(&data);
 }
 
-int nntp_sync_mailbox (CONTEXT * ctx, int unused1, int* unused2)
+static int nntp_sync_mailbox (CONTEXT * ctx, int unused1, int* unused2)
 {
   NNTP_DATA *data = ctx->data;
 
@@ -1144,7 +1101,7 @@ int nntp_sync_mailbox (CONTEXT * ctx, int unused1, int* unused2)
   return 0;
 }
 
-void nntp_fastclose_mailbox (CONTEXT * ctx)
+static void nntp_fastclose_mailbox (CONTEXT * ctx)
 {
   NNTP_DATA *data = (NNTP_DATA *) ctx->data, *tmp;
 
@@ -1204,17 +1161,11 @@ static int _nntp_check_mailbox (CONTEXT * ctx, NNTP_DATA * nntp_data)
 
   buf[0] = 0;
   if (mutt_nntp_query (nntp_data, buf, sizeof (buf)) < 0) {
-#ifdef DEBUG
-    nntp_error ("nntp_check_mailbox()", buf);
-#endif
     return -1;
   }
   if (m_strncmp("211", buf, 3)) {
     buf[0] = 0;
     if (mutt_nntp_query (nntp_data, buf, sizeof (buf)) < 0) {
-#ifdef DEBUG
-      nntp_error ("nntp_check_mailbox()", buf);
-#endif
       return -1;
     }
   }
@@ -1252,7 +1203,7 @@ static int _nntp_check_mailbox (CONTEXT * ctx, NNTP_DATA * nntp_data)
   return 0;
 }
 
-int nntp_check_mailbox (CONTEXT * ctx, int* unused1, int unused2)
+static int nntp_check_mailbox (CONTEXT * ctx, int* unused1, int unused2)
 {
   return _nntp_check_mailbox (ctx, (NNTP_DATA *) ctx->data);
 }
@@ -1334,7 +1285,7 @@ int nntp_check_newgroups (NNTP_SERVER * serv, int force)
       if (l->data && ((NNTP_DATA *) l->data)->subscribed)
         _nntp_check_mailbox (NULL, (NNTP_DATA *) l->data);
     }
-    sidebar_draw (CurrentMenu);
+    sidebar_draw ();
   }
   else if (!force)
     return 0;
@@ -1355,9 +1306,6 @@ int nntp_check_newgroups (NNTP_SERVER * serv, int force)
   l = serv->tail;
   if (mutt_nntp_fetch (&nntp_data, buf, _("Adding new newsgroups..."), NULL,
                        add_group, serv, 0) != 0) {
-#ifdef DEBUG
-    nntp_error ("nntp_check_newgroups()", buf);
-#endif
     return -1;
   }
 
@@ -1426,9 +1374,6 @@ int nntp_get_active (NNTP_SERVER * serv)
   nntp_data.group = NULL;
 
   if (mutt_nntp_fetch (&nntp_data, "string_list_t\r\n", msg, NULL, add_group, serv, 0) < 0) {
-#ifdef DEBUG
-    nntp_error ("nntp_get_active()", "string_list_t\r\n");
-#endif
     return -1;
   }
 
@@ -1555,3 +1500,36 @@ int nntp_check_children (CONTEXT * ctx, const char *msgid)
   p_delete(&cc.child);
   return ret;
 }
+
+static int nntp_is_magic (const char* path, struct stat* st) {
+  url_scheme_t s = url_check_scheme (NONULL (path));
+  return ((s == U_NNTP || s == U_NNTPS) ? M_NNTP : -1);
+}
+
+static int acl_check_nntp (CONTEXT* ctx, int bit) {
+  switch (bit) {
+    case ACL_INSERT:    /* editing messages */
+    case ACL_WRITE:     /* change importance */
+      return (0);
+    case ACL_DELETE:    /* (un)deletion */
+    case ACL_SEEN:      /* mark as read */
+      return (1);
+    default:
+      return (0);
+  }
+}
+
+mx_t const nntp_mx = {
+    M_NNTP,
+    0,
+    nntp_is_magic,
+    NULL,
+    NULL,
+    nntp_open_mailbox,
+    NULL,
+    acl_check_nntp,
+    nntp_check_mailbox,
+    nntp_fastclose_mailbox,
+    nntp_sync_mailbox,
+    NULL,
+};