#include <lib-sys/exit.h>
#include <lib-sys/mutt_signal.h>
#include <lib-mime/mime.h>
-#include <lib-ui/curses.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 "send_smtp.h"
-
-#ifdef USE_NNTP
-#include <nntp/nntp.h>
-#endif
#ifdef HAVE_SYSEXITS_H
#include <sysexits.h>
fprintf (f, "Content-Transfer-Encoding: %s\n", ENCODING (a->encoding));
/* Do NOT add the terminator here!!! */
- return (ferror (f) ? -1 : 0);
+ return ferror (f) ? -1 : 0;
}
int mutt_write_mime_body (BODY * a, FILE * f)
if (!(p = parameter_getval(a->parameter, "boundary"))) {
mutt_error _("No boundary parameter found! [report this error]");
- return (-1);
+ return -1;
}
m_strcpy(boundary, sizeof(boundary), p);
return -1;
}
fprintf (f, "\n--%s--\n", boundary);
- return (ferror (f) ? -1 : 0);
+ return ferror (f) ? -1 : 0;
}
/* This is pretty gross, but it's the best solution for now... */
fgetconv_close (&fc);
m_fclose(&fpin);
- return (ferror (f) ? -1 : 0);
+ return ferror (f) ? -1 : 0;
}
typedef struct {
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 ((fp = fopen (fname, "r")) == NULL) {
- return (NULL);
+ return NULL;
}
info = p_new(CONTENT, 1);
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");
m_strreplace(&att->xtype, xtype);
}
- return (type);
+ return type;
}
void mutt_message_to_7bit (BODY * a, FILE * fp)
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;
m_fclose(&fp);
- return (body);
+ return body;
}
BODY *mutt_make_file_attach (const char *path)
char *mutt_make_date (char *s, ssize_t len)
{
- time_t t = time (NULL);
- struct tm *l = localtime (&t);
- time_t tz = mutt_local_tz (t);
-
- tz /= 60;
+ time_t t = time(NULL);
+ const char *loc;
- snprintf (s, len, "Date: %s, %d %s %d %02d:%02d:%02d %+03d%02d\n",
- Weekdays[l->tm_wday], l->tm_mday, Months[l->tm_mon],
- l->tm_year + 1900, l->tm_hour, l->tm_min, l->tm_sec,
- (int) tz / 60, (int) abs (tz) % 60);
- return (s);
+ loc = setlocale(LC_TIME, "C");
+ strftime(s, len, "Date: %a, %d %b %Y %T %z\n", localtime(&t));
+ setlocale(LC_TIME, loc);
+ return s;
}
/* wrapper around mutt_write_address() so we can handle very large
* 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;
string_list_t *tmp = env->userhdrs;
int has_agent = 0; /* user defined user-agent header field exists */
-#ifdef USE_NNTP
- if (!option (OPTNEWSSEND))
-#endif
- if (mode == 0 && !privacy)
- fputs (mutt_make_date (buffer, sizeof (buffer)), fp);
+ 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);
mutt_write_address_list (env->to, fp, 4, 0);
}
else if (mode > 0)
-#ifdef USE_NNTP
- if (!option (OPTNEWSSEND))
-#endif
- if (edit_header(mode, "To:"))
- fputs ("To:\n", fp);
+ if (edit_header(mode, "To:"))
+ fputs ("To:\n", fp);
if (env->cc) {
fputs ("Cc: ", fp);
mutt_write_address_list (env->cc, fp, 4, 0);
}
else if (mode > 0)
-#ifdef USE_NNTP
- if (!option (OPTNEWSSEND))
-#endif
- if (edit_header(mode, "Cc:"))
- fputs ("Cc:\n", fp);
+ if (edit_header(mode, "Cc:"))
+ fputs ("Cc:\n", fp);
if (env->bcc) {
if (mode != 0 || option (OPTWRITEBCC)) {
}
}
else if (mode > 0)
-#ifdef USE_NNTP
- if (!option (OPTNEWSSEND))
-#endif
- if (edit_header(mode, "Bcc:"))
- fputs ("Bcc:\n", fp);
-
-#ifdef USE_NNTP
- if (env->newsgroups)
- fprintf (fp, "Newsgroups: %s\n", env->newsgroups);
- else if (mode == 1 && option (OPTNEWSSEND) && edit_header(mode, "Newsgroups:"))
- fputs ("Newsgroups:\n", fp);
-
- if (env->followup_to)
- 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 (edit_header(mode, "Bcc:"))
+ fputs ("Bcc:\n", fp);
if (env->subject)
fprintf (fp, "Subject: %s\n", 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) {
else if (mode > 0 && edit_header(mode, "Reply-To:"))
fputs ("Reply-To:\n", fp);
- if (env->mail_followup_to)
-#ifdef USE_NNTP
- if (!option (OPTNEWSSEND))
-#endif
- {
- fputs ("Mail-Followup-To: ", fp);
- mutt_write_address_list (env->mail_followup_to, fp, 18, 0);
- }
+ if (env->mail_followup_to) {
+ fputs ("Mail-Followup-To: ", fp);
+ mutt_write_address_list (env->mail_followup_to, fp, 18, 0);
+ }
if (mode <= 0) {
if (env->references) {
/* 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) {
- fprintf(fp, "User-Agent: %s (%s)\n", mutt_make_version(),
- MCore.operating_system);
+ if (mode == 0 && option (OPTXMAILER) && !has_agent) {
+ if (mod_core.operating_system) {
+ fprintf(fp, "User-Agent: %s (%s)\n", madmutt_version,
+ mod_core.operating_system);
} else {
- fprintf(fp, "User-Agent: %s\n", mutt_make_version());
+ fprintf(fp, "User-Agent: %s\n", madmutt_version);
}
}
- return (ferror (fp) == 0 ? 0 : -1);
+ return ferror (fp) == 0 ? 0 : -1;
}
static void encode_headers (string_list_t * h)
{
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;
}
mutt_unblock_signals_system (1);
- return (st);
+ return st;
}
static const char **
args[(*argslen)++] = addr->mailbox;
}
}
- return (args);
+ return args;
}
static const char **
p_realloc(&args, *argsmax += 5);
}
args[(*argslen)++] = s;
- return (args);
+ 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;
ssize_t argslen = 0, argsmax = 0;
int i;
-#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;
- }
- } else
-#endif
- {
- m_strcpy(cmd, sizeof(cmd), MTransport.sendmail);
- }
+ m_strcpy(cmd, sizeof(cmd), MTransport.sendmail);
ps = cmd;
i = 0;
i++;
}
-#ifdef USE_NNTP
- if (!option (OPTNEWSSEND)) {
-#endif
- if (eightbit && MTransport.use_8bitmime)
- args = add_option(args, &argslen, &argsmax, "-B8BITMIME");
-
- if (MTransport.use_envelope_from) {
- address_t *f = MTransport.envelope_from_address;
- if (!f && from && !from->next)
- f = from;
- if (f) {
- args = add_option (args, &argslen, &argsmax, "-f");
- args = add_args (args, &argslen, &argsmax, f);
- }
- }
- if (MTransport.dsn_notify) {
- args = add_option (args, &argslen, &argsmax, "-N");
- args = add_option (args, &argslen, &argsmax, MTransport.dsn_notify);
- }
- if (MTransport.dsn_return) {
- args = add_option (args, &argslen, &argsmax, "-R");
- args = add_option (args, &argslen, &argsmax, MTransport.dsn_return);
+ if (eightbit && MTransport.use_8bitmime)
+ args = add_option(args, &argslen, &argsmax, "-B8BITMIME");
+
+ if (MTransport.use_envelope_from) {
+ address_t *f = MTransport.envelope_from_address;
+ if (!f && from && !from->next)
+ f = from;
+ if (f) {
+ args = add_option (args, &argslen, &argsmax, "-f");
+ args = add_args (args, &argslen, &argsmax, f);
}
- args = add_option (args, &argslen, &argsmax, "--");
- args = add_args (args, &argslen, &argsmax, to);
- args = add_args (args, &argslen, &argsmax, cc);
- args = add_args (args, &argslen, &argsmax, bcc);
-#ifdef USE_NNTP
}
-#endif
+ if (MTransport.dsn_notify) {
+ args = add_option (args, &argslen, &argsmax, "-N");
+ args = add_option (args, &argslen, &argsmax, MTransport.dsn_notify);
+ }
+ if (MTransport.dsn_return) {
+ args = add_option (args, &argslen, &argsmax, "-R");
+ args = add_option (args, &argslen, &argsmax, MTransport.dsn_return);
+ }
+ args = add_option (args, &argslen, &argsmax, "--");
+ args = add_args (args, &argslen, &argsmax, to);
+ args = add_args (args, &argslen, &argsmax, cc);
+ args = add_args (args, &argslen, &argsmax, bcc);
if (argslen >= argsmax)
p_realloc(&args, ++argsmax);
i = 1;
else
i = -1;
- 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 send_smtp_invoke (from, to, cc, bcc, msg, eightbit);
-#endif
-
- return mutt_invoke_sendmail (from, to, cc, bcc, msg, eightbit);
+ return i;
}
/* For postponing (!final) do the necessary encodings only */
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;
return -1;
}
rfc822_addrcat(resent_from, sizeof(resent_from), from, 0);
-
-#ifdef USE_NNTP
- unset_option (OPTNEWSSEND);
-#endif
-
ret = _mutt_bounce_message (fp, h, to, resent_from, from);
-
address_list_wipe(&from);
-
return ret;
}
set_noconv_flags (hdr->content, 1);
if (mx_open_mailbox (path, M_APPEND | M_QUIET, &f) == NULL) {
- return (-1);
+ return -1;
}
/* 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);
hdr->read = !post; /* make sure to put it in the `cur' directory (maildir) */
if ((msg = mx_open_new_message (&f, hdr, M_ADD_FROM)) == NULL) {
mx_close_mailbox (&f, NULL);
- return (-1);
+ return -1;
}
/* 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;
projects / apps / madmutt.git / blobdiff