X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=compose.c;h=b0b20aaad361f837de05f14bb7661febdb571613;hp=8c0006a9d42ef0853ad63326c3d763465211f5c7;hb=bd28609f1086cc4cae0f44e2520c53b7fed542d0;hpb=b3cb6ed8d36c550a2e589910ce51bbc8352ff57c diff --git a/compose.c b/compose.c index 8c0006a..b0b20aa 100644 --- a/compose.c +++ b/compose.c @@ -16,6 +16,9 @@ #endif #include +#include +#include +#include #include "mutt.h" #include "enter.h" @@ -41,9 +44,6 @@ #include "nntp.h" #endif -#include "lib/mem.h" -#include "lib/intl.h" -#include "lib/str.h" #include #include @@ -224,14 +224,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 */ @@ -243,7 +243,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); @@ -480,7 +480,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: @@ -615,14 +615,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) @@ -635,12 +635,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) @@ -653,11 +653,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) @@ -668,7 +668,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) { @@ -685,9 +685,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); @@ -697,7 +697,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); @@ -707,10 +707,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, @@ -751,7 +752,7 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ if (!(WithCrypto & APPLICATION_PGP)) break; if (idxlen == idxmax) { - mem_realloc (&idx, sizeof (ATTACHPTR *) * (idxmax += 5)); + p_realloc(&idx, idxmax += 5); menu->data = idx; } @@ -791,8 +792,7 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ break; if (idxlen + numfiles >= idxmax) { - mem_realloc (&idx, - sizeof (ATTACHPTR *) * (idxmax += 5 + numfiles)); + p_realloc(&idx, idxmax += 5 + numfiles); menu->data = idx; } @@ -851,7 +851,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); } @@ -919,9 +919,7 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ } if (idxlen + Context->tagged >= idxmax) { - mem_realloc (&idx, - sizeof (ATTACHPTR *) * (idxmax += - 5 + Context->tagged)); + p_realloc(&idx, idxmax += 5 + Context->tagged); menu->data = idx; } @@ -999,9 +997,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); @@ -1051,8 +1048,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) { @@ -1139,7 +1136,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]) { @@ -1193,7 +1190,7 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ continue; } if (idxlen == idxmax) { - mem_realloc (&idx, sizeof (ATTACHPTR *) * (idxmax += 5)); + p_realloc(&idx, idxmax += 5); menu->data = idx; } @@ -1329,7 +1326,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)