From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 21 Aug 2014 14:13:43 +0000 (+0200)
Subject: util: make asynchronous_close() really work like an asynchronous version of safe_close()
X-Git-Tag: v217~807
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=5ed1227238724959f020169f5332086439709b55;hp=a9f85faf43ae2289e19ba9105c36496aefe66072;p=elogind.git

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

Save/restore errno, like we do in safe_close(). And don't fork a thread
if the parameter is already negative.
---

diff --git a/src/shared/async.c b/src/shared/async.c
index 3876deda7..115901e63 100644
--- a/src/shared/async.c
+++ b/src/shared/async.c
@@ -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;
 }