commit 725269a0b4acf8e51643a5e2236ce9d914e7c67a
author Johnny Chen <johnny.chen@apple.com> Sat Feb 26 01:36:13 2011 +0000
committer Johnny Chen <johnny.chen@apple.com> Sat Feb 26 01:36:13 2011 +0000
tree 56cb07b935fc17501aea43468ab5a59c9db3fa28
parent 8f4903397df26a397aae29188c1346ff6812ddd0

If the user sets a working directory path using "process launch -w <path>", 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

diff --git a/lldb/tools/debugserver/source/debugserver.cpp b/lldb/tools/debugserver/source/debugserver.cpp
index 8fab13f..62d0b28 100644
--- a/lldb/tools/debugserver/source/debugserver.cpp
+++ b/lldb/tools/debugserver/source/debugserver.cpp
@@ -204,10 +204,12 @@
 
     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,