Implement recursive directory deletion.

runtime/bin/directory_win.cc

-// Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
+// 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 <errno.h>
 #include <sys/stat.h>
 
 #include "bin/platform.h"
 
@@ skipping 20 matching lines @@
 }
 
 
 // Forward declaration.
 static bool ListRecursively(const char* dir_name,
                             bool recursive,
                             Dart_Port dir_port,
                             Dart_Port file_port,
                             Dart_Port done_port,
                             Dart_Port error_port);
+static bool DeleteRecursively(const char* dir_name);
 
 
 static bool HandleDir(char* dir_name,
                       char* path,
                       int path_length,
                       bool recursive,
                       Dart_Port dir_port,
                       Dart_Port file_port,
                       Dart_Port done_port,
                       Dart_Port error_port) {
@@ skipping 151 matching lines @@
 
   if (FindClose(find_handle) == 0) {
     PostError(error_port, "Failed to close directory", "");
   }
   free(path);
 
   return !listing_error;
 }
 
 
+static bool DeleteFile(char* file_name,
+                       char* path,
+                       int path_length) {
+  size_t written = snprintf(path + path_length,
+                            MAX_PATH - path_length,
+                            "%s",
+                            file_name);
+  ASSERT(written == strlen(file_name));

[Bill Hesse, 2012/02/02 17:24:39]

Especially on Windows, I think this assert really could fail - files can exist
that have full paths that are too long (>260 chars).  So I think we should
cleanly handle this problem, by returning failure from DeleteRecursively.  We
don't have to succeed, we just should fail correctly.

[Mads Ager (google), 2012/02/03 11:48:54]

Absolutely! Thanks!

+  return (DeleteFile(path) != 0);
+}
+
+
+static bool DeleteDir(char* dir_name,
+                      char* path,
+                      int path_length) {
+  if (strcmp(dir_name, ".") != 0 &&
+      strcmp(dir_name, "..") != 0) {
+    size_t written = snprintf(path + path_length,
+                              MAX_PATH - path_length,
+                              "%s",
+                              dir_name);
+    ASSERT(written == strlen(dir_name));

[Bill Hesse, 2012/02/02 17:24:39]

These could all be made checks, rather than asserts, I think.

[Mads Ager (google), 2012/02/03 11:48:54]

Done.

+    return DeleteRecursively(path);
+  }
+  return true;
+}
+
+
+static bool DeleteEntry(LPWIN32_FIND_DATA find_file_data,
+                        char* path,
+                        int path_length) {
+  DWORD attributes = find_file_data->dwFileAttributes;
+  if ((attributes & FILE_ATTRIBUTE_DIRECTORY) != 0) {
+    return DeleteDir(find_file_data->cFileName, path, path_length);
+  } else {
+    return DeleteFile(find_file_data->cFileName, path, path_length);
+  }
+}
+
+
+static bool DeleteRecursively(const char* dir_name) {
+  char* path = static_cast<char*>(malloc(MAX_PATH));
+  int path_length = 0;
+  ComputeFullSearchPath(dir_name, path, &path_length);
+
+  WIN32_FIND_DATA find_file_data;
+  HANDLE find_handle = FindFirstFile(path, &find_file_data);
+
+  // Adjust the path by removing the '*' used for the search.
+  path_length -= 1;
+  path[path_length] = '\0';
+
+  if (find_handle == INVALID_HANDLE_VALUE) {
+    free(path);
+    return false;
+  }
+
+  bool error = !DeleteEntry(&find_file_data, path, path_length);
+
+  while ((FindNextFile(find_handle, &find_file_data) != 0) && !error) {
+    error = error || !DeleteEntry(&find_file_data, path, path_length);
+  }
+
+  free(path);
+
+  if ((GetLastError() != ERROR_NO_MORE_FILES) ||
+      (FindClose(find_handle) == 0) ||
+      (RemoveDirectory(dir_name) == 0)) {
+    return false;
+  }
+
+  return !error;
+}
+
+
 void Directory::List(const char* dir_name,
                      bool recursive,
                      Dart_Port dir_port,
                      Dart_Port file_port,
                      Dart_Port done_port,
                      Dart_Port error_port) {
   bool result = ListRecursively(dir_name,
                                 recursive,
                                 dir_port,
                                 file_port,
@@ skipping 97 matching lines @@
     free(*path);
     *path = NULL;
     int error_code =
         SetOsErrorMessage(os_error_message, os_error_message_len);
     return error_code;
   }
   return 0;
 }
 
 
-bool Directory::Delete(const char* dir_name) {
-  return (RemoveDirectory(dir_name) != 0);
+bool Directory::Delete(const char* dir_name, bool recursive) {
+  if (!recursive) {
+    return (RemoveDirectory(dir_name) != 0);
+  } else {
+    return DeleteRecursively(dir_name);
+  }
 }