]> 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:14:06 +0000 (09:14 +0100)
* lib/progname.c (set_program_name): Keep program_invocation_name
and program_invocation_short_name consistent.

ChangeLog
lib/progname.c

index c27a4c8e12d42fab94fa632ef03593497bd3aa06..9b7991df8d731b599a9c48c65e43f4f2e183ece8 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  Pádraig Brady  <P@draigBrady.com>
 
        file-has-acl: handle NFSv4 ACLs with listxattr returning EACCES
index ee62489285bb67431c7ec1204899799173dcf57e..4a45ca349089f3ca43d3d12e722ae574c1a37448 100644 (file)
@@ -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
 }