* please see the file GPL in the top level source directory.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/file.h>
-#include <lib-lib/macros.h>
+#include <lib-lib/lib-lib.h>
#include <lib-mime/mime.h>
-
#include <lib-ui/curses.h>
+#include <lib-ui/sidebar.h>
#include "mutt.h"
#include "sort.h"
#include "mx.h"
#include "mx_nntp.h"
#include "nntp.h"
-#include "sidebar.h"
#include "buffy.h"
#include <lib-crypt/crypt.h>
-
-#include <unistd.h>
-#include <string.h>
-#include <ctype.h>
-#include <stdlib.h>
-
#define WANT_LISTGROUP_COMMAND 0
static unsigned int _checked = 0;
}
snprintf (buf, sizeof (buf), "AUTHINFO PASS %s\r\n", conn->account.pass);
- mutt_socket_write_d (conn, buf, M_SOCK_LOG_FULL);
+ mutt_socket_write(conn, buf);
if (mutt_socket_readln (buf, sizeof (buf), conn) < 0) {
conn->account.flags = flags;
return -1;
inbuf = p_new(char, sizeof(buf));
for (;;) {
- chunk = mutt_socket_readln_d (buf, sizeof (buf), nntp_data->nserv->conn,
- M_SOCK_LOG_HDR);
+ chunk = mutt_socket_readln(buf, sizeof (buf), nntp_data->nserv->conn);
if (chunk < 0)
break;
hdr->env = envelope_new();
hdr->env->newsgroups = m_strdup(nntp_data->group);
- hdr->content = mutt_new_body ();
+ hdr->content = body_new();
hdr->content->type = TYPETEXT;
hdr->content->subtype = m_strdup("plain");
hdr->content->encoding = ENC7BIT;
buf[len] = '\0';
}
if (buf[1] == '.')
- mutt_socket_write_d (nntp_data->nserv->conn, buf, M_SOCK_LOG_HDR);
+ mutt_socket_write(nntp_data->nserv->conn, buf);
else
- mutt_socket_write_d (nntp_data->nserv->conn, buf + 1, M_SOCK_LOG_HDR);
+ mutt_socket_write(nntp_data->nserv->conn, buf + 1);
}
fclose (f);
if (buf[m_strlen(buf) - 1] != '\n')
- mutt_socket_write_d (nntp_data->nserv->conn, "\r\n", M_SOCK_LOG_HDR);
- mutt_socket_write_d (nntp_data->nserv->conn, ".\r\n", M_SOCK_LOG_HDR);
+ mutt_socket_write(nntp_data->nserv->conn, "\r\n");
+ mutt_socket_write(nntp_data->nserv->conn, ".\r\n");
if (mutt_socket_readln (buf, sizeof (buf), nntp_data->nserv->conn) < 0) {
mutt_error (_("Can't post article. Connection to %s lost."),
nntp_data->nserv->conn->account.host);