fd-util: be more careful with fclose() errnos

This might fix #15859, a bug which I find very puzzling.

diff --git a/src/basic/fd-util.c b/src/basic/fd-util.c
index e2bee511478beab2fb5de276e9dcb08561e68e56..75a6282ed08d9e746b8612875031a89090d57f85 100644 (file)
--- a/src/basic/fd-util.c
+++ b/src/basic/fd-util.c
@@ -103,13 +103,16 @@ int fclose_nointr(FILE *f) {
 
         /* Same as close_nointr(), but for fclose() */
 
+        errno = 0; /* Extra safety: if the FILE* object is not encapsulating an fd, it might not set errno
+                    * correctly. Let's hence initialize it to zero first, so that we aren't confused by any
+                    * prior errno here */
         if (fclose(f) == 0)
                 return 0;
 
         if (errno == EINTR)
                 return 0;
 
-        return -errno;
+        return errno_or_else(EIO);
 }
 
 FILE* safe_fclose(FILE *f) {