From a43efc9294d158c62a3a04396fa3fe6c77090ba8 Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Sun, 14 Nov 2021 18:06:33 +0100
Subject: [PATCH] agent: Print the non-option warning earlier.

* agent/gpg-agent.c (main): Move detection up.
--

The problem is that PARGS is re-used and when detecting a possible
incorrect use, the flag that "--" has already been seen has gone.
---
 agent/gpg-agent.c | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
index c7479144d..b126174b7 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -1293,7 +1293,18 @@ main (int argc, char **argv )
           break;
 	}
     }
-  gnupg_argparse (NULL, &pargs, NULL);  /* Release internal state.  */
+
+  /* Print a warning if an argument looks like an option.  */
+  if (!opt.quiet && !(pargs.flags & ARGPARSE_FLAG_STOP_SEEN))
+    {
+      int i;
+
+      for (i=0; i < argc; i++)
+        if (argv[i][0] == '-' && argv[i][1] == '-')
+          log_info (_("Note: '%s' is not considered an option\n"), argv[i]);
+    }
+
+  gpgrt_argparse (NULL, &pargs, NULL);  /* Release internal state.  */
 
   if (!last_configname)
     config_filename = make_filename (gnupg_homedir (),
@@ -1310,15 +1321,6 @@ main (int argc, char **argv )
 
   finalize_rereadable_options ();
 
-  /* Print a warning if an argument looks like an option.  */
-  if (!opt.quiet && !(pargs.flags & ARGPARSE_FLAG_STOP_SEEN))
-    {
-      int i;
-
-      for (i=0; i < argc; i++)
-        if (argv[i][0] == '-' && argv[i][1] == '-')
-          log_info (_("Note: '%s' is not considered an option\n"), argv[i]);
-    }
 
 #ifdef ENABLE_NLS
   /* gpg-agent usually does not output any messages because it runs in