projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
create the lib-mx now
[apps/madmutt.git]
/
pop
/
pop_lib.c
diff --git
a/pop/pop_lib.c
b/pop/pop_lib.c
index
424ca73
..
b3bac5a
100644
(file)
--- a/
pop/pop_lib.c
+++ b/
pop/pop_lib.c
@@
-7,22
+7,10
@@
* 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"
#if defined (USE_SSL) || defined (USE_GNUTLS)
# include <lib-sys/mutt_ssl.h>
#include "pop.h"
#if defined (USE_SSL) || defined (USE_GNUTLS)
# include <lib-sys/mutt_ssl.h>
@@
-380,15
+368,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
+421,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;