summaryrefslogtreecommitdiffabout
authorSergey Poznyakoff <gray@gnu.org>2017-06-15 19:09:30 (GMT)
committer Sergey Poznyakoff <gray@gnu.org.ua>2017-06-16 06:50:36 (GMT)
commitc1f2442cd53e43cf11cc8f5b649b454b3f2cb03f (patch) (side-by-side diff)
tree6ef0b4a8d01cb81d8f4f1ae2757ad4047ebb03f5
parent8b5715db380634336a231b0c8573c350992c8dce (diff)
parentfe90e86dac8c9c91a35347ee5bb4513195263ee2 (diff)
downloadmailutils-c1f2442cd53e43cf11cc8f5b649b454b3f2cb03f.tar.gz
mailutils-c1f2442cd53e43cf11cc8f5b649b454b3f2cb03f.tar.bz2
Merge branch 'master' into locus
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--NEWS9
-rw-r--r--mh/comp.c13
-rw-r--r--mh/forw.c14
-rw-r--r--mh/mh.h6
-rw-r--r--mh/mh_alias_gram.y3
-rw-r--r--mh/mh_getopt.c44
-rw-r--r--mh/mh_getopt.h13
-rw-r--r--mh/mh_whatnow.c7
-rw-r--r--mh/mh_whom.c86
-rw-r--r--mh/repl.c16
-rw-r--r--mh/tests/comp.at43
-rw-r--r--mh/tests/forw.at123
-rw-r--r--mh/tests/repl.at64
-rw-r--r--mh/whom.c63
14 files changed, 431 insertions, 73 deletions
diff --git a/NEWS b/NEWS
index 266a999..e351691 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 075bb45..29389c6 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 5e0e08b..016ac84 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 69be72d..76bc85e 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 d722998..26b13ec 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 65fe3e8..16a6e5c 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 2aa90b6..684ace6 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 5dc15b5..0bd2aca 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 bbdef7a..f3067d1 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;
@@ -278,3 +316,2 @@ mh_whom (const char *filename, int check)
int rc;
- const char *val;
@@ -290,33 +327,24 @@ mh_whom (const char *filename, int check)
- 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);
- }
+ rc = mh_whom_header (hdr);
+ mu_header_destroy (&hdr);
+ }
+ return rc;
+}
- if (network_rcp)
- {
- printf (" %s\n", _("-- Network Recipients --"));
- mu_list_foreach (network_rcp, _print_recipient, &count);
- }
+int
+mh_whom_message (mu_message_t msg, int check)
+{
+ mu_header_t hdr;
+ int rc;
- if (count == 0)
- {
- mu_error(_("no recipients"));
- rc = -1;
- }
+ rc = mu_message_get_header (msg, &hdr);
+ if (rc)
+ mu_error (_("can't get headers: %s"), mu_strerror (rc));
+ else
+ {
+ rc = mh_whom_header (hdr);
mu_header_destroy (&hdr);
}
- destroy_addrs (&network_rcp);
- destroy_addrs (&local_rcp);
return rc;
}
+
diff --git a/mh/repl.c b/mh/repl.c
index 1cc1929..169f977 100644
--- a/mh/repl.c
+++ b/mh/repl.c
@@ -291,2 +291,8 @@ make_draft (mu_mailbox_t mbox, int disp, struct mh_whatnow_env *wh)
+static struct mh_optinit optinit[] = {
+ { "draftfolder", "Draft-Folder" },
+ { "whatnowproc", "whatnowproc" },
+ { NULL }
+};
+
int
@@ -296,10 +302,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);
diff --git a/mh/tests/comp.at b/mh/tests/comp.at
index 563310c..7a63e5f 100644
--- a/mh/tests/comp.at
+++ b/mh/tests/comp.at
@@ -195,2 +195,45 @@ Seen by mhed
+MH_CHECK([use Draft-Folder],[comp07 draftfolder],
+[mkdir Mail/drafts
+echo "Draft-Folder: +drafts" >> $MH
+echo 'quit' | compcmd | cwdrepl
+sed 's/ *$//' Mail/drafts/1
+],
+[0],
+[-- Editor invocation: ./Mail/drafts/1
+-- Input file:
+To:
+cc:
+Subject:
+--------
+-- Input file end
+What now? draft left on "./Mail/drafts/1".
+To:
+cc:
+Subject:
+--------
+Seen by mhed
+])
+
+MH_CHECK([-nodraftfolder],[comp08 nodraftfolder draftfolder],
+[mkdir Mail/drafts
+echo "Draft-Folder: +drafts" >> $MH
+echo 'quit' | compcmd -nodraftfolder | cwdrepl
+sed 's/ *$//' Mail/draft
+],
+[0],
+[-- Editor invocation: ./Mail/draft
+-- Input file:
+To:
+cc:
+Subject:
+--------
+-- Input file end
+What now? draft left on "./Mail/draft".
+To:
+cc:
+Subject:
+--------
+Seen by mhed
+])
diff --git a/mh/tests/forw.at b/mh/tests/forw.at
index e0566df..f668a33 100644
--- a/mh/tests/forw.at
+++ b/mh/tests/forw.at
@@ -399,2 +399,125 @@ What now? draft left on "./Mail/draft".
+MH_CHECK([Draft-Folder],[forw07 forw-draftfolder draftfolder],[
+mkdir Mail/inbox
+mkdir Mail/drafts
+echo "Draft-Folder: +drafts" >> $MH
+
+AT_DATA([Mail/inbox/1],[From: gray
+To: root
+Subject: test input
+
+message body
+])
+
+echo "quit" | forwcmd 1 | cwdrepl
+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([-nodraftfolder],[forw08 forw-nodraftfolder nodraftfolder draftfolder],[
+mkdir Mail/inbox
+mkdir Mail/drafts
+echo "Draft-Folder: +drafts" >> $MH
+
+AT_DATA([Mail/inbox/1],[From: gray
+To: root
+Subject: test input
+
+message body
+])
+
+echo "quit" | forwcmd -nodraftfolder 1 | cwdrepl
+echo == Mail/draft ==
+cat Mail/draft
+echo == Message ==
+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
+])
+
+
m4_popdef([forwcmd])
diff --git a/mh/tests/repl.at b/mh/tests/repl.at
index bd58e9f..f8a194c 100644
--- a/mh/tests/repl.at
+++ b/mh/tests/repl.at
@@ -81,2 +81,66 @@ Seen by mhed
+MH_CHECK([Draft-Folder],[repl02 repl-draftfolder draftfolder],[
+mkdir Mail/inbox
+mkdir Mail/drafts
+echo "Draft-Folder: +drafts" >> $MH
+
+AT_DATA([Mail/inbox/1],[From: gray@example.com
+To: root@example.com
+Subject: test input
+
+message body
+])
+echo "quit" | replcmd +inbox 1 | cwdrepl
+echo == Mail/drafts/1 ==
+cat Mail/drafts/1
+],
+[0],
+[-- Editor invocation: ./Mail/drafts/1
+-- Input file:
+To: <gray@example.com>
+Subject: Re: test input
+X-Mailer: MH (AT_PACKAGE_NAME AT_PACKAGE_VERSION)
+--------
+-- Input file end
+What now? draft left on "./Mail/drafts/1".
+== Mail/drafts/1 ==
+To: <gray@example.com>
+Subject: Re: test input
+X-Mailer: MH (AT_PACKAGE_NAME AT_PACKAGE_VERSION)
+--------
+Seen by mhed
+])
+
+MH_CHECK([-nodraftfolder],[repl03 repl-nodraftfolder nodraftfolder draftfolder],[
+mkdir Mail/inbox
+mkdir Mail/drafts
+echo "Draft-Folder: +drafts" >> $MH
+
+AT_DATA([Mail/inbox/1],[From: gray@example.com
+To: root@example.com
+Subject: test input
+
+message body
+])
+echo "quit" | replcmd -nodraftfolder +inbox 1 | cwdrepl
+echo == Mail/draft ==
+cat Mail/draft
+],
+[0],
+[-- Editor invocation: ./Mail/draft
+-- Input file:
+To: <gray@example.com>
+Subject: Re: test input
+X-Mailer: MH (AT_PACKAGE_NAME AT_PACKAGE_VERSION)
+--------
+-- Input file end
+What now? draft left on "./Mail/draft".
+== Mail/draft ==
+To: <gray@example.com>
+Subject: Re: test input
+X-Mailer: MH (AT_PACKAGE_NAME AT_PACKAGE_VERSION)
+--------
+Seen by mhed
+])
+
m4_popdef([replcmd])
diff --git a/mh/whom.c b/mh/whom.c
index 7c3c5ab..97deabb 100644
--- a/mh/whom.c
+++ b/mh/whom.c
@@ -23,3 +23,3 @@ static char args_doc[] = "[FILE]";
static int check_recipients;
-static int use_draft; /* Use the prepared draft */
+static char *message;
static const char *draft_folder; /* Use this draft folder */
@@ -47,3 +47,3 @@ static struct mu_option options[] = {
N_("use prepared draft"),
- mu_c_bool, &use_draft },
+ mu_c_string, &message, NULL, "draft" },
{ "draftfolder", 0, N_("FOLDER"), MU_OPTION_DEFAULT,
@@ -62,2 +62,7 @@ static struct mu_option options[] = {
};
+
+static struct mh_optinit optinit[] = {
+ { "draftfolder", "Draft-Folder" },
+ { NULL }
+};
@@ -66,16 +71,46 @@ main (int argc, char **argv)
{
- char *name = "draft";
-
- mh_getopt (&argc, &argv, options, 0, args_doc, prog_doc, NULL);
+ int rc;
+
+ mh_getopt_ext (&argc, &argv, options, 0, optinit, args_doc, prog_doc, NULL);
- if (!use_draft && argc > 0)
- name = argv[0];
+ if (draft_folder)
+ {
+ mu_mailbox_t mbox = mh_open_folder (draft_folder, MU_STREAM_READ);
+ mu_msgset_t msgset;
+ size_t msgno;
+ mu_message_t msg;
+
+ mh_msgset_parse (&msgset, mbox, argc, argv, "cur");
+ if (!mh_msgset_single_message (msgset))
+ {
+ mu_error (_("only one message at a time!"));
+ return 1;
+ }
+ msgno = mh_msgset_first (msgset, RET_MSGNO);
+ rc = mu_mailbox_get_message (mbox, msgno, &msg);
+ if (rc)
+ {
+ mu_error (_("can't read message: %s"), mu_strerror (rc));
+ exit (1);
+ }
+ rc = mh_whom_message (msg, check_recipients);
+ }
+ else
+ {
+ if (argc > 0)
+ {
+ if (message || argc > 1)
+ {
+ mu_error (_("only one file at a time!"));
+ exit (1);
+ }
+ message = argv[0];
+ }
+ else
+ message = "draft";
+ rc = mh_whom_file (mh_expand_name (draft_folder, message, NAME_ANY),
+ check_recipients);
+ }
- if (!draft_folder)
- draft_folder = mh_global_profile_get ("Draft-Folder",
- mu_folder_directory ());
-
-
- return mh_whom (mh_expand_name (draft_folder, name, NAME_ANY),
- check_recipients) ? 1 : 0;
+ return rc ? 1 : 0;
}

Return to:

Send suggestions and report system problems to the System administrator.