maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Implement getUniqueID for directories on windows. 

llvm-svn: 187441
This commit is contained in:
Rafael Espindola 2013-07-30 20:25:53 +00:00
parent 5973e8371a
commit a5932afef0
2 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
llvm/lib/Support/Windows/Path.inc
View File

@ -592,12 +592,17 @@ static error_code getStatus(HANDLE FileHandle, file_status &Result) {
if (!::GetFileInformationByHandle(FileHandle, &Info))
goto handle_status_error;
Result = file_status(
file_type::regular_file, Info.ftLastWriteTime.dwHighDateTime,
Info.ftLastWriteTime.dwLowDateTime, Info.dwVolumeSerialNumber,
Info.nFileSizeHigh, Info.nFileSizeLow, Info.nFileIndexHigh,
Info.nFileIndexLow);
return error_code::success();
{
file_type Type = (Info.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
? file_type::directory_file
: file_type::regular_file;
Result =
file_status(Type, Info.ftLastWriteTime.dwHighDateTime,
Info.ftLastWriteTime.dwLowDateTime,
Info.dwVolumeSerialNumber, Info.nFileSizeHigh,
Info.nFileSizeLow, Info.nFileIndexHigh, Info.nFileIndexLow);
return error_code::success();
}
handle_status_error:
error_code EC = windows_error(::GetLastError());
@ -644,23 +649,14 @@ error_code status(const Twine &path, file_status &result) {
return getStatus(INVALID_HANDLE_VALUE, result);
}
if (attr & FILE_ATTRIBUTE_DIRECTORY)
result = file_status(file_type::directory_file);
else {
ScopedFileHandle h(
::CreateFileW(path_utf16.begin(),
0, // Attributes only.
ScopedFileHandle h(
::CreateFileW(path_utf16.begin(), 0, // Attributes only.
FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE,
NULL,
OPEN_EXISTING,
FILE_FLAG_BACKUP_SEMANTICS,
0));
NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0));
if (!h)
return getStatus(INVALID_HANDLE_VALUE, result);
return getStatus(h, result);
}
return error_code::success();
}
error_code status(int FD, file_status &Result) {

13
llvm/unittests/Support/Path.cpp
View File

@ -195,6 +195,19 @@ TEST_F(FileSystemTest, Unique) {
ASSERT_EQ(D2, F1);
::close(FileDescriptor);
SmallString<128> Dir1;
ASSERT_NO_ERROR(
fs::createUniqueDirectory("dir1", Dir1));
ASSERT_NO_ERROR(fs::getUniqueID(Dir1.c_str(), F1));
ASSERT_NO_ERROR(fs::getUniqueID(Dir1.c_str(), F2));
ASSERT_EQ(F1, F2);
SmallString<128> Dir2;
ASSERT_NO_ERROR(
fs::createUniqueDirectory("dir2", Dir2));
ASSERT_NO_ERROR(fs::getUniqueID(Dir2.c_str(), F2));
ASSERT_NE(F1, F2);
}
TEST_F(FileSystemTest, TempFiles) {