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_lib.c
diff --git
a/pop/pop_lib.c
b/pop/pop_lib.c
index
143868e
..
fe30c11
100644
(file)
--- a/
pop/pop_lib.c
+++ b/
pop/pop_lib.c
@@
-12,10
+12,11
@@
#endif
#include "mutt.h"
#endif
#include "mutt.h"
+#include "ascii.h"
#include "mx.h"
#include "url.h"
#include "pop.h"
#include "mx.h"
#include "url.h"
#include "pop.h"
-#if
def USE_SSL
+#if
defined (USE_SSL) || defined (USE_GNUTLS)
# include "mutt_ssl.h"
#endif
# include "mutt_ssl.h"
#endif
@@
-160,6
+161,7
@@
static pop_query_status pop_capabilities (POP_DATA * pop_data, int mode)
pop_data->cmd_capa = CMD_AVAILABLE;
break;
}
pop_data->cmd_capa = CMD_AVAILABLE;
break;
}
+ case PFD_FUNCT_ERROR:
case PQ_ERR:
{
pop_data->cmd_capa = CMD_NOT_AVAILABLE;
case PQ_ERR:
{
pop_data->cmd_capa = CMD_NOT_AVAILABLE;
@@
-283,10
+285,8
@@
pop_query_status pop_open_connection (POP_DATA * pop_data)
mutt_error ("%s", pop_data->err_msg);
mutt_sleep (2);
}
mutt_error ("%s", pop_data->err_msg);
mutt_sleep (2);
}
-#if
def USE_SSL
+#if
defined (USE_SSL) || defined (USE_GNUTLS)
else if (mutt_ssl_starttls (pop_data->conn))
else if (mutt_ssl_starttls (pop_data->conn))
-#elif USE_GNUTLS
- else if (mutt_gnutls_starttls (pop_data->conn))
#endif
{
mutt_error (_("Could not negotiate TLS connection"));
#endif
{
mutt_error (_("Could not negotiate TLS connection"));
@@
-428,14
+428,15
@@
pop_query_status pop_query_d (POP_DATA * pop_data, char *buf, size_t buflen, cha
* -2 - invalid command or execution error,
* -3 - error in funct(*line, *data)
*/
* -2 - invalid command or execution error,
* -3 - error in funct(*line, *data)
*/
-pop_query_status pop_fetch_data (POP_DATA * pop_data, char *query,
char *msg
,
+pop_query_status pop_fetch_data (POP_DATA * pop_data, char *query,
progress_t* bar
,
int (*funct) (char *, void *), void *data)
{
char buf[LONG_STRING];
char *inbuf;
char *p;
pop_query_status ret;
int (*funct) (char *, void *), void *data)
{
char buf[LONG_STRING];
char *inbuf;
char *p;
pop_query_status ret;
- int chunk, line = 0;
+ int chunk = 0;
+ long pos = 0;
size_t lenbuf = 0;
strfcpy (buf, query, sizeof (buf));
size_t lenbuf = 0;
strfcpy (buf, query, sizeof (buf));
@@
-463,14
+464,14
@@
pop_query_status pop_fetch_data (POP_DATA * pop_data, char *query, char *msg,
}
strfcpy (inbuf + lenbuf, p, sizeof (buf));
}
strfcpy (inbuf + lenbuf, p, sizeof (buf));
+ pos += chunk;
if (chunk >= sizeof (buf)) {
lenbuf += strlen (p);
}
else {
if (chunk >= sizeof (buf)) {
lenbuf += strlen (p);
}
else {
- line++;
- if (msg && ReadInc && (line % ReadInc == 0))
- mutt_message ("%s %d", msg, line);
+ if (bar)
+ mutt_progress_bar (bar, pos);
if (ret == 0 && funct (inbuf, data) < 0)
ret = PFD_FUNCT_ERROR;
lenbuf = 0;
if (ret == 0 && funct (inbuf, data) < 0)
ret = PFD_FUNCT_ERROR;
lenbuf = 0;
@@
-506,6
+507,7
@@
pop_query_status pop_reconnect (CONTEXT * ctx)
{
pop_query_status ret;
POP_DATA *pop_data = (POP_DATA *) ctx->data;
{
pop_query_status ret;
POP_DATA *pop_data = (POP_DATA *) ctx->data;
+ progress_t bar;
if (pop_data->status == POP_CONNECTED)
return PQ_OK;
if (pop_data->status == POP_CONNECTED)
return PQ_OK;
@@
-517,15
+519,16
@@
pop_query_status pop_reconnect (CONTEXT * ctx)
ret = pop_open_connection (pop_data);
if (ret == PQ_OK) {
ret = pop_open_connection (pop_data);
if (ret == PQ_OK) {
- char *msg = _("Verifying message indexes...");
int i;
int i;
+ bar.msg = _("Verifying message indexes...");
+ bar.size = 0;
+ mutt_progress_bar (&bar, 0);
+
for (i = 0; i < ctx->msgcount; i++)
ctx->hdrs[i]->refno = -1;
for (i = 0; i < ctx->msgcount; i++)
ctx->hdrs[i]->refno = -1;
- mutt_message (msg);
-
- ret = pop_fetch_data (pop_data, "UIDL\r\n", msg, check_uidl, ctx);
+ ret = pop_fetch_data (pop_data, "UIDL\r\n", &bar, check_uidl, ctx);
if (ret == PQ_ERR) {
mutt_error ("%s", pop_data->err_msg);
mutt_sleep (2);
if (ret == PQ_ERR) {
mutt_error ("%s", pop_data->err_msg);
mutt_sleep (2);