Updated calls to mh_format

@@ -129,17 +129,17 @@ opt_handler (int key, char *arg, void *unused)
 }
 }
 
 
 void
 void
-list_message (mh_format_t *format, mailbox_t mbox, size_t msgno,
-	      char *buffer, size_t width)
+list_message (mh_format_t *format, mailbox_t mbox, size_t msgno, size_t width)
 {
 {
   message_t msg;
   message_t msg;
+  char *buf = NULL;
 
 
-  buffer[0] = 0;
   mailbox_get_message (mbox, msgno, &msg);
   mailbox_get_message (mbox, msgno, &msg);
-  mh_format (format, msg, msgno, buffer, width);
-  printf ("%s\n", buffer);
+  mh_format (format, msg, msgno, width, &buf);
+  printf ("%s\n", buf);
   if (audit_fp)
   if (audit_fp)
-    fprintf (audit_fp, "%s\n", buffer);
+    fprintf (audit_fp, "%s\n", buf);
+  free (buf);
 }
 }
 
 
 int
 int
@@ -151,7 +151,6 @@ main (int argc, char **argv)
   size_t lastmsg;
   size_t lastmsg;
   int f_truncate = 0;
   int f_truncate = 0;
   int f_changecur = 0;
   int f_changecur = 0;
-  char *buffer;
   mh_format_t format;
   mh_format_t format;
   int rc;
   int rc;
 
 
@@ -210,8 +209,6 @@ main (int argc, char **argv)
       exit (1);
       exit (1);
     }
     }
   
   
-  buffer = xmalloc (width);
-  
   /* Fixup options */
   /* Fixup options */
   if (truncate_source == -1)
   if (truncate_source == -1)
     truncate_source = f_truncate;
     truncate_source = f_truncate;
@@ -249,7 +246,7 @@ main (int argc, char **argv)
 	}
 	}
 	  
 	  
       if (!quiet)
       if (!quiet)
-	list_message (&format, output, lastmsg + n, buffer, width);
+	list_message (&format, output, lastmsg + n, width);
       
       
       if (truncate_source)
       if (truncate_source)
 	{
 	{

@@ -71,8 +71,6 @@ static mh_format_t format;
 
 
 static mh_msgset_t msgset;
 static mh_msgset_t msgset;
 
 
-static char *buffer;
-
 void list_message __P((mailbox_t mbox, message_t msg, size_t num, void *data));
 void list_message __P((mailbox_t mbox, message_t msg, size_t num, void *data));
 void print_header __P((mailbox_t mbox));
 void print_header __P((mailbox_t mbox));
 void clear_screen __P((void));
 void clear_screen __P((void));
@@ -171,8 +169,6 @@ main (int argc, char **argv)
 
 
   mbox = mh_open_folder (current_folder, 0);
   mbox = mh_open_folder (current_folder, 0);
 
 
-  buffer = xmalloc (width);
-  
   argc -= index;
   argc -= index;
   argv += index;
   argv += index;
   if ((argc == 0 || strcmp (argv[0], "all") == 0) && !reverse)
   if ((argc == 0 || strcmp (argv[0], "all") == 0) && !reverse)
@@ -268,7 +264,8 @@ clear_screen ()
 void
 void
 list_message (mailbox_t mbox, message_t msg, size_t num, void *data)
 list_message (mailbox_t mbox, message_t msg, size_t num, void *data)
 {
 {
-  buffer[0] = 0;
-  mh_format (&format, msg, num, buffer, width);
+  char *buffer;
+  mh_format (&format, msg, num, width, &buffer);
   printf ("%s\n", buffer);
   printf ("%s\n", buffer);
+  free (buffer);
 }
 }