12 files changed, 712 insertions, 204 deletions

diff --git a/configure.ac b/configure.ac
index a503cc7..2683b9b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,3 +17,4 @@
 AC_PREREQ(2.63)
-AC_INIT([wydawca], 2.1.90, [bug-wydawca@gnu.org.ua])
+AC_INIT([wydawca], 2.1.90, [bug-wydawca@gnu.org.ua], [wydawca],
+        [http://www.gnu.org.ua/software/wydawca])
 AC_CONFIG_SRCDIR([src/wydawca.c])
@@ -35,3 +36,3 @@ AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS([stdlib.h string.h sys/file.h unistd.h])
+AC_CHECK_HEADERS([stdlib.h string.h sys/file.h unistd.h sys/inotify.h])
 
@@ -52,3 +53,5 @@ AC_FUNC_STAT
 AC_FUNC_VPRINTF
-AC_CHECK_FUNCS([fchdir memset strchr strdup strerror strrchr setegid setregid setresgid setresuid seteuid setreuid vsyslog sysconf getdtablesize])
+AC_CHECK_FUNCS([fchdir memset strchr strdup strerror strrchr setegid setregid\
+ setresgid setresuid seteuid setreuid vsyslog sysconf getdtablesize\
+ inotify_init])
 
@@ -109,2 +112,25 @@ fi
 
+# **********************        
+# TCP wrappers
+# **********************        
+AC_ARG_WITH(inotify,
+        AC_HELP_STRING([--with-inotify],
+                       [compile with inotify(7) support (Linux-specific)]),
+        [status_inotify=${withval}],
+        [status_inotify=probe])
+if test $status_inotify != no; then
+  if test "$ac_cv_header_sys_inotify_h" = yes &&
+             test "$ac_cv_func_inotify_init" = yes; then
+    status_inotify=yes
+  elif test $status_inotify = probe; then
+    status_inotify=no
+  else
+    AC_MSG_FAILURE([Requested inotify(7) support is not available])
+  fi
+fi
+if test $status_inotify = yes; then
+  AC_DEFINE([WITH_INOTIFY],1,[Set to 1 if inotify(7) is to be used])
+fi  
+AM_CONDITIONAL([COND_INOTIFY],[test $status_inotify = yes])
+        
 # Grecs subsystem
diff --git a/src/Makefile.am b/src/Makefile.am
index 73182c4..828d573 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,2 +17,7 @@
 sbin_PROGRAMS=wydawca
+
+if COND_INOTIFY
+ WATCHER_C=watcher.c
+endif
+
 wydawca_SOURCES=\
@@ -50,3 +55,4 @@ wydawca_SOURCES=\
  txtacc.c\
- report.c
+ report.c\
+ $(WATCHER_C)
 
diff --git a/src/diskio.c b/src/diskio.c
index bab5cb8..751d684 100644
--- a/src/diskio.c
+++ b/src/diskio.c
@@ -413,2 +413,8 @@ replace_allowed_p (struct file_triplet *trp)
 
+const char *
+dir_get_path (struct spool *sp)
+{
+  return sp->source_dir;
+}
+
 /* Move the part FILE_ID of the triplet TRP between the directories in
diff --git a/src/job.c b/src/job.c
index 4a97f88..3fae432 100644
--- a/src/job.c
+++ b/src/job.c
@@ -27,3 +27,3 @@ struct job
   int state;
-  const struct spool *spool;
+  struct spool *spool;
   uid_t uid;
@@ -38,3 +38,4 @@ size_t jobcnt;
 
-static struct spool fake_spool = { "all spools" };
+struct spool fake_spool = { "all spools" },
+             inotify_spool = { "inotify" } ;
 
@@ -78,2 +79,9 @@ job_active_count ()
 
+static int
+procspool (struct spool *spool, void *data)
+{
+  spool_commit_triplets (spool);
+  return 0;
+}
+
 int
@@ -84,3 +92,5 @@ wydawca_scanner (struct job *job)
   timer_start ("wydawca");
-  if (job->spool == &fake_spool)
+  if (job->spool == &inotify_spool)
+    rc = for_each_spool (procspool, NULL);
+  else if (job->spool == &fake_spool)
     rc = scan_all_spools (1, &job->uid);
@@ -193,3 +203,3 @@ job_insert (struct job *job, struct job *elt)
 void
-schedule_job (const struct spool *spool, uid_t uid)
+schedule_job (struct spool *spool, uid_t uid)
 {
diff --git a/src/net.c b/src/net.c
index 4857fa2..3157fe8 100644
--- a/src/net.c
+++ b/src/net.c
@@ -24,6 +24,3 @@ open_listener ()
   if (listen_sockaddr.sa == NULL)
-    {
-      logmsg (LOG_CRIT, _("listener address is not configured"));
-      exit (EX_CONFIG);
-    }
+    return -1;
   
@@ -101,3 +98,3 @@ handle_connection (FILE *in, FILE *out)
   size_t buflen = 0;
-  const struct spool *spool;
+  struct spool *spool;
   char *p;
@@ -176,3 +173,18 @@ wydawca_listener ()
   int ctlfd = open_listener ();
+  int wfd = watcher_init ();
+  int maxfd = 0;
+
+  if (ctlfd != -1)
+      maxfd = ctlfd;
+
+  if (wfd != -1 && wfd > maxfd)
+    maxfd = wfd;
 
+  if (maxfd == 0)
+    {
+      logmsg (LOG_CRIT,
+              _("listener address is not configured and inotify is not available"));
+      exit (EX_CONFIG);
+    }     
+  
   job_init ();
@@ -184,4 +196,2 @@ wydawca_listener ()
     {
-      int fd;
-      FILE *in, *out;
       int rc;
@@ -189,8 +199,2 @@ wydawca_listener ()
       struct timeval to, *pto;
-      union {
-        struct sockaddr sa;
-        struct sockaddr_in s_in;
-        struct sockaddr_un s_un;
-      } addr;
-      socklen_t len;
        
@@ -198,3 +202,6 @@ wydawca_listener ()
       FD_ZERO (&rset);
-      FD_SET (ctlfd, &rset);
+      if (ctlfd != -1)
+        FD_SET (ctlfd, &rset);
+      if (wfd != -1)
+        FD_SET (wfd, &rset);
 
@@ -209,3 +216,3 @@ wydawca_listener ()
 
-      rc = select (ctlfd + 1, &rset, NULL, NULL, pto);
+      rc = select (maxfd + 1, &rset, NULL, NULL, pto);
       if (rc == 0)
@@ -220,22 +227,40 @@ wydawca_listener ()
 
-      len = sizeof (addr);
-      fd = accept (ctlfd, (struct sockaddr*) &addr, &len);
-      if (fd == -1)
-        continue;
-      /* FIXME: Use Mailutils ACLs? */
-#ifdef WITH_LIBWRAP
-      if (!tcpwrap_access(fd))
+      if (wfd != -1 && FD_ISSET (wfd, &rset))
         {
-          close(fd);
-          continue;
+          watcher_run (wfd);
         }
+      
+      if (ctlfd != -1 && FD_ISSET (ctlfd, &rset))
+        {
+          int fd;
+          FILE *in, *out;
+          union
+          {
+            struct sockaddr sa;
+            struct sockaddr_in s_in;
+            struct sockaddr_un s_un;
+          } addr;
+          socklen_t len;
+
+          len = sizeof (addr);
+          fd = accept (ctlfd, (struct sockaddr*) &addr, &len);
+          if (fd == -1)
+            continue;
+          /* FIXME: Use Mailutils ACLs? */
+#ifdef WITH_LIBWRAP
+          if (!tcpwrap_access(fd))
+            {
+              close(fd);
+              continue;
+            }
 #endif
       
-      in = fdopen (fd, "r");
-      setlinebuf (in);
-      out = fdopen (fd, "w");
-      setlinebuf (out);
-      handle_connection (in, out);
-      fclose (in);
-      fclose (out);
+          in = fdopen (fd, "r");
+          setlinebuf (in);
+          out = fdopen (fd, "w");
+          setlinebuf (out);
+          handle_connection (in, out);
+          fclose (in);
+          fclose (out);
+        }
     }
diff --git a/src/process.c b/src/process.c
index c5eb321..ec64589 100644
--- a/src/process.c
+++ b/src/process.c
@@ -26,2 +26,16 @@ static struct spool_list *spool_list;
 
+int
+for_each_spool (int (*fun) (struct spool *, void *), void *data)
+{
+  struct spool_list *sp;
+  
+  for (sp = spool_list; sp; sp = sp->next)
+    {
+      int rc = fun (&sp->spool, data);
+      if (rc)
+        return rc;