X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Futils-dir.c;h=3c934fccc875e09d373314f5e7d43c526c5c1af7;hb=c07d1ea01ae008dc5aa379932b1d2da90d7d291c;hp=b993e8669eb52c5ad70052df8e774a5567ce1bd5;hpb=27bb304eee3485c73e1be677fbc820591bacc2f9;p=src%2Fapp-framework-main.git diff --git a/src/utils-dir.c b/src/utils-dir.c index b993e86..3c934fc 100644 --- a/src/utils-dir.c +++ b/src/utils-dir.c @@ -1,5 +1,5 @@ /* - Copyright 2015, 2016 IoT.bzh + Copyright 2015, 2016, 2017 IoT.bzh author: José Bollo @@ -33,10 +33,6 @@ static int clean_dirfd(int dirfd) int rc; DIR *dir; struct dirent *ent; - struct { - struct dirent entry; - char spare[PATH_MAX]; - } entry; dir = fdopendir(dirfd); if (dir == NULL) { @@ -45,10 +41,13 @@ static int clean_dirfd(int dirfd) } for (;;) { rc = -1; - if (readdir_r(dir, &entry.entry, &ent) != 0) - goto error; - if (ent == NULL) + errno = 0; + ent = readdir(dir); + if (ent == NULL) { + if (errno) + goto error; break; + } if (ent->d_name[0] == '.' && (ent->d_name[1] == 0 || (ent->d_name[1] == '.' && ent->d_name[2] == 0))) continue;