projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
there is no real need for a lib-hash anymore. fold it.
[apps/madmutt.git]
/
pop
/
pop_lib.c
diff --git
a/pop/pop_lib.c
b/pop/pop_lib.c
index
424ca73
..
f6587ef
100644
(file)
--- a/
pop/pop_lib.c
+++ b/
pop/pop_lib.c
@@
-7,26
+7,11
@@
* please see the file GPL in the top level source directory.
*/
* please see the file GPL in the top level source directory.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <string.h>
-#include <unistd.h>
-#include <ctype.h>
-
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/ascii.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/url.h>
+#include <lib-lib/lib-lib.h>
+#include <lib-mx/mx.h>
#include "mutt.h"
#include "mutt.h"
-#include "mx.h"
#include "pop.h"
#include "pop.h"
-#if defined (USE_SSL) || defined (USE_GNUTLS)
-# include <lib-sys/mutt_ssl.h>
-#endif
/* given an POP mailbox name, return host, port, username and password */
int pop_parse_path (const char *path, ACCOUNT * act)
/* given an POP mailbox name, return host, port, username and password */
int pop_parse_path (const char *path, ACCOUNT * act)
@@
-106,15
+91,17
@@
static int fetch_capa (char *line, void *data)
static int fetch_auth (char *line, void *data)
{
POP_DATA *pop_data = (POP_DATA *) data;
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) {
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 {
} 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;
}
return 0;
}
@@
-256,7
+243,6
@@
pop_query_status pop_open_connection (POP_DATA * pop_data)
return PQ_ERR;
}
return PQ_ERR;
}
-#if (defined(USE_SSL) || defined(USE_GNUTLS))
/* Attempt STLS if available and desired. */
if (!pop_data->conn->ssf && (pop_data->cmd_stls || option(OPTSSLFORCETLS))) {
if (option (OPTSSLFORCETLS))
/* Attempt STLS if available and desired. */
if (!pop_data->conn->ssf && (pop_data->cmd_stls || option(OPTSSLFORCETLS))) {
if (option (OPTSSLFORCETLS))
@@
-279,9
+265,7
@@
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 defined (USE_SSL) || defined (USE_GNUTLS)
else if (mutt_ssl_starttls (pop_data->conn))
else if (mutt_ssl_starttls (pop_data->conn))
-#endif
{
mutt_error (_("Could not negotiate TLS connection"));
mutt_sleep (2);
{
mutt_error (_("Could not negotiate TLS connection"));
mutt_sleep (2);
@@
-305,7
+289,6
@@
pop_query_status pop_open_connection (POP_DATA * pop_data)
mutt_sleep (1);
return -2;
}
mutt_sleep (1);
return -2;
}
-#endif
ret = pop_authenticate (pop_data);
if (ret == PQ_NOT_CONNECTED)
ret = pop_authenticate (pop_data);
if (ret == PQ_NOT_CONNECTED)
@@
-380,15
+363,14
@@
void pop_logout (CONTEXT * ctx)
* -1 - conection lost,
* -2 - invalid command or execution error.
*/
* -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;
char *c;
if (pop_data->status != POP_CONNECTED)
return PQ_NOT_CONNECTED;
- mutt_socket_write
_d (pop_data->conn, buf, dbg
);
+ mutt_socket_write
(pop_data->conn, buf
);
c = strpbrk (buf, " \r\n");
*c = '\0';
c = strpbrk (buf, " \r\n");
*c = '\0';
@@
-434,8
+416,7
@@
pop_query_status pop_fetch_data (POP_DATA * pop_data, const char *query, progres
for (;;) {
chunk =
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;
if (chunk < 0) {
pop_data->status = POP_DISCONNECTED;
ret = PQ_NOT_CONNECTED;