From e653b04bd29f35ee9703be8ee6691b4a640ee2b4 Mon Sep 17 00:00:00 2001
From: Richard Levitte <levitte@openssl.org>
Date: Fri, 28 May 2021 07:51:05 +0200
Subject: [PATCH] configdata.pm: Allow extra arguments when --query is given.

That allows operations like this:

    ./configdata.pm --query 'get_sources(@ARGV)' file1 file2 file3

Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15514)
---
 configdata.pm.in | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/configdata.pm.in b/configdata.pm.in
index 57ad440fa4..14da489cd3 100644
--- a/configdata.pm.in
+++ b/configdata.pm.in
@@ -178,7 +178,10 @@ _____
                'man'                    => \$man)
         or die "Errors in command line arguments\n";
 
-    if (scalar @ARGV > 0) {
+    # We allow extra arguments with --query.  That allows constructs like
+    # this:
+    # ./configdata.pm --query 'get_sources(@ARGV)' file1 file2 file3
+    if (!$query && scalar @ARGV > 0) {
         print STDERR <<"_____";
 Unrecognised arguments.
 For more information, do '$0 --help'