Changeset 2641

Timestamp:

25/02/2010 23:20:27 (2 years ago)

Author:

chris

Message:

First attempt at tab completion for readline/libedit in bbackupquery,
with commands and local file names, because it's easy and will help to
find compatibility problems.

Location:

box/trunk/bin/bbackupquery

Files:

• BackupQueries.cpp (modified) (3 diffs)
• BackupQueries.h (modified) (1 diff)
• bbackupquery.cpp (modified) (2 diffs)

box/trunk/bin/bbackupquery/BackupQueries.cpp

@@ -64 +64 @@
 #define COMMAND_RETURN_ERROR            4
 
+// Data about commands
+QueryCommandSpecification commands[] = 
+{
+        { "quit", "" },
+        { "exit", "" },
+        { "list", "rodIFtTash", },
+        { "pwd",  "" },
+        { "cd",   "od" },
+        { "lcd",  "" },
+        { "sh",   "" },
+        { "getobject", "" },
+        { "get",  "i" },
+        { "compare", "alcqAEQ" },
+        { "restore", "drif" },
+        { "help", "" },
+        { "usage", "m" },
+        { "undelete", "" },
+        { "delete", "" },
+        { NULL, NULL } 
+};
+
+const char *alias[] = {"ls", 0};
+const int aliasIs[] = {Command_List, 0};
+
 // --------------------------------------------------------------------------
 //
@@ -100 +124 @@
 {
 }
-
-typedef struct
-{
-        const char* name;
-        const char* opts;
-} QueryCommandSpecification;
 
 // --------------------------------------------------------------------------
@@ -207 +225 @@
                 return;
         }
-        
-        // Data about commands
-        static QueryCommandSpecification commands[] = 
-        {
-                { "quit", "" },
-                { "exit", "" },
-                { "list", "rodIFtTash", },
-                { "pwd",  "" },
-                { "cd",   "od" },
-                { "lcd",  "" },
-                { "sh",   "" },
-                { "getobject", "" },
-                { "get",  "i" },
-                { "compare", "alcqAEQ" },
-                { "restore", "drif" },
-                { "help", "" },
-                { "usage", "m" },
-                { "undelete", "" },
-                { "delete", "" },
-                { NULL, NULL } 
-        };
-
-        typedef enum
-        {
-                Command_Quit = 0,
-                Command_Exit,
-                Command_List,
-                Command_pwd,
-                Command_cd,
-                Command_lcd,
-                Command_sh,
-                Command_GetObject,
-                Command_Get,
-                Command_Compare,
-                Command_Restore,
-                Command_Help,
-                Command_Usage,
-                Command_Undelete,
-                Command_Delete,
-        }
-        CommandType;
-
-        static const char *alias[] = {"ls", 0};
-        static const int aliasIs[] = {Command_List, 0};
-        
+
         // Work out which command it is...
         int cmd = 0;

box/trunk/bin/bbackupquery/BackupQueries.h

@@ -20 +20 @@
 class Configuration;
 class ExcludeList;
+
+typedef struct
+{
+        const char* name;
+        const char* opts;
+}
+QueryCommandSpecification;
+
+// Data about commands
+extern QueryCommandSpecification commands[];
+
+typedef enum
+{
+        Command_Quit = 0,
+        Command_Exit,
+        Command_List,
+        Command_pwd,
+        Command_cd,
+        Command_lcd,
+        Command_sh,
+        Command_GetObject,
+        Command_Get,
+        Command_Compare,
+        Command_Restore,
+        Command_Help,
+        Command_Usage,
+        Command_Undelete,
+        Command_Delete,
+}
+CommandType;
+
+extern const char *alias[];
+extern const int aliasIs[];
 
 // --------------------------------------------------------------------------

box/trunk/bin/bbackupquery/bbackupquery.cpp

@@ -75 +75 @@
 }
 
+#ifdef HAVE_LIBREADLINE
+// copied from: http://tiswww.case.edu/php/chet/readline/readline.html#SEC44
+
+char * command_generator(const char *text, int state)
+{
+        static int list_index, len;
+        const char *name;
+
+        /* 
+         * If this is a new word to complete, initialize now.  This includes
+         * saving the length of TEXT for efficiency, and initializing the index
+         * variable to 0.
+         */
+        if(!state)
+        {
+                list_index = 0;
+                len = strlen(text);
+        }
+
+        /* Return the next name which partially matches from the command list. */
+        while((name = commands[list_index].name))
+        {
+                list_index++;
+
+                if(::strncmp(name, text, len) == 0 && !(state--))
+                {
+                        return ::strdup(name);
+                }
+        }
+
+        list_index = 0;
+
+        while((name = alias[list_index]))
+        {
+                list_index++;
+
+                if(::strncmp(name, text, len) == 0 && !(state--))
+                {
+                        return ::strdup(name);
+                }
+        }
+
+        /* If no names matched, then return NULL. */
+        return (char *) NULL;
+}
+
+char ** bbackupquery_completion(const char *text, int start, int end)
+{
+        char **matches;
+
+        matches = (char **)NULL;
+
+        /* If this word is at the start of the line, then it is a command
+         * to complete.  Otherwise it is the name of a file in the current
+         * directory.
+         */
+        if (start == 0)
+        {
+                matches = rl_completion_matches(text, command_generator);
+        }
+
+        return matches;
+}
+
+#endif // HAVE_LIBREADLINE
+
 int main(int argc, const char *argv[])
 {
@@ -370 +436 @@
         using_history();
 #endif
+        /* Allow conditional parsing of the ~/.inputrc file. */
+        rl_readline_name = "bbackupquery";
+
+        /* Tell the completer that we want a crack first. */
+        rl_attempted_completion_function = bbackupquery_completion;
+
         char *last_cmd = 0;
         while(!context.Stop())