Post on the error handler in the Directory API when errors are encountered.

runtime/bin/directory_posix.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 <dirent.h>
 #include <errno.h>
 #include <libgen.h>
 #include <string.h>
 #include <sys/param.h>
 #include <sys/stat.h>
@@ skipping 69 matching lines @@
                               PATH_MAX - path_length,
                               "%s",
                               file_name);
     ASSERT(written == strlen(file_name));
     Dart_Handle name = Dart_NewString(path);
     Dart_Post(file_port, name);
   }
 }
 
 
+static void PostError(Dart_Port error_port,
+                      const char* prefix,
+                      const char* suffix) {
+  if (error_port != 0) {
+    int error_message_size = strlen(prefix) + strlen(suffix);
+    char* buffer = static_cast<char*>(malloc(error_message_size + 1));
+    int written = snprintf(buffer,
+                           error_message_size + 1,
+                           "%s%s",
+                           prefix,
+                           suffix);
+    ASSERT(written == error_message_size);
+    Dart_Post(error_port, Dart_NewString(buffer));
+    free(buffer);
+  }
+}
+
+
 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) {
   DIR* dir_pointer = opendir(dir_name);
   if (dir_pointer == NULL) {
-    // TODO(ager): post something on the error port.
+    PostError(error_port, "Directory listing failed for: ", dir_name);

[Søren Gjesse, 2011/11/08 16:56:16]

This does not say anything about the actual error. Isn't that something that
could be of interest?

[Mads Ager (google), 2011/11/09 08:07:30]

Yes. Refactored so PostError always extracts the error message with strerror_r
and makes that part of the message for all of these errors.

     return false;
   }
 
   // Compute full path for the directory currently being listed.
   char *path = static_cast<char*>(malloc(PATH_MAX));
   ASSERT(path != NULL);
   int path_length = 0;
   ComputeFullPath(dir_name, path, &path_length);
 
   // Iterated the directory and post the directories and files to the
   // ports.
   int success = 0;
   bool completed = true;
   dirent entry;
   dirent* result;
   while ((success = readdir_r(dir_pointer, &entry, &result)) == 0 &&
-         result != NULL) {
+         result != NULL &&
+         completed) {

[Søren Gjesse, 2011/11/08 16:56:16]

Maybe it is just the naming, but "while (completed) { ... } sounds wrong.

[Mads Ager (google), 2011/11/09 08:07:30]

I agree. Renamed to listing_error and updated the use 'while (!listing_error)'.

     switch (entry.d_type) {
       case DT_DIR:
         completed = completed && HandleDir(entry.d_name,
                                            path,
                                            path_length,
                                            recursive,
                                            dir_port,
                                            file_port,
                                            done_port,
                                            error_port);
         break;
       case DT_REG:
         HandleFile(entry.d_name, path, path_length, file_port);
         break;
       case DT_UNKNOWN: {
         // On some file systems the entry type is not determined by
         // readdir_r. For those we use lstat to determine the entry
         // type.
         struct stat entry_info;
         size_t written = snprintf(path + path_length,
                                   PATH_MAX - path_length,
                                   "%s",
                                   entry.d_name);
         ASSERT(written == strlen(entry.d_name));
         int lstat_success = lstat(path, &entry_info);
         if (lstat_success != 0) {
           completed = false;
+          PostError(error_port, "Directory listing failed for: ", path);
           break;
         }
         if ((entry_info.st_mode & S_IFMT) == S_IFDIR) {
           HandleDir(entry.d_name,

[Søren Gjesse, 2011/11/08 16:56:16]

Why is completed not updated here?

[Mads Ager (google), 2011/11/09 08:07:30]

Whoops, good catch. Done!

                     path,
                     path_length,
                     recursive,
                     dir_port,
                     file_port,
                     done_port,
                     error_port);
         } else if ((entry_info.st_mode & S_IFMT) == S_IFREG) {
           HandleFile(entry.d_name, path, path_length, file_port);
         }
         break;
       }
       default:
         break;
     }
   }
-  completed = completed && (success == 0);
 
-  // TODO(ager): Post on error port if closing fails.
-  closedir(dir_pointer);
+  if (success != 0) {
+    completed = false;
+    PostError(error_port, "Directory listing failed", "");
+  }
+
+  if (closedir(dir_pointer) == -1) {
+    static int kBufferSize = 1024;
+    char* buffer = static_cast<char*>(malloc(kBufferSize));
+    buffer[0] = '\0';
+    strerror_r(errno, buffer, kBufferSize);
+    PostError(error_port, "Failed to close directory: ", buffer);
+    free(buffer);
+  }
   free(path);
 
   return completed;
 }
 
 
 void Directory::List(const char* dir_name,
                      bool recursive,
                      Dart_Port dir_port,
                      Dart_Port file_port,
@@ skipping 44 matching lines @@
 bool Directory::Create(const char* dir_name) {
   // Create the directory with the permissions specified by the
   // process umask.
   return (mkdir(dir_name, 0777) == 0);
 }
 
 
 bool Directory::Delete(const char* dir_name) {
   return (rmdir(dir_name) == 0);
 }