projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rocco Rutte:
[apps/madmutt.git]
/
pop
/
pop.c
diff --git
a/pop/pop.c
b/pop/pop.c
index
c67cd7e
..
804fec2
100644
(file)
--- a/
pop/pop.c
+++ b/
pop/pop.c
@@
-15,10
+15,12
@@
#include "mx.h"
#include "pop.h"
#include "mutt_crypt.h"
#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/mem.h"
#include "lib/str.h"
#include "lib/intl.h"
+#include "lib/debug.h"
#include <string.h>
#include <unistd.h>
#include <string.h>
#include <unistd.h>
@@
-48,7
+50,6
@@
static pop_query_status pop_read_header (POP_DATA * pop_data, HEADER * h)
FILE *f;
int index;
pop_query_status ret;
FILE *f;
int index;
pop_query_status ret;
- cmd_status status;
long length;
char buf[LONG_STRING];
char tempfile[_POSIX_PATH_MAX];
long length;
char buf[LONG_STRING];
char tempfile[_POSIX_PATH_MAX];
@@
-71,13
+72,13
@@
static pop_query_status pop_read_header (POP_DATA * pop_data, HEADER * h)
if (ret == PQ_OK) {
pop_data->cmd_top = CMD_AVAILABLE;
if (ret == PQ_OK) {
pop_data->cmd_top = CMD_AVAILABLE;
- d
print (1, (debugfile, "pop_read_header:
set TOP capability\n"));
+ d
ebug_print (1, ("
set TOP capability\n"));
}
if (ret == PQ_ERR) {
pop_data->cmd_top = CMD_NOT_AVAILABLE;
}
if (ret == PQ_ERR) {
pop_data->cmd_top = CMD_NOT_AVAILABLE;
- d
print (1, (debugfile, "pop_read_header:
unset TOP capability\n"));
+ d
ebug_print (1, ("
unset TOP capability\n"));
snprintf (pop_data->err_msg, sizeof (pop_data->err_msg),
_("Command TOP is not supported by server."));
}
snprintf (pop_data->err_msg, sizeof (pop_data->err_msg),
_("Command TOP is not supported by server."));
}
@@
-106,6
+107,11
@@
static pop_query_status pop_read_header (POP_DATA * pop_data, HEADER * h)
{
mutt_error _("Can't write header to temporary file!");
{
mutt_error _("Can't write header to temporary file!");
+ break;
+ }
+ case PQ_NOT_CONNECTED:
+ {
+ mutt_error _("Can't fetch header: Not connected!");
break;
}
}
break;
}
}
@@
-124,20
+130,18
@@
static int fetch_uidl (char *line, void *data)
sscanf (line, "%d %s", &index, line);
for (i = 0; i < ctx->msgcount; i++)
sscanf (line, "%d %s", &index, line);
for (i = 0; i < ctx->msgcount; i++)
- if (!s
afe_str
cmp (line, ctx->hdrs[i]->data))
+ if (!s
tr_
cmp (line, ctx->hdrs[i]->data))
break;
if (i == ctx->msgcount) {
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 ();
if (i >= ctx->hdrmax)
mx_alloc_memory (ctx);
ctx->msgcount++;
ctx->hdrs[i] = mutt_new_header ();
- ctx->hdrs[i]->data = s
afe_str
dup (line);
+ ctx->hdrs[i]->data = s
tr_
dup (line);
}
else if (ctx->hdrs[i]->index != index - 1)
pop_data->clear_cache = 1;
}
else if (ctx->hdrs[i]->index != index - 1)
pop_data->clear_cache = 1;
@@
-177,13
+181,13
@@
static int pop_fetch_headers (CONTEXT * ctx)
if (ret == PQ_OK) {
pop_data->cmd_uidl = CMD_AVAILABLE;
if (ret == PQ_OK) {
pop_data->cmd_uidl = CMD_AVAILABLE;
- d
print (1, (debugfile, "pop_fetch_headers:
set UIDL capability\n"));
+ d
ebug_print (1, ("
set UIDL capability\n"));
}
if (ret == PQ_ERR && pop_data->cmd_uidl == CMD_UNKNOWN) {
pop_data->cmd_uidl = CMD_NOT_AVAILABLE;
}
if (ret == PQ_ERR && pop_data->cmd_uidl == CMD_UNKNOWN) {
pop_data->cmd_uidl = CMD_NOT_AVAILABLE;
- d
print (1, (debugfile, "pop_fetch_headers:
unset UIDL capability\n"));
+ d
ebug_print (1, ("
unset UIDL capability\n"));
snprintf (pop_data->err_msg, sizeof (pop_data->err_msg),
_("Command UIDL is not supported by server."));
}
snprintf (pop_data->err_msg, sizeof (pop_data->err_msg),
_("Command UIDL is not supported by server."));
}
@@
-242,10
+246,10
@@
int pop_open_mailbox (CONTEXT * ctx)
if (!conn)
return -1;
if (!conn)
return -1;
-
FREE
(&ctx->path);
- ctx->path = s
afe_str
dup (buf);
+
mem_free
(&ctx->path);
+ ctx->path = s
tr_
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;
pop_data->conn = conn;
ctx->data = pop_data;
@@
-282,12
+286,12
@@
static void pop_clear_cache (POP_DATA * pop_data)
if (!pop_data->clear_cache)
return;
if (!pop_data->clear_cache)
return;
- d
print (1, (debugfile, "pop_clear_cache:
delete cached messages\n"));
+ d
ebug_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);
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);
}
}
}
}
}
}
@@
-323,7
+327,7
@@
int pop_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno)
void *uidl;
char buf[LONG_STRING];
char path[_POSIX_PATH_MAX];
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];
POP_DATA *pop_data = (POP_DATA *) ctx->data;
POP_CACHE *cache;
HEADER *h = ctx->hdrs[msgno];
@@
-345,7
+349,7
@@
int pop_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno)
else {
/* clear the previous entry */
unlink (cache->path);
else {
/* clear the previous entry */
unlink (cache->path);
-
FREE
(&cache->path);
+
mem_free
(&cache->path);
}
}
}
}
@@
-361,7
+365,9
@@
int pop_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno)
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+");
mutt_mktemp (path);
msg->fp = safe_fopen (path, "w+");
@@
-373,7
+379,7
@@
int pop_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno)
snprintf (buf, sizeof (buf), "RETR %d\r\n", h->refno);
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;
if (ret == PQ_OK)
break;
@@
-398,7
+404,7
@@
int pop_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno)
* portion of the headers, those required for the main display.
*/
cache->index = h->index;
* portion of the headers, those required for the main display.
*/
cache->index = h->index;
- cache->path = s
afe_str
dup (path);
+ cache->path = s
tr_
dup (path);
rewind (msg->fp);
uidl = h->data;
mutt_free_envelope (&h->env);
rewind (msg->fp);
uidl = h->data;
mutt_free_envelope (&h->env);
@@
-424,7
+430,7
@@
int pop_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno)
}
/* update POP mailbox - delete messages from server */
}
/* 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;
{
int i;
pop_query_status ret;
@@
-467,7
+473,7
@@
pop_query_status pop_sync_mailbox (CONTEXT * ctx, int *index_hint)
}
/* Check for new messages and fetch headers */
}
/* 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;
{
int ret;
POP_DATA *pop_data = (POP_DATA *) ctx->data;
@@
-518,7
+524,7
@@
void pop_fetch_mail (void)
return;
}
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');
if (url_check_scheme (PopHost) == U_UNKNOWN) {
strcpy (url, "pop://"); /* __STRCPY_CHECKED__ */
p = strchr (url, '\0');
@@
-526,7
+532,7
@@
void pop_fetch_mail (void)
strcpy (p, PopHost); /* __STRCPY_CHECKED__ */
ret = pop_parse_path (url, &acct);
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 (ret) {
mutt_error (_("%s is an invalid POP path"), PopHost);
return;
@@
-536,12
+542,12
@@
void pop_fetch_mail (void)
if (!conn)
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);
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;
}
return;
}
@@
-643,11
+649,11
@@
finish:
if (pop_query (pop_data, buffer, sizeof (buffer)) == PQ_NOT_CONNECTED)
goto fail;
mutt_socket_close (conn);
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);
return;
fail:
mutt_error _("Server closed connection!");
mutt_socket_close (conn);
-
FREE
(&pop_data);
+
mem_free
(&pop_data);
}
}