17 files changed, 885 insertions, 150 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 7ba9832..903b754 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -25,8 +25,11 @@ wydawca_SOURCES=\
  exec.c\
  gpg.c\
  interval.c\
+ job.c\
  meta.c\
  method.c\
+ net.c\
+ pidfile.c\
  process.c\
  sql.c\
  sql.h\
@@ -56,6 +59,7 @@ LDADD=../gconf/libgconf.a ../gnu/libgnu.a @SQLLIB@ @GPGMELIB@ @MAILUTILS_LIBS@
 INCLUDES = -I$(top_srcdir)/gconf -I$(top_srcdir)/gnu -I../gnu @MAILUTILS_INCLUDES@
 AM_CPPFLAGS= \
  -DSYSCONFDIR=\"$(sysconfdir)\"\
+ -DLOCALSTATEDIR=\"$(localstatedir)\"\
  -DDEFAULT_VERSION_INCLUDE_DIR=\"$(incdir)\"\
  -DDEFAULT_INCLUDE_DIR=\"$(pkgdatadir)/include\"\
  -DDEFAULT_PREPROCESSOR="$(DEFAULT_PREPROCESSOR)"
diff --git a/src/cmdline.opt b/src/cmdline.opt
index 53bdd00..b61517b 100644
--- a/src/cmdline.opt
+++ b/src/cmdline.opt
@@ -18,6 +18,7 @@ static struct obstack pp_cmd_stack;
 static int pp_cmd_stack_init;
 
 static gl_list_t source_list;
+static gl_list_t tag_list;
 
 static bool
 source_eq (const void *elt1, const void *elt2)
@@ -28,9 +29,10 @@ source_eq (const void *elt1, const void *elt2)
 int
 enabled_spool_p (const struct spool *spool)
 {
-  if (!source_list)
-    return 1;
-  return !!gl_list_search (source_list, spool->source_dir);
+  if (source_list || tag_list)
+    return (source_list && gl_list_search (source_list, spool->source_dir))
+            || (tag_list && gl_list_search (tag_list, spool->tag));
+  return 1;     
 }
 
 OPTIONS_BEGIN(gnu, "wydawca",
@@ -61,12 +63,47 @@ BEGIN
         dry_run_mode = 1;
 END
 
+OPTION(cron,,,
+       [<force cron mode>])
+BEGIN
+        cron_option = 1;
+        log_to_stderr = 0;
+END
+
+OPTION(force,,,
+       [<force start up even if the pid file already exists>])
+BEGIN
+        force_startup = 1;
+END     
+
+OPTION(foreground,,,
+       [<foreground mode>])
+BEGIN
+        foreground_option = 1;
+END
+
+OPTION(single-process,,,
+       [<single process mode>])
+BEGIN
+        single_process_option = 1;
+END     
+
 OPTION(config-file,c,FILE,
        [<use FILE instead of the default configuration>])
 BEGIN
         conffile = optarg;
 END
 
+OPTION(spool,S,TAG,
+       [<process only spool with the given tag>])
+BEGIN
+        if (!tag_list)
+          tag_list = gl_list_create_empty (&gl_linked_list_implementation,
+                                           source_eq, NULL,
+                                           NULL, false);
+        gl_list_add_last (tag_list, optarg);   
+END
+
 OPTION(source,s,SOURCE-DIR,
        [<process only spool with the given source (may be used multiple times)>])
 BEGIN
@@ -79,9 +116,8 @@ END
 
 GROUP(Logging)
 
-OPTION(cron,,,
-       [<log to syslog>])
-ALIAS(syslog)
+OPTION(syslog,,,
+       [<log to syslog>])       
 BEGIN
         log_to_stderr = 0;
 END
diff --git a/src/config.c b/src/config.c
index dd444fe..94afb20 100644
--- a/src/config.c
+++ b/src/config.c
@@ -263,11 +263,6 @@ cb_mailer (enum gconf_callback_command cmd,
 
   if (assert_string_arg (locus, cmd, value))
     return 1;
-  if (cmd != gconf_callback_set_value)
-    {
-      gconf_error (locus, 0, _("Unexpected block statement"));
-      return 1;
-    }
   rc = mu_mailer_create (&mailer, value->v.string);
   if (rc)
     gconf_error (locus, 0, _("cannot create mailer `%s': %s"),
@@ -1085,22 +1080,17 @@ cb_access_method (enum gconf_callback_command cmd,
 }
 
 static int
-cb_destination_url (enum gconf_callback_command cmd,
-                    gconf_locus_t *locus,
-                    void *varptr,
-                    gconf_value_t *value,
-                    void *cb_data)
+cb_url (enum gconf_callback_command cmd,
+        gconf_locus_t *locus,
+        void *varptr,
+        gconf_value_t *value,
+        void *cb_data)
 {
   mu_url_t *purl = varptr, url;
   int rc;
 
   if (assert_string_arg (locus, cmd, value))
     return 1;
-  if (cmd != gconf_callback_set_value)
-    {
-      gconf_error (locus, 0, _("Unexpected block statement"));
-      return 1;
-    }
   rc = mu_url_create (&url, value->v.string);
   if (rc)
     {
@@ -1122,11 +1112,15 @@ cb_destination_url (enum gconf_callback_command cmd,
 
 
 static struct gconf_keyword spool_kw[] = {
+  { "url", N_("arg"), N_("URL corresponding to this spool"),
+    gconf_type_string, NULL, offsetof(struct spool, url) },
+  { "alias", N_("arg"), N_("Aliases"),
+    gconf_type_string|GCONF_LIST, NULL, offsetof(struct spool, aliases) },
   { "source", N_("dir"), N_("Source directory"),
     gconf_type_string, NULL, offsetof(struct spool, source_dir) },
   { "destination", N_("dir"), N_("Destination directory"),
     gconf_type_string, NULL, offsetof(struct spool, dest_url),
-    cb_destination_url },
+    cb_url },
   { "file-sweep-time", N_("interval"), N_("Define file sweep time"),
     gconf_type_string, NULL, offsetof(struct spool, file_sweep_time),
     cb_interval },
@@ -1164,7 +1158,7 @@ cb_spool (enum gconf_callback_command cmd,
           return 1;
         }
       spool = xzalloc (sizeof (*spool));
-      spool->url = xstrdup (value->v.string);
+      spool->tag = xstrdup (value->v.string);
       spool->file_sweep_time = file_sweep_time;
       for (i = 0; i < NITEMS (spool->access_method); i++)
         spool->access_method[i] = default_access_method[i];
@@ -1233,6 +1227,18 @@ cb_spool (enum gconf_callback_command cmd,
 
 
 static struct gconf_keyword wydawca_kw[] = {
+  { "daemon", NULL, N_("Enable daemon mode"),
+    gconf_type_bool, &daemon_mode },
+  { "foreground", NULL, N_("Start in foreground even in daemon mode"),
+    gconf_type_bool, &foreground },
+  { "single-process", NULL, N_("Do not spawn subprocesses"),
+    gconf_type_bool, &single_process },
+  { "wakeup-interval", N_("time"), N_("Set wake-up interval"),
+    gconf_type_string, &wakeup_interval, 0, cb_interval },
+  { "pidfile", N_("file"), N_("Set pid file name"),
+    gconf_type_string, &pidfile },
+  { "listen", N_("socket"), N_("Listen on this address"),
+    gconf_type_sockaddr, &listen_sockaddr, },
   { "mailer", N_("url"), N_("Set mailer URL"),