Split needs to handle the unix root as a special case

miner · Jan 5, 2012 · cc5f059 · cc5f059
1 parent 145d3ca
commit cc5f059
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/src/fs/core.clj b/src/fs/core.clj
@@ -164,10 +164,20 @@
   (.mkdirs (file path))
   path)
 
+(def unix-root "The root of a unix system is /, nil on Windows"
+  (when (= File/separator "/") File/separator))
+
+
 (defn split
-  "Split path to componenets."
+  "Split path to components."
   [path]
-  (seq (.split (str path) (str "\\Q" File/separator "\\E"))))
+  (let [pathstr (str path)
+        jregx (str "\\Q" File/separator "\\E")]
+    (cond (= pathstr unix-root) (list unix-root)
+          (and unix-root (.startsWith pathstr unix-root))
+          ;; unix absolute path
+            (cons unix-root (seq (.split (subs pathstr 1) jregx)))
+          :else (seq (.split pathstr jregx)))))
 
 (defn rename
   "Rename old-path to new-path. Only works on files."

diff --git a/test/fs/core_test.clj b/test/fs/core_test.clj
@@ -131,6 +131,13 @@
 (fact
   (split (file "test/fs")) => (has-suffix ["test" "fs"]))
 
+(when unix-root
+  (fact
+   (split (file "/tmp/foo/bar.txt")) => '("/" "tmp" "foo" "bar.txt")
+   (split (file "/")) => '("/")
+   (split "/") => '("/")
+   (split "") => '("")))
+
 (fact
   (let [f (temp-file)
         new-f (str f "-new")]
@@ -271,4 +278,4 @@
   (path-ns "foo/bar/baz_quux.clj") => 'foo.bar.baz-quux)
 
 (fact
-  (str (ns-path 'foo.bar.baz-quux)) => (has-suffix "foo/bar/baz_quux.clj"))
+  (str (ns-path 'foo.bar.baz-quux)) => (has-suffix "foo/bar/baz_quux.clj"))