mhn: minor changes.

* mh/etc/mhl.headers: New file.
* mh/etc/Makefile.am (MH_FILES): Add mhl.headers.
* mh/mhn.c (opt_handler): Use mh_find_file to
resolve format file name.
(mhn_show): Always open the formfile.
(copy_header_to_stream): Rewrite using mu_stream_copy + HEADER filter.

@@ -26,6 +26,7 @@ MH_FILES   = \
  forwcomps\
  forwcomps\
  mhl.format\
  mhl.format\
  mhl.forward\
  mhl.forward\
+ mhl.headers\
  mhl.repl\
  mhl.repl\
  mhl.usenet\
  mhl.usenet\
  replcomps\
  replcomps\

+; mhl.headers
+;
+; GNU Mailutils -- a suite of utilities for electronic mail
+; Copyright (C) 2010 Free Software Foundation, Inc.
+; Distributed under GPLv3+.  See <http://gnu.org/licenses/gpl.html>.
+;
+; Mhn uses this format file for displaying headers in MIME messages. 
+;
+overflowtext="***",overflowoffset=5
+leftadjust,compwidth=9
+ignores=msgid,message-id,received,content-type,content-transfer-encoding,content-id
+Date:formatfield="%<(nodate{text})%{text}%|%(pretty{text})%>"
+To:
+cc:
+From:decode
+Subject:decode
+:
+extras:nocomponent
+:
+; End of mhl.headers

@@ -96,6 +96,7 @@ static struct argp_option options[] = {
 /* Traditional MH options */
 /* Traditional MH options */
 struct mh_option mh_option[] = {
 struct mh_option mh_option[] = {
   { "file",          MH_OPT_ARG, "filename" },
   { "file",          MH_OPT_ARG, "filename" },
+  { "compose" },
   { "list",          MH_OPT_BOOL },
   { "list",          MH_OPT_BOOL },
   { "headers",       MH_OPT_BOOL },
   { "headers",       MH_OPT_BOOL },
   { "realsize",      MH_OPT_BOOL },
   { "realsize",      MH_OPT_BOOL },
@@ -357,7 +358,7 @@ opt_handler (int key, char *arg, struct argp_state *state)
       break;
       break;
 
 
     case ARG_FORM:
     case ARG_FORM:
-      formfile = arg;
+      mh_find_file (arg, &formfile);
       break;
       break;
 
 
       /* Common options */
       /* Common options */
@@ -390,6 +391,11 @@ opt_handler (int key, char *arg, struct argp_state *state)
       charset = arg;
       charset = arg;
       break;
       break;
       
       
+    case ARGP_KEY_FINI:
+      if (!formfile)
+	mh_find_file ("mhl.headers", &formfile);
+      break;
+      
     default:
     default:
       return ARGP_ERR_UNKNOWN;
       return ARGP_ERR_UNKNOWN;
     }
     }
@@ -1444,22 +1450,7 @@ mhn_show ()
       exit (1);
       exit (1);
     }
     }
   
   
-  if (formfile)
-    {
-      char *s = mh_expand_name (MHLIBDIR, "mhl.headers", 0);
-      if (access (s, R_OK) == 0)
-	formfile = "mhl.headers";
-      free (s);
-    }
-
-  if (formfile)
-    {
-      char *s = mh_expand_name (MHLIBDIR, formfile, 0);
-      mhl_format = mhl_format_compile (s);
-      if (!mhl_format)
-	exit (1);
-      free (s);
-    }
+  mhl_format = mhl_format_compile (formfile);
     
     
   if (message)
   if (message)
     rc = show_message (message, 0, ostr);
     rc = show_message (message, 0, ostr);
@@ -1895,22 +1886,27 @@ copy_header (mu_message_t msg, mu_header_t out)
 void
 void
 copy_header_to_stream (mu_message_t msg, mu_stream_t stream)
 copy_header_to_stream (mu_message_t msg, mu_stream_t stream)
 {
 {
+  int rc;
   mu_header_t hdr;
   mu_header_t hdr;
-  mu_stream_t in;
-  char *buf = NULL;
-  size_t bufsize = 0, n = 0;
+  mu_stream_t flt, str;
 
 
   mu_message_get_header (msg, &hdr);
   mu_message_get_header (msg, &hdr);
-  mu_header_get_streamref (hdr, &in);
-  /* FIXME: Use mu_stream_copy */
-  while (mu_stream_getline (in, &buf, &bufsize, &n) == 0 && n > 0)
+  mu_header_get_streamref (hdr, &str);
+  rc = mu_filter_create (&flt, str, "HEADER",
+			 MU_FILTER_DECODE, MU_STREAM_READ);
+  mu_stream_unref (str);
+  if (rc)
     {
     {
-      if (n == 1 && buf[0] == '\n')
-	break;
-      mu_stream_write (stream, buf, n, NULL);
+      mu_error (_("cannot open filter stream: %s"), mu_strerror (rc));
+      exit (1);
     }
     }
-  mu_stream_destroy (&in);
-  free (buf);
+  rc = mu_stream_copy (stream, flt, 0, NULL);
+  if (rc)
+    {
+      mu_error (_("error reading headers: %s"), mu_strerror (rc));
+      exit (1);
+    }
+  mu_stream_destroy (&flt);
 }
 }
 
 
 void
 void