Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(103)

Unified Diff: runtime/bin/directory_linux.cc

Issue 45833003: Fix directory-listing to return a future on cancel. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Fix reporting of immediate errors from directory listing. Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « runtime/bin/directory_android.cc ('k') | runtime/bin/directory_macos.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/bin/directory_linux.cc
diff --git a/runtime/bin/directory_linux.cc b/runtime/bin/directory_linux.cc
index c26289cb7c53563dc1d202602b4e0b56d10f6055..0bb07e75f9f516fc53002daae5bde9d54108eca9 100644
--- a/runtime/bin/directory_linux.cc
+++ b/runtime/bin/directory_linux.cc
@@ -105,8 +105,8 @@ ListType DirectoryListingEntry::Next(DirectoryListing* listing) {
dirent entry;
dirent* result;
if ((status = TEMP_FAILURE_RETRY(readdir_r(reinterpret_cast<DIR*>(lister_),
- &entry,
- &result))) == 0 &&
+ &entry,
+ &result))) == 0 &&
result != NULL) {
if (!listing->path_buffer().Add(entry.d_name)) {
done_ = true;
@@ -188,14 +188,18 @@ ListType DirectoryListingEntry::Next(DirectoryListing* listing) {
return kListError;
}
- if (closedir(reinterpret_cast<DIR*>(lister_)) == -1) {
- return kListError;
- }
-
return kListDone;
}
+DirectoryListingEntry::~DirectoryListingEntry() {
+ ResetLink();
+ if (lister_ != 0) {
+ closedir(reinterpret_cast<DIR*>(lister_));
+ }
+}
+
+
void DirectoryListingEntry::ResetLink() {
if (link_ != NULL && (parent_ == NULL || parent_->link_ != link_)) {
delete link_;
« no previous file with comments | « runtime/bin/directory_android.cc ('k') | runtime/bin/directory_macos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698