Code Review
/
src
/
app-framework-main.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
genconf: set filetype and syntax
[src/app-framework-main.git]
/
src
/
utils-dir.c
diff --git
a/src/utils-dir.c
b/src/utils-dir.c
index
96e803b
..
3c934fc
100644
(file)
--- a/
src/utils-dir.c
+++ b/
src/utils-dir.c
@@
-1,5
+1,5
@@
/*
/*
- Copyright 2015 IoT.bzh
+ Copyright 2015
, 2016, 2017
IoT.bzh
author: José Bollo <jose.bollo@iot.bzh>
author: José Bollo <jose.bollo@iot.bzh>
@@
-33,10
+33,6
@@
static int clean_dirfd(int dirfd)
int rc;
DIR *dir;
struct dirent *ent;
int rc;
DIR *dir;
struct dirent *ent;
- struct {
- struct dirent entry;
- char spare[PATH_MAX];
- } entry;
dir = fdopendir(dirfd);
if (dir == NULL) {
dir = fdopendir(dirfd);
if (dir == NULL) {
@@
-45,10
+41,13
@@
static int clean_dirfd(int dirfd)
}
for (;;) {
rc = -1;
}
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;
break;
+ }
if (ent->d_name[0] == '.' && (ent->d_name[1] == 0
|| (ent->d_name[1] == '.' && ent->d_name[2] == 0)))
continue;
if (ent->d_name[0] == '.' && (ent->d_name[1] == 0
|| (ent->d_name[1] == '.' && ent->d_name[2] == 0)))
continue;