#include <lib-lib/mem.h>
#include <lib-lib/str.h>
+#include <lib-lib/ascii.h>
#include "mutt.h"
-#include "ascii.h"
#include "mime.h"
#include "charset.h"
#include "rfc2047.h"
}
*t = '\0';
- strfcpy (charset, value, chslen);
+ m_strcpy(charset, chslen, value);
if ((u = strchr (t + 1, '\'')))
return u + 1;
q = p;
p = p->next;
- c = str_cmp (par->value, q->value);
+ c = m_strcmp(par->value, q->value);
if ((c > 0) || (c == 0 && par->index >= q->index))
break;
}
value = NULL;
l = 0;
- strfcpy (attribute, par->attribute, sizeof (attribute));
+ m_strcpy(attribute, sizeof(attribute), par->attribute);
if ((encoded = par->encoded))
valp = rfc2231_get_charset (par->value, charset, sizeof (charset));
rfc2231_free_parameter (&par);
if ((par = q))
valp = par->value;
- } while (par && !str_cmp (par->attribute, attribute));
+ } while (par && !m_strcmp(par->attribute, attribute));
if (value) {
if (encoded)