- 

--- src/inotifywatch.c.orig	2015-11-08 15:17:11 UTC

+++ src/inotifywatch.c

@@ -12,6 +12,7 @@

 #include <errno.h>

 #include <fcntl.h>

 #include <getopt.h>

+#include <pthread.h>

 #include <regex.h>

 #include <signal.h>

 #include <stdbool.h>

@@ -91,6 +92,7 @@ int main(int argc, char ** argv)

 	done = false;

 	char * regex = NULL;

 	char * iregex = NULL;

+	sigset_t set, oset;

 	signal( SIGINT, handle_impatient_user );

@@ -109,6 +111,16 @@ int main(int argc, char ** argv)

 		return EXIT_FAILURE;

 	}

+	// Block some signals in libinotify's worker thread, so that

+	// handle_signal runs in the context of the main thread and

+	// the `done' flag is actually honored.

+	sigemptyset(&set);

+	sigaddset(&set, SIGINT);

+	sigaddset(&set, SIGHUP);

+	sigaddset(&set, SIGTERM);

+	sigaddset(&set, SIGALRM);

+	pthread_sigmask(SIG_BLOCK, &set, &oset);

+

 	if ( !inotifytools_initialize() ) {

 		fprintf(stderr, "Couldn't initialize inotify.  Are you running Linux "

 		                "2.6.13 or later, and was the\n"

@@ -120,6 +132,8 @@ int main(int argc, char ** argv)

 		return EXIT_FAILURE;

 	}

+	pthread_sigmask(SIG_SETMASK, &oset, NULL);

+

 	// Attempt to watch file

 	// If events is still 0, make it all events.

 	if ( !events )

@@ -195,7 +209,7 @@ int main(int argc, char ** argv)

 	char * moved_from = 0;

 	do {

-		event = inotifytools_next_event( 0 );

+		event = inotifytools_next_event( -1 );

 		if ( !event ) {

 			if ( !inotifytools_error() ) {

 				return EXIT_TIMEOUT;