Handle non-regular files in recursive delete

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 274 matching lines @@
     if (result == NULL) {
       // End of directory.
       return NO_RETRY_EXPECTED(closedir(dir_pointer)) == 0 &&
              NO_RETRY_EXPECTED(remove(path->AsString())) == 0;
     }
     bool ok = false;
     switch (entry.d_type) {
       case DT_DIR:
         ok = DeleteDir(entry.d_name, path);
         break;
+      case DT_BLK:
+      case DT_CHR:
+      case DT_FIFO:
+      case DT_SOCK:
       case DT_REG:
       case DT_LNK:
         // Treat all links as files. This will delete the link which
         // is what we want no matter if the link target is a file or a
         // directory.
         ok = DeleteFile(entry.d_name, path);
         break;
       case DT_UNKNOWN: {
         if (!path->Add(entry.d_name)) {
           break;
         }
         // 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;
         if (NO_RETRY_EXPECTED(lstat(path->AsString(), &entry_info)) == -1) {
           break;
         }
         path->Reset(path_length);
         if (S_ISDIR(entry_info.st_mode)) {
           ok = DeleteDir(entry.d_name, path);
-        } else if (S_ISREG(entry_info.st_mode) || S_ISLNK(entry_info.st_mode)) {
+        } else if (S_ISREG(entry_info.st_mode) || S_ISCHR(entry_info.st_mode) ||

[rmacnak, 2016/12/14 18:44:02]

Keep S_ISLNK

[zra, 2016/12/14 20:48:07]

Done.

+                   S_ISBLK(entry_info.st_mode) ||
+                   S_ISFIFO(entry_info.st_mode) ||
+                   S_ISSOCK(entry_info.st_mode)) {
           // Treat links as files. This will delete the link which is
           // what we want no matter if the link target is a file or a
           // directory.
           ok = DeleteFile(entry.d_name, path);
+        } else {
+          FATAL1("Unexpected st_mode: %d\n", entry_info.st_mode);
         }
         break;
       }
       default:
+        // We should have covered all the bases. If not, let's get an error.
+        FATAL1("Unexpected d_type: %d\n", entry.d_type);
         break;
     }
     if (!ok) {
       break;
     }
     path->Reset(path_length);
   }
   // Only happens if an error.
   ASSERT(errno != 0);
   int err = errno;
@@ skipping 132 matching lines @@
   if (exists != EXISTS) {
     return false;
   }
   return (NO_RETRY_EXPECTED(rename(path, new_path)) == 0);
 }
 
 }  // namespace bin
 }  // namespace dart
 
 #endif  // defined(TARGET_OS_ANDROID)