Changeset 97637 in vbox for trunk/src/VBox/Main

Timestamp:

Nov 21, 2022 5:10:56 PM (2 years ago)

Author:

vboxsync

Message:

Main/ClientWatcher: Use sigabbrev_np() instead of strsignal(), so that the Validation Kit's vsheriff can detect this easier [build fix for glibc < 2.32].

File:

• trunk/src/VBox/Main/src-server/ClientWatcher.cpp (modified) (1 diff)

trunk/src/VBox/Main/src-server/ClientWatcher.cpp

@@ -215 +215 @@
                         case RTPROCEXITREASON_SIGNAL:
 #if defined(RT_OS_WINDOWS) || defined(RT_OS_OS2)
-                            LogRel(("Reaper: Pid %d (%x) was signalled: (%d / %#x)\n",
-                                    pid, pid, Status.iStatus, Status.iStatus));
-#else
+                            LogRel(("Reaper: Pid %d (%x) was signalled: (%d / %#x)\n", pid, pid, Status.iStatus, Status.iStatus));
+#else /** @todo Move this to IPRT? */
+# if __GLIBC_PREREQ(2, 32)
+                            const char *pszSig = sigabbrev_np(Status.iStatus);
+# else /* glibc < 2.32 */
+                            const char *pszSig = sys_sigabbrev[Status.iStatus < RT_ELEMENTS(sys_sigabbrev) ? Status.iStatus : 0];
+# endif /* __GLIBC_PREREQ */
                             LogRel(("Reaper: Pid %d (%x) was signalled: %s (%d / %#x)\n",
-                                    pid, pid, sigabbrev_np(Status.iStatus), Status.iStatus, Status.iStatus));
+                                    pid, pid, pszSig, Status.iStatus, Status.iStatus));
 #endif
                             break;