projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
let m_strformat accept NULL formats.
[apps/madmutt.git]
/
compose.c
diff --git
a/compose.c
b/compose.c
index
d93dbfd
..
52907b6
100644
(file)
--- a/
compose.c
+++ b/
compose.c
@@
-11,26
+11,16
@@
* please see the file GPL in the top level source directory.
*/
* please see the file GPL in the top level source directory.
*/
-#if HAVE_CONFIG_H
-# 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/lib-lib.h>
#include <lib-sys/unix.h>
#include <lib-lib/lib-lib.h>
#include <lib-sys/unix.h>
-
#include <lib-mime/mime.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-ui/curses.h>
#include <lib-ui/enter.h>
#include <lib-ui/menu.h>
+#include <lib-mx/mx.h>
#include "mutt.h"
#include "alias.h"
#include "mutt.h"
#include "alias.h"
@@
-39,23
+29,18
@@
#include "recvattach.h"
#include "sort.h"
#include "charset.h"
#include "recvattach.h"
#include "sort.h"
#include "charset.h"
-#include "mx.h"
#include "buffy.h"
#include "buffy.h"
-#include "compose.h"
-
-#ifdef MIXMASTER
#include "remailer.h"
#include "remailer.h"
-#endif
#ifdef USE_NNTP
#ifdef USE_NNTP
-#include
"nntp.h"
+#include
<nntp/nntp.h>
#endif
#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,
enum {
HDR_FROM = 1,
@@
-65,10
+50,7
@@
enum {
HDR_SUBJECT,
HDR_REPLYTO,
HDR_FCC,
HDR_SUBJECT,
HDR_REPLYTO,
HDR_FCC,
-
-#ifdef MIXMASTER
HDR_MIX,
HDR_MIX,
-#endif
HDR_CRYPT,
HDR_CRYPTINFO,
HDR_CRYPT,
HDR_CRYPTINFO,
@@
-92,18
+74,15
@@
enum {
#define W (COLS - HDR_XOFFSET - SW)
static const char *Prompts[] = {
#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 USE_NNTP
-#ifdef MIXMASTER
- , ""
-#endif
- , "", "", "Newsgroups: ", "Followup-To: ", "X-Comment-To: "
+ "", "", "", "Newsgroups: ", "Followup-To: ", "X-Comment-To: "
#endif
};
#endif
};
@@
-134,13
+113,12
@@
static struct mapping_t ComposeNewsHelp[] = {
static void snd_entry (char *b, ssize_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);
-}
+ int w = MIN(COLS-SW, blen);
-#include <lib-crypt/crypt.h>
+ m_strformat(b, w, AttachFormat, mutt_attach_fmt,
+ ((ATTACHPTR **)menu->data)[num],
+ M_FORMAT_STAT_FILE | (option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0));
+}
static void redraw_crypt_lines (HEADER * msg)
{
static void redraw_crypt_lines (HEADER * msg)
{
@@
-191,9
+169,6
@@
static void redraw_crypt_lines (HEADER * msg)
}
}
}
}
-
-#ifdef MIXMASTER
-
static void redraw_mix_line (string_list_t * chain)
{
int c;
static void redraw_mix_line (string_list_t * chain)
{
int c;
@@
-222,13
+197,12
@@
static void redraw_mix_line (string_list_t * chain)
c += m_strlen(t) + 2;
}
}
c += m_strlen(t) + 2;
}
}
-#endif /* MIXMASTER */
static int check_attachments (ATTACHPTR ** idx, short idxlen)
{
int i, r;
struct stat st;
static int check_attachments (ATTACHPTR ** idx, short idxlen)
{
int i, r;
struct stat st;
- char pretty[_POSIX_PATH_MAX], msg[_POSIX_PATH_MAX + S
HORT_S
TRING];
+ 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);
for (i = 0; i < idxlen; i++) {
m_strcpy(pretty, sizeof(pretty), idx[i]->content->filename);
@@
-258,7
+232,7
@@
static void draw_envelope_addr (int line, address_t * addr)
char buf[STRING];
buf[0] = 0;
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);
}
mvprintw (line, SW, TITLE_FMT, Prompts[line - 1]);
mutt_paddstr (W, buf);
}
@@
-273,8
+247,7
@@
static void draw_envelope (HEADER * msg, char *fcc)
draw_envelope_addr (HDR_CC, msg->env->cc);
draw_envelope_addr (HDR_BCC, msg->env->bcc);
#ifdef USE_NNTP
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]);
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]);
@@
-292,10
+265,7
@@
static void draw_envelope (HEADER * msg, char *fcc)
mutt_paddstr (W, fcc);
redraw_crypt_lines (msg);
mutt_paddstr (W, fcc);
redraw_crypt_lines (msg);
-
-#ifdef MIXMASTER
redraw_mix_line (msg->chain);
redraw_mix_line (msg->chain);
-#endif
SETCOLOR (MT_COLOR_STATUS);
mvaddstr (HDR_ATTACH - 1, SW, _("-- Attachments"));
SETCOLOR (MT_COLOR_STATUS);
mvaddstr (HDR_ATTACH - 1, SW, _("-- Attachments"));
@@
-312,7
+282,7
@@
static int edit_address_list (int line, address_t ** addr)
char *err = NULL;
mutt_addrlist_to_local (*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);
if (mutt_get_field (Prompts[line - 1], buf, sizeof (buf), M_ALIAS) == 0) {
address_list_wipe(addr);
*addr = mutt_parse_adrlist (*addr, buf);
@@
-321,7
+291,7
@@
static int edit_address_list (int line, address_t ** addr)
if (option (OPTNEEDREDRAW)) {
unset_option (OPTNEEDREDRAW);
if (option (OPTNEEDREDRAW)) {
unset_option (OPTNEEDREDRAW);
- return
(REDRAW_FULL)
;
+ return
REDRAW_FULL
;
}
if (mutt_addrlist_to_idna (*addr, &err) != 0) {
}
if (mutt_addrlist_to_idna (*addr, &err) != 0) {
@@
-332,7
+302,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;
/* 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);
move (line, HDR_XOFFSET + SW);
mutt_paddstr (W, buf);
@@
-350,7
+320,7
@@
static int delete_attachment (MUTTMENU * menu, short *idxlen, int x)
mutt_error _("You may not delete the only attachment.");
idx[x]->content->tagged = 0;
mutt_error _("You may not delete the only attachment.");
idx[x]->content->tagged = 0;
- return
(-1)
;
+ return
-1
;
}
for (y = 0; y < *idxlen; y++) {
}
for (y = 0; y < *idxlen; y++) {
@@
-385,16
+355,15
@@
static void update_idx (MUTTMENU * menu, ATTACHPTR ** idx, short idxlen)
}
}
-/*
+/*
* 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.
* 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;
{
ssize_t s;
unsigned short i;
@@
-429,24
+398,26
@@
static unsigned long cum_attachs_size (MUTTMENU * menu)
/*
* compose_format_str()
*
/*
* compose_format_str()
*
- * %a = total number of attachments
+ * %a = total number of attachments
* %h = hostname [option]
* %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.
*/
*
* 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,
static const char *compose_format_str (char *buf, ssize_t buflen, char op,
const char *src, const char *prefix,
- const char *ifstr
ing
,
- const char *els
estring
,
-
unsigned long
data, format_flag flags)
+ const char *ifstr,
+ const char *els
tr
,
+
anytype
data, format_flag flags)
{
{
- char fmt[S
HORT_STRING], tmp[SHORT_
STRING];
+ char fmt[S
TRING], tmp[
STRING];
int optional = (flags & M_FORMAT_OPTIONAL);
int optional = (flags & M_FORMAT_OPTIONAL);
- MUTTMENU *menu =
(MUTTMENU *) data
;
+ MUTTMENU *menu =
data.ptr
;
*buf = 0;
switch (op) {
*buf = 0;
switch (op) {
@@
-475,14
+446,14
@@
static const char *compose_format_str (char *buf, ssize_t buflen, char op,
return (src);
default:
return (src);
default:
-
snprintf (buf, buflen, "%%%s%c", prefix, op)
;
+
*buf = 0
;
break;
}
if (optional)
break;
}
if (optional)
- compose_status_line (buf, buflen, menu, ifstr
ing
);
+ compose_status_line (buf, buflen, menu, ifstr);
else if (flags & M_FORMAT_OPTIONAL)
else if (flags & M_FORMAT_OPTIONAL)
- compose_status_line (buf, buflen, menu, els
estring
);
+ compose_status_line (buf, buflen, menu, els
tr
);
return (src);
}
return (src);
}
@@
-490,12
+461,10
@@
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)
{
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);
+ int w = MIN(COLS - SW, buflen);
+ m_strformat(buf, w, p, compose_format_str, menu, 0);
}
}
-
/* return values:
*
* 1 message should be postponed
/* return values:
*
* 1 message should be postponed
@@
-507,7
+476,7
@@
int mutt_compose_menu (HEADER * msg, /* structure for new message */
ssize_t fcclen,
HEADER * cur __attribute__ ((unused)))
{ /* current message */
ssize_t fcclen,
HEADER * cur __attribute__ ((unused)))
{ /* current message */
- char helpstr[S
HORT_S
TRING];
+ char helpstr[STRING];
char buf[LONG_STRING];
char fname[_POSIX_PATH_MAX];
MUTTMENU *menu;
char buf[LONG_STRING];
char fname[_POSIX_PATH_MAX];
MUTTMENU *menu;
@@
-544,14
+513,12
@@
int mutt_compose_menu (HEADER * msg, /* structure for new message */
menu->data = idx;
#ifdef USE_NNTP
if (news)
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
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);
if (option (OPTMBOXPANE))
buffy_check (0);
@@
-723,9
+690,7
@@
int mutt_compose_menu (HEADER * msg, /* structure for new message */
menu->redraw = REDRAW_FULL;
mutt_message_hook (NULL, msg, M_SEND2HOOK);
menu->redraw = REDRAW_FULL;
mutt_message_hook (NULL, msg, M_SEND2HOOK);
- break;
-
-
+ break;
case OP_COMPOSE_ATTACH_KEY:
if (idxlen == idxmax) {
case OP_COMPOSE_ATTACH_KEY:
if (idxlen == idxmax) {
@@
-750,8
+715,7
@@
int mutt_compose_menu (HEADER * msg, /* structure for new message */
}
mutt_message_hook (NULL, msg, M_SEND2HOOK);
}
mutt_message_hook (NULL, msg, M_SEND2HOOK);
- break;
-
+ break;
case OP_COMPOSE_ATTACH_FILE:
{
case OP_COMPOSE_ATTACH_FILE:
{
@@
-1047,11
+1011,8
@@
int mutt_compose_menu (HEADER * msg, /* structure for new message */
break;
}
break;
}
-
-#ifdef MIXMASTER
if (msg->chain && mix_check_message (msg) != 0)
break;
if (msg->chain && mix_check_message (msg) != 0)
break;
-#endif
if (!fccSet && *fcc) {
if ((i = query_quadoption (OPT_COPY,
if (!fccSet && *fcc) {
if ((i = query_quadoption (OPT_COPY,
@@
-1078,14
+1039,6
@@
int mutt_compose_menu (HEADER * msg, /* structure for new message */
idx[menu->current]->content->unlink =
!idx[menu->current]->content->unlink;
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;
menu->redraw = REDRAW_INDEX;
/* No send2hook since this doesn't change the message. */
break;
@@
-1174,7
+1127,7
@@
int mutt_compose_menu (HEADER * msg, /* structure for new message */
p_delete(&idx[idxlen]);
continue;
}
p_delete(&idx[idxlen]);
continue;
}
-
fclose (
fp);
+
m_fclose(&
fp);
if ((idx[idxlen]->content = mutt_make_file_attach (fname)) == NULL) {
mutt_error
if ((idx[idxlen]->content = mutt_make_file_attach (fname)) == NULL) {
mutt_error
@@
-1320,8
+1273,6
@@
int mutt_compose_menu (HEADER * msg, /* structure for new message */
}
break;
}
break;
-
-
case OP_COMPOSE_PGP_MENU:
if (msg->security & APPLICATION_SMIME) {
if (mutt_yesorno (_("S/MIME already selected. Clear & continue ? "),
case OP_COMPOSE_PGP_MENU:
if (msg->security & APPLICATION_SMIME) {
if (mutt_yesorno (_("S/MIME already selected. Clear & continue ? "),
@@
-1336,12
+1287,10
@@
int mutt_compose_menu (HEADER * msg, /* structure for new message */
mutt_message_hook (NULL, msg, M_SEND2HOOK);
break;
mutt_message_hook (NULL, msg, M_SEND2HOOK);
break;
-
case OP_FORGET_PASSPHRASE:
crypt_forget_passphrase ();
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 ? "),
case OP_COMPOSE_SMIME_MENU:
if (msg->security & APPLICATION_PGP) {
if (mutt_yesorno (_("PGP already selected. Clear & continue ? "),
@@
-1356,15
+1305,10
@@
int mutt_compose_menu (HEADER * msg, /* structure for new message */
mutt_message_hook (NULL, msg, M_SEND2HOOK);
break;
mutt_message_hook (NULL, msg, M_SEND2HOOK);
break;
-
-#ifdef MIXMASTER
case OP_COMPOSE_MIX:
case OP_COMPOSE_MIX:
-
mix_make_chain (&msg->chain, &menu->redraw);
mutt_message_hook (NULL, msg, M_SEND2HOOK);
break;
mix_make_chain (&msg->chain, &menu->redraw);
mutt_message_hook (NULL, msg, M_SEND2HOOK);
break;
-#endif
-
}
/* Draw formated compose status line */
}
/* Draw formated compose status line */
@@
-1387,9
+1331,9
@@
int mutt_compose_menu (HEADER * msg, /* structure for new message */
idx[i]->content->aptr = NULL;
p_delete(&idx[i]);
}
idx[i]->content->aptr = NULL;
p_delete(&idx[i]);
}
- }
- else
+ } else {
msg->content = NULL;
msg->content = NULL;
+ }
p_delete(&idx);
p_delete(&idx);