Fix documentation build under maverick (doxygen 1.7.1)

[senf.git] / senf / Utils / Console / Executor.cc

diff --git a/senf/Utils/Console/Executor.cc b/senf/Utils/Console/Executor.cc
index 8d7e59a..1cff221 100644 (file)
--- a/senf/Utils/Console/Executor.cc
+++ b/senf/Utils/Console/Executor.cc
@@ -1,6 +1,6 @@
 // $Id$
 //
-// Copyright (C) 2008 
+// Copyright (C) 2008
 // Fraunhofer Institute for Open Communication Systems (FOKUS)
 // Competence Center NETwork research (NET), St. Augustin, GERMANY
 //     Stefan Bund <g0dil@berlios.de>
@@ -34,13 +34,12 @@
 #include <boost/preprocessor/stringize.hpp>
 #include <senf/Utils/senfassert.hh>
 #include <senf/Utils/Range.hh>
-#include <senf/Utils/String.hh>
-#include <senf/Utils/range.hh>
 #include "Server.hh"
+#include "senf/Utils/IgnoreValue.hh"
 
 //#include "Executor.mpp"
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace {
 
@@ -50,16 +49,16 @@ namespace {
             return token.value();
         }
     };
-    
+
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::console::Executor
 
 prefix_ senf::console::DirectoryNode & senf::console::Executor::cwd()
     const
 {
-    SENF_ASSERT( ! cwd_.empty() );
+    SENF_ASSERT( ! cwd_.empty(), "Internal error: CWD history empty ?" );
     while (cwd_.size()>1 && (cwd_.back().expired() || ! cwd_.back().lock()->active()))
         cwd_.pop_back();
     return * cwd_.back().lock();
@@ -70,7 +69,7 @@ prefix_ std::string senf::console::Executor::cwdPath()
 {
     if (skipping())
         return "";
-    (void) cwd(); // ensure, cwd is live.
+    senf::IGNORE( cwd() ); // ensure, cwd is live.
     return "/" + senf::stringJoin(
         senf::make_transform_range(
             boost::make_iterator_range(boost::next(cwd_.begin()), cwd_.end()),
@@ -84,11 +83,11 @@ prefix_ void senf::console::Executor::execute(std::ostream & output,
     SENF_LOG(( "Executing: " << command ));
 
     if (! skipping())
-        (void) cwd(); // Prune the cwd path of expired entries
+        senf::IGNORE( cwd() ); // Prune the cwd path of expired entries
 
     try {
         switch(command.builtin()) {
-        case ParseCommandInfo::NoBuiltin : 
+        case ParseCommandInfo::NoBuiltin :
             if (skipping())
                 return;
             exec(output, command);
@@ -106,7 +105,7 @@ prefix_ void senf::console::Executor::execute(std::ostream & output,
                     "'cd' cannot be skipped (don't use 'cd' in conf-files)");
             }
             break;
-            
+
         case ParseCommandInfo::BuiltinLS :
             if (skipping())
                 break;
@@ -135,12 +134,12 @@ prefix_ void senf::console::Executor::execute(std::ostream & output,
             else
                 exec(output, command);
             break;
-            
+
         case ParseCommandInfo::BuiltinPOPD :
             // The parser ensures, we have no arguments
             popd();
             break;
-            
+
         case ParseCommandInfo::BuiltinEXIT :
             if (skipping())
                 break;
@@ -172,7 +171,15 @@ prefix_ void senf::console::Executor::execute(std::ostream & output,
 prefix_ senf::console::GenericNode &
 senf::console::Executor::getNode(ParseCommandInfo const & command)
 {
-    return traverseNode(command.commandPath());
+    try {
+        return traverseNode(command.commandPath());
+    }
+    catch (InvalidPathException & ex) {
+        throw SyntaxErrorException("invalid path") << " '" << ex.path << "'";
+    }
+    catch (InvalidDirectoryException & ex) {
+        throw SyntaxErrorException("invalid directory") << " '" << ex.path << "'";
+    }
 }
 
 prefix_ void senf::console::Executor::exec(std::ostream & output,
@@ -225,7 +232,7 @@ prefix_ void senf::console::Executor::cd(ParseCommandInfo::TokensRange dir)
 {
     if (dir.size() == 1 && *dir.begin() == WordToken("-")) {
         cwd_.swap(oldCwd_);
-        (void) cwd(); // Prune any expired items
+        senf::IGNORE( cwd() ); // Prune any expired items
     }
     else {
         // We need to use a temporary so an error somewhere while traversing the dir does not cause
@@ -280,7 +287,7 @@ namespace {
 
     typedef std::map<senf::console::DirectoryNode*,std::string> NodesMap;
 
-    void dolr(std::ostream & output, unsigned width, NodesMap & nodes, std::string const & base, 
+    void dolr(std::ostream & output, unsigned width, NodesMap & nodes, std::string const & base,
               unsigned level, senf::console::DirectoryNode & node)
     {
         boost::format fmt ("%s%s%s  %|" BOOST_PP_STRINGIZE(HELP_COLUMN) "t|%s\n");
@@ -294,7 +301,7 @@ namespace {
                 NodesMap::iterator j (nodes.find(&subnode));
                 if (j == nodes.end()) {
                     output << fmt
-                        % pad % i->first 
+                        % pad % i->first
                         % ( i->second->isDirectory() ? "/" : i->second->isLink() ? "@" : "" )
                         % i->second->shorthelp().substr(0,width);
                     std::string subbase (base);
@@ -304,12 +311,12 @@ namespace {
                     nodes.insert(std::make_pair(&subnode, subbase));
                     dolr(output, width, nodes, subbase, level+1, subnode);
                 } else
-                    output << pad << i->first 
+                    output << pad << i->first
                            << ( i->second->isDirectory() ? "/" : i->second->isLink() ? "@" : "" )
                            << " -> " << j->second << "\n";
             } else {
                 output << fmt
-                    % pad % i->first 
+                    % pad % i->first
                     % ( i->second->isDirectory() ? "/" : i->second->isLink() ? "@" : "" )
                     % i->second->shorthelp().substr(0,width);
             }
@@ -325,7 +332,7 @@ prefix_ void senf::console::Executor::lr(std::ostream & output,
     traverseDirectory(path, dir);
     DirectoryNode & node (*dir.back().lock());
     NodesMap nodes;
-    dolr(output, senf::console::Client::getWidth(output, 80u, 60u)-(HELP_COLUMN+1), 
+    dolr(output, senf::console::Client::getWidth(output, 80u, 60u)-(HELP_COLUMN+1),
          nodes, "", 0, node);
 }
 
@@ -464,7 +471,7 @@ prefix_ void senf::console::senf_console_format_value(DirectoryNode::ptr value,
         os << "<Null Directory>";
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_
 //#include "Executor.mpp"