mh: improve forw; add tests.

* mh/forw.c (options): New option --file.
(input_file): New variable.
(opt_handler): Handle --file.
(finish_draft): Remove a leftover path hack.
Implement raw file forwarding.
(main): Minor fix.
* mh/mh_getopt.c (mh_option_init): Limit match_len to the actual
length of the option string.

* mh/tests/forw.at: New file.
* mh/tests/Makefile.am (TESTSUITE_AT): Add forw.at.
* mh/tests/testsuite.at: Include forw.at.
* mh/tests/comp.at: Add more keywords.

@@ -42,6 +42,8 @@ static struct argp_option options[] = {
    N_("set the editor program to use")},
   {"noedit",        ARG_NOEDIT,        0, 0,
    N_("suppress the initial edit")},
+  {"file",          ARG_FILE, N_("FILE"), 0,
+   N_("read message from FILE")},
   {"format",        ARG_FORMAT,        N_("BOOL"), 0, 
    N_("format messages")},
   {"noformat",      ARG_NOFORMAT,      NULL, 0,
@@ -74,26 +76,28 @@ static struct argp_option options[] = {
 struct mh_option mh_option[] = {
   { "annotate",      MH_OPT_BOOL },
   { "build" },
-  { "form",          MH_OPT_ARG, "formatfile"},
-  { "format",        MH_OPT_ARG, "string"},
-  { "draftfolder",   MH_OPT_ARG, "folder"},
+  { "file",          MH_OPT_ARG, "msgfile" },
+  { "form",          MH_OPT_ARG, "formatfile" },
+  { "format",        MH_OPT_ARG, "string" },
+  { "draftfolder",   MH_OPT_ARG, "folder" },
   { "nodraftfolder" },
   { "draftmessage" },
-  { "editor",        MH_OPT_ARG, "program"},
+  { "editor",        MH_OPT_ARG, "program" },
   { "noedit" },
-  { "filter",        MH_OPT_ARG, "program"},
+  { "filter",        MH_OPT_ARG, "program" },
   { "inplace",       MH_OPT_BOOL },
-  { "whatnowproc",   MH_OPT_ARG, "program"},
+  { "whatnowproc",   MH_OPT_ARG, "program" },
   { "nowhatnowproc" },
   { "mime",          MH_OPT_BOOL },
   { NULL }
 };
 
-enum encap_type {
+enum encap_type
+  {
     encap_clear,
     encap_mhl,
     encap_mime
-};
+  };
 
 static char *formfile;
 struct mh_whatnow_env wh_env = { 0 };
@@ -108,6 +112,7 @@ static int use_draft = 0;       /* --use flag */
 static int width = 80;          /* --width flag */
 static char *draftmessage = "new";
 static const char *draftfolder = NULL;
+static char *input_file;        /* input file name (--file option) */
 
 static mh_msgset_t msgset;
 static mu_mailbox_t mbox;
@@ -118,8 +123,7 @@ opt_handler (int key, char *arg, struct argp_state *state)
   switch (key)
     {
     case ARGP_KEY_INIT:
-      draftfolder = mh_global_profile_get ("Draft-Folder",
-					   mu_folder_directory ());
+      draftfolder = mh_global_profile_get ("Draft-Folder", NULL);
       whatnowproc = mh_global_profile_get ("whatnowproc", NULL);
       break;
 
@@ -131,6 +135,10 @@ opt_handler (int key, char *arg, struct argp_state *state)
       build_only = 1;
       break;
 
+    case ARG_FILE:
+      input_file = arg;
+      break;
+      
     case ARG_DRAFTFOLDER:
       draftfolder = arg;
       break;
@@ -218,7 +226,8 @@ opt_handler (int key, char *arg, struct argp_state *state)
   return 0;
 }
 
-struct format_data {
+struct format_data
+{
   int num;
   mu_stream_t stream;
   mu_list_t format;
@@ -286,26 +295,41 @@ msg_copy (mu_message_t msg, mu_stream_t ostream)
 }
 
 void
-format_message (mu_mailbox_t mbox, mu_message_t msg, size_t num, void *data)
+format_message (mu_stream_t outstr, mu_message_t msg, int num,
+		mu_list_t format)
 {
-  struct format_data *fp = data;
-  char *s;
-  int rc;
+  int rc = 0;
   
   if (annotate)
     mu_list_append (wh_env.anno_list, msg);
   
-  if (fp->num)
+  if (num)
+    rc = mu_stream_printf (outstr, "\n------- Message %d\n", num);
+
+  if (rc == 0)
     {
-      mu_asprintf (&s, "\n------- Message %d\n", fp->num++);
-      rc = mu_stream_write (fp->stream, s, strlen (s), NULL);
-      free (s);
+      if (format)
+	rc = mhl_format_run (format, width, 0, 0, msg, outstr);
+      else
+	rc = msg_copy (msg, outstr);
     }
   
-  if (fp->format)
-    rc = mhl_format_run (fp->format, width, 0, 0, msg, fp->stream);
-  else
-    rc = msg_copy (msg, fp->stream);
+  if (rc)
+    {
+      mu_error (_("cannot copy message: %s"), mu_strerror (rc));
+      exit (1);
+    }
+}
+
+void
+format_message_itr (mu_mailbox_t mbox MU_ARG_UNUSED,
+		    mu_message_t msg, size_t num, void *data)
+{
+  struct format_data *fp = data;
+
+  format_message (fp->stream, msg, fp->num, fp->format);
+  if (fp->num)
+    fp->num++;
 }
 
 void
@@ -317,6 +341,46 @@ finish_draft ()
   struct format_data fd;
   char *str;
   
+  if ((rc = mu_file_stream_create (&stream,
+				   wh_env.file,
+				   MU_STREAM_WRITE|MU_STREAM_CREAT)))
+    {
+      mu_error (_("cannot open output file `%s': %s"),
+		wh_env.file, mu_strerror (rc));
+      exit (1);
+    }
+
+  mu_stream_seek (stream, 0, SEEK_END, NULL);
+
+  if (input_file)
+    {
+      mu_stream_t instr;
+      int rc;
+  
+      if ((rc = mu_file_stream_create (&stream,
+				       wh_env.file,
+				       MU_STREAM_WRITE|MU_STREAM_CREAT)))
+	{
+	  mu_error (_("cannot open output file `%s': %s"),
+		    wh_env.file, mu_strerror (rc));
+	  exit (1);
+	}
+
+      mu_stream_seek (stream, 0, SEEK_END, NULL);
+      
+      rc = mu_file_stream_create (&instr, input_file, MU_STREAM_READ);
+      if (rc)
+	{
+	  mu_diag_funcall (MU_DIAG_ERROR, "mu_file_stream_create",
+			   input_file, rc);
+	  exit (1);
+	}
+      
+      rc = mu_stream_copy (stream, instr, 0, NULL);
+      mu_stream_unref (instr);
+    }
+  else
+    {
       if (!mhl_filter)
 	{
 	  char *s = mh_expand_name (MHLIBDIR, "mhl.forward", 0);
@@ -334,17 +398,6 @@ finish_draft ()
 	  free (s);
 	}
   
-  if ((rc = mu_file_stream_create (&stream,
-				   wh_env.file,
-				   MU_STREAM_WRITE|MU_STREAM_CREAT)))
-    {
-      mu_error (_("cannot open output file `%s': %s"),
-		wh_env.file, mu_strerror (rc));
-      exit (1);
-    }
-
-  mu_stream_seek (stream, 0, SEEK_END, NULL);
-
       if (annotate)
 	{
 	  wh_env.anno_field = "Forwarded";
@@ -359,10 +412,7 @@ finish_draft ()
 	  size_t i;
       
 	  mu_mailbox_get_url (mbox, &url);
-      
-      mbox_path = mu_url_to_string (url);
-      if (memcmp (mbox_path, "mh:", 3) == 0)
-	mbox_path += 3;
+	  mu_url_sget_path (url, &mbox_path);
 	  mu_asprintf (&str, "#forw [] +%s", mbox_path);
 	  rc = mu_stream_write (stream, str, strlen (str), NULL);
 	  free (str);
@@ -376,6 +426,9 @@ finish_draft ()
 		mu_list_append (wh_env.anno_list, msg);
 	      mh_message_number (msg, &num);
 	      p = mu_umaxtostr (0, num);
+	      rc = mu_stream_write (stream, " ", 1, NULL);
+	      if (rc)
+		break;
 	      rc = mu_stream_write (stream, p, strlen (p), NULL);
 	    }
 	}
@@ -398,7 +451,7 @@ finish_draft ()
 	  rc = mu_stream_write (stream, str, strlen (str), NULL);
 	  fd.stream = stream;
 	  fd.format = format;
-      rc = mh_iterate (mbox, &msgset, format_message, &fd);
+	  rc = mh_iterate (mbox, &msgset, format_message_itr, &fd);
       
 	  str = "\n------- ";
 	  rc = mu_stream_write (stream, str, strlen (str), NULL);
@@ -412,6 +465,7 @@ finish_draft ()
 	}
       
       rc = mu_stream_write (stream, "\n\n", 2, NULL);
+    }
   mu_stream_close (stream);
   mu_stream_destroy (&stream);
 }
