#include <signal.h>
#include <sys/utsname.h>
+#include <lib-lua/lib-lua.h>
#include <lib-sys/exit.h>
#include <lib-sys/mutt_signal.h>
#include <lib-mime/mime.h>
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;
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(MCharset.file_charset)
+ ? FileCharset : MCharset.charset;
+ if (MCharset.charset && (chs || MCharset.send_charset) &&
+ convert_file_from_to (fp, fchs, chs ? chs : MCharset.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"
- : Charset && !charset_is_us_ascii(Charset) ? Charset : "unknown-8bit"));
+ : MCharset.charset && !charset_is_us_ascii(MCharset.charset)
+ ? MCharset.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(MCore.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(Tempdir), NULL);
+ fpout = m_tempfile(temp, sizeof(temp), NONULL(MCore.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(Tempdir), NULL);
+ s.fpout = m_tempfile(buff, sizeof(buff), NONULL(MCore.tmpdir), NULL);
if (!s.fpout) {
mutt_error(_("Could not create temporary file"));
return;
/* 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 =
return (NULL);
}
- fp = m_tempfile(buffer, sizeof(buffer), NONULL(Tempdir), NULL);
+ fp = m_tempfile(buffer, sizeof(buffer), NONULL(MCore.tmpdir), NULL);
if (!fp)
return NULL;
while (addr) {
char buf[LONG_STRING];
- int len;
-
- len = rfc822_write_address_single(buf, ssizeof(buf), addr, display);
+ int len = rfc822_addrcpy(buf, ssizeof(buf), addr, display);
if (!first) {
if (linelen + len > 74) {
*/
if (env->from && !privacy) {
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);
}
os = (uname(&un) == -1) ? "UNIX" : un.sysname;
}
/* Add a vanity header */
- fprintf (fp, "User-Agent: %s (%s)\n", mutt_make_version (0), os);
+ fprintf (fp, "User-Agent: %s (%s)\n", mutt_make_version(), os);
}
return (ferror (fp) == 0 ? 0 : -1);
}
}
-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 (MCore.hostname && MCore.hostname[0] != '@') {
+ p = MCore.hostname;
if (may_hide_host && option (OPTHIDDENHOST)) {
- if ((p = strchr (Fqdn, '.')))
+ if ((p = strchr(MCore.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 = MCore.hostname;
}
}
static char *mutt_gen_msgid (void)
{
- char buf[SHORT_STRING];
- char localpart[SHORT_STRING];
+ char buf[STRING];
+ char localpart[STRING];
const char *fqdn;
if (!(fqdn = mutt_fqdn(0)))
- fqdn = NONULL(Hostname);
+ fqdn = NONULL(MCore.shorthost);
mutt_gen_localpart(localpart, sizeof(localpart), MsgIdFormat);
snprintf(buf, sizeof(buf), "<%s@%s>", localpart, fqdn);
sigaddset (&set, SIGTSTP);
sigprocmask (SIG_BLOCK, &set, NULL);
- if (SendmailWait >= 0) {
+ if (MTransport.sendmail_wait >= 0) {
char tmp[_POSIX_PATH_MAX];
mutt_mktemp (tmp);
}
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);
}
const char *msg, /* file containing message */
int eightbit)
{ /* message contains 8bit chars */
- char *ps = NULL, *path = NULL, *s = NULL, *childout = NULL;
+ 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];
-
- mutt_FormatString (cmd, sizeof (cmd), NONULL (Inews), nntp_format_str, 0,
- 0);
+ m_strformat(cmd, sizeof(cmd), 0, Inews, nntp_format_str, 0, 0);
if (m_strisempty(cmd)) {
i = nntp_post (msg);
unlink (msg);
return i;
}
-
- s = m_strdup(cmd);
- }
- else
+ } else
#endif
- s = m_strdup(Sendmail);
+ {
+ m_strcpy(cmd, sizeof(cmd), MTransport.sendmail);
+ }
- ps = s;
+ ps = cmd;
i = 0;
- while ((ps = strtok (ps, " "))) {
+ while ((ps = strtok(ps, " "))) {
if (argslen == argsmax)
p_realloc(&args, argsmax += 5);
#ifdef USE_NNTP
if (!option (OPTNEWSSEND)) {
#endif
- if (eightbit && option (OPTUSE8BITMIME))
+ if (eightbit && MTransport.use_8bitmime)
args = add_option(args, &argslen, &argsmax, "-B8BITMIME");
- if (option (OPTENVFROM)) {
- address_t *f = EnvFrom;
- if (EnvFrom)
- f = EnvFrom;
- else if (from && !from->next)
+ 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 (DsnNotify) {
+ if (MTransport.dsn_notify) {
args = add_option (args, &argslen, &argsmax, "-N");
- args = add_option (args, &argslen, &argsmax, DsnNotify);
+ args = add_option (args, &argslen, &argsmax, MTransport.dsn_notify);
}
- if (DsnReturn) {
+ if (MTransport.dsn_return) {
args = add_option (args, &argslen, &argsmax, "-R");
- args = add_option (args, &argslen, &argsmax, DsnReturn);
+ args = add_option (args, &argslen, &argsmax, MTransport.dsn_return);
}
args = add_option (args, &argslen, &argsmax, "--");
args = add_args (args, &argslen, &argsmax, to);
p_delete(&childout);
p_delete(&path);
- p_delete(&s);
p_delete(&args);
if (i == (EX_OK & 0xff))
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;
- f = m_tempfile(tempfile, sizeof(tempfile), NONULL(Tempdir), NULL);
+ f = m_tempfile(tempfile, sizeof(tempfile), NONULL(MCore.tmpdir), NULL);
if (f) {
int ch_flags = CH_XMIT | CH_NONEWLINE | CH_NOQFROM;
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);
+ rfc822_addrcat(resent_from, sizeof(resent_from), from, 0);
#ifdef USE_NNTP
unset_option (OPTNEWSSEND);
* the message body begins with "From "
*/
if (f.magic == M_MMDF || f.magic == M_MBOX) {
- tempfp = m_tempfile(tempfile, sizeof(tempfile), NONULL(Tempdir), NULL);
+ tempfp = m_tempfile(tempfile, sizeof(tempfile), NONULL(MCore.tmpdir), NULL);
if (!tempfp) {
mutt_error(_("Could not create temporary file"));
mx_close_mailbox (&f, NULL);
projects / apps / madmutt.git / blobdiff