Changeset 809 for trunk

Timestamp:

Aug 6, 2009, 3:24:17 AM (14 years ago)

Author:

Peter Johansson

Message:

fixes #391

File:

• trunk/lib/rmdirhier.cc (modified) (4 diffs)

trunk/lib/rmdirhier.cc

@@ -22 +22 @@
 
 #include "rmdirhier.h"
+#include "utility.h"
 
 #include <dirent.h>
@@ -71 +72 @@
       chmod(dir.c_str(),S_IWRITE);
       if (unlink(dir.c_str()))
-        throw FileDeleteError(dir);
+        throw FileDeleteError(concatenate_path(pwd(),dir));
       return;
     }
     if (chdir(dir.c_str()))
-      throw BadDirectory(dir);
+      throw BadDirectory(concatenate_path(pwd(),dir));
 
    // Delete any remaining directory entries
@@ -81 +82 @@
     struct dirent *entry;
     if (!(dp=opendir(".")))
-      throw DirectoryOpenError(dir);
+      throw DirectoryOpenError(concatenate_path(pwd(),dir));
     while ((entry=readdir(dp)) != NULL) {
       if ((std::string(entry->d_name) == ".") ||
@@ -93 +94 @@
     chdir("..");
     if (rmdir(dir.c_str()))
-      throw DirectoryDeleteError(dir);
+      throw DirectoryDeleteError(concatenate_path(pwd(),dir));
   }