Ticket #8173: debug_server.patch

src/kits/interface/ColumnListView.cpp

@@ -4291 +4291 @@
 {
     BScrollBar* vScrollBar = ScrollBar(B_VERTICAL);
     if (vScrollBar) {
+        fVisibleRect.PrintToStream();
         if (fItemsHeight > fVisibleRect.Height()) {
             float maxScrollBarValue = fItemsHeight - fVisibleRect.Height();
             vScrollBar->SetProportion(fVisibleRect.Height() / fItemsHeight);

src/servers/debug/DebugServer.cpp

@@ -115 +115 @@
     status_t _PopMessage(DebugMessage *&message);
 
     thread_id _EnterDebugger();
-    void _SetupGDBArguments(const char **argv, int &argc, char *teamString,
-        size_t teamStringSize, bool usingConsoled);
+    status_t _SetupGDBArguments(BString &argString, const char **argv,
+        int &argc, char *teamString, size_t teamStringSize,
+        bool usingConsoled);
     void _KillTeam();
 
     bool _HandleMessage(DebugMessage *message);
@@ -435 +436 @@
 }
 
 
-void
-TeamDebugHandler::_SetupGDBArguments(const char **argv, int &argc,
-    char *teamString, size_t teamStringSize, bool usingConsoled)
+status_t
+TeamDebugHandler::_SetupGDBArguments(BString &argString, const char **argv,
+    int &argc, char *teamString, size_t teamStringSize, bool usingConsoled)
 {
     // prepare the argument vector
     snprintf(teamString, teamStringSize, "--pid=%ld", fTeam);
@@ -449 +450 @@
         if (error != B_OK) {
             debug_printf("debug_server: can't find system-bin directory: %s\n",
                 strerror(error));
-            return;
+            return error;
         }
         error = terminalPath.Append("consoled");
         if (error != B_OK) {
             debug_printf("debug_server: can't append to system-bin path: %s\n",
                 strerror(error));
-            return;
+            return error;
         }
     } else {
         error = find_directory(B_SYSTEM_APPS_DIRECTORY, &terminalPath);
         if (error != B_OK) {
             debug_printf("debug_server: can't find system-apps directory: %s\n",
                 strerror(error));
-            return;
+            return error;
         }
         error = terminalPath.Append("Terminal");
         if (error != B_OK) {
             debug_printf("debug_server: can't append to system-apps path: %s\n",
                 strerror(error));
-            return;
+            return error;
         }
     }
 
-    argv[argc++] = terminalPath.Path();
+    argString = terminalPath.Path();
 
     if (!usingConsoled) {
         char windowTitle[64];
         snprintf(windowTitle, sizeof(windowTitle), "Debug of Team %ld: %s",
             fTeam, _LastPathComponent(fExecutablePath));
-        argv[argc++] = "-t";
-        argv[argc++] = windowTitle;
+        argString += "\xff-t\xff";
+        argString.Append(windowTitle);
     }
 
     BPath gdbPath;
@@ -487 +488 @@
     if (error != B_OK) {
         debug_printf("debug_server: can't find system-bin directory: %s\n",
             strerror(error));
-        return;
+        return error;
     }
     error = gdbPath.Append("gdb");
     if (error != B_OK) {
         debug_printf("debug_server: can't append to system-bin path: %s\n",
             strerror(error));
-        return;
+        return error;
+    }
+
+    argString += "\xff";
+    argString += gdbPath.Path();
+    argString += "\xff";
+    argString += teamString;
+    if (strlen(fExecutablePath) > 0) {
+        argString += "\xff";
+        argString += fExecutablePath;
     }
 
-    argv[argc++] = gdbPath.Path();
-    argv[argc++] = teamString;
-    if (strlen(fExecutablePath) > 0)
-        argv[argc++] = fExecutablePath;
+    int32 i = 0;
+    do {
+        argv[argc++] = &argString[i];
+        for (; argString[i] != -1 && i < argString.Length(); i++)
+            // skip to next argument
+            ;
+
+        if (i < argString.Length()) {
+            argString[i] = '\0';
+            i++;
+        }
+    } while (i < argString.Length());
+
     argv[argc] = NULL;
+
+    return B_OK;
 }
 
 
@@ -522 +543 @@
         return error;
     }
 
+    BString argString;
     const char *argv[16];
     int argc = 0;
     char teamString[32];
     bool debugInConsoled = _IsGUIServer() || !_AreGUIServersAlive();
 #ifdef HANDOVER_USE_GDB
 
-    _SetupGDBArguments(argv, argc, teamString, sizeof(teamString),
-        debugInConsoled);
+    error = _SetupGDBArguments(argString, argv, argc, teamString,
+        sizeof(teamString), debugInConsoled);
+    if (error != B_OK) {
+        debug_printf("debug_server: Failed to set up gdb arguments: %s\n",
+            strerror(error));
+        return error;
+    }
 
     // start the terminal
     TRACE(("debug_server: TeamDebugHandler::_EnterDebugger(): starting  "
@@ -537 +564 @@
 
 #elif defined(HANDOVER_USE_DEBUGGER)
     if (debugInConsoled) {
-        _SetupGDBArguments(argv, argc, teamString, sizeof(teamString),
-            debugInConsoled);
+        error = _SetupGDBArguments(argString, argv, argc, teamString,
+            sizeof(teamString), debugInConsoled);
+        if (error != B_OK) {
+            debug_printf("debug_server: Failed to set up gdb arguments: %s\n",
+                strerror(error));
+            return error;
+        }
     } else {
         // prepare the argument vector
-        snprintf(teamString, sizeof(teamString), "%ld", fTeam);
-
         BPath debuggerPath;
         error = find_directory(B_SYSTEM_APPS_DIRECTORY, &debuggerPath);
         if (error != B_OK) {
@@ -557 +587 @@
             return error;
         }
 
-        argv[argc++] = debuggerPath.Path();
-        argv[argc++] = "--team";
-        argv[argc++] = teamString;
+        argString.SetToFormat("%s --team %ld", debuggerPath.Path(), fTeam);
+
+        argv[argc++] = argString.String();
+        int32 stringOffset = strlen(debuggerPath.Path());
+        argString[stringOffset] = '\0';
+        argv[argc++] = &argString[stringOffset + 1];
+        stringOffset += 7;
+        argString[stringOffset] = '\0';
+        argv[argc++] = &argString[stringOffset + 1];
         argv[argc] = NULL;
 
         // start the debugger