Changeset 258

Timestamp:

10/21/07 00:46:45 (9 months ago)

Author:

hans

Message:

#155 - Applying (slightly modified) patch submitted by Bruce Weirdan. Adding correct filesystem permission checking for deleting files. (May not be correct for NTFS, though...)

Files:

• branches/2.3/classes/phing/system/io/FileSystem.php (modified) (2 diffs)
• branches/2.3/classes/phing/system/io/PhingFile.php (modified) (1 diff)
• branches/2.3/classes/phing/system/io/UnixFileSystem.php (modified) (1 diff)
• branches/2.3/classes/phing/system/io/Win32FileSystem.php (modified) (1 diff)

branches/2.3/classes/phing/system/io/FileSystem.php

@@ -128 +128 @@
-     */
-    abstract function fromURIPath($path);
-
+
-    /* -- Path operations -- */
-
@@ -191 +191 @@
-        }
-    }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-    /**
-     * Return the time at which the file or directory denoted by the given

branches/2.3/classes/phing/system/io/PhingFile.php

@@ -531 +531 @@
-    function delete() {
-        $fs = FileSystem::getFileSystem();
-heckAccess($this, true
-No read access to " . $this->path."\n");
+anDelete($this
+Cannot delete " . $this->path . "\n"); 
-        }
-        return $fs->delete($this);

branches/2.3/classes/phing/system/io/UnixFileSystem.php

@@ -264 +264 @@
-    }
-    
+    /**
+     * Whether file can be deleted.
+     * @param PhingFile $f
+     * @return boolean
+     */
+    function canDelete(PhingFile $f) 
+        { 
+                @clearstatcache(); 
+                $dir = dirname($f->getAbsolutePath()); 
+                return (bool) @is_writable($dir); 
+        }
+    
-}

branches/2.3/classes/phing/system/io/Win32FileSystem.php

@@ -473 +473 @@
-    }
-
+        /**
+     * Whether file can be deleted.
+     * 
+     * This is currently returning whether the specified file is
+     * writable.  This is likely wrong for NTFS file systems, but
+     * I'm not sure whether PHP can see the NTFS delete perm ...
+     * 
+     * @param PhingFile $f
+     * @return boolean
+     */
+    abstract function canDelete(PhingFile $f);
+    
-}
-