X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=compose.c;h=3d5f39c42f146a23f22218b8b136c1f6b68986d8;hp=b46050ecd35b7061747e61dd20fa8d45c852c6d7;hb=871a94fc21c9d349bb0fe8851e0f2e3a07527ed5;hpb=617e7d83d14e14e6a520a48e75437211b16c8834 diff --git a/compose.c b/compose.c index b46050e..3d5f39c 100644 --- a/compose.c +++ b/compose.c @@ -16,6 +16,12 @@ #endif #include +#include +#include +#include +#include + +#include #include "mutt.h" #include "enter.h" @@ -23,10 +29,8 @@ #include "mutt_idna.h" #include "mutt_menu.h" #include "rfc1524.h" -#include "mime.h" #include "attach.h" #include "recvattach.h" -#include "mapping.h" #include "sort.h" #include "charset.h" #include "mx.h" @@ -41,8 +45,6 @@ #include "nntp.h" #endif -#include "lib/intl.h" -#include "lib/str.h" #include #include @@ -223,14 +225,14 @@ static void redraw_mix_line (LIST * chain) if (t && t[0] == '0' && t[1] == '\0') t = ""; - if (c + str_len (t) + 2 >= COLS - SW) + if (c + m_strlen(t) + 2 >= COLS - SW) break; addstr (NONULL (t)); if (chain->next) addstr (", "); - c += str_len (t) + 2; + c += m_strlen(t) + 2; } } #endif /* MIXMASTER */ @@ -242,7 +244,7 @@ static int check_attachments (ATTACHPTR ** idx, short idxlen) char pretty[_POSIX_PATH_MAX], msg[_POSIX_PATH_MAX + SHORT_STRING]; for (i = 0; i < idxlen; i++) { - strfcpy (pretty, idx[i]->content->filename, sizeof (pretty)); + m_strcpy(pretty, sizeof(pretty), idx[i]->content->filename); if (stat (idx[i]->content->filename, &st) != 0) { mutt_pretty_mailbox (pretty); mutt_error (_("%s [#%d] no longer exists!"), pretty, i + 1); @@ -264,7 +266,7 @@ static int check_attachments (ATTACHPTR ** idx, short idxlen) return 0; } -static void draw_envelope_addr (int line, ADDRESS * addr) +static void draw_envelope_addr (int line, address_t * addr) { char buf[STRING]; @@ -318,7 +320,7 @@ static void draw_envelope (HEADER * msg, char *fcc) SETCOLOR (MT_COLOR_NORMAL); } -static int edit_address_list (int line, ADDRESS ** addr) +static int edit_address_list (int line, address_t ** addr) { char buf[HUGE_STRING] = ""; /* needs to be large for alias expansion */ char *err = NULL; @@ -326,7 +328,7 @@ static int edit_address_list (int line, ADDRESS ** addr) mutt_addrlist_to_local (*addr); rfc822_write_address (buf, sizeof (buf), *addr, 0); if (mutt_get_field (Prompts[line - 1], buf, sizeof (buf), M_ALIAS) == 0) { - rfc822_free_address (addr); + address_delete (addr); *addr = mutt_parse_adrlist (*addr, buf); *addr = mutt_expand_aliases (*addr); } @@ -479,7 +481,7 @@ static const char *compose_format_str (char *buf, size_t buflen, char op, break; case 'v': - strncpy (buf, mutt_make_version (0), buflen); + m_strcpy(buf, buflen, mutt_make_version (0)); break; case 0: @@ -614,14 +616,14 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ case OP_COMPOSE_EDIT_NEWSGROUPS: if (news) { if (msg->env->newsgroups) - strfcpy (buf, msg->env->newsgroups, sizeof (buf)); + m_strcpy(buf, sizeof(buf), msg->env->newsgroups); else buf[0] = 0; if (mutt_get_field ("Newsgroups: ", buf, sizeof (buf), 0) == 0 && buf[0]) { p_delete(&msg->env->newsgroups); str_skip_trailws (buf); - msg->env->newsgroups = str_dup (str_skip_initws (buf)); + msg->env->newsgroups = m_strdup(vskipspaces(buf)); move (HDR_TO, HDR_XOFFSET); clrtoeol (); if (msg->env->newsgroups) @@ -634,12 +636,12 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ if (news) { buf[0] = 0; if (msg->env->followup_to) - strfcpy (buf, msg->env->followup_to, sizeof (buf)); + m_strcpy(buf, sizeof(buf), msg->env->followup_to); if (mutt_get_field ("Followup-To: ", buf, sizeof (buf), 0) == 0 && buf[0]) { p_delete(&msg->env->followup_to); str_skip_trailws (buf); - msg->env->followup_to = str_dup (str_skip_initws (buf)); + msg->env->followup_to = m_strdup(vskipspaces(buf)); move (HDR_CC, HDR_XOFFSET); clrtoeol (); if (msg->env->followup_to) @@ -652,11 +654,11 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ if (news && option (OPTXCOMMENTTO)) { buf[0] = 0; if (msg->env->x_comment_to) - strfcpy (buf, msg->env->x_comment_to, sizeof (buf)); + m_strcpy(buf, sizeof(buf), msg->env->x_comment_to); if (mutt_get_field ("X-Comment-To: ", buf, sizeof (buf), 0) == 0 && buf[0]) { p_delete(&msg->env->x_comment_to); - msg->env->x_comment_to = str_dup (buf); + msg->env->x_comment_to = m_strdup(buf); move (HDR_BCC, HDR_XOFFSET); clrtoeol (); if (msg->env->x_comment_to) @@ -667,7 +669,7 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ #endif case OP_COMPOSE_EDIT_SUBJECT: if (msg->env->subject) - strfcpy (buf, msg->env->subject, sizeof (buf)); + m_strcpy(buf, sizeof(buf), msg->env->subject); else buf[0] = 0; if (mutt_get_field ("Subject: ", buf, sizeof (buf), 0) == 0) { @@ -684,9 +686,9 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ mutt_message_hook (NULL, msg, M_SEND2HOOK); break; case OP_COMPOSE_EDIT_FCC: - strfcpy (buf, fcc, sizeof (buf)); + m_strcpy(buf, sizeof(buf), fcc); if (mutt_get_field ("Fcc: ", buf, sizeof (buf), M_FILE | M_CLEAR) == 0) { - strfcpy (fcc, buf, _POSIX_PATH_MAX); + m_strcpy(fcc, _POSIX_PATH_MAX, buf); mutt_pretty_mailbox (fcc); move (HDR_FCC, HDR_XOFFSET + SW); mutt_paddstr (W, fcc); @@ -696,7 +698,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 && (str_cmp ("builtin", Editor) != 0) + if (Editor && (m_strcmp("builtin", Editor) != 0) && !option (OPTEDITHDRS)) { mutt_edit_file (Editor, msg->content->filename); mutt_update_encoding (msg->content); @@ -706,10 +708,11 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ } /* fall through */ case OP_COMPOSE_EDIT_HEADERS: - if (str_cmp ("builtin", Editor) != 0 && + if (m_strcmp("builtin", Editor) != 0 && (op == OP_COMPOSE_EDIT_HEADERS || (op == OP_COMPOSE_EDIT_MESSAGE && option (OPTEDITHDRS)))) { - const char *tag = NULL, *err = NULL; + const char *tag = NULL; + char *err = NULL; mutt_env_to_local (msg->env); mutt_edit_headers (NONULL (Editor), msg->content->filename, msg, @@ -849,7 +852,7 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ if ((op == OP_COMPOSE_ATTACH_MESSAGE) ^ (Context->magic == M_NNTP)) #endif { - strfcpy (fname, NONULL (Context->path), sizeof (fname)); + m_strcpy(fname, sizeof(fname), NONULL(Context->path)); mutt_pretty_mailbox (fname); } @@ -995,9 +998,8 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ case OP_COMPOSE_EDIT_DESCRIPTION: CHECK_COUNT; - strfcpy (buf, - idx[menu->current]->content->description ? - idx[menu->current]->content->description : "", sizeof (buf)); + m_strcpy(buf, sizeof(buf), + NONULL(idx[menu->current]->content->description)); /* header names should not be translated */ if (mutt_get_field ("Description: ", buf, sizeof (buf), 0) == 0) { str_replace (&idx[menu->current]->content->description, buf); @@ -1047,8 +1049,8 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ case OP_COMPOSE_EDIT_ENCODING: CHECK_COUNT; - strfcpy (buf, ENCODING (idx[menu->current]->content->encoding), - sizeof (buf)); + m_strcpy(buf, sizeof(buf), + ENCODING(idx[menu->current]->content->encoding)); if (mutt_get_field ("Content-Transfer-Encoding: ", buf, sizeof (buf), 0) == 0 && buf[0]) { if ((i = mutt_check_encoding (buf)) != ENCOTHER && i != ENCUUENCODED) { @@ -1135,7 +1137,7 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ case OP_COMPOSE_RENAME_FILE: CHECK_COUNT; - strfcpy (fname, idx[menu->current]->content->filename, sizeof (fname)); + m_strcpy(fname, sizeof(fname), idx[menu->current]->content->filename); mutt_pretty_mailbox (fname); if (mutt_get_field (_("Rename to: "), fname, sizeof (fname), M_FILE) == 0 && fname[0]) { @@ -1325,7 +1327,7 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ fname[0] = '\0'; if (Context) { - strfcpy (fname, NONULL (Context->path), sizeof (fname)); + m_strcpy(fname, sizeof(fname), NONULL(Context->path)); mutt_pretty_mailbox (fname); } if (idxlen)