X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=compose.c;h=72e67375aa6435e84b1b2da636ddaf70f4ed0e2e;hp=3de34a9bf678116353d755984c5878a859f0b817;hb=fd97b7b962d97d99e98cd566a34fcdaaeb950bfd;hpb=3c94b38b2555a98b4a7f3d9d9e1ac4aadc830edf diff --git a/compose.c b/compose.c index 3de34a9..72e6737 100644 --- a/compose.c +++ b/compose.c @@ -14,7 +14,6 @@ #include #include - #include #include @@ -24,6 +23,7 @@ #include "mutt.h" #include "alias.h" +#include "crypt.h" #include "mutt_idna.h" #include "attach.h" #include "recvattach.h" @@ -113,14 +113,11 @@ static struct mapping_t ComposeNewsHelp[] = { 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]), - M_FORMAT_STAT_FILE | M_FORMAT_ARROWCURSOR); + m_strformat(b, blen, COLS - SW, AttachFormat, mutt_attach_fmt, + ((ATTACHPTR **)menu->data)[num], + M_FORMAT_STAT_FILE | (option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0)); } -#include - static void redraw_crypt_lines (HEADER * msg) { int off = 0; @@ -203,7 +200,7 @@ static int check_attachments (ATTACHPTR ** idx, short idxlen) { int i, r; struct stat st; - char pretty[_POSIX_PATH_MAX], msg[_POSIX_PATH_MAX + SHORT_STRING]; + char pretty[_POSIX_PATH_MAX], msg[_POSIX_PATH_MAX + STRING]; for (i = 0; i < idxlen; i++) { m_strcpy(pretty, sizeof(pretty), idx[i]->content->filename); @@ -233,7 +230,7 @@ static void draw_envelope_addr (int line, address_t * addr) char buf[STRING]; buf[0] = 0; - rfc822_write_address (buf, sizeof (buf), addr, 1); + rfc822_addrcat(buf, sizeof (buf), addr, 1); mvprintw (line, SW, TITLE_FMT, Prompts[line - 1]); mutt_paddstr (W, buf); } @@ -283,7 +280,7 @@ static int edit_address_list (int line, address_t ** addr) char *err = NULL; mutt_addrlist_to_local (*addr); - rfc822_write_address (buf, sizeof (buf), *addr, 0); + rfc822_addrcat(buf, sizeof (buf), *addr, 0); if (mutt_get_field (Prompts[line - 1], buf, sizeof (buf), M_ALIAS) == 0) { address_list_wipe(addr); *addr = mutt_parse_adrlist (*addr, buf); @@ -303,7 +300,7 @@ static int edit_address_list (int line, address_t ** addr) /* redraw the expanded list so the user can see the result */ buf[0] = 0; - rfc822_write_address (buf, sizeof (buf), *addr, 1); + rfc822_addrcat(buf, sizeof (buf), *addr, 1); move (line, HDR_XOFFSET + SW); mutt_paddstr (W, buf); @@ -364,7 +361,7 @@ static void update_idx (MUTTMENU * menu, ATTACHPTR ** idx, short idxlen) * applied. * */ -static unsigned long cum_attachs_size (MUTTMENU * menu) +static unsigned long cum_attachs_size(MUTTMENU * menu) { ssize_t s; unsigned short i; @@ -412,13 +409,13 @@ static void compose_status_line (char *buf, ssize_t buflen, MUTTMENU * menu, static const char *compose_format_str (char *buf, ssize_t buflen, char op, const char *src, const char *prefix, - const char *ifstring, - const char *elsestring, - unsigned long data, format_flag flags) + const char *ifstr, + const char *elstr, + anytype data, format_flag flags) { - char fmt[SHORT_STRING], tmp[SHORT_STRING]; + char fmt[STRING], tmp[STRING]; int optional = (flags & M_FORMAT_OPTIONAL); - MUTTMENU *menu = (MUTTMENU *) data; + MUTTMENU *menu = data.ptr; *buf = 0; switch (op) { @@ -429,7 +426,7 @@ static const char *compose_format_str (char *buf, ssize_t buflen, char op, case 'h': /* hostname */ snprintf (fmt, sizeof (fmt), "%%%ss", prefix); - snprintf (buf, buflen, fmt, NONULL (Hostname)); + snprintf (buf, buflen, fmt, NONULL(MCore.shorthost)); break; case 'l': /* approx length of current message in bytes */ @@ -439,7 +436,7 @@ static const char *compose_format_str (char *buf, ssize_t buflen, char op, break; case 'v': - m_strcpy(buf, buflen, mutt_make_version (0)); + m_strcpy(buf, buflen, mutt_make_version()); break; case 0: @@ -447,14 +444,12 @@ static const char *compose_format_str (char *buf, ssize_t buflen, char op, return (src); default: - snprintf (buf, buflen, "%%%s%c", prefix, op); + *buf = 0; break; } - if (optional) - compose_status_line (buf, buflen, menu, ifstring); - else if (flags & M_FORMAT_OPTIONAL) - compose_status_line (buf, buflen, menu, elsestring); + if (flags & M_FORMAT_OPTIONAL) + compose_status_line(buf, buflen, menu, optional ? ifstr : elstr); return (src); } @@ -462,9 +457,7 @@ static const char *compose_format_str (char *buf, ssize_t buflen, char op, static void compose_status_line (char *buf, ssize_t buflen, MUTTMENU * menu, const char *p) { - int w=(COLS-SW)>buflen?buflen:(COLS-SW); - mutt_FormatString (buf, w, p, compose_format_str, - (unsigned long) menu, 0); + m_strformat(buf, buflen, COLS - SW, p, compose_format_str, menu, 0); } /* return values: @@ -478,7 +471,7 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ ssize_t fcclen, HEADER * cur __attribute__ ((unused))) { /* current message */ - char helpstr[SHORT_STRING]; + char helpstr[STRING]; char buf[LONG_STRING]; char fname[_POSIX_PATH_MAX]; MUTTMENU *menu; @@ -654,8 +647,8 @@ 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 && !option (OPTEDITHDRS)) { - mutt_edit_file (Editor, msg->content->filename); + if (!option (OPTEDITHDRS)) { + mutt_edit_file(msg->content->filename); mutt_update_encoding (msg->content); menu->redraw = REDRAW_CURRENT | REDRAW_STATUS; mutt_message_hook (NULL, msg, M_SEND2HOOK); @@ -669,8 +662,7 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ char *err = NULL; mutt_env_to_local (msg->env); - mutt_edit_headers (NONULL (Editor), msg->content->filename, msg, - fcc, fcclen); + mutt_edit_headers(msg->content->filename, msg, fcc, fcclen); if (mutt_env_to_idna (msg->env, &tag, &err)) { mutt_error (_("Bad IDN in \"%s\": '%s'"), tag, err); p_delete(&err); @@ -692,35 +684,7 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ menu->redraw = REDRAW_FULL; mutt_message_hook (NULL, msg, M_SEND2HOOK); - break; - - - - case OP_COMPOSE_ATTACH_KEY: - if (idxlen == idxmax) { - p_realloc(&idx, idxmax += 5); - menu->data = idx; - } - - idx[idxlen] = p_new(ATTACHPTR, 1); - if ((idx[idxlen]->content = - crypt_pgp_make_key_attachment (NULL)) != NULL) { - update_idx (menu, idx, idxlen++); - menu->redraw |= REDRAW_INDEX; - } - else - p_delete(&idx[idxlen]); - - menu->redraw |= REDRAW_STATUS; - - if (option (OPTNEEDREDRAW)) { - menu->redraw = REDRAW_FULL; - unset_option (OPTNEEDREDRAW); - } - - mutt_message_hook (NULL, msg, M_SEND2HOOK); - break; - + break; case OP_COMPOSE_ATTACH_FILE: { @@ -1033,7 +997,7 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ case OP_COMPOSE_EDIT_FILE: CHECK_COUNT; - mutt_edit_file (NONULL (Editor), idx[menu->current]->content->filename); + mutt_edit_file(idx[menu->current]->content->filename); mutt_update_encoding (idx[menu->current]->content); menu->redraw = REDRAW_CURRENT | REDRAW_STATUS; mutt_message_hook (NULL, msg, M_SEND2HOOK); @@ -1241,20 +1205,7 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ r = 1; break; - case OP_COMPOSE_ISPELL: - endwin (); - snprintf (buf, sizeof (buf), "%s -x %s", NONULL (Ispell), - msg->content->filename); - if (mutt_system (buf) == -1) - mutt_error (_("Error running \"%s\"!"), buf); - else { - mutt_update_encoding (msg->content); - menu->redraw |= REDRAW_STATUS; - } - break; - case OP_COMPOSE_WRITE_MESSAGE: - fname[0] = '\0'; if (Context) { m_strcpy(fname, sizeof(fname), NONULL(Context->path)); @@ -1278,8 +1229,6 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ } break; - - case OP_COMPOSE_PGP_MENU: if (msg->security & APPLICATION_SMIME) { if (mutt_yesorno (_("S/MIME already selected. Clear & continue ? "), @@ -1289,17 +1238,11 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ } msg->security = 0; } - msg->security = crypt_pgp_send_menu (msg, &menu->redraw); + msg->security = crypt_send_menu (msg, &menu->redraw, 0); redraw_crypt_lines (msg); mutt_message_hook (NULL, msg, M_SEND2HOOK); break; - - case OP_FORGET_PASSPHRASE: - crypt_forget_passphrase (); - break; - - case OP_COMPOSE_SMIME_MENU: if (msg->security & APPLICATION_PGP) { if (mutt_yesorno (_("PGP already selected. Clear & continue ? "), @@ -1309,7 +1252,7 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ } msg->security = 0; } - msg->security = crypt_smime_send_menu (msg, &menu->redraw); + msg->security = crypt_send_menu(msg, &menu->redraw, 1); redraw_crypt_lines (msg); mutt_message_hook (NULL, msg, M_SEND2HOOK); break;