# include "config.h"
#endif
+#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/ascii.h>
+#include <lib-lib/macros.h>
+
#include "mutt.h"
#include "mx.h"
#include "url.h"
#include "pop.h"
-#ifdef USE_SSL
+#if defined (USE_SSL) || defined (USE_GNUTLS)
# include "mutt_ssl.h"
#endif
-#include "lib/mem.h"
-#include "lib/intl.h"
#include "lib/debug.h"
-#include "lib/str.h"
#include <string.h>
#include <unistd.h>
acct->port = POP_PORT;
acct->type = M_ACCT_TYPE_POP;
- c = safe_strdup (path);
+ c = m_strdup(path);
url_parse_ciss (&url, c);
if (url.scheme == U_POP || url.scheme == U_POPS) {
ret = 0;
}
- FREE (&c);
+ p_delete(&c);
return ret;
}
t = strchr (pop_data->err_msg, '\0');
c = msg;
- if (!safe_strncmp (msg, "-ERR ", 5)) {
+ if (!str_ncmp (msg, "-ERR ", 5)) {
c2 = msg + 5;
SKIPWS (c2);
char *c;
if (!ascii_strncasecmp (line, "SASL", 4)) {
- FREE (&pop_data->auth_list);
+ p_delete(&pop_data->auth_list);
c = line + 4;
SKIPWS (c);
- pop_data->auth_list = safe_strdup (c);
+ pop_data->auth_list = m_strdup(c);
}
else if (!ascii_strncasecmp (line, "STLS", 4))
POP_DATA *pop_data = (POP_DATA *) data;
if (!pop_data->auth_list) {
- pop_data->auth_list = safe_malloc (strlen (line) + 1);
- *pop_data->auth_list = '\0';
- }
- else {
- safe_realloc (&pop_data->auth_list,
- strlen (pop_data->auth_list) + strlen (line) + 2);
+ pop_data->auth_list = p_new(char, strlen(line) + 1);
+ } else {
+ p_realloc(&pop_data->auth_list,
+ strlen(pop_data->auth_list) + strlen(line) + 2);
strcat (pop_data->auth_list, " "); /* __STRCAT_CHECKED__ */
}
strcat (pop_data->auth_list, line); /* __STRCAT_CHECKED__ */
pop_data->resp_codes = 0;
pop_data->expire = 1;
pop_data->login_delay = 0;
- FREE (&pop_data->auth_list);
+ p_delete(&pop_data->auth_list);
}
/* Execute CAPA command */
pop_data->cmd_capa = CMD_AVAILABLE;
break;
}
+ case PFD_FUNCT_ERROR:
case PQ_ERR:
{
pop_data->cmd_capa = CMD_NOT_AVAILABLE;
pop_data->status = POP_CONNECTED;
- if (safe_strncmp (buf, "+OK", 3)) {
+ if (str_ncmp (buf, "+OK", 3)) {
*pop_data->err_msg = '\0';
pop_error (pop_data, buf);
mutt_error ("%s", pop_data->err_msg);
#if (defined(USE_SSL) || defined(USE_GNUTLS))
/* Attempt STLS if available and desired. */
- if (pop_data->cmd_stls && !pop_data->conn->ssf) {
+ if (!pop_data->conn->ssf && (pop_data->cmd_stls || option(OPTSSLFORCETLS))) {
+ if (option (OPTSSLFORCETLS))
+ pop_data->use_stls = 2;
if (pop_data->use_stls == 0) {
ret = query_quadoption (OPT_SSLSTARTTLS,
_("Secure connection with TLS?"));
mutt_error ("%s", pop_data->err_msg);
mutt_sleep (2);
}
-#ifdef USE_SSL
+#if defined (USE_SSL) || defined (USE_GNUTLS)
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"));
}
}
}
+
+ if (option(OPTSSLFORCETLS) && !pop_data->conn->ssf) {
+ mutt_error _("Encrypted connection unavailable");
+ mutt_sleep (1);
+ return -2;
+ }
#endif
ret = pop_authenticate (pop_data);
* -1 - conection lost,
* -2 - invalid command or execution error.
*/
-pop_query_status pop_query_d (POP_DATA * pop_data, char *buf, size_t buflen, char *msg)
+pop_query_status pop_query_d (POP_DATA * pop_data, char *buf, size_t buflen, const char *msg)
{
int dbg = M_SOCK_LOG_CMD;
char *c;
pop_data->status = POP_DISCONNECTED;
return PQ_NOT_CONNECTED;
}
- if (!safe_strncmp (buf, "+OK", 3))
+ if (!str_ncmp (buf, "+OK", 3))
return PQ_OK;
pop_error (pop_data, buf);
* -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, const char *query, progress_t* bar,
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));
if (ret != PQ_OK)
return ret;
- inbuf = safe_malloc (sizeof (buf));
+ inbuf = p_new(char, sizeof(buf));
FOREVER {
chunk =
p++;
}
- strfcpy (inbuf + lenbuf, p, sizeof (buf));
+ strfcpy(inbuf + lenbuf, p, sizeof(buf));
+ pos += chunk;
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;
}
- safe_realloc (&inbuf, lenbuf + sizeof (buf));
+ p_realloc(&inbuf, lenbuf + sizeof(buf));
}
- FREE (&inbuf);
+ p_delete(&inbuf);
return ret;
}
sscanf (line, "%u %s", &index, line);
for (i = 0; i < ctx->msgcount; i++) {
- if (!mutt_strcmp (ctx->hdrs[i]->data, line)) {
+ if (!m_strcmp(ctx->hdrs[i]->data, line)) {
ctx->hdrs[i]->refno = index;
break;
}
{
pop_query_status ret;
POP_DATA *pop_data = (POP_DATA *) ctx->data;
+ progress_t bar;
if (pop_data->status == POP_CONNECTED)
return PQ_OK;
ret = pop_open_connection (pop_data);
if (ret == PQ_OK) {
- char *msg = _("Verifying message indexes...");
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;
- 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);