merge crypt back into $top_builddir :)

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

diff --git a/pop/pop.c b/pop/pop.c
index a6e1fd8..a09e1fc 100644 (file)
--- a/pop/pop.c
+++ b/pop/pop.c
@@ -10,11 +10,11 @@
 #include <lib-lib/lib-lib.h>
 
 #include <lib-ui/curses.h>
+#include <lib-mx/mx.h>
 
 #include "mutt.h"
-#include "mx.h"
 #include "pop.h"
-#include <lib-crypt/crypt.h>
+#include "crypt.h"
 
 /* write line to file */
 static int fetch_message (char *line, void *file)
@@ -45,13 +45,13 @@ static pop_query_status pop_read_header (POP_DATA * pop_data, HEADER * h)
   char buf[LONG_STRING];
   char tempfile[_POSIX_PATH_MAX];
 
-  mutt_mktemp (tempfile);
-  if (!(f = safe_fopen (tempfile, "w+"))) {
-    mutt_perror (tempfile);
+  f = m_tempfile(tempfile, sizeof(tempfile), NONULL(MCore.tmpdir), NULL);
+  if (!f) {
+    mutt_error(_("Could not create temporary file"));
     return PFD_FUNCT_ERROR;
   }
 
-  snprintf (buf, sizeof (buf), "string_list_t %d\r\n", h->refno);
+  snprintf (buf, sizeof (buf), "LIST %d\r\n", h->refno);
   ret = pop_query (pop_data, buf, sizeof (buf));
   if (ret == PQ_OK) {
     sscanf (buf, "+OK %d %ld", &idx, &length);
@@ -103,7 +103,7 @@ static pop_query_status pop_read_header (POP_DATA * pop_data, HEADER * h)
     }
   }
 
-  fclose (f);
+  m_fclose(&f);
   unlink (tempfile);
   return ret;
 }
@@ -349,11 +349,10 @@ int pop_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno)
     bar.msg = _("Fetching message...");
     mutt_progress_bar (&bar, 0);
 
-    mutt_mktemp (path);
-    msg->fp = safe_fopen (path, "w+");
+    msg->fp = m_tempfile(path, sizeof(path), NONULL(MCore.tmpdir), NULL);
     if (!msg->fp) {
-      mutt_perror (path);
-      mutt_sleep (2);
+      mutt_error(_("Could not create temporary file"));
+      mutt_sleep(2);
       return -1;
     }
 
@@ -363,7 +362,7 @@ int pop_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno)
     if (ret == PQ_OK)
       break;
 
-    safe_fclose (&msg->fp);
+    m_fclose(&msg->fp);
     unlink (path);
 
     if (ret == PQ_ERR) {
@@ -491,7 +490,7 @@ static int pop_check_mailbox (CONTEXT * ctx,
 void pop_fetch_mail (void)
 {
   char buffer[LONG_STRING];
-  char msgbuf[SHORT_STRING];
+  char msgbuf[STRING];
   char *url, *p;
   int i, delanswer, last = 0, msgs, bytes, rset = 0;
   pop_query_status ret;
@@ -500,6 +499,7 @@ void pop_fetch_mail (void)
   MESSAGE *msg = NULL;
   ACCOUNT act;
   POP_DATA *pop_data;
+  ssize_t plen;
 
   if (!PopHost) {
     mutt_error _("POP host is not defined.");
@@ -507,12 +507,13 @@ void pop_fetch_mail (void)
     return;
   }
 
-  url = p = p_new(char, strlen (PopHost) + 7);
+  plen = m_strlen(PopHost) + 7;
+  url = p = p_new(char, plen);
   if (url_check_scheme (PopHost) == U_UNKNOWN) {
-    strcpy (url, "pop://");     /* __STRCPY_CHECKED__ */
-    p = strchr (url, '\0');
+    plen -= m_strcpy(url, plen, "pop://");
+    p += plen;
   }
-  strcpy (p, PopHost);          /* __STRCPY_CHECKED__ */
+  m_strcpy(p, plen, PopHost);
 
   ret = pop_parse_path (url, &act);
   p_delete(&url);