Truncate username display to 25 characters so it doesn't overrun the column

diff --git a/textclient/citadel.c b/textclient/citadel.c
index c4d85b1f944b518349974bce75ac124e3219d948..0bab0a56630a54eb7586c970e22c94e9fba1e8d4 100644 (file)
--- a/textclient/citadel.c
+++ b/textclient/citadel.c
@@ -160,7 +160,7 @@ void formout(CtdlIPC * ipc, char *name)
 
 void userlist(CtdlIPC * ipc, char *patn) {
        char buf[SIZ];
-       char fl[SIZ];
+       char fl[26];            // a buffer this small will prevent it overrunning the column
        struct tm tmbuf;
        time_t lc;
        int r;                  // IPC response code

diff --git a/textclient/commands.c b/textclient/commands.c
index 0c0cb99ba2d2ea211be7edb7348cf5f0b7217faa..5685d2f10de2da2bf54913bc79c8611ff93e5be0 100644 (file)
--- a/textclient/commands.c
+++ b/textclient/commands.c
@@ -1346,15 +1346,15 @@ void stty_ctdl(int cmd) {
 
        if ((cmd == 0) || (cmd == 1)) {
                tcgetattr(0, &live);
+
+               // Character-by-character input instead of line mode
                live.c_iflag = ISTRIP | IXON | IXANY;
                live.c_oflag = OPOST | ONLCR;
                live.c_lflag = ISIG | NOFLSH;
 
+               // Key bindings
                live.c_cc[VINTR] = 0;
                live.c_cc[VQUIT] = 0;
-
-               // do we even need this stuff anymore?
-               // live.c_line=0;
                live.c_cc[VERASE] = 8;
                live.c_cc[VKILL] = 24;
                live.c_cc[VEOF] = 1;
@@ -1363,9 +1363,11 @@ void stty_ctdl(int cmd) {
                live.c_cc[VSTART] = 0;
                tcsetattr(0, TCSADRAIN, &live);
        }
+
        if (cmd == 2) {
                tcgetattr(0, &saved_settings);
        }
+
        if (cmd == 3) {
                tcsetattr(0, TCSADRAIN, &saved_settings);
        }