23 files changed, 15 insertions, 3227 deletions
diff --git a/lib/System/DynamicLibrary.cpp b/lib/System/DynamicLibrary.cpp
index e458d84927..231cdac19c 100644
--- a/lib/System/DynamicLibrary.cpp
+++ b/lib/System/DynamicLibrary.cpp
@@ -22,7 +22,7 @@
 
 #ifdef LLVM_ON_WIN32
 
-#include "Win32/DynamicLibrary.cpp"
+#include "Win32/DynamicLibrary.inc"
 
 #else
 
diff --git a/lib/System/MappedFile.cpp b/lib/System/MappedFile.cpp
index 6c47fbdb83..b8caa95cdb 100644
--- a/lib/System/MappedFile.cpp
+++ b/lib/System/MappedFile.cpp
@@ -26,10 +26,10 @@ using namespace sys;
 
 // Include the platform-specific parts of this class.
 #ifdef LLVM_ON_UNIX
-#include "Unix/MappedFile.cpp"
+#include "Unix/MappedFile.inc"
 #endif
 #ifdef LLVM_ON_WIN32
-#include "Win32/MappedFile.cpp"
+#include "Win32/MappedFile.inc"
 #endif
 
 // vim: sw=2 smartindent smarttab tw=80 autoindent expandtab
diff --git a/lib/System/Memory.cpp b/lib/System/Memory.cpp
index 1ced1e6f0f..71f1948de6 100644
--- a/lib/System/Memory.cpp
+++ b/lib/System/Memory.cpp
@@ -27,10 +27,10 @@ using namespace sys;
 
 // Include the platform-specific parts of this class.
 #ifdef LLVM_ON_UNIX
-#include "Unix/Memory.cpp"
+#include "Unix/Memory.inc"
 #endif
 #ifdef LLVM_ON_WIN32
-#include "Win32/Memory.cpp"
+#include "Win32/Memory.inc"
 #endif
 
 // vim: sw=2 smartindent smarttab tw=80 autoindent expandtab
