Fix directory-listing to return a future on cancel.

runtime/bin/directory_linux.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "platform/globals.h"
 #if defined(TARGET_OS_LINUX)
 
 #include "bin/directory.h"
 
 #include <dirent.h>  // NOLINT
@@ skipping 87 matching lines @@
   // Reset.
   listing->path_buffer().Reset(path_length_);
   ResetLink();
 
   // Iterate the directory and post the directories and files to the
   // ports.
   int status = 0;
   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;
       return kListError;
     }
     switch (entry.d_type) {
       case DT_DIR:
         if (strcmp(entry.d_name, ".") == 0) return Next(listing);
         if (strcmp(entry.d_name, "..") == 0) return Next(listing);
         return kListDirectory;
@@ skipping 61 matching lines @@
         break;
     }
   }
   done_ = true;
 
   if (status != 0) {
     errno = status;
     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_;
     link_ = NULL;
   }
   if (parent_ != NULL) {
     link_ = parent_->link_;
   }
 }
 
@@ skipping 224 matching lines @@
 bool Directory::Rename(const char* path, const char* new_path) {
   ExistsResult exists = Exists(path);
   if (exists != EXISTS) return false;
   return (TEMP_FAILURE_RETRY(rename(path, new_path)) == 0);
 }
 
 }  // namespace bin
 }  // namespace dart
 
 #endif  // defined(TARGET_OS_LINUX)