picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

util: make asynchronous_close() really work like an asynchronous version of safe_close()

Browse source 
Save/restore errno, like we do in safe_close(). And don't fork a thread
if the parameter is already negative.
This commit is contained in:
Lennart Poettering 2014-08-21 16:13:43 +02:00
parent a9f85faf43
commit 5ed1227238
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/shared/async.c
View file

@ -73,7 +73,7 @@ int asynchronous_sync(void) {
}
static void *close_thread(void *p) {
safe_close(PTR_TO_INT(p));
assert_se(close_nointr(PTR_TO_INT(p)) != -EBADF);
return NULL;
}
@ -86,9 +86,13 @@ int asynchronous_close(int fd) {
* but it doesn't, so we work around it, and hide this as a
* far away as we can. */
r = asynchronous_job(close_thread, INT_TO_PTR(fd));
if (r < 0)
safe_close(fd);
if (fd >= 0) {
PROTECT_ERRNO;
r = asynchronous_job(close_thread, INT_TO_PTR(fd));
if (r < 0)
assert_se(close_nointr(fd) != -EBADF);
}
return -1;
}