maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Try a little harder to provide a legit CWD to argdumper if 

the user hasn't provided one.

llvm-svn: 252023
This commit is contained in:
Jim Ingham 2015-11-04 01:02:06 +00:00
parent 5365a01dc7
commit 6d9880a6b4
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lldb/source/Host/macosx/Host.mm
View File

@ -45,6 +45,7 @@
#include <pwd.h>
#include <spawn.h>
#include <stdio.h>
#include <stdlib.h>
#include <sys/proc.h>
#include <sys/stat.h>
#include <sys/sysctl.h>
@ -1371,7 +1372,24 @@ Host::ShellExpandArguments (ProcessLaunchInfo &launch_info)
int status;
std::string output;
RunShellCommand(expand_command, launch_info.GetWorkingDirectory(), &status, nullptr, &output, 10);
FileSpec cwd(launch_info.GetWorkingDirectory());
if (!cwd.Exists())
{
char *wd = getcwd(nullptr, 0);
if (wd == nullptr)
{
error.SetErrorStringWithFormat("cwd does not exist; cannot launch with shell argument expansion");
return error;
}
else
{
FileSpec working_dir(wd, false);
free(wd);
launch_info.SetWorkingDirectory(working_dir);
}
}
RunShellCommand(expand_command, cwd, &status, nullptr, &output, 10);
if (status != 0)
{