X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=compose.c;h=960f1241f993bc134aa35d7c5c3ba5c58abc10d4;hp=7ea19521343e17d5a73fb76ea24a2a983056c55b;hb=f70e0d5b479d4917b97d5e1e50f9276dcd51cad3;hpb=df70e07e24add1869bcc9b7af2277d9d0c09a281 diff --git a/compose.c b/compose.c index 7ea1952..960f124 100644 --- a/compose.c +++ b/compose.c @@ -1,20 +1,14 @@ /* + * Copyright notice from original mutt: * Copyright (C) 1996-2000 Michael R. Elkins * Copyright (C) 2004 g10 Code GmbH - * - * 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. + * + * Parts were written/modified by: + * Nico Golde + * + * 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 @@ -29,10 +23,11 @@ #include "mime.h" #include "attach.h" #include "mapping.h" -#include "mailbox.h" #include "sort.h" #include "charset.h" #include "mx.h" +#include "buffy.h" +#include "compose.h" #ifdef MIXMASTER #include "remailer.h" @@ -42,6 +37,10 @@ #include "nntp.h" #endif +#include "lib/mem.h" +#include "lib/intl.h" +#include "lib/str.h" + #include #include #include @@ -222,14 +221,14 @@ static void redraw_mix_line (LIST * chain) if (t && t[0] == '0' && t[1] == '\0') t = ""; - if (c + mutt_strlen (t) + 2 >= COLS - SidebarWidth) + if (c + safe_strlen (t) + 2 >= COLS - SidebarWidth) break; addstr (NONULL (t)); if (chain->next) addstr (", "); - c += mutt_strlen (t) + 2; + c += safe_strlen (t) + 2; } } #endif /* MIXMASTER */ @@ -437,10 +436,6 @@ static unsigned long cum_attachs_size (MUTTMENU * menu) return s; } -/* prototype for use below */ -static void compose_status_line (char *buf, size_t buflen, MUTTMENU * menu, - const char *p); - /* * compose_format_str() * @@ -568,7 +563,7 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ ComposeHelp); if (option (OPTMBOXPANE)) - mutt_buffy_check (1); + buffy_check (1); while (loop) { #ifdef USE_NNTP unset_option (OPTNEWS); /* for any case */ @@ -674,7 +669,7 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ else buf[0] = 0; if (mutt_get_field ("Subject: ", buf, sizeof (buf), 0) == 0) { - mutt_str_replace (&msg->env->subject, buf); + str_replace (&msg->env->subject, buf); move (HDR_SUBJECT, HDR_XOFFSET + SidebarWidth); clrtoeol (); if (msg->env->subject) @@ -699,7 +694,7 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ mutt_message_hook (NULL, msg, M_SEND2HOOK); break; case OP_COMPOSE_EDIT_MESSAGE: - if (Editor && (mutt_strcmp ("builtin", Editor) != 0) + if (Editor && (safe_strcmp ("builtin", Editor) != 0) && !option (OPTEDITHDRS)) { mutt_edit_file (Editor, msg->content->filename); mutt_update_encoding (msg->content); @@ -709,7 +704,7 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ } /* fall through */ case OP_COMPOSE_EDIT_HEADERS: - if (mutt_strcmp ("builtin", Editor) != 0 && + if (safe_strcmp ("builtin", Editor) != 0 && (op == OP_COMPOSE_EDIT_HEADERS || (op == OP_COMPOSE_EDIT_MESSAGE && option (OPTEDITHDRS)))) { char *tag = NULL, *err = NULL; @@ -868,13 +863,13 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ #endif mutt_expand_path (fname, sizeof (fname)); #ifdef USE_IMAP - if (!mx_is_imap (fname)) + if (mx_get_magic (fname) != M_IMAP) #endif #ifdef USE_POP - if (!mx_is_pop (fname)) + if (mx_get_magic (fname) != M_POP) #endif #ifdef USE_NNTP - if (!mx_is_nntp (fname) && !option (OPTNEWS)) + if (mx_get_magic (fname) != M_NNTP && !option (OPTNEWS)) #endif /* check to make sure the file exists and is readable */ if (access (fname, R_OK) == -1) { @@ -1003,7 +998,7 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ idx[menu->current]->content->description : "", sizeof (buf)); /* header names should not be translated */ if (mutt_get_field ("Description: ", buf, sizeof (buf), 0) == 0) { - mutt_str_replace (&idx[menu->current]->content->description, buf); + str_replace (&idx[menu->current]->content->description, buf); menu->redraw = REDRAW_CURRENT; } mutt_message_hook (NULL, msg, M_SEND2HOOK); @@ -1151,7 +1146,7 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ if (mutt_rename_file (idx[menu->current]->content->filename, fname)) break; - mutt_str_replace (&idx[menu->current]->content->filename, fname); + str_replace (&idx[menu->current]->content->filename, fname); menu->redraw = REDRAW_CURRENT; if (idx[menu->current]->content->stamp >= st.st_mtime) @@ -1213,7 +1208,7 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ update_idx (menu, idx, idxlen++); idx[menu->current]->content->type = itype; - mutt_str_replace (&idx[menu->current]->content->subtype, p); + str_replace (&idx[menu->current]->content->subtype, p); idx[menu->current]->content->unlink = 1; menu->redraw |= REDRAW_INDEX | REDRAW_STATUS;