* please see the file GPL in the top level source directory.
*/
-#if HAVE_CONFIG_H
-# 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 <lib-lib/lib-lib.h>
+#include <lib-mx/mx.h>
#include "mutt.h"
-#include "mx.h"
-#include "url.h"
#include "pop.h"
#if defined (USE_SSL) || defined (USE_GNUTLS)
-# include "mutt_ssl.h"
+# include <lib-sys/mutt_ssl.h>
#endif
-#include "lib/debug.h"
-
-#include <string.h>
-#include <unistd.h>
-#include <ctype.h>
-
/* given an POP mailbox name, return host, port, username and password */
-int pop_parse_path (const char *path, ACCOUNT * acct)
+int pop_parse_path (const char *path, ACCOUNT * act)
{
ciss_url_t url;
char *c;
int ret = -1;
/* Defaults */
- acct->flags = 0;
- acct->port = POP_PORT;
- acct->type = M_ACCT_TYPE_POP;
+ act->flags = 0;
+ act->port = POP_PORT;
+ act->type = M_ACCT_TYPE_POP;
c = m_strdup(path);
url_parse_ciss (&url, c);
if (url.scheme == U_POP || url.scheme == U_POPS) {
if (url.scheme == U_POPS) {
- acct->flags |= M_ACCT_SSL;
- acct->port = POP_SSL_PORT;
+ act->flags |= M_ACCT_SSL;
+ act->port = POP_SSL_PORT;
}
- if ((!url.path || !*url.path) && mutt_account_fromurl (acct, &url) == 0)
+ if ((!url.path || !*url.path) && mutt_account_fromurl (act, &url) == 0)
ret = 0;
}
c = msg;
if (!m_strncmp(msg, "-ERR ", 5)) {
- c2 = msg + 5;
- SKIPWS (c2);
-
+ c2 = vskipspaces(msg + 5);
if (*c2)
c = c2;
}
m_strcpy(t, sizeof(pop_data->err_msg) - strlen(pop_data->err_msg), c);
- str_skip_trailws (pop_data->err_msg);
+ m_strrtrim(pop_data->err_msg);
}
/* Parse CAPA output */
if (!ascii_strncasecmp (line, "SASL", 4)) {
p_delete(&pop_data->auth_list);
- c = line + 4;
- SKIPWS (c);
+ c = vskipspaces(line + 4);
pop_data->auth_list = m_strdup(c);
}
static int fetch_auth (char *line, void *data)
{
POP_DATA *pop_data = (POP_DATA *) data;
+ ssize_t auth_list_len;
if (!pop_data->auth_list) {
- pop_data->auth_list = p_new(char, strlen(line) + 1);
+ auth_list_len = m_strlen(line) + 1;
+ pop_data->auth_list = p_new(char, auth_list_len);
} else {
- p_realloc(&pop_data->auth_list,
- strlen(pop_data->auth_list) + strlen(line) + 2);
- strcat (pop_data->auth_list, " "); /* __STRCAT_CHECKED__ */
+ auth_list_len = m_strlen(pop_data->auth_list) + m_strlen(line) + 2;
+ p_realloc(&pop_data->auth_list, auth_list_len);
+ m_strcat(pop_data->auth_list, auth_list_len, " ");
}
- strcat (pop_data->auth_list, line); /* __STRCAT_CHECKED__ */
+ m_strcat(pop_data->auth_list, auth_list_len, line);
return 0;
}
* -1 - conection lost,
* -2 - invalid command or execution error.
*/
-pop_query_status pop_query_d (POP_DATA * pop_data, char *buf, size_t buflen, const char *msg)
+pop_query_status pop_query (POP_DATA * pop_data, char *buf, size_t buflen)
{
- int dbg = M_SOCK_LOG_CMD;
char *c;
if (pop_data->status != POP_CONNECTED)
return PQ_NOT_CONNECTED;
-#ifdef DEBUG
- /* print msg instaed of real command */
- if (msg) {
- dbg = M_SOCK_LOG_FULL;
- debug_print (M_SOCK_LOG_CMD, ("> %s", msg));
- }
-#endif
-
- mutt_socket_write_d (pop_data->conn, buf, dbg);
+ mutt_socket_write(pop_data->conn, buf);
c = strpbrk (buf, " \r\n");
*c = '\0';
for (;;) {
chunk =
- mutt_socket_readln_d (buf, sizeof (buf), pop_data->conn,
- M_SOCK_LOG_HDR);
+ mutt_socket_readln(buf, sizeof (buf), pop_data->conn);
if (chunk < 0) {
pop_data->status = POP_DISCONNECTED;
ret = PQ_NOT_CONNECTED;
m_strcpy(inbuf + lenbuf,sizeof(buf), p);
pos += chunk;
- if (chunk >= sizeof (buf)) {
+ if (chunk >= ssizeof(buf)) {
lenbuf += strlen (p);
- }
- else {
+ } else {
if (bar)
mutt_progress_bar (bar, pos);
if (ret == 0 && funct (inbuf, data) < 0)
/* find message with this UIDL and set refno */
static int check_uidl (char *line, void *data)
{
- int i;
- unsigned int index;
- CONTEXT *ctx = (CONTEXT *) data;
+ int i, idx;
+ CONTEXT *ctx = (CONTEXT *)data;
- sscanf (line, "%u %s", &index, line);
+ sscanf (line, "%u %s", &idx, line);
for (i = 0; i < ctx->msgcount; i++) {
if (!m_strcmp(ctx->hdrs[i]->data, line)) {
- ctx->hdrs[i]->refno = index;
+ ctx->hdrs[i]->refno = idx;
break;
}
}