]> code.citadel.org Git - citadel.git/blobdiff - citadel/citadel.c
removed all references to sprintf from several files (not all files yet)
[citadel.git] / citadel / citadel.c
index 80a63c09e27d6084fab5a4ed28eaa82484fbca86..7f5b7dd43ec84b4e3e34e760a99d7f4aa8c3fc53 100644 (file)
@@ -1,8 +1,7 @@
 /*
- * Citadel/UX  
- *
- * citadel.c - Main source file.
+ * $Id$
  *
+ * Main source module for the client program.
  */
 
 #include "sysdep.h"
 #include <stdio.h>
 #include <ctype.h>
 #include <string.h>
-#include <time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
+#include <limits.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
 #include <signal.h>
 #include <pwd.h>
 #include <setjmp.h>
+#include <stdarg.h>
 
 #include "citadel.h"
 #include "axdefs.h"
+#include "serv_info.h"
+#include "routines.h"
+#include "routines2.h"
+#include "rooms.h"
+#include "messages.h"
+#include "commands.h"
+#include "ipc.h"
+#include "client_chat.h"
+#include "client_passwords.h"
+#include "citadel_decls.h"
+#include "tools.h"
+#include "acconfig.h"
+#include "client_crypto.h"
+#ifndef HAVE_SNPRINTF
+#include "snprintf.h"
+#endif
+#include "screen.h"
+
+#include "md5.h"
 
 struct march {
        struct march *next;
-       char march_name[32];
+       char march_name[ROOMNAMELEN];
        char march_floor;
+       char march_order;
        };
 
 #define IFEXPERT if (userflags&US_EXPERT)
