Handle non-regular files in recursive delete

runtime/bin/directory_android.cc

Index: runtime/bin/directory_android.cc
diff --git a/runtime/bin/directory_android.cc b/runtime/bin/directory_android.cc
index a3c923cf9bb362840f1c0b026a4ea0933f656e8b..77886375d388857667634f7323dacc472171ee9c 100644
--- a/runtime/bin/directory_android.cc
+++ b/runtime/bin/directory_android.cc
@@ -292,6 +292,10 @@ static bool DeleteRecursively(PathBuffer* path) {
       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
@@ -313,15 +317,22 @@ static bool DeleteRecursively(PathBuffer* path) {
         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) {