X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=sendlib.c;h=33129ed19d0519a36342598a12467427783da55b;hp=9881bbe3aba50daeb1a5c08c18eb50dadc1ec88a;hb=dc726add2e8fe52be1f6859ea7cbe4651498eeb8;hpb=e0571c496935f226abe4a22921b5b4e10d1481e8 diff --git a/sendlib.c b/sendlib.c index 9881bbe..33129ed 100644 --- a/sendlib.c +++ b/sendlib.c @@ -15,7 +15,6 @@ #include #include #include -#include #include #include @@ -28,10 +27,6 @@ #include "charset.h" #include "mutt_idna.h" -#ifdef USE_NNTP -#include "nntp.h" -#endif - #ifdef HAVE_SYSEXITS_H #include #else /* Make sure EX_OK is defined */ @@ -1347,11 +1342,8 @@ int mutt_write_rfc822_header (FILE * fp, ENVELOPE * env, BODY * attach, string_list_t *tmp = env->userhdrs; int has_agent = 0; /* user defined user-agent header field exists */ -#ifdef USE_NNTP - if (!option (OPTNEWSSEND)) -#endif - if (mode == 0) - fputs (mutt_make_date (buffer, sizeof (buffer)), fp); + 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 @@ -1367,22 +1359,16 @@ int mutt_write_rfc822_header (FILE * fp, ENVELOPE * env, BODY * attach, mutt_write_address_list (env->to, fp, 4, 0); } else if (mode > 0) -#ifdef USE_NNTP - if (!option (OPTNEWSSEND)) -#endif - if (edit_header(mode, "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(mode, "Cc:")) - fputs ("Cc:\n", fp); + if (edit_header(mode, "Cc:")) + fputs ("Cc:\n", fp); if (env->bcc) { if (mode != 0 || option (OPTWRITEBCC)) { @@ -1391,23 +1377,8 @@ int mutt_write_rfc822_header (FILE * fp, ENVELOPE * env, BODY * attach, } } else if (mode > 0) -#ifdef USE_NNTP - if (!option (OPTNEWSSEND)) -#endif - 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(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(mode, "Followup-To:")) - fputs ("Followup-To:\n", fp); -#endif + if (edit_header(mode, "Bcc:")) + fputs ("Bcc:\n", fp); if (env->subject) fprintf (fp, "Subject: %s\n", env->subject); @@ -1425,14 +1396,10 @@ int mutt_write_rfc822_header (FILE * fp, ENVELOPE * env, BODY * attach, 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) { @@ -1805,16 +1772,7 @@ int mutt_invoke_mta(address_t *from, address_t *to, address_t *cc, ssize_t argslen = 0, argsmax = 0; int i; -#ifdef USE_NNTP - if (option (OPTNEWSSEND)) { - i = nntp_post(msg); - unlink(msg); - return i; - } else -#endif - { - m_strcpy(cmd, sizeof(cmd), MTransport.sendmail); - } + m_strcpy(cmd, sizeof(cmd), MTransport.sendmail); ps = cmd; i = 0; @@ -1837,36 +1795,30 @@ int mutt_invoke_mta(address_t *from, address_t *to, address_t *cc, i++; } -#ifdef USE_NNTP - if (!option (OPTNEWSSEND)) { -#endif - 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); - } - } - 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); + 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) p_realloc(&args, ++argsmax); @@ -2025,15 +1977,8 @@ int mutt_bounce_message (FILE * fp, HEADER * h, address_t * to) return -1; } rfc822_addrcat(resent_from, sizeof(resent_from), from, 0); - -#ifdef USE_NNTP - unset_option (OPTNEWSSEND); -#endif - ret = _mutt_bounce_message (fp, h, to, resent_from, from); - address_list_wipe(&from); - return ret; }