Allow unique_file to take a mode for file permissions, but default

to user only read/write.

Part of rdar://11325849

llvm-svn: 156591
This commit is contained in:
Eric Christopher 2012-05-11 00:07:44 +00:00
parent 8244b1dc7e
commit b6148ed72c
3 changed files with 10 additions and 7 deletions

View File

@ -422,8 +422,8 @@ error_code status_known(const Twine &path, bool &result);
/// @results errc::success if result_{fd,path} have been successfully set,
/// otherwise a platform specific error_code.
error_code unique_file(const Twine &model, int &result_fd,
SmallVectorImpl<char> &result_path,
bool makeAbsolute = true);
SmallVectorImpl<char> &result_path,
bool makeAbsolute = true, unsigned mode = 0600);
/// @brief Canonicalize path.
///

View File

@ -347,9 +347,10 @@ error_code status(const Twine &path, file_status &result) {
return error_code::success();
}
// Since this is most often used for temporary files, mode defaults to 0600.
error_code unique_file(const Twine &model, int &result_fd,
SmallVectorImpl<char> &result_path,
bool makeAbsolute) {
SmallVectorImpl<char> &result_path,
bool makeAbsolute, unsigned mode) {
SmallString<128> Model;
model.toVector(Model);
// Null terminate.
@ -379,7 +380,7 @@ retry_random_path:
// Try to open + create the file.
rety_open_create:
int RandomFD = ::open(RandomPath.c_str(), O_RDWR | O_CREAT | O_EXCL, 0600);
int RandomFD = ::open(RandomPath.c_str(), O_RDWR | O_CREAT | O_EXCL, mode);
if (RandomFD == -1) {
// If the file existed, try again, otherwise, error.
if (errno == errc::file_exists)

View File

@ -497,9 +497,11 @@ handle_status_error:
return error_code::success();
}
// FIXME: mode should be used here and default to user r/w only,
// it currently comes in as a UNIX mode.
error_code unique_file(const Twine &model, int &result_fd,
SmallVectorImpl<char> &result_path,
bool makeAbsolute) {
SmallVectorImpl<char> &result_path,
bool makeAbsolute, unsigned mode) {
// Use result_path as temp storage.
result_path.set_size(0);
StringRef m = model.toStringRef(result_path);