#include <lib-sys/exit.h>
#include <lib-sys/mutt_signal.h>
#include <lib-mime/mime.h>
-#include <lib-ui/curses.h>
+#include <lib-ui/enter.h>
+#include <lib-ui/lib-ui.h>
#include <lib-mx/mx.h>
#include "mutt.h"
#include "pager.h"
#include "charset.h"
#include "mutt_idna.h"
-#include "mutt_libesmtp.h"
#ifdef USE_NNTP
-#include <nntp/nntp.h>
+#include "nntp.h"
#endif
#ifdef HAVE_SYSEXITS_H
int ncodes, const char **tocodes,
int *tocode, CONTENT * info)
{
-#ifdef HAVE_ICONV
iconv_t cd1, *cd;
char bufi[256], bufu[512], bufo[4 * sizeof (bufi)];
const char *ib, *ub;
p_delete(&states);
return ret;
-#else
- return -1;
-#endif /* !HAVE_ICONV */
}
/*
if (b != NULL && b->type == TYPETEXT && (!b->noconv && !b->force_charset)) {
const char *chs = parameter_getval(b->parameter, "charset");
- char *fchs = b->use_disp && !m_strisempty(MCharset.file_charset)
- ? FileCharset : MCharset.charset;
- if (MCharset.charset && (chs || MCharset.send_charset) &&
- convert_file_from_to (fp, fchs, chs ? chs : MCharset.send_charset,
+ char *fchs = b->use_disp && !m_strisempty(mod_cset.file_charset)
+ ? FileCharset : mod_cset.charset;
+ if (mod_cset.charset && (chs || mod_cset.send_charset) &&
+ convert_file_from_to (fp, fchs, chs ? chs : mod_cset.send_charset,
&fromcode, &tocode, info) != -1) {
if (!chs) {
charset_canonicalize (chsbuf, sizeof (chsbuf), tocode);
if (b != NULL && b->type == TYPETEXT && (!b->noconv && !b->force_charset))
parameter_setval(&b->parameter, "charset",
(!info->hibin ? "us-ascii"
- : MCharset.charset && !charset_is_us_ascii(MCharset.charset)
- ? MCharset.charset : "unknown-8bit"));
+ : mod_cset.charset && !charset_is_us_ascii(mod_cset.charset)
+ ? mod_cset.charset : "unknown-8bit"));
return info;
}
*/
switch (count) {
case 0:
- snprintf(buf, sizeof (buf), "%s/.mime.types", NONULL(MCore.homedir));
+ snprintf(buf, sizeof (buf), "%s/.mime.types", NONULL(mod_core.homedir));
break;
case 1:
m_strcpy(buf, sizeof(buf), SYSCONFDIR "/madmutt-mime.types");
a->length = sb.st_size;
}
- fpout = m_tempfile(temp, sizeof(temp), NONULL(MCore.tmpdir), NULL);
+ fpout = m_tempfile(temp, sizeof(temp), NONULL(mod_core.tmpdir), NULL);
if (!fpout) {
mutt_error(_("Could not create temporary file"));
goto cleanup;
a->noconv = 1;
a->force_charset = 1;
- s.fpout = m_tempfile(buff, sizeof(buff), NONULL(MCore.tmpdir), NULL);
+ s.fpout = m_tempfile(buff, sizeof(buff), NONULL(mod_core.tmpdir), NULL);
if (!s.fpout) {
mutt_error(_("Could not create temporary file"));
return;
(hdr->security & ENCRYPT)) {
}
- fp = m_tempfile(buffer, sizeof(buffer), NONULL(MCore.tmpdir), NULL);
+ fp = m_tempfile(buffer, sizeof(buffer), NONULL(mod_core.tmpdir), NULL);
if (!fp)
return NULL;
* mode == 1 => "lite" mode (used for edit_hdrs)
* mode == 0 => normal mode. write full header + MIME headers
* mode == -1 => write just the envelope info (used for postponing messages)
- *
- * privacy != 0 => will omit any headers which may identify the user.
- * Output generated is suitable for being sent through
- * anonymous remailer chains.
- *
*/
int mutt_write_rfc822_header (FILE * fp, ENVELOPE * env, BODY * attach,
- int mode, int privacy)
+ int mode)
{
char buffer[LONG_STRING];
char *p;
#ifdef USE_NNTP
if (!option (OPTNEWSSEND))
#endif
- if (mode == 0 && !privacy)
+ if (mode == 0)
fputs (mutt_make_date (buffer, sizeof (buffer)), fp);
/* OPTUSEFROM is not consulted here so that we can still write a From:
* field if the user sets it with the `my_hdr' command
*/
- if (env->from && !privacy) {
+ if (env->from) {
buffer[0] = 0;
rfc822_addrcat(buffer, sizeof(buffer), env->from, 0);
fprintf (fp, "From: %s\n", buffer);
fprintf (fp, "Followup-To: %s\n", env->followup_to);
else if (mode == 1 && option (OPTNEWSSEND) && edit_header(mode, "Followup-To:"))
fputs ("Followup-To:\n", fp);
-
- if (env->x_comment_to)
- fprintf (fp, "X-Comment-To: %s\n", env->x_comment_to);
- else if (mode == 1 && option (OPTNEWSSEND) && option (OPTXCOMMENTTO) &&
- edit_header(mode, "X-Comment-To:"))
- fputs ("X-Comment-To:\n", fp);
#endif
if (env->subject)
fputs ("Subject:\n", fp);
/* save message id if the user has set it */
- if (env->message_id && !privacy)
+ if (env->message_id)
fprintf (fp, "Message-ID: %s\n", env->message_id);
if (env->reply_to) {
/* check to see if the user has overridden the user-agent field */
if (!ascii_strncasecmp ("user-agent", tmp->data, 10)) {
has_agent = 1;
- if (privacy)
- continue;
}
fputs (tmp->data, fp);
}
}
- if (mode == 0 && !privacy && option (OPTXMAILER) && !has_agent) {
- if (MCore.operating_system) {
+ if (mode == 0 && option (OPTXMAILER) && !has_agent) {
+ if (mod_core.operating_system) {
fprintf(fp, "User-Agent: %s (%s)\n", mutt_make_version(),
- MCore.operating_system);
+ mod_core.operating_system);
} else {
fprintf(fp, "User-Agent: %s\n", mutt_make_version());
}
{
char *p = NULL, *q;
- if (MCore.hostname && MCore.hostname[0] != '@') {
- p = MCore.hostname;
+ if (mod_core.hostname && mod_core.hostname[0] != '@') {
+ p = mod_core.hostname;
if (may_hide_host && option (OPTHIDDENHOST)) {
- if ((p = strchr(MCore.hostname, '.')))
+ if ((p = strchr(mod_core.hostname, '.')))
p++;
/* sanity check: don't hide the host if
the fqdn is something like detebe.org. */
if (!p || !(q = strchr(p, '.')))
- p = MCore.hostname;
+ p = mod_core.hostname;
}
}
const char *fqdn;
if (!(fqdn = mutt_fqdn(0)))
- fqdn = NONULL(MCore.shorthost);
+ fqdn = NONULL(mod_core.shorthost);
mutt_gen_localpart(localpart, sizeof(localpart), MsgIdFormat);
snprintf(buf, sizeof(buf), "<%s@%s>", localpart, fqdn);
return m_strdup(buf);
}
-static RETSIGTYPE alarm_handler (int sig __attribute__ ((unused)))
+static void alarm_handler (int sig __attribute__ ((unused)))
{
SigAlrm = 1;
}
return (args);
}
-static int mutt_invoke_sendmail (address_t * from, /* the sender */
- address_t * to, address_t * cc, address_t * bcc, /* recips */
- const char *msg, /* file containing message */
- int eightbit)
-{ /* message contains 8bit chars */
+int mutt_invoke_mta(address_t *from, address_t *to, address_t *cc,
+ address_t *bcc, const char *msg, int eightbit)
+{
char cmd[LONG_STRING];
char *ps = NULL, *path = NULL, *childout = NULL;
const char **args = NULL;
#ifdef USE_NNTP
if (option (OPTNEWSSEND)) {
- m_strformat(cmd, sizeof(cmd), 0, Inews, nntp_format_str, 0, 0);
- if (m_strisempty(cmd)) {
- i = nntp_post (msg);
- unlink (msg);
- return i;
- }
+ i = nntp_post(msg);
+ unlink(msg);
+ return i;
} else
#endif
{
return (i);
}
-int mutt_invoke_mta (address_t * from, /* the sender */
- address_t * to, address_t * cc, address_t * bcc, /* recips */
- const char *msg, /* file containing message */
- int eightbit)
-{ /* message contains 8bit chars */
-#ifdef USE_LIBESMTP
-#ifdef USE_NNTP
- if (!option (OPTNEWSSEND))
-#endif
- if (SmtpHost)
- return mutt_libesmtp_invoke (from, to, cc, bcc, msg, eightbit);
-#endif
-
- return mutt_invoke_sendmail (from, to, cc, bcc, msg, eightbit);
-}
-
/* For postponing (!final) do the necessary encodings only */
void mutt_prepare_envelope (ENVELOPE * env, int final)
{
if (!fp)
fp = msg->fp;
- f = m_tempfile(tempfile, sizeof(tempfile), NONULL(MCore.tmpdir), NULL);
+ f = m_tempfile(tempfile, sizeof(tempfile), NONULL(mod_core.tmpdir), NULL);
if (f) {
int ch_flags = CH_XMIT | CH_NONEWLINE | CH_NOQFROM;
/* We need to add a Content-Length field to avoid problems where a line in
* the message body begins with "From "
*/
- if (f.magic == M_MMDF || f.magic == M_MBOX) {
- tempfp = m_tempfile(tempfile, sizeof(tempfile), NONULL(MCore.tmpdir), NULL);
+ if (f.magic == M_MBOX) {
+ tempfp = m_tempfile(tempfile, sizeof(tempfile), NONULL(mod_core.tmpdir), NULL);
if (!tempfp) {
mutt_error(_("Could not create temporary file"));
mx_close_mailbox (&f, NULL);
/* post == 1 => postpone message. Set mode = -1 in mutt_write_rfc822_header()
* post == 0 => Normal mode. Set mode = 0 in mutt_write_rfc822_header()
* */
- mutt_write_rfc822_header(msg->fp, hdr->env, hdr->content, -post, 0);
+ mutt_write_rfc822_header(msg->fp, hdr->env, hdr->content, -post);
/* (postponment) if this was a reply of some sort, <msgid> contians the
* Message-ID: of message replied to. Save it using a special X-Mutt-
fputc ('\n', msg->fp);
}
- /* (postponement) if the mail is to be sent through a mixmaster
- * chain, save that information
- */
- if (post && hdr->chain && hdr->chain) {
- string_list_t *p;
-
- fputs ("X-Mutt-Mix:", msg->fp);
- for (p = hdr->chain; p; p = p->next)
- fprintf (msg->fp, " %s", (char *) p->data);
-
- fputc ('\n', msg->fp);
- }
-
if (tempfp) {
char sasha[LONG_STRING];
int lines = 0;