X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=pop%2Fpop.c;h=b00274aa390152d903642f5f119ef208c849daf6;hp=572c79e4463a9e1891b7e6d92b515412d9bce6e7;hb=68edc972742930c4003e554144bfe197ba6199aa;hpb=05a3bbbe420e4afc76e0eea24ce32f859405dc4a

diff --git a/pop/pop.c b/pop/pop.c
index 572c79e..b00274a 100644
--- a/pop/pop.c
+++ b/pop/pop.c
@@ -7,18 +7,7 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <string.h>
-#include <unistd.h>
-
-#include <lib-lib/mem.h>
-#include <lib-lib/file.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/debug.h>
+#include <lib-lib/lib-lib.h>
 
 #include <lib-ui/curses.h>
 
@@ -50,7 +39,7 @@ static int fetch_message (char *line, void *file)
 static pop_query_status pop_read_header (POP_DATA * pop_data, HEADER * h)
 {
   FILE *f;
-  int index;
+  int idx;
   pop_query_status ret;
   long length;
   char buf[LONG_STRING];
@@ -62,10 +51,10 @@ static pop_query_status pop_read_header (POP_DATA * pop_data, HEADER * h)
     return PFD_FUNCT_ERROR;
   }
 
-  snprintf (buf, sizeof (buf), "LIST %d\r\n", h->refno);
+  snprintf (buf, sizeof (buf), "string_list_t %d\r\n", h->refno);
   ret = pop_query (pop_data, buf, sizeof (buf));
   if (ret == PQ_OK) {
-    sscanf (buf, "+OK %d %ld", &index, &length);
+    sscanf (buf, "+OK %d %ld", &idx, &length);
 
     snprintf (buf, sizeof (buf), "TOP %d 0\r\n", h->refno);
     ret = pop_fetch_data (pop_data, buf, NULL, fetch_message, f);
@@ -73,14 +62,10 @@ static pop_query_status pop_read_header (POP_DATA * pop_data, HEADER * h)
     if (pop_data->cmd_top == CMD_UNKNOWN) {
       if (ret == PQ_OK) {
         pop_data->cmd_top = CMD_AVAILABLE;
-
-        debug_print (1, ("set TOP capability\n"));
       }
 
       if (ret == PQ_ERR) {
         pop_data->cmd_top = CMD_NOT_AVAILABLE;
-
-        debug_print (1, ("unset TOP capability\n"));
         snprintf (pop_data->err_msg, sizeof (pop_data->err_msg),
                   _("Command TOP is not supported by server."));
       }
@@ -126,18 +111,16 @@ static pop_query_status pop_read_header (POP_DATA * pop_data, HEADER * h)
 /* parse UIDL */
 static int fetch_uidl (char *line, void *data)
 {
-  int i, index;
+  int i, idx;
   CONTEXT *ctx = (CONTEXT *) data;
   POP_DATA *pop_data = (POP_DATA *) ctx->data;
 
-  sscanf (line, "%d %s", &index, line);
+  sscanf (line, "%d %s", &idx, line);
   for (i = 0; i < ctx->msgcount; i++)
     if (!m_strcmp(line, ctx->hdrs[i]->data))
       break;
 
   if (i == ctx->msgcount) {
-    debug_print (1, ("new header %d %s\n", index, line));
-
     if (i >= ctx->hdrmax)
       mx_alloc_memory (ctx);
 
@@ -145,11 +128,11 @@ static int fetch_uidl (char *line, void *data)
     ctx->hdrs[i] = header_new();
     ctx->hdrs[i]->data = m_strdup(line);
   }
-  else if (ctx->hdrs[i]->index != index - 1)
+  else if (ctx->hdrs[i]->index != idx - 1)
     pop_data->clear_cache = 1;
 
-  ctx->hdrs[i]->refno = index;
-  ctx->hdrs[i]->index = index - 1;
+  ctx->hdrs[i]->refno = idx;
+  ctx->hdrs[i]->index = idx - 1;
 
   return 0;
 }
@@ -182,14 +165,11 @@ static int pop_fetch_headers (CONTEXT * ctx)
   if (pop_data->cmd_uidl == CMD_UNKNOWN) {
     if (ret == PQ_OK) {
       pop_data->cmd_uidl = CMD_AVAILABLE;
-
-      debug_print (1, ("set UIDL capability\n"));
     }
 
     if (ret == PQ_ERR && pop_data->cmd_uidl == CMD_UNKNOWN) {
       pop_data->cmd_uidl = CMD_NOT_AVAILABLE;
 
-      debug_print (1, ("unset UIDL capability\n"));
       snprintf (pop_data->err_msg, sizeof (pop_data->err_msg),
                 _("Command UIDL is not supported by server."));
     }
@@ -231,20 +211,20 @@ int pop_open_mailbox (CONTEXT * ctx)
   int ret;
   char buf[LONG_STRING];
   CONNECTION *conn;
-  ACCOUNT acct;
+  ACCOUNT act;
   POP_DATA *pop_data;
   ciss_url_t url;
 
-  if (pop_parse_path (ctx->path, &acct)) {
+  if (pop_parse_path (ctx->path, &act)) {
     mutt_error (_("%s is an invalid POP path"), ctx->path);
     mutt_sleep (2);
     return -1;
   }
 
-  mutt_account_tourl (&acct, &url);
+  mutt_account_tourl (&act, &url);
   url.path = NULL;
   url_ciss_tostring (&url, buf, sizeof (buf), 0);
-  conn = mutt_conn_find (NULL, &acct);
+  conn = mutt_conn_find (NULL, &act);
   if (!conn)
     return -1;
 
@@ -288,8 +268,6 @@ static void pop_clear_cache (POP_DATA * pop_data)
   if (!pop_data->clear_cache)
     return;
 
-  debug_print (1, ("delete cached messages\n"));
-
   for (i = 0; i < POP_CACHE_LEN; i++) {
     if (pop_data->cache[i].path) {
       unlink (pop_data->cache[i].path);
@@ -431,7 +409,9 @@ int pop_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno)
 }
 
 /* update POP mailbox - delete messages from server */
-pop_query_status pop_sync_mailbox (CONTEXT * ctx, int unused, int *index_hint)
+pop_query_status pop_sync_mailbox (CONTEXT * ctx,
+                                   int unused __attribute__ ((unused)),
+                                   int *index_hint __attribute__ ((unused)))
 {
   int i;
   pop_query_status ret;
@@ -474,7 +454,9 @@ pop_query_status pop_sync_mailbox (CONTEXT * ctx, int unused, int *index_hint)
 }
 
 /* Check for new messages and fetch headers */
-int pop_check_mailbox (CONTEXT * ctx, int *index_hint, int unused)
+int pop_check_mailbox (CONTEXT * ctx,
+                       int *index_hint __attribute__ ((unused)),
+                       int unused __attribute__ ((unused)))
 {
   int ret;
   POP_DATA *pop_data = (POP_DATA *) ctx->data;
@@ -516,7 +498,7 @@ void pop_fetch_mail (void)
   CONNECTION *conn;
   CONTEXT ctx;
   MESSAGE *msg = NULL;
-  ACCOUNT acct;
+  ACCOUNT act;
   POP_DATA *pop_data;
 
   if (!PopHost) {
@@ -532,14 +514,14 @@ void pop_fetch_mail (void)
   }
   strcpy (p, PopHost);          /* __STRCPY_CHECKED__ */
 
-  ret = pop_parse_path (url, &acct);
+  ret = pop_parse_path (url, &act);
   p_delete(&url);
   if (ret) {
     mutt_error (_("%s is an invalid POP path"), PopHost);
     return;
   }
 
-  conn = mutt_conn_find (NULL, &acct);
+  conn = mutt_conn_find (NULL, &act);
   if (!conn)
     return;