# include "config.h"
#endif
+#include <lib-lib/mem.h>
+#include <lib-lib/ascii.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
+
#include "mutt.h"
-#include "ascii.h"
#include "handler.h"
#include "recvattach.h"
#include "mutt_menu.h"
#include "mx.h"
#include "mutt_crypt.h"
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
#include "lib/debug.h"
#include <ctype.h>
b->parameter = NULL;
}
if (b->description) {
- mem_free (&a->description);
+ p_delete(&a->description);
a->description = b->description;
b->description = NULL;
}
if (b->form_name) {
- mem_free (&a->form_name);
+ p_delete(&a->form_name);
a->form_name = b->form_name;
b->form_name = NULL;
}
/* Remove headers by copying out data to another file, then
* copying the file back */
- fseek (fp, b->offset, 0);
+ fseeko (fp, b->offset, 0);
mutt_mktemp (tempfile);
if ((tfp = safe_fopen (tempfile, "w")) == NULL) {
mutt_perror (_("Failure to open file to strip headers."));
}
}
else {
- lng = str_len (p);
+ lng = m_strlen(p);
if (buf[lng] == '/' && str_ncasecmp (buf, p, lng) == 0)
return (1);
}
int i;
for (; t; t = t->next) {
- i = str_len (t->data) - 1;
+ i = m_strlen(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)
- mem_free (&tmp.subtype);
+ p_delete(&tmp.subtype);
if (tmp.xtype)
- mem_free (&tmp.xtype);
+ p_delete(&tmp.xtype);
}
}
}
}
for (; t; t = t->next) {
- i = str_len (t->data) - 1;
+ i = m_strlen(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 = str_dup (a->filename);
+ fname = m_strdup(a->filename);
mutt_sanitize_filename (fname, 1);
}
else
if (fp) {
/* recv case: we need to save the attachment to a file */
- mem_free (&fname);
+ p_delete(&fname);
if (mutt_save_attachment (fp, a, tempfile, 0, NULL) == -1)
goto return_error;
}
hn->msgno = hdr->msgno; /* required for MH/maildir */
hn->read = 1;
- fseek (fp, m->offset, 0);
+ fseeko (fp, m->offset, 0);
if (fgets (buf, sizeof (buf), fp) == NULL)
return -1;
if (mx_open_mailbox (path, M_APPEND | M_QUIET, &ctx) == NULL)
mutt_perror ("fopen");
return (-1);
}
- fseek ((s.fpin = fp), m->offset, 0);
+ fseeko ((s.fpin = fp), m->offset, 0);
mutt_decode_attachment (m, &s);
if (fclose (s.fpout) != 0) {