diff options
| author | Sergey Poznyakoff <gray@gnu.org.ua> | 2011-05-10 15:03:43 +0300 |
|---|---|---|
| committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2011-05-10 17:21:54 +0300 |
| commit | 8b04169265fb9762b2c1dfca3f43068f5b8233be (patch) | |
| tree | 43049c1809b2b70b21ed9300ebdd286d18833c8b /src/wydawca.c | |
| parent | bb242e454d5cf8b0c6bb1ca5d009ec18e86c0c2b (diff) | |
| download | wydawca-8b04169265fb9762b2c1dfca3f43068f5b8233be.tar.gz wydawca-8b04169265fb9762b2c1dfca3f43068f5b8233be.tar.bz2 | |
Update grecs.
* Makefile.am (ChangeLog): Use git2chg.awk.
* bootstrap.conf (gnulib_modules): Don't access grecs/gnulib.modules.
* configure.ac (GRECS_SETUP): Add options.
* gnulib.modules (getopt,gitlog-to-changelog)
(hash,error,version-etc): Remove.
* src/Makefile.am: Remove getopt.m4, use one from grecs.
* src/getopt.m4: Remove.
* src/cmdline.opt: Rewrite.
* src/config.c: Update.
* src/wydawca.h (spool) <aliases>: Change data type.
(all_spool_aliases): Change data type.
(config_finish): New proto.
* src/wydawca.c: Use grecs functions.
* src/dictionary.c: Likewise.
* src/net.c: Likewise.
* src/process.c: Likewise.
* src/mail.c: Use grecs_symtab.
* src/timer.c: Likewise.
* src/triplet.c: Likewise.
Diffstat (limited to 'src/wydawca.c')
| -rw-r--r-- | src/wydawca.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/wydawca.c b/src/wydawca.c index e693bb2..12649d3 100644 --- a/src/wydawca.c +++ b/src/wydawca.c @@ -17,7 +17,6 @@ #include "wydawca.h" #include "mail.h" #include "argmatch.h" -#include "version-etc.h" uid_t wydawca_uid; gid_t wydawca_gid; @@ -44,7 +43,7 @@ int daemon_mode = 0; int foreground; int single_process; time_t wakeup_interval; -gl_list_t all_spool_aliases; +struct grecs_list *all_spool_aliases; char *wydawca_gpg_homedir; char *default_check_script; struct grecs_sockaddr listen_sockaddr; @@ -298,6 +297,8 @@ wydawca_daemon () int main (int argc, char **argv) { + struct grecs_node *tree; + program_name = argv[0]; mu_register_all_mailer_formats (); config_init (); @@ -313,9 +314,13 @@ main (int argc, char **argv) if (preprocess_only) exit (grecs_preproc_run (conffile, grecs_preprocessor) ? EX_CONFIG : 0); - - if (grecs_parse (conffile)) + + tree = grecs_parse (conffile); + if (!tree) exit (EX_CONFIG); + + config_finish (tree); + grecs_tree_free (tree); if (lint_mode) exit (0); |