clearlinux/systemd-stable
2
0
Fork 0
mirror of https://github.com/clearlinux/systemd-stable.git synced 2026-09-06 21:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

journal: replace readdir_r with readdir

Browse Source 
This commit also adds error handling for failures during
directory reading.
This commit is contained in:
Florian Weimer
2013-12-21 18:35:55 -05:00
committed by Zbigniew Jędrzejewski-Szmek
parent a2be63f922
commit bde1fdd773
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/journal/sd-journal.c
+18 -6
View File
@@ -1442,10 +1442,16 @@ static int add_directory(sd_journal *j, const char *prefix, const char *dirname)
for (;;) {
struct dirent *de;
union dirent_storage buf;
r = readdir_r(d, &buf.de, &de);
if (r != 0 || !de)
errno = 0;
de = readdir(d);
if (!de && errno != 0) {
r = -errno;
log_debug("Failed to read directory %s: %s",
m->path, strerror(errno));
return r;
}
if (!de)
break;
if (dirent_is_file_with_suffix(de, ".journal") ||
@@ -1526,11 +1532,17 @@ static int add_root_directory(sd_journal *j, const char *p) {
for (;;) {
struct dirent *de;
union dirent_storage buf;
sd_id128_t id;
r = readdir_r(d, &buf.de, &de);
if (r != 0 || !de)
errno = 0;
de = readdir(d);
if (!de && errno != 0) {
r = -errno;
log_debug("Failed to read directory %s: %s",
m->path, strerror(errno));
return r;
}
if (!de)
break;
if (dirent_is_file_with_suffix(de, ".journal") ||