Commit 291165d2 authored by Greg Thompson's avatar Greg Thompson Committed by Commit Bot

Don't cross junction points when deleting old temp dirs (again).

https://crrev.com/784428 stopped recursing across junction points when
looking for CR_* or chrome_* directories. This CL does the same when
deleting within those directories.

BUG=1100280
R=forshaw@chromium.org

Change-Id: I7a4ef84d9df744cf5d0bd64d51065a571228520d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2292395Reviewed-by: default avatarJames Forshaw <forshaw@chromium.org>
Commit-Queue: Greg Thompson <grt@chromium.org>
Cr-Commit-Position: refs/heads/master@{#787752}
parent d68cb63e
...@@ -719,7 +719,8 @@ void RecursivelyDeleteDirectory(PathString* path) { ...@@ -719,7 +719,8 @@ void RecursivelyDeleteDirectory(PathString* path) {
if (!path->append(name)) if (!path->append(name))
continue; // Continue in spite of too long names. continue; // Continue in spite of too long names.
if (find_data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { if ((find_data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) &&
!(find_data.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT)) {
RecursivelyDeleteDirectory(path); RecursivelyDeleteDirectory(path);
} else { } else {
::DeleteFile(path->get()); ::DeleteFile(path->get());
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment