ctdlsh now has two working commands, 'date' and 'passwd'

[citadel.git] / ctdlsh / src / main.c

diff --git a/ctdlsh/src/main.c b/ctdlsh/src/main.c
index e37a3d1662c9aa2ab81dc52b187b18057cef3e65..3dd4b9dd7136d16eec6cbacd3f08cdc16f35244b 100644 (file)
--- a/ctdlsh/src/main.c
+++ b/ctdlsh/src/main.c
@@ -3,42 +3,50 @@
  * This program is released under the terms of the GNU General Public License v3.
  */
 
-#include <config.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <readline/readline.h>
 #include "ctdlsh.h"
 
-#define CTDLDIR        "/appl/citadel"
 
 
 
-int com_quit(char *cmdbuf) {
-       abort();
+int cmd_quit(int sock, char *cmdbuf) {
+       return(cmdret_exit);
 }
 
 
-
-
 /*
  * Commands understood by ctdlsh
  */
 typedef struct {
        char *name;
-       rl_icpfunc_t *func;
+       ctdlsh_cmdfunc_t *func;
        char *doc;
 } COMMAND;
 
 COMMAND commands[] = {
-       {       "quit",         com_quit,       "Quit using ctdlsh"     },
-       {       "exit",         com_quit,       "Quit using ctdlsh"     },
-       {       NULL,           NULL,           NULL                    }
+       {       "?",            cmd_help,       "Display this message"                  },
+       {       "help",         cmd_help,       "Display this message"                  },
+       {       "quit",         cmd_quit,       "Quit using ctdlsh"                     },
+       {       "exit",         cmd_quit,       "Quit using ctdlsh"                     },
+       {       "date",         cmd_datetime,   "Print the server's date and time"      },
+       {       "time",         cmd_datetime,   "Print the server's date and time"      },
+       {       "passwd",       cmd_passwd,     "Set or change an account password"     },
+       {       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);
+       }
+}
+
+
+
+
+
+
 int discover_ipgm_secret(char *dirname) {
        int fd;
        struct partial_config ccc;
@@ -63,12 +71,52 @@ int discover_ipgm_secret(char *dirname) {
 }
 
 
+/* Auto-completer function */
+char *command_generator(const char *text, int state) {
+       static int list_index;
+       static int len;
+       char *name;
+
+       if (!state) {
+               list_index = 0;
+               len = strlen(text);
+       }
+
+       while (name = commands[list_index].name) {
+               ++list_index;
+
+               if (!strncmp(name, text, len)) {
+                       return(strdup(name));
+               }
+       }
+
+       return(NULL);
+}
+
+
+/* Auto-completer function */
+char **ctdlsh_completion(const char *text, int start, int end) {
+       char **matches = (char **) NULL;
+
+       if (start == 0) {
+               matches = rl_completion_matches(text, command_generator);
+       }
+       else {
+               rl_bind_key('\t', rl_abort);
+       }
+
+       return (matches);
+}
+
+
+
 void do_main_loop(int server_socket) {
        char *cmd = NULL;
        char prompt[1024];
        char buf[1024];
        char server_reply[1024];
        int i;
+       int ret = (-1);
 
        strcpy(prompt, "> ");
 
@@ -85,24 +133,18 @@ 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 (cmd = readline(prompt)) {
+       while ((ret != cmdret_exit) && (cmd = readline(prompt))) {
 
                if ((cmd) && (*cmd)) {
                        add_history(cmd);
 
-                       sock_puts(server_socket, cmd);
-                       sock_getln(server_socket, server_reply, sizeof server_reply);
-                       printf("%s\n", server_reply);
-
-                       if ((server_reply[0] == '4') || (server_reply[0] == '8')) {
-                               /* we might consider putting something here */
-                               sock_puts(server_socket, "000");
-                       }
-
-                       if ((server_reply[0] == '1') || (server_reply[0] == '8')) {
-                               while(sock_getln(server_socket, buf, sizeof buf), strcmp(buf, "000")) {
-                                       printf("%s\n", buf);
+                       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);
                                }
                        }