#include <sys/stat.h>
#include <lib-lib/mem.h>
+#include <lib-lib/ascii.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
+#include <lib-lib/file.h>
#include "mutt.h"
-#include "ascii.h"
#include "recvattach.h"
#include "handler.h"
#include "mutt_curses.h"
#include "attach.h"
#include "lib.h"
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
#include "lib/debug.h"
typedef int handler_f (BODY *, STATE *);
if (fgets (line, MIN ((ssize_t) sizeof (line), len + 1), s->fpin) == NULL)
break;
- linelen = str_len (line);
+ linelen = m_strlen(line);
len -= linelen;
/*
while (len > 0) {
if ((fgets (tmps, sizeof (tmps), s->fpin)) == NULL)
return;
- len -= str_len (tmps);
- if ((!str_ncmp (tmps, "begin", 5)) && ISSPACE (tmps[5]))
+ len -= m_strlen(tmps);
+ if ((!m_strncmp(tmps, "begin", 5)) && ISSPACE (tmps[5]))
break;
}
while (len > 0) {
if ((fgets (tmps, sizeof (tmps), s->fpin)) == NULL)
return;
- len -= str_len (tmps);
- if (!str_ncmp (tmps, "end", 3))
+ len -= m_strlen(tmps);
+ if (!m_strncmp(tmps, "end", 3))
break;
pt = tmps;
linelen = decode_byte (*pt);
stte->indent_len = 0;
if (stte->s->prefix) {
state_puts (stte->s->prefix, stte->s);
- stte->indent_len += str_len (stte->s->prefix);
+ stte->indent_len += m_strlen(stte->s->prefix);
}
if (stte->tag_level[RICH_EXCERPT]) {
while (x) {
if (stte->s->prefix) {
state_puts (stte->s->prefix, stte->s);
- stte->indent_len += str_len (stte->s->prefix);
+ stte->indent_len += m_strlen(stte->s->prefix);
}
else {
state_puts ("> ", stte->s);
- stte->indent_len += str_len ("> ");
+ stte->indent_len += m_strlen("> ");
}
x--;
}
stte->line_used += stte->buff_used;
if (stte->line_used > stte->line_max) {
stte->line_max = stte->line_used;
- mem_realloc (&stte->line, stte->line_max + 1);
+ p_realloc(&stte->line, stte->line_max + 1);
}
strcat (stte->line, stte->buffer); /* __STRCAT_CHECKED__ */
stte->line_len += stte->word_len;
if (stte->tag_level[RICH_PARAM]) {
if (stte->tag_level[RICH_COLOR]) {
if (stte->param_used + 1 >= stte->param_len)
- mem_realloc (&stte->param, (stte->param_len += STRING));
+ p_realloc(&stte->param, (stte->param_len += STRING));
stte->param[stte->param_used++] = c;
}
/* see if more space is needed (plus extra for possible rich characters) */
if (stte->buff_len < stte->buff_used + 3) {
stte->buff_len += LONG_STRING;
- mem_realloc (&stte->buffer, stte->buff_len + 1);
+ p_realloc(&stte->buffer, stte->buff_len + 1);
}
if ((!stte->tag_level[RICH_NOFILL] && ISSPACE (c)) || c == '\0') {
{
const char *p;
- if (stte->buff_len < stte->buff_used + str_len (s)) {
+ if (stte->buff_len < stte->buff_used + m_strlen(s)) {
stte->buff_len += LONG_STRING;
- mem_realloc (&stte->buffer, stte->buff_len + 1);
+ p_realloc(&stte->buffer, stte->buff_len + 1);
}
p = s;
int tag_len = 0;
char tag[LONG_STRING + 1];
- memset (&stte, 0, sizeof (stte));
+ p_clear(&stte, 1);
stte.s = s;
stte.WrapMargin =
((s->flags & M_DISPLAY) ? (COLS - 4) : ((COLS - 4) <
if (s->prefix) {
state_puts (s->prefix, s);
- stte.indent_len += str_len (s->prefix);
+ stte.indent_len += m_strlen(s->prefix);
}
while (state != DONE) {
}
else {
wild = 1;
- btlen = str_len (t->data);
+ btlen = m_strlen(t->data);
}
if (a && a->parts)
snprintf (type, sizeof (type), "%s/%s", TYPE (a), a->subtype);
rfc1524_mailcap_lookup (a, type, entry, M_AUTOVIEW);
- fname = str_dup (a->filename);
+ fname = m_strdup(a->filename);
mutt_sanitize_filename (fname, 1);
rfc1524_expand_filename (entry->nametemplate, fname, tempfile,
sizeof (tempfile));
handler = mutt_signed_handler;
}
else if ((WithCrypto & APPLICATION_PGP)
- && str_casecmp ("encrypted", b->subtype) == 0) {
+ && m_strcasecmp("encrypted", b->subtype) == 0) {
p = mutt_get_parameter ("protocol", b->parameter);
if (!p)