diff options
| -rw-r--r-- | include/llvm/Support/MemoryBuffer.h | 13 | ||||
| -rw-r--r-- | lib/Support/MemoryBuffer.cpp | 7 |
2 files changed, 16 insertions, 4 deletions
diff --git a/include/llvm/Support/MemoryBuffer.h b/include/llvm/Support/MemoryBuffer.h index 41d4f88bfa..f29ddd1fea 100644 --- a/include/llvm/Support/MemoryBuffer.h +++ b/include/llvm/Support/MemoryBuffer.h @@ -60,13 +60,18 @@ public: /// MemoryBuffer if successful, otherwise returning null. If FileSize is /// specified, this means that the client knows that the file exists and that /// it has the specified size. - static MemoryBuffer *getFile(StringRef Filename, - std::string *ErrStr = 0, + static MemoryBuffer *getFile(StringRef Filename, std::string *ErrStr = 0, int64_t FileSize = -1); - static MemoryBuffer *getFile(const char *Filename, - std::string *ErrStr = 0, + static MemoryBuffer *getFile(const char *Filename, std::string *ErrStr = 0, int64_t FileSize = -1); + /// getOpenFile - Given an already-open file descriptor, read the file and + /// return a MemoryBuffer. This takes ownership of the descriptor, + /// immediately closing it after reading the file. + static MemoryBuffer *getOpenFile(int FD, const char *Filename, + std::string *ErrStr = 0, + int64_t FileSize = -1); + /// getMemBuffer - Open the specified memory range as a MemoryBuffer. Note /// that InputData must be null terminated. static MemoryBuffer *getMemBuffer(StringRef InputData, diff --git a/lib/Support/MemoryBuffer.cpp b/lib/Support/MemoryBuffer.cpp index da4685309d..5b701a5c60 100644 --- a/lib/Support/MemoryBuffer.cpp +++ b/lib/Support/MemoryBuffer.cpp @@ -187,6 +187,7 @@ public: MemoryBuffer *MemoryBuffer::getFile(StringRef Filename, std::string *ErrStr, int64_t FileSize) { + // Ensure the path is null terminated. SmallString<256> PathBuf(Filename.begin(), Filename.end()); return MemoryBuffer::getFile(PathBuf.c_str(), ErrStr, FileSize); } @@ -202,6 +203,12 @@ MemoryBuffer *MemoryBuffer::getFile(const char *Filename, std::string *ErrStr, if (ErrStr) *ErrStr = sys::StrError(); return 0; } + + return getOpenFile(FD, Filename, ErrStr, FileSize); +} + +MemoryBuffer *MemoryBuffer::getOpenFile(int FD, const char *Filename, + std::string *ErrStr, int64_t FileSize) { FileCloser FC(FD); // Close FD on return. // If we don't know the file size, use fstat to find out. fstat on an open |