#include <lib-lib/mem.h>
#include <lib-lib/str.h>
+#include <lib-lib/file.h>
#include <lib-lib/macros.h>
#include "mutt.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);
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);
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)
*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 = m_strdup(d);
}
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);
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);
#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;