* fall back to prctl(PR_GET_NAME) in pa_get_binary_name() if readlink() fails

* call pa_path_get_filename() in all cases before returning in pa_get_binary_name(). We already did so on Win32, but didn't on Linux.

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1077 fefdeb5f-60dc-0310-8127-8f9354f1896f

diff --git a/configure.ac b/configure.ac
index 83cb2e1a2e559d87aeb5a2d9ff02765f927f1fc6..a36ee5a04cf2b07c1cd20a53d17e8c92699b734f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -160,6 +160,8 @@ AC_CHECK_HEADERS([linux/input.h], [HAVE_EVDEV=1], [HAVE_EVDEV=0])
 
 AM_CONDITIONAL([HAVE_EVDEV], [test "x$HAVE_EVDEV" = "x1"])
 
+AC_CHECK_HEADERS([sys/prctl.h])
+
 # Solaris
 AC_CHECK_HEADERS([sys/filio.h])
 

diff --git a/src/pulse/util.c b/src/pulse/util.c
index 338607c41e79889dcd0ba0560307efaf160f863f..b041fec80e0119f96378c1a329c4d07a8f08c9af 100644 (file)
--- a/src/pulse/util.c
+++ b/src/pulse/util.c
@@ -49,6 +49,10 @@
 #include <windows.h>
 #endif
 
+#ifdef HAVE_SYS_PRCTL_H
+#include <sys/prctl.h>
+#endif
+
 #include "../pulsecore/winsock.h"
 
 #include <pulsecore/core-error.h>
@@ -152,28 +156,51 @@ char *pa_get_home_dir(char *s, size_t l) {
 
 char *pa_get_binary_name(char *s, size_t l) {
 
-#ifdef HAVE_READLINK
-    char path[PATH_MAX];
-    int i;
-    assert(s && l);
+    assert(s);
+    assert(l);
 
-    /* This works on Linux only */
+#if defined(OS_IS_WIN32)
+    {
+        char path[PATH_MAX];
+        
+        if (GetModuleFileName(NULL, path, PATH_MAX))
+            return pa_strlcpy(s, pa_path_get_filename(path), l);
+    }
+#endif
     
-    snprintf(path, sizeof(path), "/proc/%u/exe", (unsigned) getpid());
-    if ((i = readlink(path, s, l-1)) < 0)
-        return NULL;
+#ifdef HAVE_READLINK
+    {
+        int i;
+        char path[PATH_MAX];
+        /* This works on Linux only */
+        
+        if ((i = readlink("/proc/self/exe", path, sizeof(path)-1)) >= 0) {
+            path[i] = 0;
+            return pa_strlcpy(s, pa_path_get_filename(path), l);
+        }
+    }
+    
+#endif
+    
+#if defined(HAVE_SYS_PRCTL_H) && defined(PR_GET_NAME)
+    {
 
-    s[i] = 0;
-    return s;
-#elif defined(OS_IS_WIN32)
-    char path[PATH_MAX];
-    if (!GetModuleFileName(NULL, path, PATH_MAX))
-        return NULL;
-    pa_strlcpy(s, pa_path_get_filename(path), l);
-    return s;
-#else
-    return NULL;
+        #ifndef TASK_COMM_LEN
+        /* Actually defined in linux/sched.h */
+        #define TASK_COMM_LEN 16
+        #endif
+
+        char tcomm[TASK_COMM_LEN+1];
+        memset(tcomm, 0, sizeof(tcomm));
+        
+        /* This works on Linux only */
+        if (prctl(PR_GET_NAME, (unsigned long) tcomm, 0, 0, 0) == 0)
+            return pa_strlcpy(s, tcomm, l);
+        
+    }
 #endif
+    
+    return NULL;
 }
 
 const char *pa_path_get_filename(const char *p) {