aboutsummaryrefslogtreecommitdiff
path: root/lib/System/Unix
diff options
context:
space:
mode:
Diffstat (limited to 'lib/System/Unix')
-rw-r--r--lib/System/Unix/Memory.inc6
-rw-r--r--lib/System/Unix/Path.inc113
-rw-r--r--lib/System/Unix/Unix.h53
3 files changed, 63 insertions, 109 deletions
diff --git a/lib/System/Unix/Memory.inc b/lib/System/Unix/Memory.inc
index 7faa2200c4..d040416175 100644
--- a/lib/System/Unix/Memory.inc
+++ b/lib/System/Unix/Memory.inc
@@ -35,7 +35,7 @@ llvm::sys::Memory::AllocateRWX(unsigned NumBytes, const MemoryBlock* NearBlock,
#ifdef NEED_DEV_ZERO_FOR_MMAP
static int zero_fd = open("/dev/zero", O_RDWR);
if (zero_fd == -1) {
- GetErrno("Can't open /dev/zero device", ErrMsg);
+ MakeErrMsg(ErrMsg, "Can't open /dev/zero device");
return MemoryBlock();
}
fd = zero_fd;
@@ -58,7 +58,7 @@ llvm::sys::Memory::AllocateRWX(unsigned NumBytes, const MemoryBlock* NearBlock,
if (NearBlock) //Try again without a near hint
return AllocateRWX(NumBytes, 0);
- GetErrno("Can't allocate RWX Memory", ErrMsg);
+ MakeErrMsg(ErrMsg, "Can't allocate RWX Memory");
return MemoryBlock();
}
MemoryBlock result;
@@ -70,7 +70,7 @@ llvm::sys::Memory::AllocateRWX(unsigned NumBytes, const MemoryBlock* NearBlock,
bool llvm::sys::Memory::ReleaseRWX(MemoryBlock &M, std::string *ErrMsg) {
if (M.Address == 0 || M.Size == 0) return false;
if (0 != ::munmap(M.Address, M.Size))
- return GetErrno("Can't release RWX Memory", ErrMsg);
+ return MakeErrMsg(ErrMsg, "Can't release RWX Memory");
return false;
}
diff --git a/lib/System/Unix/Path.inc b/lib/System/Unix/Path.inc
index fd99250531..9802b7e00d 100644
--- a/lib/System/Unix/Path.inc
+++ b/lib/System/Unix/Path.inc
@@ -169,6 +169,7 @@ Path::GetTemporaryDirectory(std::string* ErrMsg ) {
MakeErrMsg(ErrMsg,
std::string(pathname) + ": can't create temporary directory");
return Path();
+ }
Path result;
result.set(pathname);
assert(result.isValid() && "mkstemp didn't create a valid pathname!");
@@ -359,7 +360,8 @@ bool
Path::getFileStatus(FileStatus &info, std::string *ErrStr) const {
struct stat buf;
if (0 != stat(path.c_str(), &buf))
- return GetErrno(path + ": can't get status of file '" + path + "'", ErrStr);
+ return MakeErrMsg(ErrStr,
+ path + ": can't get status of file '" + path + "'");
info.fileSize = buf.st_size;
info.modTime.fromEpochTime(buf.st_mtime);
info.mode = buf.st_mode;
@@ -566,7 +568,8 @@ Path::createFileOnDisk(std::string* ErrMsg) {
bool
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 fd = ::open(path.c_str(), O_WRONLY|O_CREAT|O_TRUNC, 0666);
@@ -589,7 +592,7 @@ Path::eraseFromDisk(bool remove_contents, std::string *ErrStr) const {
// or other things that aren't "regular" files.
if (Status.isFile) {
if (unlink(path.c_str()) != 0)
- return GetErrno(path + ": can't destroy file", ErrStr);
+ return MakeErrMsg(ErrStr, path + ": can't destroy file");
return false;
}
@@ -614,8 +617,8 @@ Path::eraseFromDisk(bool remove_contents, std::string *ErrStr) const {
pathname[lastchar+1] = 0;
if (rmdir(pathname) != 0)
- return GetErrno(std::string(pathname) + ": can't destroy directory",
- ErrStr);
+ return MakeErrMsg(ErrStr,
+ std::string(pathname) + ": can't destroy directory");
return false;
}
@@ -633,59 +636,63 @@ Path::setStatusInfoOnDisk(const FileStatus &si, std::string *ErrStr) const {
utb.actime = si.modTime.toPosixTime();
utb.modtime = utb.actime;
if (0 != ::utime(path.c_str(),&utb))
- return GetErrno(path + ": can't set file modification time", ErrStr);
+ return MakeErrMsg(ErrStr, path + ": can't set file modification time");
if (0 != ::chmod(path.c_str(),si.mode))
- return GetErrno(path + ": can't set mode", ErrStr);
+ 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.
@@ -695,9 +702,8 @@ Path::makeUnique(bool reuse_current) {
#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.
@@ -707,9 +713,8 @@ Path::makeUnique(bool reuse_current) {
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;
@@ -722,9 +727,11 @@ Path::makeUnique(bool reuse_current) {
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
+
diff --git a/lib/System/Unix/Unix.h b/lib/System/Unix/Unix.h
index 0f9b96adca..29730fd10b 100644
--- a/lib/System/Unix/Unix.h
+++ b/lib/System/Unix/Unix.h
@@ -66,59 +66,6 @@
# define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
#endif
-inline bool GetErrno(const std::string &prefix, std::string *ErrDest,
- int errnum = -1) {
- char buffer[MAXPATHLEN];
-
- if (ErrDest == 0) return true;
-
- buffer[0] = 0;
- if (errnum == -1)
- errnum = errno;
-#ifdef HAVE_STRERROR_R
- // strerror_r is thread-safe.
- if (errnum)
- strerror_r(errnum, buffer, MAXPATHLEN-1);
-#elif HAVE_STRERROR
- // Copy the thread un-safe result of strerror into
- // the buffer as fast as possible to minimize impact
- // of collision of strerror in multiple threads.
- if (errnum)
- strncpy(buffer, strerror(errnum), MAXPATHLEN-1);
- buffer[MAXPATHLEN-1] = 0;
-#else
- // Strange that this system doesn't even have strerror
- // but, oh well, just use a generic message
- sprintf(buffer, "Error #%d", errnum);
-#endif
- *ErrDest = prefix + ": " + buffer;
- return true;
-}
-
-inline void ThrowErrno(const std::string& prefix, int errnum = -1) {
- char buffer[MAXPATHLEN];
- buffer[0] = 0;
- if (errnum == -1)
- errnum = errno;
-#ifdef HAVE_STRERROR_R
- // strerror_r is thread-safe.
- if (errnum)
- strerror_r(errnum,buffer,MAXPATHLEN-1);
-#elif HAVE_STRERROR
- // Copy the thread un-safe result of strerror into
- // the buffer as fast as possible to minimize impact
- // of collision of strerror in multiple threads.
- if (errnum)
- strncpy(buffer,strerror(errnum),MAXPATHLEN-1);
- buffer[MAXPATHLEN-1] = 0;
-#else
- // Strange that this system doesn't even have strerror
- // but, oh well, just use a generic message
- sprintf(buffer, "Error #%d", errnum);
-#endif
- throw prefix + ": " + buffer;
-}
-
/// This function builds an error message into \p ErrMsg using the \p prefix
/// string and the Unix error number given by \p errnum. If errnum is -1, the
/// default then the value of errno is used.
generated by cgit v1.2.3-18-g5258 (git 2.32.0) at 2025-05-02 17:04:31 +0000