Some adjustments for Ubuntu 8.04

[senf.git] / Console / Executor.hh

diff --git a/Console/Executor.hh b/Console/Executor.hh
index f771e3b..02cff18 100644 (file)
--- a/Console/Executor.hh
+++ b/Console/Executor.hh
@@ -72,6 +72,8 @@ namespace console {
         /// Thrown by the SecurityPolicy to silently ignore a command
         struct IgnoreCommandException {};
 
+        typedef void result_type;
+
         ///////////////////////////////////////////////////////////////////////////
         //\/name Structors and default members
         ///\{
@@ -91,7 +93,8 @@ namespace console {
                                         /**< Output will be written to \a output. 
                                              Same as execute(). */
         DirectoryNode & cwd() const;    ///< Current working directory
-        bool skipping() const;
+        std::string cwdPath() const;    ///< Return pathname of current directory
+        bool skipping() const;          ///< \c true, if currently skipping a directory group
 
         bool autocd() const;            ///< Get current autocd status
                                         /**< if autocd is enabled, specifying a directory name as
@@ -142,6 +145,7 @@ namespace console {
         GenericNode & traverseNode(ParseCommandInfo::TokensRange const & path);
         void traverseDirectory(ParseCommandInfo::TokensRange const & path,
                                Path & dir);
+        std::string complete(DirectoryNode & dir, std::string const & name);
 
         struct InvalidPathException {};
         struct InvalidDirectoryException {};