Changeset 681

Timestamp:

Aug 2, 2008, 10:13:25 PM (15 years ago)

Author:

Peter Johansson

Message:

reverting r680

File:

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

trunk/lib/rmdirhier.cc

@@ -64 +64 @@
   void rmdirhier__(const std::string& dir)
   {
-    struct stat buf;
-    // using lstat because links should not be treated as dirs
-    lstat(dir.c_str(),&buf);
-    // check if dir - if not delete the node
-    if (!(buf.st_mode & S_IFDIR)) {
-      // Make sure file is removable before removing it
-      chmod(dir.c_str(),S_IWRITE);
-      if (unlink(dir.c_str()))
-        throw FileDeleteError(dir);
-      return;
-    }
     if (chdir(dir.c_str()))
       throw BadDirectory(dir);
@@ -84 +73 @@
       throw DirectoryOpenError(dir);
     while ((entry=readdir(dp)) != NULL) {
+      struct stat buf;
       if ((std::string(entry->d_name) == ".") ||
           (std::string(entry->d_name) == ".."))
         continue;
-      rmdirhier__(entry->d_name);
+      stat(entry->d_name,&buf);
+      if (buf.st_mode & S_IFDIR)
+        rmdirhier__(entry->d_name);      // sub-directory
+      else {
+        // Make sure file is removable before removing it
+        chmod(entry->d_name,S_IWRITE);
+        if (unlink(entry->d_name))
+          throw FileDeleteError(entry->d_name);
+      }
     }
     closedir(dp);