X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=ctdlsh%2Fmain.c;h=daa356833127cc2acfd08e274f61af719a641a5f;hb=93f719e3132da1eb448f7ca27c852fbe0953a63c;hp=80b2fd09e31c5aacb0f892b4b7981f3f6b4e747d;hpb=2a9247b7dd180023225732aa6665cabaaca712fd;p=citadel.git diff --git a/ctdlsh/main.c b/ctdlsh/main.c index 80b2fd09e..daa356833 100644 --- a/ctdlsh/main.c +++ b/ctdlsh/main.c @@ -1,16 +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 */ @@ -21,34 +17,46 @@ typedef struct { } COMMAND; COMMAND commands[] = { - { "?", cmd_help, "Display this message" }, - { "help", cmd_help, "Display this message" }, - { "date", cmd_datetime, "Print the server's date and time" }, - { "config", cmd_config, "Configure the Citadel server" }, - { "export", cmd_export, "Export all Citadel databases" }, - { "shutdown", cmd_shutdown, "Shut down the Citadel server" }, - { "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" }, - { NULL, NULL, NULL } + {"?", cmd_help, "Display this message"}, + {"help", cmd_help, "Display this message"}, + {"date", cmd_datetime, "Print the server's date and time"}, + {"config", cmd_config, "Configure the Citadel server"}, + {"export", cmd_export, "Export all Citadel databases"}, + {"shutdown", cmd_shutdown, "Shut down the Citadel server"}, + {"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"}, + {"mailq", cmd_mailq, "Show the outbound email queue"}, + {NULL, NULL, NULL} }; -int cmd_help(int sock, char *cmdbuf) { + +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; 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) { - static int list_index; - static int len; +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, len; char *name; if (!state) { @@ -56,46 +64,25 @@ 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); -} - - -/* 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); + return NULL; } -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_completion(const char *text, int start, int end) +{ + rl_attempted_completion_over = 1; + return rl_completion_matches(text, command_name_generator); } -void do_main_loop(int server_socket) { +void do_main_loop(int server_socket) +{ char *cmd = NULL; char prompt[1024]; char buf[1024]; @@ -110,7 +97,7 @@ void do_main_loop(int server_socket) { sock_getln(server_socket, buf, sizeof buf); if (buf[0] == '1') { i = 0; - while(sock_getln(server_socket, buf, sizeof buf), strcmp(buf, "000")) { + while (sock_getln(server_socket, buf, sizeof buf), strcmp(buf, "000")) { if (i == 1) { sprintf(prompt, "\n%s> ", buf); } @@ -118,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); } } @@ -150,14 +126,13 @@ int main(int argc, char **argv) char buf[1024]; int i; char *ctdldir = CTDLDIR; - char cmd[1024] = { 0 } ; + char cmd[1024] = { 0 }; int exitcode = 0; - for (i=1; i 0) { strcat(cmd, " "); } @@ -168,11 +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" - "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("\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("Connecting to Citadel server in %s...\n", ctdldir); } sprintf(buf, "%s/citadel-admin.socket", ctdldir); @@ -186,8 +160,7 @@ int main(int argc, char **argv) if (is_interactive) { printf("Connected: %s\n", buf); do_main_loop(server_socket); - } - else { + } else { exitcode = do_one_command(server_socket, cmd); } }