Fix directory-listing, directory-deletion and file deletion, when links are involved.

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 151 matching lines @@
         // 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;
         if (follow_links) {
           stat_success = TEMP_FAILURE_RETRY(stat(path->data, &entry_info));
+          if (stat_success == -1) {
+            stat_success = TEMP_FAILURE_RETRY(lstat(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;
         }
         break;
       }
       default:
         break;
     }
     path->Reset(path_length);
@@ skipping 22 matching lines @@
 
 static bool DeleteDir(char* dir_name,
                       PathBuffer* path) {
   if (strcmp(dir_name, ".") == 0) return true;
   if (strcmp(dir_name, "..") == 0) return true;
   return path->Add(dir_name) && DeleteRecursively(path);
 }
 
 
 static bool DeleteRecursively(PathBuffer* path) {
-  if (!path->Add(File::PathSeparator())) return false;
   // Do not recurse into links for deletion. Instead delete the link.
   struct stat st;
   if (TEMP_FAILURE_RETRY(lstat(path->data, &st)) == -1) {
     return false;
   } else if (S_ISLNK(st.st_mode)) {
     return (remove(path->data) == 0);
   }
 
+  if (!path->Add(File::PathSeparator())) return false;
+
   // Not a link. Attempt to open as a directory and recurse into the
   // directory.
   DIR* dir_pointer;
   do {
     dir_pointer = opendir(path->data);
   } while (dir_pointer == NULL && errno == EINTR);
 
   if (dir_pointer == NULL) {
     return false;
   }
@@ skipping 195 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)