#endif
#include "mutt.h"
+#include "ascii.h"
+#include "handler.h"
+#include "recvattach.h"
#include "mutt_menu.h"
#include "mutt_curses.h"
#include "keymap.h"
b->parameter = NULL;
}
if (b->description) {
- FREE (&a->description);
+ mem_free (&a->description);
a->description = b->description;
b->description = NULL;
}
if (b->form_name) {
- FREE (&a->form_name);
+ mem_free (&a->form_name);
a->form_name = b->form_name;
b->form_name = NULL;
}
int lng;
if ((p = getenv ("MM_NOASK")) != NULL && *p) {
- if (mutt_strcmp (p, "1") == 0)
+ if (str_cmp (p, "1") == 0)
return (1);
strfcpy (tmp, p, sizeof (tmp));
}
}
else {
- lng = mutt_strlen (p);
- if (buf[lng] == '/' && safe_strncasecmp (buf, p, lng) == 0)
+ lng = str_len (p);
+ if (buf[lng] == '/' && str_ncasecmp (buf, p, lng) == 0)
return (1);
}
int i;
for (; t; t = t->next) {
- i = mutt_strlen (t->data) - 1;
+ i = str_len (t->data) - 1;
if ((i > 0 && t->data[i - 1] == '/' && t->data[i] == '*' &&
ascii_strncasecmp (type, t->data, i) == 0) ||
ascii_strcasecmp (type, t->data) == 0) {
debug_print (1, ("\"%s\" -> %s\n", b->filename, type));
}
if (tmp.subtype)
- FREE (&tmp.subtype);
+ mem_free (&tmp.subtype);
if (tmp.xtype)
- FREE (&tmp.xtype);
+ mem_free (&tmp.xtype);
}
}
}
}
for (; t; t = t->next) {
- i = mutt_strlen (t->data) - 1;
+ i = str_len (t->data) - 1;
if ((i > 0 && t->data[i - 1] == '/' && t->data[i] == '*' &&
ascii_strncasecmp (type, t->data, i) == 0) ||
ascii_strcasecmp (type, t->data) == 0)
strfcpy (command, entry->command, sizeof (command));
if (fp) {
- fname = safe_strdup (a->filename);
+ fname = str_dup (a->filename);
mutt_sanitize_filename (fname, 1);
}
else
if (rfc1524_expand_filename (entry->nametemplate, fname,
tempfile, sizeof (tempfile))) {
- if (fp == NULL && mutt_strcmp (tempfile, a->filename)) {
+ if (fp == NULL && str_cmp (tempfile, a->filename)) {
/* send case: the file is already there */
if (safe_symlink (a->filename, tempfile) == -1) {
if (mutt_yesorno (_("Can't match nametemplate, continue?"), M_YES)
if (fp) {
/* recv case: we need to save the attachment to a file */
- FREE (&fname);
+ mem_free (&fname);
if (mutt_save_attachment (fp, a, tempfile, 0, NULL) == -1)
goto return_error;
}