[SCM] GNU Mailutils branch, master, updated. rel-2_1-22-g67f986c

[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=67f986cb4fa48411010cb962c34600c34b6af146

The branch, master has been updated
       via  67f986cb4fa48411010cb962c34600c34b6af146 (commit)
      from  08b3da3417d572cd3567196c8ccb04ec7f068d8d (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 67f986cb4fa48411010cb962c34600c34b6af146
Author: Sergey Poznyakoff <address@hidden>
Date:   Sat Jan 2 13:23:51 2010 +0200

    Bugfixes
    
    * libmu_cfg/init.c (mu_libcfg_parse_config): Do not produce error
    if user configuration file is absent.
    * libmu_sieve/sieve.l: Include config.h in %top section.
    * mh/mh_alias.l: Likewise.
    * mimeview/mimetypes.l: Likewise.
    * mailbox/cfg_lexer.l: Likewise.
    (mu_get_config): Call mu_cfg_tree_postprocess.

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

Summary of changes:
 libmu_cfg/init.c     |    2 ++
 libmu_sieve/sieve.l  |    4 +++-
 mailbox/cfg_lexer.l  |   13 ++++++++++---
 mh/mh_alias.l        |    8 +++++++-
 mimeview/mimetypes.l |    4 +++-
 5 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/libmu_cfg/init.c b/libmu_cfg/init.c
index e4b36ff..8fddb14 100644
--- a/libmu_cfg/init.c
+++ b/libmu_cfg/init.c
@@ -133,6 +133,8 @@ mu_libcfg_parse_config (mu_cfg_tree_t **ptree)
              mu_cfg_tree_postprocess (tmp, flags);
              mu_cfg_tree_union (&tree, &tmp);
            }
+         else if (rc == ENOENT)
+           rc = 0;
          free (file_name);
        }
     }
diff --git a/libmu_sieve/sieve.l b/libmu_sieve/sieve.l
index c66b872..17835da 100644
--- a/libmu_sieve/sieve.l
+++ b/libmu_sieve/sieve.l
@@ -1,4 +1,4 @@
-%{
+%top {
 /* GNU Mailutils -- a suite of utilities for electronic mail
    Copyright (C) 1999, 2000, 2001, 2002, 2004, 2005,
    2007, 2008, 2009 Free Software Foundation, Inc.
@@ -21,7 +21,9 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif  
+}
 
+%{
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>  
diff --git a/mailbox/cfg_lexer.l b/mailbox/cfg_lexer.l
index d15bce1..8e528f8 100644
--- a/mailbox/cfg_lexer.l
+++ b/mailbox/cfg_lexer.l
@@ -1,4 +1,4 @@
-%{
+%top {
 /* cfg_lexer.l -- default lexer for Mailutils configuration files
    Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc.
 
@@ -18,6 +18,9 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
+}
+
+%{
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/types.h>
@@ -359,8 +362,12 @@ mu_get_config (const char *file, const char *progname,
   mu_cfg_tree_t *parse_tree;
   int rc = mu_cfg_parse_file (&parse_tree, file, flags);
   if (rc == 0)
-    rc = mu_cfg_tree_reduce (parse_tree, progname, progparam, flags,
-                            target_ptr);
+    {
+      rc = mu_cfg_tree_postprocess (&parse_tree, flags);
+      if (rc == 0)
+       rc = mu_cfg_tree_reduce (parse_tree, progname, progparam, flags,
+                                target_ptr);
+    }
 
   mu_cfg_destroy_tree (&parse_tree);
 
diff --git a/mh/mh_alias.l b/mh/mh_alias.l
index e28da65..c38c6e3 100644
--- a/mh/mh_alias.l
+++ b/mh/mh_alias.l
@@ -1,4 +1,4 @@
-%{
+%top {
 /* GNU Mailutils -- a suite of utilities for electronic mail
    Copyright (C) 2003, 2005, 2006, 2007, 2009 Free Software Foundation, Inc.
 
@@ -17,6 +17,12 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
    MA 02110-1301 USA */
 
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+}
+
+%{
 #include <mh.h>
 #include <mh_alias.h>
 #include <sys/stat.h>
diff --git a/mimeview/mimetypes.l b/mimeview/mimetypes.l
index c15f1dc..6a3c263 100644
--- a/mimeview/mimetypes.l
+++ b/mimeview/mimetypes.l
@@ -1,4 +1,4 @@
-%{
+%top {
 /* GNU Mailutils -- a suite of utilities for electronic mail
    Copyright (C) 2005, 2007, 2009 Free Software Foundation, Inc.
 
@@ -20,7 +20,9 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
+}
 
+%{
 #include <unistd.h>
 #include <stdio.h>
 #include <sys/stat.h>


hooks/post-receive
-- 
GNU Mailutils