From 588b135db5d12a4fd7ded7fd40021445cbaadaaa Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 4 Oct 2009 12:14:52 +0200 Subject: [PATCH] Remove the "lt-" prefix from program_invocation_short_name. --- ChangeLog | 8 ++++++++ lib/progname.c | 9 ++++++++- modules/progname | 1 + 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 9bb6d9464..425cd05a3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2009-10-04 Bruno Haible + * lib/progname.c (set_program_name): Also remove the "lt-" prefix from + program_invocation_short_name. + * modules/progname (configure.ac): Test for presence of + program_invocation_short_name. + Reported by Sergey Poznyakoff . + +2009-10-04 Bruno Haible + * lib/progname.c (set_program_name): Fix comment. Reported by Jim Meyering. diff --git a/lib/progname.c b/lib/progname.c index 90baedaec..bfa374a52 100644 --- a/lib/progname.c +++ b/lib/progname.c @@ -48,7 +48,14 @@ set_program_name (const char *argv0) { argv0 = base; if (strncmp (base, "lt-", 3) == 0) - argv0 = base + 3; + { + 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 + } } /* But don't strip off a leading / in general, because when the user diff --git a/modules/progname b/modules/progname index 087780152..349b1ff0a 100644 --- a/modules/progname +++ b/modules/progname @@ -9,6 +9,7 @@ Depends-on: configure.ac: AC_CHECK_DECLS([program_invocation_name], [], [], [#include ]) +AC_CHECK_DECLS([program_invocation_short_name], [], [], [#include ]) Makefile.am: lib_SOURCES += progname.h progname.c -- 2.11.0