From 93f719e3132da1eb448f7ca27c852fbe0953a63c Mon Sep 17 00:00:00 2001
From: Art Cancro <ajc@citadel.org>
Date: Sat, 16 Nov 2019 17:44:03 -0500
Subject: [PATCH] playing around with readline

---
 ctdlsh/main.c | 95 +++++++++++++--------------------------------------
 1 file changed, 24 insertions(+), 71 deletions(-)

diff --git a/ctdlsh/main.c b/ctdlsh/main.c
index 468c8b261..daa356833 100644
--- a/ctdlsh/main.c
+++ b/ctdlsh/main.c
@@ -32,43 +32,31 @@ COMMAND commands[] = {
 
 
 
-struct wow {
-	char *cmd[5];			// increase this if we need to have larger commands
-	char *description;
-};
-
-struct wow wows[] = {
-	{{ "help" }					, "list available commands"				},
-	{{ "date" }					, "print the server's date and time"			},
-	{{ "show", "eggs" }				, "show how many eggs are available for serving"	},
-	{{ "kill", "mark", "zuckerberg" }		, "die motherfucker die"				},
-	{{ "show", "undead", "zombies", "real" }	, "show how many zombies are actually undead"		},
-	{{ "show", "undead", "zombies", "hollywood" }	, "show how many zombies are hollywood communists"	},
-	{{ NULL }					, "NULL"						}
-};
-
-
-int num_wows = sizeof(wows) / sizeof(struct wow);
-
-
-
-
-
 int cmd_help(int sock, char *cmdbuf)
 {
 	int i;
 
-	for (i = 0; wows[i].cmd[0]; ++i) {
-		printf("%-10s %s\n", wows[i].cmd[0], wows[i].description);
+	for (i = 0; commands[i].func != NULL; ++i) {
+		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)
 {
-	static int list_index;
-	static int len;
+	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, len;
 	char *name;
 
 	if (!state) {
@@ -76,52 +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)
 {
-
-
-	printf("\033[7mcompletion: text='%s', start=%d, end=%d\033[0m\n", text, start , 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);
 }
 
 
@@ -134,7 +90,6 @@ void do_main_loop(int server_socket)
 	int i;
 	int ret = (-1);
 
-
 	strcpy(prompt, "> ");
 
 	/* Do an INFO command and learn the hostname for the prompt */
@@ -150,10 +105,8 @@ 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 */
+	rl_attempted_completion_function = command_name_completion;
 	while ( (cmd = readline(prompt)) , cmd ) {
 		if (*cmd) {
 			add_history(cmd);
-- 
2.30.2