From a34a15765d6a7bf3d5a324689f9fc3595d0c402a Mon Sep 17 00:00:00 2001 From: Reid Spencer Date: Tue, 22 Aug 2006 23:54:35 +0000 Subject: [PATCH] For PR797: Adjust code to compensate for Path class interface change. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@29837 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/System/Win32/Path.inc | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/lib/System/Win32/Path.inc b/lib/System/Win32/Path.inc index b40318fe27c..2f2e8520133 100644 --- a/lib/System/Win32/Path.inc +++ b/lib/System/Win32/Path.inc @@ -326,11 +326,12 @@ static bool AddPermissionBits(const std::string& Filename, int bits) { return true; } -void Path::makeReadableOnDisk() { +bool Path::makeReadableOnDisk(std::string* ErrMsg) { // All files are readable on Windows (ignoring security attributes). + return false; } -void Path::makeWriteableOnDisk() { +void Path::makeWriteableOnDisk(std::string* ErrMsg) { DWORD attr = GetFileAttributes(path.c_str()); // If it doesn't exist, we're done. @@ -338,13 +339,17 @@ void Path::makeWriteableOnDisk() { return; if (attr & FILE_ATTRIBUTE_READONLY) { - if (!SetFileAttributes(path.c_str(), attr & ~FILE_ATTRIBUTE_READONLY)) - ThrowError(std::string(path) + ": Can't make file writable: "); + if (!SetFileAttributes(path.c_str(), attr & ~FILE_ATTRIBUTE_READONLY)) { + MakeErrMsg(ErrMsg, std::string(path) + ": Can't make file writable: "); + return true; + } } + return false; } -void Path::makeExecutableOnDisk() { +bool Path::makeExecutableOnDisk(std::string* ErrMsg) { // All files are executable on Windows (ignoring security attributes). + return false; } bool