X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FConsole%2FExecutor.hh;h=62faf796069ad3840de9dc7503bcafc3ea94b5eb;hb=7661548b20e6c7627f54bff87e0758396fd523ef;hp=cb1fab1f4920a631d3b8bc041258ad21a149990f;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git diff --git a/senf/Utils/Console/Executor.hh b/senf/Utils/Console/Executor.hh index cb1fab1..62faf79 100644 --- a/senf/Utils/Console/Executor.hh +++ b/senf/Utils/Console/Executor.hh @@ -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 @@ -29,11 +29,11 @@ // Custom includes #include #include "Parse.hh" -#include "../../Utils/Logger/SenfLog.hh" +#include #include "Node.hh" //#include "Executor.mpp" -///////////////////////////////hh.p//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// namespace senf { namespace console { @@ -60,11 +60,11 @@ namespace console { SENF_LOG_CLASS_AREA(); SENF_LOG_DEFAULT_LEVEL( senf::log::VERBOSE ); public: - /////////////////////////////////////////////////////////////////////////// + //-//////////////////////////////////////////////////////////////////////// // Types /// Thrown by built-in 'exit' command - struct ExitException {}; + struct ExitException {}; /// Executor policy function typedef boost::function SecurityPolicy; @@ -74,23 +74,23 @@ namespace console { typedef void result_type; - /////////////////////////////////////////////////////////////////////////// + //-//////////////////////////////////////////////////////////////////////// //\/name Structors and default members - ///\{ - + //\{ + Executor(); - ///\} - /////////////////////////////////////////////////////////////////////////// + //\} + //-//////////////////////////////////////////////////////////////////////// void execute(std::ostream & output, ParseCommandInfo const & command); ///< Execute command - /**< Output will be written to \a output. + /**< Output will be written to \a output. Same as operator()(). */ void operator()(std::ostream & output, ParseCommandInfo const & command); ///< Execute command - /**< Output will be written to \a output. + /**< Output will be written to \a output. Same as execute(). */ GenericNode & getNode(ParseCommandInfo const & command); DirectoryNode & cwd() const; ///< Current working directory @@ -119,7 +119,7 @@ namespace console { DirectoryNode & chroot() const; ///< Get root node /**< The root node defaults to senf::console::root(). If changed, all path references are relative to this node - and objects outside that tree cannot be accessed. */ + and objects outside that tree cannot be accessed. */ Executor & chroot(DirectoryNode & node); ///< chroot into given directory /**< After this call, all path's are interpreted relative to @@ -156,7 +156,7 @@ namespace console { std::string path; InvalidPathException() : path() {} InvalidPathException(std::string path_) : path(path_) {} - + }; struct InvalidDirectoryException { std::string path; @@ -164,7 +164,7 @@ namespace console { InvalidDirectoryException(std::string path_) : path(path_) {} }; struct InvalidCommandException {}; - + DirectoryNode::ptr root_; SecurityPolicy policy_; mutable Path cwd_; @@ -181,7 +181,7 @@ namespace console { }} -///////////////////////////////hh.e//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// #include "Executor.cci" //#include "Executor.ct" //#include "Executor.cti"