Implement inotify support.

* configure.ac: New option --with-inotify.
Bye default, use inotify if it is present.
* src/watcher.c: New file. Implements inotify watcher.
* src/Makefile.am [COND_INOTIFY] (wydawca_SOURCES): Add watcher.c
* src/diskio.c (dir_get_path): New function.
* src/job.c (job) <spool>: Remove const qualifier. All uses changed.
(inotify_spool): New pseudo-spool.
(fake_spool): Remove static qualifier.
(wydawca_scanner): Support for inotify spools.
* src/net.c (open_listener): Don't exit if the listener
address is not set.
(wydawca_listener): Listen on the listener socket and
on the inotify descriptor. If none is set, bail out.
* src/process.c (for_each_spool)
(file_info_cleanup)
(spool_cwd_add_new_file,spool_add_new_file): New functions.
(scan_spool_unlocked): Use spool_cwd_add_new_file.
Don't initialize dictionaries here: it will be done in
spool_commit_triplets.
(spool_open_dictionaries): New function.
(close_dictionaries): Rename to spool_close_dictionaries.
Clear dict_inited.
* src/triplet.c (hash_triplet_compare): Compare spools as well.
(register_file): Likewise.
(triplet_lookup): New function.
(check_triplet_state): New argument: noauth. All uses updated.
(enumerate_triplets): Rename to spool_commit_triplets.
Call spool_open_dictionaries.
(count_processable_triplets,triplet_remove_file): New functions.
* src/verify.c (verify_directive_file): New argument: noauth.
All uses updated.
* src/vtab.c (reg): Initialize get_path member.
(get_path): New function.
* src/wydawca.c (main): Set print_version_hook.
* src/wydawca.h (virt_tab) <get_path>: New method.
(spool) <dict_inited>: New member.
(fake_spool, inotify_spool): New externs.
(spool_add_new_file, spool_cwd_add_new_file)
(spool_open_dictionaries, spool_close_dictionaries)
(for_each_spool, count_processable_triplets)
(triplet_remove_file, get_path): New protos.
(enumerate_triplets): Rename to spool_commit_triplets.
(verify_directive_file): Take two arguments.

11 files changed, 683 insertions, 201 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 73182c4..828d573 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -12,12 +12,17 @@
 # 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/>.
 
 sbin_PROGRAMS=wydawca
+
+if COND_INOTIFY
+ WATCHER_C=watcher.c
+endif
+
 wydawca_SOURCES=\
  backup.c\
  builtin.c\
  builtin.h\
  cmdline.h\
  config.c\
@@ -45,13 +50,14 @@ wydawca_SOURCES=\
  mail.h\
  mail.c\
  vtab.c\
  null.c\
  timer.c\
  txtacc.c\
- report.c
+ report.c\
+ $(WATCHER_C)
 
 BUILT_SOURCES=cmdline.h
 EXTRA_DIST=cmdline.opt pp-setup update-2.0.awk
 
 SUFFIXES=.opt .c .h
 
diff --git a/src/diskio.c b/src/diskio.c
index bab5cb8..751d684 100644
--- a/src/diskio.c
+++ b/src/diskio.c
@@ -408,12 +408,18 @@ replace_allowed_p (struct file_triplet *trp)
 
   if (directive_get_value (trp, "replace", &val))
     return 1;
   return strcmp (val, "true") == 0;
 }
 
+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
    TRP->SPOOL. TRP->RELATIVE_DIR gives relative directory (i.e. the
    directory part of the file name) for backup purposes.
 
    Do nothing if dry_run_mode is set. */
 int
diff --git a/src/job.c b/src/job.c
index 4a97f88..3fae432 100644
--- a/src/job.c
+++ b/src/job.c
@@ -22,24 +22,25 @@
 #define STATE_ACTIVE   0x04
   
 struct job
 {
   struct job *next, *prev;
   int state;
-  const struct spool *spool;
+  struct spool *spool;
   uid_t uid;
   pid_t pid;
   time_t timestamp;
   int exit_status;
 };
 
 struct job *queue;
 size_t jobmax;
 size_t jobcnt;
 
-static struct spool fake_spool = { "all spools" };
+struct spool fake_spool = { "all spools" },
+             inotify_spool = { "inotify" } ;
 
 static int wakeup;
 
 RETSIGTYPE
 queue_signal (int sig)
 {
@@ -73,19 +74,28 @@ job_active_count ()
   for (job = queue; job; job = job->next)
     if (job->state & STATE_ACTIVE)
       count++;
   return count;
 }
 
+static int
+procspool (struct spool *spool, void *data)
+{
+  spool_commit_triplets (spool);
+  return 0;
+}
+
 int
 wydawca_scanner (struct job *job)
 {
   int rc;
   initstats();
   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);
   else
     {
       spool_create_timers ();
       rc = scan_spool (job->spool, 1, &job->uid);
     }
@@ -188,13 +198,13 @@ job_insert (struct job *job, struct job *elt)
 
   if (p)
     p->prev = job;
 }
                
 void
-schedule_job (const struct spool *spool, uid_t uid)
+schedule_job (struct spool *spool, uid_t uid)
 {
   struct job *job;
 
   if (!spool)
     spool = &fake_spool;
   
diff --git a/src/net.c b/src/net.c
index 4857fa2..3157fe8 100644
--- a/src/net.c
+++ b/src/net.c
@@ -19,16 +19,13 @@
 static int
 open_listener ()
 {
   int fd;
 
   if (listen_sockaddr.sa == NULL)
-    {
-      logmsg (LOG_CRIT, _("listener address is not configured"));
-      exit (EX_CONFIG);
-    }
+    return -1;
   
   fd = socket (listen_sockaddr.sa->sa_family, SOCK_STREAM, 0);
   if (fd == -1)
     {
       logmsg (LOG_CRIT, _("cannot create socket: %s"),
               strerror(errno));
@@ -96,13 +93,13 @@ trim_crlf (char *s)
 
 void
 handle_connection (FILE *in, FILE *out)
 {
   char *buf = NULL;
   size_t buflen = 0;
-  const struct spool *spool;
+  struct spool *spool;
   char *p;
   struct passwd *pw;
 
   if (grecs_getline (&buf, &buflen, in) <= 0)
     return;
   trim_crlf (buf);
@@ -171,74 +168,102 @@ sig_term (int sig)
 }
 
 void
 wydawca_listener ()
 {
   int ctlfd = open_listener ();
+  int wfd = watcher_init ();
+  int maxfd = 0;
+
+  if (ctlfd != -1)
+      maxfd = ctlfd;
+
+  if (wfd != -1 && wfd > maxfd)