stupid sleep

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

diff --git a/nntp/nntp.c b/nntp/nntp.c
index a2388d9..cd2073e 100644 (file)
--- a/nntp/nntp.c
+++ b/nntp/nntp.c
@@ -20,8 +20,7 @@
 #include "sort.h"
 #include "nntp.h"
 #include "buffy.h"
-
-#include <lib-crypt/crypt.h>
+#include "crypt.h"
 
 #define WANT_LISTGROUP_COMMAND          0
 
@@ -41,13 +40,13 @@ void nntp_sync_sidebar (NNTP_DATA* data) {
    * mailboxes command ;-((( FIXME
    */
   buf[0] = '\0';
-  snprintf (buf, sizeof (buf), "nntp%s://%s%s%s%s/%s",
-            (data->nserv->conn->account.flags & M_ACCT_SSL) ? "s" : "",
-            NONULL (data->nserv->conn->account.user),
-            *data->nserv->conn->account.pass ? ":" : "",
-            *data->nserv->conn->account.pass ? data->nserv->conn->account.pass : "",
-            data->nserv->conn->account.host,
-            data->group);
+  snprintf(buf, sizeof (buf), "nntp%s://%s%s%s%s/%s",
+           data->nserv->conn->account.has_ssl ? "s" : "",
+           NONULL(data->nserv->conn->account.user),
+           *data->nserv->conn->account.pass ? ":" : "",
+           *data->nserv->conn->account.pass ? data->nserv->conn->account.pass : "",
+           data->nserv->conn->account.host,
+           data->group);
 
   /* bail out if group not found via mailboxes */
   if ((i = buffy_lookup (buf)) < 0)
@@ -72,8 +71,8 @@ static int nntp_auth (NNTP_SERVER * serv)
   char buf[STRING];
   unsigned char flags = conn->account.flags;
 
-  if (mutt_account_getuser (&conn->account) || !conn->account.user[0] ||
-      mutt_account_getpass (&conn->account) || !conn->account.pass[0]) {
+  if (mutt_account_getuser(&conn->account) || !conn->account.user[0] ||
+      mutt_account_getpass(&conn->account) || !conn->account.pass[0]) {
     conn->account.flags = flags;
     return -2;
   }
@@ -141,8 +140,6 @@ static int nntp_connect_and_auth (NNTP_SERVER * serv)
     return -1;
   }
 
-  sleep (1);
-
   /* Tell INN to switch to mode reader if it isn't so. Ignore all
      returned codes and messages. */
   mutt_socket_write (conn, "MODE READER\r\n");
@@ -153,7 +150,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) && m_strncmp("480", buf, 3)) {
+  if (!conn->account.has_user && m_strncmp("480", buf, 3)) {
     serv->status = NNTP_OK;
     return 0;
   }
@@ -233,7 +230,7 @@ static int nntp_open_connection (NNTP_SERVER * serv)
 
 static int nntp_reconnect (NNTP_SERVER * serv)
 {
-  char buf[SHORT_STRING];
+  char buf[STRING];
 
   mutt_socket_close (serv->conn);
 
@@ -300,8 +297,9 @@ 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, const char *query, char *msg,
-                            progress_t* bar, int (*funct) (char *, void *),
+static int mutt_nntp_fetch (NNTP_DATA * nntp_data, const char *query,
+                            const char *msg, progress_t* bar,
+                            int (*funct) (char *, void *),
                             void *data, int tagged)
 {
   char buf[LONG_STRING];
@@ -437,7 +435,7 @@ static int nntp_read_header (CONTEXT * ctx, const char *msgid,
   int ret;
   HEADER *h = ctx->hdrs[ctx->msgcount];
 
-  f = m_tempfile(tempfile, sizeof(tempfile), NONULL(Tempdir), NULL);
+  f = m_tempfile(tempfile, sizeof(tempfile), NONULL(mod_core.tmpdir), NULL);
   if (!f)
     return -1;
 
@@ -448,14 +446,14 @@ 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) {
-    fclose (f);
+    m_fclose(&f);
     unlink (tempfile);
     return (ret == -1 ? -1 : 1);
   }
 
   h->article_num = article_num;
   h->env = mutt_read_rfc822_header (f, h, 0, 0);
-  fclose (f);
+  m_fclose(&f);
   unlink (tempfile);
 
   if (h->env->xref != NULL)
@@ -503,7 +501,7 @@ static void nntp_get_desc (NNTP_DATA * data, const char *mask, char *msg, progre
   if (data->nserv->hasXGTITLE)
     snprintf (buf, sizeof (buf), "XGTITLE %s\r\n", mask);
   else
-    snprintf (buf, sizeof (buf), "string_list_t NEWSGROUPS %s\r\n", mask);
+    snprintf (buf, sizeof (buf), "LIST NEWSGROUPS %s\r\n", mask);
   if (mutt_nntp_fetch (data, buf, msg, bar, parse_description, data->nserv, 0) !=
       0) {
   }
@@ -661,8 +659,8 @@ static int nntp_fetch_headers (CONTEXT * ctx, unsigned int first,
                                unsigned int last)
 {
   char buf[HUGE_STRING];
-  char *msg = _("Fetching message headers...");
-  char *msg2 = _("Fetching headers from cache...");
+  const char *msg = _("Fetching message headers...");
+  const char *msg2 = _("Fetching headers from cache...");
   NNTP_DATA *nntp_data = ((NNTP_DATA *) ctx->data);
   int ret;
   int num;
@@ -725,7 +723,7 @@ static int nntp_fetch_headers (CONTEXT * ctx, unsigned int first,
           mutt_message ("%s %d/%d", msg2, c, r);
         add_xover_line (buf, &fc);
       }
-      fclose (f);
+      m_fclose(&f);
       nntp_data->lastLoaded = fc.last;
       first = fc.last + 1;
       if (ctx->msgcount > oldmsgcount)
@@ -831,7 +829,7 @@ static int nntp_open_mailbox (CONTEXT * ctx)
     nntp_data = xmalloc(sizeof(NNTP_DATA) + m_strlen(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);
+    hash_insert (serv->newsgroups, nntp_data->group, nntp_data);
     nntp_add_to_list (serv, nntp_data);
   }
   ctx->data = nntp_data;
@@ -860,7 +858,7 @@ static int nntp_open_mailbox (CONTEXT * ctx)
 
       /* CACHE: delete cache and line from .index */
       nntp_delete_cache (nntp_data);
-      hash_delete (serv->newsgroups, nntp_data->group, NULL,
+      hash_remove (serv->newsgroups, nntp_data->group, NULL,
                    nntp_delete_data);
       while (l && l->data != (void *) nntp_data)
         l = l->next;
@@ -915,7 +913,7 @@ int nntp_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno)
   p_delete(&cache->path);
 
   cache->index = ctx->hdrs[msgno]->index;
-  msg->fp = m_tempfile(path, sizeof(path), NONULL(Tempdir), NULL);
+  msg->fp = m_tempfile(path, sizeof(path), NONULL(mod_core.tmpdir), NULL);
   if (!msg->fp) {
     return -1;
   }
@@ -940,7 +938,7 @@ int nntp_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno)
   }
 
   if (ret) {
-    fclose (msg->fp);
+    m_fclose(&msg->fp);
     unlink (path);
     p_delete(&cache->path);
     return -1;
@@ -1022,7 +1020,7 @@ int nntp_post (const char *msg)
     else
       mutt_socket_write(nntp_data->nserv->conn, buf + 1);
   }
-  fclose (f);
+  m_fclose(&f);
 
   if (buf[m_strlen(buf) - 1] != '\n')
     mutt_socket_write(nntp_data->nserv->conn, "\r\n");
@@ -1233,8 +1231,8 @@ static int add_group (char *buf, void *serv)
     strcpy (nntp_data->group, group);
     nntp_data->nserv = s;
     if (s->newsgroups->nelem < s->newsgroups->curnelem * 2)
-      s->newsgroups = hash_resize (s->newsgroups, s->newsgroups->nelem * 2);
-    hash_insert (s->newsgroups, nntp_data->group, nntp_data, 0);
+      hash_resize (s->newsgroups, s->newsgroups->nelem * 2);
+    hash_insert (s->newsgroups, nntp_data->group, nntp_data);
     nntp_add_to_list (s, nntp_data);
   }
   nntp_data->deleted = 0;
@@ -1344,7 +1342,7 @@ int nntp_get_cache_all (NNTP_SERVER * serv)
       i++;
     }
     add_group (NULL, NULL);
-    fclose (f);
+    m_fclose(&f);
     mutt_clear_error ();
     return 0;
   }
@@ -1357,7 +1355,7 @@ int nntp_get_cache_all (NNTP_SERVER * serv)
 /* Load list of all newsgroups from active */
 int nntp_get_active (NNTP_SERVER * serv)
 {
-  char msg[SHORT_STRING];
+  char msg[STRING];
   NNTP_DATA nntp_data;
   string_list_t *tmp;
 
@@ -1372,7 +1370,7 @@ int nntp_get_active (NNTP_SERVER * serv)
   nntp_data.nserv = serv;
   nntp_data.group = NULL;
 
-  if (mutt_nntp_fetch (&nntp_data, "string_list_t\r\n", msg, NULL, add_group, serv, 0) < 0) {
+  if (mutt_nntp_fetch (&nntp_data, "LIST\r\n", msg, NULL, add_group, serv, 0) < 0) {
     return -1;
   }
 
@@ -1385,7 +1383,7 @@ int nntp_get_active (NNTP_SERVER * serv)
 
     if (data && data->deleted && !data->rc) {
       nntp_delete_cache (data);
-      hash_delete (serv->newsgroups, data->group, NULL, nntp_delete_data);
+      hash_remove (serv->newsgroups, data->group, NULL, nntp_delete_data);
       tmp->data = NULL;
     }
   }