From 4d993c8cb75aef0f4293e0b9e8f249dd0530b5d8 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Thu, 19 Dec 2013 11:59:19 +0100 Subject: [PATCH] install: replace readdir_r with readdir The old code incorrectly assumed that readdir_r updates errno. --- src/shared/install.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/src/shared/install.c b/src/shared/install.c index 17e8a75..5001ad4 100644 --- a/src/shared/install.c +++ b/src/shared/install.c @@ -212,11 +212,10 @@ static int remove_marked_symlinks_fd( for (;;) { struct dirent *de; - union dirent_storage buf; - int k; - k = readdir_r(d, &buf.de, &de); - if (k != 0) { + errno = 0; + de = readdir(d); + if (!de && errno != 0) { r = -errno; break; } @@ -373,12 +372,11 @@ static int find_symlinks_fd( } for (;;) { - int k; struct dirent *de; - union dirent_storage buf; - k = readdir_r(d, &buf.de, &de); - if (k != 0) + errno = 0; + de = readdir(d); + if (!de && errno != 0) return -errno; if (!de) @@ -1938,12 +1936,12 @@ int unit_file_get_list( for (;;) { struct dirent *de; - union dirent_storage buffer; _cleanup_unitfilelist_free_ UnitFileList *f = NULL; - r = readdir_r(d, &buffer.de, &de); - if (r != 0) - return -r; + errno = 0; + de = readdir(d); + if (!de && errno != 0) + return -errno; if (!de) break; -- 2.7.4