Moved removeFile() and getUniqueFilename() into FileUtilities.

llvm-svn: 7691
This commit is contained in:
Misha Brukman 2003-08-07 21:28:50 +00:00
parent 5d7c46c4b3
commit 1e83bc90b9
6 changed files with 82 additions and 82 deletions

View File

@ -26,4 +26,14 @@ bool DiffFiles(const std::string &FileA, const std::string &FileB,
///
void MoveFileOverIfUpdated(const std::string &New, const std::string &Old);
/// removeFile - Delete the specified file
///
void removeFile(const std::string &Filename);
/// getUniqueFilename - Return a filename with the specified prefix. If the
/// file does not exist yet, return it, otherwise add a suffix to make it
/// unique.
///
std::string getUniqueFilename(const std::string &FilenameBase);
#endif

View File

@ -22,16 +22,6 @@ bool isExecutableFile(const std::string &ExeFileName);
std::string FindExecutable(const std::string &ExeName,
const std::string &BugPointPath);
/// removeFile - Delete the specified file
///
void removeFile(const std::string &Filename);
/// getUniqueFilename - Return a filename with the specified prefix. If the
/// file does not exist yet, return it, otherwise add a suffix to make it
/// unique.
///
std::string getUniqueFilename(const std::string &FilenameBase);
/// RunProgramWithTimeout - This function executes the specified program, with
/// the specified null-terminated argument array, with the stdin/out/err fd's
/// redirected, with a timeout specified on the commandline. This terminates

View File

@ -54,3 +54,38 @@ void MoveFileOverIfUpdated(const std::string &New, const std::string &Old) {
std::remove(New.c_str());
}
}
/// removeFile - Delete the specified file
///
void removeFile(const std::string &Filename) {
std::remove(Filename.c_str());
}
/// getUniqueFilename - Return a filename with the specified prefix. If the
/// file does not exist yet, return it, otherwise add a suffix to make it
/// unique.
///
std::string getUniqueFilename(const std::string &FilenameBase) {
if (!std::ifstream(FilenameBase.c_str()))
return FilenameBase; // Couldn't open the file? Use it!
// Create a pattern for mkstemp...
char *FNBuffer = new char[FilenameBase.size()+8];
strcpy(FNBuffer, FilenameBase.c_str());
strcpy(FNBuffer+FilenameBase.size(), "-XXXXXX");
// Agree on a temporary file name to use....
int TempFD;
if ((TempFD = mkstemp(FNBuffer)) == -1) {
std::cerr << "bugpoint: ERROR: Cannot create temporary file in the current "
<< " directory!\n";
exit(1);
}
// We don't need to hold the temp file descriptor... we will trust that noone
// will overwrite/delete the file while we are working on it...
close(TempFD);
std::string Result(FNBuffer);
delete[] FNBuffer;
return Result;
}

View File

@ -5,7 +5,7 @@
//
//===----------------------------------------------------------------------===//
#include "SystemUtils.h"
#include "Support/SystemUtils.h"
#include <algorithm>
#include <fstream>
#include <iostream>
@ -17,41 +17,6 @@
#include "Config/unistd.h"
#include "Config/errno.h"
/// removeFile - Delete the specified file
///
void removeFile(const std::string &Filename) {
std::remove(Filename.c_str());
}
/// getUniqueFilename - Return a filename with the specified prefix. If the
/// file does not exist yet, return it, otherwise add a suffix to make it
/// unique.
///
std::string getUniqueFilename(const std::string &FilenameBase) {
if (!std::ifstream(FilenameBase.c_str()))
return FilenameBase; // Couldn't open the file? Use it!
// Create a pattern for mkstemp...
char *FNBuffer = new char[FilenameBase.size()+8];
strcpy(FNBuffer, FilenameBase.c_str());
strcpy(FNBuffer+FilenameBase.size(), "-XXXXXX");
// Agree on a temporary file name to use....
int TempFD;
if ((TempFD = mkstemp(FNBuffer)) == -1) {
std::cerr << "bugpoint: ERROR: Cannot create temporary file in the current "
<< " directory!\n";
exit(1);
}
// We don't need to hold the temp file descriptor... we will trust that noone
// will overwrite/delete the file while we are working on it...
close(TempFD);
std::string Result(FNBuffer);
delete[] FNBuffer;
return Result;
}
/// isExecutableFile - This function returns true if the filename specified
/// exists and is executable.
///

View File

@ -54,3 +54,38 @@ void MoveFileOverIfUpdated(const std::string &New, const std::string &Old) {
std::remove(New.c_str());
}
}
/// removeFile - Delete the specified file
///
void removeFile(const std::string &Filename) {
std::remove(Filename.c_str());
}
/// getUniqueFilename - Return a filename with the specified prefix. If the
/// file does not exist yet, return it, otherwise add a suffix to make it
/// unique.
///
std::string getUniqueFilename(const std::string &FilenameBase) {
if (!std::ifstream(FilenameBase.c_str()))
return FilenameBase; // Couldn't open the file? Use it!
// Create a pattern for mkstemp...
char *FNBuffer = new char[FilenameBase.size()+8];
strcpy(FNBuffer, FilenameBase.c_str());
strcpy(FNBuffer+FilenameBase.size(), "-XXXXXX");
// Agree on a temporary file name to use....
int TempFD;
if ((TempFD = mkstemp(FNBuffer)) == -1) {
std::cerr << "bugpoint: ERROR: Cannot create temporary file in the current "
<< " directory!\n";
exit(1);
}
// We don't need to hold the temp file descriptor... we will trust that noone
// will overwrite/delete the file while we are working on it...
close(TempFD);
std::string Result(FNBuffer);
delete[] FNBuffer;
return Result;
}

View File

@ -5,7 +5,7 @@
//
//===----------------------------------------------------------------------===//
#include "SystemUtils.h"
#include "Support/SystemUtils.h"
#include <algorithm>
#include <fstream>
#include <iostream>
@ -17,41 +17,6 @@
#include "Config/unistd.h"
#include "Config/errno.h"
/// removeFile - Delete the specified file
///
void removeFile(const std::string &Filename) {
std::remove(Filename.c_str());
}
/// getUniqueFilename - Return a filename with the specified prefix. If the
/// file does not exist yet, return it, otherwise add a suffix to make it
/// unique.
///
std::string getUniqueFilename(const std::string &FilenameBase) {
if (!std::ifstream(FilenameBase.c_str()))
return FilenameBase; // Couldn't open the file? Use it!
// Create a pattern for mkstemp...
char *FNBuffer = new char[FilenameBase.size()+8];
strcpy(FNBuffer, FilenameBase.c_str());
strcpy(FNBuffer+FilenameBase.size(), "-XXXXXX");
// Agree on a temporary file name to use....
int TempFD;
if ((TempFD = mkstemp(FNBuffer)) == -1) {
std::cerr << "bugpoint: ERROR: Cannot create temporary file in the current "
<< " directory!\n";
exit(1);
}
// We don't need to hold the temp file descriptor... we will trust that noone
// will overwrite/delete the file while we are working on it...
close(TempFD);
std::string Result(FNBuffer);
delete[] FNBuffer;
return Result;
}
/// isExecutableFile - This function returns true if the filename specified
/// exists and is executable.
///