[SCM] GNU Mailutils branch, master, updated. release-2.2-793-gd8194bb

[Sergey Poznyakoff]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Mailutils".

http://git.savannah.gnu.org/cgit/mailutils.git/commit/?id=d8194bb31044d2140a7b3c0e877ae59c20152a35

The branch, master has been updated
       via  d8194bb31044d2140a7b3c0e877ae59c20152a35 (commit)
      from  97fb4785661350ab0ff8ae5605d1bdf7f6566386 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d8194bb31044d2140a7b3c0e877ae59c20152a35
Author: Sergey Poznyakoff <address@hidden>
Date:   Sat Oct 22 21:00:45 2016 +0300

    Bugfixes
    
    * libmailutils/cli/cli.c (mu_cli_ext): Initialize hints.data
    (accidentally deleted).
    * libmailutils/opt/help.c (mu_option_describe_options): Don't
    display dup_args_note in single-dash mode.
    * libmailutils/opt/progname.c (mu_set_program_name): Free the
    old value after allocating new copy.  This allows to pass
    mu_full_program_name as argument.  Set mu_program_name to point
    to a segment of mu_full_program_name, not the original arg.
    * mh/mh_getopt.c: Remove duplicate version option.
    * po/POTFILES.in: Add missing files.

-----------------------------------------------------------------------

Summary of changes:
 libmailutils/cli/cli.c      |    2 ++
 libmailutils/opt/help.c     |    2 +-
 libmailutils/opt/progname.c |    5 +++--
 mh/mh_getopt.c              |   15 ---------------
 mu/dispatch.c               |    2 +-
 po/POTFILES.in              |    5 +++++
 6 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/libmailutils/cli/cli.c b/libmailutils/cli/cli.c
index bf3edae..8432aa3 100644
--- a/libmailutils/cli/cli.c
+++ b/libmailutils/cli/cli.c
@@ -375,6 +375,8 @@ mu_cli_ext (int argc, char **argv,
     setup->ex_config = EX_CONFIG;
 
   hints = *cfhint;
+  hints.data = setup;
+  
   /* Set program name */
   if (hints.flags & MU_CFG_PARSE_PROGRAM)
     {
diff --git a/libmailutils/opt/help.c b/libmailutils/opt/help.c
index 9ad20f0..538e311 100644
--- a/libmailutils/opt/help.c
+++ b/libmailutils/opt/help.c
@@ -334,7 +334,7 @@ mu_option_describe_options (mu_stream_t str, struct 
mu_parseopt *po)
     i = print_option (str, po, i, &argsused);
   mu_stream_printf (str, "\n");
 
-  if (argsused && dup_args_note)
+  if (argsused && !(po->po_flags & MU_PARSEOPT_SINGLE_DASH) && dup_args_note)
     {
       set_margin (str, 0);
       mu_stream_printf (str, "%s\n\n",
diff --git a/libmailutils/opt/progname.c b/libmailutils/opt/progname.c
index 0d19773..7652387 100644
--- a/libmailutils/opt/progname.c
+++ b/libmailutils/opt/progname.c
@@ -30,10 +30,11 @@ mu_set_program_name (const char *arg)
 {
   char *p;
 
+  p = mu_strdup (arg);
   free (mu_full_program_name);
-  mu_full_program_name = mu_strdup (arg);
+  mu_full_program_name = p;
   
-  p = strrchr (arg, '/');
+  p = strrchr (mu_full_program_name, '/');
   if (p)
     ++p;
   else
diff --git a/mh/mh_getopt.c b/mh/mh_getopt.c
index bddd942..13feda9 100644
--- a/mh/mh_getopt.c
+++ b/mh/mh_getopt.c
@@ -164,20 +164,6 @@ There is NO WARRANTY, to the extent permitted by law.\n\
 "));
 }
 
-static void
-fn_version (struct mu_parseopt *po, struct mu_option *opt, char const *unused)
-{
-  mu_program_version (po, mu_strout);
-  exit (0);
-}
-
-static struct mu_option version_option[] = {
-  { "version", 0, NULL, MU_OPTION_DEFAULT,
-    N_("print program version"),
-    mu_c_string, NULL, fn_version },
-  MU_OPTION_END
-};
-
 void
 mh_getopt (int *pargc, char ***pargv, struct mu_option *options,
           int mhflags,
@@ -248,7 +234,6 @@ mh_getopt (int *pargc, char ***pargv, struct mu_option 
*options,
     optv[i++] = folder_option;
   if (options)
     optv[i++] = options;
-  optv[i++] = version_option;
   optv[i] = NULL;
   
   if (mu_parseopt (&po, argc, argv, optv, flags))
diff --git a/mu/dispatch.c b/mu/dispatch.c
index cd27a66..6054e7a 100644
--- a/mu/dispatch.c
+++ b/mu/dispatch.c
@@ -54,7 +54,7 @@ subcommand_help (mu_stream_t str)
 {
   struct mutool_action_tab *p;
   unsigned margin;
-  
+
   mu_stream_printf (str, "%s\n\n", _("Commands are:"));
   for (p = mutool_action_tab; p->name; p++)
     {
diff --git a/po/POTFILES.in b/po/POTFILES.in
index e75a7d9..0f08d37 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -104,6 +104,11 @@ libmailutils/diag/errors
 libmailutils/opt/opt.c
 libmailutils/opt/help.c
 
+libmailutils/cli/acl.c
+libmailutils/cli/capa.c
+libmailutils/cli/cli.c
+libmailutils/cli/stdcapa.c
+
 libmailutils/server/acl.c
 
 libmailutils/stream/file_stream.c


hooks/post-receive
-- 
GNU Mailutils