color
authorArt Cancro <ajc@citadel.org>
Thu, 20 May 1999 23:07:57 +0000 (23:07 +0000)
committerArt Cancro <ajc@citadel.org>
Thu, 20 May 1999 23:07:57 +0000 (23:07 +0000)
citadel/citadel.c

index 828a9eafc519d262a1046516a8133a15ef1b3a52..36e878d9793ed5ef94f8910174550d638f444100 100644 (file)
@@ -43,7 +43,7 @@ struct march {
        char march_name[32];
        char march_floor;
        char march_order;
-       };
+};
 
 #define IFEXPERT if (userflags&US_EXPERT)
 #define IFNEXPERT if ((userflags&US_EXPERT)==0)
@@ -53,62 +53,63 @@ struct march {
 struct march *march = NULL;
 
 /* 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[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 */
 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[ROOMNAMELEN];
 char ugname[ROOMNAMELEN];
-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 */
+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 */
 int timescalled;
 int posted;
 unsigned userflags;
-long usernum = 0L;                     /* user number */
+long usernum = 0L;             /* user number */
 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 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 curr_floor = 0;           /* number of current floor */
+char floorlist[128][256];      /* names of floors */
+char express_msgs = 0;         /* express messages waiting! */
 
-jmp_buf jmp_reconnect;                 /* for server reconnects */
+jmp_buf jmp_reconnect;         /* for server reconnects */
 char re_username[32];
 char re_password[32];
 
-void sigpipehandler(int nothing) {
+void sigpipehandler(int nothing)
+{
        longjmp(jmp_reconnect, nothing);
-       }
+}
 
 /*
  * here is our 'clean up gracefully and exit' routine
  */
 void logoff(int code)
 {
-       if (editor_pid>0) {             /* kill the editor if it's running */
-               kill(editor_pid,SIGHUP);
-               }
-
+       if (editor_pid > 0) {   /* kill the editor if it's running */
+               kill(editor_pid, SIGHUP);
+       }
 /* 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
@@ -121,15 +122,14 @@ void logoff(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 */
+}
 
 
 
@@ -139,19 +139,20 @@ void logoff(int code)
  */
 void sighandler(int which_sig)
 {
-       signal(SIGINT,SIG_IGN);
-       signal(SIGQUIT,SIG_IGN);
+       signal(SIGINT, SIG_IGN);
+       signal(SIGQUIT, SIG_IGN);
        sigcaught = which_sig;
        return;
-       }
+}
 
 
 /*
  * signal catching function for hangups...
  */
-void dropcarr(int signum) {
+void dropcarr(int signum)
+{
        logoff(SIGHUP);
-       }
+}
 
 
 
@@ -159,33 +160,34 @@ void dropcarr(int signum) {
  * catch SIGCONT to reset terminal modes when were are put back into the
  * foreground.
  */
-void catch_sigcont(int signum) {
+void catch_sigcont(int signum)
+{
        sttybbs(SB_LAST);
-       signal(SIGCONT,catch_sigcont);
-       }
+       signal(SIGCONT, catch_sigcont);
+}
 
 
 
 /* general purpose routines */
 
-void formout(char *name) /* display a file */
-            
-       {
+void formout(char *name)
+{                              /* display a file */
        char cmd[256];
-       snprintf(cmd,sizeof cmd,"MESG %s",name);
+       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') {
+               printf("%s\n", &cmd[4]);
                return;
-               }
-       fmout(screenwidth,NULL,
-               ((userflags & US_PAGINATOR) ? 1 : 0),
-               screenheight,1,1);
        }
+       fmout(screenwidth, NULL,
+             ((userflags & US_PAGINATOR) ? 1 : 0),
+             screenheight, 1, 1);
+}
 
 
-void userlist(void) { 
+void userlist(void)
+{
        char buf[256];
        char fl[256];
        struct tm *tmbuf;
@@ -194,38 +196,38 @@ void userlist(void) {
 
        serv_puts("LIST");
        serv_gets(buf);
-       if (buf[0]!='1') {
-               printf("%s\n",&buf[4]);
+       if (buf[0] != '1') {
+               printf("%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")) {
+       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);
+                       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));
+                              (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);
+                                   ((userflags & US_PAGINATOR) ? 1 : 0),
+                                              screenheight);
 
-                       }
                }
