]> Savannah Git Hosting - gnulib.git/commitdiff
progname: also set program_invocation_short_name
authorPádraig Brady <P@draigBrady.com>
Sun, 12 Jan 2025 16:47:57 +0000 (16:47 +0000)
committerBruno Haible <bruno@clisp.org>
Sat, 18 Jan 2025 08:32:55 +0000 (09:32 +0100)
* lib/progname.c (set_program_name): Keep program_invocation_name
and program_invocation_short_name consistent.

ChangeLog
lib/progname.c

index a7f4b4ec29fa409413eb08dda31cc988f0c69e05..eefb49a616ccbd02828d55e47f1274d3013c81d3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2025-01-12  Pádraig Brady  <P@draigBrady.com>
+
+       progname: also set program_invocation_short_name
+       * lib/progname.c (set_program_name): Keep program_invocation_name
+       and program_invocation_short_name consistent.
+
 2025-01-11  Bruno Haible  <bruno@clisp.org>
 
        eealloc, malloca: Fix module dependencies.
index db17f5b20854835d8e48be45ba457aa20414b6b2..4a45ca349089f3ca43d3d12e722ae574c1a37448 100644 (file)
@@ -1,5 +1,5 @@
 /* Program name management.
-   Copyright (C) 2001-2003, 2005-2024 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2005-2025 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
@@ -63,12 +63,8 @@ set_program_name (const char *argv0)
       argv0 = base;
       if (strncmp (base, "lt-", 3) == 0)
         {
-          argv0 = base + 3;
-          /* On glibc systems, remove the "lt-" prefix from the variable
-             program_invocation_short_name.  */
-#if HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME
-          program_invocation_short_name = (char *) argv0;
-#endif
+          base += 3;
+          argv0 = base;
         }
     }
 
@@ -89,4 +85,7 @@ set_program_name (const char *argv0)
 #if HAVE_DECL_PROGRAM_INVOCATION_NAME
   program_invocation_name = (char *) argv0;
 #endif
+#if HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME
+  program_invocation_short_name = (char *) base;
+#endif
 }