* messages.c: fixed <H>eader command

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index dfdff3b0d6d36910bc269e18a299ea427b3c6015..04da10171c40df7287170561805fe593b7c3a1ba 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,7 @@
  $Log$
+ Revision 601.63  2002/11/10 09:21:57  error
+ * messages.c: fixed <H>eader command
+
  Revision 601.62  2002/11/10 09:19:38  error
  * Convert some more routines to new IPC code
 
@@ -4200,3 +4203,4 @@ 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/messages.c b/citadel/messages.c
index ecb8666647c204b7d8e470a3722eca8f2aca043d..f89c55aca76bdba5c10f112772424df5c7d51916 100644 (file)
--- a/citadel/messages.c
+++ b/citadel/messages.c
@@ -387,7 +387,8 @@ int read_message(CtdlIPC *ipc,
                scr_printf("\n");
                ++lines_printed;
                lines_printed = checkpagin(lines_printed, pagin, screenheight);
-               scr_printf(" ");
+               if (pagin != 2)
+                       scr_printf(" ");
        }
        if (pagin == 1 && !dest) {
                color(BRIGHT_CYAN);
@@ -395,38 +396,34 @@ int read_message(CtdlIPC *ipc,
 
        /* View headers only */
        if (pagin == 2) {
-               sprintf(buf, "nhdr=%s\nfrom=%s\ntype=%d\nmsgn=%s\n",
+               pprintf("nhdr=%s\nfrom=%s\ntype=%d\nmsgn=%s\n",
                                message->nhdr ? "yes" : "no",
                                message->author, message->type,
                                message->msgid);
-               /* FIXME output buf */
                if (strlen(message->subject)) {
-                       sprintf(buf, "subj=%s\n", message->subject);
-                       /* FIXME: output buf */
+                       pprintf("subj=%s\n", message->subject);
                }
                if (strlen(message->email)) {
-                       sprintf(buf, "rfca=%s\n", message->email);
-                       /* FIXME: output buf */
+                       pprintf("rfca=%s\n", message->email);
                }
-               sprintf(buf, "hnod=%s\nroom=%s\nnode=%s\ntime=%s",
+               pprintf("hnod=%s\nroom=%s\nnode=%s\ntime=%s",
                                message->hnod, message->room,
                                message->node, 
                                asctime(localtime(&message->time)));
                if (strlen(message->recipient)) {
-                       sprintf(buf, "rcpt=%s\n", message->recipient);
-                       /* FIXME: output buf */
+                       pprintf("rcpt=%s\n", message->recipient);
                }
                if (message->attachments) {
                        struct parts *ptr;
 
                        for (ptr = message->attachments; ptr; ptr = ptr->next) {
-                               sprintf(buf, "part=%s|%s|%s|%s|%s|%ld\n",
+                               pprintf("part=%s|%s|%s|%s|%s|%ld\n",
                                        ptr->name, ptr->filename, ptr->number,
                                        ptr->disposition, ptr->mimetype,
                                        ptr->length);
-                               /* FIXME: output buf */
                        }
                }
+               pprintf("\n");
                sttybbs(0);
                return (0);
        }