add support for program_invocation[_short]_name

this is a bit ugly, and the motivation for supporting it is
questionable. however the main factors were:
1. it will be useful to have this for certain internal purposes
anyway -- things like syslog.
2. applications can just save argv[0] in main, but it's hard to fix
non-portable library code that's depending on being able to get the
invocation name without the main application's help.

diff --git a/include/errno.h b/include/errno.h
index 9e1e3202b79dcd9d024a52d76e8b5ed99cafe6ad..0361b33ad348a2ab1d3422a2399cb2e3ccf0217b 100644 (file)
--- a/include/errno.h
+++ b/include/errno.h
@@ -5,6 +5,8 @@
 extern "C" {
 #endif
 
+#include <features.h>
+
 #include <bits/errno.h>
 
 #ifdef __GNUC__
@@ -13,6 +15,10 @@ __attribute__((const))
 int *__errno_location(void);
 #define errno (*__errno_location())
 
+#ifdef _GNU_SOURCE
+extern char *program_invocation_short_name, *program_invocation_name;
+#endif
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/src/env/__libc_start_main.c b/src/env/__libc_start_main.c
index 04a454e8bf9c9031f87ac4a230627532050195b4..aef9f9ec72c6032f273309e111bc7c2b307310cd 100644 (file)
--- a/src/env/__libc_start_main.c
+++ b/src/env/__libc_start_main.c
@@ -8,8 +8,9 @@ void __init_ldso_ctors(void);
 #define AUX_CNT 38
 
 extern size_t __hwcap, __sysinfo;
+extern char *__progname, *__progname_full;
 
-void __init_libc(char **envp)
+void __init_libc(char **envp, char *pn)
 {
        size_t i, *auxv, aux[AUX_CNT] = { 0 };
        __environ = envp;
@@ -19,6 +20,11 @@ void __init_libc(char **envp)
        __hwcap = aux[AT_HWCAP];
        __sysinfo = aux[AT_SYSINFO];
 
+       if (pn) {
+               __progname = __progname_full = pn;
+               for (i=0; pn[i]; i++) if (pn[i]=='/') __progname = pn+i+1;
+       }
+
        __init_tls(aux);
        __init_security(aux);
 }
@@ -30,7 +36,7 @@ int __libc_start_main(
 {
        char **envp = argv+argc+1;
 
-       __init_libc(envp);
+       __init_libc(envp, argv[0]);
 
        libc.ldso_fini = ldso_fini;
        libc.fini = fini;

diff --git a/src/internal/libc.c b/src/internal/libc.c
index d22d274708b0d084b30cd72b713df740841e62b4..942f6b44843684631a6a906e8cfc06ebea09704e 100644 (file)
--- a/src/internal/libc.c
+++ b/src/internal/libc.c
@@ -16,3 +16,7 @@ __asm__(".hidden __libc");
 
 size_t __hwcap;
 size_t __sysinfo;
+char *__progname=0, *__progname_full=0;
+
+weak_alias(__progname, program_invocation_short_name);
+weak_alias(__progname_full, program_invocation_name);