#endif
#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
#include "mutt.h"
#include "buffer.h"
#include "compress.h"
#endif
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
#include "lib/rx.h"
#include <limits.h>
_mutt_expand_path (path, sizeof (path), 1);
p_delete(&pattern.data);
memset (&pattern, 0, sizeof (pattern));
- pattern.data = str_dup (path);
+ pattern.data = m_strdup(path);
}
#ifdef USE_COMPRESSED
else if (data & (M_APPENDHOOK | M_OPENHOOK | M_CLOSEHOOK)) {
mutt_check_simple (tmp, sizeof (tmp), DefaultHook);
p_delete(&pattern.data);
memset (&pattern, 0, sizeof (pattern));
- pattern.data = str_dup (tmp);
+ pattern.data = m_strdup(tmp);
}
if (data & (M_MBOXHOOK | M_SAVEHOOK | M_FCCHOOK)) {
mutt_expand_path (path, sizeof (path));
p_delete(&command.data);
memset (&command, 0, sizeof (command));
- command.data = str_dup (path);
+ command.data = m_strdup(path);
}
/* check to make sure that a matching hook doesn't already exist */