Ticket #2086: pathDetection.diff

source/lib/sysdep/os/linux/linux.cpp

@@ -7 +7 @@
  * distribute, sublicense, and/or sell copies of the Software, and to
  * permit persons to whom the Software is furnished to do so, subject to
  * the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
@@ -27 +27 @@
 #define GNU_SOURCE
 #include "mocks/dlfcn.h"
 #include "mocks/unistd.h"
-
 #include <cstdio>
 
+
+static size_t getPathFromProc(char* buffer, size_t length)
+{
+    // Ask /proc/self/exe where we are
+    if (readlink("/proc/self/exe", buffer, length-1) <= 0)
+    {
+        return -1;
+    }
+
+    // Get the last slash
+    char* endOfPath = strrchr(buffer, '/');
+    if (endOfPath == NULL)
+    {
+        return -1;
+    }
+
+    ++endOfPath;
+    *endOfPath = '\0';
+
+    return (size_t)(endOfPath - buffer);
+}
+
 OsPath sys_ExecutablePathname()
 {
+    // Try to find the Path with readlink
+    char pathBuffer[PATH_MAX];
+    if (getPathFromProc(pathBuffer, sizeof(pathBuffer)) > 0)
+    {
+        return pathBuffer;
+    }
+
     // Find the executable's filename
     Dl_info dl_info;
     memset(&dl_info, 0, sizeof(dl_info));
@@ -66 +94 @@
         return resolved;
     }
 
-    // If it's not a path at all, i.e. it's just a filename, we'd
-    // probably have to search through PATH to find it.
-    // That's complex and should be uncommon, so don't bother.
     return OsPath();
 }