(__argp_parse) [!_LIBC]: Make sure program_invocation_name and program_invocation_sho...

diff --git a/lib/argp-parse.c b/lib/argp-parse.c
index 0813afc824fb3cd37db978a53ac6d8b388ac6fa0..a7de72902aae7b47feedc243aa1a49c1079b4826 100644 (file)
--- a/lib/argp-parse.c
+++ b/lib/argp-parse.c
@@ -877,6 +877,20 @@ __argp_parse (const struct argp *argp, int argc, char **argv, unsigned flags,
      to be parsed (which in some cases isn't actually an error).  */
   int arg_ebadkey = 0;
 
+#ifndef _LIBC
+  if (!(flags & ARGP_PARSE_ARGV0))
+    {
+#ifdef HAVE_DECL_PROGRAM_INVOCATION_NAME
+      if (!program_invocation_name)
+       program_invocation_name = argv[0];
+#endif
+#ifdef HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME
+      if (!program_invocation_short_name)
+       program_invocation_short_name = __argp_base_name (argv[0]);
+#endif
+    }
+#endif
+       
   if (! (flags & ARGP_NO_HELP))
     /* Add our own options.  */
     {