Also mention -- flag and ignore if undocumented

Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/10077)

diff --git a/apps/list.c b/apps/list.c
index d7c46906aa30ee371a2153be9b35f1cb0ca7b928..77fd20e1e19fdcf8d7321d575ef7a99d226ffe7b 100644 (file)
--- a/apps/list.c
+++ b/apps/list.c
@@ -337,6 +337,8 @@ static void list_options_for_command(const char *command)
             continue;
         BIO_printf(bio_out, "%s %c\n", o->name, o->valtype);
     }
             continue;
         BIO_printf(bio_out, "%s %c\n", o->name, o->valtype);
     }

+    /* Always output the -- marker since it is sometimes documented. */
+    BIO_printf(bio_out, "- -\n");

 }
 
 static void list_type(FUNC_TYPE ft, int one)
 }
 
 static void list_type(FUNC_TYPE ft, int one)

diff --git a/util/find-doc-nits b/util/find-doc-nits
index c1e33fcfe455a0eae08660d1c45a601db856141d..ea5254b729a1349cac51f70901e5867be8962777 100755 (executable)
--- a/util/find-doc-nits
+++ b/util/find-doc-nits
@@ -809,6 +809,7 @@ sub checkflags {
     }
     if ( scalar @undocced > 0 ) {
         foreach ( @undocced ) {
     }
     if ( scalar @undocced > 0 ) {
         foreach ( @undocced ) {

+            next if /-/; # Skip the -- end-of-flags marker

             err("$doc: undocumented option -$_");
         }
     }
             err("$doc: undocumented option -$_");
         }
     }