diff options
| author | marha <marha@users.sourceforge.net> | 2011-04-10 18:43:19 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-04-10 18:43:19 +0000 |
| commit | 2fb58f16eeec8ef3ec2a25e246477aab64e38a7d (patch) | |
| tree | a4dbbe4f2c9a6524e99452ab43c972d5dbfa015f /mesalib/src/mesa/drivers/dri/common | |
| parent | de1c6801fc854692d39fb2f8d53bf54ab25a1287 (diff) | |
| download | vcxsrv-2fb58f16eeec8ef3ec2a25e246477aab64e38a7d.tar.gz vcxsrv-2fb58f16eeec8ef3ec2a25e246477aab64e38a7d.tar.bz2 vcxsrv-2fb58f16eeec8ef3ec2a25e246477aab64e38a7d.zip | |
mesa git update
Diffstat (limited to 'mesalib/src/mesa/drivers/dri/common')
| -rw-r--r-- | mesalib/src/mesa/drivers/dri/common/xmlconfig.c | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/mesalib/src/mesa/drivers/dri/common/xmlconfig.c b/mesalib/src/mesa/drivers/dri/common/xmlconfig.c index eaba335a4..30075f253 100644 --- a/mesalib/src/mesa/drivers/dri/common/xmlconfig.c +++ b/mesalib/src/mesa/drivers/dri/common/xmlconfig.c @@ -64,7 +64,25 @@ extern char *program_invocation_name, *program_invocation_short_name; the basename to match BSD getprogname() */
# include <stdlib.h>
# include <libgen.h>
-# define GET_PROGRAM_NAME() basename(getexecname())
+
+static const char *__getProgramName () {
+ static const char *progname;
+
+ if (progname == NULL) {
+ const char *e = getexecname();
+ if (e != NULL) {
+ /* Have to make a copy since getexecname can return a readonly
+ string, but basename expects to be able to modify its arg. */
+ char *n = strdup(e);
+ if (n != NULL) {
+ progname = basename(n);
+ }
+ }
+ }
+ return progname;
+}
+
+# define GET_PROGRAM_NAME() __getProgramName()
#endif
#if !defined(GET_PROGRAM_NAME)
|