more fiddling around with ctdlsh

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

diff --git a/ctdlsh/src/main.c b/ctdlsh/src/main.c
index 247f8e9f328bbbd338fdb9f376e79a0d7edfbb47..c47b89c997db3edcc84f3c1c4de3ac94caa4f625 100644 (file)
--- a/ctdlsh/src/main.c
+++ b/ctdlsh/src/main.c
@@ -1,18 +1,36 @@
 /*
- * (c) 2009 by Art Cancro and citadel.org
+ * (c) 2009-2011 by Art Cancro and citadel.org
  * 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        "/root/ctdl/trunk/citadel"
+
+
+
+int cmd_quit(char *cmdbuf) {
+       abort();
+}
+
+
+
+
+/*
+ * Commands understood by ctdlsh
+ */
+typedef struct {
+       char *name;
+       rl_icpfunc_t *func;
+       char *doc;
+} COMMAND;
+
+
+COMMAND commands[] = {
+       {       "quit",         cmd_quit,       "Quit using ctdlsh"                     },
+       {       "date",         cmd_datetime,   "Print the server's date and time"      },
+       {       NULL,           NULL,           NULL                                    }
+};
+
 
 int discover_ipgm_secret(char *dirname) {
        int fd;
@@ -38,6 +56,45 @@ 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];
@@ -60,26 +117,15 @@ 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)) {
 
                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')) {
-                               // FIXME
-                       }
-
-                       if ((server_reply[0] == '1') || (server_reply[0] == '8')) {
-                               while(sock_getln(server_socket, buf, sizeof buf), strcmp(buf, "000")) {
-                                       printf("%s\n", buf);
-                               }
-                       }
-
+                       /* FIXME put something here */
                }
 
                free(cmd);
@@ -95,7 +141,7 @@ int main(int argc, char **argv)
        char *ctdldir = CTDLDIR;
 
        printf("\nCitadel administration shell v" PACKAGE_VERSION "\n");
-       printf("(c) 2009 citadel.org GPLv3\n");
+       printf("(c) 2009-2011 citadel.org GPLv3\n");
 
        opterr = 0;
        while ((c = getopt (argc, argv, "h:")) != -1) {
@@ -120,14 +166,12 @@ int main(int argc, char **argv)
                exit(1);
        }
 
-       printf("Attaching to server...\r");
-       fflush(stdout);
+       printf("Trying %s...\n", ctdldir);
        sprintf(buf, "%s/citadel.socket", ctdldir);
        server_socket = uds_connectsock(buf);
        if (server_socket < 0) {
                exit(1);
        }
-       printf("                      \r");
 
        sock_getln(server_socket, buf, sizeof buf);
        printf("%s\n", buf);