Ticket #2185: src_servers_debug_DebugServer.cpp.diff

src/servers/debug/DebugServer.cpp

@@ -17 +17 @@
 #include <Autolock.h>
 #include <debug_support.h>
 #include <Entry.h>
+#include <FindDirectory.h>
 #include <Invoker.h>
+#include <Path.h>
 
 #include <RegistrarDefs.h>
 #include <RosterPrivate.h>
@@ -40 +42 @@
 
 static const char *kSignature = "application/x-vnd.Haiku-debug_server";
 
-// paths to the apps used for debugging
-static const char *kConsoledPath    = "/bin/consoled";
-static const char *kTerminalPath    = "/boot/beos/apps/Terminal";
-static const char *kGDBPath         = "/bin/gdb";
 
-
 // KillTeam
 static void
 KillTeam(team_id team, const char *appName = NULL)
@@ -444 +441 @@
     char teamString[32];
     snprintf(teamString, sizeof(teamString), "--pid=%ld", fTeam);
 
-    const char *terminal = (debugInConsoled ? kConsoledPath : kTerminalPath);
+    BPath terminalPath;
+    error = find_directory(B_BEOS_APPS_DIRECTORY, &terminalPath);
+    if (error == B_OK)  
+        error = terminalPath.Append("Terminal");
 
+    if (error < B_OK) {
+        debug_printf("Composing the path failed! At %s, %s, %d.\n"
+            "Reason: %s\n", __FILE__, __PRETTY_FUNCTION__, __LINE__,
+            strerror(error));
+        return error;
+    }
+
+    BPath consoledPath;
+    error = find_directory(B_BEOS_BIN_DIRECTORY, &consoledPath);
+    if (error == B_OK)  
+        error = consoledPath.Append("consoled");
+
+    if (error < B_OK) {
+        debug_printf("Composing the path failed! At %s, %s, %d.\n"
+            "Reason: %s\n", __FILE__, __PRETTY_FUNCTION__, __LINE__,
+            strerror(error));
+        return error;
+    }
+
+    const char* terminal = debugInConsoled ? consoledPath.Path()
+        : terminalPath.Path();
+
     const char *argv[16];
     int argc = 0;
 
@@ -459 +481 @@
         argv[argc++] = windowTitle;
     }
 
-    argv[argc++] = kGDBPath;
+    BPath gdbPath;
+    error = find_directory(B_BEOS_BIN_DIRECTORY, &gdbPath);
+    if (error == B_OK)
+        error = gdbPath.Append("gdb");
+
+    if (error < B_OK) {
+        debug_printf("Composing the path failed! At %s, %s, %d.\n"
+            "Reason: %s\n", __FILE__, __PRETTY_FUNCTION__, __LINE__,
+            strerror(error));
+        return error;
+    }
+
+    argv[argc++] = gdbPath.Path();
     argv[argc++] = teamString;
     if (strlen(fExecutablePath) > 0)
         argv[argc++] = fExecutablePath;