#include <sys/wait.h>
#include <sys/stat.h>
+#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/ascii.h>
+#include <lib-lib/macros.h>
+#include <lib-lib/file.h>
+#include <lib-lib/debug.h>
+
+#include <lib-ui/curses.h>
+
#include "mutt.h"
-#include "mutt_curses.h"
-#include "ascii.h"
#include "handler.h"
#include "state.h"
#include "lib.h"
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
-#include "lib/debug.h"
-
#define FLOWED_MAX 77
static int get_quote_level (char *line)
static void print_flowed_line (char *line, STATE * s, int ql) {
int width;
char *pos, *oldpos;
- int len = str_len (line);
+ int len = m_strlen(line);
int i;
if (MaxLineLength > 0) {
width = COLS;
}
- if (str_len (line) == 0) {
+ if (m_strlen(line) == 0) {
if (!(s->flags & M_REPLYING) || option (OPTQUOTEEMPTY)) {
if (s->prefix)
state_puts(s->prefix,s);
int rfc3676_handler (BODY * a, STATE * s) {
int bytes = a->length;
char buf[LONG_STRING];
- char *curline = mem_malloc(1);
+ char *curline = p_new(char, 1);
char *t = NULL;
unsigned int curline_len = 1,
quotelevel = 0, newql = 0;
/* respect DelSP of RfC3676 only with f=f parts */
if ((t = (char*) mutt_get_parameter ("delsp", a->parameter))) {
- delsp = str_len (t) == 3 && ascii_strncasecmp (t, "yes", 3) == 0;
+ delsp = m_strlen(t) == 3 && ascii_strncasecmp (t, "yes", 3) == 0;
t = NULL;
}
while (bytes > 0 && fgets (buf, sizeof (buf), s->fpin)) {
- buf_len = str_len (buf);
+ buf_len = m_strlen(buf);
bytes -= buf_len;
newql = get_quote_level (buf);
curline_len = 1;
}
- mem_realloc (&curline, curline_len + buf_len - buf_off);
+ p_realloc(&curline, curline_len + buf_len - buf_off);
strcpy (curline + curline_len - 1, buf + buf_off);
curline_len += buf_len - buf_off;
}
}
- mem_free (&curline);
+ p_delete(&curline);
return (0);
}
fputc (' ', out);
#if DEBUG
lc++;
- len = str_len (buf);
+ len = m_strlen(buf);
if (len > 0) {
c = buf[len-1];
buf[len-1] = '\0';
fclose (out);
mutt_set_mtime (hdr->content->filename, tmpfile);
unlink (hdr->content->filename);
- str_replace (&hdr->content->filename, tmpfile);
+ m_strreplace(&hdr->content->filename, tmpfile);
}