mirrors/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity.git synced 2025-01-24 18:32:28 -05:00
Code Issues Projects Releases Packages Wiki Activity

Shell: Recursively resolve aliases

Browse source
This commit is contained in:
AnotherTest 2020-07-12 06:50:54 +04:30 • committed by Andreas Kling
parent e461e3c8b0
commit 8d71eb9a6c
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
Shell/AST.cpp
View file

@ -745,7 +745,7 @@ RefPtr<Value> Execute::run(RefPtr<Shell> shell)
auto initial_commands = m_command->run(shell)->resolve_as_commands(shell);
decltype(initial_commands) commands;
for (auto& command : initial_commands) {
Function<void(Command&)> resolve_aliases_and_append = [&](auto& command) {
if (!command.argv.is_empty()) {
auto alias = shell->resolve_alias(command.argv[0]);
if (!alias.is_null()) {
@ -757,15 +757,26 @@ RefPtr<Value> Execute::run(RefPtr<Shell> shell)
subcommand_ast = ast->command();
}
RefPtr<Node> substitute = create<Join>(position(), move(subcommand_ast), create<CommandLiteral>(position(), command));
commands.append(substitute->run(shell)->resolve_as_commands(shell));
for (auto& subst_command : substitute->run(shell)->resolve_as_commands(shell)) {
if (!subst_command.argv.is_empty() && subst_command.argv.first() == argv0) // Disallow an alias resolving to itself.
commands.append(subst_command);
else
resolve_aliases_and_append(subst_command);
}
} else {
commands.append(command);
}
} else {
commands.append(command);
}
} else {
commands.append(command);
}
}
};
for (auto& command : initial_commands)
resolve_aliases_and_append(command);
Vector<RefPtr<Job>> jobs_to_wait_for;
auto run_commands = [&](auto& commands) {