Bug 960962 - OS.File normalization and concatenation issues on Windows. r=Yoric

toolkit/components/osfile/modules/ospath_win.jsm

@@ -142,7 +142,6 @@ let join = function(...path) {
   let absolute = false;
   for each(let subpath in path) {
     let drive = this.winGetDrive(subpath);
-    let abs   = this.winIsAbsolute(subpath);
     if (drive) {
       root = drive;
       let component = trimBackslashes(subpath.slice(drive.length));
@@ -151,8 +150,8 @@ let join = function(...path) {
       } else {
         paths = [];
       }
-      absolute = abs;
-    } else if (abs) {
+      absolute = true;
+    } else if (this.winIsAbsolute(subpath)) {
       paths = [trimBackslashes(subpath)];
       absolute = true;
     } else {
@@ -259,7 +258,7 @@ let normalize = function(path) {
 
   // Put everything back together
   let result = stack.join("\\");
-  if (absolute) {
+  if (absolute || root) {
     result = "\\" + result;
   }
   if (root) {

toolkit/components/osfile/tests/xpcshell/test_file_URL_conversion.js

@@ -89,8 +89,11 @@ function run_test() {
     let uri = Services.io.newFileURI(file).spec;
     do_check_eq(uri, OS.Path.toFileURI(path));
 
-    // keep the resulting URI to try the reverse
-    uris.push(uri)
+    // keep the resulting URI to try the reverse, except for "C:\" for which the
+    // behavior of nsIFileURL and OS.File is inconsistent
+    if (path != "C:\\") {
+      uris.push(uri);
+    }
   }
 
   for (let uri of uris) {

toolkit/components/osfile/tests/xpcshell/test_path.js

@@ -68,19 +68,23 @@ function run_test()
   do_check_eq(Win.dirname("c:a\\b\\", options), "a\\b");
   do_check_eq(Win.dirname("c:a\\\\\\\\b", options), "a");
   do_check_eq(Win.dirname("c:abc", options), ".");
+  do_check_eq(Win.join("c:", "abc"), "c:\\abc", "join c:,abc");
 
+  do_check_eq(Win.normalize("c:"), "c:\\");
+  do_check_eq(Win.normalize("c:\\"), "c:\\");
   do_check_eq(Win.normalize("c:\\a\\b\\c"), "c:\\a\\b\\c");
   do_check_eq(Win.normalize("c:\\a\\b\\\\\\\\c"), "c:\\a\\b\\c");
   do_check_eq(Win.normalize("c:\\\\\\\\a\\b\\c"), "c:\\a\\b\\c");
   do_check_eq(Win.normalize("c:\\a\\b\\c\\\\\\"), "c:\\a\\b\\c");
   do_check_eq(Win.normalize("c:\\a\\b\\c\\..\\..\\..\\d\\e\\f"), "c:\\d\\e\\f");
-  do_check_eq(Win.normalize("c:a\\b\\c\\..\\..\\..\\d\\e\\f"), "c:d\\e\\f");
+  do_check_eq(Win.normalize("c:a\\b\\c\\..\\..\\..\\d\\e\\f"), "c:\\d\\e\\f");
   do_check_fail(function() Win.normalize("c:\\a\\b\\c\\..\\..\\..\\..\\d\\e\\f"));
 
+  do_check_eq(Win.join("c:\\", "foo"), "c:\\foo", "join c:\,foo");
   do_check_eq(Win.join("c:\\tmp", "foo", "bar"), "c:\\tmp\\foo\\bar", "join c:\\tmp,foo,bar");
   do_check_eq(Win.join("c:\\tmp", "\\foo", "bar"), "c:\\foo\\bar", "join c:\\tmp,\\foo,bar");
   do_check_eq(Win.join("c:\\tmp", "c:\\foo", "bar"), "c:\\foo\\bar", "join c:\\tmp,c:\\foo,bar");
-  do_check_eq(Win.join("c:\\tmp", "c:foo", "bar"), "c:foo\\bar", "join c:\\tmp,c:foo,bar");
+  do_check_eq(Win.join("c:\\tmp", "c:foo", "bar"), "c:\\foo\\bar", "join c:\\tmp,c:foo,bar");
   do_check_eq(Win.winGetDrive("c:"), "c:");
   do_check_eq(Win.winGetDrive("c:\\"), "c:");
   do_check_eq(Win.winGetDrive("c:abc"), "c:");
@@ -96,12 +100,13 @@ function run_test()
   do_check_eq(Win.normalize("a/b/c/../../../d/e/f"), "d\\e\\f");
 
   do_print("Forwardslash-separated, with a drive");
+  do_check_eq(Win.normalize("c:/"), "c:\\");
   do_check_eq(Win.normalize("c:/a/b/c"), "c:\\a\\b\\c");
   do_check_eq(Win.normalize("c:/a/b////c"), "c:\\a\\b\\c");
   do_check_eq(Win.normalize("c:////a/b/c"), "c:\\a\\b\\c");
   do_check_eq(Win.normalize("c:/a/b/c///"), "c:\\a\\b\\c");
   do_check_eq(Win.normalize("c:/a/b/c/../../../d/e/f"), "c:\\d\\e\\f");
-  do_check_eq(Win.normalize("c:a/b/c/../../../d/e/f"), "c:d\\e\\f");
+  do_check_eq(Win.normalize("c:a/b/c/../../../d/e/f"), "c:\\d\\e\\f");
 
   do_print("Backslash-separated, UNC-style");
   do_check_eq(Win.basename("\\\\a\\b"), "b");