applications/i3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tests: make complete-run use POSIX::close(3) instead of reserving a file descriptor when starting

Browse Source 
This makes it possible to run complete-run.pl with a "tainted" environment in
which fd 3 (and possibly others) are already present.
This commit is contained in:
Michael Stapelberg 2011-10-04 19:58:17 +01:00
parent 658bf5adff
commit 20d6ae4110
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
testcases/complete-run.pl
View File

@ -33,15 +33,6 @@ use IO::Socket::UNIX; # core
use POSIX; # core use POSIX; # core
use AnyEvent::Handle; use AnyEvent::Handle;
# open a file so that we get file descriptor 3. we will later close it in the
# child and dup() the listening socket file descriptor to 3 to pass it to i3
open(my $reserved, '<', '/dev/null');
if (fileno($reserved) != 3) {
warn "Socket file descriptor is not 3.";
warn "Please don't start this script within a subshell of vim or something.";
exit 1;
}
# install a dummy CHLD handler to overwrite the CHLD handler of AnyEvent / EV # install a dummy CHLD handler to overwrite the CHLD handler of AnyEvent / EV
# XXX: we could maybe also use a different loop than the default loop in EV? # XXX: we could maybe also use a different loop than the default loop in EV?
$SIG{CHLD} = sub { $SIG{CHLD} = sub {
@ -165,7 +156,7 @@ sub take_job {
$ENV{DISPLAY} = $display; $ENV{DISPLAY} = $display;
$^F = 3; $^F = 3;
close($reserved); POSIX::close(3);
POSIX::dup2(fileno($socket), 3); POSIX::dup2(fileno($socket), 3);
# now execute i3 # now execute i3