* misc bugfixes and cleanups

[citadel.git] / citadel / citadel.c

diff --git a/citadel/citadel.c b/citadel/citadel.c
index c3f7f08569b2eeb43172302d7860bf84b56da959..01bcb05c74a21821cee64fcf17db5494248cc521 100644 (file)
--- a/citadel/citadel.c
+++ b/citadel/citadel.c
@@ -90,15 +90,6 @@ 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 */
-char re_username[32];
-char re_password[32];
-
-void sigpipehandler(int nothing)
-{
-       longjmp(jmp_reconnect, nothing);
-}
-
 /*
  * here is our 'clean up gracefully and exit' routine
  */
@@ -712,12 +703,13 @@ int set_password(void)
                newprompt("Enter a new password: ", pass1, -19);
                newprompt("Enter it again to confirm: ", pass2, -19);
        }
+       strproc(pass1);
+       strproc(pass2);
        if (!strucmp(pass1, pass2)) {
                snprintf(buf, sizeof buf, "SETP %s", pass1);
                serv_puts(buf);
                serv_gets(buf);
                printf("%s\n", &buf[4]);
-               strcpy(re_password, pass1);
                return (0);
        } else {
                printf("*** They don't match... try again.\n");
@@ -760,6 +752,7 @@ void who_is_online(int longlist)
        time_t timenow = 0;
        time_t idletime, idlehours, idlemins, idlesecs;
        int last_session = (-1);
+       int linecount = 2;
 
        if (longlist) {
                serv_puts("TIME");
@@ -796,6 +789,7 @@ void who_is_online(int longlist)
                                       fromhost, clientsoft,
                                       (long) idlehours, (long) idlemins, (long) idlesecs);
 
+                               linecount += 3;
                        } else {
                                if (extract_int(buf, 0) == last_session) {
                                        printf("        ");
@@ -809,11 +803,16 @@ void who_is_online(int longlist)
                                color(BRIGHT_CYAN);
                                printf("%-25s ", username);
                                color(BRIGHT_MAGENTA);
+                               roomname[20] = 0;
                                printf("%-20s ", roomname);
                                color(BRIGHT_CYAN);
                                printf("%-24s\n", fromhost);
                                color(DIM_WHITE);
+                               ++linecount;
                        }
+                       linecount = checkpagin(linecount,
+                                   ((userflags & US_PAGINATOR) ? 1 : 0),
+                                              screenheight);
                }
        }
 }
@@ -894,7 +893,6 @@ GSTA:       termn8 = 0;
                goto TERMN8;
        }
        /* sign on to the server */
-       strcpy(re_username, fullname);
        snprintf(aaa, sizeof aaa, "USER %s", fullname);
        serv_puts(aaa);
        serv_gets(aaa);
@@ -912,7 +910,6 @@ GSTA:       termn8 = 0;
        serv_puts(aaa);
        serv_gets(aaa);
        if (aaa[0] == '2') {
-               strcpy(re_password, eee);
                load_user_info(&aaa[4]);
                goto PWOK;
        }
@@ -1013,48 +1010,8 @@ GSTA:    termn8 = 0;
 
        do {                    /* MAIN LOOP OF PROGRAM */
 
-               if (!is_connected()) {
-                       for (a=15; a>=0; --a) {
-                               printf("\rServer connection broken; "
-                                       "will reconnect in %d seconds\r", a);
-                               fflush(stdout);
-                               sleep(1);
-                       }
-                       printf( "                                "
-                               "                                \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(SIGINT, SIG_IGN);
                signal(SIGQUIT, SIG_IGN);
-               signal(SIGPIPE, SIG_IGN);
                mcmd = getcmd(argbuf);
 
 #ifdef TIOCGWINSZ
@@ -1298,6 +1255,14 @@ GSTA:    termn8 = 0;
                                do_system_configuration();
                                break;
 
+                       case 82:
+                               do_internet_configuration();
+                               break;
+
+                       case 83:
+                               check_message_base();
+                               break;
+
                        case 50:
                                enter_config(2);
                                break;