Skip to content

Commit

Permalink
Support outputting to /dev/null.
Browse files Browse the repository at this point in the history
When writing to a non regular file we cannot rename to it. Since we
have to write, we may as well create a temporary file to avoid trying
to create an unique file in /dev when trying to write to /dev/null.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@291485 91177308-0d34-0410-b5e6-96231b3b80d8
  • Loading branch information
espindola committed Jan 9, 2017
1 parent 33887e3 commit cf230cb
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 23 deletions.
3 changes: 2 additions & 1 deletion include/llvm/Support/FileOutputBuffer.h
Original file line number Diff line number Diff line change
Expand Up @@ -78,11 +78,12 @@ class FileOutputBuffer {
FileOutputBuffer &operator=(const FileOutputBuffer &) = delete;

FileOutputBuffer(std::unique_ptr<llvm::sys::fs::mapped_file_region> R,
StringRef Path, StringRef TempPath);
StringRef Path, StringRef TempPath, bool IsRegular);

std::unique_ptr<llvm::sys::fs::mapped_file_region> Region;
SmallString<128> FinalPath;
SmallString<128> TempPath;
bool IsRegular;
};
} // end namespace llvm

Expand Down
66 changes: 44 additions & 22 deletions lib/Support/FileOutputBuffer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#include "llvm/ADT/STLExtras.h"
#include "llvm/ADT/SmallString.h"
#include "llvm/Support/Errc.h"
#include "llvm/Support/Path.h"
#include "llvm/Support/Signals.h"
#include <system_error>

Expand All @@ -28,8 +29,10 @@ using llvm::sys::fs::mapped_file_region;

namespace llvm {
FileOutputBuffer::FileOutputBuffer(std::unique_ptr<mapped_file_region> R,
StringRef Path, StringRef TmpPath)
: Region(std::move(R)), FinalPath(Path), TempPath(TmpPath) {}
StringRef Path, StringRef TmpPath,
bool IsRegular)
: Region(std::move(R)), FinalPath(Path), TempPath(TmpPath),
IsRegular(IsRegular) {}

FileOutputBuffer::~FileOutputBuffer() {
// Close the mapping before deleting the temp file, so that the removal
Expand All @@ -40,9 +43,10 @@ FileOutputBuffer::~FileOutputBuffer() {

ErrorOr<std::unique_ptr<FileOutputBuffer>>
FileOutputBuffer::create(StringRef FilePath, size_t Size, unsigned Flags) {
// If file already exists, it must be a regular file (to be mappable).
// Check file is not a regular file, in which case we cannot remove it.
sys::fs::file_status Stat;
std::error_code EC = sys::fs::status(FilePath, Stat);
bool IsRegular = true;
switch (Stat.type()) {
case sys::fs::file_type::file_not_found:
// If file does not exist, we'll create one.
Expand All @@ -56,25 +60,34 @@ FileOutputBuffer::create(StringRef FilePath, size_t Size, unsigned Flags) {
default:
if (EC)
return EC;
else
return make_error_code(errc::operation_not_permitted);
IsRegular = false;
}

// Delete target file.
EC = sys::fs::remove(FilePath);
if (EC)
return EC;

unsigned Mode = sys::fs::all_read | sys::fs::all_write;
// If requested, make the output file executable.
if (Flags & F_executable)
Mode |= sys::fs::all_exe;
if (IsRegular) {
// Delete target file.
EC = sys::fs::remove(FilePath);
if (EC)
return EC;
}

// Create new file in same directory but with random name.
SmallString<128> TempFilePath;
int FD;
EC = sys::fs::createUniqueFile(Twine(FilePath) + ".tmp%%%%%%%", FD,
TempFilePath, Mode);
if (IsRegular) {
unsigned Mode = sys::fs::all_read | sys::fs::all_write;
// If requested, make the output file executable.
if (Flags & F_executable)
Mode |= sys::fs::all_exe;
// Create new file in same directory but with random name.
EC = sys::fs::createUniqueFile(Twine(FilePath) + ".tmp%%%%%%%", FD,
TempFilePath, Mode);
} else {
// Create a temporary file. Since this is a special file, we will not move
// it and the new file can be in another filesystem. This avoids trying to
// create a temporary file in /dev when outputting to /dev/null for example.
EC = sys::fs::createTemporaryFile(sys::path::filename(FilePath), "", FD,
TempFilePath);
}

if (EC)
return EC;

Expand All @@ -99,19 +112,28 @@ FileOutputBuffer::create(StringRef FilePath, size_t Size, unsigned Flags) {
if (Ret)
return std::error_code(errno, std::generic_category());

std::unique_ptr<FileOutputBuffer> Buf(
new FileOutputBuffer(std::move(MappedFile), FilePath, TempFilePath));
std::unique_ptr<FileOutputBuffer> Buf(new FileOutputBuffer(
std::move(MappedFile), FilePath, TempFilePath, IsRegular));
return std::move(Buf);
}

std::error_code FileOutputBuffer::commit() {
// Unmap buffer, letting OS flush dirty pages to file on disk.
Region.reset();

std::error_code EC;
if (IsRegular) {
// Rename file to final name.
EC = sys::fs::rename(Twine(TempPath), Twine(FinalPath));
sys::DontRemoveFileOnSignal(TempPath);
} else {
EC = sys::fs::copy_file(TempPath, FinalPath);
std::error_code RMEC = sys::fs::remove(TempPath);
sys::DontRemoveFileOnSignal(TempPath);
if (RMEC)
return RMEC;
}

// Rename file to final name.
std::error_code EC = sys::fs::rename(Twine(TempPath), Twine(FinalPath));
sys::DontRemoveFileOnSignal(TempPath);
return EC;
}
} // namespace

0 comments on commit cf230cb

Please sign in to comment.