Commit b0a99e5fba3d04639c8fb2c181b21ab56d085c73 - entr

+1

-1

Makefile.bsd less more

0	0	PREFIX ?= /usr/local
1	1	MANPREFIX ?= ${PREFIX}/man
2		RELEASE = 4.1
	2	RELEASE = 4.2
3	3	CPPFLAGS += -DRELEASE=\"${RELEASE}\"
4	4
5	5	all: versioncheck entr

+8

-0

NEWS less more

0	0	= Release History
	1
	2	== 4.2: March 28, 2019
	3
	4	- Use pledge(2) on OpenBSD
	5	- New '-a' option enables response to events that occur while the utility is
	6	running
	7	- Error messages direct users to http://eradman.com/entrproject/limits.html
	8	- Correctly report error when a file cannot be reopened
1	9
2	10	== 4.1: June 13, 2018
3	11

+12

-2

entr.1 less more

12	12	.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
13	13	.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
14	14	.\"
15		.Dd April 17 2018 $
	15	.Dd March 28, 2019
16	16	.Dt ENTR 1
17	17	.Os
18	18	.Sh NAME

20	20	.Nd run arbitrary commands when files change
21	21	.Sh SYNOPSIS
22	22	.Nm
23		.Op Fl cdprs
	23	.Op Fl acdprs
24	24	.Ar utility
25	25	.Op Ar argument /_ ...
26	26	.Sh DESCRIPTION

35	35	.Pp
36	36	The arguments are as follows:
37	37	.Bl -tag -width Ds
	38	.It Fl a
	39	Respond to all events which occur while the
	40	.Ar utility
	41	is running.
	42	Without this option
	43	.Nm
	44	consolidates events in order to avoid looping.
	45	This option has no effect in conjunction with the
	46	.Fl r
	47	flag.
38	48	.It Fl c
39	49	Execute
40	50	.Pa /usr/bin/clear

+22

-14

entr.c less more

72	72	WatchFile *leading_edge;
73	73	int child_pid;
74	74
	75	int aggressive_opt;
75	76	int clear_opt;
76	77	int dirwatch_opt;
	78	int noninteractive_opt;
	79	int postpone_opt;
77	80	int restart_opt;
78		int postpone_opt;
79	81	int shell_opt;
80		int noninteractive_opt;
81	82	struct termios canonical_tty;
82	83
83	84	/* forwards */

126	127	xlist_dir = list_dir;
127	128	xtcsetattr = tcsetattr;
128	129
	130	if (pledge("stdio rpath tty proc exec", NULL) == -1)
	131	err(1, "pledge");
	132
129	133	/* call usage() if no command is supplied */
130	134	if (argc < 2) usage();
131	135	argv_index = set_options(argv);

137	141	if (sigemptyset(&act.sa_mask) & (sigaction(SIGINT, &act, NULL) != 0))
138	142	err(1, "Failed to set SIGINT handler");
139	143	if (sigemptyset(&act.sa_mask) & (sigaction(SIGTERM, &act, NULL) != 0))
140		err(1, "Failed to set TERM handler");
	144	err(1, "Failed to set SIGTERM handler");
141	145
142	146	/* raise soft limit */
143	147	getrlimit(RLIMIT_NOFILE, &rl);

168	172	if (n_files == -1)
169	173	errx(1, "Too many files listed; the hard limit for your login"
170	174	" class is %d. Please consult"
171		" http://entrproject.org/limits.html", (int)rl.rlim_cur);
	175	" http://eradman.com/entrproject/limits.html", (int)rl.rlim_cur);
172	176	for (i=0; i<n_files; i++)
173	177	watch_file(kq, files[i]);
174	178

199	203	void
200	204	usage() {
201	205	fprintf(stderr, "release: %s\n", RELEASE);
202		fprintf(stderr, "usage: entr [-cdnprs] utility [argument [/_] ...] < filenames\n");
	206	fprintf(stderr, "usage: entr [-acdnprs] utility [argument [/_] ...] < filenames\n");
203	207	exit(1);
204	208	}
205	209

