X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=pop%2Fpop.c;h=9b5340932a8f2008e0d14bc5d7e1d98f9d8af18b;hb=75b25db9f40ea7bbd11e63652d5fae591b3f1206;hp=40df8781bab09e82406547b396fdbf3e09ca32fc;hpb=9ed7a487e3a922f2cbb222961c2c9710c3a65f91;p=apps%2Fmadmutt.git

diff --git a/pop/pop.c b/pop/pop.c
index 40df878..9b53409 100644
--- a/pop/pop.c
+++ b/pop/pop.c
@@ -490,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;
@@ -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);