Use BSD queue macros to implement queues and linked lists.

15 files changed, 777 insertions, 286 deletions

diff --git a/modules/mailutils/mod_mailutils.c b/modules/mailutils/mod_mailutils.c
index 00ea697..759fa14 100644
--- a/modules/mailutils/mod_mailutils.c
+++ b/modules/mailutils/mod_mailutils.c
@@ -603,7 +603,7 @@ wy_config(grecs_node_t *node)
 }
         
 void
-wy_flush()
+wy_flush(void)
 {
     if (mailer_opened) {
         mu_mailer_close(mailer);
diff --git a/src/Makefile.am b/src/Makefile.am
index 5af4c2c..5b70f5e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -16,10 +16,6 @@
 
 sbin_PROGRAMS=wydawca
 
-if COND_INOTIFY
- WATCHER_C=watcher.c
-endif
-
 wydawca_SOURCES=\
  backup.c\
  builtin.c\
@@ -30,13 +26,12 @@ wydawca_SOURCES=\
  directive.c\
  diskio.c\
  exec.c\
- event.c\
  gpg.c\
  interval.c\
  module.c\
  net.c\
  pidfile.c\
- process.c\
+ spool.c\
  sql.c\
  sql.h\
  tcpwrap.c\
@@ -49,7 +44,11 @@ wydawca_SOURCES=\
  null.c\
  timer.c\
  thread_name.c\
- $(WATCHER_C)
+ queue.h
+
+if COND_INOTIFY
+  wydawca_SOURCES += watcher.c
+endif
 
 BUILT_SOURCES=cmdline.h
 EXTRA_DIST=cmdline.opt
diff --git a/src/config.c b/src/config.c
index a7ceb92..ee9f0c3 100644
--- a/src/config.c
+++ b/src/config.c
@@ -125,7 +125,7 @@ static struct archive_descr default_archive_descr = {
 };
 
 static struct dictionary *default_dictionary[dictionary_count];
-struct notification *default_notification = NULL;
+NOTIFYQ default_notification = NOTIFYQ_INITIALIZER(default_notification);
 
 /* safe_file_name: convert a file name possibly containig relative
    specs (../) into a safer form using only direct descendence.
@@ -879,9 +879,7 @@ cb_notify_event(enum grecs_callback_command cmd, grecs_node_t * node,
         else {
             /* FIXME: Check if the module is defined. Better yet,
                delay this check until config_finish */
-            struct notification **p = (struct notification **) varptr;
-            ntf->next = *p;
-            *p = ntf;
+            NOTIFYQ_APPEND((NOTIFYQ*)varptr, ntf);
             /* FIXME: check ev and tgt? */
         }
         break;
@@ -1135,7 +1133,7 @@ static struct grecs_keyword spool_kw[] = {
     { "notify-event", NULL,
       N_("Configure notification"),
       grecs_type_section, GRECS_MULT,
-      NULL, offsetof(struct spool, notification),
+      NULL, offsetof(struct spool, notification_queue),
       cb_notify_event, NULL, notify_event_kw },
     { "check-script", NULL,
       N_("A /bin/sh script to verify the tarball"),
@@ -1207,14 +1205,16 @@ cb_spool(enum grecs_callback_command cmd, grecs_node_t * node,
             return 1;
         }
 
-        if (rc)
+        if (rc) {
+            //FIXME: free spool */
             return rc;
+        }
 
-        if (!spool->notification)
-            spool->notification = default_notification;
+        //FIXME
+        if (NOTIFYQ_EMPTY(&spool->notification_queue))
+            spool->notification_queue = default_notification;
         spool->dest_dir = wy_url_printable(spool->dest_url);
         register_spool(spool);
-        free(spool);
         *pdata = NULL;
         break;
 
diff --git a/src/directive.c b/src/directive.c
index 8e7afeb..bb5ce4b 100644
--- a/src/directive.c
+++ b/src/directive.c
@@ -58,10 +58,12 @@ str_dirname_sig(char const *a, char const *b)
     while (*a && *b) {
         if (*a != *b) {
             if (arg2) {
-                if (ISSPACE(*a) && strncmp(b, ".sig", 4) == 0) {
+                if (ISSPACE(*a)
+                    && strncmp(b, SUF_SIG, SUF_SIG_LEN) == 0) {
                     arg2 = 1;
                     b += 4;
-                } else if (ISSPACE(*b) && strncmp(a, ".sig", 4) == 0) {
+                } else if (ISSPACE(*b)
+                           && strncmp(a, SUF_SIG, SUF_SIG_LEN) == 0) {
                     arg2 = -1;
                     a += 4;
                 } else
@@ -77,10 +79,10 @@ str_dirname_sig(char const *a, char const *b)
         b++;
     }
 
-    if (*a == 0 && strcmp(b, ".sig") == 0)
+    if (*a == 0 && strcmp(b, SUF_SIG) == 0)
         return (arg2 == 0 || arg2 == 1) ? 1 : 0;
 
-    if (*b == 0 && strcmp(a, ".sig") == 0)      
+    if (*b == 0 && strcmp(a, SUF_SIG) == 0)     
         return (arg2 == 0 || arg2 == -1) ? -1 : 0;
     
     return 0;
@@ -649,7 +651,7 @@ external_check(struct wy_triplet *trp)
 
     if (rc) {
         wydawca_stat_incr(WY_STAT_CHECK_FAIL);
-        notify(spool->notification, trp, wy_ev_check_fail);
+        notify(&spool->notification_queue, trp, wy_ev_check_fail);
     }
 
     return rc;
@@ -759,6 +761,6 @@ process_directives(struct wy_triplet *trp)
     wydawca_stat_incr(WY_STAT_TRIPLET_SUCCESS);
     triplet_report_finish(trp);
     timer_stop(WY_TIMER_TRIPLET);
-    notify(spool->notification, trp, wy_ev_success);
+    notify(&spool->notification_queue, trp, wy_ev_success);
     return 0;
 }
diff --git a/src/event.c b/src/event.c
deleted file mode 100644
index da26a30..0000000
--- a/src/event.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/* wydawca - automatic release submission daemon
-   Copyright (C) 2007-2020 Sergey Poznyakoff
-
-   Wydawca is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 3 of the License, or (at your
-   option) any later version.
-
-   Wydawca is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License along
-   with wydawca. If not, see <http://www.gnu.org/licenses/>. */
-
-#include "wydawca.h"
-
-void
-notify(struct notification *n, struct wy_triplet *t, enum wy_event e)
-{
-    for (; n; n = n->next)
-        if (n->ev == e) {
-            if (n->modname)
-                module_notify(n->modname, n->modcfg, e, t);
-        }
-}
-
-void
-notify_finish(void)
-{
-    notify(default_notification, NULL, wy_ev_finish);
-}
-
-void
-notify_flush(struct spool *sp)
-{