github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-23 13:58:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

Only recurse for entries that are directories

Browse Source
This commit is contained in:
Kevin Sawicki
2012-06-11 15:19:24 -07:00
parent 57c18e784e
commit d04171923e
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Atom-Linux/native_handler.cpp
View File

@@ -74,15 +74,22 @@ void NativeHandler::Absolute(const CefString& name,
void ListDirectory(string path, vector<string>* paths, bool recursive) {
dirent **children;
int childrenCount = scandir(path.c_str(), &children, 0, alphasort);
struct stat statResult;
int result;
for (int i = 0; i < childrenCount; i++) {
if (strcmp(children[i]->d_name, ".") == 0)
continue;
if (strcmp(children[i]->d_name, "..") == 0)
if (strcmp(children[i]->d_name, ".") == 0
|| strcmp(children[i]->d_name, "..") == 0) {
free(children[i]);
continue;
}
string entryPath(path + "/" + children[i]->d_name);
paths->push_back(entryPath);
if (recursive)
ListDirectory(entryPath, paths, recursive);
if (recursive) {
result = stat(entryPath.c_str(), &statResult);
if (result == 0 && S_ISDIR(statResult.st_mode))
ListDirectory(entryPath, paths, recursive);
}
free(children[i]);
}
free(children);
@@ -179,7 +186,6 @@ void NativeHandler::ReadFromPasteboard(const CefString& name,
bool NativeHandler::Execute(const CefString& name, CefRefPtr<CefV8Value> object,
const CefV8ValueList& arguments, CefRefPtr<CefV8Value>& retval,
CefString& exception) {
if (name == "exists")
Exists(name, object, arguments, retval, exception);
else if (name == "read")