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

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
This commit is contained in:
Enrico Granata 2015-02-20 22:20:30 +00:00
parent b65c6299d4
commit b38ef8c2b6
22 changed files with 58 additions and 58 deletions

4
lldb/include/lldb/API/SBLaunchInfo.h
View File

@ -142,10 +142,10 @@ public:
SetShell (const char * path);
bool
GetGlobArguments ();
GetShellExpandArguments ();
void
SetGlobArguments (bool glob);
SetShellExpandArguments (bool glob);
uint32_t
GetResumeCount ();

4
lldb/include/lldb/Host/Host.h
View File

@ -254,14 +254,14 @@ public:
LaunchProcess (ProcessLaunchInfo &launch_info);
//------------------------------------------------------------------
/// Perform globbing of the command-line for this launch info
/// Perform expansion of the command-line for this launch info
/// This can potentially involve wildcard expansion
// environment variable replacement, and whatever other
// argument magic the platform defines as part of its typical
// user experience
//------------------------------------------------------------------
static Error
GlobArguments (ProcessLaunchInfo &launch_info);
ShellExpandArguments (ProcessLaunchInfo &launch_info);
static Error
RunShellCommand (const char *command, // Shouldn't be NULL

4
lldb/include/lldb/Target/Platform.h
View File

@ -386,14 +386,14 @@ namespace lldb_private {
LaunchProcess (ProcessLaunchInfo &launch_info);
//------------------------------------------------------------------
/// Perform globbing of the command-line for this launch info
/// Perform expansion of the command-line for this launch info
/// This can potentially involve wildcard expansion
// environment variable replacement, and whatever other
// argument magic the platform defines as part of its typical
// user experience
//------------------------------------------------------------------
virtual Error
GlobArguments (ProcessLaunchInfo &launch_info);
ShellExpandArguments (ProcessLaunchInfo &launch_info);
//------------------------------------------------------------------
/// Kill process on a platform.

6
lldb/include/lldb/Target/ProcessLaunchInfo.h
View File

@ -134,13 +134,13 @@ namespace lldb_private
SetLaunchInSeparateProcessGroup (bool separate);
bool
GetGlobArguments () const
GetShellExpandArguments () const
{
return m_flags.Test(lldb::eLaunchFlagGlobArguments);
return m_flags.Test(lldb::eLaunchFlagShellExpandArguments);
}
void
SetGlobArguments (bool glob);
SetShellExpandArguments (bool expand);
void
Clear ();

2
lldb/include/lldb/lldb-enumerations.h
View File

@ -51,7 +51,7 @@ namespace lldb {
///< set this flag so lldb & the handee don't race to set its exit status.
eLaunchFlagDetachOnError = (1u << 9), ///< If set, then the client stub should detach rather than killing the debugee
///< if it loses connection with lldb.
eLaunchFlagGlobArguments = (1u << 10), ///< Glob arguments without going through a shell
eLaunchFlagShellExpandArguments = (1u << 10), ///< Perform shell-style argument expansion
eLaunchFlagCloseTTYOnExit = (1u << 11), ///< Close the open TTY on exit
} LaunchFlags;

4
lldb/scripts/Python/interface/SBLaunchInfo.i
View File

@ -93,10 +93,10 @@ public:
SetShell (const char * path);
bool
GetGlobArguments ();
GetShellExpandArguments ();
void
SetGlobArguments (bool glob);
SetShellExpandArguments (bool expand);
uint32_t
GetResumeCount ();

8
lldb/source/API/SBLaunchInfo.cpp
View File

@ -224,15 +224,15 @@ SBLaunchInfo::SetShell (const char * path)
}
bool
SBLaunchInfo::GetGlobArguments ()
SBLaunchInfo::GetShellExpandArguments ()
{
return m_opaque_sp->GetGlobArguments();
return m_opaque_sp->GetShellExpandArguments();
}
void
SBLaunchInfo::SetGlobArguments (bool glob)
SBLaunchInfo::SetShellExpandArguments (bool expand)
{
m_opaque_sp->SetGlobArguments(glob);
m_opaque_sp->SetShellExpandArguments(expand);
}
uint32_t

2
lldb/source/Host/freebsd/Host.cpp
View File

@ -313,7 +313,7 @@ Host::GetUnixSignals ()
}
Error
Host::GlobArguments (ProcessLaunchInfo &launch_info)
Host::ShellExpandArguments (ProcessLaunchInfo &launch_info)
{
return Error("unimplemented");
}

2
lldb/source/Host/linux/Host.cpp
View File

@ -418,7 +418,7 @@ Host::GetUnixSignals ()
}
Error
Host::GlobArguments (ProcessLaunchInfo &launch_info)
Host::ShellExpandArguments (ProcessLaunchInfo &launch_info)
{
return Error("unimplemented");
}

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

@ -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)
{

22
lldb/source/Host/windows/Host.cpp
View File

@ -220,19 +220,19 @@ Host::StartMonitoringChildProcess(Host::MonitorChildProcessCallback callback, vo
}
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 @@ Host::GlobArguments (ProcessLaunchInfo &launch_info)
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)
{

10
lldb/source/Target/Platform.cpp
View File

@ -1114,9 +1114,9 @@ Platform::LaunchProcess (ProcessLaunchInfo &launch_info)
num_resumes))
return error;
}
else if (launch_info.GetFlags().Test(eLaunchFlagGlobArguments))
else if (launch_info.GetFlags().Test(eLaunchFlagShellExpandArguments))
{
error = GlobArguments(launch_info);
error = ShellExpandArguments(launch_info);
if (error.Fail())
return error;
}
@ -1132,11 +1132,11 @@ Platform::LaunchProcess (ProcessLaunchInfo &launch_info)
}
Error
Platform::GlobArguments (ProcessLaunchInfo &launch_info)
Platform::ShellExpandArguments (ProcessLaunchInfo &launch_info)
{
if (IsHost())
return Host::GlobArguments(launch_info);
return Error("base lldb_private::Platform class can't glob arguments");
return Host::ShellExpandArguments(launch_info);
return Error("base lldb_private::Platform class can't expand arguments");
}
Error