@@ -431,14 +485,30 @@ main (int argc, char **argv)
   argc -= index;
   argv += index;
 
+  if (input_file)
+    {
+      if (encap == encap_mime)
+	{
+	  mu_error (_("--build disables --mime"));
+	  encap = encap_clear;
+	}
+      if (argc)
+	{
+	  mu_error (_("can't mix files and folders/msgs"));
+	  exit (1);
+	}
+    }
+  else
+    {
       mbox = mh_open_folder (mh_current_folder (), 0);
       mh_msgset_parse (mbox, &msgset, argc, argv, "cur");
+    }
   
   if (build_only || !draftfolder)
     wh_env.file = mh_expand_name (NULL, "draft", 0);
-  else 
+  else if (draftfolder)
     {
-      if (mh_draft_message (NULL, draftmessage, &wh_env.file))
+      if (mh_draft_message (draftfolder, draftmessage, &wh_env.file))
 	return 1;
     }
   wh_env.draftfile = wh_env.file;

@@ -187,6 +187,7 @@ mh_option_init (struct mh_option *opt)
 	    do
 	      {
 		minlen++;
+		if (minlen <= strlen (opt[j].opt))
 		  opt[j].match_len = minlen;
 		if (minlen == sample_len)
 		  break;
@@ -197,6 +198,7 @@ mh_option_init (struct mh_option *opt)
 	  else
 	    break;
 	}
