diff options
author | Eric Wong <e@80x24.org> | 2021-03-24 14:23:28 +0500 |
---|---|---|
committer | Eric Wong <e@80x24.org> | 2021-03-24 23:01:16 +0000 |
commit | 5577a83631e057a31489aa1ce8d1d35ac33f9d7d (patch) | |
tree | e489fb96caff09cc7dd17dfa510f33bd5e65760e /lib | |
parent | c882fd47f0f83f0be9b8c524604e003295e2b1ba (diff) | |
download | public-inbox-5577a83631e057a31489aa1ce8d1d35ac33f9d7d.tar.gz |
Since lei-daemon will fchdir on every request, we must ensure we're in the correct directory before unlink(2) is called, since we can't use unlinkat(2) from pure Perl.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/PublicInbox/MboxLock.pm | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/lib/PublicInbox/MboxLock.pm b/lib/PublicInbox/MboxLock.pm index bea0e325..856b1e21 100644 --- a/lib/PublicInbox/MboxLock.pm +++ b/lib/PublicInbox/MboxLock.pm @@ -60,6 +60,11 @@ sub acq_dotlock { if (link($tmp, $dot_lock)) { unlink($tmp) or die "unlink($tmp): $!"; $self->{".lock$pid"} = $dot_lock; + if (substr($dot_lock, 0, 1) ne '/') { + opendir(my $dh, '.') or + die "opendir . $!"; + $self->{dh} = $dh; + } return; } unlink($tmp) or die "unlink($tmp): $!"; @@ -111,10 +116,19 @@ sub acq { $self; } +sub _fchdir { chdir($_[0]) } # OnDestroy callback + sub DESTROY { my ($self) = @_; if (my $f = $self->{".lock$$"}) { + my $x; + if (my $dh = delete $self->{dh}) { + opendir my $c, '.' or die "opendir . $!"; + $x = PublicInbox::OnDestroy->new(\&_fchdir, $c); + chdir($dh) or die "chdir (for $f): $!"; + } unlink($f) or die "unlink($f): $! (lock stolen?)"; + undef $x; } } |