Revise the design of the Path concept per peer review. Too many changes to
note individually but these essence of it is to not derive from
std::string, clarify the interface, and provide better documentation.
There is now also (untested) implementations for AIX, Darwin, and SunOS.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@16078 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/System/AIX/Path.cpp b/lib/System/AIX/Path.cpp
new file mode 100644
index 0000000..f75ab90
--- /dev/null
+++ b/lib/System/AIX/Path.cpp
@@ -0,0 +1,36 @@
+//===- llvm/System/AIX/Path.cpp - AIX Path Implementation -------*- C++ -*-===//
+//
+// The LLVM Compiler Infrastructure
+//
+// This file was developed by Reid Spencer and is distributed under the
+// University of Illinois Open Source License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+//
+// This file provides the AIX specific implementation of the Path class.
+//
+//===----------------------------------------------------------------------===//
+
+//===----------------------------------------------------------------------===//
+//=== WARNING: Implementation here must contain only AIX specific code
+//=== and must not be generic UNIX code (see ../Unix/Path.cpp)
+//===----------------------------------------------------------------------===//
+
+// Include the generic unix implementation
+#include "../Unix/Path.cpp"
+
+namespace llvm {
+using namespace sys;
+
+bool
+Path::is_valid() const {
+ if (path.empty())
+ return false;
+ if (path.length() >= MAXPATHLEN)
+ return false;
+ return true;
+}
+
+}
+
+// vim: sw=2 smartindent smarttab tw=80 autoindent expandtab
diff --git a/lib/System/Darwin/Path.cpp b/lib/System/Darwin/Path.cpp
new file mode 100644
index 0000000..b3321a4
--- /dev/null
+++ b/lib/System/Darwin/Path.cpp
@@ -0,0 +1,36 @@
+//===- llvm/System/Darwin/Path.cpp - Linux Path Implementation --*- C++ -*-===//
+//
+// The LLVM Compiler Infrastructure
+//
+// This file was developed by Reid Spencer and is distributed under the
+// University of Illinois Open Source License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+//
+// This file provides the Darwin specific implementation of the Path class.
+//
+//===----------------------------------------------------------------------===//
+
+//===----------------------------------------------------------------------===//
+//=== WARNING: Implementation here must contain only Darwin specific code
+//=== and must not be generic UNIX code (see ../Unix/Path.cpp)
+//===----------------------------------------------------------------------===//
+
+// Include the generic unix implementation
+#include "../Unix/Path.cpp"
+
+namespace llvm {
+using namespace sys;
+
+bool
+Path::is_valid() const {
+ if (path.empty())
+ return false;
+ if (path.length() >= MAXPATHLEN)
+ return false;
+ return true;
+}
+
+}
+
+// vim: sw=2 smartindent smarttab tw=80 autoindent expandtab
diff --git a/lib/System/Linux/Path.cpp b/lib/System/Linux/Path.cpp
index 5c73d01..e7efd2f 100644
--- a/lib/System/Linux/Path.cpp
+++ b/lib/System/Linux/Path.cpp
@@ -13,8 +13,26 @@
//===----------------------------------------------------------------------===//
//=== WARNING: Implementation here must contain only Linux specific code
-//=== and must not be generic UNIX code (see ../Unix)
+//=== and must not be generic UNIX code (see ../Unix/Path.cpp)
//===----------------------------------------------------------------------===//
-// Th..Th..Th..Tha's All Folks!
+// Include the generic Unix implementation
#include "../Unix/Path.cpp"
+
+namespace llvm {
+using namespace sys;
+
+bool
+Path::is_valid() const {
+ if (path.empty())
+ return false;
+ char pathname[MAXPATHLEN];
+ if (0 == realpath(path.c_str(), pathname))
+ if (errno != EACCES && errno != EIO && errno != ENOENT && errno != ENOTDIR)
+ return false;
+ return true;
+}
+
+}
+
+// vim: sw=2 smartindent smarttab tw=80 autoindent expandtab
diff --git a/lib/System/Path.cpp b/lib/System/Path.cpp
index e32842d..93c1e0a 100644
--- a/lib/System/Path.cpp
+++ b/lib/System/Path.cpp
@@ -10,10 +10,11 @@
// This header file implements the operating system Path concept.
//
//===----------------------------------------------------------------------===//
+
#include "llvm/System/Path.h"
namespace llvm {
-namespace sys {
+using namespace sys;
//===----------------------------------------------------------------------===//
//=== WARNING: Implementation here must contain only TRULY operating system
@@ -21,40 +22,18 @@
//===----------------------------------------------------------------------===//
bool
-Path::is_valid() const {
- if ( empty() ) return false;
- return true;
+Path::is_file() const {
+ return (is_valid() && path[path.length()-1] != '/');
}
-void
-Path::fill( char* buffer, unsigned bufflen ) const {
- unsigned pathlen = length();
- assert( bufflen > pathlen && "Insufficient buffer size" );
- unsigned copylen = pathlen <? (bufflen - 1);
- this->copy(buffer, copylen, 0 );
- buffer[ copylen ] = 0;
+bool
+Path::is_directory() const {
+ return (is_valid() && path[path.length()-1] == '/');
}
-void
-Path::make_directory() {
- char end[2];
- end[0] = '/';
- end[1] = 0;
- if ( empty() )
- this->assign( end );
- else if ( (*this)[length()-1] != '/')
- this->append( end );
-}
-
-void
-Path::make_file() {
- if ( (*this)[length()-1] == '/')
- this->erase( this->length()-1, 1 );
}
// Include the truly platform-specific parts of this class.
#include "platform/Path.cpp"
-}
-}
// vim: sw=2
diff --git a/lib/System/SunOS/Path.cpp b/lib/System/SunOS/Path.cpp
new file mode 100644
index 0000000..a180bbf
--- /dev/null
+++ b/lib/System/SunOS/Path.cpp
@@ -0,0 +1,38 @@
+//===- llvm/System/SunOS/Path.cpp - SunOS Path Implementation ---*- C++ -*-===//
+//
+// The LLVM Compiler Infrastructure
+//
+// This file was developed by Reid Spencer and is distributed under the
+// University of Illinois Open Source License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+//
+// This file provides the SunOS specific implementation of the Path class.
+//
+//===----------------------------------------------------------------------===//
+
+//===----------------------------------------------------------------------===//
+//=== WARNING: Implementation here must contain only SunOS specific code
+//=== and must not be generic UNIX code (see ../Unix/Path.cpp)
+//===----------------------------------------------------------------------===//
+
+// Include the generic Unix implementation
+#include "../Unix/Path.cpp"
+
+namespace llvm {
+using namespace sys;
+
+bool
+Path::is_valid() const {
+ if (path.empty())
+ return false;
+ char pathname[MAXPATHLEN];
+ if (0 == realpath(path.c_str(), pathname))
+ if (errno != EACCES && errno != EIO && errno != ENOENT && errno != ENOTDIR)
+ return false;
+ return true;
+}
+
+}
+
+// vim: sw=2 smartindent smarttab tw=80 autoindent expandtab
diff --git a/lib/System/Unix/Path.cpp b/lib/System/Unix/Path.cpp
index 9253f8c..9d9dd99 100644
--- a/lib/System/Unix/Path.cpp
+++ b/lib/System/Unix/Path.cpp
@@ -13,126 +13,321 @@
//===----------------------------------------------------------------------===//
//=== WARNING: Implementation here must contain only generic UNIX code that
-//=== is guaranteed to work on all UNIX variants.
+//=== is guaranteed to work on *all* UNIX variants.
//===----------------------------------------------------------------------===//
#include "Unix.h"
#include <sys/stat.h>
#include <fcntl.h>
+#include <Config/config.h>
-bool
-Path::is_file() const {
- if (!empty() && ((*this)[length()-1] != '/'))
- return true;
- return false;
-}
+namespace llvm {
+using namespace sys;
-bool
-Path::is_directory() const {
- if ((!empty()) && ((*this)[length()-1] == '/'))
- return true;
- return false;
-}
-
-void
-Path::create( bool create_parents) {
- if ( is_directory() ) {
- if ( create_parents )
- this->create_directories( );
- this->create_directory( );
- } else if ( is_file() ) {
- if ( create_parents )
- this->create_directories( );
- this->create_file( );
- }
-}
-
-void
-Path::remove() {
- if ( is_directory() ) {
- if ( exists() )
- this->remove_directory( );
- } else if ( is_file() )
- if ( exists() )
- this->remove_file( );
-}
-
-bool
-Path::exists() {
- char pathname[MAXPATHLEN];
- this->fill(pathname,MAXPATHLEN);
- int lastchar = this->length() - 1 ;
- if (pathname[lastchar] == '/')
- pathname[lastchar] = 0;
- return 0 == access(pathname, F_OK );
-}
-
-void
-Path::create_directory( ) {
- char pathname[MAXPATHLEN];
- this->fill(pathname,MAXPATHLEN);
- int lastchar = this->length() - 1 ;
- if (pathname[lastchar] == '/')
- pathname[lastchar] = 0;
- if (0 != mkdir(pathname, S_IRWXU | S_IRWXG))
- ThrowErrno(pathname);
-}
-
-void
-Path::create_directories() {
- char pathname[MAXPATHLEN];
- this->fill(pathname,MAXPATHLEN);
- int lastchar = this->length() - 1 ;
- if (pathname[lastchar] == '/')
- pathname[lastchar] = 0;
-
- char * next = index(pathname,'/');
- if ( pathname[0] == '/')
- next = index(&pathname[1],'/');
- while ( next != 0 )
- {
- *next = 0;
- if (0 != access(pathname, F_OK | R_OK))
- if (0 != mkdir(pathname, S_IRWXU | S_IRWXG))
- ThrowErrno(pathname);
- char* save = next;
- next = index(pathname,'/');
- *save = '/';
- }
-}
-
-void
-Path::remove_directory()
+Path::Path(std::string unverified_path)
+ : path(unverified_path)
{
- char pathname[MAXPATHLEN];
- this->fill(pathname,MAXPATHLEN);
- int lastchar = this->length() - 1 ;
- if (pathname[lastchar] == '/')
- pathname[lastchar] = 0;
- if ( 0 != rmdir(pathname))
- ThrowErrno(pathname);
+ if (unverified_path.empty())
+ return;
+ if (this->is_valid())
+ return;
+ // oops, not valid.
+ path.clear();
+ ThrowErrno(unverified_path + ": path is not valid");
}
-void
+Path
+Path::GetRootDirectory() {
+ Path result;
+ result.set_directory("/");
+ return result;
+}
+
+Path
+Path::GetTemporaryDirectory() {
+ char pathname[MAXPATHLEN];
+ strcpy(pathname,"/tmp/llvm_XXXXXX");
+ if (0 == mkdtemp(pathname))
+ ThrowErrno(std::string(pathname) + ": Can't create temporary directory");
+ Path result;
+ result.set_directory(pathname);
+ assert(result.is_valid() && "mkdtemp didn't create a valid pathname!");
+ return result;
+}
+
+Path
+Path::GetSystemLibraryPath1() {
+ return Path("/lib/");
+}
+
+Path
+Path::GetSystemLibraryPath2() {
+ return Path("/usr/lib/");
+}
+
+Path
+Path::GetLLVMDefaultConfigDir() {
+ return Path("/etc/llvm/");
+}
+
+Path
+Path::GetLLVMConfigDir() {
+ Path result;
+ if (result.set_directory(LLVM_ETCDIR))
+ return result;
+ return GetLLVMDefaultConfigDir();
+}
+
+Path
+Path::GetUserHomeDirectory() {
+ const char* home = getenv("HOME");
+ if (home) {
+ Path result;
+ if (result.set_directory(home))
+ return result;
+ }
+ return GetRootDirectory();
+}
+
+bool
+Path::exists() const {
+ return 0 == access(path.c_str(), F_OK );
+}
+
+bool
+Path::readable() const {
+ return 0 == access(path.c_str(), F_OK | R_OK );
+}
+
+bool
+Path::writable() const {
+ return 0 == access(path.c_str(), F_OK | W_OK );
+}
+
+bool
+Path::executable() const {
+ return 0 == access(path.c_str(), R_OK | X_OK );
+}
+
+std::string
+Path::getLast() const {
+ // Find the last slash
+ size_t pos = path.rfind('/');
+
+ // Handle the corner cases
+ if (pos == std::string::npos)
+ return path;
+
+ // If the last character is a slash
+ if (pos == path.length()-1) {
+ // Find the second to last slash
+ size_t pos2 = path.rfind('/', pos-1);
+ if (pos2 == std::string::npos)
+ return path.substr(0,pos);
+ else
+ return path.substr(pos2+1,pos-pos2-1);
+ }
+ // Return everything after the last slash
+ return path.substr(pos+1);
+}
+
+bool
+Path::set_directory(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 (last != 0 && a_path[last] != '/')
+ path += '/';
+ if (!is_valid()) {
+ path = save.path;
+ return false;
+ }
+ return true;
+}
+
+bool
+Path::set_file(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;
+ while (last > 0 && a_path[last] == '/')
+ last--;
+ path.erase(last+1);
+ if (!is_valid()) {
+ path = save.path;
+ return false;
+ }
+ return true;
+}
+
+bool
+Path::append_directory(const std::string& dir) {
+ if (is_file())
+ return false;
+ Path save(*this);
+ path += dir;
+ path += "/";
+ if (!is_valid()) {
+ path = save.path;
+ return false;
+ }
+ return true;
+}
+
+bool
+Path::elide_directory() {
+ if (is_file())
+ return false;
+ size_t slashpos = path.rfind('/',path.size());
+ if (slashpos == 0 || slashpos == std::string::npos)
+ return false;
+ if (slashpos == path.size() - 1)
+ slashpos = path.rfind('/',slashpos-1);
+ if (slashpos == std::string::npos)
+ return false;
+ path.erase(slashpos);
+ return true;
+}
+
+bool
+Path::append_file(const std::string& file) {
+ if (!is_directory())
+ return false;
+ Path save(*this);
+ path += file;
+ if (!is_valid()) {
+ path = save.path;
+ return false;
+ }
+ return true;
+}
+
+bool
+Path::elide_file() {
+ if (is_directory())
+ return false;
+ size_t slashpos = path.rfind('/',path.size());
+ if (slashpos == std::string::npos)
+ return false;
+ path.erase(slashpos+1);
+ return true;
+}
+
+bool
+Path::append_suffix(const std::string& suffix) {
+ if (is_directory())
+ return false;
+ Path save(*this);
+ path.append(".");
+ path.append(suffix);
+ if (!is_valid()) {
+ path = save.path;
+ return false;
+ }
+ return true;
+}
+
+bool
+Path::elide_suffix() {
+ if (is_directory()) return false;
+ 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;
+ }
+ return false;
+}
+
+
+bool
+Path::create_directory( bool create_parents) {
+ // Make sure we're dealing with a directory
+ if (!is_directory()) return false;
+
+ // Get a writeable copy of the path name
+ char pathname[MAXPATHLEN];
+ path.copy(pathname,MAXPATHLEN);
+
+ // Null-terminate the last component
+ int lastchar = path.length() - 1 ;
+ if (pathname[lastchar] == '/')
+ pathname[lastchar] = 0;
+
+ // If we're supposed to create intermediate directories
+ if ( create_parents ) {
+ // Find the end of the initial name component
+ char * next = strchr(pathname,'/');
+ if ( pathname[0] == '/')
+ next = strchr(&pathname[1],'/');
+
+ // Loop through the directory components until we're done
+ 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");
+ char* save = next;
+ next = strchr(pathname,'/');
+ *save = '/';
+ }
+ } else if (0 != mkdir(pathname, S_IRWXU | S_IRWXG)) {
+ ThrowErrno(std::string(pathname) + ": Can't create directory");
+ }
+ return true;
+}
+
+bool
Path::create_file() {
- char pathname[MAXPATHLEN];
- this->fill(pathname,MAXPATHLEN);
- int lastchar = this->length() - 1 ;
- if (pathname[lastchar] == '/')
- pathname[lastchar] = 0;
- if (0 != creat(pathname, S_IRUSR | S_IWUSR))
- ThrowErrno(pathname);
+ // Make sure we're dealing with a file
+ if (!is_file()) return false;
+
+ // Create the file
+ if (0 != creat(path.c_str(), S_IRUSR | S_IWUSR))
+ ThrowErrno(std::string(path.c_str()) + ": Can't create file");
+
+ return true;
}
-void
-Path::remove_file() {
- char pathname[MAXPATHLEN];
- this->fill(pathname,MAXPATHLEN);
- int lastchar = this->length() - 1 ;
- if (pathname[lastchar] == '/')
- pathname[lastchar] = 0;
- if (0 != unlink(pathname))
- ThrowErrno(pathname);
+bool
+Path::destroy_directory(bool remove_contents) {
+ // Make sure we're dealing with a directory
+ if (!is_directory()) return false;
+
+ // If it doesn't exist, we're done.
+ if (!exists()) return true;
+
+ if (remove_contents) {
+ // Recursively descend the directory to remove its content
+ std::string cmd("/bin/rm -rf ");
+ cmd += 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;
+ if ( 0 != rmdir(pathname))
+ ThrowErrno(std::string(pathname) + ": Can't destroy directory");
+ }
+ return true;
+}
+
+bool
+Path::destroy_file() {
+ if (!is_file()) return false;
+ if (0 != unlink(path.c_str()))
+ ThrowErrno(std::string(path.c_str()) + ": Can't destroy file");
+ return true;
+}
+
}
// vim: sw=2
diff --git a/lib/System/Unix/Path.inc b/lib/System/Unix/Path.inc
index 9253f8c..9d9dd99 100644
--- a/lib/System/Unix/Path.inc
+++ b/lib/System/Unix/Path.inc
@@ -13,126 +13,321 @@
//===----------------------------------------------------------------------===//
//=== WARNING: Implementation here must contain only generic UNIX code that
-//=== is guaranteed to work on all UNIX variants.
+//=== is guaranteed to work on *all* UNIX variants.
//===----------------------------------------------------------------------===//
#include "Unix.h"
#include <sys/stat.h>
#include <fcntl.h>
+#include <Config/config.h>
-bool
-Path::is_file() const {
- if (!empty() && ((*this)[length()-1] != '/'))
- return true;
- return false;
-}
+namespace llvm {
+using namespace sys;
-bool
-Path::is_directory() const {
- if ((!empty()) && ((*this)[length()-1] == '/'))
- return true;
- return false;
-}
-
-void
-Path::create( bool create_parents) {
- if ( is_directory() ) {
- if ( create_parents )
- this->create_directories( );
- this->create_directory( );
- } else if ( is_file() ) {
- if ( create_parents )
- this->create_directories( );
- this->create_file( );
- }
-}
-
-void
-Path::remove() {
- if ( is_directory() ) {
- if ( exists() )
- this->remove_directory( );
- } else if ( is_file() )
- if ( exists() )
- this->remove_file( );
-}
-
-bool
-Path::exists() {
- char pathname[MAXPATHLEN];
- this->fill(pathname,MAXPATHLEN);
- int lastchar = this->length() - 1 ;
- if (pathname[lastchar] == '/')
- pathname[lastchar] = 0;
- return 0 == access(pathname, F_OK );
-}
-
-void
-Path::create_directory( ) {
- char pathname[MAXPATHLEN];
- this->fill(pathname,MAXPATHLEN);
- int lastchar = this->length() - 1 ;
- if (pathname[lastchar] == '/')
- pathname[lastchar] = 0;
- if (0 != mkdir(pathname, S_IRWXU | S_IRWXG))
- ThrowErrno(pathname);
-}
-
-void
-Path::create_directories() {
- char pathname[MAXPATHLEN];
- this->fill(pathname,MAXPATHLEN);
- int lastchar = this->length() - 1 ;
- if (pathname[lastchar] == '/')
- pathname[lastchar] = 0;
-
- char * next = index(pathname,'/');
- if ( pathname[0] == '/')
- next = index(&pathname[1],'/');
- while ( next != 0 )
- {
- *next = 0;
- if (0 != access(pathname, F_OK | R_OK))
- if (0 != mkdir(pathname, S_IRWXU | S_IRWXG))
- ThrowErrno(pathname);
- char* save = next;
- next = index(pathname,'/');
- *save = '/';
- }
-}
-
-void
-Path::remove_directory()
+Path::Path(std::string unverified_path)
+ : path(unverified_path)
{
- char pathname[MAXPATHLEN];
- this->fill(pathname,MAXPATHLEN);
- int lastchar = this->length() - 1 ;
- if (pathname[lastchar] == '/')
- pathname[lastchar] = 0;
- if ( 0 != rmdir(pathname))
- ThrowErrno(pathname);
+ if (unverified_path.empty())
+ return;
+ if (this->is_valid())
+ return;
+ // oops, not valid.
+ path.clear();
+ ThrowErrno(unverified_path + ": path is not valid");
}
-void
+Path
+Path::GetRootDirectory() {
+ Path result;
+ result.set_directory("/");
+ return result;
+}
+
+Path
+Path::GetTemporaryDirectory() {
+ char pathname[MAXPATHLEN];
+ strcpy(pathname,"/tmp/llvm_XXXXXX");
+ if (0 == mkdtemp(pathname))
+ ThrowErrno(std::string(pathname) + ": Can't create temporary directory");
+ Path result;
+ result.set_directory(pathname);
+ assert(result.is_valid() && "mkdtemp didn't create a valid pathname!");
+ return result;
+}
+
+Path
+Path::GetSystemLibraryPath1() {
+ return Path("/lib/");
+}
+
+Path
+Path::GetSystemLibraryPath2() {
+ return Path("/usr/lib/");
+}
+
+Path
+Path::GetLLVMDefaultConfigDir() {
+ return Path("/etc/llvm/");
+}
+
+Path
+Path::GetLLVMConfigDir() {
+ Path result;
+ if (result.set_directory(LLVM_ETCDIR))
+ return result;
+ return GetLLVMDefaultConfigDir();
+}
+
+Path
+Path::GetUserHomeDirectory() {
+ const char* home = getenv("HOME");
+ if (home) {
+ Path result;
+ if (result.set_directory(home))
+ return result;
+ }
+ return GetRootDirectory();
+}
+
+bool
+Path::exists() const {
+ return 0 == access(path.c_str(), F_OK );
+}
+
+bool
+Path::readable() const {
+ return 0 == access(path.c_str(), F_OK | R_OK );
+}
+
+bool
+Path::writable() const {
+ return 0 == access(path.c_str(), F_OK | W_OK );
+}
+
+bool
+Path::executable() const {
+ return 0 == access(path.c_str(), R_OK | X_OK );
+}
+
+std::string
+Path::getLast() const {
+ // Find the last slash
+ size_t pos = path.rfind('/');
+
+ // Handle the corner cases
+ if (pos == std::string::npos)
+ return path;
+
+ // If the last character is a slash
+ if (pos == path.length()-1) {
+ // Find the second to last slash
+ size_t pos2 = path.rfind('/', pos-1);
+ if (pos2 == std::string::npos)
+ return path.substr(0,pos);
+ else
+ return path.substr(pos2+1,pos-pos2-1);
+ }
+ // Return everything after the last slash
+ return path.substr(pos+1);
+}
+
+bool
+Path::set_directory(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 (last != 0 && a_path[last] != '/')
+ path += '/';
+ if (!is_valid()) {
+ path = save.path;
+ return false;
+ }
+ return true;
+}
+
+bool
+Path::set_file(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;
+ while (last > 0 && a_path[last] == '/')
+ last--;
+ path.erase(last+1);
+ if (!is_valid()) {
+ path = save.path;
+ return false;
+ }
+ return true;
+}
+
+bool
+Path::append_directory(const std::string& dir) {
+ if (is_file())
+ return false;
+ Path save(*this);
+ path += dir;
+ path += "/";
+ if (!is_valid()) {
+ path = save.path;
+ return false;
+ }
+ return true;
+}
+
+bool
+Path::elide_directory() {
+ if (is_file())
+ return false;
+ size_t slashpos = path.rfind('/',path.size());
+ if (slashpos == 0 || slashpos == std::string::npos)
+ return false;
+ if (slashpos == path.size() - 1)
+ slashpos = path.rfind('/',slashpos-1);
+ if (slashpos == std::string::npos)
+ return false;
+ path.erase(slashpos);
+ return true;
+}
+
+bool
+Path::append_file(const std::string& file) {
+ if (!is_directory())
+ return false;
+ Path save(*this);
+ path += file;
+ if (!is_valid()) {
+ path = save.path;
+ return false;
+ }
+ return true;
+}
+
+bool
+Path::elide_file() {
+ if (is_directory())
+ return false;
+ size_t slashpos = path.rfind('/',path.size());
+ if (slashpos == std::string::npos)
+ return false;
+ path.erase(slashpos+1);
+ return true;
+}
+
+bool
+Path::append_suffix(const std::string& suffix) {
+ if (is_directory())
+ return false;
+ Path save(*this);
+ path.append(".");
+ path.append(suffix);
+ if (!is_valid()) {
+ path = save.path;
+ return false;
+ }
+ return true;
+}
+
+bool
+Path::elide_suffix() {
+ if (is_directory()) return false;
+ 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;
+ }
+ return false;
+}
+
+
+bool
+Path::create_directory( bool create_parents) {
+ // Make sure we're dealing with a directory
+ if (!is_directory()) return false;
+
+ // Get a writeable copy of the path name
+ char pathname[MAXPATHLEN];
+ path.copy(pathname,MAXPATHLEN);
+
+ // Null-terminate the last component
+ int lastchar = path.length() - 1 ;
+ if (pathname[lastchar] == '/')
+ pathname[lastchar] = 0;
+
+ // If we're supposed to create intermediate directories
+ if ( create_parents ) {
+ // Find the end of the initial name component
+ char * next = strchr(pathname,'/');
+ if ( pathname[0] == '/')
+ next = strchr(&pathname[1],'/');
+
+ // Loop through the directory components until we're done
+ 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");
+ char* save = next;
+ next = strchr(pathname,'/');
+ *save = '/';
+ }
+ } else if (0 != mkdir(pathname, S_IRWXU | S_IRWXG)) {
+ ThrowErrno(std::string(pathname) + ": Can't create directory");
+ }
+ return true;
+}
+
+bool
Path::create_file() {
- char pathname[MAXPATHLEN];
- this->fill(pathname,MAXPATHLEN);
- int lastchar = this->length() - 1 ;
- if (pathname[lastchar] == '/')
- pathname[lastchar] = 0;
- if (0 != creat(pathname, S_IRUSR | S_IWUSR))
- ThrowErrno(pathname);
+ // Make sure we're dealing with a file
+ if (!is_file()) return false;
+
+ // Create the file
+ if (0 != creat(path.c_str(), S_IRUSR | S_IWUSR))
+ ThrowErrno(std::string(path.c_str()) + ": Can't create file");
+
+ return true;
}
-void
-Path::remove_file() {
- char pathname[MAXPATHLEN];
- this->fill(pathname,MAXPATHLEN);
- int lastchar = this->length() - 1 ;
- if (pathname[lastchar] == '/')
- pathname[lastchar] = 0;
- if (0 != unlink(pathname))
- ThrowErrno(pathname);
+bool
+Path::destroy_directory(bool remove_contents) {
+ // Make sure we're dealing with a directory
+ if (!is_directory()) return false;
+
+ // If it doesn't exist, we're done.
+ if (!exists()) return true;
+
+ if (remove_contents) {
+ // Recursively descend the directory to remove its content
+ std::string cmd("/bin/rm -rf ");
+ cmd += 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;
+ if ( 0 != rmdir(pathname))
+ ThrowErrno(std::string(pathname) + ": Can't destroy directory");
+ }
+ return true;
+}
+
+bool
+Path::destroy_file() {
+ if (!is_file()) return false;
+ if (0 != unlink(path.c_str()))
+ ThrowErrno(std::string(path.c_str()) + ": Can't destroy file");
+ return true;
+}
+
}
// vim: sw=2