aboutsummaryrefslogtreecommitdiffstats
path: root/testing/inotify-tools-inc/add-include-regex.patch
blob: 31833e0df5a8f3db8df214bb4cd1f71a0f748df5 (plain) (blame)
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
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
### adapted from https://github.com/rvoicilas/inotify-tools/pull/28 ###
diff -urp inotify-tools-3.14/libinotifytools/src/inotifytools/inotifytools.h inotify-tools.new/libinotifytools/src/inotifytools/inotifytools.h
--- inotify-tools-3.14/libinotifytools/src/inotifytools/inotifytools.h	2010-03-12 13:53:46.000000000 +0000
+++ inotify-tools.new/libinotifytools/src/inotifytools/inotifytools.h	2015-05-10 02:22:22.971561931 +0000
@@ -28,7 +28,7 @@ int inotifytools_watch_recursively_with_
                                                  int events,
                                                  char const ** exclude_list );
                                                  // [UH]
-int inotifytools_ignore_events_by_regex( char const *pattern, int flags );
+int inotifytools_ignore_events_by_regex( char const *pattern, int flags, int invert );
 struct inotify_event * inotifytools_next_event( int timeout );
 struct inotify_event * inotifytools_next_events( int timeout, int num_events );
 int inotifytools_error();
diff -urp inotify-tools-3.14/libinotifytools/src/inotifytools.c inotify-tools.new/libinotifytools/src/inotifytools.c
--- inotify-tools-3.14/libinotifytools/src/inotifytools.c	2010-03-12 13:53:46.000000000 +0000
+++ inotify-tools.new/libinotifytools/src/inotifytools.c	2015-05-10 02:21:08.839560752 +0000
@@ -149,6 +149,7 @@ static int error = 0;
 static int init = 0;
 static char* timefmt = 0;
 static regex_t* regex = 0;
+static int invert_regex = 0;
 
 int isdir( char const * path );
 void record_stats( struct inotify_event const * event );
@@ -1103,12 +1104,14 @@ struct inotify_event * inotifytools_next
 	static ssize_t bytes;
 	static jmp_buf jmp;
 	static char match_name[MAX_STRLEN];
