xenia/home
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

support multiline strings when executing file commands

Browse Source
This commit is contained in:
Maxime Coste 2012-02-13 21:39:41 +00:00
parent 2c8a6ca56a
commit 5f86941b8f
1 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/main.cc
View File

@ -710,6 +710,7 @@ void exec_commands_in_file(const CommandParameters& params,
CommandManager& cmd_manager = CommandManager::instance(); CommandManager& cmd_manager = CommandManager::instance();
size_t pos = 0; size_t pos = 0;
size_t length = file_content.length();
bool cat_with_previous = false; bool cat_with_previous = false;
std::string command_line; std::string command_line;
while (true) while (true)
@ -717,8 +718,31 @@ void exec_commands_in_file(const CommandParameters& params,
if (not cat_with_previous) if (not cat_with_previous)
command_line.clear(); command_line.clear();
size_t end_pos = file_content.find_first_of('\n', pos); size_t end_pos = pos;
if (end_pos != pos and end_pos != std::string::npos and
while (file_content[end_pos] != '\n' and end_pos != length)
{
if (file_content[end_pos] == '"' or file_content[end_pos] == '\'' or
file_content[end_pos] == '`')
{
char delimiter = file_content[end_pos];
++end_pos;
while (file_content[end_pos] != delimiter or
file_content[end_pos-1] == '\\' and end_pos != length)
++end_pos;
if (end_pos == length)
{
print_status(std::string("unterminated '") + delimiter + "' string");
return;
}
++end_pos;
}
++end_pos;
}
if (end_pos != pos and end_pos != length and
file_content[end_pos - 1] == '\\') file_content[end_pos - 1] == '\\')
{ {
command_line += file_content.substr(pos, end_pos - pos - 1); command_line += file_content.substr(pos, end_pos - pos - 1);
@ -730,7 +754,7 @@ void exec_commands_in_file(const CommandParameters& params,
cmd_manager.execute(command_line, context); cmd_manager.execute(command_line, context);
cat_with_previous = false; cat_with_previous = false;
} }
if (end_pos == std::string::npos) if (end_pos == length)
{ {
if (cat_with_previous) if (cat_with_previous)
print_status("while executing commands in \"" + params[0] + print_status("while executing commands in \"" + params[0] +