#endif
#include <lib-lib/macros.h>
+#include <lib-lib/ascii.h>
+#include <lib-lib/file.h>
#include "mutt.h"
-#include "ascii.h"
-#include "mutt_crypt.h"
+#include <lib-crypt/crypt.h>
#include "mutt_idna.h"
#include "lib/debug.h"
n->references = msg->env->references;
msg->env->references = NULL;
- mutt_free_envelope (&msg->env);
+ envelope_delete(&msg->env);
msg->env = n;
n = NULL;
* message based upon this one.
*/
if (fcc && ascii_strncasecmp ("fcc:", cur->data, 4) == 0) {
- p = cur->data + 4;
- SKIPWS (p);
+ p = vskipspaces(cur->data + 4);
if (*p) {
- strfcpy (fcc, p, fcclen);
+ m_strcpy(fcc, fcclen, p);
mutt_pretty_mailbox (fcc);
}
keep = 0;
}
else if (ascii_strncasecmp ("attach:", cur->data, 7) == 0) {
- BODY *body;
+ BODY *bbody;
BODY *parts;
char *q;
- p = cur->data + 7;
- SKIPWS (p);
+ p = vskipspaces(cur->data + 7);
if (*p) {
if ((q = strpbrk (p, " \t"))) {
- str_substrcpy (path, p, q, sizeof (path));
- SKIPWS (q);
+ m_strncpy(path, sizeof(path), p, q - p);
+ q = vskipspaces(q);
}
else
- strfcpy (path, p, sizeof (path));
+ m_strcpy(path, sizeof(path), p);
mutt_expand_path (path, sizeof (path));
- if ((body = mutt_make_file_attach (path))) {
- body->description = str_dup (q);
+ if ((bbody = mutt_make_file_attach (path))) {
+ bbody->description = m_strdup(q);
for (parts = msg->content; parts->next; parts = parts->next);
- parts->next = body;
+ parts->next = bbody;
}
else {
mutt_pretty_mailbox (path);
}
- else if ((WithCrypto & APPLICATION_PGP)
- && ascii_strncasecmp ("pgp:", cur->data, 4) == 0) {
+ else if (ascii_strncasecmp("pgp:", cur->data, 4) == 0) {
msg->security = mutt_parse_crypt_hdr (cur->data + 4, 0);
if (msg->security)
msg->security |= APPLICATION_PGP;