#endif
#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 "mutt.h"
-#include "ascii.h"
#include "enter.h"
#include "handler.h"
#include "mutt_menu.h"
#endif
#include "mutt_crypt.h"
-#include "lib/intl.h"
-#include "lib/str.h"
#include "lib/debug.h"
#include <ctype.h>
int rv = -1;
STATE s;
- memset (&s, 0, sizeof (s));
+ p_clear(&s, 1);
if (!fp && (msg = mx_open_message (ctx, hdr->msgno)) == NULL)
return (-1);
file[0] = '\0';
if (b->filename) {
strfcpy (file, b->filename, sizeof (file));
- b->d_filename = str_dup (b->filename);
+ b->d_filename = m_strdup(b->filename);
}
else {
/* avoid Content-Disposition: header with temporary filename */