qi-hardware/gmenu2x
1
0
Fork 0
mirror of git://projects.qi-hardware.com/gmenu2x.git synced 2024-12-01 21:17:31 +02:00
Code

menu.cpp: Don't use stat() to know if a FS entry is a directory

Browse Source 
The pointer returned by readdir() already informs us of the type
of the FS entry.
This commit is contained in:
Paul Cercueil 2012-10-06 17:38:58 +02:00
parent 16d66d0dbc
commit 3dc12d06ea
1 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/menu.cpp
View File

@ -61,27 +61,23 @@ uint Menu::firstDispRow() {
void Menu::readSections(std::string parentDir) void Menu::readSections(std::string parentDir)
{ {
DIR *dirp; DIR *dirp;
struct stat st;
struct dirent *dptr; struct dirent *dptr;
dirp = opendir(parentDir.c_str()); dirp = opendir(parentDir.c_str());
if (!dirp) return; if (!dirp) return;
while ((dptr = readdir(dirp))) { while ((dptr = readdir(dirp))) {
int statret; if (dptr->d_name[0] == '.' || dptr->d_type != DT_DIR)
if (dptr->d_name[0]=='.') continue; continue;
string filepath = parentDir + "/" + dptr->d_name; string filepath = parentDir + "/" + dptr->d_name;
statret = stat(filepath.c_str(), &st);
if (!S_ISDIR(st.st_mode)) continue;
if (statret != -1) {
if (find(sections.begin(), sections.end(), (string)dptr->d_name) == sections.end()) { if (find(sections.begin(), sections.end(), (string)dptr->d_name) == sections.end()) {
sections.push_back((string)dptr->d_name); sections.push_back((string)dptr->d_name);
vector<Link*> ll; vector<Link*> ll;
links.push_back(ll); links.push_back(ll);
} }
} }
}
closedir(dirp); closedir(dirp);
} }
@ -425,17 +421,13 @@ void Menu::setLinkIndex(int i) {
void Menu::readLinksOfSection(std::string path, std::vector<std::string> &linkfiles) void Menu::readLinksOfSection(std::string path, std::vector<std::string> &linkfiles)
{ {
DIR *dirp; DIR *dirp;
struct stat st;
struct dirent *dptr; struct dirent *dptr;
if ((dirp = opendir(path.c_str())) == NULL) return; if ((dirp = opendir(path.c_str())) == NULL) return;
while ((dptr = readdir(dirp))) { while ((dptr = readdir(dirp))) {
if (dptr->d_name[0] == '.') continue; if (dptr->d_type != DT_REG) continue;
string filepath = path + "/" + dptr->d_name; string filepath = path + "/" + dptr->d_name;
int statret = stat(filepath.c_str(), &st);
if (S_ISDIR(st.st_mode)) continue;
if (statret != -1)
linkfiles.push_back(filepath); linkfiles.push_back(filepath);
} }