[groff] 01/01: In groff(1), fix the combination of -v with -k, -j, and -J.

[Ingo Schwarze]

schwarze pushed a commit to branch master
in repository groff.

commit d793cb747ee9ffbb6ff91f0f2082b30290eca44e
Author: Ingo Schwarze <schwarze@openbsd.org>
AuthorDate: Wed Oct 14 00:44:42 2020 +0200

    In groff(1), fix the combination of -v with -k, -j, and -J.
    
    * src/roff/groff/groff.cpp: Pass the -v option through to the
    preconv, chem, and ideal preprocessors, just like for all
    other preprocessors, to print the version of the preprocessor
    and to avoid garbage output.
    
    Bugfix patch from Eli Zaretskii <eliz at gnu dot org>
    submitted in: https://savannah.gnu.org/bugs/?55297
---
 ChangeLog                | 14 +++++++++++++-
 src/roff/groff/groff.cpp |  4 ++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index d80975b..d1887cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,16 @@
-2020-10-12 Bertrand Garrigues <bertrand.garrigues@laposte.net>
+2020-10-14  Ingo Schwarze <schwarze@openbsd.org>
+
+       In groff(1), fix the combination of -v with -k, -j, and -J.
+
+       * src/roff/groff/groff.cpp: Pass the -v option through to the
+       preconv, chem, and ideal preprocessors, just like for all
+       other preprocessors, to print the version of the preprocessor
+       and to avoid garbage output.
+
+       Bugfix patch from Eli Zaretskii <eliz at gnu dot org>
+       submitted in: https://savannah.gnu.org/bugs/?55297
+
+2020-10-12  Bertrand Garrigues <bertrand.garrigues@laposte.net>
 
        Update 'gnulib' submodule.
 
diff --git a/src/roff/groff/groff.cpp b/src/roff/groff/groff.cpp
index a3815bf..f568ac0 100644
--- a/src/roff/groff/groff.cpp
+++ b/src/roff/groff/groff.cpp
@@ -228,6 +228,10 @@ int main(int argc, char **argv)
        "named COPYING.\n");
       printf("\ncalled subprograms:\n\n");
       fflush(stdout);
+      // Pass -v to all possible subprograms
+      commands[PRECONV_INDEX].append_arg(buf);
+      commands[CHEM_INDEX].append_arg(buf);
+      commands[IDEAL_INDEX].append_arg(buf);
       commands[POST_INDEX].append_arg(buf);
       // fall through
     case 'C':