* please see the file GPL in the top level source directory.
*/
-#define _SENDLIB_C 1
-
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <lib-lib/lib-lib.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <errno.h>
-#include <ctype.h>
-#include <sys/stat.h>
#include <signal.h>
-#include <sys/wait.h>
-#include <fcntl.h>
-#include <sys/utsname.h>
-
-#include <lib-lib/lib-lib.h>
+#include <lib-lua/lib-lua.h>
#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 "handler.h"
+#include "crypt.h"
#include "recvattach.h"
-#include "mx.h"
#include "copy.h"
#include "pager.h"
#include "charset.h"
-#include <lib-crypt/crypt.h>
#include "mutt_idna.h"
-#ifdef USE_LIBESMTP
-# include "mutt_libesmtp.h"
-#endif /* USE_LIBESMTP */
-
-#ifdef USE_NNTP
-#include <nntp.h>
-#endif
-
#ifdef HAVE_SYSEXITS_H
#include <sysexits.h>
#else /* Make sure EX_OK is defined <philiph@pobox.com> */
#define EX_OK 0
#endif
-/* If you are debugging this file, comment out the following line. */
-/*#define NDEBUG*/
-
-#ifdef NDEBUG
-#define assert(x)
-#else
-#include <assert.h>
-#endif
-
-#define DISPOSITION(X) X==DISPATTACH?"attachment":"inline"
-
static void transform_to_7bit (BODY * a, FILE * fpin);
static void encode_quoted (fgetconv_t * fc, FILE * fout, int istext)
fputc ('\n', fout);
}
-static void encode_8bit (fgetconv_t * fc, FILE * fout, int istext)
+static void encode_8bit (fgetconv_t * fc, FILE * fout,
+ int istext __attribute__ ((unused)))
{
int ch;
if (a->description)
fprintf (f, "Content-Description: %s\n", a->description);
+#define DISPOSITION(X) X==DISPATTACH?"attachment":"inline"
fprintf (f, "Content-Disposition: %s", DISPOSITION (a->disposition));
if (a->use_disp) {
int mutt_write_mime_body (BODY * a, FILE * f)
{
const char *p;
- char boundary[SHORT_STRING];
- char send_charset[SHORT_STRING];
+ char boundary[STRING];
+ char send_charset[STRING];
FILE *fpin;
BODY *t;
fgetconv_t *fc;
#undef write_as_text_part
fgetconv_close (&fc);
- fclose (fpin);
+ m_fclose(&fpin);
return (ferror (f) ? -1 : 0);
}
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;
ib = bufi;
ob = bufu, obl = sizeof (bufu);
n = my_iconv(cd1, ibl ? &ib : 0, &ibl, &ob, &obl);
- assert (n == -1 || !n);
if (n == -1 && ((errno != EINVAL && errno != E2BIG) || ib == bufi)) {
- assert (errno == EILSEQ ||
- (errno == EINVAL && ib == bufi && ibl < ssizeof (bufi)));
ret = -1;
break;
}
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 ? ((FileCharset && *FileCharset) ?
- FileCharset : Charset) : Charset;
- if (Charset && (chs || SendCharset) &&
- convert_file_from_to (fp, fchs, chs ? chs : SendCharset,
+ 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);
}
b->file_charset = fromcode;
p_delete(&tocode);
- safe_fclose (&fp);
+ m_fclose(&fp);
return info;
}
}
update_content_info (info, &state, buffer, r);
update_content_info (info, &state, 0, 0);
- safe_fclose (&fp);
+ m_fclose(&fp);
if (b != NULL && b->type == TYPETEXT && (!b->noconv && !b->force_charset))
parameter_setval(&b->parameter, "charset",
(!info->hibin ? "us-ascii"
- : Charset && !charset_is_us_ascii(Charset) ? 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 (Homedir));
+ snprintf(buf, sizeof (buf), "%s/.mime.types", NONULL(mod_core.homedir));
break;
case 1:
m_strcpy(buf, sizeof(buf), SYSCONFDIR "/madmutt-mime.types");
p = NULL;
}
}
- fclose (f);
+ m_fclose(&f);
}
}
a->offset = 0;
if (stat (a->filename, &sb) == -1) {
mutt_perror ("stat");
- fclose (fpin);
+ m_fclose(&fpin);
}
a->length = sb.st_size;
}
- mutt_mktemp (temp);
- if (!(fpout = safe_fopen (temp, "w+"))) {
- mutt_perror ("fopen");
+ fpout = m_tempfile(temp, sizeof(temp), NONULL(mod_core.tmpdir), NULL);
+ if (!fpout) {
+ mutt_error(_("Could not create temporary file"));
goto cleanup;
}
p_delete(&line);
if (fpin && !fp)
- fclose (fpin);
+ m_fclose(&fpin);
if (fpout)
- fclose (fpout);
+ m_fclose(&fpout);
else
return;
transform_to_7bit (a->parts, fpin);
}
- else if (mutt_is_message_type (a->type, a->subtype)) {
+ else if (mutt_is_message_type(a)) {
mutt_message_to_7bit (a, fpin);
}
else {
a->noconv = 1;
a->force_charset = 1;
- mutt_mktemp (buff);
- if ((s.fpout = safe_fopen (buff, "w")) == NULL) {
- mutt_perror ("fopen");
+ s.fpout = m_tempfile(buff, sizeof(buff), NONULL(mod_core.tmpdir), NULL);
+ if (!s.fpout) {
+ mutt_error(_("Could not create temporary file"));
return;
}
s.fpin = fpin;
mutt_decode_attachment (a, &s);
- fclose (s.fpout);
+ m_fclose(&s.fpout);
a->d_filename = a->filename;
a->filename = m_strdup(buff);
a->unlink = 1;
/* determine which Content-Transfer-Encoding to use */
static void mutt_set_encoding (BODY * b, CONTENT * info)
{
- char send_charset[SHORT_STRING];
+ char send_charset[STRING];
if (b->type == TYPETEXT) {
char *chsname =
if ((option (OPTMIMEFORWDECODE) || option (OPTFORWDECRYPT)) &&
(hdr->security & ENCRYPT)) {
- if (!crypt_valid_passphrase (hdr->security))
- return (NULL);
}
- mutt_mktemp (buffer);
- if ((fp = safe_fopen (buffer, "w+")) == NULL)
+ fp = m_tempfile(buffer, sizeof(buffer), NONULL(mod_core.tmpdir), NULL);
+ if (!fp)
return NULL;
body = body_new();
mutt_update_encoding (body);
body->parts = body->hdr->content;
- fclose (fp);
+ m_fclose(&fp);
return (body);
}
static int get_toplevel_encoding (BODY * a)
{
- int e = ENC7BIT;
+ int e = ENC7BIT;
- for (; a; a = a->next) {
- if (a->encoding == ENCBINARY)
- return (ENCBINARY);
- else if (a->encoding == ENC8BIT)
- e = ENC8BIT;
- }
+ for (; a; a = a->next) {
+ if (a->encoding == ENCBINARY)
+ return ENCBINARY;
- return (e);
+ if (a->encoding == ENC8BIT)
+ e = ENC8BIT;
+ }
+
+ return e;
}
BODY *mutt_make_multipart (BODY * b)
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);
+ time_t t = time(NULL);
+ const char *loc;
- tz /= 60;
-
- 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
recipient lists without needing a huge temporary buffer in memory */
-void mutt_write_address_list (address_t * adr, FILE * fp, int linelen,
- int display)
+void
+mutt_write_address_list(address_t *addr, FILE *fp, int linelen, int display)
{
- address_t *tmp;
- char buf[LONG_STRING];
- int count = 0;
- int len;
+ int first = 1;
+
+ while (addr) {
+ char buf[LONG_STRING];
+ int len = rfc822_addrcpy(buf, ssizeof(buf), addr, display);
+
+ if (!first) {
+ if (linelen + len > 74) {
+ fputs("\n\t", fp);
+ linelen = 8; /* tab is usually about 8 spaces... */
+ } else
+ if (addr->mailbox) {
+ fputc(' ', fp);
+ linelen++;
+ }
+ }
+ first = 0;
- while (adr) {
- tmp = adr->next;
- adr->next = NULL;
- buf[0] = 0;
- rfc822_write_address (buf, sizeof (buf), adr, display);
- len = m_strlen(buf);
- if (count && linelen + len > 74) {
- fputs ("\n\t", fp);
- linelen = len + 8; /* tab is usually about 8 spaces... */
- }
- else {
- if (count && adr->mailbox) {
- fputc (' ', fp);
- linelen++;
- }
- linelen += len;
- }
- fputs (buf, fp);
- adr->next = tmp;
- if (!adr->group && adr->next && adr->next->mailbox) {
- linelen++;
- fputc (',', fp);
- }
- adr = adr->next;
- count++;
- }
- fputc ('\n', fp);
-}
+ linelen += len + 1;
+ fputs(buf, fp);
-/* arbitrary number of elements to grow the array by */
-#define REF_INC 16
+ if (!addr->group && addr->next && addr->next->mailbox) {
+ fputc(',', fp);
+ linelen++;
+ }
-#define TrimRef 10
+ addr = addr->next;
+ }
+ fputc ('\n', fp);
+}
/* need to write the list in reverse because they are stored in reverse order
* when parsed to speed up threading
*/
-void mutt_write_references (string_list_t * r, FILE * f)
+void mutt_write_references(string_list_t *r, FILE *f)
{
- string_list_t **ref = NULL;
- int refcnt = 0, refmax = 0;
+ string_list_t *refs[10];
+ int i;
- for (; (TrimRef == 0 || refcnt < TrimRef) && r; r = r->next) {
- if (refcnt == refmax)
- p_realloc(&ref, refmax += REF_INC);
- ref[refcnt++] = r;
- }
+ p_clear(refs, countof(refs));
+ for (i = 0; i < countof(refs) && r; r = r->next) {
+ refs[i++] = r;
+ }
- while (refcnt-- > 0) {
- fputc (' ', f);
- fputs (ref[refcnt]->data, f);
- }
+ while (i-- > 0) {
+ fprintf(f, " %s", refs[i]->data);
+ }
+}
+
+static int edit_header(int mode, const char *s)
+{
+ const char *p;
+ int slen = m_strlen(s);
+
+ if (mode != 1 || option(OPTXMAILTO))
+ return 1;
+
+ p = skipspaces(EditorHeaders);
+ while (*p) {
+ if (!ascii_strncasecmp(p, s, slen) && p[slen - 1] == ':')
+ return 1;
+ p = skipspaces(p + slen);
+ }
- p_delete(&ref);
+ return 0;
}
/* Note: all RFC2047 encoding should be done outside of this routine, except
* 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 */
- list2_t* hdrs = list_from_str (EditorHeaders, " ");
-#ifdef USE_NNTP
- if (!option (OPTNEWSSEND))
-#endif
- if (mode == 0 && !privacy)
- fputs (mutt_make_date (buffer, sizeof (buffer)), fp);
-
-#define EDIT_HEADER(x) (mode != 1 || option(OPTXMAILTO) || (mode == 1 && list_lookup(hdrs,(list_lookup_t*) ascii_strcasecmp,x) >= 0))
+ 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_write_address (buffer, sizeof (buffer), env->from, 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("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("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("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("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("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("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);
- else if (mode == 1 && EDIT_HEADER("Subject:"))
+ else if (mode == 1 && edit_header(mode, "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) {
fputs ("Reply-To: ", fp);
mutt_write_address_list (env->reply_to, fp, 10, 0);
}
- else if (mode > 0 && EDIT_HEADER("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) {
fputc ('\n', fp);
}
-#undef EDIT_HEADER
-
/* Add any user defined headers */
for (; tmp; tmp = tmp->next) {
if ((p = strchr (tmp->data, ':'))) {
/* 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) {
- const char *os;
-
- if (OperatingSystem != NULL) {
- os = OperatingSystem;
+ 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 {
- struct utsname un;
- os = (uname(&un) == -1) ? "UNIX" : un.sysname;
+ fprintf(fp, "User-Agent: %s\n", madmutt_version);
}
- /* Add a vanity header */
- fprintf (fp, "User-Agent: %s (%s)\n", mutt_make_version (0), os);
}
- list_del (&hdrs, (list_del_t*)xmemfree);
-
return (ferror (fp) == 0 ? 0 : -1);
}
rfc2047_encode_string (&tmp);
p_realloc(&h->data, m_strlen(h->data) + 2 + m_strlen(tmp) + 1);
- sprintf (h->data + i, ": %s", NONULL (tmp)); /* __SPRINTF_CHECKED__ */
+ sprintf (h->data + i, ": %s", NONULL (tmp));
p_delete(&tmp);
}
}
-const char *mutt_fqdn (short may_hide_host)
+const char *mutt_fqdn(short may_hide_host)
{
char *p = NULL, *q;
- if (Fqdn && Fqdn[0] != '@') {
- p = Fqdn;
+ if (mod_core.hostname && mod_core.hostname[0] != '@') {
+ p = mod_core.hostname;
if (may_hide_host && option (OPTHIDDENHOST)) {
- if ((p = strchr (Fqdn, '.')))
+ if ((p = strchr(mod_core.hostname, '.')))
p++;
/* sanity check: don't hide the host if
- * the fqdn is something like detebe.org.
- */
+ the fqdn is something like detebe.org. */
- if (!p || !(q = strchr (p, '.')))
- p = Fqdn;
+ if (!p || !(q = strchr(p, '.')))
+ p = mod_core.hostname;
}
}
return p;
}
-/* normalized character (we're stricter than RFC2822, 3.6.4) */
-static char mutt_normalized_char(char c)
-{
- return (isalnum(c) || strchr(".!#$%&'*+-/=?^_`{|}~", c)) ? c : '.';
-}
-
static void mutt_gen_localpart(char *buf, unsigned int len, const char *fmt)
{
#define APPEND_FMT(fmt, arg) \
int c = *fmt++;
if (c != '%') {
- APPEND_BYTE(mutt_normalized_char(c));
+ /* normalized character (we're stricter than RFC2822, 3.6.4) */
+ APPEND_BYTE((isalnum(c) || strchr(".!#$%&'*+-/=?^_`{|}~", c)) ? c : '.');
continue;
}
break;
default: /* invalid formats are replaced by '.' */
APPEND_BYTE('.');
- m_strncat(buf, len, ".", 1);
}
}
#undef APPEND_FMT
}
-char *mutt_gen_msgid (void)
+static char *mutt_gen_msgid (void)
{
- char buf[SHORT_STRING];
- char localpart[SHORT_STRING];
- unsigned int localpart_length;
- const char *fqdn;
+ char buf[STRING];
+ char localpart[STRING];
+ const char *fqdn;
- if (!(fqdn = mutt_fqdn (0)))
- fqdn = NONULL (Hostname);
+ if (!(fqdn = mutt_fqdn(0)))
+ fqdn = NONULL(mod_core.shorthost);
- localpart_length = sizeof (buf) - m_strlen(fqdn) - 4; /* the 4 characters are '<', '@', '>' and '\0' */
-
- mutt_gen_localpart (localpart, localpart_length, MsgIdFormat);
-
- snprintf (buf, sizeof (buf), "<%s@%s>", localpart, fqdn);
- return (m_strdup(buf));
+ 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)
+static void alarm_handler (int sig __attribute__ ((unused)))
{
SigAlrm = 1;
}
sigaddset (&set, SIGTSTP);
sigprocmask (SIG_BLOCK, &set, NULL);
- if (SendmailWait >= 0) {
+ if (MTransport.sendmail_wait >= 0) {
char tmp[_POSIX_PATH_MAX];
mutt_mktemp (tmp);
setsid ();
/* next we close all open files */
-#if defined(OPEN_MAX)
- for (fd = 0; fd < OPEN_MAX; fd++)
+ for (fd = 0; fd < getdtablesize(); fd++)
close (fd);
-#elif defined(_POSIX_OPEN_MAX)
- for (fd = 0; fd < _POSIX_OPEN_MAX; fd++)
- close (fd);
-#else
- close (0);
- close (1);
- close (2);
-#endif
/* now the second fork() */
if ((pid = fork ()) == 0) {
}
unlink (msg);
- if (SendmailWait >= 0) {
+ if (MTransport.sendmail_wait >= 0) {
/* *tempfile will be opened as stdout */
if (open (*tempfile, O_WRONLY | O_APPEND | O_CREAT | O_EXCL, 0600) <
0)
/* redirect stderr to *tempfile too */
if (dup (1) < 0)
_exit (S_ERR);
- }
- else {
+ } else {
if (open ("/dev/null", O_WRONLY | O_APPEND) < 0) /* stdout */
_exit (S_ERR);
if (open ("/dev/null", O_RDWR | O_APPEND) < 0) /* stderr */
_exit (S_ERR);
}
- /* SendmailWait > 0: interrupt waitpid() after SendmailWait seconds
- * SendmailWait = 0: wait forever
- * SendmailWait < 0: don't wait
+ /* sendmail_wait > 0: interrupt waitpid() after sendmail_wait seconds
+ * sendmail_wait = 0: wait forever
+ * sendmail_wait < 0: don't wait
*/
- if (SendmailWait > 0) {
+ if (MTransport.sendmail_wait > 0) {
SigAlrm = 0;
act.sa_handler = alarm_handler;
#ifdef SA_INTERRUPT
#endif
sigemptyset (&act.sa_mask);
sigaction (SIGALRM, &act, &oldalrm);
- alarm (SendmailWait);
+ alarm (MTransport.sendmail_wait);
}
- else if (SendmailWait < 0)
+ else if (MTransport.sendmail_wait < 0)
_exit (0xff & EX_OK);
if (waitpid (pid, &st, 0) > 0) {
st = WIFEXITED (st) ? WEXITSTATUS (st) : S_ERR;
- if (SendmailWait && st == (0xff & EX_OK)) {
+ if (MTransport.sendmail_wait && st == (0xff & EX_OK)) {
unlink (*tempfile); /* no longer needed */
p_delete(tempfile);
}
- }
- else {
- st = (SendmailWait > 0 && errno == EINTR && SigAlrm) ? S_BKG : S_ERR;
- if (SendmailWait > 0) {
+ } else {
+ st = (MTransport.sendmail_wait > 0 && errno == EINTR && SigAlrm) ? S_BKG : S_ERR;
+ if (MTransport.sendmail_wait > 0) {
unlink (*tempfile);
p_delete(tempfile);
}
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 */
- char *ps = NULL, *path = NULL, *s = NULL, *childout = NULL;
+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)) {
- char cmd[LONG_STRING];
+ m_strcpy(cmd, sizeof(cmd), MTransport.sendmail);
- mutt_FormatString (cmd, sizeof (cmd), NONULL (Inews), nntp_format_str, 0,
- 0);
- if (!*cmd) {
- i = nntp_post (msg);
- unlink (msg);
- return i;
- }
-
- s = m_strdup(cmd);
- }
- else
-#endif
- s = m_strdup(Sendmail);
-
- ps = s;
+ ps = cmd;
i = 0;
- while ((ps = strtok (ps, " "))) {
+ while ((ps = strtok(ps, " "))) {
if (argslen == argsmax)
p_realloc(&args, argsmax += 5);
i++;
}
-#ifdef USE_NNTP
- if (!option (OPTNEWSSEND)) {
-#endif
- if (eightbit && option (OPTUSE8BITMIME))
- args = add_option(args, &argslen, &argsmax, "-B8BITMIME");
-
- if (option (OPTENVFROM)) {
- address_t *f = NULL;
- if (EnvFrom)
- f = EnvFrom;
- else if (from && !from->next)
- f = from;
- if (f) {
- args = add_option (args, &argslen, &argsmax, "-f");
- args = add_args (args, &argslen, &argsmax, f);
- }
- }
- if (DsnNotify) {
- args = add_option (args, &argslen, &argsmax, "-N");
- args = add_option (args, &argslen, &argsmax, DsnNotify);
- }
- if (DsnReturn) {
- args = add_option (args, &argslen, &argsmax, "-R");
- args = add_option (args, &argslen, &argsmax, DsnReturn);
+ 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)
+ if (argslen >= argsmax)
p_realloc(&args, ++argsmax);
args[argslen++] = NULL;
if (childout) {
struct stat st;
- if (stat (childout, &st) == 0 && st.st_size > 0)
- mutt_do_pager (_("Output of the delivery process"), childout, 0,
- NULL);
+ if (!stat(childout, &st) && st.st_size > 0)
+ mutt_pager(_("Output of the delivery process"), childout, 0, NULL);
}
}
- }
- else
+ } else {
unlink (childout);
+ }
p_delete(&childout);
p_delete(&path);
- p_delete(&s);
p_delete(&args);
if (i == (EX_OK & 0xff))
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)
{
- char buffer[LONG_STRING];
-
if (final) {
if (env->bcc && !(env->to || env->cc)) {
/* some MTA's will put an Apparently-To: header field showing the Bcc:
* recipients if there is no To: or Cc: field, so attempt to suppress
* it by using an empty To: field.
*/
- env->to = address_new ();
+ env->to = address_new();
env->to->group = 1;
- env->to->next = address_new ();
-
- buffer[0] = 0;
- rfc822_strcpy(buffer, sizeof(buffer), "undisclosed-recipients",
- RFC822Specials);
-
- env->to->mailbox = m_strdup(buffer);
+ env->to->next = address_new();
+ env->to->mailbox = m_strdup("undisclosed-recipients");
}
- mutt_set_followup_to (env);
+ mutt_set_followup_to(env);
- if (!env->message_id && MsgIdFormat && *MsgIdFormat)
- env->message_id = mutt_gen_msgid ();
+ if (!env->message_id && !m_strisempty(MsgIdFormat))
+ env->message_id = mutt_gen_msgid();
}
/* Take care of 8-bit => 7-bit conversion. */
- rfc2047_encode_adrlist (env->to, "To");
- rfc2047_encode_adrlist (env->cc, "Cc");
- rfc2047_encode_adrlist (env->bcc, "Bcc");
- rfc2047_encode_adrlist (env->from, "From");
- rfc2047_encode_adrlist (env->mail_followup_to, "Mail-Followup-To");
- rfc2047_encode_adrlist (env->reply_to, "Reply-To");
+ rfc2047_encode_adrlist(env->to, "To");
+ rfc2047_encode_adrlist(env->cc, "Cc");
+ rfc2047_encode_adrlist(env->bcc, "Bcc");
+ rfc2047_encode_adrlist(env->from, "From");
+ rfc2047_encode_adrlist(env->mail_followup_to, "Mail-Followup-To");
+ rfc2047_encode_adrlist(env->reply_to, "Reply-To");
if (env->subject)
-#ifdef USE_NNTP
- if (!option (OPTNEWSSEND) || option (OPTMIMESUBJECT))
-#endif
- {
- rfc2047_encode_string (&env->subject);
- }
+ rfc2047_encode_string (&env->subject);
encode_headers (env->userhdrs);
}
void mutt_unprepare_envelope (ENVELOPE * env)
{
- string_list_t *item;
+ string_list_t *item;
- for (item = env->userhdrs; item; item = item->next)
- rfc2047_decode (&item->data);
+ for (item = env->userhdrs; item; item = item->next)
+ rfc2047_decode(&item->data);
- address_list_wipe(&env->mail_followup_to);
+ address_list_wipe(&env->mail_followup_to);
- /* back conversions */
- rfc2047_decode_adrlist (env->to);
- rfc2047_decode_adrlist (env->cc);
- rfc2047_decode_adrlist (env->bcc);
- rfc2047_decode_adrlist (env->from);
- rfc2047_decode_adrlist (env->reply_to);
- rfc2047_decode (&env->subject);
+ /* back conversions */
+ rfc2047_decode_adrlist(env->to);
+ rfc2047_decode_adrlist(env->cc);
+ rfc2047_decode_adrlist(env->bcc);
+ rfc2047_decode_adrlist(env->from);
+ rfc2047_decode_adrlist(env->reply_to);
+ rfc2047_decode(&env->subject);
}
static int _mutt_bounce_message (FILE * fp, HEADER * h, address_t * to,
{
int i, ret = 0;
FILE *f;
- char date[SHORT_STRING], tempfile[_POSIX_PATH_MAX];
+ char date[STRING], tempfile[_POSIX_PATH_MAX];
MESSAGE *msg = NULL;
if (!h) {
if (!fp)
fp = msg->fp;
- mutt_mktemp (tempfile);
- if ((f = safe_fopen (tempfile, "w")) != NULL) {
+ f = m_tempfile(tempfile, sizeof(tempfile), NONULL(mod_core.tmpdir), NULL);
+ if (f) {
int ch_flags = CH_XMIT | CH_NONEWLINE | CH_NOQFROM;
if (!option (OPTBOUNCEDELIVERED))
fseeko (fp, h->offset, 0);
fprintf (f, "Resent-From: %s", resent_from);
fprintf (f, "\nResent-%s", mutt_make_date (date, sizeof (date)));
- if (MsgIdFormat && *MsgIdFormat)
- fprintf (f, "Resent-Message-ID: %s\n", mutt_gen_msgid ());
+ if (!m_strisempty(MsgIdFormat))
+ fprintf (f, "Resent-Message-ID: %s\n", mutt_gen_msgid());
fputs ("Resent-To: ", f);
mutt_write_address_list (to, f, 11, 0);
mutt_copy_header (fp, h, f, ch_flags, NULL);
fputc ('\n', f);
mutt_copy_bytes (fp, f, h->content->length);
- fclose (f);
+ m_fclose(&f);
- ret = mutt_invoke_mta (env_from, to, NULL, NULL, tempfile,
- h->content->encoding == ENC8BIT);
+ ret = mutt_invoke_mta(env_from, to, NULL, NULL, tempfile,
+ h->content->encoding == ENC8BIT);
}
if (msg)
int mutt_bounce_message (FILE * fp, HEADER * h, address_t * to)
{
address_t *from;
- const char *fqdn = mutt_fqdn (1);
char resent_from[STRING];
int ret;
char *err;
resent_from[0] = '\0';
from = mutt_default_from ();
- if (fqdn)
- rfc822_qualify (from, fqdn);
+ rfc822_qualify(from, mutt_fqdn(1));
- rfc2047_encode_adrlist (from, "Resent-From");
+ rfc2047_encode_adrlist(from, "Resent-From");
if (mutt_addrlist_to_idna (from, &err)) {
mutt_error (_("Bad IDN %s while preparing resent-from."), err);
return -1;
}
- rfc822_write_address (resent_from, sizeof (resent_from), from, 0);
-
-#ifdef USE_NNTP
- unset_option (OPTNEWSSEND);
-#endif
-
+ rfc822_addrcat(resent_from, sizeof(resent_from), from, 0);
ret = _mutt_bounce_message (fp, h, to, resent_from, from);
-
address_list_wipe(&from);
-
return ret;
}
/* 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) {
- mutt_mktemp (tempfile);
- if ((tempfp = safe_fopen (tempfile, "w+")) == NULL) {
- mutt_perror (tempfile);
+ 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);
- 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 ? -post : 0,
- 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-
fprintf (msg->fp, "X-Mutt-Fcc: %s\n", fcc);
fprintf (msg->fp, "Status: RO\n");
-
-
/* (postponment) if the mail is to be signed or encrypted, save this info */
if (post && (hdr->security & APPLICATION_PGP)) {
fputs ("X-Mutt-PGP: ", msg->fp);
fputc ('\n', msg->fp);
}
-#ifdef MIXMASTER
- /* (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);
- }
-#endif
-
if (tempfp) {
char sasha[LONG_STRING];
int lines = 0;
fflush (tempfp);
if (ferror (tempfp)) {
- fclose (tempfp);
+ m_fclose(&tempfp);
unlink (tempfile);
mx_commit_message (msg, &f); /* XXX - really? */
mx_close_message (&msg);
/* copy the body and clean up */
rewind (tempfp);
r = mutt_copy_stream (tempfp, msg->fp);
- if (fclose (tempfp) != 0)
+ if (m_fclose(&tempfp) != 0)
r = -1;
/* if there was an error, leave the temp version */
if (!r)
unlink (tempfile);
- }
- else {
+ } else {
fputc ('\n', msg->fp); /* finish off the header */
r = mutt_write_mime_body (hdr->content, msg->fp);
}
projects / apps / madmutt.git / blobdiff