1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
|
--- src/inotifywatch.c.orig 2020-01-30 00:04:48 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,10 +117,26 @@ 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.
|
