# include "config.h"
#endif
+#include <string.h>
+#include <unistd.h>
+
+#include <lib-lib/mem.h>
+#include <lib-lib/file.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
+#include <lib-lib/debug.h>
+
+#include <lib-ui/curses.h>
+
#include "mutt.h"
#include "mx.h"
#include "pop.h"
-#include "mutt_crypt.h"
-
-#include "lib/mem.h"
-#include "lib/str.h"
-#include "lib/intl.h"
-#include "lib/debug.h"
-
-#include <string.h>
-#include <unistd.h>
+#include <lib-crypt/crypt.h>
/* write line to file */
static int fetch_message (char *line, void *file)
static pop_query_status pop_read_header (POP_DATA * pop_data, HEADER * h)
{
FILE *f;
- int index;
+ int idx;
pop_query_status ret;
- cmd_status status;
long length;
char buf[LONG_STRING];
char tempfile[_POSIX_PATH_MAX];
return PFD_FUNCT_ERROR;
}
- snprintf (buf, sizeof (buf), "LIST %d\r\n", h->refno);
+ snprintf (buf, sizeof (buf), "string_list_t %d\r\n", h->refno);
ret = pop_query (pop_data, buf, sizeof (buf));
if (ret == PQ_OK) {
- sscanf (buf, "+OK %d %ld", &index, &length);
+ sscanf (buf, "+OK %d %ld", &idx, &length);
snprintf (buf, sizeof (buf), "TOP %d 0\r\n", h->refno);
ret = pop_fetch_data (pop_data, buf, NULL, fetch_message, f);
{
mutt_error _("Can't write header to temporary file!");
+ break;
+ }
+ case PQ_NOT_CONNECTED:
+ {
+ mutt_error _("Can't fetch header: Not connected!");
break;
}
}
/* parse UIDL */
static int fetch_uidl (char *line, void *data)
{
- int i, index;
+ int i, idx;
CONTEXT *ctx = (CONTEXT *) data;
POP_DATA *pop_data = (POP_DATA *) ctx->data;
- sscanf (line, "%d %s", &index, line);
+ sscanf (line, "%d %s", &idx, line);
for (i = 0; i < ctx->msgcount; i++)
- if (!safe_strcmp (line, ctx->hdrs[i]->data))
+ if (!m_strcmp(line, ctx->hdrs[i]->data))
break;
if (i == ctx->msgcount) {
- debug_print (1, ("new header %d %s\n", index, line));
+ debug_print (1, ("new header %d %s\n", idx, line));
if (i >= ctx->hdrmax)
mx_alloc_memory (ctx);
ctx->msgcount++;
- ctx->hdrs[i] = mutt_new_header ();
- ctx->hdrs[i]->data = safe_strdup (line);
+ ctx->hdrs[i] = header_new();
+ ctx->hdrs[i]->data = m_strdup(line);
}
- else if (ctx->hdrs[i]->index != index - 1)
+ else if (ctx->hdrs[i]->index != idx - 1)
pop_data->clear_cache = 1;
- ctx->hdrs[i]->refno = index;
- ctx->hdrs[i]->index = index - 1;
+ ctx->hdrs[i]->refno = idx;
+ ctx->hdrs[i]->index = idx - 1;
return 0;
}
if (ret != PQ_OK) {
for (i = ctx->msgcount; i < new_count; i++)
- mutt_free_header (&ctx->hdrs[i]);
+ header_delete(&ctx->hdrs[i]);
return ret;
}
int ret;
char buf[LONG_STRING];
CONNECTION *conn;
- ACCOUNT acct;
+ ACCOUNT act;
POP_DATA *pop_data;
ciss_url_t url;
- if (pop_parse_path (ctx->path, &acct)) {
+ if (pop_parse_path (ctx->path, &act)) {
mutt_error (_("%s is an invalid POP path"), ctx->path);
mutt_sleep (2);
return -1;
}
- mutt_account_tourl (&acct, &url);
+ mutt_account_tourl (&act, &url);
url.path = NULL;
url_ciss_tostring (&url, buf, sizeof (buf), 0);
- conn = mutt_conn_find (NULL, &acct);
+ conn = mutt_conn_find (NULL, &act);
if (!conn)
return -1;
- FREE (&ctx->path);
- ctx->path = safe_strdup (buf);
+ p_delete(&ctx->path);
+ ctx->path = m_strdup(buf);
- pop_data = safe_calloc (1, sizeof (POP_DATA));
+ pop_data = p_new(POP_DATA, 1);
pop_data->conn = conn;
ctx->data = pop_data;
conn->data = pop_data;
- FOREVER {
+ for (;;) {
if (pop_reconnect (ctx) != PQ_OK)
return -1;
for (i = 0; i < POP_CACHE_LEN; i++) {
if (pop_data->cache[i].path) {
unlink (pop_data->cache[i].path);
- FREE (&pop_data->cache[i].path);
+ p_delete(&pop_data->cache[i].path);
}
}
}
void *uidl;
char buf[LONG_STRING];
char path[_POSIX_PATH_MAX];
- char *m = _("Fetching message...");
+ progress_t bar;
POP_DATA *pop_data = (POP_DATA *) ctx->data;
POP_CACHE *cache;
HEADER *h = ctx->hdrs[msgno];
else {
/* clear the previous entry */
unlink (cache->path);
- FREE (&cache->path);
+ p_delete(&cache->path);
}
}
- FOREVER {
+ for (;;) {
if (pop_reconnect (ctx) != PQ_OK)
return -1;
return -1;
}
- mutt_message (m);
+ bar.size = h->content->length + h->content->offset - 1;
+ bar.msg = _("Fetching message...");
+ mutt_progress_bar (&bar, 0);
mutt_mktemp (path);
msg->fp = safe_fopen (path, "w+");
snprintf (buf, sizeof (buf), "RETR %d\r\n", h->refno);
- ret = pop_fetch_data (pop_data, buf, m, fetch_message, msg->fp);
+ ret = pop_fetch_data (pop_data, buf, &bar, fetch_message, msg->fp);
if (ret == PQ_OK)
break;
* portion of the headers, those required for the main display.
*/
cache->index = h->index;
- cache->path = safe_strdup (path);
+ cache->path = m_strdup(path);
rewind (msg->fp);
uidl = h->data;
- mutt_free_envelope (&h->env);
+ envelope_delete(&h->env);
h->env = mutt_read_rfc822_header (msg->fp, h, 0, 0);
h->data = uidl;
h->lines = 0;
fgets (buf, sizeof (buf), msg->fp);
}
- h->content->length = ftell (msg->fp) - h->content->offset;
+ h->content->length = ftello (msg->fp) - h->content->offset;
/* This needs to be done in case this is a multipart message */
- if (!WithCrypto)
- h->security = crypt_query (h->content);
+ h->security = crypt_query (h->content);
mutt_clear_error ();
rewind (msg->fp);
}
/* update POP mailbox - delete messages from server */
-pop_query_status pop_sync_mailbox (CONTEXT * ctx, int unused, int *index_hint)
+pop_query_status pop_sync_mailbox (CONTEXT * ctx,
+ int unused __attribute__ ((unused)),
+ int *index_hint __attribute__ ((unused)))
{
int i;
pop_query_status ret;
pop_data->check_time = 0;
- FOREVER {
+ for (;;) {
if (pop_reconnect (ctx) != PQ_OK)
return PQ_NOT_CONNECTED;
}
if (ret == PQ_OK) {
- strfcpy (buf, "QUIT\r\n", sizeof (buf));
+ m_strcpy(buf, sizeof(buf), "QUIT\r\n");
ret = pop_query (pop_data, buf, sizeof (buf));
}
}
/* Check for new messages and fetch headers */
-int pop_check_mailbox (CONTEXT * ctx, int *index_hint, int unused)
+int pop_check_mailbox (CONTEXT * ctx,
+ int *index_hint __attribute__ ((unused)),
+ int unused __attribute__ ((unused)))
{
int ret;
POP_DATA *pop_data = (POP_DATA *) ctx->data;
CONNECTION *conn;
CONTEXT ctx;
MESSAGE *msg = NULL;
- ACCOUNT acct;
+ ACCOUNT act;
POP_DATA *pop_data;
if (!PopHost) {
return;
}
- url = p = safe_calloc (strlen (PopHost) + 7, sizeof (char));
+ url = p = p_new(char, strlen (PopHost) + 7);
if (url_check_scheme (PopHost) == U_UNKNOWN) {
strcpy (url, "pop://"); /* __STRCPY_CHECKED__ */
p = strchr (url, '\0');
}
strcpy (p, PopHost); /* __STRCPY_CHECKED__ */
- ret = pop_parse_path (url, &acct);
- FREE (&url);
+ ret = pop_parse_path (url, &act);
+ p_delete(&url);
if (ret) {
mutt_error (_("%s is an invalid POP path"), PopHost);
return;
}
- conn = mutt_conn_find (NULL, &acct);
+ conn = mutt_conn_find (NULL, &act);
if (!conn)
return;
- pop_data = safe_calloc (1, sizeof (POP_DATA));
+ pop_data = p_new(POP_DATA, 1);
pop_data->conn = conn;
if (pop_open_connection (pop_data) < 0) {
mutt_socket_free (pop_data->conn);
- FREE (&pop_data);
+ p_delete(&pop_data);
return;
}
mutt_message _("Checking for new messages...");
/* find out how many messages are in the mailbox. */
- strfcpy (buffer, "STAT\r\n", sizeof (buffer));
+ m_strcpy(buffer, sizeof(buffer), "STAT\r\n");
ret = pop_query (pop_data, buffer, sizeof (buffer));
if (ret == PQ_NOT_CONNECTED)
goto fail;
/* only get unread messages */
if (msgs > 0 && option (OPTPOPLAST)) {
- strfcpy (buffer, "LAST\r\n", sizeof (buffer));
+ m_strcpy(buffer, sizeof(buffer), "LAST\r\n");
ret = pop_query (pop_data, buffer, sizeof (buffer));
if (ret == PQ_NOT_CONNECTED)
goto fail;
if (rset) {
/* make sure no messages get deleted */
- strfcpy (buffer, "RSET\r\n", sizeof (buffer));
+ m_strcpy(buffer, sizeof(buffer), "RSET\r\n");
if (pop_query (pop_data, buffer, sizeof (buffer)) == PQ_NOT_CONNECTED)
goto fail;
}
finish:
/* exit gracefully */
- strfcpy (buffer, "QUIT\r\n", sizeof (buffer));
+ m_strcpy(buffer, sizeof(buffer), "QUIT\r\n");
if (pop_query (pop_data, buffer, sizeof (buffer)) == PQ_NOT_CONNECTED)
goto fail;
mutt_socket_close (conn);
- FREE (&pop_data);
+ p_delete(&pop_data);
return;
fail:
mutt_error _("Server closed connection!");
mutt_socket_close (conn);
- FREE (&pop_data);
+ p_delete(&pop_data);
}
projects / apps / madmutt.git / blobdiff