fixed a bunch of display bugs, and a couple of memory leaks.

diff --git a/clients/mailmaint/mailmaint.c b/clients/mailmaint/mailmaint.c
index d86ce4274791fde614dc65d71f5d711c0e4f8e21..117942f8f9178d2a59a2e1772a3ceda1b7b0e2e9 100644 (file)
--- a/clients/mailmaint/mailmaint.c
+++ b/clients/mailmaint/mailmaint.c
@@ -32,7 +32,6 @@ static char rcsid_mailmaint_c[] = "$Header$";
 
 #define STARTCOL 0
 #define STARTROW 3
-#define SECONDCOL 30
 #define DISPROW 15
 #define LISTMAX 50
 #define LISTSIZE 32
@@ -332,9 +331,11 @@ display_buff(buf)
     int maxcol;
 
     maxcol = COLS;
+
+/* I don't understand the point of this limitation. -jweiss 3/25/94
     if (maxcol >= 80)
        maxcol = 80;
-
+*/
     cnt = 0;
     printbuf = calloc((unsigned)maxcol, 1);
     for (i = 0; i <= strlen(buf); i++) {
@@ -369,7 +370,8 @@ start_display_buff(buff)
        mvcur(0, 0, currow, STARTCOL);
        refresh();
        if (Prompt("--RETURN for more, ctl-c to exit--", buffer, 1, 0) == 0) {
-           display_buff("Flushing query...");
+           erase_line(currow, STARTCOL);
+           show_text(currow, STARTCOL, "Flushing query...");
            moreflg = 1;
            return (0);
        }
@@ -600,7 +602,9 @@ start_display(buff)
     char *buff;
 {
     char *buffer;
+    int secondcol;   /* where to start the second column of text */
 
+    secondcol = (COLS / 2);  /* 1/2 was accross the screen */
     num_members++;
     if (moreflg)
        return(0);
@@ -610,7 +614,8 @@ start_display(buff)
        mvcur(0, 0, currow, STARTCOL);
        refresh();
        if (Prompt("--RETURN for more, ctl-c to exit--", buffer, 1, 0) == 0) {
-           display_buff("Flushing query...");
+           erase_line(currow, STARTCOL);
+           show_text(currow, STARTCOL, "Flushing query...");
            moreflg = 1;
            return (0);
        }
@@ -624,7 +629,8 @@ start_display(buff)
     if (!toggle)
        show_text(currow, STARTCOL, buff);
     else {
-       show_text(currow, SECONDCOL, buff);
+        erase_line(currow, secondcol-1);  /* in case the 1st col is too long */
+       show_text(currow, secondcol, buff);
        currow++;
     }
     toggle = !toggle;
@@ -784,6 +790,7 @@ erase_line(row, col)
     mvcur(0, 0, row, col);
     addstr(buff);
     refresh();
+    free(buff);  /* close mem. leak */
 }
 
 /****************************************************/
@@ -802,8 +809,10 @@ clrwin(erase_row)
     int maxcol;
 
     maxcol = COLS;
+/* I don't understand the point of this limitation. -jweiss 3/25/94
+   and I believe it was preventing the window from being cleared properly.
     if (maxcol > 80)
-       maxcol = 80;            /* limit width */
+       maxcol = 80; */         /* limit width */
 
     buff = calloc((unsigned)maxcol + 1, 1);
     for (i = 0; i <= maxcol - 1; i++)
@@ -817,6 +826,7 @@ clrwin(erase_row)
     addstr(buff);
     mvcur(erase_row, STARTCOL, STARTROW + oldpos[level] - 1, STARTCOL);
     refresh();
+    free (buff); /* fix mem. leak */
 }
 
 /****************************************************/