#endif
#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
#include <lib-lib/macros.h>
#include "mutt.h"
#include "rfc1524.h"
#include "rfc2047.h"
-#include "lib/str.h"
#include "lib/debug.h"
#include <unistd.h>
len = sizeof (group);
strfcpy (group, line, len);
if ((data = (NNTP_DATA *) hash_find (news->newsgroups, group)) == NULL) {
- data = xmalloc(sizeof(NNTP_DATA) + str_len(group) + 1);
+ data = xmalloc(sizeof(NNTP_DATA) + m_strlen(group) + 1);
data->group = (char *) data + sizeof (NNTP_DATA);
strcpy (data->group, group);
data->nserv = news;
return 0;
rewind (index);
while (fgets (buf, sizeof (buf), index)) {
- buf[str_len (buf) - 1] = 0; /* strip ending '\n' */
+ buf[m_strlen(buf) - 1] = 0; /* strip ending '\n' */
if (!str_ncmp (buf, "#: ", 3) &&
!str_casecmp (buf + 3, news->conn->account.host))
break;
break;
sscanf (cp + 1, "%s %d %d", file, &l, &m);
if (!str_cmp (buf, "ALL")) {
- news->cache = str_dup (file);
+ news->cache = m_strdup(file);
news->newgroups_time = m;
}
else if (news->newsgroups) {
if ((data = (NNTP_DATA *) hash_find (news->newsgroups, buf)) == NULL) {
- data = xmalloc(sizeof(NNTP_DATA) + str_len(buf) + 1);
+ data = xmalloc(sizeof(NNTP_DATA) + m_strlen(buf) + 1);
data->group = (char *) data + sizeof (NNTP_DATA);
strcpy (data->group, buf);
data->nserv = news;
hash_insert (news->newsgroups, data->group, data, 0);
nntp_add_to_list (news, data);
}
- data->cache = str_dup (file);
+ data->cache = m_strdup(file);
t = 0;
if (!data->firstMessage || data->lastMessage < m)
t = 1;
acct->port = NNTP_PORT;
acct->type = M_ACCT_TYPE_NNTP;
- c = str_dup (server);
+ c = m_strdup(server);
url_parse_ciss (&url, c);
if (url.scheme == U_NNTP || url.scheme == U_NNTPS) {
{
ciss_url_t url;
- url.path = str_dup (line);
+ url.path = m_strdup(line);
mutt_account_tourl (acct, &url);
url_ciss_tostring (&url, line, len, 0);
p_delete(&url.path);
return NULL;
}
- buf = p = p_new(char, str_len (server) + 10);
+ buf = p = p_new(char, m_strlen(server) + 10);
if (url_check_scheme (server) == U_UNKNOWN) {
strcpy (buf, "nntp://");
p = strchr (buf, '\0');
/* New newsserver */
serv = p_new(NNTP_SERVER, 1);
serv->conn = conn;
- serv->newsrc = str_dup (file);
+ serv->newsrc = m_strdup(file);
serv->newsgroups = hash_create (1009);
slurp_newsrc (serv); /* load .newsrc */
nntp_parse_cacheindex (serv); /* load .index */
line = *buf + (*pline - line);
}
strcpy (line, data->group);
- len -= str_len (line) + 1;
- line += str_len (line);
+ len -= m_strlen(line) + 1;
+ line += m_strlen(line);
*line++ = data->subscribed ? ':' : '!';
*line++ = ' ';
*line = '\0';
continue;
nntp_create_newsrc_line (data, &buf, &line, &llen);
debug_print (2, ("Added to newsrc: %s\n", line));
- line += str_len (line);
+ line += m_strlen(line);
}
/* newrc being fully rewritten */
if (news->newsrc &&
return fp;
nntp_cache_expand (buf, "cache-XXXXXX");
- pc = buf + str_len (buf) - 12; /* positioning to "cache-XXXXXX" */
+ pc = buf + m_strlen(buf) - 12; /* positioning to "cache-XXXXXX" */
if ((fd = mkstemp (buf)) == -1)
return NULL;
strcpy (s, pc); /* generated name */
else {
strfcpy (buf, news->conn->account.host, sizeof (buf));
f = mutt_mkname (buf);
- news->cache = str_dup (buf);
+ news->cache = m_strdup(buf);
nntp_cache_expand (file, buf);
}
if (!f)
((NNTP_DATA *) ctx->data)->nserv->conn->account.host,
((NNTP_DATA *) ctx->data)->group);
f = mutt_mkname (buf);
- ((NNTP_DATA *) ctx->data)->cache = str_dup (buf);
+ ((NNTP_DATA *) ctx->data)->cache = m_strdup(buf);
nntp_cache_expand (file, buf);
}
if (!f)
if (!news || !news->newsgroups || !group || !*group)
return NULL;
if (!(data = (NNTP_DATA *) hash_find (news->newsgroups, group))) {
- data = xmalloc(sizeof(NNTP_DATA) + str_len(group) + 1);
+ data = xmalloc(sizeof(NNTP_DATA) + m_strlen(group) + 1);
data->group = (char *) data + sizeof (NNTP_DATA);
strcpy (data->group, group);
data->nserv = news;