X-Git-Url: http://git.madism.org/?a=blobdiff_plain;ds=sidebyside;f=pop.c;h=30dcf2de01b2abac59b323d5fb094cfcd20d1681;hb=a31de505502560546791fc0158b03c41b7a721ec;hp=3cfb694dc93d0b1e435433076d373985741ac97f;hpb=5a44e401b4e50f378f9caa045fe6ad6ca652b758;p=apps%2Fmadmutt.git

diff --git a/pop.c b/pop.c
index 3cfb694..30dcf2d 100644
--- a/pop.c
+++ b/pop.c
@@ -155,7 +155,7 @@ static pop_query_status pop_connect(pop_data_t * pop_data)
 
     p_delete(&pop_data->timestamp);
     if ((p = strchr(buf, '<')) && (q = strchr(p, '>'))) {
-        pop_data->timestamp = p_dupstr(p, q - p);
+        pop_data->timestamp = p_dupstr(p, q + 1 - p);
     }
     return PQ_OK;
 }
@@ -1217,18 +1217,18 @@ void pop_fetch_mail (void)
   pop_data_t *pop_data;
   ssize_t plen;
 
-  if (!PopHost) {
+  if (m_strisempty(PopHost)) {
     mutt_error _("POP host is not defined.");
     return;
   }
 
   plen = m_strlen(PopHost) + 7;
-  url = p = p_new(char, plen);
+  url  = p = p_new(char, plen);
   if (url_check_scheme (PopHost) == U_UNKNOWN) {
-    plen -= m_strcpy(url, plen, "pop://");
-    p += plen;
+      snprintf(p, plen, "pop://%s", PopHost);
+  } else {
+      m_strcpy(p, plen, PopHost);
   }
-  m_strcpy(p, plen, PopHost);
 
   ret = pop_parse_path (url, &act);
   p_delete(&url);