From 62f20522813e5edce17a0d69128c4a5c769aa08c Mon Sep 17 00:00:00 2001 From: Rocco Rutte Date: Sun, 5 Apr 2009 13:41:15 +0200 Subject: [PATCH] Backed out changeset 23c7b469ff20 This requires more thought: if the user has -- in $sendmail, we need to add our arguments for 8BITMIME/DSN/etc. before it and not after. See #3168. --- ChangeLog | 13 ------------- init.h | 3 +-- sendlib.c | 6 +----- 3 files changed, 2 insertions(+), 20 deletions(-) diff --git a/ChangeLog b/ChangeLog index 689431e05..342a6cd0b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,16 +1,3 @@ -2009-04-02 12:57 +0200 Rocco Rutte (bfb12cf02417) - - * init.h: Clarify what $attach_charset does, closes #3165. - -2009-04-02 11:49 +0200 Rocco Rutte (1759a509dd0a) - - * ChangeLog, doc/Makefile.am: Add 'sortcheck' target to - doc/Makefile.am - - This should be used from time to time to check if vars are sorted. - - Closes #3191. - 2009-04-02 11:47 +0200 Rocco Rutte (e8cdc049cf84) * init.h: Sort $pgp_* and $crypt_* vars, see #3191. diff --git a/init.h b/init.h index be0bb00a1..cfb451f8d 100644 --- a/init.h +++ b/init.h @@ -2427,8 +2427,7 @@ struct option_t MuttVars[] = { ** .pp ** Specifies the program and arguments used to deliver mail sent by Mutt. ** Mutt expects that the specified program interprets additional - ** arguments as recipient addresses. Mutt appends all recipients after - ** adding \fC--\fP as delimiter (if not already present). + ** arguments as recipient addresses. */ { "sendmail_wait", DT_NUM, R_NONE, UL &SendmailWait, 0 }, /* diff --git a/sendlib.c b/sendlib.c index 3cb9feabf..1c9c352d4 100644 --- a/sendlib.c +++ b/sendlib.c @@ -2206,11 +2206,7 @@ mutt_invoke_sendmail (ADDRESS *from, /* the sender */ args = add_option (args, &argslen, &argsmax, "-R"); args = add_option (args, &argslen, &argsmax, DsnReturn); } - if (strstr (args, "--") == NULL) - { - /* Only append "--" if not already present. */ - args = add_option (args, &argslen, &argsmax, "--"); - } + 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); -- 2.40.0