#include "rfc2047.h"
#include "keymap.h"
#include "mime.h"
-#include "mailbox.h"
#include "copy.h"
#include "mx.h"
#include "mutt_crypt.h"
#include "lib/mem.h"
#include "lib/intl.h"
#include "lib/str.h"
+#include "lib/debug.h"
#include <ctype.h>
#include <stdlib.h>
*/
if (curenv->real_subj) {
FREE (&env->subject);
- env->subject = safe_malloc (safe_strlen (curenv->real_subj) + 5);
+ env->subject = safe_malloc (mutt_strlen (curenv->real_subj) + 5);
sprintf (env->subject, "Re: %s", curenv->real_subj); /* __SPRINTF_CHECKED__ */
}
else if (!env->subject)
else if (option (OPTUSEDOMAIN)) {
adr = rfc822_new_address ();
adr->mailbox =
- safe_malloc (safe_strlen (Username) + safe_strlen (fqdn) + 2);
+ safe_malloc (mutt_strlen (Username) + mutt_strlen (fqdn) + 2);
sprintf (adr->mailbox, "%s@%s", NONULL (Username), NONULL (fqdn)); /* __SPRINTF_CHECKED__ */
}
else {
}
if (!tempfp) {
- dprint (1,
- (debugfile,
- "newsend_message: can't create tempfile %s (errno=%d)\n",
- msg->content->filename, errno));
+ debug_print (1, ("can't create tempfile %s (errno=%d)\n",
+ msg->content->filename, errno));
mutt_perror (msg->content->filename);
goto cleanup;
}
if (option (OPTSIGONTOP)
&& (!(flags & (SENDMAILX | SENDKEY)) && Editor
- && safe_strcmp (Editor, "builtin") != 0))
+ && mutt_strcmp (Editor, "builtin") != 0))
append_signature (tempfp);
/* include replies/forwarded messages, unless we are given a template */
if (!option (OPTSIGONTOP)
&& (!(flags & (SENDMAILX | SENDKEY)) && Editor
- && safe_strcmp (Editor, "builtin") != 0))
+ && mutt_strcmp (Editor, "builtin") != 0))
append_signature (tempfp);
/*
/* If the this isn't a text message, look for a mailcap edit command */
if (mutt_needs_mailcap (msg->content))
mutt_edit_attachment (msg->content);
- else if (!Editor || safe_strcmp ("builtin", Editor) == 0)
+ else if (!Editor || mutt_strcmp ("builtin", Editor) == 0)
mutt_builtin_editor (msg->content->filename, msg, cur);
else if (option (OPTEDITHDRS)) {
mutt_env_to_local (msg->env);
*/
#ifdef USE_IMAP
- if ((flags & SENDBATCH) && fcc[0] && mx_is_imap (fcc))
+ if ((flags & SENDBATCH) && fcc[0] && mx_get_magic (fcc) == M_IMAP)
fcc[0] = '\0';
#endif
- if (*fcc && safe_strcmp ("/dev/null", fcc) != 0) {
+ if (*fcc && mutt_strcmp ("/dev/null", fcc) != 0) {
BODY *tmpbody = msg->content;
BODY *save_sig = NULL;
BODY *save_parts = NULL;
/* check to see if the user wants copies of all attachments */
if (!option (OPTFCCATTACH) && msg->content->type == TYPEMULTIPART) {
if (WithCrypto
- && (safe_strcmp (msg->content->subtype, "encrypted") == 0 ||
- safe_strcmp (msg->content->subtype, "signed") == 0)) {
+ && (mutt_strcmp (msg->content->subtype, "encrypted") == 0 ||
+ mutt_strcmp (msg->content->subtype, "signed") == 0)) {
if (clear_content->type == TYPEMULTIPART) {
if (!(msg->security & ENCRYPT) && (msg->security & SIGN)) {
/* save initial signature and attachments */