From 725269a0b4acf8e51643a5e2236ce9d914e7c67a Mon Sep 17 00:00:00 2001 From: Johnny Chen Date: Sat, 26 Feb 2011 01:36:13 +0000 Subject: [PATCH] If the user sets a working directory path using "process launch -w ", honor that dir path; otherwise, use the thing the debugserver is started with. Fixed rdar://problem/9056462 The process launch flag '-w' for setting the current working directory not working? llvm-svn: 126537 --- lldb/tools/debugserver/source/debugserver.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lldb/tools/debugserver/source/debugserver.cpp b/lldb/tools/debugserver/source/debugserver.cpp index 8fab13f2dd73..62d0b2854551 100644 --- a/lldb/tools/debugserver/source/debugserver.cpp +++ b/lldb/tools/debugserver/source/debugserver.cpp @@ -204,10 +204,12 @@ RNBRunLoopLaunchInferior (RNBRemote *remote, const char *stdin_path, const char char launch_err_str[PATH_MAX]; launch_err_str[0] = '\0'; + const char * cwd = (ctx.GetWorkingDirPath() != NULL ? ctx.GetWorkingDirPath() + : ctx.GetWorkingDirectory()); nub_process_t pid = DNBProcessLaunch (resolved_path, &inferior_argv[0], &inferior_envp[0], - ctx.GetWorkingDirectory(), + cwd, stdin_path, stdout_path, stderr_path,