dart:io | Add "followLinks" optional parameter to Directory.list, let it return Link objects when f…

runtime/bin/directory.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 "bin/directory.h"
 
 #include "bin/dartutils.h"
 #include "bin/thread.h"
 #include "include/dart_api.h"
 #include "platform/assert.h"
@@ skipping 99 matching lines @@
   Dart_ExitScope();
 }
 
 
 void FUNCTION_NAME(Directory_List)(Dart_NativeArguments args) {
   Dart_EnterScope();
   Dart_Handle path = Dart_GetNativeArgument(args, 0);
   Dart_Handle recursive = Dart_GetNativeArgument(args, 1);
   // Create the list to hold the directory listing here, and pass it to the
   // SyncDirectoryListing object, which adds elements to it.
+  Dart_Handle follow_links = Dart_GetNativeArgument(args, 2);
+  // Create the list to hold the directory listing here, and pass it to the
+  // SyncDirectoryListing object, which adds elements to it.
   Dart_Handle results =
       Dart_New(DartUtils::GetDartClass(DartUtils::kCoreLibURL, "List"),
                Dart_Null(),
                0,
                NULL);
   SyncDirectoryListing sync_listing(results);
   Directory::List(DartUtils::GetStringValue(path),
                   DartUtils::GetBooleanValue(recursive),
+                  DartUtils::GetBooleanValue(follow_links),
                   &sync_listing);
   Dart_SetReturnValue(args, results);
   Dart_ExitScope();
 }
 
 
 static CObject* DirectoryCreateRequest(const CObjectArray& request) {
   if (request.Length() == 2 && request[1]->IsString()) {
     CObjectString path(request[1]);
     if (Directory::Create(path.CString())) {
@@ skipping 49 matching lines @@
     } else {
       return CObject::NewOSError();
     }
   }
   return CObject::IllegalArgumentError();
 }
 
 
 static CObject* DirectoryListRequest(const CObjectArray& request,
                                      Dart_Port response_port) {
-  if (request.Length() == 3 && request[1]->IsString() && request[2]->IsBool()) {
+  if (request.Length() == 4 &&
+      request[1]->IsString() &&
+      request[2]->IsBool() &&
+      request[3]->IsBool()) {
     AsyncDirectoryListing* dir_listing =
         new AsyncDirectoryListing(response_port);
     CObjectString path(request[1]);
     CObjectBool recursive(request[2]);
+    CObjectBool follow_links(request[3]);
     bool completed = Directory::List(
-        path.CString(), recursive.Value(), dir_listing);
+        path.CString(), recursive.Value(), follow_links.Value(), dir_listing);
     delete dir_listing;
     CObjectArray* response = new CObjectArray(CObject::NewArray(2));
     response->SetAt(
         0,
         new CObjectInt32(CObject::NewInt32(AsyncDirectoryListing::kListDone)));
     response->SetAt(1, CObject::Bool(completed));
     return response;
   }
   // Respond with an illegal argument list error message.
   CObjectArray* response = new CObjectArray(CObject::NewArray(3));
@@ skipping 94 matching lines @@
   return Dart_PostCObject(response_port_, response->AsApiCObject());
 }
 
 
 bool AsyncDirectoryListing::HandleFile(char* file_name) {
   CObjectArray* response = NewResponse(kListFile, file_name);
   return Dart_PostCObject(response_port_, response->AsApiCObject());
 }
 
 
+bool AsyncDirectoryListing::HandleLink(char* link_name) {
+  CObjectArray* response = NewResponse(kListLink, link_name);
+  return Dart_PostCObject(response_port_, response->AsApiCObject());
+}
+
+
 bool AsyncDirectoryListing::HandleError(const char* dir_name) {
   CObject* err = CObject::NewOSError();
   CObjectArray* response = new CObjectArray(CObject::NewArray(3));
   response->SetAt(0, new CObjectInt32(CObject::NewInt32(kListError)));
   response->SetAt(1, new CObjectString(CObject::NewString(dir_name)));
   response->SetAt(2, err);
   return Dart_PostCObject(response_port_, response->AsApiCObject());
 }
 
 bool SyncDirectoryListing::HandleDirectory(char* dir_name) {
   Dart_Handle dir_name_dart = DartUtils::NewString(dir_name);
   Dart_Handle dir =
       Dart_New(directory_class_, Dart_Null(), 1, &dir_name_dart);
   Dart_Invoke(results_, add_string_, 1, &dir);
   return true;
 }
 
+bool SyncDirectoryListing::HandleLink(char* link_name) {
+  Dart_Handle link_name_dart = DartUtils::NewString(link_name);
+  Dart_Handle link =
+      Dart_New(link_class_, Dart_Null(), 1, &link_name_dart);
+  Dart_Invoke(results_, add_string_, 1, &link);
+  return true;
+}
+
 bool SyncDirectoryListing::HandleFile(char* file_name) {
   Dart_Handle file_name_dart = DartUtils::NewString(file_name);
   Dart_Handle file =
       Dart_New(file_class_, Dart_Null(), 1, &file_name_dart);
   Dart_Invoke(results_, add_string_, 1, &file);
   return true;
 }
 
 bool SyncDirectoryListing::HandleError(const char* dir_name) {
   Dart_Handle dart_os_error = DartUtils::NewDartOSError();
   Dart_Handle args[3];
   args[0] = DartUtils::NewString("Directory listing failed");
   args[1] = DartUtils::NewString(dir_name);
   args[2] = dart_os_error;
   Dart_ThrowException(Dart_New(
       DartUtils::GetDartClass(DartUtils::kIOLibURL, "DirectoryIOException"),
       Dart_Null(),
       3,
       args));
   return true;
 }