chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
016284c
)
tmpfiles: replace readdir_r with readdir
author
Florian Weimer
<fweimer@redhat.com>
Thu, 19 Dec 2013 11:26:07 +0000
(12:26 +0100)
committer
Zbigniew Jędrzejewski-Szmek
<zbyszek@in.waw.pl>
Sat, 21 Dec 2013 23:35:55 +0000
(18:35 -0500)
src/tmpfiles/tmpfiles.c
patch
|
blob
|
history
diff --git
a/src/tmpfiles/tmpfiles.c
b/src/tmpfiles/tmpfiles.c
index b7f6a2e058bcdcf539c5aaa7e06c7cf69b60b710..e83a73e2793c3ffc014644d82415ea3349ecadba 100644
(file)
--- 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;
}