Merge branch 'master' into locus

14 files changed, 431 insertions, 73 deletions

diff --git a/NEWS b/NEWS
index 266a99912..e35169161 100644
--- a/NEWS
+++ b/NEWS
@@ -1,2 +1,2 @@
-GNU mailutils NEWS -- history of user-visible changes. 2017-06-01
+GNU mailutils NEWS -- history of user-visible changes. 2017-06-16
 Copyright (C) 2002-2017 Free Software Foundation, Inc.
@@ -77,2 +77,9 @@ section is not defined.
 
+* Source location API
+
+Libmailutils provides functions for keeping track of locations in
+source files for diagnostic purposes.
+
+* Improve error reporting
+
 * AM_GNU_MAILUTILS autoconf macro
diff --git a/mh/comp.c b/mh/comp.c
index 075bb4516..29389c69e 100644
--- a/mh/comp.c
+++ b/mh/comp.c
@@ -129,2 +129,8 @@ copy_message (mu_mailbox_t mbox, size_t n, const char *file)
 
+static struct mh_optinit optinit[] = {
+  { "draftfolder", "Draft-Folder" },
+  { "whatnowproc", "whatnowproc" },
+  { NULL }
+};
+
 int
@@ -132,8 +138,3 @@ main (int argc, char **argv)
 {
-  mh_getopt (&argc, &argv, options, 0, args_doc, prog_doc, NULL);
-
-  if (!draftfolder)
-    draftfolder = mh_global_profile_get ("Draft-Folder", NULL);
-  if (!whatnowproc)
-    whatnowproc = mh_global_profile_get ("whatnowproc", NULL);
+  mh_getopt_ext (&argc, &argv, options, 0, optinit, args_doc, prog_doc, NULL);
 
diff --git a/mh/forw.c b/mh/forw.c
index 5e0e08b97..016ac84bc 100644
--- a/mh/forw.c
+++ b/mh/forw.c
@@ -379,2 +379,8 @@ finish_draft ()
 
+static struct mh_optinit optinit[] = {
+  { "draftfolder", "Draft-Folder" },
+  { "whatnowproc", "whatnowproc" },
+  { NULL }
+};
+
 int
@@ -384,8 +390,4 @@ main (int argc, char **argv)
 
-  mh_getopt (&argc, &argv, options, MH_GETOPT_DEFAULT_FOLDER,
-             args_doc, prog_doc, NULL);
-  if (!draftfolder)
-    draftfolder = mh_global_profile_get ("Draft-Folder", NULL);
-  if (!whatnowproc)
-    whatnowproc = mh_global_profile_get ("whatnowproc", NULL);
+  mh_getopt_ext (&argc, &argv, options, MH_GETOPT_DEFAULT_FOLDER, optinit,
+                 args_doc, prog_doc, NULL);
   if (!formfile)
diff --git a/mh/mh.h b/mh/mh.h
index 69be72de2..76bc85e37 100644
--- a/mh/mh.h
+++ b/mh/mh.h
@@ -344,3 +344,7 @@ char *mh_draft_name (void);
 char *mh_create_message_id (int);
-int mh_whom (const char *filename, int check);
+
+int mh_whom_header (mu_header_t hdr);
+int mh_whom_file (const char *filename, int check);
+int mh_whom_message (mu_message_t msg, int check);
+
 void mh_set_reply_regex (const char *str);
diff --git a/mh/mh_alias_gram.y b/mh/mh_alias_gram.y
index d7229983a..26b13ec83 100644
--- a/mh/mh_alias_gram.y
+++ b/mh/mh_alias_gram.y
@@ -504,2 +504,5 @@ mh_read_aliases (void)
   const char *p;
+
+  if (alias_list)
+    return 0;
   
diff --git a/mh/mh_getopt.c b/mh/mh_getopt.c
index 65fe3e8c7..16a6e5c55 100644
--- a/mh/mh_getopt.c
+++ b/mh/mh_getopt.c
@@ -181,6 +181,35 @@ has_folder_option (struct mu_option *opt)
 
+static void
+opt_init (struct mu_parseopt *po,
+          struct mu_option **optv, struct mh_optinit *optinit)
+{
+  if (!optinit)
+    return;
+  for (; optinit->opt; optinit++)
+    {
+      size_t i;
+      for (i = 0; optv[i]; i++)
+        {
+          struct mu_option *opt;
+          for (opt = optv[i]; !MU_OPTION_IS_END (opt); opt++)
+            {
+              if (strcmp (opt->opt_long, optinit->opt) == 0)
+                {
+                  char const *val = mh_global_profile_get (optinit->var, NULL);
+                  if (val)
+                    {
+                      (opt->opt_set ?
+                       opt->opt_set : mu_option_set_value) (po, opt, val);
+                    }
+                  break;
+                }
+            }
+        }
+    }
+}
+
 void
-mh_getopt (int *pargc, char ***pargv, struct mu_option *options,
-           int mhflags,
-           char *argdoc, char *progdoc, char *extradoc)
+mh_getopt_ext (int *pargc, char ***pargv, struct mu_option *options,
+               int mhflags, struct mh_optinit *optinit,
+               char *argdoc, char *progdoc, char *extradoc)
 {
@@ -258,2 +287,3 @@ mh_getopt (int *pargc, char ***pargv, struct mu_option *options,
   optv[i] = NULL;
+  opt_init (&po, optv, optinit);
   
@@ -287,2 +317,10 @@ mh_getopt (int *pargc, char ***pargv, struct mu_option *options,
 void
+mh_getopt (int *pargc, char ***pargv, struct mu_option *options,
+           int mhflags, char *argdoc, char *progdoc, char *extradoc)
+{
+  mh_getopt_ext (pargc, pargv, options, mhflags, NULL, argdoc, progdoc,
+                 extradoc);
+}
+
+void
 mh_opt_notimpl (struct mu_parseopt *po, struct mu_option *opt, char const *arg)
diff --git a/mh/mh_getopt.h b/mh/mh_getopt.h
index 2aa90b669..684ace678 100644
--- a/mh/mh_getopt.h
+++ b/mh/mh_getopt.h
@@ -22,5 +22,14 @@
 
+struct mh_optinit
+{
+  char const *opt;   /* Option name */
+  char const *var;   /* mh_property name */
+};
+
+void mh_getopt_ext (int *pargc, char ***pargv, struct mu_option *options,
+                    int mhflags, struct mh_optinit *optinit,
+                    char *argdoc, char *progdoc, char *extradoc);
+
 void mh_getopt (int *pargc, char ***pargv, struct mu_option *options,
-                int flags,
-                char *argdoc, char *progdoc, char *extradoc);
+                int flags, char *argdoc, char *progdoc, char *extradoc);
 
diff --git a/mh/mh_whatnow.c b/mh/mh_whatnow.c
index 5dc15b553..0bd2acabe 100644
--- a/mh/mh_whatnow.c
+++ b/mh/mh_whatnow.c
@@ -546,5 +546,6 @@ whom (struct mh_whatnow_env *wh, int argc, char **argv, int *status)
   else
-    mh_whom (wh->file, (argc == 2
-                        && (strcmp (argv[1], "-check") == 0
-                            || strcmp (argv[1], "--check") == 0)));
+    mh_whom_file (wh->file,
+                  (argc == 2
+                   && (strcmp (argv[1], "-check") == 0
+                       || strcmp (argv[1], "--check") == 0)));
   return 0;
diff --git a/mh/mh_whom.c b/mh/mh_whom.c
index bbdef7ac5..f3067d1ab 100644
--- a/mh/mh_whom.c
+++ b/mh/mh_whom.c
@@ -263,3 +263,42 @@ read_header (mu_stream_t stream)
 int
-mh_whom (const char *filename, int check)
+mh_whom_header (mu_header_t hdr)
+{
+  size_t count = 0;
+  int rc;
+  const char *val;
+
+  mh_read_aliases ();
+
+  if (mu_header_sget_value (hdr, MU_HEADER_TO, &val) == 0)
+    scan_addrs (val, 0);
+  if (mu_header_sget_value (hdr, MU_HEADER_CC, &val) == 0)
+    scan_addrs (val, 0);
+  if (mu_header_sget_value (hdr, MU_HEADER_BCC, &val) == 0)
+    scan_addrs (val, 1);
+
+  if (local_rcp)
+    {
+      printf ("  %s\n", _("-- Local Recipients --"));
+      mu_list_foreach (local_rcp, _print_local_recipient, &count);
+    }
+
+  if (network_rcp)
+    {
+      printf ("  %s\n", _("-- Network Recipients --"));
+      mu_list_foreach (network_rcp, _print_recipient, &count);
+    }
+
+  if (count == 0)
+    {
+      mu_error(_("no recipients"));
+      rc = -1;
+    }
+
+  destroy_addrs (&network_rcp);
+  destroy_addrs (&local_rcp);
+  return rc;
+}
+
+int
+mh_whom_file (const char *filename, int check)
 {
@@ -274,3 +313,2 @@ mh_whom (const char *filename, int check)
     {
-      size_t count = 0;
       mu_header_t hdr;