Reinstated the defunct 'whobbs' utility as a function of ctdlsh

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

diff --git a/ctdlsh/src/main.c b/ctdlsh/src/main.c
index 99c85d00c6b5e2b3dcd38c5d42299ecbb4328e78..7e18d2e6b64dda3aeef9fc55be2f1d5ca59a7c40 100644 (file)
--- a/ctdlsh/src/main.c
+++ b/ctdlsh/src/main.c
@@ -1,5 +1,5 @@
 /*
- * (c) 2009-2011 by Art Cancro and citadel.org
+ * (c) 2009-2012 by Art Cancro and citadel.org
  * This program is released under the terms of the GNU General Public License v3.
  */
 
@@ -28,6 +28,7 @@ COMMAND commands[] = {
        {       "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"     },
+       {       "who",          cmd_who,        "Display a list of online users"        },
        {       "shutdown",     cmd_shutdown,   "Shut down the Citadel server"          },
        {       NULL,           NULL,           NULL                                    }
 };
@@ -80,7 +81,6 @@ char **ctdlsh_completion(const char *text, int start, int end) {
 }
 
 
-
 void do_main_loop(int server_socket) {
        char *cmd = NULL;
        char prompt[1024];
@@ -125,6 +125,10 @@ void do_main_loop(int server_socket) {
        }
 }
 
+
+/*
+ * If you don't know what main() does by now you probably shouldn't be reading this code.
+ */
 int main(int argc, char **argv)
 {
        int server_socket = 0;
@@ -132,8 +136,10 @@ int main(int argc, char **argv)
        int c;
        char *ctdldir = CTDLDIR;
 
-       printf("\nCitadel administration shell v" PACKAGE_VERSION "\n");
-       printf("(c) 2009-2011 citadel.org GPLv3\n");
+       printf("\nCitadel administration shell v" PACKAGE_VERSION " (c) 2009-2012 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"
+       );
 
        opterr = 0;
        while ((c = getopt (argc, argv, "h:")) != -1) {