Improve daemon mode.

* gconf/gconf-gram.y: Provide created lists with appropriate equal tests.
Special handling for lists of strings.
* src/cmdline.opt: Minor fix.
* src/config.c: New keyword all-spools.
* src/job.c: Hanlde "all spools" requests.
* src/net.c: Likewise.
* src/process.c (spool_check_alias): Rewrite using gl_list_search
(scan_directories): Rename to scan_all_spools.
(spool_create_timers): New function.
* src/wydawca.c (all_spool_aliases): New global.
(initstats): New function.
* src/wydawca.h: Add new declarations.

8 files changed, 154 insertions, 70 deletions

diff --git a/gconf/gconf-gram.y b/gconf/gconf-gram.y
index f7ee710..66b5416 100644
--- a/gconf/gconf-gram.y
+++ b/gconf/gconf-gram.y
@@ -708,29 +708,62 @@ string_convert (void *target, enum gconf_data_type type, const char *string)
   return 0;
 }
 
-size_t gconf_type_size_tab[] = {
-  0                        /* gconf_type_void */,
-  sizeof (char*)            /* gconf_type_string */,
-  sizeof (short)            /* gconf_type_short */,
-  sizeof (unsigned short)   /* gconf_type_ushort */,
-  sizeof (int)              /* gconf_type_int */,
-  sizeof (unsigned int)     /* gconf_type_uint */,
-  sizeof (long)             /* gconf_type_long */,
-  sizeof (unsigned long)    /* gconf_type_ulong */,
-  sizeof (size_t)           /* gconf_type_size */,
+struct gconf_prop
+{
+  size_t size;
+  gl_listelement_equals_fn eqfn;
+};
+
+static bool
+string_eq (const void *elt1, const void *elt2)
+{
+  return strcmp ((const char *)elt1, (const char *)elt2) == 0;
+}
+
+#define __gconf_name_cat__(a,b) a ## b
+#define NUMEQ(type) __gconf_name_cat__(type,_eq)
+#define __DECL_NUMEQ(type,ctype)                        \
+  static bool                                           \
+  NUMEQ(type) (const void *elt1, const void *elt2)      \
+  {                                                     \
+    return memcmp (elt1, elt2, sizeof (ctype)) == 0;    \
+  }
+#define DECL_NUMEQ(type) __DECL_NUMEQ(type,type)
+
+DECL_NUMEQ(short)
+DECL_NUMEQ(int)
+DECL_NUMEQ(long)
+DECL_NUMEQ(size_t)
+DECL_NUMEQ(uintmax_t)
+DECL_NUMEQ(intmax_t)
+DECL_NUMEQ(time_t)
+__DECL_NUMEQ(in_addr, struct in_addr)
+__DECL_NUMEQ(gconf_sockaddr, struct gconf_sockaddr)
+
+struct gconf_prop gconf_prop_tab[] = {
+  { 0, NULL },                                  /* gconf_type_void */
+  { sizeof (char*), string_eq },                /* gconf_type_string */
+  { sizeof (short), NUMEQ (short) },            /* gconf_type_short */
+  { sizeof (unsigned short), NUMEQ (short) },   /* gconf_type_ushort */
+  { sizeof (int), NUMEQ (int) },                /* gconf_type_int */
+  { sizeof (unsigned int), NUMEQ (int) },       /* gconf_type_uint */
+  { sizeof (long), NUMEQ (long) },              /* gconf_type_long */
+  { sizeof (unsigned long), NUMEQ (long) },     /* gconf_type_ulong */
+  { sizeof (size_t), NUMEQ (size_t) },          /* gconf_type_size */
   /*    gconf_type_off,*/
-  sizeof (uintmax_t)        /* gconf_type_uintmax */,
-  sizeof (intmax_t)         /* gconf_type_intmax */,
-  sizeof (time_t)           /* gconf_type_time */,
-  sizeof (int)              /* gconf_type_bool */,
-  sizeof (struct in_addr)   /* gconf_type_ipv4 */,
-  0                        /* FIXME: gconf_type_cidr */,
-  sizeof (struct in_addr)   /* gconf_type_host */, 
-  sizeof (struct gconf_sockaddr) /* gconf_type_sockaddr */,
-  0                        /* gconf_type_section */
+  { sizeof (uintmax_t), NUMEQ (uintmax_t) },    /* gconf_type_uintmax */
+  { sizeof (intmax_t), NUMEQ (intmax_t) },      /* gconf_type_intmax */
+  { sizeof (time_t), NUMEQ (time_t) },          /* gconf_type_time */
+  { sizeof (int), NUMEQ (int) },                /* gconf_type_bool */
+  { sizeof (struct in_addr), NUMEQ (in_addr) }, /* gconf_type_ipv4 */
+  { 0, NULL },                           /* FIXME: gconf_type_cidr */
+  { sizeof (struct in_addr), NUMEQ (in_addr) }, /* gconf_type_host */ 
+  { sizeof (struct gconf_sockaddr), NUMEQ (gconf_sockaddr) },
+                                                /* gconf_type_sockaddr */
+  { 0, NULL }                                   /* gconf_type_section */
 };
-#define gconf_type_size_count \
-  (sizeof (gconf_type_size_tab) / sizeof (gconf_type_size_tab[0]))
+#define gconf_prop_count \
+  (sizeof (gconf_prop_tab) / sizeof (gconf_prop_tab[0]))
 
 static void
 process_ident (struct gconf_keyword *kwp, gconf_value_t *value)
@@ -763,27 +796,35 @@ process_ident (struct gconf_keyword *kwp, gconf_value_t *value)
           enum gconf_data_type type = GCONF_TYPE (kwp->type);
           int num = 1;
           const void *p;
-          gl_list_t list = simple_list_create (true);
+          gl_list_t list;
+          size_t size;
 
+          if (type >= gconf_prop_count
+              || (size = gconf_prop_tab[type].size) == 0)
+            {
+              gconf_error (&gconf_current_locus, 0,
+                           _("INTERNAL ERROR at %s:%d: "
+                             "unhandled data type %d"),
+                           __FILE__, __LINE__, type);
+              abort ();
+            }
+
+          list = gl_list_create_empty (&gl_linked_list_implementation,
+                                       gconf_prop_tab[type].eqfn,
+                                       NULL,
+                                       listel_dispose,
+                                       false);
+          
           while (gl_list_iterator_next (&itr, &p, NULL))
             {
               const gconf_value_t *vp = p;
-              size_t size;
 
-              if (type >= gconf_type_size_count
-                  || (size = gconf_type_size_tab[type]) == 0)
-                {
-                  gconf_error (&gconf_current_locus, 0,
-                               _("INTERNAL ERROR at %s:%d: "
-                                 "unhandled data type %d"),
-                               __FILE__, __LINE__, type);
-                  abort ();
-                }
-                
               if (vp->type != GCONF_TYPE_STRING)
                 gconf_error (&gconf_current_locus, 0,
                              _("%s: incompatible data type in list item #%d"),
                              kwp->ident, num);
+              else if (type == gconf_type_string)
+                gl_list_add_last (list, vp->v.string);
               else
                 {
                   void *ptr = xmalloc (size);
@@ -798,34 +839,46 @@ process_ident (struct gconf_keyword *kwp, gconf_value_t *value)
         }
       else
         {
-          gconf_error (&gconf_current_locus, 0, _("incompatible data type for `%s'"),
+          gconf_error (&gconf_current_locus, 0,
+                       _("incompatible data type for `%s'"),
                        kwp->ident);
           return;
         }
     }
   else if (GCONF_IS_LIST (kwp->type))
     {
-      gl_list_t list = simple_list_create (true);
+      gl_list_t list;
       enum gconf_data_type type = GCONF_TYPE (kwp->type);
       size_t size;
       void *ptr;
       
-      if (type >= gconf_type_size_count
-          || (size = gconf_type_size_tab[type]) == 0)
+      if (type >= gconf_prop_count
+          || (size = gconf_prop_tab[type].size) == 0)
         {
           gconf_error (&gconf_current_locus, 0,
                        _("INTERNAL ERROR at %s:%d: unhandled data type %d"),
                        __FILE__, __LINE__, type);
           abort();
         }
-      ptr = xmalloc (size);
-      if (string_convert (ptr, type, value->v.string))
+      
+      list = gl_list_create_empty (&gl_linked_list_implementation,
+                                   gconf_prop_tab[type].eqfn,
+                                   NULL,
+                                   listel_dispose,
+                                   false);
+      if (type == gconf_type_string)
+        gl_list_add_last (list, value->v.string);
+      else
         {
-          free (ptr);
-          gl_list_free (list);
-          return;
+          ptr = xmalloc (size);
+          if (string_convert (ptr, type, value->v.string))
+            {
+              free (ptr);
+              gl_list_free (list);
+              return;
+            }
+          gl_list_add_last (list, ptr);
         }
-      gl_list_add_last (list, ptr);
       *(gl_list_t*)target = list;
     }
   else
diff --git a/src/cmdline.opt b/src/cmdline.opt
index b61517b..8b45791 100644
--- a/src/cmdline.opt
+++ b/src/cmdline.opt
@@ -21,7 +21,7 @@ static gl_list_t source_list;
 static gl_list_t tag_list;
 
 static bool
-source_eq (const void *elt1, const void *elt2)
+string_eq (const void *elt1, const void *elt2)
 {
   return strcmp ((const char *)elt1, (const char *)elt2) == 0;
 }
@@ -99,7 +99,7 @@ OPTION(spool,S,TAG,