// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

#include "net/disk_cache/cache_util.h"

#include "base/file_util.h"
#include "base/logging.h"
#include "base/string_util.h"

namespace disk_cache {

bool MoveCache(const std::wstring& from_path, const std::wstring& to_path) {
  // Just use the version from base.
  return file_util::Move(from_path.c_str(), to_path.c_str());
}

void DeleteCache(const std::wstring& path, bool remove_folder) {
  file_util::FileEnumerator iter(path, /* recursive */ false,
                                 file_util::FileEnumerator::FILES);
  for (std::wstring file = iter.Next(); !file.empty(); file = iter.Next()) {
    if (!file_util::Delete(file, /* recursive */ false))
      NOTREACHED();
  }

  if (remove_folder) {
    if (!file_util::Delete(path, /* recursive */ false))
      NOTREACHED();
  }
}

bool DeleteCacheFile(const std::wstring& name) {
  return file_util::Delete(name, false);
}

void WaitForPendingIO(int* num_pending_io) {
  if (*num_pending_io) {
    NOTIMPLEMENTED();
  }
}

}  // namespace disk_cache

// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

#include "net/disk_cache/cache_util.h"

#include "base/file_util.h"
#include "base/logging.h"
#include "base/string_util.h"

namespace disk_cache {

bool MoveCache(const std::wstring& from_path, const std::wstring& to_path) {
  // Just use the version from base.
  return file_util::Move(from_path.c_str(), to_path.c_str());
}

void DeleteCache(const std::wstring& path, bool remove_folder) {
  if (remove_folder) {
    file_util::Delete(path, false);
  } else {
    std::wstring name(path);
    // TODO(rvargas): Fix this after file_util::delete is fixed.
    // file_util::AppendToPath(&name, L"*");
    file_util::Delete(name, true);
  }
}

bool DeleteCacheFile(const std::wstring& name) {
  return file_util::Delete(name, false);
}

void WaitForPendingIO(int* num_pending_io) {
  if (*num_pending_io) {
    NOTIMPLEMENTED();
  }
}

}  // namespace disk_cache


--- 
+++ 
@@ -16,13 +16,16 @@
 }
 
 void DeleteCache(const std::wstring& path, bool remove_folder) {
+  file_util::FileEnumerator iter(path, /* recursive */ false,
+                                 file_util::FileEnumerator::FILES);
+  for (std::wstring file = iter.Next(); !file.empty(); file = iter.Next()) {
+    if (!file_util::Delete(file, /* recursive */ false))
+      NOTREACHED();
+  }
+
   if (remove_folder) {
-    file_util::Delete(path, false);
-  } else {
-    std::wstring name(path);
-    // TODO(rvargas): Fix this after file_util::delete is fixed.
-    // file_util::AppendToPath(&name, L"*");
-    file_util::Delete(name, true);
+    if (!file_util::Delete(path, /* recursive */ false))
+      NOTREACHED();
   }
 }
 
@@ -37,4 +40,3 @@
 }
 
 }  // namespace disk_cache
-
Fix DeleteCache on POSIX.  It wasn't successfully deleting before.


git-svn-id: dd90618784b6a4b323ea0c23a071cb1c9e6f2ac7@2468 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
