SENF_LOG(( "Executing: " << command ));
if (cwd_.expired() || ! cwd().active())
- cwd_ = root().thisptr();
+ cwd_ = root_;
try {
switch(command.builtin()) {
case ParseCommandInfo::NoBuiltin : {
+ if (skipping_)
+ break;
GenericNode & node ( traverseCommand(command.commandPath()) );
DirectoryNode * dir ( dynamic_cast<DirectoryNode*>(&node) );
if ( dir ) {
- if (autocd_ && command.arguments().empty()) {
+ if (autocd_ && command.tokens().empty()) {
oldCwd_ = cwd_;
cwd_ = dir->thisptr();
} else
}
case ParseCommandInfo::BuiltinCD :
- if ( command.arguments() ) {
- if (command.arguments().begin()->size() == 1
- && command.arguments().begin()->begin()->value() == "-") {
- if (oldCwd_.expired() || ! oldCwd_.lock()->active()) {
+ if (skipping_)
+ break;
+ try {
+ if ( command.arguments() ) {
+ if (command.arguments().begin()->size() == 1
+ && command.arguments().begin()->begin()->value() == "-") {
+ if (oldCwd_.expired() || ! oldCwd_.lock()->active()) {
+ oldCwd_ = cwd_;
+ cwd_ = root_;
+ } else
+ swap(cwd_, oldCwd_);
+ }
+ else {
oldCwd_ = cwd_;
- cwd_ = root().thisptr();
- } else
- swap(cwd_, oldCwd_);
- }
- else {
- oldCwd_ = cwd_;
- cwd_ = traverseDirectory(command.arguments().begin()[0]).thisptr();
+ cwd_ = traverseDirectory(*command.arguments().begin()).thisptr();
+ }
}
}
+ catch (IgnoreCommandException &) {
+ throw SyntaxErrorException(
+ "'cd' cannot be skipped (don't use 'cd' in conf-files)");
+ }
break;
case ParseCommandInfo::BuiltinLS : {
+ if (skipping_)
+ break;
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();
+ dirstack_.push_back(DirEntry(cwd_, skipping_));
+ if ( ! skipping_ && command.arguments() ) {
+ try {
+ cwd_ = traverseDirectory(*command.arguments().begin()).thisptr();
+ }
+ catch (IgnoreCommandException &) {
+ cwd_.reset();
+ skipping_ = true;
+ }
+ }
break;
case ParseCommandInfo::BuiltinPOPD :
if (! dirstack_.empty()) {
- cwd_ = dirstack_.back();
+ cwd_ = dirstack_.back().dir;
+ skipping_ = dirstack_.back().skip;
dirstack_.pop_back();
}
break;
case ParseCommandInfo::BuiltinEXIT :
+ if (skipping_)
+ break;
throw ExitException();
case ParseCommandInfo::BuiltinHELP :
+ if (skipping_)
+ break;
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())),
- autocomplete_);
+ 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, autocomplete_);
+ 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) );