Changeset 4531

Timestamp:

01/29/12 13:39:51 (4 months ago)

Author:

tboutell

Message:

Nonrecursive implementation of aFiles::rmRf can cope with seriously deep directory structures resulting from various fascinating former bugs

Files:

• plugins/apostrophePlugin/branches/1.5/lib/toolkit/BaseaFiles.class.php (modified) (2 diffs)

plugins/apostrophePlugin/branches/1.5/lib/toolkit/BaseaFiles.class.php

@@ -350 +350 @@
   
   /**
-   * Be careful with this, it follows symlinks if any. Mainly for stream wrappers
+   * Be careful with this, it follows symlinks if any. Mainly for stream wrappers.
+   * Recursion has been removed in favor of building up and emptying out a paths array
+   * in multiple passes so that we don't hit the "100 levels of recursion, bailing out" problem 
+   * when removing a big, deeply screwed up directory structure (:
    */
   static public function rmRf($path)
   {
-    $stat = @stat($path);
-    if (!$stat)
-    {
-      return;
-    }
-    if (aFiles::statIsDir($stat))
-    {
-      $list = aFiles::ls($path);
-      foreach ($list as $file)
-      {
-        $filePath = "$path/$file";
-        if (strlen($filePath) < strlen($path))
-        {
-          throw new sfException("I almost tried to delete something higher up the original, I don't like this, bailing out");
-        }
-        aFiles::rmRf($filePath);
-      }
-      if (!aFiles::rmdir($path))
+    $originalPath = $path;
+    $paths = array();
+    error_log("Removing $path");
+    $paths[] = $path;
+    while (count($paths))
+    {
+      $path = array_shift($paths);
+      $stat = @stat($path);
+      if (!$stat)
       {
         return false;
       }
-    }
-    else
-    {
-      if (!aFiles::unlink($path))
-      {
-        return false;
+      if (aFiles::statIsDir($stat))
+      {
+        $list = aFiles::ls($path);
+        foreach ($list as $file)
+        {
+          $filePath = "$path/$file";
+          if (strlen($filePath) < strlen($originalPath))
+          {
+            throw new sfException("I almost tried to delete something higher up than the original, I don't like this, bailing out");
+          }
+          $paths[] = $filePath;
+        }
+        if (!aFiles::rmdir($path))
+        {
+          return false;
+        }
+      }
+      else
+      {
+        if (!aFiles::unlink($path))
+        {
+          return false;
+        }
       }
     }
@@ -427 +438 @@
   static public function sync($from, $to, $options = array())
   {
+    error_log("Syncing $from to $to");
     // Let's be verbose for this first big scary migration on staging
     $fromList = aFiles::ls($from);