vbox的更動 58580 路徑 trunk/src/VBox/GuestHost

時間撮記:

2015-11-5 下午02:18:59 (9 年 以前)

作者:

vboxsync

訊息:

bugref:8087: Additions/x11: support non-root X server: do not fork and exec in a shared library constructor, as this plays very badly with LD_PRELOAD.

檔案:

• trunk/src/VBox/GuestHost/OpenGL/util/process.c (修改) (4 筆差異)

trunk/src/VBox/GuestHost/OpenGL/util/process.c

@@ -15 +15 @@
 #ifndef WINDOWS
 #include <unistd.h>
+# ifdef VBOX
+#  include <string.h>
+# endif
 #else
 #pragma warning ( disable : 4127 )
@@ -130 +133 @@
         }
 #else
+#ifdef VBOX
+    const char *pszExecName, *pszProgName;
+#  ifdef SunOS
+    pszExecName = getexecname();
+#  else
+    extern const char *__progname;
+    pszExecName = __progname;
+#  endif
+    if (!pszExecName)
+        pszExecName = "<unknown>";
+    pszProgName = strrchr(pszExecName, '/');
+    if (pszProgName && *(pszProgName + 1))
+        pszProgName++;
+    else
+        pszProgName = pszExecName;
+    strncpy(name, pszProgName, maxLen);
+    name[maxLen - 1] = '\0';
+# else
         /* Unix:
          * Call getpid() to get our process ID.
@@ -149 +170 @@
         /* pipe output of ps to temp file */
 #ifndef SunOS
-# ifdef VBOX
-        snprintf(command, sizeof(command), "ps > %s", tmp);
-# else
         sprintf(command, "ps > %s", tmp);
-# endif
-#else
-# ifdef VBOX
-        snprintf(command, sizeof(command), "ps -e -o 'pid tty time comm'> %s", tmp);
-# else
+#else
         sprintf(command, "ps -e -o 'pid tty time comm'> %s", tmp);
-# endif
 #endif
         system(command);
@@ -188 +201 @@
         }
         remove(tmp);
+# endif
 #endif
 }