#include "mutt.h"
#include "pop.h"
-#include <lib-crypt/crypt.h>
+#include "crypt.h"
/* write line to file */
static int fetch_message (char *line, void *file)
char buf[LONG_STRING];
char tempfile[_POSIX_PATH_MAX];
- f = m_tempfile(tempfile, sizeof(tempfile), NONULL(Tempdir), NULL);
+ 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);
}
}
- fclose (f);
+ m_fclose(&f);
unlink (tempfile);
return ret;
}
bar.msg = _("Fetching message...");
mutt_progress_bar (&bar, 0);
- msg->fp = m_tempfile(path, sizeof(path), NONULL(Tempdir), NULL);
+ msg->fp = m_tempfile(path, sizeof(path), NONULL(MCore.tmpdir), NULL);
if (!msg->fp) {
mutt_error(_("Could not create temporary file"));
mutt_sleep(2);
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;
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);