#include <lib-lib/lib-lib.h>
#include <lib-sys/unix.h>
-
#include <lib-mime/mime.h>
#include <lib-ui/curses.h>
#include "mutt.h"
#include "alias.h"
+#include "crypt.h"
#include "mutt_idna.h"
#include "attach.h"
#include "recvattach.h"
#include <nntp/nntp.h>
#endif
-static const char *There_are_no_attachments = N_("There are no attachments.");
-
-#define CHECK_COUNT if (idxlen == 0) { mutt_error _(There_are_no_attachments); break; }
-
-
+#define CHECK_COUNT \
+ if (idxlen == 0) { \
+ mutt_error _("There are no attachments."); \
+ break; \
+ }
enum {
HDR_FROM = 1,
#define W (COLS - HDR_XOFFSET - SW)
static const char *Prompts[] = {
- "From: ",
- "To: ",
- "Cc: ",
- "Bcc: ",
- "Subject: ",
- "Reply-To: ",
- "Fcc: ",
+ "From: ",
+ "To: ",
+ "Cc: ",
+ "Bcc: ",
+ "Subject: ",
+ "Reply-To: ",
+ "Fcc: ",
#ifdef USE_NNTP
- "",
- "", "", "Newsgroups: ", "Followup-To: ", "X-Comment-To: "
+ "", "", "", "Newsgroups: ", "Followup-To: ", "X-Comment-To: "
#endif
};
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);
}
-#include <lib-crypt/crypt.h>
-
static void redraw_crypt_lines (HEADER * msg)
{
int off = 0;
{
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);
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);
}
draw_envelope_addr (HDR_CC, msg->env->cc);
draw_envelope_addr (HDR_BCC, msg->env->bcc);
#ifdef USE_NNTP
- }
- else {
+ } else {
mvprintw (HDR_TO, SW, TITLE_FMT, Prompts[HDR_NEWSGROUPS - 1]);
mutt_paddstr (W, NONULL (msg->env->newsgroups));
mvprintw (HDR_CC, SW, TITLE_FMT, Prompts[HDR_FOLLOWUPTO - 1]);
mutt_paddstr (W, NONULL (msg->env->followup_to));
- if (option (OPTXCOMMENTTO)) {
- mvprintw (HDR_BCC, 0, TITLE_FMT, Prompts[HDR_XCOMMENTTO - 1]);
- mutt_paddstr (W, NONULL (msg->env->x_comment_to));
- }
}
#endif
mvprintw (HDR_SUBJECT, SW, TITLE_FMT, Prompts[HDR_SUBJECT - 1]);
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);
if (option (OPTNEEDREDRAW)) {
unset_option (OPTNEEDREDRAW);
- return (REDRAW_FULL);
+ return REDRAW_FULL;
}
if (mutt_addrlist_to_idna (*addr, &err) != 0) {
/* 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);
mutt_error _("You may not delete the only attachment.");
idx[x]->content->tagged = 0;
- return (-1);
+ return -1;
}
for (y = 0; y < *idxlen; y++) {
}
-/*
+/*
* cum_attachs_size: Cumulative Attachments Size
*
* Returns the total number of bytes used by the attachments in the
* attachment list _after_ content-transfer-encodings have been
* applied.
- *
+ *
*/
-
-static unsigned long cum_attachs_size (MUTTMENU * menu)
+static unsigned long cum_attachs_size(MUTTMENU * menu)
{
ssize_t s;
unsigned short i;
/*
* compose_format_str()
*
- * %a = total number of attachments
+ * %a = total number of attachments
* %h = hostname [option]
- * %l = approx. length of current message (in bytes)
- * %v = Mutt version
+ * %l = approx. length of current message (in bytes)
+ * %v = Mutt version
*
* This function is similar to status_format_str(). Look at that function for
* help when modifying this function.
*/
-
static void compose_status_line (char *buf, ssize_t buflen, MUTTMENU * menu,
const char *p);
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) {
case 'h': /* hostname */
snprintf (fmt, sizeof (fmt), "%%%ss", prefix);
- snprintf (buf, buflen, fmt, NONULL (Hostname));
+ snprintf (buf, buflen, fmt, NONULL(mod_core.shorthost));
break;
case 'l': /* approx length of current message in bytes */
break;
case 'v':
- m_strcpy(buf, buflen, mutt_make_version (0));
+ m_strcpy(buf, buflen, mutt_make_version());
break;
case 0:
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);
}
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:
*
* 1 message should be postponed
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;
menu->data = idx;
#ifdef USE_NNTP
if (news)
- menu->help =
- mutt_compile_help (helpstr, sizeof (helpstr), MENU_COMPOSE,
- ComposeNewsHelp);
+ menu->help = mutt_compile_help(helpstr, sizeof(helpstr), MENU_COMPOSE,
+ ComposeNewsHelp);
else
#endif
- menu->help =
- mutt_compile_help (helpstr, sizeof (helpstr), MENU_COMPOSE,
- ComposeHelp);
+ menu->help = mutt_compile_help(helpstr, sizeof(helpstr), MENU_COMPOSE,
+ ComposeHelp);
if (option (OPTMBOXPANE))
buffy_check (0);
}
break;
- case OP_COMPOSE_EDIT_X_COMMENT_TO:
- if (news && option (OPTXCOMMENTTO)) {
- buf[0] = 0;
- if (msg->env->x_comment_to)
- 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 = m_strdup(buf);
- move (HDR_BCC, HDR_XOFFSET);
- clrtoeol ();
- if (msg->env->x_comment_to)
- printw ("%-*.*s", W, W, msg->env->x_comment_to);
- }
- }
- break;
#endif
case OP_COMPOSE_EDIT_SUBJECT:
if (msg->env->subject)
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);
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);
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:
{
- char *prompt, **files;
+ const char *prompt;
+ char **files;
int error, numfiles;
fname[0] = 0;
case OP_COMPOSE_ATTACH_NEWS_MESSAGE:
#endif
{
- char *prompt;
+ const char *prompt;
HEADER *h;
fname[0] = 0;
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);
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));
}
break;
-
-
case OP_COMPOSE_PGP_MENU:
if (msg->security & APPLICATION_SMIME) {
if (mutt_yesorno (_("S/MIME already selected. Clear & continue ? "),
}
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 ? "),
}
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;
idx[i]->content->aptr = NULL;
p_delete(&idx[i]);
}
- }
- else
+ } else {
msg->content = NULL;
+ }
p_delete(&idx);
projects / apps / madmutt.git / blobdiff