#include <lib-lib/ascii.h>
#include <lib-lib/str.h>
#include <lib-lib/macros.h>
+#include <lib-lib/file.h>
#include "mutt.h"
#include "enter.h"
tmp[sizeof (tmp) - 1] = 0;
if (prefix) {
- strfcpy (tmp, NONULL (Prefix), sizeof (tmp));
+ m_strcpy(tmp, sizeof(tmp), NONULL(Prefix));
tmplen = m_strlen(tmp);
p = tmp + tmplen;
tmplen = sizeof (tmp) - tmplen;
if (!e->subject || force) {
addstr ("Subject: ");
- strfcpy (tmp, e->subject ? e->subject : "", sizeof (tmp));
+ m_strcpy(tmp, sizeof(tmp), NONULL(e->subject));
if (mutt_enter_string (tmp, sizeof (tmp), LINES - 1, 9, 0) == 0)
str_replace (&e->subject, tmp);
addch ('\n');
while (p >= tmp && ISSPACE (*p))
*p-- = 0;
- p = tmp + 2;
- SKIPWS (p);
+ p = vskipspaces(tmp + 2);
switch (tmp[1]) {
case '?':
break;
case 'r':
if (*p) {
- strncpy (tmp, p, sizeof (tmp));
+ m_strcpy(tmp, sizeof(tmp), p);
mutt_expand_path (tmp, sizeof (tmp));
buf = be_snarf_file (tmp, buf, &bufmax, &buflen, 1);
}
case 'u':
if (buflen) {
buflen--;
- strfcpy (tmp, buf[buflen], sizeof (tmp));
+ m_strcpy(tmp, sizeof(tmp), buf[buflen]);
tmp[m_strlen(tmp) - 1] = 0;
p_delete(&buf[buflen]);
buf[buflen] = NULL;
break;
}
}
- else if (str_cmp (".", tmp) == 0)
+ else if (m_strcmp(".", tmp) == 0)
done = 1;
else {
- str_cat (tmp, sizeof (tmp), "\n");
+ m_strcat(tmp, sizeof(tmp), "\n");
if (buflen == bufmax)
p_realloc(&buf, bufmax += 25);
buf[buflen++] = m_strdup(tmp[1] == '~' ? tmp + 1 : tmp);