@@ -36,130 +68,77 @@ struct march {
 #define IFNAIDE if (axlevel<6)
 
 struct march *march = NULL;
-long finduser();
-void extract();
-long extract_long();
-int extract_int();
-void load_command_set();
-void updatelsa();
-void movefile();
-void deletefile();
-void netsendfile();
-void listzrooms();
-int ka_system();
-void interr();
-int struncmp();
-int yesno();
-void sttybbs();
-void newprompt();
-void strprompt();
-int fmout();
-int checkpagin();
-int pattern();
-int pattern2();
-void readinfo();
-int num_parms();
-void attach_to_server();
-void strproc();
-void enter_config();
-void entregis();
-int entmsg();
-void updatels();
-void forget();
-void readmsgs();
-int getcmd();
-void subshell();
-void entroom();
-void killroom();
-void invite();
-void kickout();
-void editthisroom();
-void roomdir();
-void download();
-void upload();
-void cli_upload();
-void ungoto();
-void whoknows();
-void validate();
-void enterinfo();
-void display_help();
-void edituser();
-void knrooms();
-void locate_host();
-void chatmode();
-void load_floorlist();
-void create_floor();
-void edit_floor();
-void kill_floor();
-void enter_bio();
-void read_bio();
-void misc_server_cmd();
-int nukedir();
-void color();
-void cls();
-void edit_system_message();
-void send_ansi_detect();
-void look_for_ansi();
-void cli_image_upload();
-
 
 /* globals associated with the client program */
-char temp[16];                         /* Name of general temp file */
-char temp2[16];                                /* Name of general temp file */
-char tempdir[16];                      /* Name of general temp dir */
-char editor_path[256];                 /* path to external editor */
-char printcmd[256];                    /* print command */
+char temp[PATH_MAX];           /* Name of general temp file */
+char temp2[PATH_MAX];          /* Name of general temp file */
+char tempdir[PATH_MAX];                /* Name of general temp dir */
+char editor_path[SIZ];         /* path to external editor */
+char printcmd[SIZ];            /* print command */
 int editor_pid = (-1);
 char fullname[32];
 jmp_buf nextbuf;
-struct CtdlServInfo serv_info;         /* Info on the server connected */
+struct CtdlServInfo serv_info; /* Info on the server connected */
 int screenwidth;
 int screenheight;
 unsigned room_flags;
-char room_name[32];
-char ugname[20];
-long uglsn;                            /* holds <u>ngoto info */
-char is_mail = 0;                      /* nonzero when we're in a mail room */
-char axlevel = 0;                      /* access level */
-char is_room_aide = 0;                 /* boolean flag, 1 if room aide */
+char room_name[ROOMNAMELEN];
+char *uglist[UGLISTLEN]; /* size of the ungoto list */
+long uglistlsn[UGLISTLEN]; /* current read position for all the ungoto's. Not going to make any friends with this one. */
+int uglistsize = 0;
+char is_mail = 0;              /* nonzero when we're in a mail room */
+char axlevel = 0;              /* access level */
+char is_room_aide = 0;         /* boolean flag, 1 if room aide */
 int timescalled;
 int posted;
 unsigned userflags;
-long usernum = 0L;                     /* user number */
+long usernum = 0L;             /* user number */
+time_t lastcall = 0L;          /* Date/time of previous login */
 char newnow;
-long highest_msg_read;                 /* used for <A>bandon room cmd */
-long maxmsgnum;                                /* used for <G>oto */
+long highest_msg_read;         /* used for <A>bandon room cmd */
+long maxmsgnum;                        /* used for <G>oto */
 char sigcaught = 0;
-char have_xterm = 0;                   /* are we running on an xterm? */
+char have_xterm = 0;           /* are we running on an xterm? */
 char rc_username[32];
 char rc_password[32];
+char hostbuf[SIZ];
+char portbuf[SIZ];
 char rc_floor_mode;
 char floor_mode;
-char curr_floor = 0;                   /* number of current floor */
-char floorlist[128][256];              /* names of floors */
-char express_msgs = 0;                 /* express messages waiting! */
-char last_paged[32]="";
+char curr_floor = 0;           /* number of current floor */
+char floorlist[128][SIZ];      /* names of floors */
+char express_msgs = 0;         /* express messages waiting! */
+int termn8 = 0;                        /* Set to nonzero to cause a logoff */
+int secure;                    /* Set to nonzero when wire is encrypted */
 
-extern char server_is_local;           /* defined in ipc module */
+extern int rc_ansi_color;      /* ansi color value from citadel.rc */
 
 /*
  * here is our 'clean up gracefully and exit' routine
  */
-void logoff(code)
-int code; {
-       if (editor_pid>0) {             /* kill the editor if it's running */
-               kill(editor_pid,SIGHUP);
-               }
+void logoff(int code)
+{
+    int lp;
+       if (editor_pid > 0) {   /* kill the editor if it's running */
+               kill(editor_pid, SIGHUP);
+       }
+
+    /* Free the ungoto list */
+    for (lp = 0; lp < uglistsize; lp++)
+      free (uglist[lp]);
 
 /* shut down the server... but not if the logoff code is 3, because
  * that means we're exiting because we already lost the server
  */
-       if (code!=3) serv_puts("QUIT");
+       if (code != 3)
+               serv_puts("QUIT");
 
 /*
  * now clean up various things
  */
 
+       screen_delete();
+
        unlink(temp);
        unlink(temp2);
        nukedir(tempdir);
@@ -167,114 +146,107 @@ int code; {
        /* Violently kill off any child processes if Citadel is
         * the login shell. 
         */
-       if (getppid()==1) {
-               kill(0-getpgrp(),SIGTERM);
+       if (getppid() == 1) {
+               kill(0 - getpgrp(), SIGTERM);
                sleep(1);
-               kill(0-getpgrp(),SIGKILL);
-               }
-
-       sttybbs(SB_RESTORE);            /* return the old terminal settings */
-       exit(code);                     /* exit with the proper exit code */
+               kill(0 - getpgrp(), SIGKILL);
        }
+       sttybbs(SB_RESTORE);    /* return the old terminal settings */
+       exit(code);             /* exit with the proper exit code */
+}
 
 
 
 /*
- * We handle "next" and "stop" much differently than in earlier versions.
- * The signal catching routine simply sets a flag and returns.
+ * signal catching function for hangups...
  */
-void sighandler(which_sig)
-int which_sig; {
-       signal(SIGINT,SIG_IGN);
-       signal(SIGQUIT,SIG_IGN);
-       sigcaught = which_sig;
-       return;
-       }
+void dropcarr(int signum)
+{
+       logoff(SIGHUP);
+}
+
 
 
 /*
- * signal catching function for hangups...
+ * catch SIGCONT to reset terminal modes when were are put back into the
+ * foreground.
  */
-void dropcarr() {
-       logoff(SIGHUP);
-       }
+void catch_sigcont(int signum)
+{
+       sttybbs(SB_LAST);
+       signal(SIGCONT, catch_sigcont);
+}
 
 
 
 /* general purpose routines */
 
-void formout(name) /* display a file */
-char name[];
-       {
-       char cmd[256];
-       sprintf(cmd,"MESG %s",name);
+void formout(char *name)
+{                              /* display a file */
+       char cmd[SIZ];
+       snprintf(cmd, sizeof cmd, "MESG %s", name);
        serv_puts(cmd);
        serv_gets(cmd);
-       if (cmd[0]!='1') {
-               printf("%s\n",&cmd[4]);
+       if (cmd[0] != '1') {
+               scr_printf("%s\n", &cmd[4]);
                return;
-               }
-       fmout(screenwidth,NULL,
-               ((userflags & US_PAGINATOR) ? 1 : 0),
-               screenheight,1,1);
        }
+       fmout(screenwidth, NULL, NULL,
+             ((userflags & US_PAGINATOR) ? 1 : 0),
+             screenheight, 1, 1);
+}
 
 
-void userlist() { 
-       char buf[256];
-       char fl[256];
+void userlist(char *patn)
+{
+       char buf[SIZ];
+       char fl[SIZ];
        struct tm *tmbuf;
-       long lc;
-       int linecount = 2;
+       time_t lc;
 
        serv_puts("LIST");
        serv_gets(buf);
-       if (buf[0]!='1') {
-               printf("%s\n",&buf[4]);
+       if (buf[0] != '1') {
+               pprintf("%s\n", &buf[4]);
                return;
-               }
-       sigcaught = 0;
-       sttybbs(SB_YES_INTR);
-       printf("       User Name           Num  L  LastCall  Calls Posts\n");
-       printf("------------------------- ----- - ---------- ----- -----\n");
-       while (serv_gets(buf), strcmp(buf,"000")) {
+       }
+       pprintf("       User Name           Num  L  LastCall  Calls Posts\n");
+       pprintf("------------------------- ----- - ---------- ----- -----\n");
+       while (serv_gets(buf), strcmp(buf, "000")) {
                if (sigcaught == 0) {
-                       extract(fl,buf,0);
-                       printf("%-25s ",fl);
-                       printf("%5ld %d ",extract_long(buf,2),
-                               extract_int(buf,1));
-                       lc = extract_long(buf,3);
-                       tmbuf = (struct tm *)localtime(&lc);
-                       printf("%02d/%02d/%04d ",
-                               (tmbuf->tm_mon+1),
-                               tmbuf->tm_mday,
-                               (tmbuf->tm_year + 1900));
-                       printf("%5ld %5ld\n",extract_long(buf,4),extract_long(buf,5));
-
-                       ++linecount;
-                       linecount = checkpagin(linecount,
-                               ((userflags & US_PAGINATOR) ? 1 : 0),
-                               screenheight);
+                   extract(fl, buf, 0);
+                   if (pattern(fl, patn) >= 0) {
+                       pprintf("%-25s ", fl);
+                       pprintf("%5ld %d ", extract_long(buf, 2),
+                              extract_int(buf, 1));
+                       lc = extract_long(buf, 3);
+                       tmbuf = (struct tm *) localtime(&lc);
+                       pprintf("%02d/%02d/%04d ",
+                              (tmbuf->tm_mon + 1),
+                              tmbuf->tm_mday,
+                              (tmbuf->tm_year + 1900));
+                       pprintf("%5ld %5ld\n", extract_long(buf, 4), extract_long(buf, 5));
+                   }
 
-                       }
                }
-       sttybbs(SB_NO_INTR);
-       printf("\n");
        }
+       pprintf("\n");
+}
 
 
 /*
  * grab assorted info about the user...
  */
-void load_user_info(params)
-char *params; {
-       extract(fullname,params,0);
-       axlevel = extract_int(params,1);
-       timescalled = extract_int(params,2);
-       posted = extract_int(params,3);
-       userflags = extract_int(params,4);
-       usernum = extract_long(params,5);
-       }
+void load_user_info(char *params)
+{
+       extract(fullname, params, 0);
+       axlevel = extract_int(params, 1);
+       timescalled = extract_int(params, 2);
+       posted = extract_int(params, 3);
+       userflags = extract_int(params, 4);
+       usernum = extract_long(params, 5);
+       lastcall = extract_long(params, 6);
+}
 
 
 /*
@@ -282,501 +254,537 @@ char *params; {
  * 'roomname' is set to _FLOOR_, in which case all rooms on the requested
  * floor will be removed from the march list.
  */
-void remove_march(roomname,floornum)
-char *roomname;
-int floornum; {
-       struct march *mptr,*mptr2;
+void remove_march(char *roomname, int floornum)
+{
+       struct march *mptr, *mptr2;
 
-       if (march==NULL) return;
+       if (march == NULL)
+               return;
 
-       if ( (!strucmp(march->march_name,roomname))
-        || ((!strucmp(roomname,"_FLOOR_"))&&(march->march_floor==floornum))) {
+       if ((!strcasecmp(march->march_name, roomname))
+           || ((!strcasecmp(roomname, "_FLOOR_")) && (march->march_floor == floornum))) {
                mptr = march->next;
                free(march);
                march = mptr;
                return;
-               }
-
+       }
        mptr2 = march;
-       for (mptr=march; mptr!=NULL; mptr=mptr->next) {
+       for (mptr = march; mptr != NULL; mptr = mptr->next) {
 
-               if ( (!strucmp(mptr->march_name,roomname))
-                  || ((!strucmp(roomname,"_FLOOR_"))
-                       &&(mptr->march_floor==floornum))) {
+               if ((!strcasecmp(mptr->march_name, roomname))
+                   || ((!strcasecmp(roomname, "_FLOOR_"))
+                       && (mptr->march_floor == floornum))) {
 
                        mptr2->next = mptr->next;
                        free(mptr);
-                       mptr=mptr2;
-                       }
-               else {
-                       mptr2=mptr;
-                       }
+                       mptr = mptr2;
+               } else {
+                       mptr2 = mptr;
                }
        }
+}
+
 
 /*
- * sort the march list by floor
+ * Locate the room on the march list which we most want to go to.  Each room
+ * is measured given a "weight" of preference based on various factors.
  */
-void sort_march_list() {
-       struct march *mlist[129];
+char *pop_march(int desired_floor)
+{
+       static char TheRoom[ROOMNAMELEN];
+       int TheFloor = 0;
+       int TheOrder = 32767;
+       int TheWeight = 0;
+       int weight;
        struct march *mptr = NULL;
-       int a;
-
-       if (march == NULL) return;
 
-       for (a=0; a<129; ++a) mlist[a] = NULL;
-
-       /* first, create 128 separate lists for each floor. */
-       while (march != NULL) {
+       strcpy(TheRoom, "_BASEROOM_");
+       if (march == NULL)
+               return (TheRoom);
 
-               a = (int)(march->march_floor);
-
-               /* assign an illegal floor number of 128 to _BASEROOM_
-                * in order to force it to show up last */      
-               if (!strucmp(march->march_name,"_BASEROOM_")) a = 128;
-
-               mptr = march;
-               march = march->next;
-               mptr->next = mlist[a];
-               mlist[a] = mptr;
-               }
-
-       /* now merge the lists, in order, into one big list, 
-        * except the current floor
-        */
-       for (a=128; a>=0; --a) if (a != curr_floor) {
-               while (mlist[a] != NULL) {
-                       mptr = mlist[a];
-                       mlist[a] = mlist[a]->next;
-                       mptr->next = march;
-                       march = mptr;
-                       }
-               }
-
-       /* now merge in rooms from the current floor */
-       while (mlist[(int)curr_floor] != NULL) {
-               mptr = mlist[(int)curr_floor];
-               mlist[(int)curr_floor] = mlist[(int)curr_floor]->next;
-               mptr->next = march;
-               march = mptr;
+       for (mptr = march; mptr != NULL; mptr = mptr->next) {
+               weight = 0;
+               if ((strcasecmp(mptr->march_name, "_BASEROOM_")))
+                       weight = weight + 10000;
+               if (mptr->march_floor == desired_floor)
+                       weight = weight + 5000;
+
+               weight = weight + ((128 - (mptr->march_floor)) * 128);
+               weight = weight + (128 - (mptr->march_order));
+
+               if (weight > TheWeight) {
+                       TheWeight = weight;
+                       strcpy(TheRoom, mptr->march_name);
+                       TheFloor = mptr->march_floor;
+                       TheOrder = mptr->march_order;
                }
-
        }
-
+       return (TheRoom);
+}
 
 
 /*
  * jump directly to a room
  */
-void dotgoto(towhere,display_name)
-char *towhere;
-int display_name; {
-       char aaa[256],bbb[256],psearch[256];
+void dotgoto(char *towhere, int display_name, int fromungoto)
+{
+       char aaa[SIZ], bbb[SIZ], psearch[SIZ];
        static long ls = 0L;
-       int newmailcount;
+       int newmailcount = 0;
        static int oldmailcount = (-1);
-       int partial_match,best_match;
+       int partial_match, best_match;
        char from_floor;
+    int ugpos = uglistsize;
 
        /* store ungoto information */
-       strcpy(ugname,room_name);
-       uglsn = ls;
-
+    if (fromungoto == 0)
+      {
+        if (uglistsize >= (UGLISTLEN-1))
+          {  /* sloppy slide them all down, hey it's the client, who cares. :-) */
+            int lp;
+            free (uglist[0]);
+            for (lp = 0; lp < (UGLISTLEN-1); lp++)
+              {
+                uglist[lp] = uglist[lp+1];
+                uglistlsn[lp] = uglistlsn[lp+1];
+              }
+            ugpos--;
+          }
+        else
+          uglistsize++;
+        
+        uglist[ugpos] = malloc(strlen(room_name)+1);
+        strcpy(uglist[ugpos], room_name);
+        uglistlsn[ugpos] = ls;
+      }
+      
        /* first try an exact match */
-       sprintf(aaa,"GOTO %s",towhere);
+       snprintf(aaa, sizeof aaa, "GOTO %s", towhere);
        serv_puts(aaa);
        serv_gets(aaa);
-       if (aaa[3]=='*') express_msgs = 1;
-       if (!strncmp(aaa,"54",2)) {
-               newprompt("Enter room password: ",bbb,9);
-               sprintf(aaa,"GOTO %s|%s",towhere,bbb);
+       if (aaa[3] == '*')
+               express_msgs = 1;
+       if (!strncmp(aaa, "54", 2)) {
+               newprompt("Enter room password: ", bbb, 9);
+               snprintf(aaa, sizeof aaa, "GOTO %s|%s", towhere, bbb);
                serv_puts(aaa);
                serv_gets(aaa);
-               if (aaa[3]=='*') express_msgs = 1;
-               }
-       if (!strncmp(aaa,"54",2)) {
-               printf("Wrong password.\n");
+               if (aaa[3] == '*')
+                       express_msgs = 1;
+       }
+       if (!strncmp(aaa, "54", 2)) {
+               scr_printf("Wrong password.\n");
                return;
-               }
-
-
+       }
        /*
         * If a match is not found, try a partial match.
         * Partial matches anywhere in the string carry a weight of 1,
         * left-aligned matches carry a weight of 2.  Pick the room that
         * has the highest-weighted match.
         */
-       if (aaa[0]!='2') {
+       if (aaa[0] != '2') {
                best_match = 0;
-               strcpy(bbb,"");
+               strcpy(bbb, "");
                serv_puts("LKRA");
                serv_gets(aaa);
-               if (aaa[0]=='1') while (serv_gets(aaa), strcmp(aaa,"000")) {
-                       extract(psearch,aaa,0);
-                       partial_match = 0;
-                       if (pattern(psearch,towhere)>=0) {
-                               partial_match = 1;
+               if (aaa[0] == '1')
+                       while (serv_gets(aaa), strcmp(aaa, "000")) {
+                               extract(psearch, aaa, 0);
+                               partial_match = 0;
+                               if (pattern(psearch, towhere) >= 0) {
+                                       partial_match = 1;
                                }
-                       if (!struncmp(towhere,psearch,strlen(towhere))) {
-                               partial_match = 2;
+                               if (!strncasecmp(towhere, psearch, strlen(towhere))) {
+                                       partial_match = 2;
                                }
-                       if (partial_match > best_match) {
-                               strcpy(bbb,psearch);
-                               best_match = partial_match;
+                               if (partial_match > best_match) {
+                                       strcpy(bbb, psearch);
+                                       best_match = partial_match;
                                }
                        }
-               if (strlen(bbb)==0) {
-                       printf("No room '%s'.\n",towhere);
+               if (strlen(bbb) == 0) {
+                       scr_printf("No room '%s'.\n", towhere);
                        return;
-                       }
-               sprintf(aaa,"GOTO %s",bbb);
+               }
+               snprintf(aaa, sizeof aaa, "GOTO %s", bbb);
                serv_puts(aaa);
                serv_gets(aaa);
-               if (aaa[3]=='*') express_msgs = 1;
-               }
-
-       if (aaa[0]!='2') {
-               printf("%s\n",aaa);
+               if (aaa[3] == '*')
+                       express_msgs = 1;
+       }
+       if (aaa[0] != '2') {
+               scr_printf("%s\n", aaa);
                return;
-               }
-
-       extract(room_name,&aaa[4],0);
-       room_flags = extract_int(&aaa[4],4);
+       }
+       extract(room_name, &aaa[4], 0);
+       room_flags = extract_int(&aaa[4], 4);
        from_floor = curr_floor;
-       curr_floor = extract_int(&aaa[4],10);
-
-       remove_march(room_name,0);
-       if (!strucmp(towhere,"_BASEROOM_")) remove_march(towhere,0);
-       if ((from_floor!=curr_floor) && (display_name>0) && (floor_mode==1)) {
-               if (floorlist[(int)curr_floor][0]==0) load_floorlist();
-               printf("(Entering floor: %s)\n",&floorlist[(int)curr_floor][0]);
-               }
-       if (display_name == 1) printf("%s - ",room_name);
-       if (display_name != 2) printf("%d new of %d messages.\n",
-               extract_int(&aaa[4],1),
-               extract_int(&aaa[4],2));
-       highest_msg_read = extract_int(&aaa[4],6);
-       maxmsgnum = extract_int(&aaa[4],5);
-       is_mail = (char) extract_int(&aaa[4],7);
-       is_room_aide = (char) extract_int(&aaa[4],8);
-       ls = extract_long(&aaa[4],6);
+       curr_floor = extract_int(&aaa[4], 10);
+
+       remove_march(room_name, 0);
+       if (!strcasecmp(towhere, "_BASEROOM_"))
+               remove_march(towhere, 0);
+       if ((from_floor != curr_floor) && (display_name > 0) && (floor_mode == 1)) {
+               if (floorlist[(int) curr_floor][0] == 0)
+                       load_floorlist();
+               scr_printf("(Entering floor: %s)\n", &floorlist[(int) curr_floor][0]);
+       }
+       if (display_name == 1) {
+               color(BRIGHT_WHITE);
+               scr_printf("%s ", room_name);
+               color(DIM_WHITE);
+               scr_printf("- ");
+       }
+       if (display_name != 2) {
+               color(BRIGHT_YELLOW);
+               scr_printf("%d ", extract_int(&aaa[4], 1));
+               color(DIM_WHITE);
+               scr_printf("new of ");
+               color(BRIGHT_YELLOW);
+               scr_printf("%d ", extract_int(&aaa[4], 2));
+               color(DIM_WHITE);
+               scr_printf("messages.\n");
+       }
+       highest_msg_read = extract_int(&aaa[4], 6);
+       maxmsgnum = extract_int(&aaa[4], 5);
+       is_mail = (char) extract_int(&aaa[4], 7);
+       is_room_aide = (char) extract_int(&aaa[4], 8);
+       ls = extract_long(&aaa[4], 6);
 
        /* read info file if necessary */
-       if (extract_int(&aaa[4],3) > 0) readinfo();
+       if (extract_int(&aaa[4], 3) > 0)
+               readinfo();
 
        /* check for newly arrived mail if we can */
-       if (num_parms(&aaa[4])>=10) {
-               newmailcount = extract_int(&aaa[4],9);
-               if ( (oldmailcount >= 0) && (newmailcount > oldmailcount) )
-                       printf("*** You have new mail\n");
-               oldmailcount = newmailcount;
+       if (num_parms(&aaa[4]) >= 10) {
+               newmailcount = extract_int(&aaa[4], 9);
+               if ((oldmailcount >= 0) && (newmailcount > oldmailcount)) {
+                       color(BRIGHT_RED);
+                       scr_printf("*** You have new mail\n");
+                       color(DIM_WHITE);
                }
+               oldmailcount = newmailcount;
+               status_line(serv_info.serv_humannode, serv_info.serv_bbs_city,
+                               room_name, secure, newmailcount);
+       } else {
+               status_line(serv_info.serv_humannode, serv_info.serv_bbs_city,
+                               room_name, secure, -1);
        }
+}
 
 /* Goto next room having unread messages.
  * We want to skip over rooms that the user has already been to, and take the
  * user back to the lobby when done.  The room we end up in is placed in
  * newroom - which is set to 0 (the lobby) initially.
- * We start the search in the current room rather than the beginning to prevent
- * two or more concurrent users from dragging each other back to the same room.
  */
-void gotonext() {
-       char buf[256];
-       struct march *mptr,*mptr2;
-       char next_room[32];
+void gotonext(void)
+{
+       char buf[SIZ];
+       struct march *mptr, *mptr2;
+       char next_room[ROOMNAMELEN];
 
-       /* First check to see if the march-mode list is already allocated.
+       /* Check to see if the march-mode list is already allocated.
         * If it is, pop the first room off the list and go there.
         */
-
-       if (march==NULL) {
+       if (march == NULL) {
                serv_puts("LKRN");
                serv_gets(buf);
-               if (buf[0]=='1')
-                   while (serv_gets(buf), strcmp(buf,"000")) {
-                       mptr = (struct march *) malloc(sizeof(struct march));
-                       mptr->next = NULL;
-                       extract(mptr->march_name,buf,0);
-                       mptr->march_floor = (char) (extract_int(buf,2) & 0x7F);
-                       if (march==NULL) {
-                               march = mptr;
-                               }
-                       else {
-                               mptr2 = march;
-                               while (mptr2->next != NULL)
-                                       mptr2 = mptr2->next;
-                               mptr2->next = mptr;
+               if (buf[0] == '1')
+                       while (serv_gets(buf), strcmp(buf, "000")) {
+                               mptr = (struct march *) malloc(sizeof(struct march));
+                               mptr->next = NULL;
+                               extract(mptr->march_name, buf, 0);
+                               mptr->march_floor = (char) (extract_int(buf, 2) & 0x7F);
+                               mptr->march_order = (char) (extract_int(buf, 3) & 0x7F);
+                               if (march == NULL) {
+                                       march = mptr;
+                               } else {
+                                       mptr2 = march;
+                                       while (mptr2->next != NULL)
+                                               mptr2 = mptr2->next;
+                                       mptr2->next = mptr;
                                }
                        }
-
 /* add _BASEROOM_ to the end of the march list, so the user will end up
  * in the system base room (usually the Lobby>) at the end of the loop
  */
                mptr = (struct march *) malloc(sizeof(struct march));
                mptr->next = NULL;
-               strcpy(mptr->march_name,"_BASEROOM_");
-               if (march==NULL) {
+               strcpy(mptr->march_name, "_BASEROOM_");
+               if (march == NULL) {
                        march = mptr;
-                       }
-               else {
+               } else {
                        mptr2 = march;
                        while (mptr2->next != NULL)
                                mptr2 = mptr2->next;
                        mptr2->next = mptr;
-                       }
+               }
 /*
  * ...and remove the room we're currently in, so a <G>oto doesn't make us
  * walk around in circles
  */
-               remove_march(room_name,0);
-               }
-
-       sort_march_list();
-
-       if (march!=NULL) {
-               strcpy(next_room,march->march_name);
-               }
-       else {
-               strcpy(next_room,"_BASEROOM_");
-               }
-       remove_march(next_room,0);
-       dotgoto(next_room,1);
-   }
+               remove_march(room_name, 0);
+       }
+       if (march != NULL) {
+               strcpy(next_room, pop_march(curr_floor));
+       } else {
+               strcpy(next_room, "_BASEROOM_");
+       }
+       remove_march(next_room, 0);
+       dotgoto(next_room, 1, 0);
+}
 
 /*
  * forget all rooms on a given floor
  */
-void forget_all_rooms_on(ffloor)
-int ffloor; {
-       char buf[256];
-       struct march *flist,*fptr;
-
-       printf("Forgetting all rooms on %s...\r",&floorlist[ffloor][0]);
-       fflush(stdout);
-       sprintf(buf,"LKRA %d",ffloor);
+void forget_all_rooms_on(int ffloor)
+{
+       char buf[SIZ];
+       struct march *flist, *fptr;
+
+       scr_printf("Forgetting all rooms on %s...\r", &floorlist[ffloor][0]);
+       scr_flush();
+       snprintf(buf, sizeof buf, "LKRA %d", ffloor);
        serv_puts(buf);
        serv_gets(buf);
-       if (buf[0]!='1') {
-               printf("%-72s\n",&buf[4]);
+       if (buf[0] != '1') {
+               scr_printf("%-72s\n", &buf[4]);
                return;
-               }
+       }
        flist = NULL;
-       while (serv_gets(buf), strcmp(buf,"000")) {
+       while (serv_gets(buf), strcmp(buf, "000")) {
                fptr = (struct march *) malloc(sizeof(struct march));
                fptr->next = flist;
                flist = fptr;
-               extract(fptr->march_name,buf,0);
-               }
+               extract(fptr->march_name, buf, 0);
+       }
        while (flist != NULL) {
-               sprintf(buf,"GOTO %s",flist->march_name);
+               snprintf(buf, sizeof buf, "GOTO %s", flist->march_name);
                serv_puts(buf);
                serv_gets(buf);
-               if (buf[0]=='2') {
+               if (buf[0] == '2') {
                        serv_puts("FORG");
                        serv_gets(buf);
-                       }
+               }
                fptr = flist;
                flist = flist->next;
                free(fptr);
-               }
-       printf("%-72s\r","");
        }
+       scr_printf("%-72s\r", "");
+}
 
 
 /*
  * routine called by gotofloor() to move to a new room on a new floor
  */
-void gf_toroom(towhere,mode)
-char *towhere;
-int mode; {
+void gf_toroom(char *towhere, int mode)
+{
        int floor_being_left;
 
        floor_being_left = curr_floor;
 
-       if (mode == GF_GOTO) {          /* <;G>oto mode */
+       if (mode == GF_GOTO) {  /* <;G>oto mode */
                updatels();
-               dotgoto(towhere,1);
-               }
-
-       if (mode == GF_SKIP) {          /* <;S>kip mode */
-               dotgoto(towhere,1);
-               remove_march("_FLOOR_",floor_being_left);
-               }
-
-       if (mode == GF_ZAP) {           /* <;Z>ap mode */
-               dotgoto(towhere,1);
-               remove_march("_FLOOR_",floor_being_left);
+               dotgoto(towhere, 1, 0);
+       }
+       if (mode == GF_SKIP) {  /* <;S>kip mode */
+               dotgoto(towhere, 1, 0);
+               remove_march("_FLOOR_", floor_being_left);
+       }
+       if (mode == GF_ZAP) {   /* <;Z>ap mode */
+               dotgoto(towhere, 1, 0);
+               remove_march("_FLOOR_", floor_being_left);
                forget_all_rooms_on(floor_being_left);
-               }
        }
+}
 
 
 /*
  * go to a new floor
  */
-void gotofloor(towhere,mode)
-char *towhere;
-int mode; {
-       int a,tofloor;
+void gotofloor(char *towhere, int mode)
+{
+       int a, tofloor;
        struct march *mptr;
-       char buf[256],targ[256];
+       char buf[SIZ], targ[SIZ];
 
-       if (floorlist[0][0]==0) load_floorlist();
+       if (floorlist[0][0] == 0)
+               load_floorlist();
        tofloor = (-1);
-       for (a=0; a<128; ++a) if (!strucmp(&floorlist[a][0],towhere))
-               tofloor = a;
-
-       if (tofloor<0) {
-               for (a=0; a<128; ++a) {
-                   if (!struncmp(&floorlist[a][0],towhere,strlen(towhere))) {
+       for (a = 0; a < 128; ++a)
+               if (!strcasecmp(&floorlist[a][0], towhere))
                        tofloor = a;
+
+       if (tofloor < 0) {
+               for (a = 0; a < 128; ++a) {
+                       if (!strncasecmp(&floorlist[a][0], towhere, strlen(towhere))) {
+                               tofloor = a;
                        }
-                   }
-               }
-       
-       if (tofloor<0) {
-               for (a=0; a<128; ++a)
-                   if (pattern(towhere,&floorlist[a][0])>0)
-                       tofloor = a;
                }
-       
-       if (tofloor<0) {
-               printf("No floor '%s'.\n",towhere);
+       }
+       if (tofloor < 0) {
+               for (a = 0; a < 128; ++a)
+                       if (pattern(towhere, &floorlist[a][0]) > 0)
+                               tofloor = a;
+       }
+       if (tofloor < 0) {
+               scr_printf("No floor '%s'.\n", towhere);
                return;
-               }
-
+       }
        for (mptr = march; mptr != NULL; mptr = mptr->next) {
-               if ((mptr->march_floor) == tofloor) 
-                       gf_toroom(mptr->march_name,mode);
-                       return;
-               }
+               if ((mptr->march_floor) == tofloor)
+                       gf_toroom(mptr->march_name, mode);
+               return;
+       }
 
-       strcpy(targ,"");
-       sprintf(buf,"LKRA %d",tofloor);
+       strcpy(targ, "");
+       snprintf(buf, sizeof buf, "LKRA %d", tofloor);
        serv_puts(buf);
        serv_gets(buf);
-       if (buf[0]=='1') while (serv_gets(buf), strcmp(buf,"000")) {
-               if ((extract_int(buf,2)==tofloor)&&(strlen(targ)==0))
-                        extract(targ,buf,0);
-               }
-       if (strlen(targ)>0) {
-               gf_toroom(targ,mode);
-               }
-       else {
-               printf("There are no rooms on '%s'.\n",&floorlist[tofloor][0]);
+       if (buf[0] == '1')
+               while (serv_gets(buf), strcmp(buf, "000")) {
+                       if ((extract_int(buf, 2) == tofloor) && (strlen(targ) == 0))
+                               extract(targ, buf, 0);
                }
+       if (strlen(targ) > 0) {
+               gf_toroom(targ, mode);
+       } else {
+               scr_printf("There are no rooms on '%s'.\n", &floorlist[tofloor][0]);
        }
+}
 
 
 /*
  * forget all rooms on current floor
  */
-void forget_this_floor() {
-       
+void forget_this_floor(void)
+{
+
        if (curr_floor == 0) {
-               printf("Can't forget this floor.\n");
+               scr_printf("Can't forget this floor.\n");
                return;
-               }
-
-       if (floorlist[0][0]==0) load_floorlist();
-       printf("Are you sure you want to forget all rooms on %s? ",
-               &floorlist[(int)curr_floor][0]);
-       if (yesno()==0) return;
-
-       gf_toroom("_BASEROOM_",GF_ZAP); 
        }
+       if (floorlist[0][0] == 0)
+               load_floorlist();
+       scr_printf("Are you sure you want to forget all rooms on %s? ",
+              &floorlist[(int) curr_floor][0]);
+       if (yesno() == 0)
+               return;
+
+       gf_toroom("_BASEROOM_", GF_ZAP);
+}
 
 
 /* 
  * Figure out the physical screen dimensions, if we can
+ * WARNING:  this is now called from a signal handler!
  */
-void check_screen_dims() {
+void check_screen_dims(void)
+{
 #ifdef TIOCGWINSZ
        struct {
-               unsigned short height;          /* rows */
-               unsigned short width;           /* columns */
+               unsigned short height;  /* rows */
+               unsigned short width;   /* columns */
                unsigned short xpixels;
                unsigned short ypixels;         /* pixels */
        } xwinsz;
 
+       if (scr_set_windowsize())
+               return;
+
        if (have_xterm) {       /* dynamically size screen if on an xterm */
-               if ( ioctl(0, TIOCGWINSZ, &xwinsz) == 0 ) {
-                       if (xwinsz.height) screenheight = (int) xwinsz.height;
-                       if (xwinsz.width) screenwidth = (int) xwinsz.width;
-                       }
+               if (ioctl(0, TIOCGWINSZ, &xwinsz) == 0) {
+                       if (xwinsz.height)
+                               screenheight = (int) xwinsz.height;
+                       if (xwinsz.width)
+                               screenwidth = (int) xwinsz.width;
                }
-#endif
        }
+#endif
+}
 
 
 /*
  * set floor mode depending on client, server, and user settings
  */
-void set_floor_mode() {
+void set_floor_mode(void)
+{
        if (serv_info.serv_ok_floors == 0) {
-               floor_mode = 0;         /* Don't use floors if the server */
-               }                       /* doesn't support them!          */
+               floor_mode = 0; /* Don't use floors if the server */
+       }
+       /* doesn't support them!          */
        else {
                if (rc_floor_mode == RC_NO) {   /* never use floors */
                        floor_mode = 0;
-                       }
+               }
                if (rc_floor_mode == RC_YES) {  /* always use floors */
                        floor_mode = 1;
-                       }
+               }
                if (rc_floor_mode == RC_DEFAULT) {      /* user choice */
                        floor_mode = ((userflags & US_FLOORS) ? 1 : 0);
-                       }
                }
        }
+}
 
 /*
  * Set or change the user's password
  */
-int set_password() {
+int set_password(void)
+{
        char pass1[20];
        char pass2[20];
-       char buf[256];
+       char buf[SIZ];
 
        if (strlen(rc_password) > 0) {
-               strcpy(pass1,rc_password);
-               strcpy(pass2,rc_password);
-               }
-       else {
+               strcpy(pass1, rc_password);
+               strcpy(pass2, rc_password);
+       } else {
                IFNEXPERT formout("changepw");
                newprompt("Enter a new password: ", pass1, -19);
                newprompt("Enter it again to confirm: ", pass2, -19);
-               }
-       if (!strucmp(pass1,pass2)) {
-               sprintf(buf,"SETP %s",pass1);
+       }
+       strproc(pass1);
+       strproc(pass2);
+       if (!strcasecmp(pass1, pass2)) {
+               snprintf(buf, sizeof buf, "SETP %s", pass1);
                serv_puts(buf);
                serv_gets(buf);
-               printf("%s\n",&buf[4]);
-               return(0);
-               }
-       else {
-               printf("*** They don't match... try again.\n");
-               return(1);
-               }
+               scr_printf("%s\n", &buf[4]);
+               offer_to_remember_password(hostbuf, portbuf, fullname, pass1);
+               return (0);
+       } else {
+               scr_printf("*** They don't match... try again.\n");
+               return (1);
        }
+}
 
 
 
 /*
  * get info about the server we've connected to
  */
-void get_serv_info() {
-       char buf[256];
+void get_serv_info(char *supplied_hostname)
+{
+       char buf[512];
 
        CtdlInternalGetServInfo(&serv_info);
 
        /* be nice and identify ourself to the server */
-       sprintf(buf,"IDEN %d|%d|%d|%s|",
-               SERVER_TYPE,0,REV_LEVEL,
-               (server_is_local ? "local" : CITADEL));
-       locate_host(&buf[strlen(buf)]); /* append to the end */
-       serv_puts(buf);
-       serv_gets(buf); /* we don't care about the result code */
+       snprintf(buf, sizeof buf, "IDEN %d|%d|%d|%s|",
+                SERVER_TYPE, 0, REV_LEVEL,
+                (server_is_local ? "local" : CITADEL));
+
+       /* Append a hostname */
+       if (supplied_hostname != NULL) {
+               strcat(buf, supplied_hostname);
        }
+       else {
+               locate_host(&buf[strlen(buf)]); /* append to the end */
+       }
+
+       serv_puts(buf);
+       serv_gets(buf);         /* we don't care about the result code */
+}
 
 
 
@@ -785,218 +793,448 @@ void get_serv_info() {
 /*
  * Display list of users currently logged on to the server
  */
-void who_is_online(int longlist) 
+void who_is_online(int longlist)
 {
-       char buf[128], username[128], roomname[128], fromhost[128], flags[128];
-       char tbuf[128], timestr[128], idlebuf[128], clientsoft[128];
-       time_t timenow=0;
+       char buf[SIZ], username[SIZ], roomname[SIZ], fromhost[SIZ];
+       char flags[SIZ];
+       char actual_user[SIZ], actual_room[SIZ], actual_host[SIZ];
+       char tbuf[SIZ], clientsoft[SIZ];
+       time_t timenow = 0;
        time_t idletime, idlehours, idlemins, idlesecs;
-       
-       if (longlist)
-       {
-          serv_puts("TIME");
-          serv_gets(tbuf);
-          extract(timestr, tbuf, 1);
-          timenow = atol(timestr);
+       int last_session = (-1);
+    int skipidle = 0;
+    
+    if (longlist == 2)
+      {
+        longlist = 0;
+        skipidle = 1;
+      }
+
+       serv_puts("TIME");
+       serv_gets(tbuf);
+       if (tbuf[0] == '2') {
+               timenow = extract_long(&tbuf[4], 0);
        }
        else {
-       printf("FLG ###        User Name                 Room                 From host\n");
-       printf("--- --- ------------------------- -------------------- ------------------------\n");
-               }
+               time(&timenow);
+       }
+
+       if (!longlist) {
+               color(BRIGHT_WHITE);
+               pprintf("FLG ###        User Name                 Room                 From host\n");
+               color(DIM_WHITE);
+               pprintf("--- --- ------------------------- -------------------- ------------------------\n");
+       }
        serv_puts("RWHO");
        serv_gets(buf);
-       if (buf[0]=='1') 
-       {
-               while(serv_gets(buf), strcmp(buf,"000")) 
-               {
-                       extract(username,buf,1);
-                       extract(roomname,buf,2);
-                       extract(fromhost,buf,3);
+       if (buf[0] == '1') {
+               while (serv_gets(buf), strcmp(buf, "000")) {
+               int isidle = 0;
+                       extract(username, buf, 1);
+                       extract(roomname, buf, 2);
+                       extract(fromhost, buf, 3);
                        extract(clientsoft, buf, 4);
-                       extract(idlebuf, buf,5);
-                       extract(flags,buf,7);
+                       extract(flags, buf, 7);
 
-                       if (longlist) {
-                               idletime = timenow - atol(idlebuf);
-                               idlehours = idletime / 3600;
-                               idlemins = (idletime - (idlehours*3600)) / 60;
-                               idlesecs = (idletime - (idlehours*3600) - (idlemins*60) );
-                               printf("\nFlags: %-3s  Session: %-3d  Name: %-25s  Room: %s\n",
-                                       flags, extract_int(buf,0), username, roomname);
-                               printf("from <%s> using <%s>, idle %ld:%02ld:%02ld\n",
-                                       fromhost, clientsoft,
-                                       idlehours, idlemins, idlesecs);
+                       idletime = timenow - extract_long(buf, 5);
+                       idlehours = idletime / 3600;
+                       idlemins = (idletime - (idlehours * 3600)) / 60;
+                       idlesecs = (idletime - (idlehours * 3600) - (idlemins * 60));
 
+                       if (idletime > 900) {
+                               while (strlen(roomname) < 20) {
+                                       strcat(roomname, " ");
                                }
-                       else {
-                       printf("%-3s %-3d %-25s %-20s %-24s\n",
-                               flags, extract_int(buf,0), username,
-                               roomname, fromhost);
+                               strcpy(&roomname[14], "[idle]");
+                       if (skipidle)
+                  isidle = 1;
+                       }
+
+                       if (longlist) {
+
+                               extract(actual_user, buf, 8);
+                               extract(actual_room, buf, 9);
+                               extract(actual_host, buf, 10);
+
+                               pprintf("  Flags: %s\n", flags);
+                               pprintf("Session: %d\n", extract_int(buf, 0));
+                               pprintf("   Name: %s\n", username);
+                               pprintf("In room: %s\n", roomname);
+                               pprintf("   Host: %s\n", fromhost);
+                               pprintf(" Client: %s\n", clientsoft);
+                               pprintf("   Idle: %ld:%02ld:%02ld\n",
+                                       (long) idlehours,
+                                       (long) idlemins,
+                                       (long) idlesecs);
+
+                               if ( (strlen(actual_user)+strlen(actual_room)+strlen(actual_host)) > 0) {
+                                       pprintf("(really ");
+                                       if (strlen(actual_user)>0) pprintf("<%s> ", actual_user);
+                                       if (strlen(actual_room)>0) pprintf("in <%s> ", actual_room);
+                                       if (strlen(actual_host)>0) pprintf("from <%s> ", actual_host);
+                                       pprintf(")\n");
                                }
+                               pprintf("\n");
+
+                       } else {
+                   if (isidle == 0) {
+                               if (extract_int(buf, 0) == last_session) {
+                                       pprintf("        ");
+                               } else {
+                                       color(BRIGHT_MAGENTA);
+                                       pprintf("%-3s ", flags);
+                                       color(DIM_WHITE);
+                                       pprintf("%-3d ", extract_int(buf, 0));
+                               }
+                               last_session = extract_int(buf, 0);
+                               color(BRIGHT_CYAN);
+                               pprintf("%-25s ", username);
+                               color(BRIGHT_MAGENTA);
+                               roomname[20] = 0;
+                               pprintf("%-20s ", roomname);
+                               color(BRIGHT_CYAN);
+                               fromhost[24] = '\0';
+                               pprintf("%-24s\n", fromhost);
+                               color(DIM_WHITE);
+                       }
                        }
                }
        }
+}
 
 void enternew(char *desc, char *buf, int maxlen)
 {
-   char bbb[128];
-   sprintf(bbb, "Enter in your new %s: ", desc);
-   newprompt(bbb, buf, maxlen);
+       char bbb[128];
+       snprintf(bbb, sizeof bbb, "Enter in your new %s: ", desc);
+       newprompt(bbb, buf, maxlen);
+}
+
+
+
+int shift(int argc, char **argv, int start, int count) {
+       int i;
+
+       for (i=start; i<(argc-count); ++i) {
+               argv[i] = argv[i+count];
+       }
+       argc = argc - count;
+       return argc;
 }
 
 /*
  * main
  */
-void main(argc,argv)
-int argc;
-char *argv[]; {
-int a,b,mcmd;
-int termn8 = 0;
-char aaa[100],bbb[100],ccc[100],eee[100];      /* general purpose variables */
-char argbuf[32];                               /* command line buf */
-
-
-load_command_set();            /* parse the citadel.rc file */
-sttybbs(SB_SAVE);              /* Store the old terminal parameters */
-sttybbs(SB_NO_INTR);           /* Install the new ones */
-signal(SIGINT,SIG_IGN);
-signal(SIGQUIT,SIG_IGN);
-signal(SIGHUP,dropcarr);       /* Cleanup gracefully if carrier is dropped */
-signal(SIGTERM,dropcarr);      /* Cleanup gracefully if terminated */
-
-send_ansi_detect();
-printf("Attaching to server...\r");
-fflush(stdout);
-attach_to_server(argc,argv);
-
-cls();
-color(7);
-serv_gets(aaa);
-if (aaa[0]!='2') {
-       printf("%s\n",&aaa[4]);
-       logoff(atoi(aaa));
+int main(int argc, char **argv)
+{
+       int a, b, mcmd;
+       char aaa[100], bbb[100];/* general purpose variables */
+       char argbuf[32];        /* command line buf */
+       char nonce[NONCE_SIZE];
+       char *telnet_client_host = NULL;
+       char *sptr, *sptr2;     /* USed to extract the nonce */
+       char hexstring[MD5_HEXSTRING_SIZE];
+       int stored_password = 0;
+       char password[SIZ];
+       
+       /* Permissions sanity check - don't run citadel setuid/setgid */
+       if (getuid() != geteuid()) {
+               err_printf("Please do not run citadel setuid!\n");
+               logoff(3);
+       } else if (getgid() != getegid()) {
+               err_printf("Please do not run citadel setgid!\n");
+               logoff(3);
        }
-get_serv_info();
 
-printf("%-22s\n%s\n%s\n",serv_info.serv_software,serv_info.serv_humannode,
-       serv_info.serv_bbs_city);
-screenwidth = 80;              /* default screen dimensions */
-screenheight = 24;
+       sttybbs(SB_SAVE);       /* Store the old terminal parameters */
+       load_command_set();     /* parse the citadel.rc file */
+       sttybbs(SB_NO_INTR);    /* Install the new ones */
+       signal(SIGHUP, dropcarr);       /* Cleanup gracefully if carrier is dropped */
+       signal(SIGTERM, dropcarr);      /* Cleanup gracefully if terminated */
+       signal(SIGCONT, catch_sigcont);         /* Catch SIGCONT so we can reset terminal */
 
-printf(" pause    next    stop\n");
-printf(" ctrl-s  ctrl-o  ctrl-c\n\n");
-formout("hello");              /* print the opening greeting */
-printf("\n");
+#ifdef HAVE_OPENSSL
+       arg_encrypt = RC_DEFAULT;
+#endif
+#ifdef HAVE_CURSES_H
+       arg_screen = RC_DEFAULT;
+#endif
 
-       /* if we're not the login shell, try auto-login */
-if (getppid()!=1) {
-       serv_puts("AUTO");
-       serv_gets(aaa);
-       if (aaa[0]=='2') {
-               load_user_info(&aaa[4]);
-               goto PWOK;
+       /* 
+        * Handle command line options as if we were called like /bin/login
+        * (i.e. from in.telnetd)
+        */
+       for (a=0; a<argc; ++a) {
+               if ((argc > a+1) && (!strcmp(argv[a], "-h")) ) {
+                       telnet_client_host = argv[a+1];
+                       argc = shift(argc, argv, a, 2);
+               }
+               if (!strcmp(argv[a], "-x")) {
+#ifdef HAVE_OPENSSL
+                       arg_encrypt = RC_NO;
+#endif
+                       argc = shift(argc, argv, a, 1);
+               }
+               if (!strcmp(argv[a], "-X")) {
+#ifdef HAVE_OPENSSL
+                       arg_encrypt = RC_YES;
+                        argc = shift(argc, argv, a, 1);
+#else
+                       fprintf(stderr, "Not compiled with encryption support");
+                       return 1;
+#endif
+               }
+               if (!strcmp(argv[a], "-s")) {
+#ifdef HAVE_CURSES_H
+                       arg_screen = RC_NO;
+#endif
+                       argc = shift(argc, argv, a, 1);
+               }
+               if (!strcmp(argv[a], "-S")) {
+#ifdef HAVE_CURSES_H
+                       arg_screen = RC_YES;
+#endif
+                       argc = shift(argc, argv, a, 1);
+               }
+               if (!strcmp(argv[a], "-p")) {
+                       struct stat st;
+               
+                       if (chdir(BBSDIR) < 0) {
+                               perror("can't change to " BBSDIR);
+                               logoff(3);
+                       }
+
+                       /*
+                        * Drop privileges if necessary. We stat
+                        * citadel.config to get the uid/gid since it's
+                        * guaranteed to have the uid/gid we want.
+                        */
+                       if (!getuid() || !getgid()) {
+                               if (stat(BBSDIR "/citadel.config", &st) < 0) {
+                                       perror("couldn't stat citadel.config");
+                                       logoff(3);
+                               }
+                               if (!getgid() && (setgid(st.st_gid) < 0)) {
+                                       perror("couldn't change gid");
+                                       logoff(3);
+                               }
+                               if (!getuid() && (setuid(st.st_uid) < 0)) {
+                                       perror("couldn't change uid");
+                                       logoff(3);
+                               }
+                               /*
+                               scr_printf("Privileges changed to uid %d gid %d\n",
+                                               getuid(), getgid());
+                               */
+                       }
+                       argc = shift(argc, argv, a, 1);
                }
        }
 
-look_for_ansi();
+       screen_new();
 
-GSTA:  termn8=0; newnow=0;
-       do {
-               if (strlen(rc_username) > 0) {
-                       strcpy(fullname,rc_username);
+       sln_printf("Attaching to server... \r");
+       sln_flush();
+       attach_to_server(argc, argv, hostbuf, portbuf);
+
+       serv_gets(aaa);
+       if (aaa[0] != '2') {
+               scr_printf("%s\n", &aaa[4]);
+               logoff(atoi(aaa));
+       }
+
+/* If there is a [nonce] at the end, put the nonce in <nonce>, else nonce
+ * is zeroized.
+ */
+       
+       if ((sptr = strchr(aaa, '<')) == NULL)
+       {
+          nonce[0] = '\0';
+       }
+       else
+       {
+          if ((sptr2 = strchr(sptr, '>')) == NULL)
+          {
+             nonce[0] = '\0';
+          }
+          else
+          {
+             sptr2++;
+             *sptr2 = '\0';
+             strncpy(nonce, sptr, NONCE_SIZE);
+          }
+       }
+
+       get_serv_info(telnet_client_host);
+
+       scr_printf("%-24s\n%s\n%s\n", serv_info.serv_software, serv_info.serv_humannode,
+               serv_info.serv_bbs_city);
+       scr_flush();
+
+       secure = starttls();
+       status_line(serv_info.serv_humannode, serv_info.serv_bbs_city, NULL,
+                       secure, -1);
+
+       screenwidth = 80;       /* default screen dimensions */
+       screenheight = 24;
+       
+       scr_printf(" pause    next    stop\n");
+       scr_printf(" ctrl-s  ctrl-o  ctrl-c\n\n");
+       formout("hello");       /* print the opening greeting */
+       scr_printf("\n");
+
+GSTA:  /* See if we have a username and password on disk */
+       if (rc_remember_passwords) {
+               get_stored_password(hostbuf, portbuf, fullname, password);
+               if (strlen(fullname) > 0) {
+                       snprintf(aaa, sizeof(aaa)-1, "USER %s", fullname);
+                       serv_puts(aaa);
+                       serv_gets(aaa);
+                       if (nonce[0])
+                       {
+                               snprintf(aaa, sizeof aaa, "PAS2 %s", make_apop_string(password, nonce, hexstring, sizeof hexstring));
                        }
-               else {
-                       newprompt("Enter your name: ",fullname,29);
+                       else    /* Else no APOP */
+                       {
+                               snprintf(aaa, sizeof(aaa)-1, "PASS %s", password);
+                       }
+                       
+                       serv_puts(aaa);
+                       serv_gets(aaa);
+                       if (aaa[0] == '2') {
+                               load_user_info(&aaa[4]);
+                               stored_password = 1;
+                               goto PWOK;
+                       }
+                       else {
+                               set_stored_password(hostbuf, portbuf, "", "");
                        }
-               strproc(fullname); 
-               if (!strucmp(fullname,"new")) {         /* just in case */
-                  printf("Please enter the name you wish to log in with.\n");
-                  }
-               } while( 
-                       (!strucmp(fullname,"bbs"))
-                       || (!strucmp(fullname,"new"))
-                       || (strlen(fullname)==0) );
-
-       if (!strucmp(fullname,"off")) {
-               mcmd=29;
-               goto TERMN8;
                }
+       }
 
+       termn8 = 0;
+       newnow = 0;
+       do {
+               if (strlen(rc_username) > 0) {
+                       strcpy(fullname, rc_username);
+               } else {
+                       newprompt("Enter your name: ", fullname, 29);
+               }
+               strproc(fullname);
+               if (!strcasecmp(fullname, "new")) {     /* just in case */
+                       scr_printf("Please enter the name you wish to log in with.\n");
+               }
+       } while (
+                       (!strcasecmp(fullname, "bbs"))
+                       || (!strcasecmp(fullname, "new"))
+                       || (strlen(fullname) == 0));
+
+       if (!strcasecmp(fullname, "off")) {
+               mcmd = 29;
+               goto TERMN8;
+       }
        /* sign on to the server */
-       sprintf(aaa,"USER %s",fullname);
+       snprintf(aaa, sizeof aaa, "USER %s", fullname);
        serv_puts(aaa);
        serv_gets(aaa);
-       if (aaa[0]!='3') goto NEWUSR;
+       if (aaa[0] != '3')
+               goto NEWUSR;
 
        /* password authentication */
-       if (strlen(rc_password)>0) {
-               strcpy(eee,rc_password);
-               }
-       else {
-               newprompt("\rPlease enter your password: ",eee,-19);
-               }
-       strproc(eee);
-       sprintf(aaa,"PASS %s",eee);
+       if (strlen(rc_password) > 0) {
+               strcpy(password, rc_password);
+       } else {
+               newprompt("\rPlease enter your password: ", password, -19);
+       }
+       strproc(password);
+
+       if (nonce[0])
+       {
+               snprintf(aaa, sizeof aaa, "PAS2 %s", make_apop_string(password, nonce, hexstring, sizeof hexstring));
+       }
+       else    /* Else no APOP */
+       {
+               snprintf(aaa, sizeof aaa, "PASS %s", password);
+       }
+       
        serv_puts(aaa);
        serv_gets(aaa);
-       if (aaa[0]=='2') {
+       if (aaa[0] == '2') {
                load_user_info(&aaa[4]);
+               offer_to_remember_password(hostbuf, portbuf,
+                                       fullname, password);
                goto PWOK;
-               }
-       
-       printf("<< wrong password >>\n");
-       if (strlen(rc_password)>0) logoff(0);
+       }
+       scr_printf("<< wrong password >>\n");
+       if (strlen(rc_password) > 0)
+               logoff(0);
        goto GSTA;
 
-NEWUSR:        if (strlen(rc_password)==0) {
-               printf("No record. Enter as new user? ");
-               if (yesno()==0) goto GSTA;
-               }
-
-       sprintf(aaa,"NEWU %s",fullname);
+NEWUSR:        if (strlen(rc_password) == 0) {
+               scr_printf("No record. Enter as new user? ");
+               if (yesno() == 0)
+                       goto GSTA;
+       }
+       snprintf(aaa, sizeof aaa, "NEWU %s", fullname);
        serv_puts(aaa);
        serv_gets(aaa);
-       if (aaa[0]!='2') {
-               printf("%s\n",aaa);
+       if (aaa[0] != '2') {
+               scr_printf("%s\n", aaa);
                goto GSTA;
-               }
+       }
        load_user_info(&aaa[4]);
 
-       while (set_password() != 0) ;;
-       newnow=1;
+       while (set_password() != 0);;
+       newnow = 1;
 
        enter_config(1);
-       
 
-PWOK:  printf("%s\nAccess level: %d (%s)\nUser #%ld / Call #%d\n",
-               fullname,axlevel,axdefs[(int)axlevel],
-               usernum,timescalled);
+PWOK:
+       /* Switch color support on or off if we're in user mode */
+       if (rc_ansi_color == 3) {
+               if (userflags & US_COLOR)
+                       enable_color = 1;
+               else
+                       enable_color = 0;
+       }
+
+       scr_printf("%s\nAccess level: %d (%s)\n"
+               "User #%ld / Login #%d",
+               fullname, axlevel, axdefs[(int) axlevel],
+               usernum, timescalled);
+       if (lastcall > 0L) {
+               scr_printf(" / Last login: %s\n",
+                       asctime(localtime(&lastcall)) );
+       }
+       scr_printf("\n");
 
        serv_puts("CHEK");
        serv_gets(aaa);
-       if (aaa[0]=='2') {
-               b = extract_int(&aaa[4],0);
-               if (b==1) printf("*** You have a new private message in Mail>\n");
-               if (b>1)  printf("*** You have %d new private messages in Mail>\n",b);
-
-               if ((axlevel>=6) && (extract_int(&aaa[4],2)>0)) {
-                       printf("*** Users need validation\n");
-                       }
-
-               if (extract_int(&aaa[4],1)>0) {
-                       printf("*** Please register.\n");
+       if (aaa[0] == '2') {
+               b = extract_int(&aaa[4], 0);
+               if (b > 0) {
+                       color(BRIGHT_RED);
+                       if (b == 1)
+                               scr_printf("*** You have a new private message in Mail>\n");
+                       if (b > 1)
+                               scr_printf("*** You have %d new private messages in Mail>\n", b);
+                       color(DIM_WHITE);
+               }
+               if ((axlevel >= 6) && (extract_int(&aaa[4], 2) > 0)) {
+                       scr_printf("*** Users need validation\n");
+               }
+               if (extract_int(&aaa[4], 1) > 0) {
+                       scr_printf("*** Please register.\n");
                        formout("register");
                        entregis();
-                       }
                }
-
+       }
        /* Make up some temporary filenames for use in various parts of the
         * program.  Don't mess with these once they've been set, because we
         * will be unlinking them later on in the program and we don't
         * want to delete something that we didn't create. */
-       sprintf(temp,"/tmp/citA%d",getpid());
-       sprintf(temp2,"/tmp/citB%d",getpid());
-       sprintf(tempdir,"/tmp/citC%d",getpid());
+       snprintf(temp, sizeof temp, tmpnam(NULL));
+       snprintf(temp2, sizeof temp2, tmpnam(NULL));
+       snprintf(tempdir, sizeof tempdir, tmpnam(NULL));
 
        /* Get screen dimensions.  First we go to a default of 80x24.  Then
         * we try to get the user's actual screen dimensions off the server.
@@ -1008,12 +1246,13 @@ PWOK:   printf("%s\nAccess level: %d (%s)\nUser #%ld / Call #%d\n",
        screenheight = 24;
        serv_puts("GETU");
        serv_gets(aaa);
-       if (aaa[0]=='2') {
-               screenwidth = extract_int(&aaa[4],0);
-               screenheight = extract_int(&aaa[4],1);
-               }
-       if (getenv("TERM")!=NULL) if (!strcmp(getenv("TERM"),"xterm")) {
-               have_xterm = 1;
+       if (aaa[0] == '2') {
+               screenwidth = extract_int(&aaa[4], 0);
+               screenheight = extract_int(&aaa[4], 1);
+       }
+       if (getenv("TERM") != NULL)
+               if (!strcmp(getenv("TERM"), "xterm")) {
+                       have_xterm = 1;
                }
 #ifdef TIOCGWINSZ
        check_screen_dims();
@@ -1023,304 +1262,455 @@ PWOK: printf("%s\nAccess level: %d (%s)\nUser #%ld / Call #%d\n",
 
 
        /* Enter the lobby */
-       dotgoto("_BASEROOM_",1);
+       dotgoto("_BASEROOM_", 1, 0);
 
 /* Main loop for the system... user is logged in. */
-       strcpy(ugname,"");
-       uglsn = 0L;
+    uglistsize = 0;
 
-       if (newnow==1)  readmsgs(3,1,5);
-               else    readmsgs(1,1,0);
+       if (newnow == 1)
+               readmsgs(3, 1, 5);
+       else
+               readmsgs(1, 1, 0);
 
-do {   /* MAIN LOOP OF PROGRAM */
-       signal(SIGINT,SIG_IGN);
-       signal(SIGQUIT,SIG_IGN);
-       mcmd=getcmd(argbuf);
+       /* MAIN COMMAND LOOP */
+       do {
+               mcmd = getcmd(argbuf);          /* Get keyboard command */
 
 #ifdef TIOCGWINSZ
-       check_screen_dims();
+               check_screen_dims();            /* if xterm, get screen size */
 #endif
 
-       if (termn8==0) switch(mcmd) {
-          case 1:      formout("help");
-                       break;
-          case 4:      entmsg(0,0);
-                       break;
-          case 36:     entmsg(0,1);
-                       break;
-          case 46:     entmsg(0,2);
-                       break;
-          case 78:     newprompt("What do you want your username to be? ", aaa, 32);
-                       sprintf(bbb, "ENT0 2|0|0|0|%s", aaa);
-                       serv_puts(bbb);
-                       serv_gets(aaa);
-                       if (strncmp("200", aaa, 3))
-                          printf("\n%s\n", aaa);
-                       else
-                          entmsg(0, 0);
-                       break;
-          case 5:      updatels();
-                       gotonext();
-                       break;
-          case 47:     updatelsa();
-                       gotonext();
-                       break;
-          case 58:     updatelsa();
-                       dotgoto("_MAIL_",1);
-                       break;
-          case 20:     updatels();
-          case 52:     dotgoto(argbuf,0);
-                       break;
-          case 10:     readmsgs(0,1,0);
-                       break;
-          case 9:      readmsgs(3,1,5);
-                       break;
-          case 13:     readmsgs(1,1,0);
-                       break;
-          case 11:     readmsgs(0,(-1),0);
-                       break;
-          case 12:     readmsgs(2,(-1),0);
-                       break;
-          case 71:     readmsgs(3, 1, atoi(argbuf));
-                       break;
-          case 7:      forget();       break;
-          case 18:     subshell();     break;
-          case 38:     updatels();
-                       entroom();      break;
-          case 22:     killroom();     break;
-          case 32:     userlist();     break;
-          case 27:     invite();       break;
-          case 28:     kickout();      break;
-          case 23:     editthisroom(); break;
-          case 14:     roomdir();      break;
-          case 33:     download(0);    break;
-          case 34:     download(1);    break;
-          case 31:     download(2);    break;
-          case 43:     download(3);    break;
-          case 45:     download(4);    break;
-          case 55:     download(5);    break;
-          case 39:     upload(0);      break;
-          case 40:     upload(1);      break;
-          case 42:     upload(2);      break;
-          case 44:     upload(3);      break;
-          case 57:     cli_upload();   break;
-          case 16:     ungoto();       break;
-          case 24:     whoknows();     break;
-          case 26:     validate();     break;
-          case 29:     updatels();
-                       termn8=1;
-                       break;
-          case 30:     updatels();
-                       termn8=1;
-                       break;
-          case 48:     enterinfo();
-                       break;
-          case 49:     readinfo();
-                       break;
-          case 72:     cli_image_upload("_userpic_");
-                       break;
-          case 73:     cli_image_upload("_roompic_");
-                       break;
-
-case 74:
-       sprintf(aaa, "_floorpic_|%d", curr_floor);
-       cli_image_upload(aaa);
-       break;
-       
-case 75:
-       enternew("roomname", aaa, 20);
-       sprintf(bbb, "RCHG %s", aaa);
-       serv_puts(bbb);
-       serv_gets(aaa);
-       if (strncmp("200",aaa, 3))
-          printf("\n%s\n", aaa);
-       break;
-case 76:
-       enternew("hostname", aaa, 25);
-       sprintf(bbb, "HCHG %s", aaa);
-       serv_puts(bbb);
-       serv_gets(aaa);
-       if (strncmp("200",aaa, 3))
-          printf("\n%s\n", aaa);
-       break;
-case 77:
-       enternew("username", aaa, 32);
-       sprintf(bbb, "UCHG %s", aaa);
-       serv_puts(bbb);
-       serv_gets(aaa);
-       if (strncmp("200",aaa, 3))
-          printf("\n%s\n", aaa);
-       break;
-
-case 35:
-       set_password();
-       break;
-
-case 21:
-       if (argbuf[0]==0) strcpy(aaa,"?");
-       display_help(argbuf);
-       break;
-
-case 41:
-       formout("register");
-       entregis();
-       break;
-
-case 15:
-       printf("Are you sure (y/n)? ");
-       if (yesno()==1) {
-               updatels();
-               a=0;
-               termn8=1;
-               }
-       break;
-
-case 6:
-       gotonext();
-       break;
-
-case 3:        chatmode();
-       break;
-
-case 2: if (server_is_local) {
-               sttybbs(SB_RESTORE);
-sprintf(aaa,"USERNAME=\042%s\042; export USERNAME; exec ./subsystem %ld %d %d",
-                       fullname,
-                       usernum,screenwidth,axlevel);
-               ka_system(aaa);
-               sttybbs(SB_NO_INTR);
-               }
-       else {
-               printf("*** Can't run doors when server is not local.\n");
-               }
-       break;
-
-case 17:
-       who_is_online(0);
-       break;
-
-case 79:
-       who_is_online(1);
-       break;
-
-case 50:
-       enter_config(2);
-       break;
-
-case 37:
-       enter_config(0);
-       set_floor_mode();
-       break;
-
-case 59:
-       enter_config(3);
-       set_floor_mode();
-       break;
+               if (termn8 == 0)
+                       switch (mcmd) {
+                       case 1:
+                               formout("help");
+                               break;
+                       case 4:
+                               entmsg(0, 0);
+                               break;
+                       case 36:
+                               entmsg(0, 1);
+                               break;
+                       case 46:
+                               entmsg(0, 2);
+                               break;
+                       case 78:
+                               newprompt("What do you want your username to be? ", aaa, 32);
+                               snprintf(bbb, sizeof bbb, "ENT0 2|0|0|0|%s", aaa);
+                               serv_puts(bbb);
+                               serv_gets(aaa);
+                               if (strncmp("200", aaa, 3))
+                                       scr_printf("\n%s\n", aaa);
+                               else
+                                       entmsg(0, 0);
+                               break;
+                       case 5:
+                               updatels();
+                               gotonext();
+                               break;
+                       case 47:
+                               if (!rc_alt_semantics)
+                                       updatelsa();
+                               gotonext();
+                               break;
+                       case 90:
+                               if (!rc_alt_semantics)
+                                       updatelsa();
+                               dotgoto(argbuf, 0, 0);
+                               break;
+                       case 58:
+                               updatelsa();
+                               dotgoto("_MAIL_", 1, 0);
+                               break;
+                       case 20:
+                               updatels();
+                               dotgoto(argbuf, 0, 0);
+                               break;
+                       case 52:
+                               if (rc_alt_semantics)
+                                       updatelsa();
+                               dotgoto(argbuf, 0, 0);
+                               break;
+                       case 10:
+                               readmsgs(0, 1, 0);
+                               break;
+                       case 9:
+                               readmsgs(3, 1, 5);
+                               break;
+                       case 13:
+                               readmsgs(1, 1, 0);
+                               break;
+                       case 11:
+                               readmsgs(0, (-1), 0);
+                               break;
+                       case 12:
+                               readmsgs(2, (-1), 0);
+                               break;
+                       case 71:
+                               readmsgs(3, 1, atoi(argbuf));
+                               break;
+                       case 7:
+                               forget();
+                               break;
+                       case 18:
+                               subshell();
+                               break;
+                       case 38:
+                               updatels();
+                               entroom();
+                               break;
+                       case 22:
+                               killroom();
+                               break;
+                       case 32:
+                               userlist(argbuf);
+                               break;
+                       case 27:
+                               invite();
+                               break;
+                       case 28:
+                               kickout();
+                               break;
+                       case 23:
+                               editthisroom();
+                               break;
+                       case 14:
+                               roomdir();
+                               break;
+                       case 33:
+                               download(0);
+                               break;
+                       case 34:
+                               download(1);
+                               break;
+                       case 31:
+                               download(2);
+                               break;
+                       case 43:
+                               download(3);
+                               break;
+                       case 45:
+                               download(4);
+                               break;
+                       case 55:
+                               download(5);
+                               break;
+                       case 39:
+                               upload(0);
+                               break;
+                       case 40:
+                               upload(1);
+                               break;
+                       case 42:
+                               upload(2);
+                               break;
+                       case 44:
+                               upload(3);
+                               break;
+                       case 57:
+                               cli_upload();
+                               break;
+                       case 16:
+                               ungoto();
+                               break;
+                       case 24:
+                               whoknows();
+                               break;
+                       case 26:
+                               validate();
+                               break;
+                       case 29:
+                               if (!rc_alt_semantics)
+                                       updatels();
+                               termn8 = 1;
+                               break;
+                       case 30:
+                               if (!rc_alt_semantics)
+                                       updatels();
+                               termn8 = 1;
+                               break;
+                       case 48:
+                               enterinfo();
+                               break;
+                       case 49:
+                               readinfo();
+                               break;
+                       case 72:
+                               cli_image_upload("_userpic_");
+                               break;
+                       case 73:
+                               cli_image_upload("_roompic_");
+                               break;
+
+                       case 74:
+                               snprintf(aaa, sizeof aaa, "_floorpic_|%d", curr_floor);
+                               cli_image_upload(aaa);
+                               break;
+
+                       case 75:
+                               enternew("roomname", aaa, 20);
+                               snprintf(bbb, sizeof bbb, "RCHG %s", aaa);
+                               serv_puts(bbb);
+                               serv_gets(aaa);
+                               if (strncmp("200", aaa, 3))
+                                       scr_printf("\n%s\n", aaa);
+                               break;
+                       case 76:
+                               enternew("hostname", aaa, 25);
+                               snprintf(bbb, sizeof bbb, "HCHG %s", aaa);
+                               serv_puts(bbb);
+                               serv_gets(aaa);
+                               if (strncmp("200", aaa, 3))
+                                       scr_printf("\n%s\n", aaa);
+                               break;
+                       case 77:
+                               enternew("username", aaa, 32);
+                               snprintf(bbb, sizeof bbb, "UCHG %s", aaa);
+                               serv_puts(bbb);
+                               serv_gets(aaa);
+                               if (strncmp("200", aaa, 3))
+                                       scr_printf("\n%s\n", aaa);
+                               break;
+
+                       case 35:
+                               set_password();
+                               break;
+
+                       case 21:
+                               if (argbuf[0] == 0)
+                                       strcpy(aaa, "?");
+                               display_help(argbuf);
+                               break;
+
+                       case 41:
+                               formout("register");
+                               entregis();
+                               break;
+
+                       case 15:
+                               scr_printf("Are you sure (y/n)? ");
+                               if (yesno() == 1) {
+                                       updatels();
+                                       a = 0;
+                                       termn8 = 1;
+                               }
+                               break;
+
+                       case 85:
+                               scr_printf("All users will be disconnected!  "
+                                       "Really terminate the server? ");
+                               if (yesno() == 1) {
+                                       serv_puts("DOWN");
+                                       serv_gets(aaa);
+                                       scr_printf("%s\n", &aaa[4]);
+                                       if (aaa[0]=='2') {
+                                               updatels();
+                                               a = 0;
+                                               termn8 = 1;
+                                       }
+                               }
+                               break;
+
+                       case 86:
+                               scr_printf("Do you really want to schedule a "
+                                       "server shutdown? ");
+                               if (yesno() == 1) {
+                                       serv_puts("SCDN 1");
+                                       serv_gets(aaa);
+                                       if (aaa[0]=='2') {
+                                               if (atoi(&aaa[4])) {
+                                                       scr_printf(
+"The Citadel server will terminate when all users are logged off.\n"
+                                                               );
+                                               }
+                                               else {
+                                                       scr_printf(
+"The Citadel server will not terminate.\n"
+                                                               );
+                                               }
+                                       }
+                               }
+                               break;
+
+                       case 87:
+                               network_config_management("listrecp",
+                                       "Mailing list recipients");
+                               break;
+
+                       case 89:
+                               network_config_management("ignet_push_share",
+                                       "Nodes with which we share this room");
+                               break;
+
+                       case 88:
+                               do_ignet_configuration();
+                               break;
+
+                       case 92:
+                               do_filterlist_configuration();
+                               break;
+
+                       case 6:
+                               if (rc_alt_semantics)
+                                       updatelsa();
+                               gotonext();
+                               break;
+
+                       case 3:
+                               chatmode();
+                               break;
+
+                       case 2:
+                               if (server_is_local) {
+                                       screen_reset();
+                                       sttybbs(SB_RESTORE);
+                                       snprintf(aaa, sizeof aaa, "USERNAME=\042%s\042; export USERNAME;"
+                                                "exec ./subsystem %ld %d %d", fullname,
+                                         usernum, screenwidth, axlevel);
+                                       ka_system(aaa);
+                                       sttybbs(SB_NO_INTR);
+                                       screen_set();
+                               } else {
+                                       scr_printf("*** Can't run doors when server is not local.\n");
+                               }
+                               break;
+
+                       case 17:
+                               who_is_online(0);
+                               break;
+
+                       case 79:
+                               who_is_online(1);
+                               break;
+
+            case 91:
+                who_is_online(2);
+                break;
+                
+                       case 80:
+                               do_system_configuration();
+                               break;
+
+                       case 82:
+                               do_internet_configuration();
+                               break;
+
+                       case 83:
+                               check_message_base();
+                               break;
+
+                       case 84:
+                               quiet_mode();
+                               break;
+
+                       case 50:
+                               enter_config(2);
+                               break;
+
+                       case 37:
+                               enter_config(0);
+                               set_floor_mode();
+                               break;
+
+                       case 59:
+                               enter_config(3);
+                               set_floor_mode();
+                               break;
+
+                       case 60:
+                               gotofloor(argbuf, GF_GOTO);
+                               break;
+
+                       case 61:
+                               gotofloor(argbuf, GF_SKIP);
+                               break;
+
+                       case 62:
+                               forget_this_floor();
+                               break;
+
+                       case 63:
+                               create_floor();
+                               break;
+
+                       case 64:
+                               edit_floor();
+                               break;
+
+                       case 65:
+                               kill_floor();
+                               break;
+
+                       case 66:
+                               enter_bio();
+                               break;
+
+                       case 67:
+                               read_bio();
+                               break;
+
+                       case 25:
+                               edituser();
+                               break;
+
+                       case 8:
+                               knrooms(floor_mode);
+                               scr_printf("\n");
+                               break;
+
+                       case 68:
+                               knrooms(2);
+                               scr_printf("\n");
+                               break;
+
+                       case 69:
+                               misc_server_cmd(argbuf);
+                               break;
+
+                       case 70:
+                               edit_system_message(argbuf);
+                               break;
+
+                       case 19:
+                               listzrooms();
+                               scr_printf("\n");
+                               break;
+
+                       case 51:
+                               deletefile();
+                               break;
+
+                       case 53:
+                               netsendfile();
+                               break;
+
+                       case 54:
+                               movefile();
+                               break;
+
+                       case 56:
+                               page_user();
+                               break;
+
+                       }       /* end switch */
+       } while (termn8 == 0);
 
-case 60:
-       gotofloor(argbuf,GF_GOTO);
-       break;
-       
-case 61:
-       gotofloor(argbuf,GF_SKIP);
-       break;
-       
-case 62:
-       forget_this_floor();
-       break;
-
-case 63:
-       create_floor();
-       break;
-
-case 64:
-       edit_floor();
-       break;
-
-case 65:
-       kill_floor();
-       break;
-
-case 66:
-       enter_bio();
-       break;
-
-case 67:
-       read_bio();
-       break;
-
-case 25:
-       edituser();
-       break;
-
-case 8:
-       knrooms(floor_mode);
-       printf("\n");
-       break;
-
-case 68:
-       knrooms(2);
-       printf("\n");
-       break;
-
-case 69:
-       misc_server_cmd(argbuf);
-       break;
-
-case 70:
-       edit_system_message(argbuf);
-       break;
-
-case 19:
-       listzrooms();
-       printf("\n");
-       break;
-
-case 51:
-       deletefile();
-       break;
-
-case 53:
-       netsendfile();
-       break;
-
-case 54:
-       movefile();
-       break;
-
-case 56:
-        if (last_paged[0])
-           sprintf(bbb, "Page who [%s]? ", last_paged);
-        else
-           sprintf(bbb, "Page who? ");
-       newprompt(bbb,aaa,30);
-       if (!aaa[0])
-          strcpy(aaa, last_paged);
-       strproc(aaa);
-       newprompt("Message:  ",bbb,69);
-       sprintf(ccc,"SEXP %s|%s",aaa,bbb);
-       serv_puts(ccc);
-       serv_gets(ccc);
-       if (!strncmp("200", ccc, 3))
-          strcpy(last_paged, aaa);
-       printf("%s\n",&ccc[4]);
-       break;
-
-       } /* end switch */
-    } while(termn8==0);
-
-TERMN8:        printf("%s logged out.\n",fullname);
-       while (march!=NULL) remove_march(march->march_name,0);
-       if (mcmd==30)
-               printf("\n\nType 'off' to hang up, or next user...\n");
-       sprintf(aaa,"LOUT");
+TERMN8:        scr_printf("%s logged out.\n", fullname);
+       while (march != NULL) {
+               remove_march(march->march_name, 0);
+       }
+       if (mcmd == 30) {
+               sln_printf("\n\nType 'off' to disconnect, or next user...\n");
+       }
+       snprintf(aaa, sizeof aaa, "LOUT");
        serv_puts(aaa);
        serv_gets(aaa);
-       if ((mcmd==29)||(mcmd==15)) {
+       screen_delete();
+       sttybbs(SB_RESTORE);
+       if ((mcmd == 29) || (mcmd == 15)) {
                formout("goodbye");
                logoff(0);
-               }
+       }
        goto GSTA;
 
-} /* end main() */
-
+}      /* end main() */