OctaForge
/
libostd
1
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

cleanup

master
Daniel Kolesa 2015-09-06 17:39:09 +01:00
parent 1c48de0ccd
commit a31fbdbe32
1 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ostd/filesystem.hh
View File

@ -264,15 +264,8 @@ struct DirectoryStream {
long ret = 0;
struct dirent rdv;
struct dirent *rd;
for (;;) {
if (readdir_r(td, &rdv, &rd)) {
closedir(td);
return -1;
}
if (!rd)
break;
ret += (strcmp(rd->d_name, ".") && strcmp(rd->d_name, ".."));
}
while (pop_front(td, &rdv, &rd))
++ret;
closedir(td);
return ret;
}
@ -303,16 +296,20 @@ private:
return !p_de;
}
bool pop_front() {
if (!p_d) return false;
if (readdir_r(p_d, &p_dev, &p_de))
static bool pop_front(DIR *d, struct dirent *dev, struct dirent **de) {
if (!d) return false;
if (readdir_r(d, dev, de))
return false;
while (p_de && (!strcmp(p_de->d_name, ".") ||
!strcmp(p_de->d_name, ".."))) {
if (readdir_r(p_d, &p_dev, &p_de))
while (*de && (!strcmp((*de)->d_name, ".") ||
!strcmp((*de)->d_name, ".."))) {
if (readdir_r(d, dev, de))
return false;
}
return !!p_de;
return !!*de;
}
bool pop_front() {
return pop_front(p_d, &p_dev, &p_de);
}
FileInfo front() const {