Ticket #221: phing.symlinks[1].patch

classes/phing/system/io/File.php

@@ -405 +405 @@
-        return @is_file($this->path);
-    }
-
+        public function isLink() {
+                clearstatcache();
+                $fs = FileSystem::getFileSystem();
+                if ($fs->checkAccess($this) !== true) {
+                        throw new IOException("No read access to " . $this->path);
+                }
+                return @is_link($this->path);
+        }
+
+        public function getLinkTarget() 
+        {
+                return @readlink($this->path);
+        }
+
-    /**
-     * Tests whether the path represented by this object is a hidden file.
-     *  
@@ -608 +622 @@
-     * @param File $destFile  The new abstract pathname for the named file
-     * @return true if and only if the renaming succeeded; false otherwise
-     */
-
+, $resolveSymlinks = true
-        $fs = FileSystem::getFileSystem();
-
-        if ($fs->checkAccess($this) !== true) {
@@ -618 +632 @@
-        if ($fs->checkAccess($destFile, true) !== true) {
-            throw new IOException("File::copyTo() No write access to ".$destFile->getPath());
-        }
-
+, $resolveSymlinks
-    }
-
-    /**

classes/phing/system/io/UnixFileSystem.php

@@ -271 +271 @@
-     * @param File $f
-     * @return boolean
-     */
-    
+       
-        { 
-                @clearstatcache(); 
-                $dir = dirname($f->getAbsolutePath()); 
-                return (bool) @is_writable($dir); 
-        }
+
+
+        /**
+         * Copy a file. 
+         *
+         * This method overrides generic copy method to add support for copying 
+         * symlinks as is (without resolving them to ordinary files).
+         * 
+         * @param File $src Source path and name file to copy
+         * @param File $dest Destination path and name of new file
+         * @param bool $resolveSymlinks  whether to resolve symlink to their content
+         *
+         * @return void
+         * @throws Exception if file cannot be copied or symlink cannot be created
+         */
+        function copy(File $src, File $dest, $resolveSymlinks = true) {
+                if ($resolveSymlinks || !$src->isLink()) { // copy as usual (content)
+                        return parent::copy($src, $dest);
+                } else { // do not resolve symlinks, copy as is
+                        $destPath = $dest->getAbsolutePath();
+                        $linkTarget = $src->getLinkTarget();
+                        if (false === @symlink($linkTarget, $destPath)) {
+                                $msg = "FileSystem::copy() FAILED. Cannot create symlink from $destPath to $linkTarget.";
+                                throw new Exception($msg);
+                        }
+
+                        // chmod has no effects on symlinks, so we do not have to chmod created symlink
+                }
+        }
-    
-}

classes/phing/tasks/system/CopyTask.php

@@ -49 +49 @@
-    protected $preserveLMT   = true;   // sync timestamps (from xml attribute)
-    protected $includeEmpty  = true;   // include empty dirs? (from XML)
-    protected $flatten       = false;  // apply the FlattenMapper right way (from XML)
+        protected $resolveSymlinks = true; // resolve symlinks (copy them as their content) ?
-    protected $mapperElement = null;
-
-    protected $fileCopyMap   = array(); // asoc array containing mapped file names
@@ -118 +119 @@
-        $this->includeEmpty = (boolean) $bool;
-    }
-
+        /**
+         * Set the resolve symlinks flag. Obviously meaningless on filesystems
+         * without symlink support.
+         * 
+         * @param boolean  Flag if symlinks should be copied as their content
+         * @return void
+         * @access public
+         */
+        function setResolveSymlinks($bool) {
+                $this->resolveSymlinks = (boolean) $bool;
+        }
-
+
-    /**
-     * Set the file. We have to manually take care of the
-     * type that is coming due to limited type support in php
@@ -160 +173 @@
-        $this->destDir = $dir;
-    }
-
+
-    /**
-     * Nested creator, creates a FileSet for this task
-     *
@@ -230 +244 @@
-        foreach($this->filesets as $fs) {
-            $ds = $fs->getDirectoryScanner($project);
-            $fromDir  = $fs->getDir($project);
+
+                        if (!$this->resolveSymlinks) {
+                                $ds->setTreatDirSymlinksAsFiles(true);
+                        }
+
-            $srcFiles = $ds->getIncludedFiles();
-            $srcDirs  = $ds->getIncludedDirectories();
-
+
-            if (!$this->flatten && $this->mapperElement === null)
-            {
-                                $this->completeDirMap[$fromDir->getAbsolutePath()] = $this->destDir->getAbsolutePath();
@@ -376 +395 @@
-                                        $toSlot->setValue($toFile->getPath());
-                                        $toBasenameSlot->setValue($toFile->getName());
-                                        
-
+, $this->resolveSymlinks
-                        
-                    $count++;
-                } catch (IOException $ioe) {

classes/phing/util/DirectoryScanner.php

@@ -188 +188 @@
-    /** if there are no deselected files */
-    protected $everythingIncluded = true;        
-
+        protected $treatDirSymlinksAsFiles = false;
+
-    /**
-     * Does the path match the start of this pattern up to the first "**".
-     * This is a static mehtod and should always be called static
@@ -419 +421 @@
-        return $list;
-    }
-
+        public function setTreatDirSymlinksAsFiles($bool = true) 
+        {
+                $this->treatDirSymlinksAsFiles = (bool) $bool;
+        }
+
-    /**
-     * Scans the passed dir for files and directories. Found files and
-     * directories are placed in their respective collections, based on the
@@ -450 +457 @@
-            $file = $_rootdir . DIRECTORY_SEPARATOR . $newfiles[$i];
-            $name = $_vpath . $newfiles[$i];
-
-
+ && !(@is_link($file) && $this->treatDirSymlinksAsFiles)
-                if ($this->isIncluded($name)) {
-                    if (!$this->isExcluded($name)) {
-                        if ($this->isSelected($name, $file)) {

classes/phing/util/FileUtils.php

@@ -70 +70 @@
-     * @param boolean $preserveLastModified
-     * @param array $filterChains 
-     * @param Project $project
+         * @param boolean $resolveSymlinks
-     * @return void
-     */
-
+, $resolveSymlinks = true
-       
-        if ($overwrite || !$destFile->exists() || $destFile->lastModified() < $sourceFile->lastModified()) {
-            if ($destFile->exists() && $destFile->isFile()) {
@@ -101 +102 @@
-                    $out->close();
-            } else {
-                // simple copy (no filtering)
-
+, $resolveSymlinks
-            }
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-        }
-    }