+	static int rv;
 
 #define RETURN(A) {\
 	if (regex) {\
 		inotifytools_snprintf(match_name, MAX_STRLEN, A, "%w%f");\
-		if (0 == regexec(regex, match_name, 0, 0, 0)) {\
-			longjmp(jmp,0);\
+		rv = regexec(regex, match_name, 0, 0, 0); \
+		if ((!invert_regex && 0 == rv) || (invert_regex && 0 != rv)) { \
+			longjmp(jmp,0); \
 		}\
 	}\
 	if ( collect_stats ) {\
@@ -1999,7 +2002,7 @@ int inotifytools_get_max_user_watches()
  * events occur.  If the regular expression matches, the matched event will be
  * ignored.
  */
-int inotifytools_ignore_events_by_regex( char const *pattern, int flags ) {
+int inotifytools_ignore_events_by_regex( char const *pattern, int flags, int invert ) {
 	if (!pattern) {
 		if (regex) {
 			regfree(regex);
@@ -2013,7 +2016,10 @@ int inotifytools_ignore_events_by_regex(
 	else       { regex = (regex_t *)malloc(sizeof(regex_t)); }
 
 	int ret = regcomp(regex, pattern, flags | REG_NOSUB);
-	if (0 == ret) return 1;
+	if (0 == ret) {
+        invert_regex = invert;
+        return 1;
+	}
 
 	regfree(regex);
 	free(regex);

diff -urp inotify-tools-3.14/src/inotifywait.c inotify-tools.new/src/inotifywait.c
--- inotify-tools-3.14/src/inotifywait.c	2010-03-12 13:53:46.000000000 +0000
+++ inotify-tools.new/src/inotifywait.c	2015-05-10 16:53:20.384393049 +0000
@@ -48,7 +48,9 @@ bool parse_opts(
   char ** fromfile,
   char ** outfile,
   char ** regex,
-  char ** iregex
+  char ** iregex,
+  char ** include_regex,
+  char ** include_iregex
 );
 
 void print_help();
@@ -157,16 +159,29 @@ int main(int argc, char ** argv)
 	char * outfile = NULL;
 	char * regex = NULL;
 	char * iregex = NULL;
+	char * include_regex = NULL;
+	char * include_iregex = NULL;
+	bool invert_regex = false;
 	pid_t pid;
     int fd;
 
 	// Parse commandline options, aborting if something goes wrong
 	if ( !parse_opts(&argc, &argv, &events, &monitor, &quiet, &timeout,
-	                 &recursive, &csv, &daemon, &syslog, &format, &timefmt, 
-                         &fromfile, &outfile, &regex, &iregex) ) {
+			&recursive, &csv, &daemon, &syslog, &format, &timefmt,
+			&fromfile, &outfile, &regex, &iregex, &include_regex, &include_iregex) ) {
 		return EXIT_FAILURE;
 	}
 
+	if (include_regex) {
+		regex = include_regex;
+		invert_regex = true;
+	}
+
+	if (include_iregex) {
+		iregex = include_iregex;
+		invert_regex = true;
+	}
+
 	if ( !inotifytools_initialize() ) {
 		fprintf(stderr, "Couldn't initialize inotify.  Are you running Linux "
 		                "2.6.13 or later, and was the\n"
@@ -180,11 +195,11 @@ int main(int argc, char ** argv)
 
 	if ( timefmt ) inotifytools_set_printf_timefmt( timefmt );
 	if (
-		(regex && !inotifytools_ignore_events_by_regex(regex, REG_EXTENDED) ) ||
+		(regex && !inotifytools_ignore_events_by_regex(regex, REG_EXTENDED, invert_regex) ) ||
 		(iregex && !inotifytools_ignore_events_by_regex(iregex, REG_EXTENDED|
-		                                                        REG_ICASE))
+									REG_ICASE, invert_regex))
 	) {
-		fprintf(stderr, "Error in `exclude' regular expression.\n");
+		fprintf(stderr, "Error in `exclude' or `include' regular expression.\n");
 		return EXIT_FAILURE;
 	}
 
@@ -423,18 +438,20 @@ bool parse_opts(
   char ** fromfile,
   char ** outfile,
   char ** regex,
-  char ** iregex
+  char ** iregex,
+  char ** include_regex,
+  char ** include_iregex
 ) {
 	assert( argc ); assert( argv ); assert( events ); assert( monitor );
 	assert( quiet ); assert( timeout ); assert( csv ); assert( daemon );
-	assert( syslog ); assert( format ); assert( timefmt ); assert( fromfile ); 
+	assert( syslog ); assert( format ); assert( timefmt ); assert( fromfile );
 	assert( outfile ); assert( regex ); assert( iregex );
 
 	// Short options
 	char * opt_string = "mrhcdsqt:fo:e:";
 
 	// Construct array
-	struct option long_opts[17];
+	struct option long_opts[19];
 
 	// --help
 	long_opts[0].name = "help";
@@ -520,11 +537,21 @@ bool parse_opts(
 	long_opts[15].has_arg = 1;
 	long_opts[15].flag = NULL;
 	long_opts[15].val = (int)'b';
+	// --include
+	long_opts[16].name = "include";
+	long_opts[16].has_arg = 1;
+	long_opts[16].flag = NULL;
+	long_opts[16].val = (int)'j';
+	// --includei
+	long_opts[17].name = "includei";
+	long_opts[17].has_arg = 1;
+	long_opts[17].flag = NULL;
+	long_opts[17].val = (int)'k';
 	// Empty last element
-	long_opts[16].name = 0;
-	long_opts[16].has_arg = 0;
-	long_opts[16].flag = 0;
-	long_opts[16].val = 0;
+	long_opts[18].name = 0;
+	long_opts[18].has_arg = 0;
+	long_opts[18].flag = 0;
+	long_opts[18].val = 0;
 
 	// Get first option
 	char curr_opt = getopt_long(*argc, *argv, opt_string, long_opts, NULL);
@@ -604,6 +631,16 @@ bool parse_opts(
 				(*iregex) = optarg;
 				break;
 
+			// --include
+			case 'j':
+				(*include_regex) = optarg;
+				break;
+
+			// --includei
+			case 'k':
+				(*include_iregex) = optarg;
+				break;
+
 			// --fromfile
 			case 'z':
 				if (*fromfile) {
@@ -671,6 +708,16 @@ bool parse_opts(
 		return false;
 	}
 
+	if ( *include_regex && *include_iregex ) {
+		fprintf(stderr, "--include and --includei cannot both be specified.\n");
+		return false;
+	}
+
+	if ( ( *include_regex || *include_iregex ) && ( *regex || *iregex ) ) {
+		fprintf(stderr, "Cannot use include and exclude options simultaneously.\n");
+		return false;
+	}
+
 	if ( *format && *csv ) {
 		fprintf(stderr, "-c and --format cannot both be specified.\n");
 		return false;
@@ -715,6 +762,11 @@ void print_help()
 	       "\t              \textended regular expression <pattern>.\n");
 	printf("\t--excludei <pattern>\n"
 	       "\t              \tLike --exclude but case insensitive.\n");
+	printf("\t--include <pattern>\n"
+	       "\t              \tInclude all events on only those files matching\n"
+	       "\t              \tthe extended regular expression <pattern>.\n");
+	printf("\t--includei <pattern>\n"
+	       "\t              \tLike --include but case insensitive.\n");
 	printf("\t-m|--monitor  \tKeep listening for events forever.  Without\n"
 	       "\t              \tthis option, inotifywait will exit after one\n"
 	       "\t              \tevent is received.\n");
diff -urp inotify-tools-3.14/src/inotifywatch.c inotify-tools.new/src/inotifywatch.c
--- inotify-tools-3.14/src/inotifywatch.c	2010-03-12 13:53:46.000000000 +0000
+++ inotify-tools.new/src/inotifywatch.c	2015-05-10 16:51:40.060391453 +0000
@@ -43,7 +43,9 @@ bool parse_opts(
   int * recursive,
   char ** fromfile,
   char ** regex,
-  char ** iregex
+  char ** iregex,
+  char ** include_regex,
+  char ** include_iregex
 );
 
 void print_help();
@@ -91,21 +93,34 @@ int main(int argc, char ** argv)
 	done = false;
 	char * regex = NULL;
 	char * iregex = NULL;
+	char * include_regex = NULL;
+	char * include_iregex = NULL;
+	bool invert_regex = false;
 
 	signal( SIGINT, handle_impatient_user );
 
 	// Parse commandline options, aborting if something goes wrong
 	if ( !parse_opts( &argc, &argv, &events, &timeout, &verbose, &zero, &sort,
-	                 &recursive, &fromfile, &regex, &iregex ) ) {
+			&recursive, &fromfile, &regex, &iregex, &include_regex, &include_iregex ) ) {
 		return EXIT_FAILURE;
 	}
 
+	if (include_regex) {
+		regex = include_regex;
+		invert_regex = true;
+	}
+
+	if (include_iregex) {
+		iregex = include_iregex;
+		invert_regex = true;
+	}
+
 	if (
-		(regex && !inotifytools_ignore_events_by_regex(regex, REG_EXTENDED) ) ||
+		(regex && !inotifytools_ignore_events_by_regex(regex, REG_EXTENDED, invert_regex) ) ||
 		(iregex && !inotifytools_ignore_events_by_regex(iregex, REG_EXTENDED|
-		                                                        REG_ICASE))
+									REG_ICASE, invert_regex))
 	) {
-		fprintf(stderr, "Error in `exclude' regular expression.\n");
+		fprintf(stderr, "Error in `exclude' or `include' regular expression.\n");
 		return EXIT_FAILURE;
 	}
 
@@ -390,7 +405,9 @@ bool parse_opts(
   int * recursive,
   char ** fromfile,
   char ** regex,
-  char ** iregex
+  char ** iregex,
+  char ** include_regex,
+  char ** include_iregex
 ) {
 	assert( argc ); assert( argv ); assert( events ); assert( timeout );
 	assert( verbose ); assert( zero ); assert( sort ); assert( recursive );
@@ -400,7 +417,7 @@ bool parse_opts(
 	char * opt_string = "hra:d:zve:t:";
 
 	// Construct array
-	struct option long_opts[12];
+	struct option long_opts[14];
 
 	// --help
 	long_opts[0].name = "help";
@@ -460,11 +477,21 @@ bool parse_opts(
 	long_opts[10].has_arg = 1;
 	long_opts[10].flag = NULL;
 	long_opts[10].val = (int)'b';
+	// --include
+	long_opts[11].name = "include";
+	long_opts[11].has_arg = 1;
+	long_opts[11].flag = NULL;
+	long_opts[11].val = (int)'j';
+	// --includei
+	long_opts[12].name = "includei";
+	long_opts[12].has_arg = 1;
+	long_opts[12].flag = NULL;
+	long_opts[12].val = (int)'k';
 	// Empty last element
-	long_opts[11].name = 0;
-	long_opts[11].has_arg = 0;
-	long_opts[11].flag = 0;
-	long_opts[11].val = 0;
+	long_opts[13].name = 0;
+	long_opts[13].has_arg = 0;
+	long_opts[13].flag = 0;
+	long_opts[13].val = 0;
 
 	// Get first option
 	char curr_opt = getopt_long(*argc, *argv, opt_string, long_opts, NULL);
@@ -506,6 +533,16 @@ bool parse_opts(
 				(*iregex) = optarg;
 				break;
 
+			// --include
+			case 'j':
+				(*include_regex) = optarg;
+				break;
+
+			// --includei
+			case 'k':
+				(*include_iregex) = optarg;
+				break;
+
 			// --fromfile
 			case 'o':
 				if (*fromfile) {
@@ -625,6 +662,16 @@ bool parse_opts(
 		return false;
 	}
 
+	if ( *include_regex && *include_iregex ) {
+		fprintf(stderr, "--include and --includei cannot both be specified.\n");
+		return false;
+	}
+
+	if ( ( *include_regex || *include_iregex ) && ( *regex || *iregex ) ) {
+		fprintf(stderr, "Cannot use include and exclude options simultaneously.\n");
+		return false;
+	}
+
 	// If ? returned, invalid option
 	return (curr_opt != '?');
 }
@@ -647,6 +694,11 @@ void print_help()
 	       "\t\texpression <pattern>.\n");
 	printf("\t--excludei <pattern>\n"
 	       "\t\tLike --exclude but case insensitive.\n");
+	printf("\t--include <pattern>\n"
+	       "\t\tInclude all events only those files matching the extended\n"
+	       "\t\tregular expression <pattern>.\n");
+	printf("\t--includei <pattern>\n"
+	       "\t\tLike --include but case insensitive.\n");
 	printf("\t-z|--zero\n"
 	       "\t\tIn the final table of results, output rows and columns even\n"
 	       "\t\tif they consist only of zeros (the default is to not output\n"