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

runtime/bin/directory_android.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_ANDROID)
 
 #include "bin/directory.h"
 
 #include <dirent.h>  // NOLINT
@@ skipping 39 matching lines @@
   void Reset(int new_length) {
     length = new_length;
     data[length] = '\0';
   }
 };
 
 
 // Forward declarations.
 static bool ListRecursively(PathBuffer* path,
                             bool recursive,
+                            bool follow_links,
                             DirectoryListing* listing);
 static bool DeleteRecursively(PathBuffer* path);
 
 
 static void PostError(DirectoryListing *listing,
                       const char* dir_name) {
   listing->HandleError(dir_name);
 }
 
 
 static bool HandleDir(char* dir_name,
                       PathBuffer* path,
                       bool recursive,
+                      bool follow_links,
                       DirectoryListing *listing) {
   if (strcmp(dir_name, ".") == 0) return true;
   if (strcmp(dir_name, "..") == 0) return true;
   if (!path->Add(dir_name)) {
     PostError(listing, path->data);
     return false;
+  }
   return listing->HandleDirectory(path->data) &&
-      (!recursive || ListRecursively(path, recursive, listing));
+      (!recursive || ListRecursively(path, recursive, follow_links, listing));
 }
 
 
 static bool HandleFile(char* file_name,
                        PathBuffer* path,
                        DirectoryListing *listing) {
   if (!path->Add(file_name)) {
     PostError(listing, path->data);
     return false;
   }
   return listing->HandleFile(path->data);
 }
 
 
+static bool HandleLink(char* link_name,
+                       PathBuffer* path,
+                       DirectoryListing *listing) {
+  if (!path->Add(link_name)) {
+    PostError(listing, path->data);
+    return false;
+  }
+  return listing->HandleLink(path->data);
+}
+
+
 static bool ListRecursively(PathBuffer* path,
                             bool recursive,
+                            bool follow_links,
                             DirectoryListing *listing) {
   if (!path->Add(File::PathSeparator())) {
     PostError(listing, path->data);
     return false;
   }
   DIR* dir_pointer;
   do {
     dir_pointer = opendir(path->data);
   } while (dir_pointer == NULL && errno == EINTR);
   if (dir_pointer == NULL) {
@@ skipping 10 matching lines @@
   dirent* result;
   while ((status = TEMP_FAILURE_RETRY(readdir_r(dir_pointer,
                                                 &entry,
                                                 &result))) == 0 &&
          result != NULL) {
     switch (entry.d_type) {
       case DT_DIR:
         success = HandleDir(entry.d_name,
                             path,
                             recursive,
+                            follow_links,
                             listing) && success;
         break;
       case DT_REG:
         success = HandleFile(entry.d_name,
                              path,
                              listing) && success;
         break;
       case DT_LNK:
+        if (!follow_links) {
+          success = HandleLink(entry.d_name,
+                               path,
+                               listing) && success;
+          break;
+        }
+        // Else fall through to next case.
+        // Fall through.
       case DT_UNKNOWN: {
         // On some file systems the entry type is not determined by
         // readdir_r. For those and for links we use stat to determine
         // the actual entry type. Notice that stat returns the type of
         // the file pointed to.
         struct stat entry_info;
         if (!path->Add(entry.d_name)) {
           success = false;
           break;
         }
-        int stat_success = TEMP_FAILURE_RETRY(stat(path->data, &entry_info));
+        int stat_success;
+        if (follow_links) {
+          stat_success = TEMP_FAILURE_RETRY(stat(path->data, &entry_info));
+        } else {
+          stat_success = TEMP_FAILURE_RETRY(lstat(path->data, &entry_info));
+        }
         if (stat_success == -1) {
           success = false;
           PostError(listing, path->data);
           break;
         }
         path->Reset(path_length);
         if (S_ISDIR(entry_info.st_mode)) {
           success = HandleDir(entry.d_name,
                               path,
                               recursive,
+                              follow_links,
                               listing) && success;
         } else if (S_ISREG(entry_info.st_mode)) {
           success = HandleFile(entry.d_name,
                                path,
                                listing) && success;
+        } else if (S_ISLNK(entry_info.st_mode)) {
+          ASSERT(!follow_links);
+          success = HandleLink(entry.d_name,
+                               path,
+                               listing) && success;
         }
-        ASSERT(!S_ISLNK(entry_info.st_mode));
         break;
       }
       default:
         break;
     }
     path->Reset(path_length);
   }
 
   if (status != 0) {
     errno = status;
@@ skipping 102 matching lines @@
       (closedir(dir_pointer) == -1) ||
       (remove(path->data) == -1)) {
     return false;
   }
   return success;
 }
 
 
 bool Directory::List(const char* dir_name,
                      bool recursive,
+                     bool follow_links,
                      DirectoryListing *listing) {
   PathBuffer path;
   if (!path.Add(dir_name)) {
     PostError(listing, dir_name);
     return false;
   }
-  return ListRecursively(&path, recursive, listing);
+  return ListRecursively(&path, recursive, follow_links, listing);
 }
 
 
 Directory::ExistsResult Directory::Exists(const char* dir_name) {
   struct stat entry_info;
   int success = TEMP_FAILURE_RETRY(stat(dir_name, &entry_info));
   if (success == 0) {
     if (S_ISDIR(entry_info.st_mode)) {
       return EXISTS;
     } else {
@@ skipping 112 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);
 }
 
 #endif  // defined(TARGET_OS_ANDROID)