# include "config.h"
#endif
+#include <lib-lib/macros.h>
#include <lib-lib/mem.h>
#include <lib-lib/str.h>
+#include <lib-lib/file.h>
#include <lib-lib/ascii.h>
+#include <lib-mime/mime.h>
+
#include "mutt.h"
#include "handler.h"
#include "mx.h"
#include "copy.h"
#include "rfc2047.h"
-#include "mime.h"
#include "mutt_crypt.h"
#include "mutt_idna.h"
/* Is it the begining of a header? */
if (nl && buf[0] != ' ' && buf[0] != '\t') {
ignore = 1;
- if (!from && str_ncmp ("From ", buf, 5) == 0) {
+ if (!from && m_strncmp("From ", buf, 5) == 0) {
if ((flags & CH_FROM) == 0)
continue;
from = 1;
ignore = 1;
this_is_from = 0;
- if (!from && str_ncmp ("From ", buf, 5) == 0) {
+ if (!from && m_strncmp("From ", buf, 5) == 0) {
if ((flags & CH_FROM) == 0)
continue;
this_is_from = from = 1;
if (flags & M_CM_PREFIX) {
if (option (OPTTEXTFLOWED))
- strfcpy (prefix, ">", sizeof (prefix));
+ m_strcpy(prefix, sizeof(prefix), ">");
else
_mutt_make_string (prefix, sizeof (prefix), NONULL (Prefix), Context,
hdr, 0);
if (flags & M_CM_DECODE) {
/* now make a text/plain version of the message */
- memset (&s, 0, sizeof (STATE));
+ p_clear(&s, 1);
s.fpin = fpin;
s.fpout = fpout;
if (flags & M_CM_PREFIX)
* XXX - fix that.
*/
-static void format_address_header (char **h, ADDRESS * a)
+static void format_address_header (char **h, address_t * a)
{
char buf[HUGE_STRING];
char cbuf[STRING];
p_realloc(h, buflen);
for (count = 0; a; a = a->next, count++) {
- ADDRESS *tmp = a->next;
+ address_t *tmp = a->next;
a->next = NULL;
*buf = *cbuf = *c2buf = '\0';
char *s = *h;
int l;
- ADDRESS *a = NULL;
+ address_t *a = NULL;
switch (tolower ((unsigned char) *s)) {
case 'r':
format_address_header (h, a);
- rfc822_free_address (&a);
+ address_delete (&a);
p_delete(&s);
return 1;