#endif
#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
#include <lib-lib/macros.h>
+#include <lib-lib/file.h>
#include "mutt.h"
#include "mutt_curses.h"
#include "mutt_idna.h"
#include "xterm.h"
-#include "lib/str.h"
#include "lib/debug.h"
#include <string.h>
SRAND (time (NULL));
umask (077);
- memset (Options, 0, sizeof (Options));
- memset (QuadOptions, 0, sizeof (QuadOptions));
+ p_clear(Options, sizeof(Options));
+ p_clear(QuadOptions, sizeof(QuadOptions));
#ifdef USE_NNTP
while ((i =
}
if (subject)
- msg->env->subject = str_dup (subject);
+ msg->env->subject = m_strdup(subject);
if (includeFile)
infile = includeFile;
if (infile || bodytext) {
if (infile) {
- if (str_cmp ("-", infile) == 0)
+ if (m_strcmp("-", infile) == 0)
fin = stdin;
else {
char path[_POSIX_PATH_MAX];
fin = NULL;
mutt_mktemp (buf);
- tempfile = str_dup (buf);
+ tempfile = m_strdup(buf);
if (draftFile)
msg->env = mutt_read_rfc822_header (fin, NULL, 1, 0);