projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove most of the debug code: often makes the code unreadable, for little
[apps/madmutt.git]
/
pop
/
pop.c
diff --git
a/pop/pop.c
b/pop/pop.c
index
3213e92
..
5fe55e4
100644
(file)
--- a/
pop/pop.c
+++ b/
pop/pop.c
@@
-11,18
+11,20
@@
# include "config.h"
#endif
# include "config.h"
#endif
+#include <string.h>
+#include <unistd.h>
+
+#include <lib-lib/mem.h>
+#include <lib-lib/file.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
+
+#include <lib-ui/curses.h>
+
#include "mutt.h"
#include "mx.h"
#include "pop.h"
#include "mutt.h"
#include "mx.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 <lib-crypt/crypt.h>
/* write line to file */
static int fetch_message (char *line, void *file)
/* write line to file */
static int fetch_message (char *line, void *file)
@@
-47,9
+49,8
@@
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;
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];
@@
-60,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);
@@
-71,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."));
}
@@
-107,6
+104,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;
}
}
@@
-119,30
+121,28
@@
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++)
for (i = 0; i < ctx->msgcount; i++)
- if (!
safe_strcmp
(line, ctx->hdrs[i]->data))
+ if (!
m_strcmp
(line, ctx->hdrs[i]->data))
break;
if (i == ctx->msgcount) {
break;
if (i == ctx->msgcount) {
- debug_print (1, ("new header %d %s\n", index, line));
-
if (i >= ctx->hdrmax)
mx_alloc_memory (ctx);
ctx->msgcount++;
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] =
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;
}
@@
-175,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."));
}
@@
-210,7
+207,7
@@
static int pop_fetch_headers (CONTEXT * ctx)
if (ret != PQ_OK) {
for (i = ctx->msgcount; i < new_count; i++)
if (ret != PQ_OK) {
for (i = ctx->msgcount; i < new_count; i++)
-
mutt_free_header
(&ctx->hdrs[i]);
+
header_delete
(&ctx->hdrs[i]);
return ret;
}
return ret;
}
@@
-224,27
+221,27
@@
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;
-
FREE
(&ctx->path);
- ctx->path =
safe_strdup
(buf);
+
p_delete
(&ctx->path);
+ ctx->path =
m_strdup
(buf);
- pop_data =
safe_calloc (1, sizeof (POP_DATA)
);
+ pop_data =
p_new(POP_DATA, 1
);
pop_data->conn = conn;
ctx->data = pop_data;
pop_data->conn = conn;
ctx->data = pop_data;
@@
-253,7
+250,7
@@
int pop_open_mailbox (CONTEXT * ctx)
conn->data = pop_data;
conn->data = pop_data;
-
FOREVER
{
+
for (;;)
{
if (pop_reconnect (ctx) != PQ_OK)
return -1;
if (pop_reconnect (ctx) != PQ_OK)
return -1;
@@
-281,12
+278,10
@@
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);
-
FREE
(&pop_data->cache[i].path);
+
p_delete
(&pop_data->cache[i].path);
}
}
}
}
}
}
@@
-322,7
+317,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];
@@
-344,11
+339,11
@@
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);
+
p_delete
(&cache->path);
}
}
}
}
-
FOREVER
{
+
for (;;)
{
if (pop_reconnect (ctx) != PQ_OK)
return -1;
if (pop_reconnect (ctx) != PQ_OK)
return -1;
@@
-360,7
+355,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+");
@@
-372,7
+369,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;
@@
-397,10
+394,10
@@
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 =
safe_strdup
(path);
+ cache->path =
m_strdup
(path);
rewind (msg->fp);
uidl = h->data;
rewind (msg->fp);
uidl = h->data;
-
mutt_free_envelope
(&h->env);
+
envelope_delete
(&h->env);
h->env = mutt_read_rfc822_header (msg->fp, h, 0, 0);
h->data = uidl;
h->lines = 0;
h->env = mutt_read_rfc822_header (msg->fp, h, 0, 0);
h->data = uidl;
h->lines = 0;
@@
-410,11
+407,10
@@
int pop_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno)
fgets (buf, sizeof (buf), msg->fp);
}
fgets (buf, sizeof (buf), msg->fp);
}
- h->content->length = ftell (msg->fp) - h->content->offset;
+ h->content->length = ftell
o
(msg->fp) - h->content->offset;
/* This needs to be done in case this is a multipart message */
/* This needs to be done in case this is a multipart message */
- if (!WithCrypto)
- h->security = crypt_query (h->content);
+ h->security = crypt_query (h->content);
mutt_clear_error ();
rewind (msg->fp);
mutt_clear_error ();
rewind (msg->fp);
@@
-423,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;
@@
-432,7
+430,7
@@
pop_query_status pop_sync_mailbox (CONTEXT * ctx, int unused, int *index_hint)
pop_data->check_time = 0;
pop_data->check_time = 0;
-
FOREVER
{
+
for (;;)
{
if (pop_reconnect (ctx) != PQ_OK)
return PQ_NOT_CONNECTED;
if (pop_reconnect (ctx) != PQ_OK)
return PQ_NOT_CONNECTED;
@@
-446,7
+444,7
@@
pop_query_status pop_sync_mailbox (CONTEXT * ctx, int unused, int *index_hint)
}
if (ret == PQ_OK) {
}
if (ret == PQ_OK) {
-
strfcpy (buf, "QUIT\r\n", sizeof (buf)
);
+
m_strcpy(buf, sizeof(buf), "QUIT\r\n"
);
ret = pop_query (pop_data, buf, sizeof (buf));
}
ret = pop_query (pop_data, buf, sizeof (buf));
}
@@
-466,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;
@@
-508,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) {
@@
-517,30
+517,30
@@
void pop_fetch_mail (void)
return;
}
return;
}
- url = p =
safe_calloc (strlen (PopHost) + 7, sizeof (char)
);
+ url = p =
p_new(char, strlen (PopHost) + 7
);
if (url_check_scheme (PopHost) == U_UNKNOWN) {
strcpy (url, "pop://"); /* __STRCPY_CHECKED__ */
p = strchr (url, '\0');
}
strcpy (p, PopHost); /* __STRCPY_CHECKED__ */
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, &ac
c
t);
-
FREE
(&url);
+ ret = pop_parse_path (url, &act);
+
p_delete
(&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;
}
- conn = mutt_conn_find (NULL, &ac
c
t);
+ conn = mutt_conn_find (NULL, &act);
if (!conn)
return;
if (!conn)
return;
- pop_data =
safe_calloc (1, sizeof (POP_DATA)
);
+ pop_data =
p_new(POP_DATA, 1
);
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);
+
p_delete
(&pop_data);
return;
}
return;
}
@@
-549,7
+549,7
@@
void pop_fetch_mail (void)
mutt_message _("Checking for new messages...");
/* find out how many messages are in the mailbox. */
mutt_message _("Checking for new messages...");
/* find out how many messages are in the mailbox. */
-
strfcpy (buffer, "STAT\r\n", sizeof (buffer)
);
+
m_strcpy(buffer, sizeof(buffer), "STAT\r\n"
);
ret = pop_query (pop_data, buffer, sizeof (buffer));
if (ret == PQ_NOT_CONNECTED)
goto fail;
ret = pop_query (pop_data, buffer, sizeof (buffer));
if (ret == PQ_NOT_CONNECTED)
goto fail;
@@
-562,7
+562,7
@@
void pop_fetch_mail (void)
/* only get unread messages */
if (msgs > 0 && option (OPTPOPLAST)) {
/* only get unread messages */
if (msgs > 0 && option (OPTPOPLAST)) {
-
strfcpy (buffer, "LAST\r\n", sizeof (buffer)
);
+
m_strcpy(buffer, sizeof(buffer), "LAST\r\n"
);
ret = pop_query (pop_data, buffer, sizeof (buffer));
if (ret == PQ_NOT_CONNECTED)
goto fail;
ret = pop_query (pop_data, buffer, sizeof (buffer));
if (ret == PQ_NOT_CONNECTED)
goto fail;
@@
-631,22
+631,22
@@
void pop_fetch_mail (void)
if (rset) {
/* make sure no messages get deleted */
if (rset) {
/* make sure no messages get deleted */
-
strfcpy (buffer, "RSET\r\n", sizeof (buffer)
);
+
m_strcpy(buffer, sizeof(buffer), "RSET\r\n"
);
if (pop_query (pop_data, buffer, sizeof (buffer)) == PQ_NOT_CONNECTED)
goto fail;
}
finish:
/* exit gracefully */
if (pop_query (pop_data, buffer, sizeof (buffer)) == PQ_NOT_CONNECTED)
goto fail;
}
finish:
/* exit gracefully */
-
strfcpy (buffer, "QUIT\r\n", sizeof (buffer)
);
+
m_strcpy(buffer, sizeof(buffer), "QUIT\r\n"
);
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);
+
p_delete
(&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);
+
p_delete
(&pop_data);
}
}