diff options
Diffstat (limited to 'lldb/source/Commands')
| -rw-r--r-- | lldb/source/Commands/CommandObjectBreakpointCommand.cpp | 2 | ||||
| -rw-r--r-- | lldb/source/Commands/CommandObjectCommands.cpp | 21 |
2 files changed, 13 insertions, 10 deletions
diff --git a/lldb/source/Commands/CommandObjectBreakpointCommand.cpp b/lldb/source/Commands/CommandObjectBreakpointCommand.cpp index 3c3a85a0bde..85971bd6a9b 100644 --- a/lldb/source/Commands/CommandObjectBreakpointCommand.cpp +++ b/lldb/source/Commands/CommandObjectBreakpointCommand.cpp @@ -49,7 +49,7 @@ lldb::OptionDefinition CommandObjectBreakpointCommandAdd::CommandOptions::g_option_table[] = { { LLDB_OPT_SET_ALL, false, "one-liner", 'o', required_argument, NULL, 0, "<one-liner>", - "Specify a one-liner inline." }, + "Specify a one-line breakpoint command inline. Be sure to surround it with quotes." }, { LLDB_OPT_SET_1, true, "script", 's', no_argument, NULL, 0, NULL, "Write the breakpoint command script in the default scripting language."}, diff --git a/lldb/source/Commands/CommandObjectCommands.cpp b/lldb/source/Commands/CommandObjectCommands.cpp index fc761587c82..913577b087b 100644 --- a/lldb/source/Commands/CommandObjectCommands.cpp +++ b/lldb/source/Commands/CommandObjectCommands.cpp @@ -207,7 +207,7 @@ public: CommandReturnObject &result ) { - const size_t argc = args.GetArgumentCount(); + size_t argc = args.GetArgumentCount(); if (argc < 2) { @@ -296,15 +296,18 @@ public: args.Shift (); if (result.Succeeded()) options->VerifyPartialOptions (result); - if (!result.Succeeded()) - return false; - } - else - { - for (size_t i = 0; i < argc; ++i) - option_arg_vector->push_back (OptionArgPair ("<argument>", - std::string (args.GetArgumentAtIndex (i)))); + if (!result.Succeeded() && result.GetStatus() != lldb::eReturnStatusStarted) + { + result.AppendError ("Unable to create requested command alias.\n"); + } } + + // Anything remaining in args must be a plain argument. + + argc = args.GetArgumentCount(); + for (size_t i = 0; i < argc; ++i) + option_arg_vector->push_back (OptionArgPair ("<argument>", + std::string (args.GetArgumentAtIndex (i)))); } // Create the alias. |