+       }
        sttybbs(SB_NO_INTR);
        printf("\n");
-       }
+}
 
 
 /*
@@ -233,13 +235,13 @@ void userlist(void) {
  */
 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);
-       }
+       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);
+}
 
 
 /*
@@ -249,41 +251,41 @@ void load_user_info(char *params)
  */
 void remove_march(char *roomname, int floornum)
 {
-       struct march *mptr,*mptr2;
+       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 ((!strucmp(march->march_name, roomname))
+           || ((!strucmp(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 ((!strucmp(mptr->march_name, roomname))
+                   || ((!strucmp(roomname, "_FLOOR_"))
+                       && (mptr->march_floor == floornum))) {
 
                        mptr2->next = mptr->next;
                        free(mptr);
-                       mptr=mptr2;
-                       }
-               else {
-                       mptr2=mptr;
-                       }
+                       mptr = mptr2;
+               } else {
+                       mptr2 = mptr;
                }
        }
+}
 
 
 /*
  * 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.
  */
-char *pop_march(int desired_floor) {
+char *pop_march(int desired_floor)
+{
        static char TheRoom[ROOMNAMELEN];
        int TheFloor = 0;
        int TheOrder = 32767;
@@ -292,7 +294,8 @@ char *pop_march(int desired_floor) {
        struct march *mptr = NULL;
 
        strcpy(TheRoom, "_BASEROOM_");
-       if (march == NULL) return(TheRoom);
+       if (march == NULL)
+               return (TheRoom);
 
        for (mptr = march; mptr != NULL; mptr = mptr->next) {
                weight = 0;
@@ -301,18 +304,18 @@ char *pop_march(int desired_floor) {
                if (mptr->march_floor == desired_floor)
                        weight = weight + 5000;
 
-                       weight = weight + ((128-(mptr->march_floor))*128);
-                       weight = weight + (128-(mptr->march_order));
+               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);
        }
+       return (TheRoom);
+}
 
 
 /*
@@ -320,173 +323,187 @@ char *pop_march(int desired_floor) {
  */
 void dotgoto(char *towhere, int display_name)
 {
-       char aaa[256],bbb[256],psearch[256];
+       char aaa[256], bbb[256], psearch[256];
        static long ls = 0L;
        int newmailcount;
        static int oldmailcount = (-1);
-       int partial_match,best_match;
+       int partial_match, best_match;
        char from_floor;
 
        /* store ungoto information */
-       strcpy(ugname,room_name);
+       strcpy(ugname, room_name);
        uglsn = ls;
 
        /* first try an exact match */
-       snprintf(aaa,sizeof 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);
-               snprintf(aaa,sizeof 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)) {
+               if (aaa[3] == '*')
+                       express_msgs = 1;
+       }
+       if (!strncmp(aaa, "54", 2)) {
                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 (!struncmp(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) {
+                       printf("No room '%s'.\n", towhere);
                        return;
-                       }
-               snprintf(aaa,sizeof 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') {
+               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 (!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) {
+               color(BRIGHT_WHITE);
+               printf("%s ", room_name);
+               color(DIM_WHITE);
+               printf("- ");
+       }
+       if (display_name != 2) {
+               color(BRIGHT_YELLOW);
+               printf("%d ", extract_int(&aaa[4], 1));
+               color(DIM_WHITE);
+               printf("new of ");
+               color(BRIGHT_YELLOW);
+               printf("%d ", extract_int(&aaa[4], 2));
+               color(DIM_WHITE);
+               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) )
+       if (num_parms(&aaa[4]) >= 10) {
+               newmailcount = extract_int(&aaa[4], 9);
+               if ((oldmailcount >= 0) && (newmailcount > oldmailcount)) {
+                       color(BRIGHT_RED);
                        printf("*** You have new mail\n");
-               oldmailcount = newmailcount;
+                       color(DIM_WHITE);
                }
+               oldmailcount = newmailcount;
        }
+}
 
 /* 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.
  */
-void gotonext(void) {
+void gotonext(void)
+{
        char buf[256];
-       struct march *mptr,*mptr2;
+       struct march *mptr, *mptr2;
        char next_room[32];
 
        /* 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);
-                       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;
+               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);
-               }
-
-       if (march!=NULL) {
+               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);
-   }
+       } else {
+               strcpy(next_room, "_BASEROOM_");
+       }
+       remove_march(next_room, 0);
+       dotgoto(next_room, 1);
+}
 
 /*
  * forget all rooms on a given floor
@@ -494,38 +511,38 @@ void gotonext(void) {
 void forget_all_rooms_on(int ffloor)
 {
        char buf[256];
-       struct march *flist,*fptr;
+       struct march *flist, *fptr;
 
-       printf("Forgetting all rooms on %s...\r",&floorlist[ffloor][0]);
+       printf("Forgetting all rooms on %s...\r", &floorlist[ffloor][0]);
        fflush(stdout);
-       snprintf(buf,sizeof buf,"LKRA %d",ffloor);
+       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') {
+               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) {
-               snprintf(buf,sizeof 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","");
        }
+       printf("%-72s\r", "");
+}
 
 
 /*
@@ -537,22 +554,20 @@ void gf_toroom(char *towhere, int mode)
 
        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);
+       }
+       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);
                forget_all_rooms_on(floor_being_left);
-               }
        }
+}
 
 
 /*
@@ -560,167 +575,173 @@ void gf_toroom(char *towhere, int mode)
  */
 void gotofloor(char *towhere, int mode)
 {
-       int a,tofloor;
+       int a, tofloor;
        struct march *mptr;
-       char buf[256],targ[256];
+       char buf[256], targ[256];
 
-       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 (!strucmp(&floorlist[a][0], towhere))
                        tofloor = a;
+
+       if (tofloor < 0) {
+               for (a = 0; a < 128; ++a) {
+                       if (!struncmp(&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) {
+               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,"");
-       snprintf(buf,sizeof 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 {
+               printf("There are no rooms on '%s'.\n", &floorlist[tofloor][0]);
        }
+}
 
 
 /*
  * forget all rooms on current floor
  */
-void forget_this_floor(void) {
-       
+void forget_this_floor(void)
+{
+
        if (curr_floor == 0) {
                printf("Can't forget this floor.\n");
                return;
-               }
-
-       if (floorlist[0][0]==0) load_floorlist();
+       }
+       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;
+              &floorlist[(int) curr_floor][0]);
+       if (yesno() == 0)
+               return;
 
-       gf_toroom("_BASEROOM_",GF_ZAP); 
-       }
+       gf_toroom("_BASEROOM_", GF_ZAP);
+}
 
 
 /* 
  * Figure out the physical screen dimensions, if we can
  */
-void check_screen_dims(void) {
+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 (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) {
+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(void) {
+int set_password(void)
+{
        char pass1[20];
        char pass2[20];
        char buf[256];
 
        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)) {
-               snprintf(buf,sizeof buf,"SETP %s",pass1);
+       }
+       if (!strucmp(pass1, pass2)) {
+               snprintf(buf, sizeof buf, "SETP %s", pass1);
                serv_puts(buf);
                serv_gets(buf);
-               printf("%s\n",&buf[4]);
+               printf("%s\n", &buf[4]);
                strcpy(re_password, pass1);
-               return(0);
-               }
-       else {
+               return (0);
+       } else {
                printf("*** They don't match... try again.\n");
-               return(1);
-               }
+               return (1);
        }
+}
 
 
 
 /*
  * get info about the server we've connected to
  */
-void get_serv_info(void) {
+void get_serv_info(void)
+{
        char buf[512];
 
        CtdlInternalGetServInfo(&serv_info);
 
        /* be nice and identify ourself to the server */
-       snprintf(buf,sizeof 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 */
+       snprintf(buf, sizeof 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 */
-       }
+       serv_gets(buf);         /* we don't care about the result code */
+}
 
 
 
@@ -729,66 +750,60 @@ void get_serv_info(void) {
 /*
  * 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 buf[128], username[128], roomname[128], fromhost[128],
+        flags[128];
        char tbuf[128], clientsoft[128];
-       time_t timenow=0;
+       time_t timenow = 0;
        time_t idletime, idlehours, idlemins, idlesecs;
        int last_session = (-1);
-       
-       if (longlist)
-       {
-          serv_puts("TIME");
-          serv_gets(tbuf);
-          if (tbuf[0] == '2') {
-               timenow = extract_long(&tbuf[4], 0);
-               }
-          else {
-               time(&timenow);
+
+       if (longlist) {
+               serv_puts("TIME");
+               serv_gets(tbuf);
+               if (tbuf[0] == '2') {
+                       timenow = extract_long(&tbuf[4], 0);
+               } else {
+                       time(&timenow);
                }
+       } else {
+               color(BRIGHT_WHITE);
+               printf("FLG ###        User Name                 Room                 From host\n");
+               color(DIM_WHITE);
+               printf("--- --- ------------------------- -------------------- ------------------------\n");
        }
-       else {
-       color(BRIGHT_WHITE);
-       printf("FLG ###        User Name                 Room                 From host\n");
-       color(DIM_WHITE);
-       printf("--- --- ------------------------- -------------------- ------------------------\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")) {
+                       extract(username, buf, 1);
+                       extract(roomname, buf, 2);
+                       extract(fromhost, buf, 3);
                        extract(clientsoft, buf, 4);
-                       extract(flags,buf,7);
+                       extract(flags, buf, 7);
 
                        if (longlist) {
                                idletime = timenow - extract_long(buf, 5);
                                idlehours = idletime / 3600;
-                               idlemins = (idletime - (idlehours*3600)) / 60;
-                               idlesecs = (idletime - (idlehours*3600) - (idlemins*60) );
+                               idlemins = (idletime - (idlehours * 3600)) / 60;
+                               idlesecs = (idletime - (idlehours * 3600) - (idlemins * 60));
                                printf("\nFlags: %-3s  Sess# %-3d  Name: %-25s  Room: %s\n",
-                                       flags, extract_int(buf,0), username, roomname);
+                                      flags, extract_int(buf, 0), username, roomname);
                                printf("from <%s> using <%s>, idle %ld:%02ld:%02ld\n",
-                                       fromhost, clientsoft,
-                                       (long)idlehours, (long)idlemins, (long)idlesecs);
+                                      fromhost, clientsoft,
+                                      (long) idlehours, (long) idlemins, (long) idlesecs);
 
-                               }
-                       else {
-                               if (extract_int(buf,0)==last_session) {
+                       } else {
+                               if (extract_int(buf, 0) == last_session) {
                                        printf("        ");
-                                       }
-                               else {
+                               } else {
                                        color(BRIGHT_MAGENTA);
                                        printf("%-3s ", flags);
                                        color(DIM_WHITE);
-                                       printf("%-3d ", extract_int(buf,0));
-                                       }
-                               last_session=extract_int(buf,0);
+                                       printf("%-3d ", extract_int(buf, 0));
+                               }
+                               last_session = extract_int(buf, 0);
                                color(BRIGHT_CYAN);
                                printf("%-25s ", username);
                                color(BRIGHT_MAGENTA);
@@ -796,16 +811,16 @@ void who_is_online(int longlist)
                                color(BRIGHT_CYAN);
                                printf("%-24s\n", fromhost);
                                color(DIM_WHITE);
-                               }
                        }
                }
        }
+}
 
 void enternew(char *desc, char *buf, int maxlen)
 {
-   char bbb[128];
-   snprintf(bbb, sizeof 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);
 }
 
 /*
@@ -813,147 +828,149 @@ void enternew(char *desc, char *buf, int maxlen)
  */
 int main(int argc, char **argv)
 {
-int a,b,mcmd;
-char aaa[100],bbb[100],eee[100];               /* general purpose variables */
-char argbuf[32];                               /* command line buf */
-volatile int termn8 = 0;
-
-
-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(SIGINT,SIG_IGN);
-signal(SIGQUIT,SIG_IGN);
-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("Attaching to server...\r");
-fflush(stdout);
-attach_to_server(argc,argv);
-
-send_ansi_detect();
-
-serv_gets(aaa);
-if (aaa[0]!='2') {
-       printf("%s\n",&aaa[4]);
-       logoff(atoi(aaa));
+       int a, b, mcmd;
+       char aaa[100], bbb[100], eee[100];      /* general purpose variables */
+       char argbuf[32];        /* command line buf */
+       volatile int termn8 = 0;
+
+
+       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(SIGINT, SIG_IGN);
+       signal(SIGQUIT, SIG_IGN);
+       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("Attaching to server...\r");
+       fflush(stdout);
+       attach_to_server(argc, argv);
+
+       send_ansi_detect();
+
+       serv_gets(aaa);
+       if (aaa[0] != '2') {
+               printf("%s\n", &aaa[4]);
+               logoff(atoi(aaa));
        }
-get_serv_info();
+       get_serv_info();
 
-look_for_ansi();
-cls(0);
-color(7);
+       look_for_ansi();
+       cls(0);
+       color(7);
 
-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;
+       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;
 
-printf(" pause    next    stop\n");
-printf(" ctrl-s  ctrl-o  ctrl-c\n\n");
-formout("hello");              /* print the opening greeting */
-printf("\n");
+       printf(" pause    next    stop\n");
+       printf(" ctrl-s  ctrl-o  ctrl-c\n\n");
+       formout("hello");       /* print the opening greeting */
+       printf("\n");
 
-GSTA:  termn8=0; newnow=0;
+      GSTA:termn8 = 0;
+       newnow = 0;
        do {
                if (strlen(rc_username) > 0) {
-                       strcpy(fullname,rc_username);
-                       }
-               else {
-                       newprompt("Enter your name: ",fullname,29);
-                       }
-               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;
+                       strcpy(fullname, rc_username);
+               } else {
+                       newprompt("Enter your name: ", fullname, 29);
+               }
+               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;
+       }
        /* sign on to the server */
        strcpy(re_username, fullname);
-       snprintf(aaa,sizeof 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);
-               }
+       if (strlen(rc_password) > 0) {
+               strcpy(eee, rc_password);
+       } else {
+               newprompt("\rPlease enter your password: ", eee, -19);
+       }
        strproc(eee);
-       snprintf(aaa,sizeof aaa,"PASS %s",eee);
+       snprintf(aaa, sizeof aaa, "PASS %s", eee);
        serv_puts(aaa);
        serv_gets(aaa);
-       if (aaa[0]=='2') {
+       if (aaa[0] == '2') {
                strcpy(re_password, eee);
                load_user_info(&aaa[4]);
                goto PWOK;
-               }
-       
+       }
        printf("<< wrong password >>\n");
-       if (strlen(rc_password)>0) logoff(0);
+       if (strlen(rc_password) > 0)
+               logoff(0);
        goto GSTA;
 
-NEWUSR:        if (strlen(rc_password)==0) {
+      NEWUSR:if (strlen(rc_password) == 0) {
                printf("No record. Enter as new user? ");
-               if (yesno()==0) goto GSTA;
-               }
-
-       snprintf(aaa,sizeof aaa,"NEWU %s",fullname);
+               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') {
+               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:printf("%s\nAccess level: %d (%s)\nUser #%ld / Call #%d\n",
+              fullname, axlevel, axdefs[(int) axlevel],
+              usernum, timescalled);
 
        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)) {
+       if (aaa[0] == '2') {
+               b = extract_int(&aaa[4], 0);
+               if (b > 0) {
+                       color(BRIGHT_RED);
+                       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);
+                       color(DIM_WHITE);
+               }
+               if ((axlevel >= 6) && (extract_int(&aaa[4], 2) > 0)) {
                        printf("*** Users need validation\n");
-                       }
-
-               if (extract_int(&aaa[4],1)>0) {
+               }
+               if (extract_int(&aaa[4], 1) > 0) {
                        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. */
-       snprintf(temp,sizeof temp,"/tmp/citA%d",getpid());
-       snprintf(temp2,sizeof temp2,"/tmp/citB%d",getpid());
-       snprintf(tempdir,sizeof tempdir,"/tmp/citC%d",getpid());
+       snprintf(temp, sizeof temp, "/tmp/citA%d", getpid());
+       snprintf(temp2, sizeof temp2, "/tmp/citB%d", getpid());
+       snprintf(tempdir, sizeof tempdir, "/tmp/citC%d", getpid());
 
        /* 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.
@@ -965,12 +982,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();
@@ -980,320 +998,402 @@ PWOK:   printf("%s\nAccess level: %d (%s)\nUser #%ld / Call #%d\n",
 
 
        /* Enter the lobby */
-       dotgoto("_BASEROOM_",1);
+       dotgoto("_BASEROOM_", 1);
 
 /* Main loop for the system... user is logged in. */
-       strcpy(ugname,"");
+       strcpy(ugname, "");
        uglsn = 0L;
 
-       if (newnow==1)  readmsgs(3,1,5);
-               else    readmsgs(1,1,0);
-
-do {   /* MAIN LOOP OF PROGRAM */
-
-       /* Reconnect to the server if the connection was broken */
-       if (setjmp(jmp_reconnect)) {
-               printf("\rServer connection broken; reconnecting...\r");
-               fflush(stdout);
-               attach_to_server(argc,argv);
-               printf("                                         \r");
-               fflush(stdout);
-               serv_gets(aaa);
-               if (aaa[0]!='2') { printf("%s\n", &aaa[4]); exit(0); }
-               get_serv_info();
-               sprintf(aaa, "USER %s", re_username);
-               serv_puts(aaa);
-               serv_gets(aaa);
-               if (aaa[0]!='3') { printf("%s\n", &aaa[4]); exit(0); }
-               sprintf(aaa, "PASS %s", re_password);
-               serv_puts(aaa);
-               serv_gets(aaa);
-               if (aaa[0]!='2') { printf("%s\n", &aaa[4]); exit(0); }
-               load_user_info(&aaa[4]);
-               sprintf(aaa, "GOTO %s", room_name);
-               serv_puts(aaa);
-               serv_gets(aaa);
+       if (newnow == 1)
+               readmsgs(3, 1, 5);
+       else
+               readmsgs(1, 1, 0);
+
+       do {                    /* MAIN LOOP OF PROGRAM */
+
+               /* Reconnect to the server if the connection was broken */
+               if (setjmp(jmp_reconnect)) {
+                       printf("\rServer connection broken; reconnecting...\r");
+                       fflush(stdout);
+                       attach_to_server(argc, argv);
+                       printf("                                         \r");
+                       fflush(stdout);
+                       serv_gets(aaa);
+                       if (aaa[0] != '2') {
+                               printf("%s\n", &aaa[4]);
+                               exit(0);
+                       }
+                       get_serv_info();
+                       sprintf(aaa, "USER %s", re_username);
+                       serv_puts(aaa);
+                       serv_gets(aaa);
+                       if (aaa[0] != '3') {
+                               printf("%s\n", &aaa[4]);
+                               exit(0);
+                       }
+                       sprintf(aaa, "PASS %s", re_password);
+                       serv_puts(aaa);
+                       serv_gets(aaa);
+                       if (aaa[0] != '2') {
+                               printf("%s\n", &aaa[4]);
+                               exit(0);
+                       }
+                       load_user_info(&aaa[4]);
+                       sprintf(aaa, "GOTO %s", room_name);
+                       serv_puts(aaa);
+                       serv_gets(aaa);
                }
-       signal(SIGPIPE, sigpipehandler);
+               signal(SIGPIPE, sigpipehandler);
 
-       signal(SIGINT,SIG_IGN);
-       signal(SIGQUIT,SIG_IGN);
-       mcmd=getcmd(argbuf);
+               signal(SIGINT, SIG_IGN);
+               signal(SIGQUIT, SIG_IGN);
+               mcmd = getcmd(argbuf);
 
 #ifdef TIOCGWINSZ
-       check_screen_dims();
+               check_screen_dims();
 #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);
-                       snprintf(bbb, sizeof 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:
-       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))
-          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))
-          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))
-          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);
-               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);
-               }
-       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 80:
-       do_system_configuration();
-       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);
-       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:
-       page_user();
-       break;
-
-       } /* end switch */
-    } while(termn8==0);
+               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))
+                                       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:
+                               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))
+                                       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))
+                                       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))
+                                       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);
+                                       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);
+                               } else {
+                                       printf("*** Can't run doors when server is not local.\n");
+                               }
+                               break;
+
+                       case 17:
+                               who_is_online(0);
+                               break;
 
-TERMN8:        printf("%s logged out.\n",fullname);
-       while (march!=NULL) remove_march(march->march_name,0);
-       if (mcmd==30)
+                       case 79:
+                               who_is_online(1);
+                               break;
+
+                       case 80:
+                               do_system_configuration();
+                               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);
+                               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:
+                               page_user();
+                               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");
-       snprintf(aaa,sizeof aaa,"LOUT");
+       snprintf(aaa, sizeof aaa, "LOUT");
        serv_puts(aaa);
        serv_gets(aaa);
-       if ((mcmd==29)||(mcmd==15)) {
+       if ((mcmd == 29) || (mcmd == 15)) {
                formout("goodbye");
                logoff(0);
-               }
+       }
        goto GSTA;
 
-} /* end main() */
-
+}                              /* end main() */