pathname: Move same_paths? to pathname.c

4 files changed, 15 insertions, 8 deletions

diff --git a/internal/string.h b/internal/string.h
index 02e708d341..94a46a9657 100644
--- a/internal/string.h
+++ b/internal/string.h
@@ -98,6 +98,7 @@ VALUE rb_str_upto_endless_each(VALUE, int (*each)(VALUE, VALUE), VALUE);
 VALUE rb_str_with_debug_created_info(VALUE, VALUE, int);
 VALUE rb_str_frozen_bare_string(VALUE);
 const char *rb_str_null_check(VALUE);
+VALUE rb_str_casecmp(VALUE str1, VALUE str2);
 
 /* error.c */
 void rb_warn_unchilled_literal(VALUE str);
diff --git a/pathname.c b/pathname.c
index b2f1da8f75..a294a0d730 100644
--- a/pathname.c
+++ b/pathname.c
@@ -120,6 +120,18 @@ path_sub(int argc, VALUE *argv, VALUE self)
     return rb_class_new_instance(1, &str, rb_obj_class(self));
 }
 
+/* :nodoc: */
+static VALUE
+same_paths(VALUE self, VALUE a, VALUE b)
+{
+    check_strpath(a);
+    check_strpath(b);
+    if (CASEFOLD_FILESYSTEM)
+        return RBOOL(rb_str_casecmp(a, b) == INT2FIX(0));
+    else
+        return rb_str_equal(a, b);
+}
+
 /*
  * Predicate method for root directories.  Returns +true+ if the
  * pathname consists of consecutive slashes.
@@ -339,6 +351,7 @@ InitVM_pathname(void)
     rb_define_method(rb_cPathname, "root?", path_root_p, 0);
     rb_define_method(rb_cPathname, "absolute?", path_absolute_p, 0);
 
+    rb_define_private_method(rb_cPathname, "same_paths?", same_paths, 2);
     rb_define_private_method(rb_cPathname, "has_separator?", has_separator_p, 1);
     rb_define_private_method(rb_cPathname, "chop_basename", chop_basename, 1);
     rb_define_private_method(rb_cPathname, "split_names", split_names, 1);
diff --git a/pathname_builtin.rb b/pathname_builtin.rb
index ea302c594b..4bd8b002f3 100644
--- a/pathname_builtin.rb
+++ b/pathname_builtin.rb
@@ -221,13 +221,6 @@ class Pathname
 
   # :stopdoc:
 
-  if File::FNM_SYSCASE.nonzero?
-    # Avoid #zero? here because #casecmp can return nil.
-    private def same_paths?(a, b) a.casecmp(b) == 0 end
-  else
-    private def same_paths?(a, b) a == b end
-  end
-
   attr_reader :path
   protected :path
 
diff --git a/string.c b/string.c
index 2d7bd4ee74..e4de2f0e66 100644
--- a/string.c
+++ b/string.c
@@ -4401,7 +4401,7 @@ static VALUE str_casecmp_p(VALUE str1, VALUE str2);
  *  Related: see {Comparing}[rdoc-ref:String@Comparing].
  */
 
-static VALUE
+VALUE
 rb_str_casecmp(VALUE str1, VALUE str2)
 {
     VALUE s = rb_check_string_type(str2);