# undef HAVE_MKDTEMP
#endif
-namespace llvm {
-using namespace sys;
+namespace {
+inline bool lastIsSlash(const std::string& path) {
+ return !path.empty() && path[path.length() - 1] == '/';
+}
-Path::Path(const std::string& unverified_path) : path(unverified_path) {
- if (unverified_path.empty())
- return;
- if (this->isValid())
- return;
- // oops, not valid.
- path.clear();
- ThrowErrno(unverified_path + ": path is not valid");
}
+namespace llvm {
+using namespace sys;
+
bool
Path::isValid() const {
+ // Check some obvious things
if (path.empty())
return false;
else if (path.length() >= MAXPATHLEN)
return false;
-#if defined(HAVE_REALPATH)
- char pathname[MAXPATHLEN];
- if (0 == realpath(path.c_str(), pathname))
- if (errno != EACCES && errno != EIO && errno != ENOENT && errno != ENOTDIR)
- return false;
-#endif
- return true;
+
+ // Check that the characters are ascii chars
+ size_t len = path.length();
+ unsigned i = 0;
+ while (i < len && isascii(path[i]))
+ ++i;
+ return i >= len;
}
+bool
+Path::isAbsolute() const {
+ if (path.empty())
+ return false;
+ return path[0] == '/';
+}
Path
Path::GetRootDirectory() {
Path result;
- result.setDirectory("/");
+ result.set("/");
return result;
}
Path
-Path::GetTemporaryDirectory() {
+Path::GetTemporaryDirectory(std::string* ErrMsg ) {
#if defined(HAVE_MKDTEMP)
// The best way is with mkdtemp but that's not available on many systems,
// Linux and FreeBSD have it. Others probably won't.
char pathname[MAXPATHLEN];
strcpy(pathname,"/tmp/llvm_XXXXXX");
- if (0 == mkdtemp(pathname))
- ThrowErrno(std::string(pathname) + ": can't create temporary directory");
+ if (0 == mkdtemp(pathname)) {
+ MakeErrMsg(ErrMsg,
+ std::string(pathname) + ": can't create temporary directory");
+ return Path();
+ }
Path result;
- result.setDirectory(pathname);
+ result.set(pathname);
assert(result.isValid() && "mkdtemp didn't create a valid pathname!");
return result;
#elif defined(HAVE_MKSTEMP)
char pathname[MAXPATHLEN];
strcpy(pathname, "/tmp/llvm_XXXXXX");
int fd = 0;
- if (-1 == (fd = mkstemp(pathname)))
- ThrowErrno(std::string(pathname) + ": can't create temporary directory");
+ if (-1 == (fd = mkstemp(pathname))) {
+ MakeErrMsg(ErrMsg,
+ std::string(pathname) + ": can't create temporary directory");
+ return Path();
+ }
::close(fd);
::unlink(pathname); // start race condition, ignore errors
- if (-1 == ::mkdir(pathname, S_IRWXU)) // end race condition
- ThrowErrno(std::string(pathname) + ": can't create temporary directory");
+ if (-1 == ::mkdir(pathname, S_IRWXU)) { // end race condition
+ MakeErrMsg(ErrMsg,
+ std::string(pathname) + ": can't create temporary directory");
+ return Path();
+ }
Path result;
- result.setDirectory(pathname);
+ result.set(pathname);
assert(result.isValid() && "mkstemp didn't create a valid pathname!");
return result;
#elif defined(HAVE_MKTEMP)
char pathname[MAXPATHLEN];
strcpy(pathname, "/tmp/llvm_XXXXXX");
char *TmpName = ::mktemp(pathname);
- if (TmpName == 0)
- ThrowErrno(std::string(TmpName) + ": can't create unique directory name");
- if (-1 == ::mkdir(TmpName, S_IRWXU))
- ThrowErrno(std::string(TmpName) + ": can't create temporary directory");
+ if (TmpName == 0) {
+ MakeErrMsg(ErrMsg,
+ std::string(TmpName) + ": can't create unique directory name");
+ return Path();
+ }
+ if (-1 == ::mkdir(TmpName, S_IRWXU)) {
+ MakeErrMsg(ErrMsg,
+ std::string(TmpName) + ": can't create temporary directory");
+ return Path();
+ }
Path result;
- result.setDirectory(TmpName);
+ result.set(TmpName);
assert(result.isValid() && "mktemp didn't create a valid pathname!");
return result;
#else
num++;
sprintf(pathname, "/tmp/llvm_%010u", unsigned(num));
} while ( 0 == access(pathname, F_OK ) );
- if (-1 == ::mkdir(pathname, S_IRWXU))
- ThrowErrno(std::string(pathname) + ": can't create temporary directory");
+ if (-1 == ::mkdir(pathname, S_IRWXU)) {
+ MakeErrMsg(ErrMsg,
+ std::string(pathname) + ": can't create temporary directory");
+ return Path();
+ }
Path result;
- result.setDirectory(pathname);
+ result.set(pathname);
assert(result.isValid() && "mkstemp didn't create a valid pathname!");
return result;
#endif
Path tmpPath;
while( delim != 0 ) {
std::string tmp(at, size_t(delim-at));
- if (tmpPath.setDirectory(tmp))
- if (tmpPath.readable())
+ if (tmpPath.set(tmp))
+ if (tmpPath.canRead())
Paths.push_back(tmpPath);
at = delim + 1;
delim = strchr(at, ':');
}
if (*at != 0)
- if (tmpPath.setDirectory(std::string(at)))
- if (tmpPath.readable())
+ if (tmpPath.set(std::string(at)))
+ if (tmpPath.canRead())
Paths.push_back(tmpPath);
}
#ifdef LLVM_LIBDIR
{
Path tmpPath;
- if (tmpPath.setDirectory(LLVM_LIBDIR))
- if (tmpPath.readable())
+ if (tmpPath.set(LLVM_LIBDIR))
+ if (tmpPath.canRead())
Paths.push_back(tmpPath);
}
#endif
const char* home = getenv("HOME");
if (home) {
Path result;
- if (result.setDirectory(home))
+ if (result.set(home))
return result;
}
return GetRootDirectory();
}
-bool
-Path::isFile() const {
- return (isValid() && path[path.length()-1] != '/');
-}
-
-bool
-Path::isDirectory() const {
- return (isValid() && path[path.length()-1] == '/');
-}
std::string
Path::getBasename() const {
else
slash++;
- return path.substr(slash, path.rfind('.'));
+ size_t dot = path.rfind('.');
+ if (dot == std::string::npos || dot < slash)
+ return path.substr(slash);
+ else
+ return path.substr(slash, dot - slash);
}
bool Path::hasMagicNumber(const std::string &Magic) const {
size_t len = Magic.size();
assert(len < 1024 && "Request for magic string too long");
char* buf = (char*) alloca(1 + len);
- int fd = ::open(path.c_str(),O_RDONLY);
+ int fd = ::open(path.c_str(), O_RDONLY);
if (fd < 0)
return false;
size_t read_len = ::read(fd, buf, len);
}
bool Path::getMagicNumber(std::string& Magic, unsigned len) const {
- if (!isFile())
- return false;
assert(len < 1024 && "Request for magic string too long");
char* buf = (char*) alloca(1 + len);
- int fd = ::open(path.c_str(),O_RDONLY);
+ int fd = ::open(path.c_str(), O_RDONLY);
if (fd < 0)
return false;
ssize_t bytes_read = ::read(fd, buf, len);
bool
Path::isBytecodeFile() const {
- char buffer[ 4];
+ char buffer[4];
buffer[0] = 0;
- int fd = ::open(path.c_str(),O_RDONLY);
+ int fd = ::open(path.c_str(), O_RDONLY);
if (fd < 0)
return false;
ssize_t bytes_read = ::read(fd, buffer, 4);
return false;
return (buffer[0] == 'l' && buffer[1] == 'l' && buffer[2] == 'v' &&
- (buffer[3] == 'c' || buffer[3] == 'm'));
+ (buffer[3] == 'c' || buffer[3] == 'm'));
}
bool
}
bool
-Path::readable() const {
+Path::canRead() const {
return 0 == access(path.c_str(), F_OK | R_OK );
}
bool
-Path::writable() const {
+Path::canWrite() const {
return 0 == access(path.c_str(), F_OK | W_OK );
}
bool
-Path::executable() const {
+Path::canExecute() const {
+ if (0 != access(path.c_str(), R_OK | X_OK ))
+ return false;
struct stat st;
int r = stat(path.c_str(), &st);
if (r != 0 || !S_ISREG(st.st_mode))
return false;
- return 0 == access(path.c_str(), R_OK | X_OK );
+ return true;
}
std::string
return path.substr(pos+1);
}
-void
-Path::getStatusInfo(StatusInfo& info) const {
- struct stat buf;
- if (0 != stat(path.c_str(), &buf)) {
- ThrowErrno(path + ": can't determine type of path object: ");
+bool
+Path::getFileStatus(FileStatus &info, bool update, std::string *ErrStr) const {
+ if (status == 0 || update) {
+ struct stat buf;
+ if (0 != stat(path.c_str(), &buf))
+ return MakeErrMsg(ErrStr, path + ": can't get status of file");
+ if (status == 0)
+ status = new FileStatus;
+ status->fileSize = buf.st_size;
+ status->modTime.fromEpochTime(buf.st_mtime);
+ status->mode = buf.st_mode;
+ status->user = buf.st_uid;
+ status->group = buf.st_gid;
+ status->uniqueID = uint64_t(buf.st_ino);
+ status->isDir = S_ISDIR(buf.st_mode);
+ status->isFile = S_ISREG(buf.st_mode);
}
- info.fileSize = buf.st_size;
- info.modTime.fromEpochTime(buf.st_mtime);
- info.mode = buf.st_mode;
- info.user = buf.st_uid;
- info.group = buf.st_gid;
- info.isDir = S_ISDIR(buf.st_mode);
- if (info.isDir && path[path.length()-1] != '/')
- path += '/';
+ info = *status;
+ return false;
}
-static bool AddPermissionBits(const std::string& Filename, int bits) {
+static bool AddPermissionBits(const Path &File, int bits) {
// Get the umask value from the operating system. We want to use it
// when changing the file's permissions. Since calling umask() sets
// the umask and returns its old value, we must call it a second
umask(mask); // Restore the umask.
// Get the file's current mode.
- struct stat st;
- if ((stat(Filename.c_str(), &st)) == -1)
- return false;
+ FileStatus Stat;
+ if (File.getFileStatus(Stat)) return false;
// Change the file to have whichever permissions bits from 'bits'
// that the umask would not disable.
- if ((chmod(Filename.c_str(), (st.st_mode | (bits & ~mask)))) == -1)
+ if ((chmod(File.c_str(), (Stat.getMode() | (bits & ~mask)))) == -1)
return false;
return true;
}
-void Path::makeReadable() {
- if (!AddPermissionBits(path,0444))
- ThrowErrno(path + ": can't make file readable");
+bool Path::makeReadableOnDisk(std::string* ErrMsg) {
+ if (!AddPermissionBits(*this, 0444))
+ return MakeErrMsg(ErrMsg, path + ": can't make file readable");
+ return false;
}
-void Path::makeWriteable() {
- if (!AddPermissionBits(path,0222))
- ThrowErrno(path + ": can't make file writable");
+bool Path::makeWriteableOnDisk(std::string* ErrMsg) {
+ if (!AddPermissionBits(*this, 0222))
+ return MakeErrMsg(ErrMsg, path + ": can't make file writable");
+ return false;
}
-void Path::makeExecutable() {
- if (!AddPermissionBits(path,0111))
- ThrowErrno(path + ": can't make file executable");
+bool Path::makeExecutableOnDisk(std::string* ErrMsg) {
+ if (!AddPermissionBits(*this, 0111))
+ return MakeErrMsg(ErrMsg, path + ": can't make file executable");
+ return false;
}
bool
-Path::getDirectoryContents(std::set<Path>& result) const {
- if (!isDirectory())
- return false;
+Path::getDirectoryContents(std::set<Path>& result, std::string* ErrMsg) const {
DIR* direntries = ::opendir(path.c_str());
if (direntries == 0)
- ThrowErrno(path + ": can't open directory");
+ return MakeErrMsg(ErrMsg, path + ": can't open directory");
+
+ std::string dirPath = path;
+ if (!lastIsSlash(dirPath))
+ dirPath += '/';
result.clear();
struct dirent* de = ::readdir(direntries);
for ( ; de != 0; de = ::readdir(direntries)) {
if (de->d_name[0] != '.') {
- Path aPath(path + (const char*)de->d_name);
- struct stat buf;
- if (0 != stat(aPath.path.c_str(), &buf)) {
- int stat_errno = errno;
- struct stat st;
- if (0 == lstat(aPath.path.c_str(), &st) && S_ISLNK(st.st_mode))
+ Path aPath(dirPath + (const char*)de->d_name);
+ struct stat st;
+ if (0 != lstat(aPath.path.c_str(), &st)) {
+ if (S_ISLNK(st.st_mode))
continue; // dangling symlink -- ignore
- ThrowErrno(aPath.path +
- ": can't determine file object type", stat_errno);
+ return MakeErrMsg(ErrMsg,
+ aPath.path + ": can't determine file object type");
}
- if (S_ISDIR(buf.st_mode))
- aPath.path += "/";
result.insert(aPath);
}
}
closedir(direntries);
- return true;
-}
-
-bool
-Path::setDirectory(const std::string& a_path) {
- if (a_path.size() == 0)
- return false;
- Path save(*this);
- path = a_path;
- size_t last = a_path.size() -1;
- if (a_path[last] != '/')
- path += '/';
- if (!isValid()) {
- path = save.path;
- return false;
- }
- return true;
+ return false;
}
bool
-Path::setFile(const std::string& a_path) {
- if (a_path.size() == 0)
+Path::set(const std::string& a_path) {
+ if (a_path.empty())
return false;
- Path save(*this);
+ std::string save(path);
path = a_path;
- size_t last = a_path.size() - 1;
- while (last > 0 && a_path[last] == '/')
- last--;
- path.erase(last+1);
if (!isValid()) {
- path = save.path;
+ path = save;
return false;
}
return true;
}
bool
-Path::appendDirectory(const std::string& dir) {
- if (isFile())
+Path::appendComponent(const std::string& name) {
+ if (name.empty())
return false;
- Path save(*this);
- path += dir;
- path += "/";
+ std::string save(path);
+ if (!lastIsSlash(path))
+ path += '/';
+ path += name;
if (!isValid()) {
- path = save.path;
+ path = save;
return false;
}
return true;
}
bool
-Path::elideDirectory() {
- if (isFile())
- return false;
+Path::eraseComponent() {
size_t slashpos = path.rfind('/',path.size());
- if (slashpos == 0 || slashpos == std::string::npos)
- return false;
+ if (slashpos == 0 || slashpos == std::string::npos) {
+ path.erase();
+ return true;
+ }
if (slashpos == path.size() - 1)
slashpos = path.rfind('/',slashpos-1);
- if (slashpos == std::string::npos)
- return false;
- path.erase(slashpos);
- return true;
-}
-
-bool
-Path::appendFile(const std::string& file) {
- if (!isDirectory())
- return false;
- Path save(*this);
- path += file;
- if (!isValid()) {
- path = save.path;
- return false;
+ if (slashpos == std::string::npos) {
+ path.erase();
+ return true;
}
- return true;
-}
-
-bool
-Path::elideFile() {
- if (isDirectory())
- return false;
- size_t slashpos = path.rfind('/',path.size());
- if (slashpos == std::string::npos)
- return false;
- path.erase(slashpos+1);
+ path.erase(slashpos);
return true;
}
bool
Path::appendSuffix(const std::string& suffix) {
- if (isDirectory())
- return false;
- Path save(*this);
+ std::string save(path);
path.append(".");
path.append(suffix);
if (!isValid()) {
- path = save.path;
+ path = save;
return false;
}
return true;
}
-bool
-Path::elideSuffix() {
- if (isDirectory()) return false;
+bool
+Path::eraseSuffix() {
+ std::string save = path;
size_t dotpos = path.rfind('.',path.size());
size_t slashpos = path.rfind('/',path.size());
- if (slashpos != std::string::npos && dotpos != std::string::npos &&
- dotpos > slashpos) {
- path.erase(dotpos, path.size()-dotpos);
- return true;
+ if (dotpos != std::string::npos) {
+ if (slashpos == std::string::npos || dotpos > slashpos+1) {
+ path.erase(dotpos, path.size()-dotpos);
+ return true;
+ }
}
+ if (!isValid())
+ path = save;
return false;
}
-
bool
-Path::createDirectory( bool create_parents) {
- // Make sure we're dealing with a directory
- if (!isDirectory()) return false;
-
+Path::createDirectoryOnDisk( bool create_parents, std::string* ErrMsg ) {
// Get a writeable copy of the path name
char pathname[MAXPATHLEN];
path.copy(pathname,MAXPATHLEN);
while ( next != 0 ) {
*next = 0;
if (0 != access(pathname, F_OK | R_OK | W_OK))
- if (0 != mkdir(pathname, S_IRWXU | S_IRWXG))
- ThrowErrno(std::string(pathname) + ": can't create directory");
+ if (0 != mkdir(pathname, S_IRWXU | S_IRWXG)) {
+ return MakeErrMsg(ErrMsg,
+ std::string(pathname) + ": can't create directory");
+ }
char* save = next;
next = strchr(next+1,'/');
*save = '/';
}
if (0 != access(pathname, F_OK | R_OK))
- if (0 != mkdir(pathname, S_IRWXU | S_IRWXG))
- ThrowErrno(std::string(pathname) + ": can't create directory");
- return true;
+ if (0 != mkdir(pathname, S_IRWXU | S_IRWXG)) {
+ return MakeErrMsg(ErrMsg,
+ std::string(pathname) + ": can't create directory");
+ }
+ return false;
}
bool
-Path::createFile() {
- // Make sure we're dealing with a file
- if (!isFile()) return false;
-
+Path::createFileOnDisk(std::string* ErrMsg) {
// Create the file
int fd = ::creat(path.c_str(), S_IRUSR | S_IWUSR);
if (fd < 0)
- ThrowErrno(path + ": can't create file");
+ return MakeErrMsg(ErrMsg, path + ": can't create file");
::close(fd);
-
- return true;
+ return false;
}
bool
-Path::createTemporaryFile(bool reuse_current) {
- // Make sure we're dealing with a file
- if (!isFile())
- return false;
-
+Path::createTemporaryFileOnDisk(bool reuse_current, std::string* ErrMsg) {
// Make this into a unique file name
- makeUnique( reuse_current );
+ if (makeUnique( reuse_current, ErrMsg ))
+ return true;
// create the file
- int outFile = ::open(path.c_str(), O_WRONLY|O_CREAT|O_TRUNC, 0666);
- if (outFile != -1) {
- ::close(outFile);
- return true;
- }
+ int fd = ::open(path.c_str(), O_WRONLY|O_CREAT|O_TRUNC, 0666);
+ if (fd < 0)
+ return MakeErrMsg(ErrMsg, path + ": can't create temporary file");
+ ::close(fd);
return false;
}
bool
-Path::destroyDirectory(bool remove_contents) const {
- // Make sure we're dealing with a directory
- if (!isDirectory()) return false;
-
- // If it doesn't exist, we're done.
- if (!exists()) return true;
-
+Path::eraseFromDisk(bool remove_contents, std::string *ErrStr) const {
+ FileStatus Status;
+ if (getFileStatus(Status, ErrStr))
+ return true;
+
+ // Note: this check catches strange situations. In all cases, LLVM should only
+ // be involved in the creation and deletion of regular files. This check
+ // ensures that what we're trying to erase is a regular file. It effectively
+ // prevents LLVM from erasing things like /dev/null, any block special file,
+ // or other things that aren't "regular" files.
+ if (Status.isFile) {
+ if (unlink(path.c_str()) != 0)
+ return MakeErrMsg(ErrStr, path + ": can't destroy file");
+ return false;
+ }
+
+ if (!Status.isDir) {
+ if (ErrStr) *ErrStr = "not a file or directory";
+ return true;
+ }
if (remove_contents) {
- // Recursively descend the directory to remove its content
- std::string cmd("/bin/rm -rf ");
- cmd += path;
+ // Recursively descend the directory to remove its contents.
+ std::string cmd = "/bin/rm -rf " + path;
system(cmd.c_str());
- } else {
- // Otherwise, try to just remove the one directory
- char pathname[MAXPATHLEN];
- path.copy(pathname,MAXPATHLEN);
- int lastchar = path.length() - 1 ;
- if (pathname[lastchar] == '/')
- pathname[lastchar] = 0;
- else
- pathname[lastchar+1] = 0;
- if ( 0 != rmdir(pathname))
- ThrowErrno(std::string(pathname) + ": can't destroy directory");
+ return false;
}
- return true;
-}
-bool
-Path::destroyFile() const {
- if (!isFile()) return false;
- if (0 != unlink(path.c_str()))
- ThrowErrno(path + ": can't destroy file");
- return true;
+ // Otherwise, try to just remove the one directory.
+ char pathname[MAXPATHLEN];
+ path.copy(pathname, MAXPATHLEN);
+ int lastchar = path.length() - 1 ;
+ if (pathname[lastchar] == '/')
+ pathname[lastchar] = 0;
+ else
+ pathname[lastchar+1] = 0;
+
+ if (rmdir(pathname) != 0)
+ return MakeErrMsg(ErrStr,
+ std::string(pathname) + ": can't destroy directory");
+ return false;
}
bool
-Path::renameFile(const Path& newName) {
- if (!isFile()) return false;
- if (0 != rename(path.c_str(), newName.c_str()))
- ThrowErrno(std::string("can't rename '") + path + "' as '" +
+Path::renamePathOnDisk(const Path& newName, std::string* ErrMsg) {
+ if (0 != ::rename(path.c_str(), newName.c_str()))
+ return MakeErrMsg(ErrMsg, std::string("can't rename '") + path + "' as '" +
newName.toString() + "' ");
- return true;
+ return false;
}
bool
-Path::setStatusInfo(const StatusInfo& si) const {
- if (!isFile()) return false;
+Path::setStatusInfoOnDisk(const FileStatus &si, std::string *ErrStr) const {
struct utimbuf utb;
utb.actime = si.modTime.toPosixTime();
utb.modtime = utb.actime;
if (0 != ::utime(path.c_str(),&utb))
- ThrowErrno(path + ": can't set file modification time");
+ return MakeErrMsg(ErrStr, path + ": can't set file modification time");
if (0 != ::chmod(path.c_str(),si.mode))
- ThrowErrno(path + ": can't set mode");
- return true;
+ return MakeErrMsg(ErrStr, path + ": can't set mode");
+ return false;
}
-void
-sys::CopyFile(const sys::Path &Dest, const sys::Path &Src) {
+bool
+sys::CopyFile(const sys::Path &Dest, const sys::Path &Src, std::string* ErrMsg){
int inFile = -1;
int outFile = -1;
- try {
- inFile = ::open(Src.c_str(), O_RDONLY);
- if (inFile == -1)
- ThrowErrno(Src.toString() + ": can't open source file to copy: ");
-
- outFile = ::open(Dest.c_str(), O_WRONLY|O_CREAT, 0666);
- if (outFile == -1)
- ThrowErrno(Dest.toString() +": can't create destination file for copy: ");
-
- char Buffer[16*1024];
- while (ssize_t Amt = ::read(inFile, Buffer, 16*1024)) {
- if (Amt == -1) {
- if (errno != EINTR && errno != EAGAIN)
- ThrowErrno(Src.toString()+": can't read source file: ");
- } else {
- char *BufPtr = Buffer;
- while (Amt) {
- ssize_t AmtWritten = ::write(outFile, BufPtr, Amt);
- if (AmtWritten == -1) {
- if (errno != EINTR && errno != EAGAIN)
- ThrowErrno(Dest.toString() + ": can't write destination file: ");
- } else {
- Amt -= AmtWritten;
- BufPtr += AmtWritten;
+ inFile = ::open(Src.c_str(), O_RDONLY);
+ if (inFile == -1)
+ return MakeErrMsg(ErrMsg, Src.toString() +
+ ": can't open source file to copy");
+
+ outFile = ::open(Dest.c_str(), O_WRONLY|O_CREAT, 0666);
+ if (outFile == -1) {
+ ::close(inFile);
+ return MakeErrMsg(ErrMsg, Dest.toString() +
+ ": can't create destination file for copy");
+ }
+
+ char Buffer[16*1024];
+ while (ssize_t Amt = ::read(inFile, Buffer, 16*1024)) {
+ if (Amt == -1) {
+ if (errno != EINTR && errno != EAGAIN) {
+ ::close(inFile);
+ ::close(outFile);
+ return MakeErrMsg(ErrMsg, Src.toString()+": can't read source file: ");
+ }
+ } else {
+ char *BufPtr = Buffer;
+ while (Amt) {
+ ssize_t AmtWritten = ::write(outFile, BufPtr, Amt);
+ if (AmtWritten == -1) {
+ if (errno != EINTR && errno != EAGAIN) {
+ ::close(inFile);
+ ::close(outFile);
+ return MakeErrMsg(ErrMsg, Dest.toString() +
+ ": can't write destination file: ");
}
+ } else {
+ Amt -= AmtWritten;
+ BufPtr += AmtWritten;
}
}
}
- ::close(inFile);
- ::close(outFile);
- } catch (...) {
- if (inFile != -1)
- ::close(inFile);
- if (outFile != -1)
- ::close(outFile);
- throw;
}
+ ::close(inFile);
+ ::close(outFile);
+ return false;
}
-void
-Path::makeUnique(bool reuse_current) {
+bool
+Path::makeUnique(bool reuse_current, std::string* ErrMsg) {
if (reuse_current && !exists())
- return; // File doesn't exist already, just use it!
+ return false; // File doesn't exist already, just use it!
// Append an XXXXXX pattern to the end of the file for use with mkstemp,
// mktemp or our own implementation.
#if defined(HAVE_MKSTEMP)
int TempFD;
- if ((TempFD = mkstemp(FNBuffer)) == -1) {
- ThrowErrno(path + ": can't make unique filename");
- }
+ if ((TempFD = mkstemp(FNBuffer)) == -1)
+ return MakeErrMsg(ErrMsg, path + ": can't make unique filename");
// We don't need to hold the temp file descriptor... we will trust that no one
// will overwrite/delete the file before we can open it again.
path = FNBuffer;
#elif defined(HAVE_MKTEMP)
// If we don't have mkstemp, use the old and obsolete mktemp function.
- if (mktemp(FNBuffer) == 0) {
- ThrowErrno(path + ": can't make unique filename");
- }
+ if (mktemp(FNBuffer) == 0)
+ return MakeErrMsg(ErrMsg, path + ": can't make unique filename");
// Save the name
path = FNBuffer;
path = FNBuffer;
}
if (FCounter > 999999)
- throw std::string(path + ": can't make unique filename: too many files");
+ return MakeErrMsg(ErrMsg,
+ path + ": can't make unique filename: too many files");
#endif
-
-}
+ return false;
}
+} // end llvm namespace
+
projects / oota-llvm.git / blobdiff