Added ICMPv6 Packet Parser and Unittests for different ICMP Packages.

[senf.git] / Console / Executor.cci

diff --git a/Console/Executor.cci b/Console/Executor.cci
index ab91c30..81df7ed 100644 (file)
--- a/Console/Executor.cci
+++ b/Console/Executor.cci
@@ -34,9 +34,11 @@
 // senf::console::Executor
 
 prefix_ senf::console::Executor::Executor()
-    : root_(senf::console::root().thisptr()), cwd_ (root_), oldCwd_ (cwd_),
-      autocd_ (false), autocomplete_ (false), skipping_ (false)
-{}
+    : root_(senf::console::root().thisptr()), cwd_ (), oldCwd_ (),
+      autocd_ (false), autocomplete_ (false)
+{
+    cwd_.push_back(root_);
+}
 
 prefix_ void senf::console::Executor::operator()(std::ostream & output,
                                                  ParseCommandInfo const & command)
@@ -44,12 +46,6 @@ prefix_ void senf::console::Executor::operator()(std::ostream & output,
     return execute(output, command);
 }
 
-prefix_ senf::console::DirectoryNode & senf::console::Executor::cwd()
-    const
-{
-    return cwd_.expired() ? root() : *cwd_.lock();
-}
-
 prefix_ bool senf::console::Executor::autocd()
     const
 {
@@ -83,8 +79,9 @@ prefix_ senf::console::DirectoryNode & senf::console::Executor::chroot()
 prefix_ senf::console::Executor & senf::console::Executor::chroot(DirectoryNode & node)
 {
     root_ = node.thisptr();
-    cwd_ = root_;
-    oldCwd_ = root_;
+    cwd_.clear();
+    cwd_.push_back(root_);
+    oldCwd_ = cwd_;
     return *this;
 }
 
@@ -94,6 +91,12 @@ prefix_ senf::console::Executor & senf::console::Executor::policy(SecurityPolicy
     return *this;
 }
 
+prefix_ bool senf::console::Executor::skipping()
+    const
+{
+    return cwd_.empty();
+}
+
 ///////////////////////////////cci.e///////////////////////////////////////
 #undef prefix_