summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libmu_cfg/init.c2
-rw-r--r--libmu_sieve/sieve.l4
-rw-r--r--mailbox/cfg_lexer.l13
-rw-r--r--mh/mh_alias.l8
-rw-r--r--mimeview/mimetypes.l4
5 files changed, 25 insertions, 6 deletions
diff --git a/libmu_cfg/init.c b/libmu_cfg/init.c
index e4b36ff29..8fddb14af 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 c66b872a1..17835dae0 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 d15bce13c..8e528f8f8 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 e28da65d1..c38c6e37f 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 c15f1dc0c..6a3c263c8 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>

Return to:

Send suggestions and report system problems to the System administrator.