X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FConsole%2FLineEditor.cc;h=3b6ee03c10f440981f41a94912af5b862923ddaf;hb=4101c2b818ec67e7469ebb44f030eed2185c4ab0;hp=07cee7f54311eec01f374633e5b147eaecab7086;hpb=b6acba899f44ba9422476022c775cef823fc9337;p=senf.git diff --git a/senf/Utils/Console/LineEditor.cc b/senf/Utils/Console/LineEditor.cc index 07cee7f..3b6ee03 100644 --- a/senf/Utils/Console/LineEditor.cc +++ b/senf/Utils/Console/LineEditor.cc @@ -1,6 +1,6 @@ // $Id$ // -// Copyright (C) 2009 +// Copyright (C) 2009 // Fraunhofer Institute for Open Communication Systems (FOKUS) // Competence Center NETwork research (NET), St. Augustin, GERMANY // Stefan Bund @@ -33,9 +33,9 @@ //#include "LineEditor.mpp" #define prefix_ -///////////////////////////////cc.p//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// -/////////////////////////////////////////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// // senf::console::detail::LineEditorSwitcher prefix_ senf::console::detail::LineEditorSwitcher::LineEditorSwitcher(Client & client) @@ -72,7 +72,7 @@ prefix_ unsigned senf::console::detail::LineEditorSwitcher::v_width() return reader_->width(); } -/////////////////////////////////////////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// // senf::console::detail::LineEditorClientReader prefix_ senf::console::detail::LineEditorClientReader:: @@ -86,7 +86,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); } @@ -148,7 +148,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 (bfirst + (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()); @@ -195,7 +195,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())) { @@ -206,7 +206,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)) { @@ -226,7 +226,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"