10
lldb/source/Target/Process.cpp
View File

@ -491,14 +491,14 @@ ProcessLaunchCommandOptions::SetOptionValue (uint32_t option_idx, const char *op
break;
}
case 'G': // Glob args.
case 'X': // shell expand args.
{
bool success;
const bool glob_args = Args::StringToBoolean (option_arg, true, &success);
const bool expand_args = Args::StringToBoolean (option_arg, true, &success);
if (success)
launch_info.SetGlobArguments(glob_args);
launch_info.SetShellExpandArguments(expand_args);
else
error.SetErrorStringWithFormat ("Invalid boolean value for glob-args option: '%s'", option_arg ? option_arg : "<null>");
error.SetErrorStringWithFormat ("Invalid boolean value for shell-expand-args option: '%s'", option_arg ? option_arg : "<null>");
break;
}
@ -538,7 +538,7 @@ ProcessLaunchCommandOptions::g_option_table[] =
{ LLDB_OPT_SET_2 , false, "tty", 't', OptionParser::eNoArgument, NULL, NULL, 0, eArgTypeNone, "Start the process in a terminal (not supported on all platforms)."},
{ LLDB_OPT_SET_3 , false, "no-stdio", 'n', OptionParser::eNoArgument, NULL, NULL, 0, eArgTypeNone, "Do not set up for terminal I/O to go to running process."},
{ LLDB_OPT_SET_4, false, "glob-args", 'G', OptionParser::eRequiredArgument, NULL, NULL, 0, eArgTypeBoolean, "Set whether to glob arguments to the process when launching."},
{ LLDB_OPT_SET_4, false, "shell-expand-args", 'X', OptionParser::eRequiredArgument, NULL, NULL, 0, eArgTypeBoolean, "Set whether to shell expand arguments to the process when launching."},
{ 0 , false, NULL, 0, 0, NULL, NULL, 0, eArgTypeNone, NULL }
};

8
lldb/source/Target/ProcessLaunchInfo.cpp
View File

@ -211,12 +211,12 @@ ProcessLaunchInfo::SetLaunchInSeparateProcessGroup (bool separate)
}
void
ProcessLaunchInfo::SetGlobArguments (bool glob)
ProcessLaunchInfo::SetShellExpandArguments (bool expand)
{
if (glob)
m_flags.Set(lldb::eLaunchFlagGlobArguments);
if (expand)
m_flags.Set(lldb::eLaunchFlagShellExpandArguments);
else
m_flags.Clear(lldb::eLaunchFlagGlobArguments);
m_flags.Clear(lldb::eLaunchFlagShellExpandArguments);
}
void

0
lldb/test/functionalities/launch_with_glob/Makefile → lldb/test/functionalities/launch_with_shellexpand/Makefile
View File

6
lldb/test/functionalities/launch_with_glob/TestLaunchWithGlob.py → lldb/test/functionalities/launch_with_shellexpand/TestLaunchWithShellExpand.py
View File

@ -9,7 +9,7 @@ import unittest2
from lldbtest import *
import lldbutil
class LaunchWithGlobTestCase(TestBase):
class LaunchWithShellExpandTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@ -21,7 +21,7 @@ class LaunchWithGlobTestCase(TestBase):
self.do_test ()
@expectedFailureFreeBSD("llvm.org/pr22627 process launch w/ glob not working")
@expectedFailureFreeBSD("llvm.org/pr22627 process launch w/ shell expansion not working")
@dwarf_test
def test_with_dwarf (self):
self.buildDwarf()
@ -39,7 +39,7 @@ class LaunchWithGlobTestCase(TestBase):
breakpoint = target.BreakpointCreateBySourceRegex ('break here', lldb.SBFileSpec ("main.cpp", False))
self.assertTrue(breakpoint, VALID_BREAKPOINT)
self.runCmd("process launch -G true -w %s -- fi*.tx?" % (os.getcwd()))
self.runCmd("process launch -X true -w %s -- fi*.tx?" % (os.getcwd()))
process = self.process()

0
lldb/test/functionalities/launch_with_glob/file1.txt → lldb/test/functionalities/launch_with_shellexpand/file1.txt
View File

0
lldb/test/functionalities/launch_with_glob/file2.txt → lldb/test/functionalities/launch_with_shellexpand/file2.txt
View File

0
lldb/test/functionalities/launch_with_glob/file3.txt → lldb/test/functionalities/launch_with_shellexpand/file3.txt
View File

0
lldb/test/functionalities/launch_with_glob/file4.txy → lldb/test/functionalities/launch_with_shellexpand/file4.txy
View File

0
lldb/test/functionalities/launch_with_glob/file5.tyx → lldb/test/functionalities/launch_with_shellexpand/file5.tyx
View File

0
lldb/test/functionalities/launch_with_glob/main.cpp → lldb/test/functionalities/launch_with_shellexpand/main.cpp
View File