# include "config.h"
#endif
+#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/ascii.h>
+#include <lib-lib/macros.h>
+
#include "mutt.h"
#include "rfc1524.h"
#include "attach.h"
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
#include "lib/debug.h"
#include <string.h>
field = ch;
ch = get_field (ch);
if (entry)
- entry->command = str_dup (field);
+ entry->command = m_strdup(field);
/* parse the optional fields */
found = TRUE;
if (get_field_text (field + 4, &test_command, type, filename, line)
&& test_command) {
- len = str_len (test_command) + STRING;
- mem_realloc (&test_command, len);
+ len = m_strlen(test_command) + STRING;
+ p_realloc(&test_command, len);
rfc1524_expand_command (a, a->filename, type, test_command, len);
if (mutt_system (test_command)) {
/* a non-zero exit code means test failed */
found = FALSE;
}
- mem_free (&test_command);
+ p_delete(&test_command);
}
}
} /* while (ch) */
if (!found) {
/* reset */
if (entry) {
- mem_free (&entry->command);
- mem_free (&entry->composecommand);
- mem_free (&entry->composetypecommand);
- mem_free (&entry->editcommand);
- mem_free (&entry->printcommand);
- mem_free (&entry->nametemplate);
- mem_free (&entry->convert);
+ p_delete(&entry->command);
+ p_delete(&entry->composecommand);
+ p_delete(&entry->composetypecommand);
+ p_delete(&entry->editcommand);
+ p_delete(&entry->printcommand);
+ p_delete(&entry->nametemplate);
+ p_delete(&entry->convert);
entry->needsterminal = 0;
entry->copiousoutput = 0;
}
} /* while (!found && (buf = mutt_read_line ())) */
fclose (fp);
} /* if ((fp = fopen ())) */
- mem_free (&buf);
+ p_delete(&buf);
return found;
}
rfc1524_entry *rfc1524_new_entry (void)
{
- return (rfc1524_entry *) mem_calloc (1, sizeof (rfc1524_entry));
+ return p_new(rfc1524_entry, 1);
}
void rfc1524_free_entry (rfc1524_entry ** entry)
{
rfc1524_entry *p = *entry;
- mem_free (&p->command);
- mem_free (&p->testcommand);
- mem_free (&p->composecommand);
- mem_free (&p->composetypecommand);
- mem_free (&p->editcommand);
- mem_free (&p->printcommand);
- mem_free (&p->nametemplate);
- mem_free (entry);
+ p_delete(&p->command);
+ p_delete(&p->testcommand);
+ p_delete(&p->composecommand);
+ p_delete(&p->composetypecommand);
+ p_delete(&p->editcommand);
+ p_delete(&p->printcommand);
+ p_delete(&p->nametemplate);
+ p_delete(entry);
}
/*
rmatch = 1;
- for (r = 0, j = str_len (oldfile) - 1, k =
- str_len (nametemplate) - 1;
+ for (r = 0, j = m_strlen(oldfile) - 1, k =
+ m_strlen(nametemplate) - 1;
j >= (lmatch ? i : 0) && k >= i + 2; j--, k--) {
if (nametemplate[k] != oldfile[j]) {
rmatch = 0;
}
}
- mutt_adv_mktemp (newfile, nflen);
+ mutt_adv_mktemp (NULL, newfile, nflen);
if (rmatch && lmatch)
return 0;