#include "mx.h"
#include "pop.h"
#include "mutt_crypt.h"
+#include "mutt_curses.h"
+
+#include "lib/mem.h"
+#include "lib/str.h"
+#include "lib/intl.h"
+#include "lib/debug.h"
#include <string.h>
#include <unistd.h>
* -2 - invalid command or execution error,
* -3 - error writing to tempfile
*/
-static int pop_read_header (POP_DATA * pop_data, HEADER * h)
+static pop_query_status pop_read_header (POP_DATA * pop_data, HEADER * h)
{
FILE *f;
- int ret, index;
+ int index;
+ pop_query_status ret;
long length;
char buf[LONG_STRING];
char tempfile[_POSIX_PATH_MAX];
mutt_mktemp (tempfile);
if (!(f = safe_fopen (tempfile, "w+"))) {
mutt_perror (tempfile);
- return -3;
+ return PFD_FUNCT_ERROR;
}
snprintf (buf, sizeof (buf), "LIST %d\r\n", h->refno);
ret = pop_query (pop_data, buf, sizeof (buf));
- if (ret == 0) {
+ if (ret == PQ_OK) {
sscanf (buf, "+OK %d %ld", &index, &length);
snprintf (buf, sizeof (buf), "TOP %d 0\r\n", h->refno);
ret = pop_fetch_data (pop_data, buf, NULL, fetch_message, f);
- if (pop_data->cmd_top == 2) {
- if (ret == 0) {
- pop_data->cmd_top = 1;
+ if (pop_data->cmd_top == CMD_UNKNOWN) {
+ if (ret == PQ_OK) {
+ pop_data->cmd_top = CMD_AVAILABLE;
- dprint (1, (debugfile, "pop_read_header: set TOP capability\n"));
+ debug_print (1, ("set TOP capability\n"));
}
- if (ret == -2) {
- pop_data->cmd_top = 0;
+ if (ret == PQ_ERR) {
+ pop_data->cmd_top = CMD_NOT_AVAILABLE;
- dprint (1, (debugfile, "pop_read_header: unset TOP capability\n"));
+ debug_print (1, ("unset TOP capability\n"));
snprintf (pop_data->err_msg, sizeof (pop_data->err_msg),
_("Command TOP is not supported by server."));
}
}
switch (ret) {
- case 0:
+ case PQ_OK:
{
rewind (f);
h->env = mutt_read_rfc822_header (f, h, 0, 0);
}
break;
}
- case -2:
+ case PQ_ERR:
{
mutt_error ("%s", pop_data->err_msg);
break;
}
- case -3:
+ case PFD_FUNCT_ERROR:
{
mutt_error _("Can't write header to temporary file!");
+ break;
+ }
+ case PQ_NOT_CONNECTED:
+ {
+ mutt_error _("Can't fetch header: Not connected!");
break;
}
}
sscanf (line, "%d %s", &index, line);
for (i = 0; i < ctx->msgcount; i++)
- if (!mutt_strcmp (line, ctx->hdrs[i]->data))
+ if (!str_cmp (line, ctx->hdrs[i]->data))
break;
if (i == ctx->msgcount) {
- dprint (1,
- (debugfile, "pop_fetch_headers: new header %d %s\n", index,
- line));
+ debug_print (1, ("new header %d %s\n", index, 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]->data = str_dup (line);
}
else if (ctx->hdrs[i]->index != index - 1)
pop_data->clear_cache = 1;
*/
static int pop_fetch_headers (CONTEXT * ctx)
{
- int i, ret, old_count, new_count;
+ int i, old_count, new_count;
+ pop_query_status ret;
POP_DATA *pop_data = (POP_DATA *) ctx->data;
time (&pop_data->check_time);
new_count = ctx->msgcount;
ctx->msgcount = old_count;
- if (pop_data->cmd_uidl == 2) {
- if (ret == 0) {
- pop_data->cmd_uidl = 1;
+ if (pop_data->cmd_uidl == CMD_UNKNOWN) {
+ if (ret == PQ_OK) {
+ pop_data->cmd_uidl = CMD_AVAILABLE;
- dprint (1, (debugfile, "pop_fetch_headers: set UIDL capability\n"));
+ debug_print (1, ("set UIDL capability\n"));
}
- if (ret == -2 && pop_data->cmd_uidl == 2) {
- pop_data->cmd_uidl = 0;
+ if (ret == PQ_ERR && pop_data->cmd_uidl == CMD_UNKNOWN) {
+ pop_data->cmd_uidl = CMD_NOT_AVAILABLE;
- dprint (1, (debugfile, "pop_fetch_headers: unset UIDL capability\n"));
+ debug_print (1, ("unset UIDL capability\n"));
snprintf (pop_data->err_msg, sizeof (pop_data->err_msg),
_("Command UIDL is not supported by server."));
}
}
- if (ret == 0) {
+ if (ret == PQ_OK) {
for (i = 0; i < old_count; i++)
if (ctx->hdrs[i]->refno == -1)
ctx->hdrs[i]->deleted = 1;
i + 1 - old_count, new_count - old_count);
ret = pop_read_header (pop_data, ctx->hdrs[i]);
- if (ret < 0)
+ if (ret != PQ_OK)
break;
ctx->msgcount++;
mx_update_context (ctx, i - old_count);
}
- if (ret < 0) {
+ if (ret != PQ_OK) {
for (i = ctx->msgcount; i < new_count; i++)
mutt_free_header (&ctx->hdrs[i]);
return ret;
if (!conn)
return -1;
- FREE (&ctx->path);
- ctx->path = safe_strdup (buf);
+ mem_free (&ctx->path);
+ ctx->path = str_dup (buf);
- pop_data = safe_calloc (1, sizeof (POP_DATA));
+ pop_data = mem_calloc (1, sizeof (POP_DATA));
pop_data->conn = conn;
ctx->data = pop_data;
conn->data = pop_data;
FOREVER {
- if (pop_reconnect (ctx) < 0)
+ if (pop_reconnect (ctx) != PQ_OK)
return -1;
ctx->size = pop_data->size;
if (!pop_data->clear_cache)
return;
- dprint (1, (debugfile, "pop_clear_cache: delete cached messages\n"));
+ debug_print (1, ("delete cached messages\n"));
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);
+ mem_free (&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);
+ mem_free (&cache->path);
}
}
FOREVER {
- if (pop_reconnect (ctx) < 0)
+ if (pop_reconnect (ctx) != PQ_OK)
return -1;
/* verify that massage index is correct */
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);
- if (ret == 0)
+ ret = pop_fetch_data (pop_data, buf, &bar, fetch_message, msg->fp);
+ if (ret == PQ_OK)
break;
safe_fclose (&msg->fp);
unlink (path);
- if (ret == -2) {
+ if (ret == PQ_ERR) {
mutt_error ("%s", pop_data->err_msg);
mutt_sleep (2);
return -1;
}
- if (ret == -3) {
+ if (ret == PFD_FUNCT_ERROR) {
mutt_error _("Can't write message to temporary file!");
mutt_sleep (2);
* portion of the headers, those required for the main display.
*/
cache->index = h->index;
- cache->path = safe_strdup (path);
+ cache->path = str_dup (path);
rewind (msg->fp);
uidl = h->data;
mutt_free_envelope (&h->env);
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)
}
/* update POP mailbox - delete messages from server */
-int pop_sync_mailbox (CONTEXT * ctx, int *index_hint)
+pop_query_status pop_sync_mailbox (CONTEXT * ctx, int unused, int *index_hint)
{
- int i, ret;
+ int i;
+ pop_query_status ret;
char buf[LONG_STRING];
POP_DATA *pop_data = (POP_DATA *) ctx->data;
pop_data->check_time = 0;
FOREVER {
- if (pop_reconnect (ctx) < 0)
- return -1;
+ if (pop_reconnect (ctx) != PQ_OK)
+ return PQ_NOT_CONNECTED;
mutt_message (_("Marking %d messages deleted..."), ctx->deleted);
}
}
- if (ret == 0) {
+ if (ret == PQ_OK) {
strfcpy (buf, "QUIT\r\n", sizeof (buf));
ret = pop_query (pop_data, buf, sizeof (buf));
}
- if (ret == 0) {
+ if (ret == PQ_OK) {
pop_data->clear_cache = 1;
pop_clear_cache (pop_data);
pop_data->status = POP_DISCONNECTED;
- return 0;
+ return PQ_OK;
}
- if (ret == -2) {
+ if (ret == PQ_ERR) {
mutt_error ("%s", pop_data->err_msg);
mutt_sleep (2);
- return -1;
+ return PQ_NOT_CONNECTED;
}
}
}
/* Check for new messages and fetch headers */
-int pop_check_mailbox (CONTEXT * ctx, int *index_hint)
+int pop_check_mailbox (CONTEXT * ctx, int *index_hint, int unused)
{
int ret;
POP_DATA *pop_data = (POP_DATA *) ctx->data;
char buffer[LONG_STRING];
char msgbuf[SHORT_STRING];
char *url, *p;
- int i, delanswer, last = 0, msgs, bytes, rset = 0, ret;
+ int i, delanswer, last = 0, msgs, bytes, rset = 0;
+ pop_query_status ret;
CONNECTION *conn;
CONTEXT ctx;
MESSAGE *msg = NULL;
return;
}
- url = p = safe_calloc (strlen (PopHost) + 7, sizeof (char));
+ url = p = mem_calloc (strlen (PopHost) + 7, sizeof (char));
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);
+ mem_free (&url);
if (ret) {
mutt_error (_("%s is an invalid POP path"), PopHost);
return;
if (!conn)
return;
- pop_data = safe_calloc (1, sizeof (POP_DATA));
+ pop_data = mem_calloc (1, sizeof (POP_DATA));
pop_data->conn = conn;
if (pop_open_connection (pop_data) < 0) {
mutt_socket_free (pop_data->conn);
- FREE (&pop_data);
+ mem_free (&pop_data);
return;
}
/* find out how many messages are in the mailbox. */
strfcpy (buffer, "STAT\r\n", sizeof (buffer));
ret = pop_query (pop_data, buffer, sizeof (buffer));
- if (ret == -1)
+ if (ret == PQ_NOT_CONNECTED)
goto fail;
- if (ret == -2) {
+ if (ret == PQ_ERR) {
mutt_error ("%s", pop_data->err_msg);
goto finish;
}
if (msgs > 0 && option (OPTPOPLAST)) {
strfcpy (buffer, "LAST\r\n", sizeof (buffer));
ret = pop_query (pop_data, buffer, sizeof (buffer));
- if (ret == -1)
+ if (ret == PQ_NOT_CONNECTED)
goto fail;
- if (ret == 0)
+ if (ret == PQ_OK)
sscanf (buffer, "+OK %d", &last);
}
else {
snprintf (buffer, sizeof (buffer), "RETR %d\r\n", i);
ret = pop_fetch_data (pop_data, buffer, NULL, fetch_message, msg->fp);
- if (ret == -3)
+ if (ret == PFD_FUNCT_ERROR)
rset = 1;
- if (ret == 0 && mx_commit_message (msg, &ctx) != 0) {
+ if (ret == PQ_OK && mx_commit_message (msg, &ctx) != 0) {
rset = 1;
- ret = -3;
+ ret = PFD_FUNCT_ERROR;
}
mx_close_message (&msg);
}
- if (ret == 0 && delanswer == M_YES) {
+ if (ret == PQ_OK && delanswer == M_YES) {
/* delete the message on the server */
snprintf (buffer, sizeof (buffer), "DELE %d\r\n", i);
ret = pop_query (pop_data, buffer, sizeof (buffer));
}
- if (ret == -1) {
+ if (ret == PQ_NOT_CONNECTED) {
mx_close_mailbox (&ctx, NULL);
goto fail;
}
- if (ret == -2) {
+ if (ret == PQ_ERR) {
mutt_error ("%s", pop_data->err_msg);
break;
}
- if (ret == -3) {
+ if (ret == -3) { /* this is -3 when ret != 0, because it will keep the value from before *gna* */
mutt_error _("Error while writing mailbox!");
break;
if (rset) {
/* make sure no messages get deleted */
strfcpy (buffer, "RSET\r\n", sizeof (buffer));
- if (pop_query (pop_data, buffer, sizeof (buffer)) == -1)
+ if (pop_query (pop_data, buffer, sizeof (buffer)) == PQ_NOT_CONNECTED)
goto fail;
}
finish:
/* exit gracefully */
strfcpy (buffer, "QUIT\r\n", sizeof (buffer));
- if (pop_query (pop_data, buffer, sizeof (buffer)) == -1)
+ if (pop_query (pop_data, buffer, sizeof (buffer)) == PQ_NOT_CONNECTED)
goto fail;
mutt_socket_close (conn);
- FREE (&pop_data);
+ mem_free (&pop_data);
return;
fail:
mutt_error _("Server closed connection!");
mutt_socket_close (conn);
- FREE (&pop_data);
+ mem_free (&pop_data);
}
projects / apps / madmutt.git / blobdiff