projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
more charset improvements.
[apps/madmutt.git]
/
pop
/
pop.c
diff --git
a/pop/pop.c
b/pop/pop.c
index
572c79e
..
5fe55e4
100644
(file)
--- a/
pop/pop.c
+++ b/
pop/pop.c
@@
-18,7
+18,6
@@
#include <lib-lib/file.h>
#include <lib-lib/str.h>
#include <lib-lib/macros.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 <lib-ui/curses.h>
@@
-50,7
+49,7
@@
static int fetch_message (char *line, void *file)
static pop_query_status pop_read_header (POP_DATA * pop_data, HEADER * h)
{
FILE *f;
static pop_query_status pop_read_header (POP_DATA * pop_data, HEADER * h)
{
FILE *f;
- int i
nde
x;
+ int i
d
x;
pop_query_status ret;
long length;
char buf[LONG_STRING];
pop_query_status ret;
long length;
char buf[LONG_STRING];
@@
-62,10
+61,10
@@
static pop_query_status pop_read_header (POP_DATA * pop_data, HEADER * h)
return PFD_FUNCT_ERROR;
}
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) {
ret = pop_query (pop_data, buf, sizeof (buf));
if (ret == PQ_OK) {
- sscanf (buf, "+OK %d %ld", &i
nde
x, &length);
+ sscanf (buf, "+OK %d %ld", &i
d
x, &length);
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);
@@
-73,14
+72,10
@@
static pop_query_status pop_read_header (POP_DATA * pop_data, HEADER * h)
if (pop_data->cmd_top == CMD_UNKNOWN) {
if (ret == PQ_OK) {
pop_data->cmd_top = CMD_AVAILABLE;
if (pop_data->cmd_top == CMD_UNKNOWN) {
if (ret == PQ_OK) {
pop_data->cmd_top = CMD_AVAILABLE;
-
- debug_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;
-
- debug_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."));
}
@@
-126,18
+121,16
@@
static pop_query_status pop_read_header (POP_DATA * pop_data, HEADER * h)
/* parse UIDL */
static int fetch_uidl (char *line, void *data)
{
/* parse UIDL */
static int fetch_uidl (char *line, void *data)
{
- int i, i
nde
x;
+ int i, i
d
x;
CONTEXT *ctx = (CONTEXT *) data;
POP_DATA *pop_data = (POP_DATA *) ctx->data;
CONTEXT *ctx = (CONTEXT *) data;
POP_DATA *pop_data = (POP_DATA *) ctx->data;
- sscanf (line, "%d %s", &i
nde
x, line);
+ sscanf (line, "%d %s", &i
d
x, line);
for (i = 0; i < ctx->msgcount; i++)
if (!m_strcmp(line, ctx->hdrs[i]->data))
break;
if (i == ctx->msgcount) {
for (i = 0; i < ctx->msgcount; i++)
if (!m_strcmp(line, ctx->hdrs[i]->data))
break;
if (i == ctx->msgcount) {
- 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);
@@
-145,11
+138,11
@@
static int fetch_uidl (char *line, void *data)
ctx->hdrs[i] = header_new();
ctx->hdrs[i]->data = m_strdup(line);
}
ctx->hdrs[i] = header_new();
ctx->hdrs[i]->data = m_strdup(line);
}
- else if (ctx->hdrs[i]->index != i
nde
x - 1)
+ else if (ctx->hdrs[i]->index != i
d
x - 1)
pop_data->clear_cache = 1;
pop_data->clear_cache = 1;
- ctx->hdrs[i]->refno = i
nde
x;
- ctx->hdrs[i]->index = i
nde
x - 1;
+ ctx->hdrs[i]->refno = i
d
x;
+ ctx->hdrs[i]->index = i
d
x - 1;
return 0;
}
return 0;
}
@@
-182,14
+175,11
@@
static int pop_fetch_headers (CONTEXT * ctx)
if (pop_data->cmd_uidl == CMD_UNKNOWN) {
if (ret == PQ_OK) {
pop_data->cmd_uidl = CMD_AVAILABLE;
if (pop_data->cmd_uidl == CMD_UNKNOWN) {
if (ret == PQ_OK) {
pop_data->cmd_uidl = CMD_AVAILABLE;
-
- debug_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;
- debug_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."));
}
@@
-231,20
+221,20
@@
int pop_open_mailbox (CONTEXT * ctx)
int ret;
char buf[LONG_STRING];
CONNECTION *conn;
int ret;
char buf[LONG_STRING];
CONNECTION *conn;
- ACCOUNT ac
c
t;
+ ACCOUNT act;
POP_DATA *pop_data;
ciss_url_t url;
POP_DATA *pop_data;
ciss_url_t url;
- if (pop_parse_path (ctx->path, &ac
c
t)) {
+ if (pop_parse_path (ctx->path, &act)) {
mutt_error (_("%s is an invalid POP path"), ctx->path);
mutt_sleep (2);
return -1;
}
mutt_error (_("%s is an invalid POP path"), ctx->path);
mutt_sleep (2);
return -1;
}
- mutt_account_tourl (&ac
c
t, &url);
+ mutt_account_tourl (&act, &url);
url.path = NULL;
url_ciss_tostring (&url, buf, sizeof (buf), 0);
url.path = NULL;
url_ciss_tostring (&url, buf, sizeof (buf), 0);
- conn = mutt_conn_find (NULL, &ac
c
t);
+ conn = mutt_conn_find (NULL, &act);
if (!conn)
return -1;
if (!conn)
return -1;
@@
-288,8
+278,6
@@
static void pop_clear_cache (POP_DATA * pop_data)
if (!pop_data->clear_cache)
return;
if (!pop_data->clear_cache)
return;
- 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);
for (i = 0; i < POP_CACHE_LEN; i++) {
if (pop_data->cache[i].path) {
unlink (pop_data->cache[i].path);
@@
-431,7
+419,9
@@
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 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;
{
int i;
pop_query_status ret;
@@
-474,7
+464,9
@@
pop_query_status pop_sync_mailbox (CONTEXT * ctx, int unused, 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 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;
{
int ret;
POP_DATA *pop_data = (POP_DATA *) ctx->data;
@@
-516,7
+508,7
@@
void pop_fetch_mail (void)
CONNECTION *conn;
CONTEXT ctx;
MESSAGE *msg = NULL;
CONNECTION *conn;
CONTEXT ctx;
MESSAGE *msg = NULL;
- ACCOUNT ac
c
t;
+ ACCOUNT act;
POP_DATA *pop_data;
if (!PopHost) {
POP_DATA *pop_data;
if (!PopHost) {
@@
-532,14
+524,14
@@
void pop_fetch_mail (void)
}
strcpy (p, PopHost); /* __STRCPY_CHECKED__ */
}
strcpy (p, PopHost); /* __STRCPY_CHECKED__ */
- ret = pop_parse_path (url, &ac
c
t);
+ ret = pop_parse_path (url, &act);
p_delete(&url);
if (ret) {
mutt_error (_("%s is an invalid POP path"), PopHost);
return;
}
p_delete(&url);
if (ret) {
mutt_error (_("%s is an invalid POP path"), PopHost);
return;
}
- conn = mutt_conn_find (NULL, &ac
c
t);
+ conn = mutt_conn_find (NULL, &act);
if (!conn)
return;
if (!conn)
return;