Salastil/ncmpcpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make code from Browser::GetLocalDirectory() portable

Browse Source
This commit is contained in:
Andrzej Rybczak
2009-03-25 19:52:03 +01:00
parent 1b22f307ea
commit de98176198
1 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/browser.cpp
View File

@@ -317,22 +317,34 @@ bool Browser::hasSupportedExtension(const string &file)
void Browser::GetLocalDirectory(ItemList &v) void Browser::GetLocalDirectory(ItemList &v)
{ {
dirent **list; DIR *dir = opendir(itsBrowsedDir.c_str());
int n = scandir(itsBrowsedDir.c_str(), &list, NULL, alphasort);
if (n < 0) if (!dir)
return; return;
dirent *file;
struct stat file_stat; struct stat file_stat;
string full_path; string full_path;
for (int i = 2; i < n; i++) // omit . and ..
for (int i = 0; i < 2; i++)
{
file = readdir(dir);
if (!file)
{
closedir(dir);
return;
}
}
while ((file = readdir(dir)))
{ {
Item new_item; Item new_item;
full_path = itsBrowsedDir; full_path = itsBrowsedDir;
if (itsBrowsedDir != "/") if (itsBrowsedDir != "/")
full_path += "/"; full_path += "/";
full_path += list[i]->d_name; full_path += file->d_name;
stat(full_path.c_str(), &file_stat); stat(full_path.c_str(), &file_stat);
if (S_ISDIR(file_stat.st_mode)) if (S_ISDIR(file_stat.st_mode))
{ {
@@ -340,7 +352,7 @@ void Browser::GetLocalDirectory(ItemList &v)
new_item.name = full_path; new_item.name = full_path;
v.push_back(new_item); v.push_back(new_item);
} }
else if (hasSupportedExtension(list[i]->d_name)) else if (hasSupportedExtension(file->d_name))
{ {
new_item.type = itSong; new_item.type = itSong;
mpd_Song *s = mpd_newSong(); mpd_Song *s = mpd_newSong();
@@ -351,9 +363,8 @@ void Browser::GetLocalDirectory(ItemList &v)
new_item.song = new Song(s); new_item.song = new Song(s);
v.push_back(new_item); v.push_back(new_item);
} }
delete list[i];
} }
delete list; closedir(dir);
} }
void Browser::LocateSong(const MPD::Song &s) void Browser::LocateSong(const MPD::Song &s)