# include "config.h"
#endif
+#include <errno.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
+#include <unistd.h>
+#include <stdlib.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 "mutt.h"
-#include "enter.h"
-#include "mutt_curses.h"
#include "mutt_idna.h"
-#include "mutt_menu.h"
#include "rfc1524.h"
#include "attach.h"
#include "recvattach.h"
#include "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; }
};
#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]),
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;
return 0;
}
-static void draw_envelope_addr (int line, ADDRESS * addr)
+static void draw_envelope_addr (int line, address_t * addr)
{
char buf[STRING];
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);
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;
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_list_wipe(addr);
*addr = mutt_parse_adrlist (*addr, buf);
*addr = mutt_expand_aliases (*addr);
}
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);
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;
if (mutt_get_field ("Newsgroups: ", buf, sizeof (buf), 0) == 0
&& buf[0]) {
p_delete(&msg->env->newsgroups);
- str_skip_trailws (buf);
- msg->env->newsgroups = m_strdup(vskipspaces(buf));
+ m_strrtrim(buf);
+ msg->env->newsgroups = m_strdup(skipspaces(buf));
move (HDR_TO, HDR_XOFFSET);
clrtoeol ();
if (msg->env->newsgroups)
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 = m_strdup(vskipspaces(buf));
+ m_strrtrim(buf);
+ msg->env->followup_to = m_strdup(skipspaces(buf));
move (HDR_CC, HDR_XOFFSET);
clrtoeol ();
if (msg->env->followup_to)
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)
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;
- char *err = NULL;
+ const 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
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) {
}
menu->redraw |= REDRAW_FULL;
- if (close == OP_QUIT)
+ if (closed == OP_QUIT)
mx_close_mailbox (Context, NULL);
else
mx_fastclose_mailbox (Context);
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);
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)
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;
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 ();