Changes in directory llvm/lib/System/Unix:
Path.inc updated: 1.54 -> 1.55 --- Log message: For PR797: http://llvm.org/PR797 : Remove exceptions from the Path::create*OnDisk methods. Update their users to handle error messages via arguments and result codes. --- Diffs of the changes: (+22 -15) Path.inc | 37 ++++++++++++++++++++++--------------- 1 files changed, 22 insertions(+), 15 deletions(-) Index: llvm/lib/System/Unix/Path.inc diff -u llvm/lib/System/Unix/Path.inc:1.54 llvm/lib/System/Unix/Path.inc:1.55 --- llvm/lib/System/Unix/Path.inc:1.54 Tue Aug 22 18:27:22 2006 +++ llvm/lib/System/Unix/Path.inc Tue Aug 22 19:39:35 2006 @@ -517,7 +517,7 @@ } bool -Path::createDirectoryOnDisk( bool create_parents) { +Path::createDirectoryOnDisk( bool create_parents, std::string* ErrMsg ) { // Get a writeable copy of the path name char pathname[MAXPATHLEN]; path.copy(pathname,MAXPATHLEN); @@ -540,8 +540,11 @@ 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)) { + MakeErrMsg(ErrMsg, + std::string(pathname) + ": can't create directory"); + return true; + } char* save = next; next = strchr(next+1,'/'); *save = '/'; @@ -549,33 +552,37 @@ } 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)) { + MakeErrMsg(ErrMsg, std::string(pathname) + ": can't create directory"); + return true; + } + return false; } bool -Path::createFileOnDisk() { +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"); + if (fd < 0) { + MakeErrMsg(ErrMsg, path + ": can't create file"); + return true; + } ::close(fd); - - return true; + return false; } bool -Path::createTemporaryFileOnDisk(bool reuse_current) { +Path::createTemporaryFileOnDisk(bool reuse_current, std::string* ErrMsg) { // Make this into a unique file name makeUnique( reuse_current ); // create the file - int outFile = ::open(path.c_str(), O_WRONLY|O_CREAT|O_TRUNC, 0666); - if (outFile != -1) { - ::close(outFile); + int fd = ::open(path.c_str(), O_WRONLY|O_CREAT|O_TRUNC, 0666); + if (fd < 0) { + MakeErrMsg(ErrMsg, path + ": can't create temporary file"); return true; } + ::close(fd); return false; } _______________________________________________ llvm-commits mailing list llvm-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
