X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FConsole%2FExecutor.hh;h=2a95f8e0f1d4754574412346a6676076720b9c25;hb=f08685d9795a3be20ce5c7a337087358ccd77eb5;hp=cb1fab1f4920a631d3b8bc041258ad21a149990f;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git

diff --git a/senf/Utils/Console/Executor.hh b/senf/Utils/Console/Executor.hh
index cb1fab1..2a95f8e 100644
--- a/senf/Utils/Console/Executor.hh
+++ b/senf/Utils/Console/Executor.hh
@@ -1,24 +1,29 @@
 // $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>
 //
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
+// The contents of this file are subject to the Fraunhofer FOKUS Public License
+// Version 1.0 (the "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at 
+// http://senf.berlios.de/license.html
 //
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+// The Fraunhofer FOKUS Public License Version 1.0 is based on, 
+// but modifies the Mozilla Public License Version 1.1.
+// See the full license text for the amendments.
 //
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the
-// Free Software Foundation, Inc.,
-// 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+// Software distributed under the License is distributed on an "AS IS" basis, 
+// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License 
+// for the specific language governing rights and limitations under the License.
+//
+// The Original Code is Fraunhofer FOKUS code.
+//
+// The Initial Developer of the Original Code is Fraunhofer-Gesellschaft e.V. 
+// (registered association), Hansastraße 27 c, 80686 Munich, Germany.
+// All Rights Reserved.
+//
+// Contributor(s):
+//   Stefan Bund <g0dil@berlios.de>
 
 /** \file
     \brief Executor public header */
@@ -29,11 +34,11 @@
 // Custom includes
 #include <boost/utility.hpp>
 #include "Parse.hh"
-#include "../../Utils/Logger/SenfLog.hh"
+#include <senf/Utils/Logger/SenfLog.hh>
 #include "Node.hh"
 
 //#include "Executor.mpp"
-///////////////////////////////hh.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace senf {
 namespace console {
@@ -60,11 +65,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<void (DirectoryNode &,std::string const &)> SecurityPolicy;
@@ -74,23 +79,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 +124,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 +161,7 @@ namespace console {
             std::string path;
             InvalidPathException() : path() {}
             InvalidPathException(std::string path_) : path(path_) {}
-            
+
         };
         struct InvalidDirectoryException {
             std::string path;
@@ -164,7 +169,7 @@ namespace console {
             InvalidDirectoryException(std::string path_) : path(path_) {}
         };
         struct InvalidCommandException {};
-        
+
         DirectoryNode::ptr root_;
         SecurityPolicy policy_;
         mutable Path cwd_;
@@ -181,7 +186,7 @@ namespace console {
 
 }}
 
-///////////////////////////////hh.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #include "Executor.cci"
 //#include "Executor.ct"
 //#include "Executor.cti"