X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=send.c;h=6f988dd0eee637b6920561c4eb7765c5230a61fe;hp=8f09f36c45fc863a826ea26f6774b9d42d21decd;hb=be3bd578d8557b8d0cb9138153ee30e14b33ec58;hpb=df70e07e24add1869bcc9b7af2277d9d0c09a281 diff --git a/send.c b/send.c index 8f09f36..6f988dd 100644 --- a/send.c +++ b/send.c @@ -1,19 +1,10 @@ /* + * Copyright notice from original mutt: * Copyright (C) 1996-2002 Michael R. Elkins - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * + * This file is part of mutt-ng, see http://www.muttng.org/. + * It's licensed under the GNU General Public License, + * please see the file GPL in the top level source directory. */ #if HAVE_CONFIG_H @@ -25,13 +16,16 @@ #include "rfc2047.h" #include "keymap.h" #include "mime.h" -#include "mailbox.h" #include "copy.h" #include "mx.h" #include "mutt_crypt.h" #include "mutt_idna.h" #include "url.h" +#include "lib/mem.h" +#include "lib/intl.h" +#include "lib/str.h" + #include #include #include @@ -296,7 +290,7 @@ static int edit_envelope (ENVELOPE * en, int flags) return (-1); } - mutt_str_replace (&en->subject, buf); + str_replace (&en->subject, buf); return 0; } @@ -351,7 +345,7 @@ static void process_user_header (ENVELOPE * env) env->reply_to = rfc822_parse_adrlist (env->reply_to, uh->data + 9); } else if (ascii_strncasecmp ("message-id:", uh->data, 11) == 0) - mutt_str_replace (&env->message_id, uh->data + 11); + str_replace (&env->message_id, uh->data + 11); else if (ascii_strncasecmp ("to:", uh->data, 3) != 0 && ascii_strncasecmp ("cc:", uh->data, 3) != 0 && ascii_strncasecmp ("bcc:", uh->data, 4) != 0 && @@ -654,7 +648,7 @@ void mutt_make_forward_subject (ENVELOPE * env, CONTEXT * ctx, HEADER * cur) /* set the default subject for the message. */ mutt_make_string (buffer, sizeof (buffer), NONULL (ForwFmt), ctx, cur); - mutt_str_replace (&env->subject, buffer); + str_replace (&env->subject, buffer); } void mutt_make_misc_reply_headers (ENVELOPE * env, CONTEXT * ctx, @@ -665,7 +659,7 @@ void mutt_make_misc_reply_headers (ENVELOPE * env, CONTEXT * ctx, */ if (curenv->real_subj) { FREE (&env->subject); - env->subject = safe_malloc (mutt_strlen (curenv->real_subj) + 5); + env->subject = safe_malloc (safe_strlen (curenv->real_subj) + 5); sprintf (env->subject, "Re: %s", curenv->real_subj); /* __SPRINTF_CHECKED__ */ } else if (!env->subject) @@ -764,7 +758,7 @@ envelope_defaults (ENVELOPE * env, CONTEXT * ctx, HEADER * cur, int flags) if ((flags & SENDNEWS)) { /* in case followup set Newsgroups: with Followup-To: if it present */ if (!env->newsgroups && curenv && - mutt_strcasecmp (curenv->followup_to, "poster")) + safe_strcasecmp (curenv->followup_to, "poster")) env->newsgroups = safe_strdup (curenv->followup_to); } else @@ -1001,7 +995,7 @@ ADDRESS *mutt_default_from (void) else if (option (OPTUSEDOMAIN)) { adr = rfc822_new_address (); adr->mailbox = - safe_malloc (mutt_strlen (Username) + mutt_strlen (fqdn) + 2); + safe_malloc (safe_strlen (Username) + safe_strlen (fqdn) + 2); sprintf (adr->mailbox, "%s@%s", NONULL (Username), NONULL (fqdn)); /* __SPRINTF_CHECKED__ */ } else { @@ -1321,7 +1315,7 @@ int ci_send_message (int flags, /* send mode */ if (option (OPTSIGONTOP) && (!(flags & (SENDMAILX | SENDKEY)) && Editor - && mutt_strcmp (Editor, "builtin") != 0)) + && safe_strcmp (Editor, "builtin") != 0)) append_signature (tempfp); /* include replies/forwarded messages, unless we are given a template */ @@ -1331,7 +1325,7 @@ int ci_send_message (int flags, /* send mode */ if (!option (OPTSIGONTOP) && (!(flags & (SENDMAILX | SENDKEY)) && Editor - && mutt_strcmp (Editor, "builtin") != 0)) + && safe_strcmp (Editor, "builtin") != 0)) append_signature (tempfp); /* @@ -1444,7 +1438,7 @@ int ci_send_message (int flags, /* send mode */ /* 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 || mutt_strcmp ("builtin", Editor) == 0) + else if (!Editor || safe_strcmp ("builtin", Editor) == 0) mutt_builtin_editor (msg->content->filename, msg, cur); else if (option (OPTEDITHDRS)) { mutt_env_to_local (msg->env); @@ -1668,11 +1662,11 @@ int ci_send_message (int flags, /* send mode */ */ #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 && mutt_strcmp ("/dev/null", fcc) != 0) { + if (*fcc && safe_strcmp ("/dev/null", fcc) != 0) { BODY *tmpbody = msg->content; BODY *save_sig = NULL; BODY *save_parts = NULL; @@ -1683,8 +1677,8 @@ int ci_send_message (int flags, /* send mode */ /* check to see if the user wants copies of all attachments */ if (!option (OPTFCCATTACH) && msg->content->type == TYPEMULTIPART) { if (WithCrypto - && (mutt_strcmp (msg->content->subtype, "encrypted") == 0 || - mutt_strcmp (msg->content->subtype, "signed") == 0)) { + && (safe_strcmp (msg->content->subtype, "encrypted") == 0 || + safe_strcmp (msg->content->subtype, "signed") == 0)) { if (clear_content->type == TYPEMULTIPART) { if (!(msg->security & ENCRYPT) && (msg->security & SIGN)) { /* save initial signature and attachments */