aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org>2014-08-17 14:03:50 +0300
committerSergey Poznyakoff <gray@gnu.org>2014-08-17 14:15:07 +0300
commitd2b3be6e927d6585a4e9d9f7dd566763bbb6c539 (patch)
treefff626f7c69d0ecb9b532a98afea9b7ec7981c39
parente45d22ab0f9e86da6f1c4985c1d200275cb2d82e (diff)
downloaddirevent-d2b3be6e927d6585a4e9d9f7dd566763bbb6c539.tar.gz
direvent-d2b3be6e927d6585a4e9d9f7dd566763bbb6c539.tar.bz2
Rename project to direvent.
-rw-r--r--Makefile.am10
-rw-r--r--NEWS6
-rw-r--r--README14
-rw-r--r--THANKS3
-rw-r--r--configure.ac20
-rw-r--r--doc/.gitignore36
-rw-r--r--doc/Config14
-rw-r--r--doc/Makefile.am16
-rw-r--r--doc/direvent.8 (renamed from doc/dircond.8)66
-rw-r--r--doc/direvent.conf.5 (renamed from doc/dircond.conf.5)42
-rw-r--r--doc/direvent.texi (renamed from doc/dircond.texi)90
-rw-r--r--doc/fdl.texi3
-rwxr-xr-xdoc/gendocs_template8
-rw-r--r--src/.gitignore2
-rw-r--r--src/Makefile.am32
-rw-r--r--src/cmdline.opt6
-rw-r--r--src/config.c20
-rw-r--r--src/detach-bsd.c12
-rw-r--r--src/detach-darwin.c12
-rw-r--r--src/detach-std.c12
-rw-r--r--src/direvent.c (renamed from src/dircond.c)14
-rw-r--r--src/direvent.h (renamed from src/dircond.h)8
-rw-r--r--src/environ.c22
-rw-r--r--src/ev_inotify.c12
-rw-r--r--src/ev_kqueue.c12
-rw-r--r--src/event.c12
-rw-r--r--src/fnpat.c10
-rw-r--r--src/hashtab.c12
-rw-r--r--src/progman.c12
-rw-r--r--src/sigv.c12
-rw-r--r--src/watcher.c12
-rw-r--r--tests/Makefile.am8
-rw-r--r--tests/atlocal.in4
-rw-r--r--tests/attrib.at26
-rw-r--r--tests/cmdexp.at26
-rw-r--r--tests/create.at26
-rw-r--r--tests/createrec.at16
-rw-r--r--tests/delete.at26
-rw-r--r--tests/env00.at28
-rw-r--r--tests/env01.at28
-rw-r--r--tests/env02.at18
-rw-r--r--tests/env03.at18
-rw-r--r--tests/envdump.c8
-rw-r--r--tests/glob01.at26
-rw-r--r--tests/glob02.at24
-rwxr-xr-xtests/printname2
-rw-r--r--tests/re01.at26
-rw-r--r--tests/re02.at26
-rw-r--r--tests/re03.at26
-rw-r--r--tests/re04.at26
-rw-r--r--tests/re05.at24
-rw-r--r--tests/remove.at26
-rw-r--r--tests/testsuite.at10
-rw-r--r--tests/waitfile.c10
-rw-r--r--tests/write.at26
55 files changed, 524 insertions, 522 deletions
diff --git a/Makefile.am b/Makefile.am
index 3877d2f..ea87088 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,18 +1,18 @@
-# This file is part of Dircond -*- autoconf -*-
-# Copyright (C) 2012, 2013 Sergey Poznyakoff
+# This file is part of Direvent -*- autoconf -*-
+# Copyright (C) 2012-2014 Sergey Poznyakoff
#
-# Dircond is free software; you can redistribute it and/or modify
+# Direvent 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, or (at your option)
# any later version.
#
-# Dircond is distributed in the hope that it will be useful,
+# Direvent 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 Dircond. If not, see <http://www.gnu.org/licenses/>.
+# along with Direvent. If not, see <http://www.gnu.org/licenses/>.
ACLOCAL_AMFLAGS = -I grecs/am
diff --git a/NEWS b/NEWS
index 208629c..8a06296 100644
--- a/NEWS
+++ b/NEWS
@@ -1,8 +1,8 @@
-dircond -- history of user-visible changes. 2014-08-10
+direvent -- history of user-visible changes. 2014-08-10
Copyright (C) 2012-2014 Sergey Poznyakoff
See the end of file for copying conditions.
-Please send dircond bug reports to <bug-dircond@gnu.org.ua>
+Please send direvent bug reports to <bug-direvent@gnu.org.ua>
Version 4.1.90, Git
@@ -41,7 +41,7 @@ Version 2.0, 2013-01-11
* Change command line handling
-Dircond accepts handler definitions interspersed with directory
+Direvent accepts handler definitions interspersed with directory
name. This allows for having different per-directory handlers.
Similarly, the autowatch options ("-a" and "-l") affect the
diff --git a/README b/README
index 0e716f4..17bfacf 100644
--- a/README
+++ b/README
@@ -1,10 +1,10 @@
-Dircond README.
-Copyright (C) 2012, 2013 Sergey Poznyakoff
+Direvent README.
+Copyright (C) 2012-2014 Sergey Poznyakoff
See the end of file for copying conditions.
* Overview
-Dircond is a directory content watcher daemon, i.e. a program that
+Direvent is a directory content watcher daemon, i.e. a program that
monitors a set of directories on the file system and reacts when
their content changes. When a change is detected, the daemon reacts by
invoking an external command configured for that kind of change.
@@ -30,15 +30,15 @@ generic options.
Complete documentation is included with the package, both in man
and Texinfo formats. After successful installation, use
- info dircond
+ info direvent
to read the Texinfo documentation. To read the manpages, use:
- man 8 dircond
- man 5 dircond.conf
+ man 8 direvent
+ man 5 direvent.conf
An online copy of the documentation in various formats is available
-at http://dircond.man.gnu.org.ua.
+at http://direvent.man.gnu.org.ua.
* Copyright information:
diff --git a/THANKS b/THANKS
index 955f86a..76a53b0 100644
--- a/THANKS
+++ b/THANKS
@@ -1,4 +1,5 @@
-Dircond THANKS file.
+Direvent THANKS file.
+Karl Berry <karl@freefriends.org>
Natalia Alifanova <na@nxc.no>
Zeus Panchenko <zeus@ibs.dn.ua>
diff --git a/configure.ac b/configure.ac
index 4ec162a..8ecedb1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,23 +1,23 @@
-# This file is part of Dircond -*- autoconf -*-
+# This file is part of Direvent -*- autoconf -*-
# Copyright (C) 2012-2014 Sergey Poznyakoff
#
-# Dircond is free software; you can redistribute it and/or modify
+# Direvent 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, or (at your option)
# any later version.
#
-# Dircond is distributed in the hope that it will be useful,
+# Direvent 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 Dircond. If not, see <http://www.gnu.org/licenses/>.
+# along with Direvent. If not, see <http://www.gnu.org/licenses/>.
AC_PREREQ([2.69])
-AC_INIT([dircond], [4.1.90], [bug-dircond@gnu.org.ua],,
- [http://www.gnu.org.ua/software/dircond])
-AC_CONFIG_SRCDIR([src/dircond.c])
+AC_INIT([direvent], [4.1.90], [bug-direvent@gnu.org.ua],,
+ [http://www.gnu.org.ua/software/direvent])
+AC_CONFIG_SRCDIR([src/direvent.c])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_AUX_DIR([build-aux])
AM_INIT_AUTOMAKE([1.11.5 gnits tar-ustar silent-rules])
@@ -50,12 +50,12 @@ else
AC_MSG_ERROR([no suitable interface found])
fi
-AM_CONDITIONAL([DIRCOND_INOTIFY],[test $iface = inotify])
-AM_CONDITIONAL([DIRCOND_KQUEUE],[test $iface = kqueue])
+AM_CONDITIONAL([DIREVENT_INOTIFY],[test $iface = inotify])
+AM_CONDITIONAL([DIREVENT_KQUEUE],[test $iface = kqueue])
AC_SUBST(IFACE, $iface)
AC_DEFINE_UNQUOTED(USE_IFACE,IFACE_`echo $iface|tr a-z A-Z`,
[event notification interface to use])
-AM_CONDITIONAL([DIRCOND_RFORK], [test "$ac_cv_func_rfork" = yes])
+AM_CONDITIONAL([DIREVENT_RFORK], [test "$ac_cv_func_rfork" = yes])
AH_TOP([
/* Supported event notification types */
#define IFACE_INOTIFY 0 /* inotify - Linux */
diff --git a/doc/.gitignore b/doc/.gitignore
index 893d222..a6ea4c9 100644
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -1,23 +1,23 @@
Makefile
Makefile.in
-dircond.info*
+direvent.info*
stamp-vti
version.texi
-dircond.aux
-dircond.cp
-dircond.cps
-dircond.dvi
-dircond.fl
-dircond.fn
-dircond.kw
-dircond.ky
-dircond.log
-dircond.mt
-dircond.op
-dircond.pg
-dircond.pr
-dircond.ps
-dircond.toc
-dircond.tp
-dircond.vr
+direvent.aux
+direvent.cp
+direvent.cps
+direvent.dvi
+direvent.fl
+direvent.fn
+direvent.kw
+direvent.ky
+direvent.log
+direvent.mt
+direvent.op
+direvent.pg
+direvent.pr
+direvent.ps
+direvent.toc
+direvent.tp
+direvent.vr
manual
diff --git a/doc/Config b/doc/Config
index 69e5d99..3b6e0b1 100644
--- a/doc/Config
+++ b/doc/Config
@@ -1,20 +1,20 @@
-# Texi2html configuration for Dircond documentation. -*- perl -*-
-# Copyright (C) 2012, 2013 Sergey Poznyakoff
+# Texi2html configuration for Direvent documentation. -*- perl -*-
+# Copyright (C) 2012-2014 Sergey Poznyakoff
#
-# Dircond is free software; you can redistribute it and/or modify
+# Direvent 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, or (at your option)
# any later version.
#
-# Dircond is distributed in the hope that it will be useful,
+# Direvent 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 Dircond. If not, see <http://www.gnu.org/licenses/>.
+# along with Direvent. If not, see <http://www.gnu.org/licenses/>.
-$top_html_dir="/software/dircond";
+$top_html_dir="/software/direvent";
$graphics_dir="$top_html_dir/graphics";
## texi2html configuration
@@ -41,7 +41,7 @@ $AFTER_BODY_OPEN=qq{
<div id="header">
<!--#include virtual="${top_html_dir}/inc/header.html" -->
<ul class='tabs'>
- <li><a href="${top_html_dir}/dircond.html">Main</a></li>
+ <li><a href="${top_html_dir}/direvent.html">Main</a></li>
<li><a href="${top_html_dir}/download.html">Downloads</a></li>
<li><a class="active" href="${top_html_dir}/manual.html">Documentation</a></li>
</ul>
diff --git a/doc/Makefile.am b/doc/Makefile.am
index ce09893..06f7187 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,24 +1,24 @@
-# This file is part of Dircond -*- autoconf -*-
-# Copyright (C) 2012, 2013 Sergey Poznyakoff
+# This file is part of Direvent -*- autoconf -*-
+# Copyright (C) 2012-2014 Sergey Poznyakoff
#
-# Dircond is free software; you can redistribute it and/or modify
+# Direvent 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, or (at your option)
# any later version.
#
-# Dircond is distributed in the hope that it will be useful,
+# Direvent 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 Dircond. If not, see <http://www.gnu.org/licenses/>.
+# along with Direvent. If not, see <http://www.gnu.org/licenses/>.
-info_TEXINFOS=dircond.texi
-dircond_TEXINFOS=\
+info_TEXINFOS=direvent.texi
+direvent_TEXINFOS=\
fdl.texi
-dist_man_MANS=dircond.8 dircond.conf.5
+dist_man_MANS=direvent.8 direvent.conf.5
EXTRA_DIST = \
gendocs_template
diff --git a/doc/dircond.8 b/doc/direvent.8
index 759295f..098fd43 100644
--- a/doc/dircond.8
+++ b/doc/direvent.8
@@ -1,23 +1,23 @@
-.\" dircond - directory content watcher daemon -*- nroff -*-
-.\" Copyright (C) 2012, 2013 Sergey Poznyakoff
+.\" direvent - directory content watcher daemon -*- nroff -*-
+.\" Copyright (C) 2012-2014 Sergey Poznyakoff
.\"
-.\" Dircond is free software; you can redistribute it and/or modify it
+.\" Direvent 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.
.\"
-.\" Dircond is distributed in the hope that it will be useful,
+.\" Direvent 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 dircond. If not, see <http://www.gnu.org/licenses/>.
-.TH DIRCOND 8 "June 4, 2013" "DIRCOND" "Dircond User Reference"
+.\" with direvent. If not, see <http://www.gnu.org/licenses/>.
+.TH DIREVENT 8 "June 4, 2013" "DIREVENT" "Direvent User Reference"
.SH NAME
-dircond \- directory content watcher
+direvent \- directory content watcher
.SH SYNOPSIS
-\fBdircond\fR [\fB\-HVdfh\fR] [\fB\-F\fR \fINAME\fR]\
+\fBdirevent\fR [\fB\-HVdfh\fR] [\fB\-F\fR \fINAME\fR]\
[\fB\-P\fR \fIFILE\fR]\
[\fB-l\fR \fIPRIO\fR]\
[\fB\-\-debug\fR]
@@ -25,22 +25,22 @@ dircond \- directory content watcher
[\fB\-\-foreground\fB]\
[\fB\-\-pidfile\fR=\fIFILE\fR] [\fBCONFIG\fR]
-.B dircond \-h
+.B direvent \-h
.br
-.B dircond \-\-help
+.B direvent \-\-help
-.B dircond \-H
+.B direvent \-H
.br
-.B dircond \-\-config\-help
+.B direvent \-\-config\-help
-.B dircond \-\-usage
+.B direvent \-\-usage
-.B dircond \-V
+.B direvent \-V
.br
-.B dircond \-\-version
+.B direvent \-\-version
.SH DESCRIPTION
-.B Dircond
+.B Direvent
monitors a set of directories on the file system and reacts when
a file system event occurs in any of them. Directories and events
to monitor are specified in the configuration file. When an event
@@ -65,7 +65,7 @@ File attributes have changed. This includes changes in the file
ownership, mode, link count, etc.
.PP
Depending on the interface provided by the underlying operating system
-.B dircond
+.B direvent
can trace various
.B system-dependent
events, which may offer a better resolution. These events are
@@ -76,7 +76,7 @@ below.
A
.B watcher
is a configuration entity within
-.B dircond
+.B direvent
which associates a set of directories with a set of events and
instructs the program to run a specified external command when
any of these events occur in any of these directories. This
@@ -86,7 +86,7 @@ variables, or from its command line (see the \fBHANDLER ENVIRONMENT\fR
section below).
.PP
Watchers are declared in the program configuration file
-.BR dircond.conf ,
+.BR direvent.conf ,
located in the system configuration directory (normally \fB/etc\fR).
.PP
An alternative configuration file can be used, by supplying its pathname
@@ -125,7 +125,7 @@ Write PID to \fIFILE\fR.
Check configuration file for errors and exit.
.TP
\fB\-l\fR \fIPRIO\fR
-While connected to a terminal \fBdircond\fR outputs its diagnostics
+While connected to a terminal \fBdirevent\fR outputs its diagnostics
messages to stderr and, if configured, to \fBsyslog\fR. This option
limits the amount of information output to the standard error.
\fIPRIO\fR is one of the following priorities (in order of increasing
@@ -157,12 +157,12 @@ Show available command line options.
Print program version and copyright information.
.SH CONFIGURATION
The default configuration file is
-.BR /etc/dircond.conf .
+.BR /etc/direvent.conf .
If a file name is supplied as an argument to the program, that file
will be read instead.
.PP
The configuration file syntax is discussed in detail in
-.BR dircond.conf (5).
+.BR direvent.conf (5).
This section provides only a short description of it.
.PP
Three types of comments are allowed: inline comments, that begin with
@@ -205,7 +205,7 @@ It is defined as follows:
.in
.fi
.PP
-Each \fBwatcher\fR statement instructs \fBdircond\fR to monitor
+Each \fBwatcher\fR statement instructs \fBdirevent\fR to monitor
the events listed in \fIEVENT\-LIST\fR occurring in the directories
specified by \fIPATHNAME\fRs in \fBpath\fR statements (any number of
\fBpath\fR statements can be given). When any such event is detected,
@@ -213,13 +213,13 @@ the \fICOMMAND\-LINE\fR will be executed.
.PP
Each directory defined with the \fBrecursive\fR keyword will be
watched recursively. This means that for each subdirectory created in
-it, \fBdircond\fR will install a watcher similar to that of its parent
+it, \fBdirevent\fR will install a watcher similar to that of its parent
directory. The optional \fILEVEL\fR can be used to set up a cut-off
nesting level, beyond which the recursive operation is disabled.
.PP
The rest of statements are optional. The \fBuser\fR statement can be
used to execute the \fICOMMAND\-LINE\fR as the user \fINAME\fR
-(provided, of course, that \fBdircond\fR is started with root
+(provided, of course, that \fBdirevent\fR is started with root
privileges). The \fBtimeout\fR specifies the maximum amount of time
(in seconds) the command is allowed to run. It defaults to 5. The
\fBenviron\fR statement modifies the command environment (see the
@@ -253,7 +253,7 @@ the named file after disconnecting from the controlling terminal.
.SH "HANDLER ENVIRONMENT"
The handler to be executed on an event is defined by the \fBcommand\fR
statement in the \fBwatcher\fR configuration block (see
-.BR dircond.conf (5)).
+.BR direvent.conf (5)).
Before executing, the following operations are performed:
.nr step 1 1
.IP \n[step].
@@ -263,7 +263,7 @@ occurred.
If the \fBenviron\fR statement is present in the watcher, the
environment is modified according to its rules. See the description
of the \fBenviron\fR statement in
-.BR dircond.conf (5).
+.BR direvent.conf (5).
.IP \n+[step].
The standard input is closed.
.IP
@@ -280,7 +280,7 @@ All file descriptors above 2 are closed.
\fBMacro variables\fR are expanded. See the section
.B MACRO EXPANSION
in
-.BR dircond.conf (5).
+.BR direvent.conf (5).
For example, if the handler is about to be executed for the
\fBwrite\fR event on the file \fBsomefile\fR, and the \fBcommand\fR
definition was:
@@ -308,7 +308,7 @@ word is treated as the pathname of the program to be executed.
.IP \n+[step].
The program is invoked.
.SH "SYSTEM DEPENDENCIES"
-\fBDircond\fR relies on the event monitoring API provided by the
+\fBDirevent\fR relies on the event monitoring API provided by the
kernel.
.SH Linux
On \fBLinux\fR the program uses
@@ -368,7 +368,7 @@ A file was moved out from a monitored directory.
A file was opened.
.SH BSD
When compiled on \fBBSD\fR systems (including \fBDarwin\fR),
-\fBdircond\fR uses
+\fBdirevent\fR uses
.BR kqueue (2).
This interface needs an open file handle for each file in a monitored
directory, which means that the number of watchers is limited by the
@@ -377,7 +377,7 @@ maximum number of open files. Use
to raise it to a higher number.
.PP
Since it operates on files, \fBkqueue\fR does not provide direct
-support for the \fBcreate\fR generic event. \fBDircond\fR works
+support for the \fBcreate\fR generic event. \fBDirevent\fR works
over this disadvantage by keeping track of the contents of each
monitored directory and rescanning it each time a \fBWRITE\fR system
event is reported for it. It then generates the
@@ -425,13 +425,13 @@ Command line usage error.
.IP 2
Another error occurred.
.SH "SEE ALSO"
-.BR dircond.conf (5),
+.BR direvent.conf (5),
.BR inotify (7),
.BR kqueue (2).
.SH AUTHORS
Sergey Poznyakoff
.SH "BUG REPORTS"
-Report bugs to <bug-dircond@gnu.org.ua>.
+Report bugs to <bug-direvent@gnu.org.ua>.
.SH COPYRIGHT
Copyright \(co 2012, 2013 Sergey Poznyakoff
.br
diff --git a/doc/dircond.conf.5 b/doc/direvent.conf.5
index b7892b6..023cd6f 100644
--- a/doc/dircond.conf.5
+++ b/doc/direvent.conf.5
@@ -1,21 +1,21 @@
-.\" dircond - directory content watcher daemon -*- nroff -*-
+.\" direvent - directory content watcher daemon -*- nroff -*-
.\" Copyright (C) 2012-2014 Sergey Poznyakoff
.\"
-.\" Dircond is free software; you can redistribute it and/or modify it
+.\" Direvent 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.
.\"
-.\" Dircond is distributed in the hope that it will be useful,
+.\" Direvent 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 dircond. If not, see <http://www.gnu.org/licenses/>.
-.TH DIRCOND.CONF 5 "August 10, 2014" "DIRCOND" "Dircond User Reference"
-dircond.conf \- configuration file for
-.BR dircond (8).
+.\" with direvent. If not, see <http://www.gnu.org/licenses/>.
+.TH DIREVENT.CONF 5 "August 10, 2014" "DIREVENT" "Direvent User Reference"
+direvent.conf \- configuration file for
+.BR direvent (8).
.SH DESCRIPTION
The configuration file consists of statements and comments.
.PP
@@ -105,7 +105,7 @@ The following is a simple statement:
.sp
.RS 4
.nf
-pidfile /var/run/dircond.pid;
+pidfile /var/run/direvent.pid;
.RE
.fi
.PP
@@ -297,7 +297,7 @@ characters. Each name corresponds to a bit in \fBsysev_code\fR. See
the section
.B SYSTEM DEPENDENCIES
in
-.BR dircond (8),
+.BR direvent (8),
for a list of system-dependent event names.
.TP
.B genev_code
@@ -323,7 +323,7 @@ Upon successful startup store the PID of the daemon process in \fIFILE\fR.
Set debug level. Valid \fINUMBER\fR values are \fB0\fR (no debug) to \fB3\fR
(maximum verbosity).
.SH LOGGING
-While connected to the terminal \fBdircond\fR outputs its diagnostics and
+While connected to the terminal \fBdirevent\fR outputs its diagnostics and
debugging messages to the standard error. After disconnecting from the
controlling terminal it closes the first three file descriptors and directs
all its output to the \fBsyslog\fR. When running in foreground mode, its
@@ -403,7 +403,7 @@ existing directory in the file system. The watcher will watch events
occurring for all files within that directory. If the optional
.B recursive
clause is specified, this directory will be watched recursively, i.e.
-when any subdirectory is created in it, \fBdircond\fR will set up
+when any subdirectory is created in it, \fBdirevent\fR will set up
a watcher for files in this subdirectory. This new watcher will be
an exact copy of the parent watcher, excepting for the pathnames.
The optional \fINUMBER\fR parameter defines a cut-off nesting level for
@@ -472,7 +472,7 @@ command "/bin/prog -event $genev_name -file $file";
.RE
.IP
See the section \fBHANDLER ENVIRONMENT\fR in
-.BR dircond (8),
+.BR direvent (8),
for a detailed discussion of how the command is executed.
.TP
\fBuser\fR \fISTRING\fR;
@@ -501,22 +501,22 @@ Capture the standard error of the command and redirect it to the
.TP
\fBenviron\fR \fIENV\-SPEC\fR;
Modify command environment. By default the command inherits the environment
-of \fBdircond\fR augmented with the following variables:
+of \fBdirevent\fR augmented with the following variables:
.RS +10
.TP
-.B DIRCOND_SYSEV_CODE
+.B DIREVENT_SYSEV_CODE
The system-dependent event code (see the \fB${sysev_code}\fR variable).
.TP
-.B DIRCOND_SYSEV_NAME
+.B DIREVENT_SYSEV_NAME
The system-dependent event name or names (see the \fB${sysev_name}\fR variable).
.TP
-.B DIRCOND_GENEV_CODE
+.B DIREVENT_GENEV_CODE
The generic event code (see the \fB${genev_code}\fR variable).
.TP
-.B DIRCOND_GENEV_NAME
+.B DIREVENT_GENEV_NAME
The generic event name or names (see the \fB${genev_name}\fR variable).
.TP
-.B DIRCOND_FILE
+.B DIREVENT_FILE
The name of the affected file relative to the current working directory
(see the \fB${file}\fR variable).
.RE
@@ -528,13 +528,13 @@ directives:
.TP
.BR \- " (a single dash)"
Clear the inherited environment, but retain the variables added by
-\fBdircond\fR. The removed environment variables can be selectively
+\fBdirevent\fR. The removed environment variables can be selectively
restored by the directives that follow. This must be the first directive
in the list.
.TP
.BR \-\- " (double-dash)"
Clear the entire environment, including the variables added by
-\fBdircond\fR. This must be the first directive in the list.
+\fBdirevent\fR. This must be the first directive in the list.
.TP
.BI \- NAME
Unset the variable \fINAME\fR.
@@ -582,7 +582,7 @@ the assignment.
The \fIVALUE\fR can contain macro variables, which will be expanded prior
to the assignment.
.SH "SEE ALSO"
-.BR dircond (8).
+.BR direvent (8).
.SH COPYRIGHT
Copyright \(co 2012, 2013 Sergey Poznyakoff
.br
diff --git a/doc/dircond.texi b/doc/dire