bb22ecf6d0
Additional port changes: * Updated MAINTANER e-mail * Reformatted the patch to fit reformatted surroundings Reported by: portscout Approved by: adamw (mentor) Differential Revision: https://reviews.freebsd.org/D14202
52 lines
1.4 KiB
C
52 lines
1.4 KiB
C
--- src/inotifywatch.c.orig 2018-01-06 11:10:51 UTC
|
|
+++ src/inotifywatch.c
|
|
@@ -12,6 +12,9 @@
|
|
#include <errno.h>
|
|
#include <fcntl.h>
|
|
#include <getopt.h>
|
|
+#ifdef __FreeBSD__
|
|
+#include <pthread.h>
|
|
+#endif // __FreeBSD__
|
|
#include <regex.h>
|
|
#include <signal.h>
|
|
#include <stdbool.h>
|
|
@@ -82,6 +85,10 @@ int main(int argc, char **argv) {
|
|
char *inc_regex = NULL;
|
|
char *inc_iregex = NULL;
|
|
|
|
+#ifdef __FreeBSD__
|
|
+ sigset_t set, oset;
|
|
+#endif // __FreeBSD__
|
|
+
|
|
signal(SIGINT, handle_impatient_user);
|
|
|
|
// Parse commandline options, aborting if something goes wrong
|
|
@@ -110,11 +117,27 @@ int main(int argc, char **argv) {
|
|
return EXIT_FAILURE;
|
|
}
|
|
|
|
+#ifdef __FreeBSD__
|
|
+ // 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);
|
|
+#endif // __FreeBSD__
|
|
+
|
|
if (!inotifytools_initialize()) {
|
|
warn_inotify_init_error();
|
|
return EXIT_FAILURE;
|
|
}
|
|
|
|
+#ifdef __FreeBSD__
|
|
+ pthread_sigmask(SIG_SETMASK, &oset, NULL);
|
|
+#endif // __FreeBSD__
|
|
+
|
|
// Attempt to watch file
|
|
// If events is still 0, make it all events.
|
|
if (!events)
|