make the console output follow the 'engineerign' format

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

diff --git a/Utils/Console/Executor.cc b/Utils/Console/Executor.cc
index 692af69..49e7eb9 100644 (file)
--- a/Utils/Console/Executor.cc
+++ b/Utils/Console/Executor.cc
@@ -114,6 +114,13 @@ prefix_ void senf::console::Executor::execute(std::ostream & output,
             ls( output, command.commandPath() );
             break;
 
+        case ParseCommandInfo::BuiltinLL :
+            if (skipping())
+                break;
+            // The parser ensures, we have either one or no argument
+            ll( output, command.commandPath() );
+            break;
+
         case ParseCommandInfo::BuiltinLR :
             if (skipping())
                 break;
@@ -233,6 +240,18 @@ prefix_ void senf::console::Executor::cd(ParseCommandInfo::TokensRange dir)
 prefix_ void senf::console::Executor::ls(std::ostream & output,
                                          ParseCommandInfo::TokensRange path)
 {
+    Path dir (cwd_);
+    traverseDirectory(path, dir);
+    DirectoryNode & node (*dir.back().lock());
+    DirectoryNode::child_iterator i (node.children().begin());
+    DirectoryNode::child_iterator const i_end (node.children().end());
+    for (; i != i_end; ++i)
+        output << i->first << "\n";
+}
+
+prefix_ void senf::console::Executor::ll(std::ostream & output,
+                                         ParseCommandInfo::TokensRange path)
+{
 #   define HELP_COLUMN 28
 
     unsigned width (senf::console::Client::getWidth(output, 80u, 60u)-(HELP_COLUMN+1));