X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=compose.c;h=09acea2a04042bd732e64b3bcaf9120b34c990b3;hp=78f1ab96c7001cde57084be3ce8bba8840919906;hb=93b012884de4ca5e1f2550f767d0b8680b9c0e9f;hpb=8e037c67a88cb4680c4391134c578e3b55a80f8a diff --git a/compose.c b/compose.c index 78f1ab9..09acea2 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,9 +45,6 @@ #include "nntp.h" #endif -#include "lib/mem.h" -#include "lib/intl.h" -#include "lib/str.h" #include #include @@ -133,7 +134,8 @@ static struct mapping_t ComposeNewsHelp[] = { }; #endif -static void snd_entry (char *b, size_t blen, MUTTMENU * menu, int num) { + +static void snd_entry (char *b, ssize_t blen, MUTTMENU * menu, int num) { int w=(COLS-SW)>blen?blen:COLS-SW; mutt_FormatString (b, w, NONULL (AttachFormat), mutt_attach_fmt, (unsigned long) (((ATTACHPTR **) menu->data)[num]), @@ -224,14 +226,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 +245,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); @@ -265,7 +267,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]; @@ -319,7 +321,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; @@ -327,7 +329,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); } @@ -480,7 +482,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: @@ -500,7 +502,7 @@ static const char *compose_format_str (char *buf, size_t buflen, char op, return (src); } -static void compose_status_line (char *buf, size_t buflen, MUTTMENU * menu, +static void compose_status_line (char *buf, ssize_t buflen, MUTTMENU * menu, const char *p) { int w=(COLS-SW)>buflen?buflen:(COLS-SW); @@ -526,7 +528,7 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ ATTACHPTR **idx = NULL; short idxlen = 0; short idxmax = 0; - int i, close = 0; + int i, closed = 0; int r = -1; /* return value */ int op = 0; int loop = 1; @@ -615,14 +617,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)); + m_strrtrim(buf); + msg->env->newsgroups = m_strdup(skipspaces(buf)); move (HDR_TO, HDR_XOFFSET); clrtoeol (); if (msg->env->newsgroups) @@ -635,12 +637,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)); + m_strrtrim(buf); + msg->env->followup_to = m_strdup(skipspaces(buf)); move (HDR_CC, HDR_XOFFSET); clrtoeol (); if (msg->env->followup_to) @@ -653,11 +655,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,11 +670,11 @@ 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) { - str_replace (&msg->env->subject, buf); + m_strreplace(&msg->env->subject, buf); move (HDR_SUBJECT, HDR_XOFFSET + SW); clrtoeol (); if (msg->env->subject) @@ -685,9 +687,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 +699,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 +709,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; + const char *err = NULL; mutt_env_to_local (msg->env); mutt_edit_headers (NONULL (Editor), msg->content->filename, msg, @@ -751,11 +754,11 @@ 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; } - idx[idxlen] = (ATTACHPTR *) mem_calloc (1, sizeof (ATTACHPTR)); + idx[idxlen] = p_new(ATTACHPTR, 1); if ((idx[idxlen]->content = crypt_pgp_make_key_attachment (NULL)) != NULL) { update_idx (menu, idx, idxlen++); @@ -791,8 +794,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; } @@ -803,7 +805,7 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ for (i = 0; i < numfiles; i++) { char *att = files[i]; - idx[idxlen] = (ATTACHPTR *) mem_calloc (1, sizeof (ATTACHPTR)); + idx[idxlen] = p_new(ATTACHPTR, 1); idx[idxlen]->unowned = 1; idx[idxlen]->content = mutt_make_file_attach (att); if (idx[idxlen]->content != NULL) @@ -851,7 +853,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); } @@ -905,7 +907,7 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ set_option (OPTATTACHMSG); mutt_message _("Tag the messages you want to attach!"); - close = mutt_index_menu (); + closed = mutt_index_menu (); unset_option (OPTATTACHMSG); if (!Context) { @@ -919,16 +921,14 @@ 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; } for (i = 0; i < Context->msgcount; i++) { h = Context->hdrs[i]; if (h->tagged) { - idx[idxlen] = (ATTACHPTR *) mem_calloc (1, sizeof (ATTACHPTR)); + idx[idxlen] = p_new(ATTACHPTR, 1); idx[idxlen]->content = mutt_make_message_attach (Context, h, 1); if (idx[idxlen]->content != NULL) update_idx (menu, idx, idxlen++); @@ -941,7 +941,7 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ } menu->redraw |= REDRAW_FULL; - if (close == OP_QUIT) + if (closed == OP_QUIT) mx_close_mailbox (Context, NULL); else mx_fastclose_mailbox (Context); @@ -999,12 +999,11 @@ 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); + m_strreplace(&idx[menu->current]->content->description, buf); menu->redraw = REDRAW_CURRENT; } mutt_message_hook (NULL, msg, M_SEND2HOOK); @@ -1051,8 +1050,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 +1138,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]) { @@ -1152,7 +1151,7 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ if (mutt_rename_file (idx[menu->current]->content->filename, fname)) break; - str_replace (&idx[menu->current]->content->filename, fname); + m_strreplace(&idx[menu->current]->content->filename, fname); menu->redraw = REDRAW_CURRENT; if (idx[menu->current]->content->stamp >= st.st_mtime) @@ -1193,11 +1192,11 @@ 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; } - idx[idxlen] = (ATTACHPTR *) mem_calloc (1, sizeof (ATTACHPTR)); + idx[idxlen] = p_new(ATTACHPTR, 1); /* Touch the file */ if (!(fp = safe_fopen (fname, "w"))) { mutt_error (_("Can't create file %s"), fname); @@ -1214,7 +1213,7 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ update_idx (menu, idx, idxlen++); idx[menu->current]->content->type = itype; - str_replace (&idx[menu->current]->content->subtype, p); + m_strreplace(&idx[menu->current]->content->subtype, p); idx[menu->current]->content->unlink = 1; menu->redraw |= REDRAW_INDEX | REDRAW_STATUS; @@ -1329,7 +1328,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)