Use getexecname() if available for getprogname()

This function is present on Solaris.

diff --git a/configure.ac b/configure.ac
index 06a02b7a12aad3a73414abe1b6b15ce62e53ca61..c9cf0a46003ee30945e7d5b3b9b1661fe82a8e3c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -37,6 +37,7 @@ AC_TYPE_SIZE_T
 AC_TYPE_SSIZE_T
 
 # Checks for library functions.
+AC_CHECK_FUNCS([getexecname])
 
 AC_CONFIG_FILES([
        Makefile

diff --git a/src/progname.c b/src/progname.c
index f24071ae7c47d4706c24d430279d14e79f72bd4d..b5132d8ec0c13db88f5efd9c03c48653ba226af9 100644 (file)
--- a/src/progname.c
+++ b/src/progname.c
@@ -1,6 +1,6 @@
 /*
  * Copyright © 2006 Robert Millan
- * Copyright © 2010-2011 Guillem Jover
+ * Copyright © 2010-2012 Guillem Jover <guillem@hadrons.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -41,6 +41,10 @@ getprogname(void)
 #ifdef __GLIBC__
        if (__progname == NULL)
                __progname = program_invocation_short_name;
+#elif defined(HAVE_GETEXECNAME)
+       /* getexecname(3) returns an absolute pathname, normalize it. */
+       if (__progname == NULL)
+               setprogname(getexecname());
 #endif
 
        return __progname;