From c80255e51076239163914c696aad2af6dff8e6e9 Mon Sep 17 00:00:00 2001
From: Graydon Hoare <graydon@mozilla.com>
Date: Thu, 5 May 2011 13:42:52 -0700
Subject: Fix assumption that only os_fs.path_sep can separate paths, sigh.

---
 src/lib/fs.rs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'src/lib')

diff --git a/src/lib/fs.rs b/src/lib/fs.rs
index e185ca3e..722f2661 100644
--- a/src/lib/fs.rs
+++ b/src/lib/fs.rs
@@ -13,7 +13,13 @@ fn dirname(path p) -> path {
     assert (_str.byte_len(sep) == 1u);
     let int i = _str.rindex(p, sep.(0));
     if (i == -1) {
-        ret p;
+        // FIXME: the '/' character is a path separator on all 3 platforms we
+        // support. This should probably be generalized a bit more in the
+        // future, but for now this should work.
+        i = _str.rindex(p, '/');
+        if (i == -1) {
+            ret p;
+        }
     }
     ret _str.substr(p, 0u, i as uint);
 }
-- 
cgit v1.2.3