make the File.dirname impl clearer and fix regex

jruby · Jun 18, 2015 · 0ee3d96 · 0ee3d96
1 parent 0046bed
commit 0ee3d96
Showing 1 changed file with 11 additions and 8 deletions.
diff --git a/core/src/main/java/org/jruby/RubyFile.java b/core/src/main/java/org/jruby/RubyFile.java
@@ -661,7 +661,7 @@ public static IRubyObject dirname(ThreadContext context, IRubyObject recv, IRuby
         return runtime.newString(dirname(context, jfilename)).infectBy(filename);
     }
 
-    private static Pattern PROTOCOL_PATTERN = Pattern.compile("^[a-z:]{2,}:/");
+    private static Pattern PROTOCOL_PATTERN = Pattern.compile("^([a-z]+:)?[a-z]+:/.*");
     public static String dirname(ThreadContext context, String jfilename) {
         String name = jfilename.replace('\\', '/');
         int minPathLength = 1;
@@ -673,15 +673,18 @@ public static String dirname(ThreadContext context, String jfilename) {
             minPathLength = 3;
         }
 
-        // address all the url like paths first
-        if (PROTOCOL_PATTERN.matcher(name).matches() || name.contains("!/")) {
-            int start = Math.max(name.indexOf(":/"), name.indexOf("!/")) + 2;
+        // jar like paths
+        if (name.contains("!/")) {
+            int start = name.indexOf("!/") + 1;
             String path = dirname(context, name.substring(start));
             if (path.equals(".") || path.equals("/")) path = "";
-            if (name.contains("!/") &&
-                (path.startsWith("/") || path.equals(""))) {
-                start = start - 1;
-            }
+            return name.substring(0, start) + path;
+        }
+        // address all the url like paths first
+        if (PROTOCOL_PATTERN.matcher(name).matches()) {
+            int start = name.indexOf(":/") + 2;
+            String path = dirname(context, name.substring(start));
+            if (path.equals(".")) path = "";
             return name.substring(0, start) + path;
         }