diff options
Diffstat (limited to 'lldb/source/Host/macosx')
| -rw-r--r-- | lldb/source/Host/macosx/Host.mm | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/lldb/source/Host/macosx/Host.mm b/lldb/source/Host/macosx/Host.mm index 1e7c0de7a5e..512d3243e8e 100644 --- a/lldb/source/Host/macosx/Host.mm +++ b/lldb/source/Host/macosx/Host.mm @@ -1353,19 +1353,19 @@ Host::LaunchProcess (ProcessLaunchInfo &launch_info) } Error -Host::GlobArguments (ProcessLaunchInfo &launch_info) +Host::ShellExpandArguments (ProcessLaunchInfo &launch_info) { Error error; - if (launch_info.GetFlags().Test(eLaunchFlagGlobArguments)) + if (launch_info.GetFlags().Test(eLaunchFlagShellExpandArguments)) { - FileSpec glob_tool_spec; - if (!HostInfo::GetLLDBPath(lldb::ePathTypeSupportExecutableDir, glob_tool_spec)) + FileSpec expand_tool_spec; + if (!HostInfo::GetLLDBPath(lldb::ePathTypeSupportExecutableDir, expand_tool_spec)) { error.SetErrorString("could not find argdumper tool"); return error; } - glob_tool_spec.AppendPathComponent("argdumper"); - if (!glob_tool_spec.Exists()) + expand_tool_spec.AppendPathComponent("argdumper"); + if (!expand_tool_spec.Exists()) { error.SetErrorString("could not find argdumper tool"); return error; @@ -1373,15 +1373,15 @@ Host::GlobArguments (ProcessLaunchInfo &launch_info) std::string quoted_cmd_string; launch_info.GetArguments().GetQuotedCommandString(quoted_cmd_string); - StreamString glob_command; + StreamString expand_command; - glob_command.Printf("%s %s", - glob_tool_spec.GetPath().c_str(), - quoted_cmd_string.c_str()); + expand_command.Printf("%s %s", + expand_tool_spec.GetPath().c_str(), + quoted_cmd_string.c_str()); int status; std::string output; - RunShellCommand(glob_command.GetData(), launch_info.GetWorkingDirectory(), &status, nullptr, &output, 10); + RunShellCommand(expand_command.GetData(), launch_info.GetWorkingDirectory(), &status, nullptr, &output, 10); if (status != 0) { @@ -1409,7 +1409,7 @@ Host::GlobArguments (ProcessLaunchInfo &launch_info) error.SetErrorString("invalid JSON"); return error; } - + auto args_array_sp = args_sp->GetAsArray(); if (!args_array_sp) { |