diff --git a/lib/System/Path.cpp b/lib/System/Path.cpp
index 3187bfee59..d61a015f68 100644
--- a/lib/System/Path.cpp
+++ b/lib/System/Path.cpp
@@ -101,10 +101,10 @@ Path::GetDLLSuffix() {
 // Include the truly platform-specific parts of this class.
 
 #if defined(LLVM_ON_UNIX)
-#include "Unix/Path.cpp"
+#include "Unix/Path.inc"
 #endif
 #if defined(LLVM_ON_WIN32)
-#include "Win32/Path.cpp"
+#include "Win32/Path.inc"
 #endif
 
 // vim: sw=2 smartindent smarttab tw=80 autoindent expandtab
diff --git a/lib/System/Process.cpp b/lib/System/Process.cpp
index 5aefb6a336..ccd30b5c69 100644
--- a/lib/System/Process.cpp
+++ b/lib/System/Process.cpp
@@ -26,10 +26,10 @@ using namespace sys;
 
 // Include the platform-specific parts of this class.
 #ifdef LLVM_ON_UNIX
-#include "Unix/Process.cpp"
+#include "Unix/Process.inc"
 #endif
 #ifdef LLVM_ON_WIN32
-#include "Win32/Process.cpp"
+#include "Win32/Process.inc"
 #endif
 
 // vim: sw=2 smartindent smarttab tw=80 autoindent expandtab
diff --git a/lib/System/Program.cpp b/lib/System/Program.cpp
index 88a0084835..e9661dab36 100644
--- a/lib/System/Program.cpp
+++ b/lib/System/Program.cpp
@@ -26,10 +26,10 @@ using namespace sys;
 
 // Include the platform-specific parts of this class.
 #ifdef LLVM_ON_UNIX
-#include "Unix/Program.cpp"
+#include "Unix/Program.inc"
 #endif
 #ifdef LLVM_ON_WIN32
-#include "Win32/Program.cpp"
+#include "Win32/Program.inc"
 #endif
 
 // vim: sw=2 smartindent smarttab tw=80 autoindent expandtab
diff --git a/lib/System/Signals.cpp b/lib/System/Signals.cpp
index 4d88e642e3..cdd730619b 100644
--- a/lib/System/Signals.cpp
+++ b/lib/System/Signals.cpp
@@ -27,10 +27,10 @@ using namespace sys;
 
 // Include the platform-specific parts of this class.
 #ifdef LLVM_ON_UNIX
-#include "Unix/Signals.cpp"
+#include "Unix/Signals.inc"
 #endif
 #ifdef LLVM_ON_WIN32
-#include "Win32/Signals.cpp"
+#include "Win32/Signals.inc"
 #endif
 
 // vim: sw=2 smartindent smarttab tw=80 autoindent expandtab
diff --git a/lib/System/TimeValue.cpp b/lib/System/TimeValue.cpp
index 64078f6f42..ccf15a2b3e 100644
--- a/lib/System/TimeValue.cpp
+++ b/lib/System/TimeValue.cpp
@@ -50,10 +50,10 @@ TimeValue::normalize( void ) {
 
 /// Include the platform specific portion of TimeValue class
 #ifdef LLVM_ON_UNIX
-#include "Unix/TimeValue.cpp"
+#include "Unix/TimeValue.inc"
 #endif
 #ifdef LLVM_ON_WIN32
-#include "Win32/TimeValue.cpp"
+#include "Win32/TimeValue.inc"
 #endif
 
 // vim: sw=2 smartindent smarttab tw=80 autoindent expandtab
diff --git a/lib/System/Unix/MappedFile.cpp b/lib/System/Unix/MappedFile.cpp
deleted file mode 100644
index 07683c1439..0000000000
--- a/lib/System/Unix/MappedFile.cpp
+++ /dev/null
@@ -1,154 +0,0 @@
-//===- Unix/MappedFile.cpp - Unix MappedFile 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 generic Unix implementation of the MappedFile concept.
-//
-//===----------------------------------------------------------------------===//
-
-//===----------------------------------------------------------------------===//
-//=== WARNING: Implementation here must contain only generic UNIX code that
-//===          is guaranteed to work on *all* UNIX variants.
-//===----------------------------------------------------------------------===//
-
-#include "Unix.h"
-#include "llvm/System/Process.h"
-
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-
-#ifdef HAVE_SYS_MMAN_H
-#include <sys/mman.h>
-#endif
-
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
-
-namespace llvm {
-using namespace sys;
-
-struct sys::MappedFileInfo {
-  int fd_;
-  struct stat sbuf_;
-};
-
-void MappedFile::initialize() {
-  if (path_.exists()) {
-    info_ = new MappedFileInfo;
-    int mode = 0;
-    if (options_&READ_ACCESS) 
-      if (options_&WRITE_ACCESS)
-        mode = O_RDWR;
-      else
-        mode = O_RDONLY;
-    else if (options_&WRITE_ACCESS)
-      mode = O_WRONLY;
-    info_->fd_ = ::open(path_.c_str(),mode);
-    if (info_->fd_ < 0) {
-      delete info_;
-      info_ = 0;
-      ThrowErrno(std::string("Can't open file: ") + path_.toString());
-    }
-    struct stat sbuf;
-    if(::fstat(info_->fd_, &info_->sbuf_) < 0) {
-      ::close(info_->fd_);
-      delete info_;
-      info_ = 0;
-      ThrowErrno(std::string("Can't stat file: ") + path_.toString());
-    }
-  } else {
-    throw std::string("Can't open file: ") + path_.toString();
-  }
-}
-
-void MappedFile::terminate() {
-  assert(info_ && "MappedFile not initialized");
-  if (info_->fd_ >= 0)
-    ::close(info_->fd_);
-  delete info_;
-  info_ = 0;
-}
-
-void MappedFile::unmap() {
-  assert(info_ && "MappedFile not initialized");
-  if (isMapped()) {
-    if (options_ & WRITE_ACCESS)
-      ::msync(base_, info_->sbuf_.st_size, MS_SYNC);
-    ::munmap(base_, info_->sbuf_.st_size);
-  }
-}
-
-void* MappedFile::map() {
-  assert(info_ && "MappedFile not initialized");
-  if (!isMapped()) {
-    int prot = PROT_NONE;
-    int flags = 0;
-#ifdef MAP_FILE
-    flags |= MAP_FILE;
-#endif
-    if (options_ == 0) {
-      prot = PROT_READ;
-      flags = MAP_PRIVATE;
-    } else {
-      if (options_ & READ_ACCESS)
-        prot |= PROT_READ;
-      if (options_ & WRITE_ACCESS)
-        prot |= PROT_WRITE;
-      if (options_ & EXEC_ACCESS)
-        prot |= PROT_EXEC;
-      if (options_ & SHARED_MAPPING)
-        flags |= MAP_SHARED;
-      else
-        flags |= MAP_PRIVATE;
-    }
-    size_t map_size = ((info_->sbuf_.st_size / Process::GetPageSize())+1) *
-      Process::GetPageSize();
-
-    base_ = ::mmap(0, map_size, prot, flags, info_->fd_, 0);
-    if (base_ == MAP_FAILED)
-      ThrowErrno(std::string("Can't map file:") + path_.toString());
-  }
-  return base_;
-}
-
-size_t MappedFile::size() const {
-  assert(info_ && "MappedFile not initialized");
-  return info_->sbuf_.st_size;
-}
-
-void MappedFile::size(size_t new_size) {
-  assert(info_ && "MappedFile not initialized");
-
-  // Take the mapping out of memory
-  this->unmap();
-
-  // Adjust the current size to a page boundary
-  size_t cur_size = ((info_->sbuf_.st_size / Process::GetPageSize())+1) *
-    Process::GetPageSize();
-
-  // Adjust the new_size to a page boundary
-  new_size = ((new_size / Process::GetPageSize())+1) *
-    Process::GetPageSize();
-
-  // If the file needs to be extended
-  if (new_size > cur_size) {
-    // Ensure we can allocate at least the idodes necessary to handle the
-    // file size requested. 
-    ::lseek(info_->fd_, new_size, SEEK_SET);
-    ::write(info_->fd_, "\0", 1);
-  }
-
-  // Seek to current end of file. 
-  this->map();
-}
-
-}
-
-// vim: sw=2 smartindent smarttab tw=80 autoindent expandtab
diff --git a/lib/System/Unix/Memory.cpp b/lib/System/Unix/Memory.cpp
deleted file mode 100644
index 370b318955..0000000000
--- a/lib/System/Unix/Memory.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-//===- Unix/Memory.cpp - Generic UNIX System Configuration ------*- 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 defines some functions for various memory management utilities.
-//
-//===----------------------------------------------------------------------===//
-
-#include "Unix.h"
-#include "llvm/System/Process.h"
-
-#ifdef HAVE_SYS_MMAN_H
-#include <sys/mman.h>
-#endif
-
-namespace llvm {
-
-/// AllocateRWXMemory - Allocate a slab of memory with read/write/execute
-/// permissions.  This is typically used for JIT applications where we want
-/// to emit code to the memory then jump to it.  Getting this type of memory
-/// is very OS specific.
-///
-MemoryBlock Memory::AllocateRWX(unsigned NumBytes) {
-  if (NumBytes == 0) return MemoryBlock();
-
-  long pageSize = Process::GetPageSize();
-  unsigned NumPages = (NumBytes+pageSize-1)/pageSize;
-
-  int fd = -1;
-#ifdef NEED_DEV_ZERO_FOR_MMAP
-  static int zero_fd = open("/dev/zero", O_RDWR);
-  if (zero_fd == -1) {
-    ThrowErrno("Can't open /dev/zero device");
-  }
-  fd = zero_fd;
-#endif
-
-  int flags = MAP_PRIVATE |
-#ifdef HAVE_MMAP_ANONYMOUS
-  MAP_ANONYMOUS
-#else
-  MAP_ANON
-#endif
-  ;
-  void *pa = ::mmap(0, pageSize*NumPages, PROT_READ|PROT_WRITE|PROT_EXEC,
-                    flags, fd, 0);
-  if (pa == MAP_FAILED) {
-    ThrowErrno("Can't allocate RWX Memory");
-  }
-  MemoryBlock result;
-  result.Address = pa;
-  result.Size = NumPages*pageSize;
-  return result;
-}
-
-void Memory::ReleaseRWX(MemoryBlock& M) {
-  if (M.Address == 0 || M.Size == 0) return;
-  if (0 != ::munmap(M.Address, M.Size)) {
-    ThrowErrno("Can't release RWX Memory");
-  }
-}
-
-}
-
-// vim: sw=2 smartindent smarttab tw=80 autoindent expandtab
diff --git a/lib/System/Unix/Path.cpp b/lib/System/Unix/Path.cpp
deleted file mode 100644
index 99923335c5..0000000000
--- a/lib/System/Unix/Path.cpp
+++ /dev/null
@@ -1,752 +0,0 @@
-//===- llvm/System/Unix/Path.cpp - Unix 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 implements the Unix specific portion of the Path class.
-//
-//===----------------------------------------------------------------------===//
-
-//===----------------------------------------------------------------------===//
-//=== WARNING: Implementation here must contain only generic UNIX code that
-//===          is guaranteed to work on *all* UNIX variants.
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Config/alloca.h"
-#include "Unix.h"
-#if HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
-#if HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-#if HAVE_UTIME_H
-#include <utime.h>
-#endif
-#if HAVE_TIME_H
-#include <time.h>
-#endif
-#if HAVE_DIRENT_H
-# include <dirent.h>
-# define NAMLEN(dirent) strlen((dirent)->d_name)
-#else
-# define dirent direct
-# define NAMLEN(dirent) (dirent)->d_namlen
-# if HAVE_SYS_NDIR_H
-#  include <sys/ndir.h>
-# endif
-# if HAVE_SYS_DIR_H
-#  include <sys/dir.h>
-# endif
-# if HAVE_NDIR_H
-#  include <ndir.h>
-# endif
-#endif
-
-
-namespace llvm {
-using namespace sys;
-
-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");
-}
-
-bool 
-Path::isValid() const {
-  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;
-}
-
-Path
-Path::GetRootDirectory() {
-  Path result;
-  result.setDirectory("/");
-  return result;
-}
-
-Path
-Path::GetTemporaryDirectory() {
-#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");
-  Path result;
-  result.setDirectory(pathname);
-  assert(result.isValid() && "mkdtemp didn't create a valid pathname!");
-  return result;
-#elif defined(HAVE_MKSTEMP)
-  // If no mkdtemp is available, mkstemp can be used to create a temporary file
-  // which is then removed and created as a directory. We prefer this over
-  // mktemp because of mktemp's inherent security and threading risks. We still
-  // have a slight race condition from the time the temporary file is created to
-  // the time it is re-created as a directoy. 
-  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");
-  ::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");
-  Path result;
-  result.setDirectory(pathname);
-  assert(result.isValid() && "mkstemp didn't create a valid pathname!");
-  return result;
-#elif defined(HAVE_MKTEMP)
-  // If a system doesn't have mkdtemp(3) or mkstemp(3) but it does have
-  // mktemp(3) then we'll assume that system (e.g. AIX) has a reasonable
-  // implementation of mktemp(3) and doesn't follow BSD 4.3's lead of replacing
-  // the XXXXXX with the pid of the process and a letter. That leads to only
-  // twenty six temporary files that can be generated.
-  char pathname[MAXPATHLEN];
-  strcpy(pathname, "/tmp/llvm_XXXXXX");
-  char *TmpName = ::mktemp(pathname);
-  if (TmpName == 0)
-    throw std::string(TmpName) + ": Can't create unique directory name";
-  if (-1 == ::mkdir(TmpName, S_IRWXU))
-    ThrowErrno(std::string(TmpName) + ": Can't create temporary directory");
-  Path result;
-  result.setDirectory(TmpName);
-  assert(result.isValid() && "mktemp didn't create a valid pathname!");
-  return result;
-#else
-  // This is the worst case implementation. tempnam(3) leaks memory unless its
-  // on an SVID2 (or later) system. On BSD 4.3 it leaks. tmpnam(3) has thread
-  // issues. The mktemp(3) function doesn't have enough variability in the
-  // temporary name generated. So, we provide our own implementation that 
-  // increments an integer from a random number seeded by the current time. This
-  // should be sufficiently unique that we don't have many collisions between
-  // processes. Generally LLVM processes don't run very long and don't use very
-  // many temporary files so this shouldn't be a big issue for LLVM.
-  static time_t num = ::time(0);
-  char pathname[MAXPATHLEN];
-  do {
-    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");
-  Path result;
-  result.setDirectory(pathname);
-  assert(result.isValid() && "mkstemp didn't create a valid pathname!");
-  return result;
-#endif
-}
-
-static void getPathList(const char*path, std::vector<sys::Path>& Paths) {
-  const char* at = path;
-  const char* delim = strchr(at, ':');
-  Path tmpPath;
-  while( delim != 0 ) {
-    std::string tmp(at, size_t(delim-at));
-    if (tmpPath.setDirectory(tmp))
-      if (tmpPath.readable())
-        Paths.push_back(tmpPath);
-    at = delim + 1;
-    delim = strchr(at, ':');
-  }
-  if (*at != 0)
-    if (tmpPath.setDirectory(std::string(at)))
-      if (tmpPath.readable())
-        Paths.push_back(tmpPath);
-
-}
-
-void 
-Path::GetSystemLibraryPaths(std::vector<sys::Path>& Paths) {
-#ifdef LTDL_SHLIBPATH_VAR
-  char* env_var = getenv(LTDL_SHLIBPATH_VAR);
-  if (env_var != 0) {
-    getPathList(env_var,Paths);
-  }
-#endif
-  // FIXME: Should this look at LD_LIBRARY_PATH too?
-  Paths.push_back(sys::Path("/usr/local/lib/"));
-  Paths.push_back(sys::Path("/usr/X11R6/lib/"));
-  Paths.push_back(sys::Path("/usr/lib/"));
-  Paths.push_back(sys::Path("/lib/"));
-}
-
-void
-Path::GetBytecodeLibraryPaths(std::vector<sys::Path>& Paths) {
-  char * env_var = getenv("LLVM_LIB_SEARCH_PATH");
-  if (env_var != 0) {
-    getPathList(env_var,Paths);
-  }
-#ifdef LLVM_LIBDIR
-  {
-    Path tmpPath;
-    if (tmpPath.setDirectory(LLVM_LIBDIR))
-      if (tmpPath.readable())
-        Paths.push_back(tmpPath);
-  }
-#endif
-  GetSystemLibraryPaths(Paths);
-}
-
-Path 
-Path::GetLLVMDefaultConfigDir() {
-  return Path("/etc/llvm/");
-}
-
-Path
-Path::GetUserHomeDirectory() {
-  const char* home = getenv("HOME");
-  if (home) {
-    Path result;
-    if (result.setDirectory(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 {
-  // Find the last slash
-  size_t slash = path.rfind('/');
-  if (slash == std::string::npos)
-    slash = 0;
-  else
-    slash++;
-
-  return path.substr(slash, path.rfind('.'));
-}
-
-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);
-  if (fd < 0)
-    return false;
-  size_t read_len = ::read(fd, buf, len);
-  close(fd);
-  if (len != read_len)
-    return false;
-  buf[len] = '\0';
-  return Magic == buf;
-}
-
-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);
-  if (fd < 0)
-    return false;
-  ssize_t bytes_read = ::read(fd, buf, len);
-  ::close(fd);
-  if (ssize_t(len) != bytes_read) {
-    Magic.clear();
-    return false;
-  }
-  Magic.assign(buf,len);
-  return true;
-}
-
-bool 
-Path::isBytecodeFile() const {
-  char buffer[ 4];
-  buffer[0] = 0;
-  int fd = ::open(path.c_str(),O_RDONLY);
-  if (fd < 0)
-    return false;
-  ssize_t bytes_read = ::read(fd, buffer, 4);
-  ::close(fd);
-  if (4 != bytes_read) 
-    return false;
-
-  return (buffer[0] == 'l' && buffer[1] == 'l' && buffer[2] == 'v' &&
-      (buffer[3] == 'c' || buffer[3] == 'm'));
-}
-
-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);
-}
-
-void
-Path::getStatusInfo(StatusInfo& info) const {
-  struct stat buf;
-  if (0 != stat(path.c_str(), &buf)) {
-    ThrowErrno(std::string("Can't get status: ")+path);
-  }
-  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 += '/';
-}
-
-static bool AddPermissionBits(const std::string& Filename, 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
-  // time to reset it to the user's preference.
-  int mask = umask(0777); // The arg. to umask is arbitrary.
-  umask(mask);            // Restore the umask.
-
-  // Get the file's current mode.
-  struct stat st;
-  if ((stat(Filename.c_str(), &st)) == -1)
-    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)
-    return false;
-
-  return true;
-}
-
-void Path::makeReadable() {
-  if (!AddPermissionBits(path,0444))
-    ThrowErrno(path + ": can't make file readable");
-}
-
-void Path::makeWriteable() {
-  if (!AddPermissionBits(path,0222))
-    ThrowErrno(path + ": can't make file writable");
-}
-
-void Path::makeExecutable() {
-  if (!AddPermissionBits(path,0111))
-    ThrowErrno(path + ": can't make file executable");
-}
-
-bool
-Path::getDirectoryContents(std::set<Path>& result) const {
-  if (!isDirectory())
-    return false;
-  DIR* direntries = ::opendir(path.c_str());
-  if (direntries == 0)
-    ThrowErrno(path + ": can't open directory");
-
-  result.clear();
-  struct dirent* de = ::readdir(direntries);
-  while (de != 0) {
-    if (de->d_name[0] != '.') {
-      Path aPath(path + (const char*)de->d_name);
-      struct stat buf;
-      if (0 != stat(aPath.path.c_str(), &buf))
-        ThrowErrno(aPath.path + ": can't get status");
-      if (S_ISDIR(buf.st_mode))
-        aPath.path += "/";
-      result.insert(aPath);
-    }
-    de = ::readdir(direntries);
-  }
-  
-  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;
-}
-
-bool
-Path::setFile(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 (!isValid()) {
-    path = save.path;
-    return false;
-  }
-  return true;
-}
-
-bool
-Path::appendDirectory(const std::string& dir) {
-  if (isFile()) 
-    return false;
-  Path save(*this);
-  path += dir;
-  path += "/";
-  if (!isValid()) {
-    path = save.path;
-    return false;
-  }
-  return true;
-}
-
-bool
-Path::elideDirectory() {
-  if (isFile()) 
-    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::appendFile(const std::string& file) {
-  if (!isDirectory()) 
-    return false;
-  Path save(*this);
-  path += file;
-  if (!isValid()) {
-    path = save.path;
-    return false;
-  }
-  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);
-  return true;
-}
-
-bool
-Path::appendSuffix(const std::string& suffix) {
-  if (isDirectory()) 
-    return false;
-  Path save(*this);
-  path.append(".");
-  path.append(suffix);
-  if (!isValid()) {
-    path = save.path;
-    return false;
-  }
-  return true;
-}
-
-bool 
-Path::elideSuffix() {
-  if (isDirectory()) 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::createDirectory( bool create_parents) {
-  // Make sure we're dealing with a directory
-  if (!isDirectory()) 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;
-  else 
-    pathname[lastchar+1] = 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(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;
-}
-
-bool
-Path::createFile() {
-  // Make sure we're dealing with a file
-  if (!isFile()) return false; 
-
-  // Create the file
-  int fd = ::creat(path.c_str(), S_IRUSR | S_IWUSR);
-  if (fd < 0)
-    ThrowErrno(path + ": Can't create file");
-  ::close(fd);
-
-  return true;
-}
-
-bool
-Path::createTemporaryFile(bool reuse_current) {
-  // Make sure we're dealing with a file
-  if (!isFile()) 
-    return false;
-
-  // 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);
-    return true;
-  }
-  return false;
-}
-
-bool
-Path::destroyDirectory(bool remove_contents) const