nicolas/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Frontend: Don't automatically create missing directories when using temporary files with createOutputFile()

Browse Source 
- This would otherwise happen as a side effect of llvm::sys::fs::unique_file creating parent directories.

llvm-svn: 151960
This commit is contained in:
Daniel Dunbar
2012-03-03 00:36:02 +00:00
parent 62a58f4928
commit b9c62c0773
3 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
clang/lib/Frontend/CompilerInstance.cpp
View File

@@ -478,12 +478,14 @@ CompilerInstance::createOutputFile(StringRef OutputPath,
bool Binary, bool RemoveFileOnSignal,
StringRef InFile,
StringRef Extension,
bool UseTemporary) {
bool UseTemporary,
bool CreateMissingDirectories) {
std::string Error, OutputPathName, TempPathName;
llvm::raw_fd_ostream *OS = createOutputFile(OutputPath, Error, Binary,
RemoveFileOnSignal,
InFile, Extension,
UseTemporary,
CreateMissingDirectories,
&OutputPathName,
&TempPathName);
if (!OS) {
@@ -508,8 +510,12 @@ CompilerInstance::createOutputFile(StringRef OutputPath,
StringRef InFile,
StringRef Extension,
bool UseTemporary,
bool CreateMissingDirectories,
std::string *ResultPathName,
std::string *TempPathName) {
assert((!CreateMissingDirectories || UseTemporary) &&
"CreateMissingDirectories is only allowed when using temporary files");
std::string OutFile, TempFile;
if (!OutputPath.empty()) {
OutFile = OutputPath;
@@ -528,12 +534,20 @@ CompilerInstance::createOutputFile(StringRef OutputPath,
std::string OSFile;
if (UseTemporary && OutFile != "-") {
llvm::sys::Path OutPath(OutFile);
// Only create the temporary if we can actually write to OutPath, otherwise
// we want to fail early.
// Only create the temporary if the parent directory exists (or create
// missing directories is true) and we can actually write to OutPath,
// otherwise we want to fail early.
SmallString<256> AbsPath(OutputPath);
llvm::sys::fs::make_absolute(AbsPath);
llvm::sys::Path OutPath(AbsPath);
bool ParentExists = false;
if (llvm::sys::fs::exists(llvm::sys::path::parent_path(AbsPath.str()),
ParentExists))
ParentExists = false;
bool Exists;
if ((llvm::sys::fs::exists(OutPath.str(), Exists) || !Exists) ||
(OutPath.isRegularFile() && OutPath.canWrite())) {
if ((CreateMissingDirectories || ParentExists) &&
((llvm::sys::fs::exists(AbsPath.str(), Exists) || !Exists) ||
(OutPath.isRegularFile() && OutPath.canWrite()))) {
// Create a temporary file.
SmallString<128> TempPath;
TempPath = OutFile;