Ticket #4939: 4939.patch

_source/includes/io.js

@@ -402 +402 @@
 
                 isChildPath : function( childPath, parentPath )
                 {
-                        if ( childPath.length > parentPath.length )
+                        if ( childPath.length() < parentPath.length() )
                                 return false;
 
                         var i = 0, max = Math.min( childPath.length(), parentPath.length() );
@@ -410 +410 @@
                         while ( i < max && childPath.charAt( i ) == parentPath.charAt( i ) )
                                 i++;
 
-                        return i != max;
+                        return ( i == max );
                 }
         };
 } )();

_source/includes/releaser.js

@@ -466 +466 @@
                                 throw "Source and target directory cannot be identical";
 
                         if ( CKRELEASER.io.isChildPath( targetDir.getCanonicalPath(), sourceDir.getCanonicalPath() ) )
-                                throw "Target directory must be located outside source directory";
+                        {
+                                var _dir, targetDirIsIgnored = false;
+                                for ( var i = 0 ; i < CKRELEASER.release.ignore.length ; i++ )
+                                {
+                                        _dir = new File( sourceDir, CKRELEASER.release.ignore[i] );
+                                        if ( CKRELEASER.io.isChildPath( targetDir.getCanonicalPath(), _dir.getCanonicalPath() ) )
+                                                targetDirIsIgnored = true;
+                                }
+                                if ( !targetDirIsIgnored )
+                                        throw "Target directory must be located outside the source directory";
+                        }
 
                         if ( !releaseDir.mkdirs() )
                                 throw "Cannot create release directory (" + releaseDir + ")";

test/test.js

@@ -303 +303 @@
                 var areEqual = files.toString().replace(/\\/g, "/") == validResult.toString();
                 assertEquals( true, areEqual, "Comparing plugins directories (are equal?)" );
         }
+
+        function testIO() {
+                var releaser = new CKRELEASER.releaser();
+                // isChildPath(child, parent)
+                var result = [
+                        CKRELEASER.io.isChildPath( new java.lang.String("C:/path/to/directory"), new java.lang.String("C:/path") ),
+                        CKRELEASER.io.isChildPath( new java.lang.String("C:/path"), new java.lang.String("C:/path/to/directory") ),
+                        CKRELEASER.io.isChildPath( new java.lang.String("C:/foo"), new java.lang.String("C:/bar") ),
+                        CKRELEASER.io.isChildPath( new java.lang.String("C:/foo/bar"), new java.lang.String("C:/baz") ),
+                        CKRELEASER.io.isChildPath( new java.lang.String("D:\\htdocs\\ckeditor_trunk\\_dev\\releaser\\release"), new java.lang.String("D:\\htdocs\\ckeditor_trunk") ),
+                        CKRELEASER.io.isChildPath( new java.lang.String("C:/foo"), new java.lang.String("C:/bar/baz") )
+                ];
+                assertEquals( [true, false, false, false, true, false].toString(), result.toString(), "Checking isChildPath()" );
+        }
+
         prepareTempDirs();
         testDirectives();
         testSkins();
@@ -310 +325 @@
         testBom();
         testLineEndings();
         testCopyFiles();
+        testIO();
 
         print( '' );
         print( 'Finished: ' + passCount + ' passed / ' + failCount + ' failed' );