* 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/debug.h>
-#include <lib-lib/url.h>
+#include <lib-lib/lib-lib.h>
+#include <lib-mx/mx.h>
#include "mutt.h"
-#include "mx.h"
#include "pop.h"
#if defined (USE_SSL) || defined (USE_GNUTLS)
# include <lib-sys/mutt_ssl.h>
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;