* please see the file GPL in the top level source directory.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/file.h>
-#include <lib-lib/mapping.h>
+#include <lib-lib/lib-lib.h>
+#include <lib-sys/unix.h>
#include <lib-mime/mime.h>
+#include <lib-crypt/crypt.h>
+
+#include <lib-ui/curses.h>
+#include <lib-ui/enter.h>
+#include <lib-ui/menu.h>
+#include <lib-mx/mx.h>
#include "mutt.h"
-#include "enter.h"
-#include "mutt_curses.h"
+#include "alias.h"
#include "mutt_idna.h"
-#include "mutt_menu.h"
-#include "rfc1524.h"
#include "attach.h"
#include "recvattach.h"
#include "sort.h"
#include "charset.h"
-#include "mx.h"
#include "buffy.h"
-#include "compose.h"
-
-#ifdef MIXMASTER
#include "remailer.h"
-#endif
#ifdef USE_NNTP
-#include "nntp.h"
+#include <nntp/nntp.h>
#endif
-
-#include <errno.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-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,
HDR_SUBJECT,
HDR_REPLYTO,
HDR_FCC,
-
-#ifdef MIXMASTER
HDR_MIX,
-#endif
HDR_CRYPT,
HDR_CRYPTINFO,
#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
-#ifdef MIXMASTER
- , ""
-#endif
- , "", "", "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 | (option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0));
}
-#include "mutt_crypt.h"
-
static void redraw_crypt_lines (HEADER * msg)
{
int off = 0;
}
}
-
-#ifdef MIXMASTER
-
-static void redraw_mix_line (LIST * chain)
+static void redraw_mix_line (string_list_t * chain)
{
int c;
const char *t;
c += m_strlen(t) + 2;
}
}
-#endif /* MIXMASTER */
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);
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, fcc);
redraw_crypt_lines (msg);
-
-#ifdef MIXMASTER
redraw_mix_line (msg->chain);
-#endif
SETCOLOR (MT_COLOR_STATUS);
mvaddstr (HDR_ATTACH - 1, SW, _("-- Attachments"));
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_delete (addr);
+ address_list_wipe(addr);
*addr = mutt_parse_adrlist (*addr, buf);
*addr = mutt_expand_aliases (*addr);
}
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++) {
idx[x]->content->next = NULL;
idx[x]->content->parts = NULL;
- mutt_free_body (&(idx[x]->content));
+ body_list_wipe(&(idx[x]->content));
p_delete(&idx[x]->tree);
p_delete(&idx[x]);
for (; x < *idxlen - 1; x++)
}
-/*
+/*
* 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)
{
- size_t s;
+ ssize_t s;
unsigned short i;
ATTACHPTR **idx = menu->data;
CONTENT *info;
/*
* 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, size_t buflen, char op,
+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) {
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
*/
int mutt_compose_menu (HEADER * msg, /* structure for new message */
char *fcc, /* where to save a copy of the message */
- size_t fcclen, HEADER * cur)
+ 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);
mutt_message_hook (NULL, msg, M_SEND2HOOK);
break;
case OP_COMPOSE_EDIT_MESSAGE:
- if (Editor && (m_strcmp("builtin", Editor) != 0)
- && !option (OPTEDITHDRS)) {
+ if (Editor && !option (OPTEDITHDRS)) {
mutt_edit_file (Editor, msg->content->filename);
mutt_update_encoding (msg->content);
menu->redraw = REDRAW_CURRENT | REDRAW_STATUS;
}
/* fall through */
case OP_COMPOSE_EDIT_HEADERS:
- if (m_strcmp("builtin", Editor) != 0 &&
- (op == OP_COMPOSE_EDIT_HEADERS ||
+ if ((op == OP_COMPOSE_EDIT_HEADERS ||
(op == OP_COMPOSE_EDIT_MESSAGE && option (OPTEDITHDRS)))) {
const char *tag = NULL;
- const char *err = NULL;
+ char *err = NULL;
mutt_env_to_local (msg->env);
mutt_edit_headers (NONULL (Editor), msg->content->filename, msg,
p_delete(&err);
}
}
- else {
- /* this is grouped with OP_COMPOSE_EDIT_HEADERS because the
- attachment list could change if the user invokes ~v to edit
- the message with headers, in which we need to execute the
- code below to regenerate the index array */
- mutt_builtin_editor (msg->content->filename, msg, cur);
- }
mutt_update_encoding (msg->content);
/* attachments may have been added */
menu->redraw = REDRAW_FULL;
mutt_message_hook (NULL, msg, M_SEND2HOOK);
- break;
-
-
+ break;
case OP_COMPOSE_ATTACH_KEY:
if (idxlen == idxmax) {
}
mutt_message_hook (NULL, msg, M_SEND2HOOK);
- break;
-
+ break;
case OP_COMPOSE_ATTACH_FILE:
{
else
#endif
mutt_expand_path (fname, sizeof (fname));
-#ifdef USE_IMAP
if (mx_get_magic (fname) != M_IMAP)
-#endif
if (mx_get_magic (fname) != M_POP)
#ifdef USE_NNTP
if (mx_get_magic (fname) != M_NNTP && !option (OPTNEWS))
break;
}
-
-#ifdef MIXMASTER
if (msg->chain && mix_check_message (msg) != 0)
break;
-#endif
if (!fccSet && *fcc) {
if ((i = query_quadoption (OPT_COPY,
idx[menu->current]->content->unlink =
!idx[menu->current]->content->unlink;
-#if 0
- /* OPTRESOLVE is otherwise ignored on this menu.
- * Where's the bug?
- */
-
- if (option (OPTRESOLVE) && menu->current + 1 < menu->max)
- menu->current++;
-# endif
menu->redraw = REDRAW_INDEX;
/* No send2hook since this doesn't change the message. */
break;
p_delete(&idx[idxlen]);
continue;
}
- fclose (fp);
+ m_fclose(&fp);
if ((idx[idxlen]->content = mutt_make_file_attach (fname)) == NULL) {
mutt_error
idx[idxlen]->content->parts = NULL;
if (idx[idxlen]->unowned)
idx[idxlen]->content->unlink = 0;
- mutt_free_body (&idx[idxlen]->content);
+ body_list_wipe(&idx[idxlen]->content);
p_delete(&idx[idxlen]->tree);
p_delete(&idx[idxlen]);
}
}
break;
-
-
case OP_COMPOSE_PGP_MENU:
if (msg->security & APPLICATION_SMIME) {
if (mutt_yesorno (_("S/MIME already selected. Clear & continue ? "),
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 ? "),
mutt_message_hook (NULL, msg, M_SEND2HOOK);
break;
-
-#ifdef MIXMASTER
case OP_COMPOSE_MIX:
-
mix_make_chain (&msg->chain, &menu->redraw);
mutt_message_hook (NULL, msg, M_SEND2HOOK);
break;
-#endif
-
}
/* Draw formated compose status line */
idx[i]->content->aptr = NULL;
p_delete(&idx[i]);
}
- }
- else
+ } else {
msg->content = NULL;
+ }
p_delete(&idx);
projects / apps / madmutt.git / blobdiff