---

yaml
---
r: 5674
b: refs/heads/master
c: 6f5a0c7
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 51ae30287bf8512cde8747d7ae6788ec5ac41395
+refs/heads/master: 6f5a0c7500fe3a7b1dd7a18f85daa419807759f3

trunk/src/lib/fs.rs

@@ -85,6 +85,84 @@ fn split(p: path) -> [path] {
     ret split2;
 }
 
+fn normalize(p: path) -> path {
+    let s = split(p);
+    let s = strip_dots(s);
+    let s = rollup_doubledots(s);
+
+    let s = if check vec::is_not_empty(s) {
+        connect_many(s)
+    } else {
+        ""
+    };
+    let s = reabsolute(p, s);
+    let s = reterminate(p, s);
+
+    let s = if str::byte_len(s) == 0u {
+        "."
+    } else {
+        s
+    };
+
+    ret s;
+
+    fn strip_dots(s: [path]) -> [path] {
+        vec::filter_map({ |elem|
+            if elem == "." {
+                option::none
+            } else {
+                option::some(elem)
+            }
+        }, s)
+    }
+
+    fn rollup_doubledots(s: [path]) -> [path] {
+        if vec::is_empty(s) {
+            ret [];
+        }
+
+        let t = [];
+        let i = vec::len(s);
+        let skip = 0;
+        do {
+            i -= 1u;
+            if s[i] == ".." {
+                skip += 1;
+            } else {
+                if skip == 0 {
+                    t += [s[i]];
+                } else {
+                    skip -= 1;
+                }
+            }
+        } while i != 0u;
+        let t = vec::reversed(t);
+        while skip > 0 {
+            t += [".."];
+            skip -= 1;
+        }
+        ret t;
+    }
+
+    fn reabsolute(orig: path, new: path) -> path {
+        if path_is_absolute(orig) {
+            path_sep() + new
+        } else {
+            new
+        }
+    }
+
+    fn reterminate(orig: path, new: path) -> path {
+        let last = orig[str::byte_len(orig) - 1u];
+        if last == os_fs::path_sep as u8
+            || last == os_fs::path_sep as u8 {
+            ret new + path_sep();
+        } else {
+            ret new;
+        }
+    }
+}
+
 // Local Variables:
 // mode: rust;
 // fill-column: 78;

trunk/src/test/stdtest/fs.rs

@@ -64,3 +64,80 @@ fn split4() {
     let expected = ["a", "b", "c"];
     assert actual == expected;
 }
+
+#[test]
+fn normalize1() {
+    let actual = fs::normalize("a/b/..");
+    let expected = "a";
+    assert actual == expected;
+}
+
+#[test]
+fn normalize2() {
+    let actual = fs::normalize("/a/b/..");
+    let expected = "/a";
+    assert actual == expected;
+}
+
+#[test]
+fn normalize3() {
+    let actual = fs::normalize("a/../b");
+    let expected = "b";
+    assert actual == expected;
+}
+
+#[test]
+fn normalize4() {
+    let actual = fs::normalize("/a/../b");
+    let expected = "/b";
+    assert actual == expected;
+}
+
+#[test]
+fn normalize5() {
+    let actual = fs::normalize("a/.");
+    let expected = "a";
+    assert actual == expected;
+}
+
+#[test]
+fn normalize6() {
+    let actual = fs::normalize("a/./b/");
+    let expected = "a/b/";
+    assert actual == expected;
+}
+
+#[test]
+fn normalize7() {
+    let actual = fs::normalize("a/..");
+    let expected = ".";
+    assert actual == expected;
+}
+
+#[test]
+fn normalize8() {
+    let actual = fs::normalize("../../..");
+    let expected = "../../..";
+    assert actual == expected;
+}
+
+#[test]
+fn normalize9() {
+    let actual = fs::normalize("a/b/../../..");
+    let expected = "..";
+    assert actual == expected;
+}
+
+#[test]
+fn normalize10() {
+    let actual = fs::normalize("/a/b/c/../d/./../../e/");
+    let expected = "/a/e/";
+    assert actual == expected;
+}
+
+#[test]
+fn normalize11() {
+    let actual = fs::normalize("/a/..");
+    let expected = "/";
+    assert actual == expected;
+}