Use good m_ functions, because it smell like a flower, version 2.

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

diff --git a/pop/pop.c b/pop/pop.c
index 713743f..a40e2f8 100644 (file)
--- a/pop/pop.c
+++ b/pop/pop.c
@@ -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;
 }
@@ -499,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.");
@@ -506,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);