X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FConsole%2FLineEditor.cc;h=f4ea2016d6c416a9a00b3613acb6c76645abb57f;hb=1342c5d49ca8bd523c9fdf7d89b40448cdfd394b;hp=8235f71faeec899477d804121c531d18c57880f0;hpb=26610f603ebdd465307b9621f532c1fe19fd5571;p=senf.git

diff --git a/senf/Utils/Console/LineEditor.cc b/senf/Utils/Console/LineEditor.cc
index 8235f71..f4ea201 100644
--- a/senf/Utils/Console/LineEditor.cc
+++ b/senf/Utils/Console/LineEditor.cc
@@ -1,24 +1,29 @@
 // $Id$
 //
-// Copyright (C) 2009 
+// Copyright (C) 2009
 // 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 LineEditor non-inline non-template implementation */
@@ -28,13 +33,14 @@
 
 // Custom includes
 #include <senf/Utils/Logger/SenfLog.hh>
-#include <senf/Utils/range.hh>
+#include <senf/Utils/Range.hh>
+#include <senf/Utils/membind.hh>
 
 //#include "LineEditor.mpp"
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::console::detail::LineEditorSwitcher
 
 prefix_ senf::console::detail::LineEditorSwitcher::LineEditorSwitcher(Client & client)
@@ -71,7 +77,7 @@ prefix_ unsigned senf::console::detail::LineEditorSwitcher::v_width()
     return reader_->width();
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::console::detail::LineEditorClientReader
 
 prefix_ senf::console::detail::LineEditorClientReader::
@@ -85,7 +91,7 @@ LineEditorClientReader(Client & client, LineEditorSwitcher & switcher)
                       senf::membind(&LineEditorClientReader::deleteCharOrExit, this));
     editor_.defineKey(senf::term::KeyParser::Tab,
                       boost::bind(&term::bindings::complete,
-                                  _1, 
+                                  _1,
                                   senf::membind(&LineEditorClientReader::completePath, this)));
     editor_.defineKey(senf::term::KeyParser::Return, &senf::term::bindings::acceptWithRepeat);
 }
@@ -147,7 +153,7 @@ completePath(term::LineEditor & editor, unsigned & b, unsigned & e, std::string
     std::string const & t (editor.text());
     // Search backward from e finding the longest valid path. This does *not* accept all valid
     // path's, only those without embedded white-space. However, this is only for completion so
-    // it's ok. 
+    // it's ok.
     if (b<e) {
         unsigned bb (e-1);
         for (;;) {
@@ -170,7 +176,7 @@ completePath(term::LineEditor & editor, unsigned & b, unsigned & e, std::string
     catch (CommandParser::ParserErrorException & ex) {
         return;
     }
- 
+
     ParseCommandInfo::TokensRange path (cmd.commandPath());
     if (path.empty()) {
         DirectoryNode::ChildrenRange cs (client().cwd().children());
@@ -178,7 +184,7 @@ completePath(term::LineEditor & editor, unsigned & b, unsigned & e, std::string
             completions.push_back(i->first + (i->second->followLink().isDirectory() ? "/" : " "));
         return;
     }
-    
+
     ParseCommandInfo::TokensRange::const_iterator i (path.begin());
     ParseCommandInfo::TokensRange::const_iterator const i_end (boost::prior(path.end()));
     DirectoryNode * dir (& client().cwd());
@@ -194,7 +200,7 @@ completePath(term::LineEditor & editor, unsigned & b, unsigned & e, std::string
             if (parent) dir = parent;
             prefix += "../";
         }
-        else if (*i == WordToken(".")) 
+        else if (*i == WordToken("."))
             prefix += "./";
         else {
             if (dir->hasChild(i->value())) {
@@ -205,7 +211,7 @@ completePath(term::LineEditor & editor, unsigned & b, unsigned & e, std::string
                     return;
                 }
                 prefix += i->value() + "/";
-            } 
+            }
             else {
                 DirectoryNode::ChildrenRange cs (dir->completions(i->value()));
                 if (has_one_elt(cs)) {
@@ -225,7 +231,7 @@ completePath(term::LineEditor & editor, unsigned & b, unsigned & e, std::string
         completions.push_back(j->first + (j->second->followLink().isDirectory() ? "/" : " "));
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_
 //#include "LineEditor.mpp"