SENF_LOG(( "Executing: " << command ));
if (cwd_.expired() || ! cwd().active())
- cwd_ = root().thisptr();
+ cwd_ = root_;
try {
switch(command.builtin()) {
GenericNode & node ( traverseCommand(command.commandPath()) );
DirectoryNode * dir ( dynamic_cast<DirectoryNode*>(&node) );
if ( dir ) {
- oldCwd_ = cwd_;
- cwd_ = dir->thisptr();
+ if (autocd_ && command.tokens().empty()) {
+ oldCwd_ = cwd_;
+ cwd_ = dir->thisptr();
+ } else
+ throw InvalidCommandException();
} else {
dynamic_cast<CommandNode &>(node)(output, command);
}
&& command.arguments().begin()->begin()->value() == "-") {
if (oldCwd_.expired() || ! oldCwd_.lock()->active()) {
oldCwd_ = cwd_;
- cwd_ = root().thisptr();
+ cwd_ = root_;
} else
swap(cwd_, oldCwd_);
}
else {
oldCwd_ = cwd_;
- cwd_ = traverseDirectory(command.arguments().begin()[0]).thisptr();
+ cwd_ = traverseDirectory(*command.arguments().begin()).thisptr();
}
}
break;
case ParseCommandInfo::BuiltinLS : {
DirectoryNode const & dir ( command.arguments()
- ? traverseDirectory(command.arguments().begin()[0])
+ ? traverseDirectory(*command.arguments().begin())
: cwd() );
for (DirectoryNode::child_iterator i (dir.children().begin());
i != dir.children().end(); ++i) {
case ParseCommandInfo::BuiltinPUSHD :
dirstack_.push_back(cwd_);
if ( command.arguments() )
- cwd_ = traverseDirectory(command.arguments().begin()[0]).thisptr();
+ cwd_ = traverseDirectory(*command.arguments().begin()).thisptr();
break;
case ParseCommandInfo::BuiltinPOPD :
case ParseCommandInfo::BuiltinHELP :
GenericNode const & node (command.arguments()
- ? traverseNode(command.arguments().begin()[0])
+ ? traverseNode(*command.arguments().begin())
: cwd());
output << prettyName(typeid(node)) << " at " << node.path() << "\n\n";
node.help(output);
catch (InvalidCommandException &) {
output << "invalid command" << std::endl;
}
+ catch (IgnoreCommandException &) {}
}
prefix_ senf::console::GenericNode &
-senf::console::Executor::traverseNode(ParseCommandInfo::argument_value_type const & path)
+senf::console::Executor::traverseNode(ParseCommandInfo::TokensRange const & path)
{
try {
- return cwd().traverse(
+ return traverse(
+ cwd(),
boost::make_iterator_range(
boost::make_transform_iterator(path.begin(), TraverseTokens()),
- boost::make_transform_iterator(path.end(), TraverseTokens())));
+ boost::make_transform_iterator(path.end(), TraverseTokens())) );
}
catch (std::bad_cast &) {
throw InvalidPathException();
senf::console::Executor::traverseCommand(ParseCommandInfo::CommandPathRange const & path)
{
try {
- return cwd().traverse(path);
+ return traverse(cwd(), path);
}
catch (std::bad_cast &) {
throw InvalidPathException();
}
prefix_ senf::console::DirectoryNode &
-senf::console::Executor::traverseDirectory(ParseCommandInfo::argument_value_type const & path)
+senf::console::Executor::traverseDirectory(ParseCommandInfo::TokensRange const & path)
{
try {
return dynamic_cast<DirectoryNode&>( traverseNode(path) );