playing around with readline

[citadel.git] / ctdlsh / main.c

diff --git a/ctdlsh/main.c b/ctdlsh/main.c
index cda33ec44c1fff20c562b3d02dc04576afbf815e..daa356833127cc2acfd08e274f61af719a641a5f 100644 (file)
--- a/ctdlsh/main.c
+++ b/ctdlsh/main.c
@@ -1,17 +1,12 @@
 /*
- * (c) 2009-2017 by Art Cancro and citadel.org
- * This program is released under the terms of the GNU General Public License v3.
+ * (c) 2009-2019 by Art Cancro and citadel.org
+ * This program is open source.  It runs great on the Linux operating system.
+ * It's released under the General Public License (GPL) version 3.
  */
 
 #include "ctdlsh.h"
 
 
-int cmd_quit(int sock, char *cmdbuf)
-{
-       return (cmdret_exit);
-}
-
-
 /*
  * Commands understood by ctdlsh
  */
@@ -31,28 +26,37 @@ COMMAND commands[] = {
        {"time", cmd_datetime, "Print the server's date and time"},
        {"passwd", cmd_passwd, "Set or change an account password"},
        {"who", cmd_who, "Display a list of online users"},
-       {"exit", cmd_quit, "Quit using ctdlsh"},
-       {"quit", cmd_quit, "Quit using ctdlsh"},
        {"mailq", cmd_mailq, "Show the outbound email queue"},
        {NULL, NULL, NULL}
 };
 
 
+
 int cmd_help(int sock, char *cmdbuf)
 {
        int i;
 
        for (i = 0; commands[i].func != NULL; ++i) {
-               printf("%-10s %s\n", commands[i].name, commands[i].doc);
+               printf("%10s %s\n", commands[i].name, commands[i].doc);
        }
 }
 
 
-/* Auto-completer function */
-char *command_generator(const char *text, int state)
+int do_one_command(int server_socket, char *cmd)
+{
+       int i;
+       int ret;
+       for (i = 0; commands[i].func != NULL; ++i) {
+               if (!strncasecmp(cmd, commands[i].name, strlen(commands[i].name))) {
+                       ret = (*commands[i].func) (server_socket, cmd);
+               }
+       }
+       return ret;
+}
+
+char *command_name_generator(const char *text, int state)
 {
-       static int list_index;
-       static int len;
+       static int list_index, len;
        char *name;
 
        if (!state) {
@@ -60,44 +64,20 @@ char *command_generator(const char *text, int state)
                len = strlen(text);
        }
 
-       while (name = commands[list_index].name) {
-               ++list_index;
-
-               if (!strncmp(name, text, len)) {
-                       return (strdup(name));
+       while (name = commands[list_index++].name) {
+               if (strncmp(name, text, len) == 0) {
+                       return strdup(name);
                }
        }
 
-       return (NULL);
+       return NULL;
 }
 
 
-/* Auto-completer function */
-char **ctdlsh_completion(const char *text, int start, int end)
+char **command_name_completion(const char *text, int start, int end)
 {
-       char **matches = (char **) NULL;
-
-       rl_completer_word_break_characters = " ";
-       if (start == 0) {
-               matches = rl_completion_matches(text, command_generator);
-       } else {
-               rl_bind_key('\t', rl_abort);
-       }
-
-       return (matches);
-}
-
-
-int do_one_command(int server_socket, char *cmd)
-{
-       int i;
-       int ret;
-       for (i = 0; commands[i].func != NULL; ++i) {
-               if (!strncasecmp(cmd, commands[i].name, strlen(commands[i].name))) {
-                       ret = (*commands[i].func) (server_socket, cmd);
-               }
-       }
-       return ret;
+       rl_attempted_completion_over = 1;
+       return rl_completion_matches(text, command_name_generator);
 }
 
 
@@ -125,24 +105,13 @@ void do_main_loop(int server_socket)
                }
        }
 
-       /* Tell libreadline how we will help with auto-completion of commands */
-       rl_attempted_completion_function = ctdlsh_completion;
-
        /* Here we go ... main command loop */
-       while ((ret != cmdret_exit) && (cmd = readline(prompt))) {
-
-               if ((cmd) && (*cmd)) {
+       rl_attempted_completion_function = command_name_completion;
+       while ( (cmd = readline(prompt)) , cmd ) {
+               if (*cmd) {
                        add_history(cmd);
                        ret = do_one_command(server_socket, cmd);
-
-                       //for (i=0; commands[i].func != NULL; ++i) {
-                       //if (!strncasecmp(cmd, commands[i].name, strlen(commands[i].name))) {
-                       //ret = (*commands[i].func) (server_socket, cmd);
-                       //}
-                       //}
-
                }
-
                free(cmd);
        }
 }
@@ -174,10 +143,10 @@ int main(int argc, char **argv)
        int is_interactive = ((strlen(cmd) == 0) ? 1 : 0);
 
        if (is_interactive) {
-               printf("\nCitadel administration shell (c) 2009-2017 by citadel.org\n"
+               printf("\nCitadel administration shell (c) 2009-2019 by citadel.org\n"
                       "This is open source software made available to you under the terms\n"
                       "of the GNU General Public License v3.  All other rights reserved.\n");
-               printf("Trying %s...\n", ctdldir);
+               printf("Connecting to Citadel server in %s...\n", ctdldir);
        }
 
        sprintf(buf, "%s/citadel-admin.socket", ctdldir);