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
9eb6172
..
ab5b739
100644
(file)
--- a/
pop/pop.c
+++ b/
pop/pop.c
@@
-16,6
+16,11
@@
#include "pop.h"
#include "mutt_crypt.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 <string.h>
#include <unistd.h>
@@
-39,7
+44,7
@@
static int fetch_message (char *line, void *file)
* -2 - invalid command or execution error,
* -3 - error writing to tempfile
*/
* -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 index;
{
FILE *f;
int index;
@@
-51,7
+56,7
@@
static int pop_read_header (POP_DATA * pop_data, HEADER * h)
mutt_mktemp (tempfile);
if (!(f = safe_fopen (tempfile, "w+"))) {
mutt_perror (tempfile);
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);
}
snprintf (buf, sizeof (buf), "LIST %d\r\n", h->refno);
@@
-62,17
+67,17
@@
static int pop_read_header (POP_DATA * pop_data, HEADER * h)
snprintf (buf, sizeof (buf), "TOP %d 0\r\n", h->refno);
ret = pop_fetch_data (pop_data, buf, NULL, fetch_message, f);
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 (pop_data->cmd_top ==
CMD_UNKNOWN
) {
if (ret == PQ_OK) {
if (ret == PQ_OK) {
- pop_data->cmd_top =
1
;
+ 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) {
}
if (ret == PQ_ERR) {
- pop_data->cmd_top =
0
;
+ 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."));
}
@@
-123,9
+128,7
@@
static int fetch_uidl (char *line, void *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);
if (i >= ctx->hdrmax)
mx_alloc_memory (ctx);
@@
-168,17
+171,17
@@
static int pop_fetch_headers (CONTEXT * ctx)
new_count = ctx->msgcount;
ctx->msgcount = old_count;
new_count = ctx->msgcount;
ctx->msgcount = old_count;
- if (pop_data->cmd_uidl ==
2
) {
+ if (pop_data->cmd_uidl ==
CMD_UNKNOWN
) {
if (ret == PQ_OK) {
if (ret == PQ_OK) {
- pop_data->cmd_uidl =
1
;
+ 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 ==
2
) {
- pop_data->cmd_uidl =
0
;
+ 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."));
}
@@
-277,7
+280,7
@@
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) {
for (i = 0; i < POP_CACHE_LEN; i++) {
if (pop_data->cache[i].path) {
@@
-419,7
+422,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;
@@
-462,7
+465,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;