* please see the file GPL in the top level source directory.
*/
-#define _SENDLIB_C 1
+#include <lib-lib/lib-lib.h>
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#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/mem.h>
-#include <lib-lib/ascii.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/file.h>
-
#include <lib-sys/exit.h>
#include <lib-sys/mutt_signal.h>
-
#include <lib-mime/mime.h>
-
#include <lib-ui/curses.h>
+#include <lib-mx/mx.h>
+
+#include <lib-crypt/crypt.h>
#include "mutt.h"
#include "handler.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
#endif /* USE_LIBESMTP */
#ifdef USE_NNTP
-#include <nntp.h>
+#include <nntp/nntp.h>
#endif
#ifdef HAVE_SYSEXITS_H
#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 char MsgIdPfx = 'A';
-
static void transform_to_7bit (BODY * a, FILE * fpin);
static void encode_quoted (fgetconv_t * fc, FILE * fout, int istext)
fputs (line, fout);
}
else {
- int savechar = line[linelen - 1];
+ savechar = line[linelen - 1];
line[linelen - 1] = '=';
line[linelen] = 0;
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) {
return (ferror (f) ? -1 : 0);
}
-# define write_as_text_part(a) (mutt_is_text_part(a) || mutt_is_application_pgp(a))
-
int mutt_write_mime_body (BODY * a, FILE * f)
{
const char *p;
else
fc = fgetconv_open (fpin, 0, 0, 0);
+#define write_as_text_part(a) (mutt_is_text_part(a) || mutt_is_application_pgp(a))
if (a->encoding == ENCQUOTEDPRINTABLE)
encode_quoted (fc, f, write_as_text_part (a));
else if (a->encoding == ENCBASE64)
encode_8bit (fc, f, write_as_text_part (a));
else
mutt_copy_stream (fpin, f);
+#undef write_as_text_part
fgetconv_close (&fc);
- fclose (fpin);
+ m_fclose(&fpin);
return (ferror (f) ? -1 : 0);
}
-#undef write_as_text_part
-
typedef struct {
int from;
int whitespace;
}
-/* Define as 1 if iconv sometimes returns -1(EILSEQ) instead of transcribing. */
-#define BUGGY_ICONV 1
-
/*
* Find the best charset conversion of the file from fromcode into one
* of the tocodes. If successful, set *tocode and CONTENT *info and
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)));
+ if (n == -1 && ((errno != EINVAL && errno != E2BIG) || ib == bufi)) {
ret = -1;
break;
}
ob = bufo, obl = sizeof (bufo);
n = my_iconv(cd[i], (ibl || ubl) ? &ub : 0, &ubl, &ob, &obl);
if (n == -1) {
- assert (errno == E2BIG ||
- (BUGGY_ICONV && (errno == EILSEQ || errno == ENOENT)));
score[i] = -1;
}
else {
}
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",
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(Tempdir), 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;
return;
}
a->length = sb.st_size;
- mutt_free_body (&a->parts);
+ body_list_wipe(&a->parts);
a->hdr->content = NULL;
}
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(Tempdir), 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;
&& ascii_strcasecmp (b->subtype, "pgp-keys") == 0)
b->encoding = ENC7BIT;
else
-#if 0
- if (info->lobin || info->hibin || info->binary || info->linemax > 990
- || info->cr || ( /* option (OPTENCODEFROM) && */ info->from))
-#endif
{
/* Determine which encoding is smaller */
if (1.33 * (float) (info->lobin + info->hibin + info->ascii) <
else
b->encoding = ENCQUOTEDPRINTABLE;
}
-#if 0
- else
- b->encoding = ENC7BIT;
-#endif
}
void mutt_stamp_attachment (BODY * a)
/* Get a body's character set */
-char *mutt_get_body_charset (char *d, ssize_t dlen, BODY * b)
+char *mutt_get_body_charset(char *d, ssize_t dlen, BODY * b)
{
- const char *p = NULL;
-
- if (b && b->type != TYPETEXT)
- return NULL;
-
- if (b)
- p = parameter_getval(b->parameter, "charset");
+ const char *p;
- if (p)
- charset_canonicalize (d, dlen, p);
- else
- m_strcpy(d, dlen, "us-ascii");
+ if (b && b->type != TYPETEXT)
+ return NULL;
- return d;
+ p = b ? parameter_getval(b->parameter, "charset") : NULL;
+ charset_canonicalize(d, dlen, p);
+ return d;
}
return (NULL);
}
- mutt_mktemp (buffer);
- if ((fp = safe_fopen (buffer, "w+")) == NULL)
+ fp = m_tempfile(buffer, sizeof(buffer), NONULL(Tempdir), NULL);
+ if (!fp)
return NULL;
- body = mutt_new_body ();
+ body = body_new();
body->type = TYPEMESSAGE;
body->subtype = m_strdup("rfc822");
body->filename = m_strdup(buffer);
mutt_update_encoding (body);
body->parts = body->hdr->content;
- fclose (fp);
+ m_fclose(&fp);
return (body);
}
BODY *att;
CONTENT *info;
- att = mutt_new_body ();
+ att = body_new();
att->filename = m_strdup(path);
/* Attempt to determine the appropriate content-type based on the filename
* suffix.
*/
-
-#if 0
-
- if ((n =
- mutt_lookup_mime_type (buf, sizeof (buf), xbuf, sizeof (xbuf),
- path)) != TYPEOTHER || *xbuf != '\0') {
- att->type = n;
- att->subtype = m_strdup(buf);
- att->xtype = m_strdup(xbuf);
- }
-
-#else
-
mutt_lookup_mime_type (att, path);
-#endif
-
if ((info = mutt_get_content_info (path, att)) == NULL) {
- mutt_free_body (&att);
+ body_list_wipe(&att);
return NULL;
}
*/
att->type = TYPETEXT;
att->subtype = m_strdup("plain");
- }
- else {
+ } else {
att->type = TYPEAPPLICATION;
att->subtype = m_strdup("octet-stream");
}
}
mutt_update_encoding (att);
- return (att);
+ return att;
}
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;
+
+ if (a->encoding == ENC8BIT)
+ e = ENC8BIT;
+ }
- return (e);
+ return e;
}
BODY *mutt_make_multipart (BODY * b)
{
BODY *new;
- new = mutt_new_body ();
+ new = body_new();
new->type = TYPEMULTIPART;
new->subtype = m_strdup("mixed");
new->encoding = get_toplevel_encoding (b);
t = b;
b = b->parts;
t->parts = NULL;
- mutt_free_body (&t);
+ body_list_wipe(&t);
}
return b;
}
/* 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;
+
+ len = rfc822_write_address_single(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);
- p_delete(&ref);
+ 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);
+ }
+
+ return 0;
}
/* Note: all RFC2047 encoding should be done outside of this routine, except
* anonymous remailer chains.
*
*/
-
int mutt_write_rfc822_header (FILE * fp, ENVELOPE * env, BODY * attach,
int mode, int privacy)
{
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))
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))
-
/* OPTUSEFROM is not consulted here so that we can still write a From:
* field if the user sets it with the `my_hdr' command
*/
#ifdef USE_NNTP
if (!option (OPTNEWSSEND))
#endif
- if (EDIT_HEADER("To:"))
+ if (edit_header(mode, "To:"))
fputs ("To:\n", fp);
if (env->cc) {
#ifdef USE_NNTP
if (!option (OPTNEWSSEND))
#endif
- if (EDIT_HEADER("Cc:"))
+ if (edit_header(mode, "Cc:"))
fputs ("Cc:\n", fp);
if (env->bcc) {
#ifdef USE_NNTP
if (!option (OPTNEWSSEND))
#endif
- if (EDIT_HEADER("Bcc:"))
+ 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("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("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("X-Comment-To:"))
+ edit_header(mode, "X-Comment-To:"))
fputs ("X-Comment-To:\n", fp);
#endif
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 */
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)
fputc ('\n', fp);
}
-#undef EDIT_HEADER
-
/* Add any user defined headers */
for (; tmp; tmp = tmp->next) {
if ((p = strchr (tmp->data, ':'))) {
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);
}
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) \
tm = gmtime (&now);
while (*fmt) {
+ static char MsgIdPfx = 'A';
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;
-
- if (!(fqdn = mutt_fqdn (0)))
- fqdn = NONULL (Hostname);
+ char buf[SHORT_STRING];
+ char localpart[SHORT_STRING];
+ const char *fqdn;
- localpart_length = sizeof (buf) - m_strlen(fqdn) - 4; /* the 4 characters are '<', '@', '>' and '\0' */
+ if (!(fqdn = mutt_fqdn(0)))
+ fqdn = NONULL(Hostname);
- 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 RETSIGTYPE alarm_handler (int sig __attribute__ ((unused)))
{
SigAlrm = 1;
}
setsid ();
/* next we close all open files */
-#if defined(OPEN_MAX)
- for (fd = 0; fd < OPEN_MAX; fd++)
- close (fd);
-#elif defined(_POSIX_OPEN_MAX)
- for (fd = 0; fd < _POSIX_OPEN_MAX; fd++)
+ for (fd = 0; fd < getdtablesize(); fd++)
close (fd);
-#else
- close (0);
- close (1);
- close (2);
-#endif
/* now the second fork() */
if ((pid = fork ()) == 0) {
_exit (S_ERR);
}
- execv (path, args);
+ execv (path, (char**)args);
_exit (S_ERR);
}
else if (pid == -1) {
mutt_FormatString (cmd, sizeof (cmd), NONULL (Inews), nntp_format_str, 0,
0);
- if (!*cmd) {
+ if (m_strisempty(cmd)) {
i = nntp_post (msg);
unlink (msg);
return i;
args = add_option(args, &argslen, &argsmax, "-B8BITMIME");
if (option (OPTENVFROM)) {
- address_t *f = NULL;
+ address_t *f = EnvFrom;
if (EnvFrom)
f = EnvFrom;
else if (from && !from->next)
}
#endif
- 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_do_pager(_("Output of the delivery process"), childout, 0,
+ NULL);
}
}
- }
- else
+ } else {
unlink (childout);
+ }
p_delete(&childout);
p_delete(&path);
return mutt_invoke_sendmail (from, to, cc, bcc, msg, eightbit);
}
-/* appends string 'b' to string 'a', and returns the pointer to the new
- string. */
-char *mutt_append_string (char *a, const char *b)
-{
- ssize_t la = m_strlen(a);
-
- p_realloc(&a, la + m_strlen(b) + 1);
- strcpy (a + la, b); /* __STRCPY_CHECKED__ */
- return (a);
-}
-
-/* returns 1 if char `c' needs to be quoted to protect from shell
- interpretation when executing commands in a subshell */
-#define INVALID_CHAR(c) (!isalnum ((unsigned char)c) && !strchr ("@.+-_,:", c))
-
-/* returns 1 if string `s' contains characters which could cause problems
- when used on a command line to execute a command */
-int mutt_needs_quote (const char *s)
-{
- while (*s) {
- if (INVALID_CHAR (*s))
- return 1;
- s++;
- }
- return 0;
-}
-
-/* Quote a string to prevent shell escapes when this string is used on the
- command line to send mail. */
-char *mutt_quote_string (const char *s)
-{
- char *r, *pr;
- ssize_t rlen;
-
- rlen = m_strlen(s) + 3;
- pr = r = p_new(char, rlen);
- *pr++ = '"';
- while (*s) {
- if (INVALID_CHAR (*s)) {
- ssize_t o = pr - r;
-
- p_realloc(&r, ++rlen);
- pr = r + o;
- *pr++ = '\\';
- }
- *pr++ = *s++;
- }
- *pr++ = '"';
- *pr = 0;
- return (r);
-}
-
/* 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 (!fp)
fp = msg->fp;
- mutt_mktemp (tempfile);
- if ((f = safe_fopen (tempfile, "w")) != NULL) {
+ f = m_tempfile(tempfile, sizeof(tempfile), NONULL(Tempdir), 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)
return ret;
}
-
-/* given a list of addresses, return a list of unique addresses */
-address_t *mutt_remove_duplicates (address_t * addr)
-{
- address_t *top = addr;
- address_t **last = ⊤
- address_t *tmp;
- int dup;
-
- while (addr) {
- for (tmp = top, dup = 0; tmp && tmp != addr; tmp = tmp->next) {
- if (tmp->mailbox && addr->mailbox &&
- !ascii_strcasecmp (addr->mailbox, tmp->mailbox)) {
- dup = 1;
- break;
- }
- }
-
- if (dup) {
- *last = addr->next;
-
- addr->next = NULL;
- address_list_wipe(&addr);
-
- addr = *last;
- }
- else {
- last = &addr->next;
- addr = addr->next;
- }
- }
-
- return (top);
-}
-
static void set_noconv_flags (BODY * b, short flag)
{
for (; b; b = b->next) {
* 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);
+ tempfp = m_tempfile(tempfile, sizeof(tempfile), NONULL(Tempdir), NULL);
+ if (!tempfp) {
+ mutt_error(_("Could not create temporary file"));
mx_close_mailbox (&f, NULL);
- return (-1);
+ return -1;
}
}
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;
fputc ('\n', msg->fp);
}
-#endif
if (tempfp) {
char sasha[LONG_STRING];
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)
projects / apps / madmutt.git / blobdiff