From: Florian Weimer <fweimer@redhat.com>
Date: Thu, 19 Dec 2013 11:26:07 +0000 (+0100)
Subject: tmpfiles: replace readdir_r with readdir
X-Git-Tag: v209~753
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=d78096b343400d7a9f513a55b76c8de28adb2e08;hp=016284c352084cdbf856905704070c1f30970f58

tmpfiles: replace readdir_r with readdir
---

diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
index b7f6a2e05..e83a73e27 100644
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -543,15 +543,15 @@ static int recursive_relabel_children(Item *i, const char *path) {
 
         for (;;) {
                 struct dirent *de;
-                union dirent_storage buf;
                 bool is_dir;
                 int r;
                 _cleanup_free_ char *entry_path = NULL;
 
-                r = readdir_r(d, &buf.de, &de);
-                if (r != 0) {
+                errno = 0;
+                de = readdir(d);
+                if (!de && errno != 0) {
                         if (ret == 0)
-                                ret = -r;
+                                ret = -errno;
                         break;
                 }