#endif
#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/file.h>
#include <lib-lib/macros.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 "mime.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/str.h"
#include "lib/debug.h"
#include <unistd.h>
return -1;
}
- if (str_ncmp ("281", buf, 3)) {
+ if (m_strncmp("281", buf, 3)) {
conn->account.flags = flags;
mutt_error _("Login failed.");
if (mutt_socket_readln (buf, sizeof (buf), conn) < 0)
return nntp_connect_error (serv);
- if (!str_ncmp ("200", buf, 3))
+ if (!m_strncmp("200", buf, 3))
mutt_message (_("Connected to %s. Posting ok."), conn->account.host);
- else if (!str_ncmp ("201", buf, 3))
+ 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 (mutt_socket_readln (buf, sizeof (buf), conn) < 0)
return nntp_connect_error (serv);
- if (!(conn->account.flags & M_ACCT_USER) && str_ncmp ("480", buf, 3)) {
+ if (!(conn->account.flags & M_ACCT_USER) && m_strncmp("480", buf, 3)) {
serv->status = NNTP_OK;
return 0;
}
mutt_socket_write (conn, "XOVER\r\n");
if (mutt_socket_readln (buf, sizeof (buf), conn) < 0)
return nntp_connect_error (serv);
- if (str_ncmp ("500", buf, 3))
+ if (m_strncmp("500", buf, 3))
serv->hasXOVER = 1;
mutt_socket_write (conn, "XPAT\r\n");
if (mutt_socket_readln (buf, sizeof (buf), conn) < 0)
return nntp_connect_error (serv);
- if (str_ncmp ("500", buf, 3))
+ if (m_strncmp("500", buf, 3))
serv->hasXPAT = 1;
#if WANT_LISTGROUP_COMMAND
mutt_socket_write (conn, "LISTGROUP\r\n");
if (mutt_socket_readln (buf, sizeof (buf), conn) < 0)
return (nntp_connect_error (serv));
- if (str_ncmp ("500", buf, 3))
+ if (m_strncmp("500", buf, 3))
serv->hasLISTGROUP = 1;
#endif
mutt_socket_write (conn, "XGTITLE +\r\n");
if (mutt_socket_readln (buf, sizeof (buf), conn) < 0)
return nntp_connect_error (serv);
- if (str_ncmp ("500", buf, 3))
+ if (m_strncmp("500", buf, 3))
serv->hasXGTITLE = 1;
- if (!str_ncmp ("282", buf, 3)) {
+ if (!m_strncmp("282", buf, 3)) {
do {
if (mutt_socket_readln (buf, sizeof (buf), conn) < 0)
return nntp_connect_error (serv);
mutt_socket_close (serv->conn);
- FOREVER {
+ for (;;) {
if (nntp_connect_and_auth (serv) == 0)
return 0;
if (*line)
done = FALSE;
}
- else if ((!str_ncmp ("480", buf, 3)) && nntp_auth (data->nserv) < 0)
+ else if ((!m_strncmp("480", buf, 3)) && nntp_auth (data->nserv) < 0)
return -1;
} while (!done);
- strfcpy (line, buf, linelen);
+ m_strcpy(line, linelen, buf);
return 0;
}
int ret;
do {
- strfcpy (buf, query, sizeof (buf));
+ m_strcpy(buf, sizeof(buf), query);
if (mutt_nntp_query (nntp_data, buf, sizeof (buf)) < 0)
return -1;
if (buf[0] == '5')
line = 0;
inbuf = p_new(char, sizeof(buf));
- FOREVER {
+ for (;;) {
chunk = mutt_socket_readln_d (buf, sizeof (buf), nntp_data->nserv->conn,
M_SOCK_LOG_HDR);
if (chunk < 0)
p++;
}
- strfcpy (inbuf + lenbuf, p, sizeof (buf));
+ m_strcpy(inbuf + lenbuf, sizeof(buf), p);
pos += chunk;
if (chunk >= sizeof (buf)) {
- lenbuf += str_len (p);
+ lenbuf += m_strlen(p);
}
else {
if (bar) {
*colon = '\0';
colon++;
nntp_get_status (ctx, h, b, atoi (colon));
- if (h && h->article_num == 0 && str_cmp (group, b) == 0)
+ if (h && h->article_num == 0 && m_strcmp(group, b) == 0)
h->article_num = atoi (colon);
}
}
d++;
debug_print (2, ("group: %s, desc: %s\n", line, d));
if ((data = (NNTP_DATA *) hash_find (news->newsgroups, line)) != NULL &&
- str_cmp (d, data->desc)) {
+ m_strcmp(d, data->desc)) {
p_delete(&data->desc);
- data->desc = str_dup (d);
+ data->desc = m_strdup(d);
}
return 0;
#undef news
char *p, *b;
int x, done = 0;
- hdr->env = mutt_new_envelope ();
- hdr->env->newsgroups = str_dup (nntp_data->group);
+ hdr->env = envelope_new();
+ hdr->env->newsgroups = m_strdup(nntp_data->group);
hdr->content = mutt_new_body ();
hdr->content->type = TYPETEXT;
- hdr->content->subtype = str_dup ("plain");
+ hdr->content->subtype = m_strdup("plain");
hdr->content->encoding = ENC7BIT;
hdr->content->disposition = DISPINLINE;
hdr->content->length = -1;
nntp_get_status (ctx, hdr, NULL, hdr->article_num);
break;
case 1:
- hdr->env->subject = str_dup (b);
+ hdr->env->subject = m_strdup(b);
break;
case 2:
- rfc822_free_address (&hdr->env->from);
+ address_delete (&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
* and mark mail/(esp.) news article as your own. aaargh! this
* bothered me for _years_ */
if (!hdr->env->from) {
- hdr->env->from = rfc822_new_address ();
- hdr->env->from->personal = str_dup (b);
+ hdr->env->from = address_new ();
+ hdr->env->from->personal = m_strdup(b);
}
break;
case 3:
break;
case 4:
p_delete(&hdr->env->message_id);
- hdr->env->message_id = str_dup (b);
+ hdr->env->message_id = m_strdup(b);
break;
case 5:
mutt_free_list (&hdr->env->references);
if (!hdr->read)
p_delete(&hdr->env->xref);
b = b + 6; /* skips the "Xref: " */
- hdr->env->xref = str_dup (b);
+ 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;
unsigned int first;
ACCOUNT acct;
- memset (&acct, 0, sizeof (ACCOUNT));
+ p_clear(&acct, 1);
if (nntp_parse_url (ctx->path, &acct, buf, sizeof (buf)) < 0 || !*buf) {
mutt_error (_("%s is an invalid newsgroup specification!"), ctx->path);
/* create NNTP-specific state struct if nof found in list */
if ((nntp_data = (NNTP_DATA *) hash_find (serv->newsgroups, buf)) == NULL) {
- nntp_data = xmalloc(sizeof(NNTP_DATA) + str_len(buf) + 1);
+ nntp_data = xmalloc(sizeof(NNTP_DATA) + m_strlen(buf) + 1);
nntp_data->group = (char *) nntp_data + sizeof (NNTP_DATA);
strcpy (nntp_data->group, buf);
hash_insert (serv->newsgroups, nntp_data->group, nntp_data, 0);
return -1;
}
- if (str_ncmp ("211", buf, 3)) {
+ if (m_strncmp("211", buf, 3)) {
LIST *l = serv->list;
/* GROUP command failed */
- if (!str_ncmp ("411", buf, 3)) {
+ if (!m_strncmp("411", buf, 3)) {
mutt_error (_("Newsgroup %s not found on server %s"),
nntp_data->group, serv->conn->account.host);
cache->index = ctx->hdrs[msgno]->index;
mutt_mktemp (path);
- cache->path = str_dup (path);
+ cache->path = m_strdup(path);
if (!(msg->fp = safe_fopen (path, "w+"))) {
p_delete(&cache->path);
return -1;
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 */
return -1;
}
- strfcpy (buf, "POST\r\n", sizeof (buf));
+ m_strcpy(buf, sizeof(buf), "POST\r\n");
if (mutt_nntp_query (nntp_data, buf, sizeof (buf)) < 0) {
mutt_error (_("Can't post article. Connection to %s lost."),
nntp_data->nserv->conn->account.host);
buf[0] = '.';
buf[1] = '\0';
while (fgets (buf + 1, sizeof (buf) - 2, f) != NULL) {
- len = str_len (buf);
+ len = m_strlen(buf);
if (buf[len - 1] == '\n') {
buf[len - 1] = '\r';
buf[len] = '\n';
}
fclose (f);
- if (buf[str_len (buf) - 1] != '\n')
+ 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);
if (mutt_socket_readln (buf, sizeof (buf), nntp_data->nserv->conn) < 0) {
#endif
return -1;
}
- if (str_ncmp ("211", buf, 3)) {
+ if (m_strncmp("211", buf, 3)) {
buf[0] = 0;
if (mutt_nntp_query (nntp_data, buf, sizeof (buf)) < 0) {
#ifdef DEBUG
return -1;
}
}
- if (!str_ncmp ("211", buf, 3)) {
+ if (!m_strncmp("211", buf, 3)) {
int first;
int last;
return 0;
if ((nntp_data = (NNTP_DATA *) hash_find (s->newsgroups, group)) == NULL) {
n++;
- nntp_data = xmalloc(sizeof(NNTP_DATA) + str_len(group) + 1);
+ nntp_data = xmalloc(sizeof(NNTP_DATA) + m_strlen(group) + 1);
nntp_data->group = (char *) nntp_data + sizeof (NNTP_DATA);
strcpy (nntp_data->group, group);
nntp_data->nserv = s;
if (nntp_data->desc)
p_delete(&nntp_data->desc);
if (*desc)
- nntp_data->desc = str_dup (desc);
+ nntp_data->desc = m_strdup(desc);
if (nntp_data->rc || nntp_data->lastCached)
mutt_newsgroup_stat (nntp_data);
else if (nntp_data->lastMessage &&
return -1;
}
- strfcpy (msg, _("Loading descriptions..."), sizeof (msg));
+ m_strcpy(msg, sizeof(msg), _("Loading descriptions..."));
mutt_message (msg);
nntp_get_desc (&nntp_data, "*", msg, NULL);
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);
projects / apps / madmutt.git / blobdiff