X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=sendlib.c;h=5ac02ab9a8c17b09764fcebb032fc9bc80586417;hp=e45ad112fbbee4c8cf0187a678731dfe5c4f981d;hb=6a7c1f87b97c733b63c177d41a5aca3427e9521a;hpb=2bc76f88e99c16e773c2b2ba805a0bf3e2c034fd diff --git a/sendlib.c b/sendlib.c index e45ad11..5ac02ab 100644 --- a/sendlib.c +++ b/sendlib.c @@ -15,22 +15,21 @@ #include #include #include +#include #include #include -#include - #include "mutt.h" #include "handler.h" +#include "crypt.h" #include "recvattach.h" #include "copy.h" #include "pager.h" #include "charset.h" #include "mutt_idna.h" -#include "mutt_libesmtp.h" #ifdef USE_NNTP -#include +#include "nntp.h" #endif #ifdef HAVE_SYSEXITS_H @@ -535,7 +534,6 @@ static ssize_t convert_file_to (FILE * file, const char *fromcode, 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; @@ -643,9 +641,6 @@ static ssize_t convert_file_to (FILE * file, const char *fromcode, p_delete(&states); return ret; -#else - return -1; -#endif /* !HAVE_ICONV */ } /* @@ -763,10 +758,10 @@ CONTENT *mutt_get_content_info (const char *fname, BODY * b) 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); @@ -789,8 +784,8 @@ CONTENT *mutt_get_content_info (const char *fname, BODY * b) 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; } @@ -826,7 +821,7 @@ int mutt_lookup_mime_type (BODY * att, const char *path) */ 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"); @@ -922,7 +917,7 @@ 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; @@ -987,7 +982,7 @@ static void transform_to_7bit (BODY * a, FILE * fpin) 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; @@ -1107,11 +1102,9 @@ BODY *mutt_make_message_attach (CONTEXT * ctx, HEADER * hdr, int attach_msg) if ((option (OPTMIMEFORWDECODE) || option (OPTFORWDECRYPT)) && (hdr->security & ENCRYPT)) { - if (!crypt_valid_passphrase (hdr->security)) - return (NULL); } - 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; @@ -1423,12 +1416,6 @@ int mutt_write_rfc822_header (FILE * fp, ENVELOPE * env, BODY * attach, 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 (env->subject) @@ -1494,9 +1481,9 @@ int mutt_write_rfc822_header (FILE * fp, ENVELOPE * env, BODY * attach, } if (mode == 0 && !privacy && option (OPTXMAILER) && !has_agent) { - if (MCore.operating_system) { + if (mod_core.operating_system) { fprintf(fp, "User-Agent: %s (%s)\n", mutt_make_version(), - MCore.operating_system); + mod_core.operating_system); } else { fprintf(fp, "User-Agent: %s\n", mutt_make_version()); } @@ -1535,18 +1522,18 @@ const char *mutt_fqdn(short may_hide_host) { 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; } } @@ -1649,14 +1636,14 @@ static char *mutt_gen_msgid (void) 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; } @@ -1820,11 +1807,9 @@ add_option(const char **args, ssize_t *argslen, ssize_t *argsmax, const char *s) 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; @@ -1833,12 +1818,9 @@ static int mutt_invoke_sendmail (address_t * from, /* the sender */ #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; - } + i = nntp_post(msg); + unlink(msg); + return i; } else #endif { @@ -1910,8 +1892,7 @@ static int mutt_invoke_sendmail (address_t * from, /* the sender */ struct stat st; if (!stat(childout, &st) && st.st_size > 0) - mutt_do_pager(_("Output of the delivery process"), childout, 0, - NULL); + mutt_pager(_("Output of the delivery process"), childout, 0, NULL); } } } else { @@ -1931,22 +1912,6 @@ static int mutt_invoke_sendmail (address_t * from, /* the sender */ 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) { @@ -1977,12 +1942,7 @@ void mutt_prepare_envelope (ENVELOPE * env, int final) 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); } @@ -2029,7 +1989,7 @@ static int _mutt_bounce_message (FILE * fp, HEADER * h, address_t * to, 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; @@ -2118,8 +2078,8 @@ int mutt_write_fcc (const char *path, HEADER * hdr, const char *msgid, /* 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);