225	229	}
226	230
227	231	/*
228		* Read lines from a file stream (normally STDIN)
229		* Returns the number of regular files to be watched or -1 if max_files is
230		* exceeded
	232	* Read lines from a file stream (normally STDIN). Returns the number of
	233	* regular files to be watched or -1 if max_files is exceeded.
231	234	*/
232	235	int
233	236	process_input(FILE file, WatchFile files[], int max_files) {

308	311
309	312	/* read arguments until we reach a command */
310	313	for (argc=1; argv[argc] != 0 && argv[argc][0] == '-'; argc++);
311		while ((ch = getopt(argc, argv, "cdnprs")) != -1) {
	314	while ((ch = getopt(argc, argv, "acdnprs")) != -1) {
312	315	switch (ch) {
	316	case 'a':
	317	aggressive_opt = 1;
	318	break;
313	319	case 'c':
314	320	clear_opt = 1;
315	321	break;

440	446	else break;
441	447	}
442	448	if (file->fd == -1) {
	449	warn("cannot open '%s'", file->fn);
443	450	terminate_utility();
444		err(1, "cannot open '%s'", file->fn);
	451	exit(1);
445	452	}
446	453
447	454	EV_SET(&evSet, file->fd, EVFILT_VNODE, EV_ADD \| EV_CLEAR, NOTE_ALL, 0,

450	457	if (errno == ENOSPC)
451	458	errx(1, "Unable to allocate memory for kernel queue."
452	459	" Please consult"
453		" http://entrproject.org/limits.html");
	460	" http://eradman.com/entrproject/limits.html");
454	461	else
455	462	err(1, "failed to register VNODE event");
456	463	}

494	501	WatchFile *file;
495	502	int i;
496	503	struct timespec evTimeout = { 0, 1000000 };
497		int reopen_only = 0;
	504	int reopen_only = !aggressive_opt;
498	505	int collate_only = 0;
499	506	int do_exec = 0;
500	507	int dir_modified = 0;

516	523
517	524	main:
518	525	if (!noninteractive_opt)
519		xtcsetattr(STDIN_FILENO, TCSADRAIN, &character_tty);
	526	xtcsetattr(0, TCSADRAIN, &character_tty);
520	527	if ((reopen_only == 1) \|\| (collate_only == 1)) {
521	528	nev = xkevent(kq, NULL, 0, evList, 32, &evTimeout);
522	529	}

631	638	if (do_exec == 1) {
632	639	do_exec = 0;
633	640	run_utility(argv);
634		reopen_only = 1;
	641	if (!aggressive_opt)
	642	reopen_only = 1;
635	643	leading_edge_set = 0;
636	644	}
637	645	if (dir_modified > 0) {

+5

-1

entr_spec.c less more

79	79	optind = 1;
80	80
81	81	/* initialize global data */
	82	aggressive_opt = 1;
82	83	clear_opt = 0;
83	84	dirwatch_opt = 0;
	85	noninteractive_opt = 0;
84	86	postpone_opt = 0;
85	87	restart_opt = 0;
86	88	shell_opt = 0;
87		noninteractive_opt = 0;
	89
88	90	leading_edge = 0;
89	91	files = calloc(max_files, sizeof(WatchFile *));
90	92	for (i=0; i<max_files; i++)
91	93	files[i] = calloc(1, sizeof(WatchFile));
	94
92	95	/* initialize test context */
93	96	memset(&ctx, 0, sizeof(ctx));
94	97

377	380	int kq = kqueue();
378	381	static char *argv[] = { "prog", "arg1", "arg2", NULL };
379	382
	383	aggressive_opt = 0;
380	384	postpone_opt = 1;
381	385	strlcpy(files[0]->fn, "main.py", sizeof(files[0]->fn));
382	386	watch_file(kq, files[0]);

+5

-1

missing/compat.h less more

14	14	#endif
15	15
16	16	#if !defined(ARG_MAX)
17		#define ARG_MAX 2097152
	17	#define ARG_MAX (256 * 1024)
18	18	#endif
	19
	20	#ifndef __OpenBSD__
	21	#define pledge(s, p) (0)
	22	#endif

+10

-0

system_test.sh less more

370	370
371	371	# extra slow tests that rely on timeouts
372	372
	373	try "respond to events that occur while the utility is running"
	374	setup
	375	ls $tmp/file* \| ./entr -a sh -c 'echo "vroom"; sleep 0.5' > $tmp/exec.out &
	376	bgpid=$! ; zz
	377	echo "123" > $tmp/file1
	378	sleep 1
	379	kill -INT $bgpid
	380	wait $bgpid \|\| assert "$?" "130"
	381	assert "$(cat $tmp/exec.out)" "$(printf 'vroom\nvroom\n')"
	382
373	383	try "ensure that all subprocesses are terminated in restart mode when a file is removed"
374	384	setup
375	385	cat <<-SCRIPT > $tmp/go.sh