picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

util: use readdir_r() instead of readdir()

Browse source
This commit is contained in:
Lennart Poettering 2011-07-22 04:25:25 +02:00
parent 830964834f
commit f782b8d031
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/util.c
View file

@ -4801,7 +4801,7 @@ static int file_is_conf(const struct dirent *d, const char *suffix) {
static int files_add(Hashmap *h, const char *path, const char *suffix) {
DIR *dir;
struct dirent *de;
struct dirent buffer, *de;
int r = 0;
dir = opendir(path);
@ -4811,9 +4811,18 @@ static int files_add(Hashmap *h, const char *path, const char *suffix) {
return -errno;
}
for (de = readdir(dir); de; de = readdir(dir)) {
for (;;) {
int k;
char *p, *f;
const char *base;
k = readdir_r(dir, &buffer, &de);
if (k != 0) {
r = -k;
goto finish;
}
if (!de)
break;
if (!file_is_conf(de, suffix))
continue;
@ -4832,8 +4841,7 @@ static int files_add(Hashmap *h, const char *path, const char *suffix) {
free(p);
log_debug("found: %s\n", f);
base = f + strlen(path) + 1;
if (hashmap_put(h, base, f) <= 0)
if (hashmap_put(h, file_name_from_path(f), f) <= 0)
free(f);
}