* Pages are once again formatted to the caller's screen width.

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index cc913eaca8b149cedad8c832cc38fb55129e305a..f0e278c0507a9d0e555eb289783aabfc1fc67a02 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,7 @@
  $Log$
+ Revision 590.17  2001/12/23 10:00:43  error
+ * Pages are once again formatted to the caller's screen width.
+
  Revision 590.16  2001/12/23 09:57:47  error
  * tools.c: added parameter to fmt_date() to allow for printing the seconds
    along with the time, e.g. 12:34 pm or 12:34:56 pm
@@ -2999,4 +3002,3 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import 
-

diff --git a/citadel/commands.c b/citadel/commands.c
index e4353ca89b221600831dea0c0955695327d00a20..333d2972b1f8a559f3c2670131c1664a910819a5 100644 (file)
--- a/citadel/commands.c
+++ b/citadel/commands.c
@@ -274,6 +274,7 @@ void print_express(void)
                }
                /* fall back to built-in express message display */
                printf("\n");
+               lines_printed++;
 
                /* Header derived from flags */
                if (flags & 2)
@@ -303,10 +304,8 @@ void print_express(void)
                        printf(" @%s", node);
        
                printf(":\n");
-       
-               while (serv_gets(buf), strcmp(buf, "000")) {
-                       printf("%s", buf);
-               }
+               lines_printed++;
+               fmout(screenwidth, NULL, 1, screenheight, -1, 0);
        }
        printf("\n---\n");
        color(BRIGHT_WHITE);