/*
+ * Copyright notice from original mutt:
* Copyright (C) 1996-2002 Michael R. Elkins <me@mutt.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ *
+ * This file is part of mutt-ng, see http://www.muttng.org/.
+ * It's licensed under the GNU General Public License,
+ * please see the file GPL in the top level source directory.
*/
#define _SENDLIB_C 1
#endif
#include "mutt.h"
+#include "ascii.h"
+#include "handler.h"
+#include "recvattach.h"
#include "mutt_curses.h"
#include "rfc2047.h"
#include "rfc2231.h"
#include "mx.h"
#include "mime.h"
-#include "mailbox.h"
#include "copy.h"
#include "pager.h"
#include "charset.h"
#include "mutt_crypt.h"
#include "mutt_idna.h"
+#include "svnrev.h"
+
+#include "lib/mem.h"
+#include "lib/str.h"
+#include "lib/intl.h"
+#include "lib/debug.h"
#include <string.h>
#include <stdlib.h>
extern char RFC822Specials[];
-static struct sysexits {
- int v;
- const char *str;
-} sysexits_h[] = {
-#ifdef EX_USAGE
- {
- 0xff & EX_USAGE, "Bad usage."},
-#endif
-#ifdef EX_DATAERR
- {
- 0xff & EX_DATAERR, "Data format error."},
-#endif
-#ifdef EX_NOINPUT
- {
- 0xff & EX_NOINPUT, "Cannot open input."},
-#endif
-#ifdef EX_NOUSER
- {
- 0xff & EX_NOUSER, "User unknown."},
-#endif
-#ifdef EX_NOHOST
- {
- 0xff & EX_NOHOST, "Host unknown."},
-#endif
-#ifdef EX_UNAVAILABLE
- {
- 0xff & EX_UNAVAILABLE, "Service unavailable."},
-#endif
-#ifdef EX_SOFTWARE
- {
- 0xff & EX_SOFTWARE, "Internal error."},
-#endif
-#ifdef EX_OSERR
- {
- 0xff & EX_OSERR, "Operating system error."},
-#endif
-#ifdef EX_OSFILE
- {
- 0xff & EX_OSFILE, "System file missing."},
-#endif
-#ifdef EX_CANTCREAT
- {
- 0xff & EX_CANTCREAT, "Can't create output."},
-#endif
-#ifdef EX_IOERR
- {
- 0xff & EX_IOERR, "I/O error."},
-#endif
-#ifdef EX_TEMPFAIL
- {
- 0xff & EX_TEMPFAIL, "Deferred."},
-#endif
-#ifdef EX_PROTOCOL
- {
- 0xff & EX_PROTOCOL, "Remote protocol error."},
-#endif
-#ifdef EX_NOPERM
- {
- 0xff & EX_NOPERM, "Insufficient permission."},
-#endif
-#ifdef EX_CONFIG
- {
- 0xff & EX_NOPERM, "Local configuration error."},
-#endif
- {
- S_ERR, "Exec error."}, {
- -1, NULL}
-};
-
-
-
#define DISPOSITION(X) X==DISPATTACH?"attachment":"inline"
const char MimeSpecials[] = "@.,;:<>[]\\\"()?/= \t";
}
/* Escape lines that begin with/only contain "the message separator". */
- if (linelen == 4 && !mutt_strncmp ("From", line, 4)) {
+ if (linelen == 4 && !str_ncmp ("From", line, 4)) {
strfcpy (line, "=46rom", sizeof (line));
linelen = 6;
}
- else if (linelen == 4 && !mutt_strncmp ("from", line, 4)) {
+ else if (linelen == 4 && !str_ncmp ("from", line, 4)) {
strfcpy (line, "=66rom", sizeof (line));
linelen = 6;
}
fprintf (f, "Content-Type: %s/%s", TYPE (a), a->subtype);
if (a->parameter) {
- len = 25 + mutt_strlen (a->subtype); /* approximate len. of content-type */
+ len = 25 + str_len (a->subtype); /* approximate len. of content-type */
for (p = a->parameter; p; p = p->next) {
char *tmp;
fputc (';', f);
buffer[0] = 0;
- tmp = safe_strdup (p->value);
+ tmp = str_dup (p->value);
encode = rfc2231_encode_string (&tmp);
rfc822_cat (buffer, sizeof (buffer), tmp, MimeSpecials);
&& !strcmp (buffer, tmp))
snprintf (buffer, sizeof (buffer), "\"%s\"", tmp);
- FREE (&tmp);
+ mem_free (&tmp);
- tmplen = mutt_strlen (buffer) + mutt_strlen (p->attribute) + 1;
+ tmplen = str_len (buffer) + str_len (p->attribute) + 1;
if (len + tmplen + 2 > 76) {
fputs ("\n\t", f);
t = fn;
buffer[0] = 0;
- tmp = safe_strdup (t);
+ tmp = str_dup (t);
encode = rfc2231_encode_string (&tmp);
rfc822_cat (buffer, sizeof (buffer), tmp, MimeSpecials);
- FREE (&tmp);
+ mem_free (&tmp);
fprintf (f, "; filename%s=%s", encode ? "*" : "", buffer);
}
}
if (a->type == TYPEMULTIPART) {
/* First, find the boundary to use */
if (!(p = mutt_get_parameter ("boundary", a->parameter))) {
- dprint (1,
- (debugfile,
- "mutt_write_mime_body(): no boundary parameter found!\n"));
+ debug_print (1, ("no boundary parameter found!\n"));
mutt_error _("No boundary parameter found! [report this error]");
return (-1);
/* This is pretty gross, but it's the best solution for now... */
if ((WithCrypto & APPLICATION_PGP)
&& a->type == TYPEAPPLICATION
- && mutt_strcmp (a->subtype, "pgp-encrypted") == 0) {
+ && str_cmp (a->subtype, "pgp-encrypted") == 0) {
fputs ("Version: 1\n", f);
return 0;
}
if ((fpin = fopen (a->filename, "r")) == NULL) {
- dprint (1,
- (debugfile, "write_mime_body: %s no longer exists!\n",
- a->filename));
+ debug_print (1, ("%s no longer exists!\n", a->filename));
mutt_error (_("%s no longer exists!"), a->filename);
return -1;
}
if (cd1 == (iconv_t) (-1))
return -1;
- cd = safe_calloc (ncodes, sizeof (iconv_t));
- score = safe_calloc (ncodes, sizeof (size_t));
- states = safe_calloc (ncodes, sizeof (CONTENT_STATE));
- infos = safe_calloc (ncodes, sizeof (CONTENT));
+ cd = mem_calloc (ncodes, sizeof (iconv_t));
+ score = mem_calloc (ncodes, sizeof (size_t));
+ states = mem_calloc (ncodes, sizeof (CONTENT_STATE));
+ infos = mem_calloc (ncodes, sizeof (CONTENT));
for (i = 0; i < ncodes; i++)
if (ascii_strcasecmp (tocodes[i], "UTF-8"))
iconv_close (cd[i]);
iconv_close (cd1);
- FREE (&cd);
- FREE (&infos);
- FREE (&score);
- FREE (&states);
+ mem_free (&cd);
+ mem_free (&infos);
+ mem_free (&score);
+ mem_free (&states);
return ret;
#else
}
/* Copy them */
- tcode = safe_malloc (ncodes * sizeof (char *));
+ tcode = mem_malloc (ncodes * sizeof (char *));
for (c = tocodes, i = 0; c; c = c1 ? c1 + 1 : 0, i++) {
if ((c1 = strchr (c, ':')) == c)
continue;
- tcode[i] = mutt_substrdup (c, c1);
+ tcode[i] = str_substrdup (c, c1);
}
ret = (size_t) (-1);
for (c = fromcodes; c; c = c1 ? c1 + 1 : 0) {
if ((c1 = strchr (c, ':')) == c)
continue;
- fcode = mutt_substrdup (c, c1);
+ fcode = str_substrdup (c, c1);
ret = convert_file_to (file, fcode, ncodes, (const char **) tcode,
&cn, info);
tcode[cn] = 0;
break;
}
- FREE (&fcode);
+ mem_free (&fcode);
}
}
else {
/* Free memory */
for (i = 0; i < ncodes; i++)
- FREE (&tcode[i]);
+ mem_free (&tcode[i]);
- FREE (tcode);
+ mem_free (tcode);
return ret;
}
CONTENT *info;
CONTENT_STATE state;
FILE *fp = NULL;
- char *fromcode;
+ char *fromcode = NULL;
char *tocode;
char buffer[100];
char chsbuf[STRING];
}
if ((fp = fopen (fname, "r")) == NULL) {
- dprint (1, (debugfile, "mutt_get_content_info: %s: %s (errno %d).\n",
- fname, strerror (errno), errno));
+ debug_print (1, ("%s: %s (errno %d).\n", fname, strerror (errno), errno));
return (NULL);
}
- info = safe_calloc (1, sizeof (CONTENT));
+ info = mem_calloc (1, sizeof (CONTENT));
memset (&state, 0, sizeof (state));
if (b != NULL && b->type == TYPETEXT && (!b->noconv && !b->force_charset)) {
mutt_set_parameter ("charset", chsbuf, &b->parameter);
}
b->file_charset = fromcode;
- FREE (&tocode);
+ mem_free (&tocode);
safe_fclose (&fp);
return info;
}
type = TYPEOTHER;
cur_sze = 0;
- szf = mutt_strlen (path);
+ szf = str_len (path);
for (count = 0; count < 3; count++) {
/*
snprintf (buf, sizeof (buf), "%s/.mime.types", NONULL (Homedir));
break;
case 1:
- strfcpy (buf, SYSCONFDIR "/mime.types", sizeof (buf));
+ strfcpy (buf, SYSCONFDIR "/muttng-mime.types", sizeof (buf));
break;
case 2:
strfcpy (buf, PKGDATADIR "/mime.types", sizeof (buf));
break;
default:
- dprint (1,
- (debugfile,
- "mutt_lookup_mime_type: Internal error, count = %d.\n",
- count));
+ debug_print (1, ("Internal error, count = %d.\n", count));
goto bye; /* shouldn't happen */
}
/* cycle through the file extensions */
while ((p = strtok (p, " \t\n"))) {
- sze = mutt_strlen (p);
+ sze = str_len (p);
if ((sze > cur_sze) && (szf >= sze) &&
- (mutt_strcasecmp (path + szf - sze, p) == 0
+ (str_casecmp (path + szf - sze, p) == 0
|| ascii_strcasecmp (path + szf - sze, p) == 0) && (szf == sze
|| path[szf
-
for (q = p; *q && !ISSPACE (*q); q++);
- mutt_substrcpy (subtype, p, q, sizeof (subtype));
+ str_substrcpy (subtype, p, q, sizeof (subtype));
if ((type = mutt_check_mime_type (ct)) == TYPEOTHER)
strfcpy (xtype, ct, sizeof (xtype));
if (type != TYPEOTHER || *xtype != '\0') {
att->type = type;
- mutt_str_replace (&att->subtype, subtype);
- mutt_str_replace (&att->xtype, xtype);
+ str_replace (&att->subtype, subtype);
+ str_replace (&att->xtype, xtype);
}
return (type);
mutt_write_mime_body (a->parts, fpout);
cleanup:
- FREE (&line);
+ mem_free (&line);
if (fpin && !fp)
fclose (fpin);
a->d_filename = a->filename;
if (a->filename && a->unlink)
unlink (a->filename);
- a->filename = safe_strdup (temp);
+ a->filename = str_dup (temp);
a->unlink = 1;
if (stat (a->filename, &sb) == -1) {
mutt_perror ("stat");
mutt_decode_attachment (a, &s);
fclose (s.fpout);
a->d_filename = a->filename;
- a->filename = safe_strdup (buff);
+ a->filename = str_dup (buff);
a->unlink = 1;
if (stat (a->filename, &sb) == -1) {
mutt_perror ("stat");
mutt_set_encoding (a, info);
mutt_stamp_attachment (a);
- FREE (&a->content);
+ mem_free (&a->content);
a->content = info;
}
body = mutt_new_body ();
body->type = TYPEMESSAGE;
- body->subtype = safe_strdup ("rfc822");
- body->filename = safe_strdup (buffer);
+ body->subtype = str_dup ("rfc822");
+ body->filename = str_dup (buffer);
body->unlink = 1;
body->use_disp = 0;
body->disposition = DISPINLINE;
CONTENT *info;
att = mutt_new_body ();
- att->filename = safe_strdup (path);
+ att->filename = str_dup (path);
/* Attempt to determine the appropriate content-type based on the filename
* suffix.
mutt_lookup_mime_type (buf, sizeof (buf), xbuf, sizeof (xbuf),
path)) != TYPEOTHER || *xbuf != '\0') {
att->type = n;
- att->subtype = safe_strdup (buf);
- att->xtype = safe_strdup (xbuf);
+ att->subtype = str_dup (buf);
+ att->xtype = str_dup (xbuf);
}
#else
* chars if this is really a binary file...
*/
att->type = TYPETEXT;
- att->subtype = safe_strdup ("plain");
+ att->subtype = str_dup ("plain");
}
else {
att->type = TYPEAPPLICATION;
- att->subtype = safe_strdup ("octet-stream");
+ att->subtype = str_dup ("octet-stream");
}
}
new = mutt_new_body ();
new->type = TYPEMULTIPART;
- new->subtype = safe_strdup ("mixed");
+ new->subtype = str_dup ("mixed");
new->encoding = get_toplevel_encoding (b);
mutt_generate_boundary (&new->parameter);
new->use_disp = 0;
adr->next = NULL;
buf[0] = 0;
rfc822_write_address (buf, sizeof (buf), adr, display);
- len = mutt_strlen (buf);
+ len = str_len (buf);
if (count && linelen + len > 74) {
fputs ("\n\t", fp);
linelen = len + 8; /* tab is usually about 8 spaces... */
for (; (TrimRef == 0 || refcnt < TrimRef) && r; r = r->next) {
if (refcnt == refmax)
- safe_realloc (&ref, (refmax += REF_INC) * sizeof (LIST *));
+ mem_realloc (&ref, (refmax += REF_INC) * sizeof (LIST *));
ref[refcnt++] = r;
}
fputs (ref[refcnt]->data, f);
}
- FREE (&ref);
+ mem_free (&ref);
}
/* Note: all RFC2047 encoding should be done outside of this routine, except
}
}
/* Add a vanity header */
- fprintf (fp, "User-Agent: mutt-ng %s (%s)\n", MUTT_VERSION, os);
+ fprintf (fp, "User-Agent: %s (%s)\n", mutt_make_version (0), os);
}
return (ferror (fp) == 0 ? 0 : -1);
i = p - h->data;
++p;
SKIPWS (p);
- tmp = safe_strdup (p);
+ tmp = str_dup (p);
if (!tmp)
continue;
rfc2047_encode_string (&tmp);
- safe_realloc (&h->data,
- mutt_strlen (h->data) + 2 + mutt_strlen (tmp) + 1);
+ mem_realloc (&h->data,
+ str_len (h->data) + 2 + str_len (tmp) + 1);
sprintf (h->data + i, ": %s", NONULL (tmp)); /* __SPRINTF_CHECKED__ */
- FREE (&tmp);
+ mem_free (&tmp);
}
}
return;
case 'd':
snprintf (tmp, sizeof (tmp), "%02d", tm->tm_mday);
- safe_strncat (buf, len, tmp, 2);
+ str_ncat (buf, len, tmp, 2);
break;
case 'h':
snprintf (tmp, sizeof (tmp), "%02d", tm->tm_hour);
- safe_strncat (buf, len, tmp, 2);
+ str_ncat (buf, len, tmp, 2);
break;
case 'm':
snprintf (tmp, sizeof (tmp), "%02d", tm->tm_mon + 1);
- safe_strncat (buf, len, tmp, 2);
+ str_ncat (buf, len, tmp, 2);
break;
case 'M':
snprintf (tmp, sizeof (tmp), "%02d", tm->tm_min);
- safe_strncat (buf, len, tmp, 2);
+ str_ncat (buf, len, tmp, 2);
break;
case 'O':
snprintf (tmp, sizeof (tmp), "%lo", (unsigned long) now);
- safe_strncat (buf, len, tmp, strlen (tmp));
+ str_ncat (buf, len, tmp, str_len (tmp));
break;
case 'p':
snprintf (tmp, sizeof (tmp), "%u", (unsigned int) getpid ());
- safe_strncat (buf, len, tmp, strlen (tmp));
+ str_ncat (buf, len, tmp, str_len (tmp));
break;
case 'P':
snprintf (tmp, sizeof (tmp), "%c", MsgIdPfx);
MsgIdPfx = (MsgIdPfx == 'Z') ? 'A' : MsgIdPfx + 1;
- safe_strncat (buf, len, tmp, 1);
+ str_ncat (buf, len, tmp, 1);
break;
case 'r':
snprintf (tmp, sizeof (tmp), "%u", (unsigned int) rand ());
- safe_strncat (buf, len, tmp, strlen (tmp));
+ str_ncat (buf, len, tmp, str_len (tmp));
break;
case 'R':
snprintf (tmp, sizeof (tmp), "%x", (unsigned int) rand ());
- safe_strncat (buf, len, tmp, strlen (tmp));
+ str_ncat (buf, len, tmp, str_len (tmp));
break;
case 's':
snprintf (tmp, sizeof (tmp), "%02d", tm->tm_sec);
- safe_strncat (buf, len, tmp, 2);
+ str_ncat (buf, len, tmp, 2);
break;
case 'T':
snprintf (tmp, sizeof (tmp), "%u", (unsigned int) now);
- safe_strncat (buf, len, tmp, strlen (tmp));
+ str_ncat (buf, len, tmp, str_len (tmp));
break;
case 'X':
snprintf (tmp, sizeof (tmp), "%x", (unsigned int) now);
- safe_strncat (buf, len, tmp, strlen (tmp));
+ str_ncat (buf, len, tmp, str_len (tmp));
break;
case 'Y':
snprintf (tmp, sizeof (tmp), "%04d", tm->tm_year + 1900); /* this will break in the year 10000 ;-) */
- safe_strncat (buf, len, tmp, 4);
+ str_ncat (buf, len, tmp, 4);
break;
case '%':
- safe_strncat (buf, len, "%", 1);
+ str_ncat (buf, len, "%", 1);
break;
default:
- safe_strncat (buf, len, ".", 1); /* invalid formats are replaced by '.' */
+ str_ncat (buf, len, ".", 1); /* invalid formats are replaced by '.' */
} /* switch */
++fmt;
}
char c;
c = mutt_normalized_char (*fmt); /* @todo: filter out invalid characters */
- safe_strncat (buf, len, &c, 1);
+ str_ncat (buf, len, &c, 1);
}
}
}
char buf[SHORT_STRING];
char localpart[SHORT_STRING];
unsigned int localpart_length;
- time_t now;
- struct tm *tm;
const char *fqdn;
- now = time (NULL);
- tm = gmtime (&now);
if (!(fqdn = mutt_fqdn (0)))
fqdn = NONULL (Hostname);
- localpart_length = sizeof (buf) - strlen (fqdn) - 4; /* the 4 characters are '<', '@', '>' and '\0' */
+ localpart_length = sizeof (buf) - str_len (fqdn) - 4; /* the 4 characters are '<', '@', '>' and '\0' */
mutt_gen_localpart (localpart, localpart_length, MsgIdFormat);
snprintf (buf, sizeof (buf), "<%s@%s>", localpart, fqdn);
- return (safe_strdup (buf));
+ return (str_dup (buf));
}
static RETSIGTYPE alarm_handler (int sig)
char tmp[_POSIX_PATH_MAX];
mutt_mktemp (tmp);
- *tempfile = safe_strdup (tmp);
+ *tempfile = str_dup (tmp);
}
if ((pid = fork ()) == 0) {
}
else if (pid == -1) {
unlink (msg);
- FREE (tempfile);
+ mem_free (tempfile);
_exit (S_ERR);
}
st = WIFEXITED (st) ? WEXITSTATUS (st) : S_ERR;
if (SendmailWait && st == (0xff & EX_OK)) {
unlink (*tempfile); /* no longer needed */
- FREE (tempfile);
+ mem_free (tempfile);
}
}
else {
st = (SendmailWait > 0 && errno == EINTR && SigAlrm) ? S_BKG : S_ERR;
if (SendmailWait > 0) {
unlink (*tempfile);
- FREE (tempfile);
+ mem_free (tempfile);
}
}
if (kill (ppid, 0) == -1 && errno == ESRCH) {
/* the parent is already dead */
unlink (*tempfile);
- FREE (tempfile);
+ mem_free (tempfile);
}
_exit (st);
/* weed out group mailboxes, since those are for display only */
if (addr->mailbox && !addr->group) {
if (*argslen == *argsmax)
- safe_realloc (&args, (*argsmax += 5) * sizeof (char *));
+ mem_realloc (&args, (*argsmax += 5) * sizeof (char *));
args[(*argslen)++] = addr->mailbox;
}
}
char *s)
{
if (*argslen == *argsmax)
- safe_realloc (&args, (*argsmax += 5) * sizeof (char *));
+ mem_realloc (&args, (*argsmax += 5) * sizeof (char *));
args[(*argslen)++] = s;
return (args);
}
-static const char *strsysexit (int e)
-{
- int i;
-
- for (i = 0; sysexits_h[i].str; i++) {
- if (e == sysexits_h[i].v)
- break;
- }
-
- return sysexits_h[i].str;
-}
-
-
static int mutt_invoke_sendmail (ADDRESS * from, /* the sender */
ADDRESS * to, ADDRESS * cc, ADDRESS * bcc, /* recips */
const char *msg, /* file containing message */
return i;
}
- s = safe_strdup (cmd);
+ s = str_dup (cmd);
}
else
#endif
- s = safe_strdup (Sendmail);
+ s = str_dup (Sendmail);
ps = s;
i = 0;
while ((ps = strtok (ps, " "))) {
if (argslen == argsmax)
- safe_realloc (&args, sizeof (char *) * (argsmax += 5));
+ mem_realloc (&args, sizeof (char *) * (argsmax += 5));
if (i)
args[argslen++] = ps;
else {
- path = safe_strdup (ps);
+ path = str_dup (ps);
ps = strrchr (ps, '/');
if (ps)
ps++;
#endif
if (argslen == argsmax)
- safe_realloc (&args, sizeof (char *) * (++argsmax));
+ mem_realloc (&args, sizeof (char *) * (++argsmax));
args[argslen++] = NULL;
if ((i = send_msg (path, args, msg, &childout)) != (EX_OK & 0xff)) {
if (i != S_BKG) {
- const char *e = strsysexit (i);
+ const char *e = mutt_strsysexit (i);
- e = strsysexit (i);
+ e = mutt_strsysexit (i);
mutt_error (_("Error sending message, child exited %d (%s)."), i,
NONULL (e));
if (childout) {
else
unlink (childout);
- FREE (&childout);
- FREE (&path);
- FREE (&s);
- FREE (&args);
+ mem_free (&childout);
+ mem_free (&path);
+ mem_free (&s);
+ mem_free (&args);
if (i == (EX_OK & 0xff))
i = 0;
{ /* message contains 8bit chars */
#ifdef USE_LIBESMTP
if (SmtpHost)
- return mutt_invoke_libesmtp (from, to, cc, bcc, msg, eightbit);
+ return mutt_libesmtp_invoke (from, to, cc, bcc, msg, eightbit);
#endif
return mutt_invoke_sendmail (from, to, cc, bcc, msg, eightbit);
string. */
char *mutt_append_string (char *a, const char *b)
{
- size_t la = mutt_strlen (a);
+ size_t la = str_len (a);
- safe_realloc (&a, la + mutt_strlen (b) + 1);
+ mem_realloc (&a, la + str_len (b) + 1);
strcpy (a + la, b); /* __STRCPY_CHECKED__ */
return (a);
}
char *r, *pr;
size_t rlen;
- rlen = mutt_strlen (s) + 3;
- pr = r = (char *) safe_malloc (rlen);
+ rlen = str_len (s) + 3;
+ pr = r = (char *) mem_malloc (rlen);
*pr++ = '"';
while (*s) {
if (INVALID_CHAR (*s)) {
size_t o = pr - r;
- safe_realloc (&r, ++rlen);
+ mem_realloc (&r, ++rlen);
pr = r + o;
*pr++ = '\\';
}
rfc822_cat (buffer, sizeof (buffer), "undisclosed-recipients",
RFC822Specials);
- env->to->mailbox = safe_strdup (buffer);
+ env->to->mailbox = str_dup (buffer);
}
mutt_set_followup_to (env);
- if (!env->message_id)
+ if (!env->message_id && MsgIdFormat && *MsgIdFormat)
env->message_id = mutt_gen_msgid ();
}
fseek (fp, h->offset, 0);
fprintf (f, "Resent-From: %s", resent_from);
fprintf (f, "\nResent-%s", mutt_make_date (date, sizeof (date)));
- fprintf (f, "Resent-Message-ID: %s\n", mutt_gen_msgid ());
+ if (MsgIdFormat && *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);
}
if (dup) {
- dprint (2, (debugfile, "mutt_remove_duplicates: Removing %s\n",
- addr->mailbox));
+ debug_print (2, ("Removing %s\n", addr->mailbox));
*last = addr->next;
set_noconv_flags (hdr->content, 1);
if (mx_open_mailbox (path, M_APPEND | M_QUIET, &f) == NULL) {
- dprint (1,
- (debugfile,
- "mutt_write_fcc(): unable to open mailbox %s in append-mode, aborting.\n",
- path));
+ debug_print (1, ("unable to open mailbox %s in append-mode, aborting.\n", path));
return (-1);
}
fflush (tempfp);
if (ferror (tempfp)) {
- dprint (1,
- (debugfile, "mutt_write_fcc(): %s: write failed.\n", tempfile));
+ debug_print (1, ("%s: write failed.\n", tempfile));
fclose (tempfp);
unlink (tempfile);
mx_commit_message (msg, &f); /* XXX - really? */
projects / apps / madmutt.git / blobdiff