From 1ff75f944f66e60d81a1f4157f3f2cfb21fa4f89 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Sun, 15 Mar 2015 17:30:28 +0000
Subject: preserve errno

---
 src/util/disk.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/util/disk.c b/src/util/disk.c
index b0a8ad7b0..da78a1e1d 100644
--- a/src/util/disk.c
+++ b/src/util/disk.c
@@ -868,7 +868,9 @@ GNUNET_DISK_file_read (const struct GNUNET_DISK_FileHandle *h,
     {
       if (GetLastError () != ERROR_IO_PENDING)
       {
-        LOG (GNUNET_ERROR_TYPE_DEBUG, "Error reading from pipe: %u\n", GetLastError ());
+        LOG (GNUNET_ERROR_TYPE_DEBUG,
+             "Error reading from pipe: %u\n",
+             GetLastError ());
         SetErrnoFromWinError (GetLastError ());
         return GNUNET_SYSERR;
       }
@@ -983,6 +985,7 @@ GNUNET_DISK_fn_read (const char *fn,
 {
   struct GNUNET_DISK_FileHandle *fh;
   ssize_t ret;
+  int eno;
 
   fh = GNUNET_DISK_file_open (fn,
                               GNUNET_DISK_OPEN_READ,
@@ -990,8 +993,9 @@ GNUNET_DISK_fn_read (const char *fn,
   if (NULL == fh)
     return GNUNET_SYSERR;
   ret = GNUNET_DISK_file_read (fh, result, len);
+  eno = errno;
   GNUNET_assert (GNUNET_OK == GNUNET_DISK_file_close (fh));
-
+  errno = eno;
   return ret;
 }
 
-- 
cgit v1.2.3