switch to new MPL based Fraunhofer FOKUS Public License

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

diff --git a/senf/Utils/Console/Config.cc b/senf/Utils/Console/Config.cc
index 66a7a19..a4ea65f 100644 (file)
--- a/senf/Utils/Console/Config.cc
+++ b/senf/Utils/Console/Config.cc
@@ -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 Config non-inline non-template implementation */
@@ -31,9 +36,9 @@
 
 //#include "Config.mpp"
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::console::detail::RestrictedExecutor
 
 prefix_ senf::console::detail::RestrictedExecutor::RestrictedExecutor(DirectoryNode & root)
@@ -109,7 +114,7 @@ senf::console::detail::RestrictedExecutor::insertParsedNode(DirectoryNode & node
     parsedNodes_.push_back(node.thisptr());
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::console::ConfigBundle
 
 prefix_ void senf::console::ConfigBundle::parse()
@@ -131,7 +136,7 @@ prefix_ void senf::console::ConfigBundle::parseInternal()
         (*i)->parse(executor_);
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::console::detail::RestrictedExecutor::RestrictGuard
 
 prefix_ senf::console::detail::RestrictedExecutor::RestrictGuard::
@@ -141,7 +146,7 @@ RestrictGuard(RestrictedExecutor & executor)
     // This MUST BE root() not chroot() since restriction does NOT follow symlinks.
     // Therefore, if chroot() is a directory of symlinks, restricting to it will
     // execute NOTHING.
-    executor_.restrict_ = senf::console::root().thisptr();
+    executor_.restrict_ = console::root().thisptr();
 }
 
 prefix_ senf::console::detail::RestrictedExecutor::RestrictGuard::
@@ -155,16 +160,16 @@ prefix_ senf::console::detail::RestrictedExecutor::RestrictGuard::~RestrictGuard
 {
     if (! std::uncaught_exception())
         executor_.insertParsedNode( *executor_.restrict_ );
-    executor_.restrict_ = senf::console::root().thisptr();
+    executor_.restrict_ = console::root().thisptr();
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::console::detail::ConfigSource
 
 prefix_ senf::console::detail::ConfigSource::~ConfigSource()
 {}
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_
 //#include "Config.mpp"