Reapply directory error handling change.

runtime/bin/directory_win.cc

 // Copyright (c) 2011, 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 "bin/directory.h"
+
 #include <errno.h>
 #include <sys/stat.h>
 
-#include "bin/directory.h"
+#include "bin/platform.h"
 
 // Forward declaration.
 static bool ListRecursively(const char* dir_name,
                             bool recursive,
                             Dart_Port dir_port,
                             Dart_Port file_port,
                             Dart_Port done_port,
                             Dart_Port error_port);
 
 
@@ skipping 69 matching lines @@
   }
 }
 
 
 static void ComputeFullSearchPath(const char* dir_name,
                                   char* path,
                                   int* path_length) {
   // GetFullPathName only works in a multi-threaded environment if
   // SetCurrentDirectory is not used. We currently have no plan for
   // exposing SetCurrentDirectory.
-  int written =
+  size_t written =
     GetFullPathName(dir_name, MAX_PATH - *path_length, path, NULL);
   *path_length += written;
   written = snprintf(path + *path_length,
                      MAX_PATH - *path_length,
                      "%s",
                      "\\*");
   ASSERT(written == 2);
   *path_length += written;
 }
 
+static void PostError(Dart_Port error_port,
+                      const char* prefix,
+                      const char* suffix) {
+  if (error_port != 0) {
+    char* error_str = Platform::StrError(GetLastError());
+    int error_message_size =
+        strlen(prefix) + strlen(suffix) + strlen(error_str) + 3;
+    char* message = static_cast<char*>(malloc(error_message_size + 1));
+    size_t written = snprintf(message,
+                       error_message_size + 1,
+                       "%s%s (%s)",
+                       prefix,
+                       suffix,
+                       error_str);
+    ASSERT(written == error_message_size);
+    free(error_str);
+    Dart_Post(error_port, Dart_NewString(message));
+    free(message);
+  }
+}
+
+
 static bool ListRecursively(const char* dir_name,
                             bool recursive,
                             Dart_Port dir_port,
                             Dart_Port file_port,
                             Dart_Port done_port,
                             Dart_Port error_port) {
   char* path = static_cast<char*>(malloc(MAX_PATH));
   int path_length = 0;
   ComputeFullSearchPath(dir_name, path, &path_length);
 
   WIN32_FIND_DATA find_file_data;
   HANDLE find_handle = FindFirstFile(path, &find_file_data);
 
   // Adjust the path by removing the '*' used for the search.
   path_length -= 1;
   path[path_length] = '\0';
 
   if (find_handle == INVALID_HANDLE_VALUE) {
-    // TODO(ager): Post on error port.
+    PostError(error_port, "Directory listing failed for: ", path);
     free(path);
     return false;
   }
 
-  bool completed = HandleEntry(&find_file_data,
-                               path,
-                               path_length,
-                               recursive,
-                               dir_port,
-                               file_port,
-                               done_port,
-                               error_port);
+  bool listing_error = !HandleEntry(&find_file_data,
+                                    path,
+                                    path_length,
+                                    recursive,
+                                    dir_port,
+                                    file_port,
+                                    done_port,
+                                    error_port);
 
-  while (FindNextFile(find_handle, &find_file_data) != 0) {
-    completed = completed && HandleEntry(&find_file_data,
-                                         path,
-                                         path_length,
-                                         recursive,
-                                         dir_port,
-                                         file_port,
-                                         done_port,
-                                         error_port);
+  while ((FindNextFile(find_handle, &find_file_data) != 0) && !listing_error) {
+    listing_error = listing_error || !HandleEntry(&find_file_data,
+                                                  path,
+                                                  path_length,
+                                                  recursive,
+                                                  dir_port,
+                                                  file_port,
+                                                  done_port,
+                                                  error_port);
   }
 
-  completed = completed && (GetLastError() == ERROR_NO_MORE_FILES);
+  if (GetLastError() != ERROR_NO_MORE_FILES) {
+    listing_error = true;
+    PostError(error_port, "Directory listing failed", "");
+  }
 
-  // TODO(ager): Post on error port if close fails.
-  FindClose(find_handle);
+  if (FindClose(find_handle) == 0) {
+    PostError(error_port, "Failed to close directory", "");
+  }
   free(path);
 
-  return completed;
+  return !listing_error;
 }
 
 
 void Directory::List(const char* dir_name,
                      bool recursive,
                      Dart_Port dir_port,
                      Dart_Port file_port,
                      Dart_Port done_port,
                      Dart_Port error_port) {
   bool result = ListRecursively(dir_name,
@@ skipping 37 matching lines @@
 
 
 bool Directory::Create(const char* dir_name) {
   return (CreateDirectory(dir_name, NULL) != 0);
 }
 
 
 bool Directory::Delete(const char* dir_name) {
   return (RemoveDirectory(dir_name) != 0);
 }