From: Florian Weimer <fweimer@redhat.com>
Date: Thu, 19 Dec 2013 11:23:12 +0000 (+0100)
Subject: journald/server: replace readdir_r with readdir
X-Git-Tag: v209~746
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=0371ca0dac1d70b2e5060a3c4e6fbbc2bdbd8671

journald/server: replace readdir_r with readdir

The available_space function now returns 0 if reading the directory
fails.  Previously, such errors were silently ignored.
---

diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
index 3f8b95dee..a3bacdab6 100644
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -135,11 +135,11 @@ static uint64_t available_space(Server *s, bool verbose) {
         for (;;) {
                 struct stat st;
                 struct dirent *de;
-                union dirent_storage buf;
 
-                r = readdir_r(d, &buf.de, &de);
-                if (r != 0)
-                        break;
+                errno = 0;
+                de = readdir(d);
+                if (!de && errno != 0)
+                        return 0;
 
                 if (!de)
                         break;