* please see the file GPL in the top level source directory.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <lib-lib/lib-lib.h>
-#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-sys/unix.h>
#include <lib-mime/mime.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; }
M_FORMAT_STAT_FILE | M_FORMAT_ARROWCURSOR);
}
-#include "mutt_crypt.h"
+#include <lib-crypt/crypt.h>
static void redraw_crypt_lines (HEADER * msg)
{
int off = 0;
- if ((WithCrypto & APPLICATION_PGP) && (WithCrypto & APPLICATION_SMIME)) {
- if (!msg->security)
- mvaddstr (HDR_CRYPT, SW, " Security: ");
- else if (msg->security & APPLICATION_SMIME)
- mvaddstr (HDR_CRYPT, SW, " S/MIME: ");
- else if (msg->security & APPLICATION_PGP)
- mvaddstr (HDR_CRYPT, SW, " PGP: ");
- }
- else if ((WithCrypto & APPLICATION_SMIME))
+ if (!msg->security)
+ mvaddstr (HDR_CRYPT, SW, " Security: ");
+ else if (msg->security & APPLICATION_SMIME)
mvaddstr (HDR_CRYPT, SW, " S/MIME: ");
- else if ((WithCrypto & APPLICATION_PGP))
+ else if (msg->security & APPLICATION_PGP)
mvaddstr (HDR_CRYPT, SW, " PGP: ");
- else
- return;
if ((msg->security & (ENCRYPT | SIGN)) == (ENCRYPT | SIGN))
addstr (_("Sign, Encrypt"));
else
addstr (_("Clear"));
- if ((WithCrypto & APPLICATION_PGP))
- if ((msg->security & APPLICATION_PGP)
- && (msg->security & (ENCRYPT | SIGN))) {
- if ((msg->security & INLINE))
- addstr (_(" (inline)"));
- else
- addstr (_(" (PGP/MIME)"));
- }
+ if ((msg->security & APPLICATION_PGP)
+ && (msg->security & (ENCRYPT | SIGN))) {
+ if ((msg->security & INLINE))
+ addstr (_(" (inline)"));
+ else
+ addstr (_(" (PGP/MIME)"));
+ }
clrtoeol ();
move (HDR_CRYPTINFO, SW);
clrtoeol ();
- if ((WithCrypto & APPLICATION_PGP)
- && msg->security & APPLICATION_PGP && msg->security & SIGN)
+ if (msg->security & APPLICATION_PGP && msg->security & SIGN)
printw ("%s%s", _(" sign as: "),
PgpSignAs ? PgpSignAs : _("<default>"));
- if ((WithCrypto & APPLICATION_SMIME)
- && msg->security & APPLICATION_SMIME && msg->security & SIGN) {
+ if (msg->security & APPLICATION_SMIME && msg->security & SIGN) {
printw ("%s%s", _(" sign as: "),
SmimeDefaultKey ? SmimeDefaultKey : _("<default>"));
}
- if ((WithCrypto & APPLICATION_SMIME)
- && (msg->security & APPLICATION_SMIME)
+ if ((msg->security & APPLICATION_SMIME)
&& (msg->security & ENCRYPT)
&& SmimeCryptAlg && *SmimeCryptAlg) {
mvprintw (HDR_CRYPTINFO, SW + 40, "%s%s", _("Encrypt with: "),
#ifdef MIXMASTER
-static void redraw_mix_line (LIST * chain)
+static void redraw_mix_line (string_list_t * chain)
{
int c;
const char *t;
mvprintw (HDR_FCC, SW, TITLE_FMT, Prompts[HDR_FCC - 1]);
mutt_paddstr (W, fcc);
- if (WithCrypto)
- redraw_crypt_lines (msg);
+ redraw_crypt_lines (msg);
#ifdef MIXMASTER
redraw_mix_line (msg->chain);
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) {
- address_delete (addr);
+ address_list_wipe(addr);
*addr = mutt_parse_adrlist (*addr, buf);
*addr = mutt_expand_aliases (*addr);
}
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++)
static unsigned long cum_attachs_size (MUTTMENU * menu)
{
- size_t s;
+ ssize_t s;
unsigned short i;
ATTACHPTR **idx = menu->data;
CONTENT *info;
* help when modifying this function.
*/
-static const char *compose_format_str (char *buf, size_t buflen, char op,
+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,
*/
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 buf[LONG_STRING];
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 */
case OP_COMPOSE_ATTACH_KEY:
- if (!(WithCrypto & APPLICATION_PGP))
- break;
if (idxlen == idxmax) {
p_realloc(&idx, idxmax += 5);
menu->data = idx;
else
#endif
mutt_expand_path (fname, sizeof (fname));
-#ifdef USE_IMAP
if (mx_get_magic (fname) != M_IMAP)
-#endif
-#ifdef USE_POP
if (mx_get_magic (fname) != M_POP)
-#endif
#ifdef USE_NNTP
if (mx_get_magic (fname) != M_NNTP && !option (OPTNEWS))
#endif
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]);
}
case OP_COMPOSE_PGP_MENU:
- if (!(WithCrypto & APPLICATION_PGP))
- break;
- if ((WithCrypto & APPLICATION_SMIME)
- && msg->security & APPLICATION_SMIME) {
+ if (msg->security & APPLICATION_SMIME) {
if (mutt_yesorno (_("S/MIME already selected. Clear & continue ? "),
M_YES) != M_YES) {
mutt_clear_error ();
case OP_COMPOSE_SMIME_MENU:
- if (!(WithCrypto & APPLICATION_SMIME))
- break;
-
- if ((WithCrypto & APPLICATION_PGP)
- && msg->security & APPLICATION_PGP) {
+ if (msg->security & APPLICATION_PGP) {
if (mutt_yesorno (_("PGP already selected. Clear & continue ? "),
M_YES) != M_YES) {
mutt_clear_error ();
projects / apps / madmutt.git / blobdiff