tMerge branch 'master' of z3bra.org:wendy - wendy - watch files/directories and run commands on any event
HTML git clone git://z3bra.org/wendy
DIR Log
DIR Files
DIR Refs
DIR README
DIR LICENSE
---
DIR commit 010a50e899c96c995df263439caad4c3001a0f0b
DIR parent f98a8f1ea4f4174f307a2355dbd432d3510aec6e
HTML Author: z3bra <willy@mailoo.org>
Date: Mon, 10 Mar 2014 08:35:23 +0100
Merge branch 'master' of z3bra.org:wendy
Diffstat:
M wendy.c | 30 +++++++++++++++++++++---------
1 file changed, 21 insertions(+), 9 deletions(-)
---
DIR diff --git a/wendy.c b/wendy.c
t@@ -64,7 +64,9 @@ list_events()
"IN_CREATE ........ %u\n"
"IN_DELETE ........ %u\n"
"IN_DELETE_SELF ... %u\n"
- "IN_MOVE_SELF ..... %u\n",
+ "IN_MOVE_SELF ..... %u\n"
+ "IN_ALL_EVENTS .... %u\n"
+ "IN_UNMOUNT ....... %u\n",
IN_ACCESS,
IN_MODIFY,
IN_ATTRIB,
t@@ -76,7 +78,9 @@ list_events()
IN_CREATE,
IN_DELETE,
IN_DELETE_SELF,
- IN_MOVE_SELF
+ IN_MOVE_SELF,
+ IN_ALL_EVENTS,
+ IN_UNMOUNT
);
exit(0);
}
t@@ -128,11 +132,14 @@ main (int argc, char **argv)
if (fd < 0)
perror("inotify_init");
+add_watch:
/* add a watcher on the file */
wd = inotify_add_watch(fd, file, mask);
- if (wd < 0)
+ if (wd < 0) {
perror("inotify_add_watch");
+ exit(1);
+ }
if (!quiet) {
printf( "watching file %s with event mask %u\n", file, mask);
t@@ -140,6 +147,7 @@ main (int argc, char **argv)
/* start looping */
for (;;) {
+
/* get every event raised, and queue them */
len = read(fd, buf, BUF_LEN);
t@@ -149,15 +157,20 @@ main (int argc, char **argv)
i = 0;
-
/* treat all events queued */
while (i < len) {
/* get events one by one */
- ev = (struct inotify_event *) &buf[i];
+ ev = (struct inotify_event *) &buf[i];
- if (!quiet && ev->len > 0) {
- printf("event on file %s: %u\n", ev->name, ev->mask);
+ if (ev->mask & IN_IGNORED) {
+ printf("watch removed, attemting to create another\n");
+ goto add_watch;
+ }
+
+ if (!quiet) {
+ printf("event on file %s: %u\n",
+ ev->len ? ev->name : file, ev->mask);
}
/*
t@@ -169,8 +182,7 @@ main (int argc, char **argv)
* If you don't undersand this sentence, don't worry. Me neither.
* Just trust the if().
*/
- if (cmd && !(file && strncmp(file, ev->name, 255))) {
-
+ if (cmd) {
/* OMG a new event ! Quick, raise an alert ! */
if (!fork()) { execvpe(cmd[0], cmd, environ); }
}