#include <lib-lib/str.h>
#include <lib-lib/file.h>
#include <lib-lib/macros.h>
+#include <lib-lib/debug.h>
#include <lib-mime/mime.h>
+#include <lib-ui/curses.h>
+
#include "mutt.h"
-#include "mutt_curses.h"
#include "sort.h"
#include "mx.h"
#include "mx_nntp.h"
#include "rfc1524.h"
-#include "rfc2047.h"
#include "nntp.h"
#include "sidebar.h"
#include "buffy.h"
-#include "mutt_crypt.h"
+#include <lib-crypt/crypt.h>
-#include "lib/debug.h"
#include <unistd.h>
#include <string.h>
else if (!m_strncmp("201", buf, 3))
mutt_message (_("Connected to %s. Posting NOT ok."), conn->account.host);
else {
- mutt_socket_close (conn);
- str_skip_trailws (buf);
- mutt_error ("%s", buf);
+ mutt_socket_close(conn);
+ m_strrtrim(buf);
+ mutt_error("%s", buf);
sleep (2);
return -1;
}
if (data->nserv->hasXGTITLE)
snprintf (buf, sizeof (buf), "XGTITLE %s\r\n", mask);
else
- snprintf (buf, sizeof (buf), "LIST NEWSGROUPS %s\r\n", mask);
+ snprintf (buf, sizeof (buf), "string_list_t NEWSGROUPS %s\r\n", mask);
if (mutt_nntp_fetch (data, buf, msg, bar, parse_description, data->nserv, 0) !=
0) {
#ifdef DEBUG
char *p, *b;
int x, done = 0;
- hdr->env = mutt_new_envelope ();
+ hdr->env = envelope_new();
hdr->env->newsgroups = m_strdup(nntp_data->group);
hdr->content = mutt_new_body ();
hdr->content->type = TYPETEXT;
hdr->env->subject = m_strdup(b);
break;
case 2:
- address_delete (&hdr->env->from);
+ address_list_wipe(&hdr->env->from);
hdr->env->from = rfc822_parse_adrlist (hdr->env->from, b);
/* same as for mutt_parse_rfc822_line():
* don't leave from info NULL if there's an invalid address (or
hdr->env->message_id = m_strdup(b);
break;
case 5:
- mutt_free_list (&hdr->env->references);
+ string_list_wipe(&hdr->env->references);
hdr->env->references = mutt_parse_references (b, 0);
break;
case 6:
hdr->env->xref = m_strdup(b);
nntp_parse_xref (ctx, nntp_data->group, b, hdr);
}
- rfc2047_decode_envelope (hdr->env);
+ rfc2047_decode_envelope(hdr->env);
if (!*p)
return -1;
b = p;
if (ctx->msgcount >= ctx->hdrmax)
mx_alloc_memory (ctx);
- ctx->hdrs[ctx->msgcount] = mutt_new_header ();
+ ctx->hdrs[ctx->msgcount] = header_new();
ctx->hdrs[ctx->msgcount]->index = ctx->msgcount;
nntp_parse_xover (ctx, line, ctx->hdrs[ctx->msgcount]);
mutt_message ("%s %d/%d", fc->msg, num, total);
}
else
- mutt_free_header (&ctx->hdrs[ctx->msgcount]); /* skip it */
+ header_delete(&ctx->hdrs[ctx->msgcount]); /* skip it */
return 0;
}
if (ctx->msgcount >= ctx->hdrmax)
mx_alloc_memory (ctx);
- h = ctx->hdrs[ctx->msgcount] = mutt_new_header ();
+ h = ctx->hdrs[ctx->msgcount] = header_new();
h->index = ctx->msgcount;
ret = nntp_read_header (ctx, NULL, current);
mx_update_context (ctx, 1);
}
else
- mutt_free_header (&h); /* skip it */
+ header_delete(&h); /* skip it */
if (ret == -1) {
p_delete(&fc.messages);
return -1;
}
if (m_strncmp("211", buf, 3)) {
- LIST *l = serv->list;
+ string_list_t *l = serv->list;
/* GROUP command failed */
if (!m_strncmp("411", buf, 3)) {
return -1;
}
- mutt_free_envelope (&ctx->hdrs[msgno]->env);
+ envelope_delete(&ctx->hdrs[msgno]->env);
ctx->hdrs[msgno]->env =
mutt_read_rfc822_header (msg->fp, ctx->hdrs[msgno], 0, 0);
/* fix content length */
{
char buf[LONG_STRING];
NNTP_DATA nntp_data;
- LIST *l;
- LIST emp;
+ string_list_t *l;
+ string_list_t emp;
time_t now;
struct tm *t;
{
char msg[SHORT_STRING];
NNTP_DATA nntp_data;
- LIST *tmp;
+ string_list_t *tmp;
if (nntp_open_connection (serv) < 0)
return -1;
nntp_data.nserv = serv;
nntp_data.group = NULL;
- if (mutt_nntp_fetch (&nntp_data, "LIST\r\n", msg, NULL, add_group, serv, 0) < 0) {
+ if (mutt_nntp_fetch (&nntp_data, "string_list_t\r\n", msg, NULL, add_group, serv, 0) < 0) {
#ifdef DEBUG
- nntp_error ("nntp_get_active()", "LIST\r\n");
+ nntp_error ("nntp_get_active()", "string_list_t\r\n");
#endif
return -1;
}
return 1;
if (ctx->msgcount == ctx->hdrmax)
mx_alloc_memory (ctx);
- ctx->hdrs[ctx->msgcount] = mutt_new_header ();
+ ctx->hdrs[ctx->msgcount] = header_new();
ctx->hdrs[ctx->msgcount]->index = ctx->msgcount;
mutt_message (_("Fetching %s from server..."), msgid);
/* since nntp_read_header() may set read flag, we must reset it */
ctx->hdrs[ctx->msgcount]->read = 0;
if (ret != 0)
- mutt_free_header (&ctx->hdrs[ctx->msgcount]);
+ header_delete(&ctx->hdrs[ctx->msgcount]);
else {
ctx->msgcount++;
mx_update_context (ctx, 1);