}
}
- fclose (f);
+ m_fclose(&f);
unlink (tempfile);
return ret;
}
if (ret == PQ_OK)
break;
- safe_fclose (&msg->fp);
+ m_fclose(&msg->fp);
unlink (path);
if (ret == PQ_ERR) {
MESSAGE *msg = NULL;
ACCOUNT act;
POP_DATA *pop_data;
+ ssize_t plen;
if (!PopHost) {
mutt_error _("POP host is not defined.");
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);