Rename the "glob arguments" feature to "shell expand arguments"
This should not bring any feature change, except changing names of things here and there
llvm-svn: 230077
diff --git a/lldb/source/Host/freebsd/Host.cpp b/lldb/source/Host/freebsd/Host.cpp
index 56e0684..e2bc1dc 100644
--- a/lldb/source/Host/freebsd/Host.cpp
+++ b/lldb/source/Host/freebsd/Host.cpp
@@ -313,7 +313,7 @@
}
Error
-Host::GlobArguments (ProcessLaunchInfo &launch_info)
+Host::ShellExpandArguments (ProcessLaunchInfo &launch_info)
{
return Error("unimplemented");
}
diff --git a/lldb/source/Host/linux/Host.cpp b/lldb/source/Host/linux/Host.cpp
index 90898c7..edad8f7 100644
--- a/lldb/source/Host/linux/Host.cpp
+++ b/lldb/source/Host/linux/Host.cpp
@@ -418,7 +418,7 @@
}
Error
-Host::GlobArguments (ProcessLaunchInfo &launch_info)
+Host::ShellExpandArguments (ProcessLaunchInfo &launch_info)
{
return Error("unimplemented");
}
diff --git a/lldb/source/Host/macosx/Host.mm b/lldb/source/Host/macosx/Host.mm
index 1e7c0de..512d324 100644
--- a/lldb/source/Host/macosx/Host.mm
+++ b/lldb/source/Host/macosx/Host.mm
@@ -1353,19 +1353,19 @@
}
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 @@
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 @@
error.SetErrorString("invalid JSON");
return error;
}
-
+
auto args_array_sp = args_sp->GetAsArray();
if (!args_array_sp)
{
diff --git a/lldb/source/Host/windows/Host.cpp b/lldb/source/Host/windows/Host.cpp
index afd3e42..052e6aa 100644
--- a/lldb/source/Host/windows/Host.cpp
+++ b/lldb/source/Host/windows/Host.cpp
@@ -220,19 +220,19 @@
}
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.exe");
- if (!glob_tool_spec.Exists())
+ expand_tool_spec.AppendPathComponent("argdumper.exe");
+ if (!expand_tool_spec.Exists())
{
error.SetErrorString("could not find argdumper tool");
return error;
@@ -241,15 +241,15 @@
std::string quoted_cmd_string;
launch_info.GetArguments().GetQuotedCommandString(quoted_cmd_string);
std::replace(quoted_cmd_string.begin(), quoted_cmd_string.end(), '\\', '/');
- 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)
{