X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=ctdlsh%2Fmain.c;h=69d7f777ba1c0ff6803494f475f1fe5d51132419;hb=aae29a7692b6df8429a1d81b1f33b43f703e78dd;hp=cda33ec44c1fff20c562b3d02dc04576afbf815e;hpb=eda46d460765e708116f0225f6435b576c2869d4;p=citadel.git

diff --git a/ctdlsh/main.c b/ctdlsh/main.c
index cda33ec44..69d7f777b 100644
--- 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,19 +26,40 @@ 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}
 };
 
 
+
+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; commands[i].func != NULL; ++i) {
-		printf("%-10s %s\n", commands[i].name, commands[i].doc);
+	for (i = 0; wows[i].cmd[0]; ++i) {
+		printf("%-10s %s\n", wows[i].cmd[0], wows[i].description);
 	}
 }
 
@@ -110,6 +126,7 @@ 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 */
@@ -129,20 +146,11 @@ void do_main_loop(int server_socket)
 	rl_attempted_completion_function = ctdlsh_completion;
 
 	/* Here we go ... main command loop */
-	while ((ret != cmdret_exit) && (cmd = readline(prompt))) {
-
-		if ((cmd) && (*cmd)) {
+	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 +182,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);