+      if (minlen <= sample_len)
 	opt[i].match_len = minlen;
     }
 }

@@ -44,6 +44,7 @@ TESTSUITE_AT = \
  burst.at\
  comp.at\
  folder.at\
+ forw.at\
  inc.at\
  install-mh.at\
  mark.at\

@@ -143,7 +143,7 @@ Subject: test input
 message body
 ])
 
-MH_CHECK([comp -draftfolder],[comp05 comp-draftfolder],[
+MH_CHECK([comp -draftfolder],[comp05 comp-draftfolder draftfolder],[
 mkdir Mail/drafts
 dir=`pwd`
 echo 'quit' | compcmd -draftfolder drafts | sed "s|$dir/*||;s|  *$||"
@@ -165,7 +165,7 @@ Subject:
 Seen by mhed
 ])
 
-MH_CHECK([comp +draftfolder -use],[comp06 comp-draftfolder-use],[
+MH_CHECK([comp +draftfolder -use],[comp06 comp-draftfolder-use draftfolder],[
 mkdir Mail/drafts
 AT_DATA([Mail/drafts/1],[From: gray
 To: root
@@ -201,3 +201,4 @@ Seen by mhed
 m4_popdef([compcmd])
 m4_popdef([MH_KEYWORDS])
 
+# End of comp.at

+# This file is part of GNU Mailutils. -*- Autotest -*-
+# Copyright (C) 2010 Free Software Foundation, Inc.
+#
+# GNU Mailutils is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 3, or (at
+# your option) any later version.
+#
+# GNU Mailutils is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Mailutils.  If not, see <http://www.gnu.org/licenses/>.
+
+m4_pushdef([MH_KEYWORDS],[forw])
+m4_pushdef([forwcmd],[forw dnl
+-form $abs_top_srcdir/mh/components dnl
+-editor $abs_top_srcdir/mh/tests/mhed])
+
+MH_CHECK([forw msg],[forw00 forw-msg],[
+mkdir Mail/inbox
+AT_DATA([Mail/inbox/1],[From: gray
+To: root
+Subject: test input
+
+message body
+])
+
+dir=`pwd`
+echo quit | forwcmd +inbox 1 | sed "s|$dir/*||;s|  *$||"
+echo == Mail/draft ==
+cat Mail/draft
+echo == Message ==
+# FIXME: AMD adds this header to the first message.  Find a better way.
+# See also the same sed hacks below.
+sed '/^X-IMAPbase/d' Mail/inbox/1
+],
+[0],
+[-- Editor invocation: Mail/draft
+-- Input file:
+To:
+cc:
+Subject:
+--------
+
+------- Forwarded message
+From: gray
+To: root
+Subject: test input
+
+message body
+
+------- End of Forwarded message
+
+-- Input file end
+What now? draft left on "Mail/draft".
+== Mail/draft ==
+To:
+cc:
+Subject:
+--------
+
+------- Forwarded message
+From: gray
+To: root
+Subject: test input
+
+message body
+
+------- End of Forwarded message
+
+Seen by mhed
+== Message ==
+From: gray
+To: root
+Subject: test input
+
+message body
+])
+
+MH_CHECK([forw msgs],[forw01 forw-msgs],[
+mkdir Mail/inbox
+AT_DATA([Mail/inbox/1],[From: gray
+To: root
+Subject: test input
+
+message body
+])
+AT_DATA([Mail/inbox/2],[From: gray
+To: marlow
+Subject: 2nd message
+
+2nd message body
+])
+
+dir=`pwd`
+echo quit | forwcmd +inbox 1 2 | sed "s|$dir/*||;s|  *$||"
+echo == Mail/draft ==
+cat Mail/draft
+echo == Message 1 ==
+sed '/^X-IMAPbase/d' Mail/inbox/1
+echo == Message 2 ==
+cat Mail/inbox/2
+],
+[0],
+[-- Editor invocation: Mail/draft
+-- Input file:
+To:
+cc:
+Subject:
+--------
+
+------- Forwarded messages
+
+------- Message 1
+From: gray
+To: root
+Subject: test input
+
+message body
+
+------- Message 2
+From: gray
+To: marlow
+Subject: 2nd message
+
+2nd message body
+
+------- End of Forwarded messages
+
+-- Input file end
+What now? draft left on "Mail/draft".
+== Mail/draft ==
+To:
+cc:
+Subject:
+--------
+
+------- Forwarded messages
+
+------- Message 1
+From: gray
+To: root
+Subject: test input
+
+message body
+
+------- Message 2
+From: gray
+To: marlow
+Subject: 2nd message
+
+2nd message body
+
+------- End of Forwarded messages
+
+Seen by mhed
+== Message 1 ==
+From: gray
+To: root
+Subject: test input
+
+message body
+== Message 2 ==
+From: gray
+To: marlow
+Subject: 2nd message
+
+2nd message body
+])
+
+MH_CHECK([forw -build msg],[forw02 forw-build-msg],[
+mkdir Mail/inbox
+AT_DATA([Mail/inbox/1],[From: gray
+To: root
+Subject: test input
+
+message body
+])
+
+dir=`pwd`
+forwcmd -build +inbox 1 | sed "s|$dir/*||;s|  *$||"
+echo == Mail/draft ==
+cat Mail/draft
+echo == Message ==
+sed '/^X-IMAPbase/d' Mail/inbox/1
+],
+[0],
+[== Mail/draft ==
+To:
+cc:
+Subject:
+--------
+
+------- Forwarded message
+From: gray
+To: root
+Subject: test input
+
+message body
+
+------- End of Forwarded message
+
+== Message ==
+From: gray
+To: root
+Subject: test input
+
+message body
+])
+
+MH_CHECK([forw -build -mime msgs],[forw03 forw-build-mime-msg],[
+mkdir Mail/inbox
+AT_DATA([Mail/inbox/1],[From: gray
+To: root
+Subject: test input
+
+message body
+])
+AT_DATA([Mail/inbox/2],[From: gray
+To: marlow
+Subject: 2nd message
+
+2nd message body
+])
+
+dir=`pwd`
+forwcmd -build -mime +inbox 1 2 | sed "s|$dir/*||;s|  *$||"
+echo == Mail/draft ==
+sed "s|$dir/*||;s|  *$||" Mail/draft
+echo == Message 1 ==
+sed '/^X-IMAPbase/d' Mail/inbox/1
+echo == Message 2 ==
+cat Mail/inbox/2
+],
+[0],
+[== Mail/draft ==
+To:
+cc:
+Subject:
+--------
+#forw [] +Mail/inbox 1 2
+
+== Message 1 ==
+From: gray
+To: root
+Subject: test input
+
+message body
+== Message 2 ==
+From: gray
+To: marlow
+Subject: 2nd message
+
+2nd message body
+])
+
+MH_CHECK([forw -draftfolder],[forw04 forw-draftfolder draftfolder],[
+mkdir Mail/inbox
+mkdir Mail/drafts
+AT_DATA([Mail/inbox/1],[From: gray
+To: root
+Subject: test input
+
+message body
+])
+
+echo "quit" | forwcmd -draftfolder drafts 1 | sed "s|$dir/*||;s|  *$||"
+echo == Mail/drafts/1 ==
+cat Mail/drafts/1
+echo == Message ==
+sed '/^X-IMAPbase/d' Mail/inbox/1
+],
+[0],
+[-- Editor invocation: Mail/drafts/1
+-- Input file:
+To:
+cc:
+Subject:
+--------
+
+------- Forwarded message
+From: gray
+To: root
+Subject: test input
+
+message body
+
+------- End of Forwarded message
+
+-- Input file end
+What now? draft left on "Mail/drafts/1".
+== Mail/drafts/1 ==
+To:
+cc:
+Subject:
+--------
+
+------- Forwarded message
+From: gray
+To: root
+Subject: test input
+
+message body
+
+------- End of Forwarded message
+
+Seen by mhed
+== Message ==
+From: gray
+To: root
+Subject: test input
+
+message body
+])
+
+MH_CHECK([forw -file],[forw05 forw-file],[
+AT_DATA([infile],[From: gray
+To: root
+Subject: test input
+
+message body
+])
+
+echo "quit" | forwcmd -file infile | sed "s|$dir/*||;s|  *$||"
+],
+[0],
+[-- Editor invocation: Mail/draft
+-- Input file:
+To:
+cc:
+Subject:
+--------
+From: gray
+To: root
+Subject: test input
+
+message body
+-- Input file end
+What now? draft left on "Mail/draft".
+])
+
+m4_popdef([forwcmd])
+m4_popdef([MH_KEYWORDS])
+
+# End of forw.at

@@ -58,3 +58,4 @@ m4_include([anno.at])
 m4_include([pick.at])
 m4_include([burst.at])
 m4_include([comp.at])
+m4_include([forw.at])