#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>
FILE *f;
int index;
pop_query_status ret;
- cmd_status status;
long length;
char buf[LONG_STRING];
char tempfile[_POSIX_PATH_MAX];
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 == 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."));
}
{
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;
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 == 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 (!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;
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);
}
}
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 = 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 */
-pop_query_status pop_sync_mailbox (CONTEXT * ctx, int *index_hint)
+pop_query_status pop_sync_mailbox (CONTEXT * ctx, int unused, int *index_hint)
{
int i;
pop_query_status ret;
}
/* 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;
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;
}
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